[atomix] 01/10: New upstream version 3.22.0
Markus Koschany
apo-guest at moszumanska.debian.org
Thu Sep 22 16:09:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository atomix.
commit 93f0eccf8848f7ef6effe5ee8d36b8205b1f523c
Author: Markus Koschany <apo at debian.org>
Date: Thu Sep 22 17:42:34 2016 +0200
New upstream version 3.22.0
---
.gitignore | 1 +
NEWS | 20 +++
autogen.sh | 44 +++++--
configure.ac | 10 +-
data/atomix.appdata.xml.in | 24 ++++
po/am.po | 1 +
po/ar.po | 1 +
po/az.po | 1 +
po/be.po | 1 +
po/bg.po | 1 +
po/bn.po | 1 +
po/cs.po | 20 +--
po/da.po | 1 +
po/de.po | 23 ++--
po/dz.po | 1 +
po/en_CA.po | 1 +
po/eo.po | 1 +
po/es.po | 40 +++---
po/et.po | 1 +
po/eu.po | 1 +
po/fa.po | 1 +
po/fi.po | 86 ++++++++++---
po/fr.po | 309 ++++++++++++++++++++++++++++-----------------
po/ga.po | 1 +
po/gu.po | 1 +
po/he.po | 17 ++-
po/hi.po | 1 +
po/hu.po | 72 +++--------
po/id.po | 294 +++++++++++++++++++++++-------------------
po/is.po | 1 +
po/it.po | 1 +
po/ja.po | 1 +
po/ka.po | 1 +
po/kn.po | 1 +
po/ko.po | 1 +
po/lt.po | 31 +++--
po/lv.po | 1 +
po/mk.po | 1 +
po/ml.po | 1 +
po/ms.po | 1 +
po/nb.po | 1 +
po/nl.po | 1 +
po/oc.po | 2 +-
po/pa.po | 1 +
po/pl.po | 52 ++++----
po/pt.po | 71 ++++++++---
po/pt_BR.po | 38 +++---
po/sl.po | 2 +-
po/sq.po | 1 +
po/sr.po | 35 +++--
po/sr at latin.po | 35 +++--
po/sv.po | 19 ++-
po/ta.po | 1 +
po/th.po | 1 +
po/uk.po | 1 +
po/vi.po | 1 +
po/wa.po | 1 +
po/zh_CN.po | 1 +
po/zh_HK.po | 1 +
po/zh_TW.po | 1 +
src/Makefile.am | 12 +-
src/board-gtk.c | 56 ++++----
src/clock.c | 5 +-
src/goal-view.c | 6 +-
src/goal.c | 10 +-
src/level-manager.c | 4 +-
src/main.c | 7 +-
src/playfield.c | 46 +++----
src/tile.c | 5 +-
69 files changed, 845 insertions(+), 589 deletions(-)
diff --git a/.gitignore b/.gitignore
index 22657bc..dbd65dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ aclocal.m4
data/atomix.desktop
data/atomix.appdata.xml
data/atomix.appdata.valid
+ar-lib
autom4te.cache/
config.guess
config.h
diff --git a/NEWS b/NEWS
index eb1cbe3..3782a64 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,23 @@
+2016-09-19: Release version 3.22.0
+
+ * Updated translations
+ * Added content ratings
+
+2016-09-12: Release version 3.21.92
+
+ * Updated translations
+
+2016-08-29: Release version 3.21.91
+
+ * Updated translations
+ * Port from gnome-common (Ernestas Kulik)
+ * Fix compilation warnings (Robert Roth)
+
+2016-08-15: Release version 3.21.90
+
+ * Updated translations
+ * Use label word wrap instead of newlines
+
2016-03-22: Release version 3.20.0
* Stable release version bump
diff --git a/autogen.sh b/autogen.sh
index 6d62767..fa7f5a6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,20 +1,38 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
+test -n "$srcdir" || srcdir=$(dirname "$0")
+test -n "$srcdir" || srcdir=.
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
+olddir=$(pwd)
-(test -f $srcdir/configure.ac \
- && test -f $srcdir/ChangeLog \
- && test -f $srcdir/src/level.h) || {
- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
- echo " top-level Atomix directory"
- exit 1
-}
+cd $srcdir
-which gnome-autogen.sh || {
- echo "You need to install gnome-common package"
- exit 1
+(test -f configure.ac) || {
+ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
+ exit 1
}
-. gnome-autogen.sh
+# shellcheck disable=SC2016
+PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
+
+if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
+ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
+ echo "*** If you wish to pass any to it, please specify them on the" >&2
+ echo "*** '$0' command line." >&2
+ echo "" >&2
+fi
+
+aclocal --install || exit 1
+intltoolize --force --copy --automake || exit 1
+autoreconf --verbose --force --install || exit 1
+
+cd "$olddir"
+if [ "$NOCONFIGURE" = "" ]; then
+ $srcdir/configure "$@" || exit 1
+
+ if [ "$1" = "--help" ]; then exit 0 else
+ echo "Now type 'make' to compile $PKG_NAME" || exit 1
+ fi
+else
+ echo "Skipping configure process."
+fi
diff --git a/configure.ac b/configure.ac
index db60fc4..62e727a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,8 @@
AC_PREREQ([2.63])
-AC_INIT([atomix],[3.20.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=atomix])
+AC_INIT([atomix],[3.22.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=atomix])
+
+AX_IS_RELEASE([minor-version])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([src/main.c])
@@ -14,10 +16,12 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AC_PROG_CC
AC_PROG_RANLIB
+AM_PROG_AR
+
+AX_REQUIRE_DEFINED([APPSTREAM_XML])
APPSTREAM_XML
-GNOME_COMPILE_WARNINGS([maximum])
-GNOME_MAINTAINER_MODE_DEFINES
+AX_COMPILER_FLAGS
dnl ================= Requirements =======================
LIBGTK_REQUIRED=3.10.0
diff --git a/data/atomix.appdata.xml.in b/data/atomix.appdata.xml.in
index f22457d..1792102 100644
--- a/data/atomix.appdata.xml.in
+++ b/data/atomix.appdata.xml.in
@@ -33,4 +33,28 @@
<kudo>ModernToolkit</kudo>
</kudos>
<translation type="gettext">atomix</translation>
+ <!-- Generated by http://apps-xdgapp.rhcloud.com/oars -->
+ <content_rating type="oars-1.0">
+ <content_attribute id="violence-cartoon">none</content_attribute>
+ <content_attribute id="violence-fantasy">none</content_attribute>
+ <content_attribute id="violence-realistic">none</content_attribute>
+ <content_attribute id="violence-bloodshed">none</content_attribute>
+ <content_attribute id="violence-sexual">none</content_attribute>
+ <content_attribute id="drugs-alcohol">none</content_attribute>
+ <content_attribute id="drugs-narcotics">none</content_attribute>
+ <content_attribute id="drugs-tobacco">none</content_attribute>
+ <content_attribute id="sex-nudity">none</content_attribute>
+ <content_attribute id="sex-themes">none</content_attribute>
+ <content_attribute id="language-profanity">none</content_attribute>
+ <content_attribute id="language-humor">none</content_attribute>
+ <content_attribute id="language-discrimination">none</content_attribute>
+ <content_attribute id="social-chat">none</content_attribute>
+ <content_attribute id="social-info">none</content_attribute>
+ <content_attribute id="social-audio">none</content_attribute>
+ <content_attribute id="social-location">none</content_attribute>
+ <content_attribute id="social-contacts">none</content_attribute>
+ <content_attribute id="money-purchasing">none</content_attribute>
+ <content_attribute id="money-gambling">none</content_attribute>
+ </content_rating>
+
</component>
diff --git a/po/am.po b/po/am.po
index b580b3d..a027ea2 100644
--- a/po/am.po
+++ b/po/am.po
@@ -11,6 +11,7 @@ msgstr ""
"PO-Revision-Date: 2003-01-24 11:45+EDT\n"
"Last-Translator: Ge'ez Frontier Foundation <locales at geez.org>\n"
"Language-Team: Amharic <locales at geez.org>\n"
+"Language: am\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ar.po b/po/ar.po
index e636483..4b14f19 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,6 +11,7 @@ msgstr ""
"PO-Revision-Date: 2007-04-14 18:49+0100\n"
"Last-Translator: Djihed Afifi <djihed at gmail.com>\n"
"Language-Team: Arabeyes <doc at arabeyes.org>\n"
+"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/az.po b/po/az.po
index 6b6e3f1..ad7081a 100644
--- a/po/az.po
+++ b/po/az.po
@@ -9,6 +9,7 @@ msgstr ""
"PO-Revision-Date: 2003-03-07 19:01+0200\n"
"Last-Translator: Mətin Əmirov <metin at karegen.com>\n"
"Language-Team: Azerbaijani Turkic <linuxaz at azerimail.net>\n"
+"Language: az\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/be.po b/po/be.po
index a6b5656..9d047b7 100644
--- a/po/be.po
+++ b/po/be.po
@@ -11,6 +11,7 @@ msgstr ""
"PO-Revision-Date: 2012-10-02 16:40+0300\n"
"Last-Translator: Ihar Hrachyshka <ihar.hrachyshka at gmail.com>\n"
"Language-Team: Belarusian <i18n-bel-gnome at googlegroups.com>\n"
+"Language: be\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/bg.po b/po/bg.po
index d6b030b..64bb4ea 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -12,6 +12,7 @@ msgstr ""
"PO-Revision-Date: 2006-01-09 18:32+0200\n"
"Last-Translator: Alexander Shopov <ash at contact.bg>\n"
"Language-Team: Bulgarian <dict at fsa-bg.org>\n"
+"Language: bg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/bn.po b/po/bn.po
index e07dfed..8c94278 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -11,6 +11,7 @@ msgstr ""
"PO-Revision-Date: 2006-03-07 21:00+0600\n"
"Last-Translator: Progga <progga at BengaLinux.Org>\n"
"Language-Team: Bangla <gnome-translation at BengaLinux.Org>\n"
+"Language: bn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/cs.po b/po/cs.po
index 2c4ba06..cc9be7e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,7 +14,7 @@ msgstr ""
"Project-Id-Version: atomix\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=atomix&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-01-01 15:57+0000\n"
+"POT-Creation-Date: 2016-08-13 10:04+0000\n"
"PO-Revision-Date: 2016-01-01 19:59+0100\n"
"Last-Translator: Marek Černocký <marek at manet.cz>\n"
"Language-Team: Czech <gnome-cs-list at gnome.org>\n"
@@ -42,9 +42,9 @@ msgid ""
"wall or another atom."
msgstr ""
"Atomix je logická hra, ve které je cílem sestavit molekuly z jednotlivých "
-"atomů jejich přesouváním po hracím poli. Atomy ale nemůžete přesouvat, "
-"jak vás napadne. Po udaní směru se samy pohybují, až dokud nenarazí do zdi "
-"nebo do jiného atomu."
+"atomů jejich přesouváním po hracím poli. Atomy ale nemůžete přesouvat, jak "
+"vás napadne. Po udaní směru se samy pohybují, až dokud nenarazí do zdi nebo "
+"do jiného atomu."
#: ../data/atomix.appdata.xml.in.h:4
msgid ""
@@ -248,13 +248,13 @@ msgstr "Ukončit"
#: ../src/board-gtk.c:338
msgid ""
-"Guide the atoms through the maze to form molecules.\n"
-"Click, or use the arrow keys and Enter, to select an atom and move it.\n"
-"Be careful, though: an atom keeps moving until it hits a wall.\n"
+"Guide the atoms through the maze to form molecules. Click, or use the arrow "
+"keys and Enter, to select an atom and move it. Be careful, though: an atom "
+"keeps moving until it hits a wall."
msgstr ""
-"Proveďte atomy bludištěm, aby vytvořily molekulu.\n"
-"Kliknutím, nebo šipkami a zmáčknutím Enter, vyberte atom a přesuňte jej.\n"
-"Buďte ale opatrní: atom se pohybuje, dokud nenarazí na zeď.\n"
+"Proveďte atomy bludištěm, aby vytvořily molekulu. Kliknutím, nebo šipkami a "
+"zmáčknutím Enter, vyberte atom a přesuňte jej. Buďte ale opatrní: atom se "
+"pohybuje, dokud nenarazí na zeď."
#: ../src/level-manager.c:200
msgid "Couldn't find level sequence description."
diff --git a/po/da.po b/po/da.po
index b24b443..c8ede38 100644
--- a/po/da.po
+++ b/po/da.po
@@ -13,6 +13,7 @@ msgstr ""
"PO-Revision-Date: 2010-12-15 13:01+01:00\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
+"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/de.po b/po/de.po
index 10d4fe3..16e0f82 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,22 +6,22 @@
# Jens Finke <jens at gnome.org>, 2006.
# Mario Blättermann <mariobl at gnome.org>, 2010.
# Wolfgang Stöggl <c72578 at yahoo.de>, 2015.
-# Mario Blättermann <mario.blaettermann at gmail.com>, 2015.
+# Mario Blättermann <mario.blaettermann at gmail.com>, 2015, 2016.
#
msgid ""
msgstr ""
"Project-Id-Version: atomix master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=atomix&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-12-30 03:57+0000\n"
-"PO-Revision-Date: 2015-12-30 12:42+0100\n"
+"POT-Creation-Date: 2016-08-13 10:04+0000\n"
+"PO-Revision-Date: 2016-09-03 21:58+0200\n"
"Last-Translator: Mario Blättermann <mario.blaettermann at gmail.com>\n"
"Language-Team: German <gnome-de at gnome.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.5\n"
+"X-Generator: Poedit 1.8.9\n"
#: ../data/atomix.appdata.xml.in.h:1 ../data/atomix.desktop.in.h:1
#: ../data/ui/interface.ui.h:1 ../src/main.c:128 ../src/main.c:669
@@ -246,14 +246,14 @@ msgstr "Beenden"
#: ../src/board-gtk.c:338
msgid ""
-"Guide the atoms through the maze to form molecules.\n"
-"Click, or use the arrow keys and Enter, to select an atom and move it.\n"
-"Be careful, though: an atom keeps moving until it hits a wall.\n"
+"Guide the atoms through the maze to form molecules. Click, or use the arrow "
+"keys and Enter, to select an atom and move it. Be careful, though: an atom "
+"keeps moving until it hits a wall."
msgstr ""
-"Führen Sie die Atome durch das Labyrinth, um Moleküle zu formen.\n"
-"Klicken Sie oder verwenden sie die Pfeiltasten und die Eingabetaste,\n"
-"um ein Atom auszuwählen und es zu verschieben. Seien Sie vorsichtig,\n"
-"denn Atom bewegt sich weiter, bis es eine Wand erreicht.\n"
+"Führen Sie die Atome durch das Labyrinth, um Moleküle zu formen. Klicken Sie "
+"oder verwenden Sie die Pfeiltasten und die Eingabetaste, um ein Atom "
+"auszuwählen und es zu verschieben. Seien Sie vorsichtig, denn ein Atom "
+"bewegt sich weiter, bis es eine Wand erreicht."
#: ../src/level-manager.c:200
msgid "Couldn't find level sequence description."
@@ -288,4 +288,3 @@ msgstr "Keine Themen gefunden."
#, c-format
msgid "Found theme '%s' in: %s"
msgstr "Thema »%s« gefunden in: %s"
-
diff --git a/po/dz.po b/po/dz.po
index f396bf4..2c8f4c3 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -11,6 +11,7 @@ msgstr ""
"PO-Revision-Date: 2007-02-12 12:21+0530\n"
"Last-Translator: sonam pelden <sonaa_peldn at yahoo.com>\n"
"Language-Team: Dzongkha <pgeyleg at dit.gov.bt>\n"
+"Language: dz\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/en_CA.po b/po/en_CA.po
index c1a2203..3e5f991 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -12,6 +12,7 @@ msgstr ""
"PO-Revision-Date: 2005-04-30 18:20-0400\n"
"Last-Translator: Adam Weinberger <adamw at gnome.org>\n"
"Language-Team: Canadian English <adamw at gnome.org>\n"
+"Language: en_CA\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/eo.po b/po/eo.po
index 2637cea..621c641 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -12,6 +12,7 @@ msgstr ""
"PO-Revision-Date: 2011-11-11 20:24+0100\n"
"Last-Translator: Kristjan SCHMIDT <kristjan.schmidt at googlemail.com>\n"
"Language-Team: Esperanto <gnome-l10n-eo at lists.launchpad.net>\n"
+"Language: eo\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bits\n"
diff --git a/po/es.po b/po/es.po
index c57fb0c..c52ac2c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,22 +1,22 @@
-# translation of atomix.master.es.po to Spanish
-# Spanish/Spain translation of ATOMIX.
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-# Ãlvaro Peña <alvaropg at mac.com>, 2001.
-# Francisco Javier F. Serrador <serrador at cvs.gnome.org>, 2003.
-# Jorge González <jorgegonz at svn.gnome.org>, 2010.
-#
-# Daniel Mustieles <daniel.mustieles at gmail.com>, 2015.
, 2016.
+# translation of atomix.master.es.po to Spanish
+# Spanish/Spain translation of ATOMIX.
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+# Ãlvaro Peña <alvaropg at mac.com>, 2001.
+# Francisco Javier F. Serrador <serrador at cvs.gnome.org>, 2003.
+# Jorge González <jorgegonz at svn.gnome.org>, 2010.
+#
+# Daniel Mustieles <daniel.mustieles at gmail.com>, 2015, 2016.
#
msgid ""
msgstr ""
"Project-Id-Version: atomix.master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=atomix&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-01-07 03:57+0000\n"
+"POT-Creation-Date: 2016-08-13 10:04+0000\n"
"PO-Revision-Date: 2016-01-07 11:40+0100\n"
"Last-Translator: Daniel Mustieles <daniel.mustieles at gmail.com>\n"
"Language-Team: Español; Castellano <gnome-es-list at gnome.org>\n"
-"Language: \n"
+"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -209,55 +209,51 @@ msgid "Statistics"
msgstr "Estadísticas"
#: ../data/ui/interface.ui.h:20
-#| msgid "_New Game"
msgid "New Game"
msgstr "Juego nuevo"
#: ../data/ui/interface.ui.h:21
-#| msgid "_End Game"
msgid "End Game"
msgstr "Finalizar el juego"
#: ../data/ui/interface.ui.h:22
-#| msgid "_Skip Level"
msgid "Skip Level"
msgstr "Saltar nivel"
#: ../data/ui/interface.ui.h:23
-#| msgid "_Reset Level"
msgid "Reset Level"
msgstr "Reiniciar nivel"
#: ../data/ui/interface.ui.h:24
-#| msgid "_Undo Move"
msgid "Undo Move"
msgstr "Deshacer movimiento"
#: ../data/ui/interface.ui.h:25
-#| msgid "_Pause Game"
msgid "Pause Game"
msgstr "Pausar juego"
#: ../data/ui/interface.ui.h:26
-#| msgid "_Continue Game"
msgid "Continue Game"
msgstr "Continuar juego"
#: ../data/ui/interface.ui.h:27
-#| msgid "_About"
msgid "About"
msgstr "Acerca de"
#: ../data/ui/interface.ui.h:28
-#| msgid "_Quit"
msgid "Quit"
msgstr "Salir"
#: ../src/board-gtk.c:338
+#, fuzzy
+#| msgid ""
+#| "Guide the atoms through the maze to form molecules.\n"
+#| "Click, or use the arrow keys and Enter, to select an atom and move it.\n"
+#| "Be careful, though: an atom keeps moving until it hits a wall.\n"
msgid ""
-"Guide the atoms through the maze to form molecules.\n"
-"Click, or use the arrow keys and Enter, to select an atom and move it.\n"
-"Be careful, though: an atom keeps moving until it hits a wall.\n"
+"Guide the atoms through the maze to form molecules. Click, or use the arrow "
+"keys and Enter, to select an atom and move it. Be careful, though: an atom "
+"keeps moving until it hits a wall."
msgstr ""
"Guíe a los átomos por el laberinto para formar moléculas.\n"
"Pulse o use las teclas de flechas e Intro para seleccionar un átomo y "
diff --git a/po/et.po b/po/et.po
index ce526f3..1d4f82f 100644
--- a/po/et.po
+++ b/po/et.po
@@ -16,6 +16,7 @@ msgstr ""
"PO-Revision-Date: 2006-01-15 15:24+0200\n"
"Last-Translator: Ivar Smolin <okul at linux.ee>\n"
"Language-Team: Estonian <gnome-et at linux.ee>\n"
+"Language: et\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/eu.po b/po/eu.po
index 4198a63..d6fa717 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -11,6 +11,7 @@ msgstr ""
"PO-Revision-Date: 2010-03-30 12:00+0200\n"
"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo at euskalgnu.org>\n"
"Language-Team: Basque <itzulpena at euskalgnu.org>\n"
+"Language: eu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/fa.po b/po/fa.po
index f0f868c..5f5f537 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -9,6 +9,7 @@ msgstr ""
"PO-Revision-Date: 2003-02-23 16:24+0330\n"
"Last-Translator: Roozbeh Pournader <roozbeh at sharif.edu>\n"
"Language-Team: Persian <farsi at lists.sharif.edu>\n"
+"Language: fa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/fi.po b/po/fi.po
index 8f1101c..07800af 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4,26 +4,26 @@
# Copyright (C) 2002 Free Software Foundation, Inc.
# Lauri Nurmi <lanurmi at iki.fi>, 2002.
# Ilkka Tuohela <hile at iki.fi>, 2005.
-# Jiri Grönroos <jiri.gronroos+l10n at iki.fi>, 2015.
+# Jiri Grönroos <jiri.gronroos+l10n at iki.fi>, 2015, 2016.
#
msgid ""
msgstr ""
"Project-Id-Version: atomix\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=atomix&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-08-31 12:37+0000\n"
-"PO-Revision-Date: 2015-10-11 16:51+0300\n"
+"POT-Creation-Date: 2016-08-13 10:04+0000\n"
+"PO-Revision-Date: 2016-09-04 17:21+0300\n"
"Last-Translator: Jiri Grönroos <jiri.gronroos+l10n at iki.fi>\n"
-"Language-Team: suomi <gnome-fi-laatu at lists.sourceforge.net>\n"
+"Language-Team: suomi <lokalisointi-lista at googlegroups.com>\n"
"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
#: ../data/atomix.appdata.xml.in.h:1 ../data/atomix.desktop.in.h:1
-#: ../data/ui/interface.ui.h:1 ../src/main.c:127 ../src/main.c:684
+#: ../data/ui/interface.ui.h:1 ../src/main.c:128 ../src/main.c:669
msgid "Atomix"
msgstr "Atomix"
@@ -55,6 +55,10 @@ msgstr ""
msgid "Molecule puzzle game"
msgstr "Molekyyliälypeli"
+#: ../data/atomix.desktop.in.h:3 ../src/main.c:131
+msgid "A puzzle game about atoms and molecules"
+msgstr "Älypeli atomeista ja molekyyleistä"
+
#: ../data/level/aceticacid.atomix.xml.h:1
msgid "Acetic Acid"
msgstr "Etikkahappo"
@@ -144,27 +148,22 @@ msgid "_End Game"
msgstr "_Lopeta peli"
#: ../data/ui/interface.ui.h:5
-#| msgid "Skip _level"
msgid "_Skip Level"
msgstr "Ohita _taso"
#: ../data/ui/interface.ui.h:6
-#| msgid "Reset level"
msgid "_Reset Level"
msgstr "Aloita taso uu_delleen"
#: ../data/ui/interface.ui.h:7
-#| msgid "_Undo move"
msgid "_Undo Move"
msgstr "_Kumoa siirto"
#: ../data/ui/interface.ui.h:8
-#| msgid "_Pause game"
msgid "_Pause Game"
msgstr "K_eskeytä peli"
#: ../data/ui/interface.ui.h:9
-#| msgid "_Continue game"
msgid "_Continue Game"
msgstr "_Jatka peliä"
@@ -208,6 +207,61 @@ msgstr "tyhjä"
msgid "Statistics"
msgstr "Tilasto"
+#: ../data/ui/interface.ui.h:20
+#| msgid "_New Game"
+msgid "New Game"
+msgstr "Uusi peli"
+
+#: ../data/ui/interface.ui.h:21
+#| msgid "_End Game"
+msgid "End Game"
+msgstr "Lopeta peli"
+
+#: ../data/ui/interface.ui.h:22
+#| msgid "_Skip Level"
+msgid "Skip Level"
+msgstr "Ohita taso"
+
+#: ../data/ui/interface.ui.h:23
+#| msgid "_Reset Level"
+msgid "Reset Level"
+msgstr "Aloita taso uudelleen"
+
+#: ../data/ui/interface.ui.h:24
+#| msgid "_Undo Move"
+msgid "Undo Move"
+msgstr "Kumoa siirto"
+
+#: ../data/ui/interface.ui.h:25
+#| msgid "_Pause Game"
+msgid "Pause Game"
+msgstr "Keskeytä peli"
+
+#: ../data/ui/interface.ui.h:26
+#| msgid "_Continue Game"
+msgid "Continue Game"
+msgstr "Jatka peliä"
+
+#: ../data/ui/interface.ui.h:27
+#| msgid "_About"
+msgid "About"
+msgstr "Tietoja"
+
+#: ../data/ui/interface.ui.h:28
+#| msgid "_Quit"
+msgid "Quit"
+msgstr "Lopeta"
+
+#: ../src/board-gtk.c:338
+msgid ""
+"Guide the atoms through the maze to form molecules. Click, or use the arrow "
+"keys and Enter, to select an atom and move it. Be careful, though: an atom "
+"keeps moving until it hits a wall."
+msgstr ""
+"Johdata atomeja sokkelon läpi muodostaaksesi molekyylejä. Napsauta, tai "
+"käytä nuolinäppäimiä ja Enteriä, valitaksesi atomin ja siirtääksesi sitä. "
+"Ole kuitenkin varovainen, sillä atomi liikkuu kunnes se osuu seinämään."
+
#: ../src/level-manager.c:200
msgid "Couldn't find level sequence description."
msgstr "Tason sarjan kuvausta ei löytynyt."
@@ -221,18 +275,14 @@ msgstr "Tasoa ei löytynyt."
msgid "Found level '%s' in: %s"
msgstr "Taso '%s' löytyi paikasta: %s"
-#: ../src/main.c:129
-msgid "A puzzle game about atoms and molecules"
-msgstr "Älypeli atomeista ja molekyyleistä"
-
-#: ../src/main.c:133
+#: ../src/main.c:135
msgid "translator-credits"
msgstr ""
"Lauri Nurmi, 2002.\n"
"Ilkka Tuohela, 2005.\n"
-"Jiri Grönroos, 2015."
+"Jiri Grönroos, 2015-2016."
-#: ../src/main.c:440
+#: ../src/main.c:438
msgid "Congratulations! You have finished all Atomix levels."
msgstr "Onnittelut! Olet läpäissyt kaikki Atomixin tasot."
diff --git a/po/fr.po b/po/fr.po
index 4a7438e..3b318a6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,233 +10,308 @@ msgid ""
msgstr ""
"Project-Id-Version: atomix 2.14.0\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=atomix&component=general\n"
-"POT-Creation-Date: 2010-12-13 20:12+0000\n"
-"PO-Revision-Date: 2010-12-13 21:19+0100\n"
+"product=atomix&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-08-13 10:04+0000\n"
+"PO-Revision-Date: 2016-08-25 19:31+0200\n"
"Last-Translator: Claude Paroz <claude at 2xlibre.net>\n"
"Language-Team: GNOME French Team <gnomefr at traduc.org>\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.8\n"
-#: ../level/aceticacid.atomix.xml.h:1
+#: ../data/atomix.appdata.xml.in.h:1 ../data/atomix.desktop.in.h:1
+#: ../data/ui/interface.ui.h:1 ../src/main.c:128 ../src/main.c:669
+msgid "Atomix"
+msgstr "Atomix"
+
+#: ../data/atomix.appdata.xml.in.h:2
+msgid "Build molecules out of single atoms"
+msgstr "Composer des molécules un atome à la fois"
+
+#: ../data/atomix.appdata.xml.in.h:3
+msgid ""
+"Atomix is a puzzle game where your goal is to assemble molecules from "
+"compound atoms by moving them on the playfield. However, atoms don't just "
+"move wherever you want to move them to, they slide until they hit either a "
+"wall or another atom."
+msgstr ""
+"Atomix est un jeu de casse-tête dans lequel le but est d'assembler des "
+"molécules à partir de ses composantes atomiques en les déplaçant sur le "
+"terrain de jeu. Cependant, les atomes ne bougent pas comme vous le "
+"souhaiteriez, ils glissent jusqu'à ce qu'ils rencontrent un autre mur ou un "
+"autre atome."
+
+#: ../data/atomix.appdata.xml.in.h:4
+msgid ""
+"Try to build the molecules as fast as you can on each level to earn a higher "
+"score."
+msgstr ""
+"Essayez d'aller le plus rapidement possible pour concevoir les molécules "
+"pour avoir un meilleur score."
+
+#: ../data/atomix.desktop.in.h:2
+msgid "Molecule puzzle game"
+msgstr "Jeu de mémoire sur les molécules"
+
+#: ../data/atomix.desktop.in.h:3 ../src/main.c:131
+msgid "A puzzle game about atoms and molecules"
+msgstr "Un jeu de mémoire sur les atomes et molécules"
+
+#: ../data/level/aceticacid.atomix.xml.h:1
msgid "Acetic Acid"
msgstr "Acide acétique"
-#: ../level/acetone.atomix.xml.h:1
+#: ../data/level/acetone.atomix.xml.h:1
msgid "Acetone"
msgstr "Acétone"
-#: ../level/butanol.atomix.xml.h:1
+#: ../data/level/butanol.atomix.xml.h:1
msgid "Butanol"
msgstr "Butanol"
-#: ../level/cyclobutane.atomix.xml.h:1
+#: ../data/level/cyclobutane.atomix.xml.h:1
msgid "Cyclobutane"
msgstr "Cyclobutane"
-#: ../level/dimethylether.atomix.xml.h:1
+#: ../data/level/dimethylether.atomix.xml.h:1
msgid "Dimethyl Ether"
msgstr "Éther diméthyle"
-#: ../level/ethanal.atomix.xml.h:1
+#: ../data/level/ethanal.atomix.xml.h:1
msgid "Ethanal"
msgstr "Éthanal"
-#: ../level/ethane.atomix.xml.h:1
+#: ../data/level/ethane.atomix.xml.h:1
msgid "Ethane"
msgstr "Éthane"
-#: ../level/ethanol.atomix.xml.h:1
+#: ../data/level/ethanol.atomix.xml.h:1
msgid "Ethanol"
msgstr "Éthanol"
-#: ../level/ethylene.atomix.xml.h:1
+#: ../data/level/ethylene.atomix.xml.h:1
msgid "Ethylene"
msgstr "Éthylène"
-#: ../level/glycerin.atomix.xml.h:1
+#: ../data/level/glycerin.atomix.xml.h:1
msgid "Glycerin"
msgstr "Glycérine"
-#: ../level/lactic-acid.atomix.xml.h:1
+#: ../data/level/lactic-acid.atomix.xml.h:1
msgid "Lactic Acid"
msgstr "Acide lactique"
-#: ../level/methanal.atomix.xml.h:1
+#: ../data/level/methanal.atomix.xml.h:1
msgid "Methanal"
msgstr "Méthanal"
-#: ../level/methane.atomix.xml.h:1
+#: ../data/level/methane.atomix.xml.h:1
msgid "Methane"
msgstr "Méthane"
-#: ../level/methanol.atomix.xml.h:1
+#: ../data/level/methanol.atomix.xml.h:1
msgid "Methanol"
msgstr "Méthanol"
-#: ../level/propanal.atomix.xml.h:1
+#: ../data/level/propanal.atomix.xml.h:1
msgid "Propanal"
msgstr "Propanal"
-#: ../level/propylene.atomix.xml.h:1
+#: ../data/level/propylene.atomix.xml.h:1
msgid "Propylene"
msgstr "Propylène"
-#: ../level/pyran.atomix.xml.h:1
+#: ../data/level/pyran.atomix.xml.h:1
msgid "Pyran"
msgstr "Pyrane"
-#: ../level/transbutylen.atomix.xml.h:1
+#: ../data/level/transbutylen.atomix.xml.h:1
msgid "Trans Butylen"
msgstr "Trans Butylène"
-#: ../level/water.atomix.xml.h:1
+#: ../data/level/water.atomix.xml.h:1
msgid "Water"
msgstr "Eau"
-#: ../src/games-runtime.c:273
-msgid "Could not show link"
-msgstr "Impossible d'afficher le lien"
-
-#: ../src/games-scores-dialog.c:113
-msgid "Time"
-msgstr "Date"
-
-#. Note that this assumes the default style is plain.
-#: ../src/games-scores-dialog.c:118 ../src/games-scores-dialog.c:545
-msgid "Score"
-msgstr "Score"
+#: ../data/ui/interface.ui.h:2
+msgid "_File"
+msgstr "_Fichier"
-#. Translators: this is for a minutes, seconds time display.
-#: ../src/games-scores-dialog.c:276
-#, c-format
-msgid "%dm %ds"
-msgstr "%dm %ds"
+#: ../data/ui/interface.ui.h:3
+msgid "_New Game"
+msgstr "_Nouvelle partie"
-#: ../src/games-scores-dialog.c:437 ../src/main.c:736
-msgid "New Game"
-msgstr "Nouvelle partie"
+#: ../data/ui/interface.ui.h:4
+msgid "_End Game"
+msgstr "T_erminer la partie"
-#: ../src/games-scores-dialog.c:537
-msgid "Name"
-msgstr "Nom"
+#: ../data/ui/interface.ui.h:5
+msgid "_Skip Level"
+msgstr "Pa_sser le niveau"
-#. Empty title shows up as "<unnamed>" on maemo
-#: ../src/games-show.c:151
-msgid "Error"
-msgstr "Erreur"
+#: ../data/ui/interface.ui.h:6
+msgid "_Reset Level"
+msgstr "_Réinitialiser le niveau"
-#: ../src/level-manager.c:176
-msgid "Couldn't find level sequence description."
-msgstr "Impossible de trouver le niveau de la description de séquence."
+#: ../data/ui/interface.ui.h:7
+msgid "_Undo Move"
+msgstr "Ann_uler le mouvement"
-#: ../src/level-manager.c:190
-msgid "No level found."
-msgstr "Aucun niveau trouvé."
-
-#: ../src/level-manager.c:286
-#, c-format
-msgid "Found level '%s' in: %s"
-msgstr "A trouvé le niveau « %s » dans : %s"
-
-#: ../src/main.c:121 ../src/main.c:775 ../src/main.c:832
-#: ../atomix.desktop.in.h:1
-msgid "Atomix"
-msgstr "Atomix"
-
-#: ../src/main.c:166
-msgid "A puzzle game about atoms and molecules"
-msgstr "Un jeu de mémoire sur les atomes et molécules"
-
-#: ../src/main.c:170
-msgid "translator-credits"
-msgstr ""
-"Christophe Merlet <redfox at redfoxcenter.org>\n"
-"Jonathan Ernst <jonathan at ernstfamily.ch>"
+#: ../data/ui/interface.ui.h:8
+msgid "_Pause Game"
+msgstr "_Suspendre la partie"
-#: ../src/main.c:493
-msgid "Congratulations! You have finished all Atomix levels."
-msgstr "Félicitations ! Vous avez fini tous les niveaux d'Atomix."
+#: ../data/ui/interface.ui.h:9
+msgid "_Continue Game"
+msgstr "_Continuer la partie"
-#: ../src/main.c:503
-msgid "Couldn't find at least one level."
-msgstr "Impossible de trouver au moins un niveau."
+#: ../data/ui/interface.ui.h:10
+msgid "_Quit"
+msgstr "_Quitter"
-#: ../src/main.c:508
-msgid "Do you want to finish the game?"
-msgstr "Voulez-vous finir le jeu ?"
+#: ../data/ui/interface.ui.h:11
+msgid "_Help"
+msgstr "Aid_e"
-#. create statistics frame
-#: ../src/main.c:701
-msgid "Statistics"
-msgstr "Statistiques"
+#: ../data/ui/interface.ui.h:12
+msgid "_About"
+msgstr "_À propos"
-#: ../src/main.c:707
+#: ../data/ui/interface.ui.h:13
msgid "Level:"
msgstr "Niveau :"
-#: ../src/main.c:708
+#: ../data/ui/interface.ui.h:14
msgid "Molecule:"
msgstr "Molécule :"
-#: ../src/main.c:709
+#: ../data/ui/interface.ui.h:15
msgid "Formula:"
msgstr "Formule :"
-#: ../src/main.c:710
+#: ../data/ui/interface.ui.h:16
msgid "Score:"
msgstr "Score :"
-#: ../src/main.c:711
+#: ../data/ui/interface.ui.h:17
msgid "Time:"
msgstr "Date :"
-#: ../src/main.c:734
-msgid "_Game"
-msgstr "_Jeu"
+#: ../data/ui/interface.ui.h:18
+msgid "empty"
+msgstr "vide"
-#: ../src/main.c:735
-msgid "_Help"
-msgstr "Aid_e"
+#: ../data/ui/interface.ui.h:19
+msgid "Statistics"
+msgstr "Statistiques"
+
+#: ../data/ui/interface.ui.h:20
+msgid "New Game"
+msgstr "Nouvelle partie"
-#: ../src/main.c:737
+#: ../data/ui/interface.ui.h:21
msgid "End Game"
msgstr "Terminer la partie"
-#: ../src/main.c:738
+#: ../data/ui/interface.ui.h:22
msgid "Skip Level"
msgstr "Passer le niveau"
-#: ../src/main.c:739
+#: ../data/ui/interface.ui.h:23
msgid "Reset Level"
msgstr "Initialiser le niveau"
-#: ../src/main.c:741
-msgid "_Pause Game"
-msgstr "_Suspendre la partie"
+#: ../data/ui/interface.ui.h:24
+msgid "Undo Move"
+msgstr "Annuler le mouvement"
-#: ../src/main.c:742
-msgid "_Continue Game"
-msgstr "_Continuer la partie"
+#: ../data/ui/interface.ui.h:25
+msgid "Pause Game"
+msgstr "Sus_pendre la partie"
-#: ../src/main.c:743
-msgid "_Scores..."
-msgstr "_Scores..."
+#: ../data/ui/interface.ui.h:26
+msgid "Continue Game"
+msgstr "Continuer la partie"
-#: ../src/main.c:745
+#: ../data/ui/interface.ui.h:27
msgid "About"
msgstr "À propos"
-#: ../src/theme-manager.c:136
+#: ../data/ui/interface.ui.h:28
+msgid "Quit"
+msgstr "Quitter"
+
+#: ../src/board-gtk.c:338
+msgid ""
+"Guide the atoms through the maze to form molecules. Click, or use the arrow "
+"keys and Enter, to select an atom and move it. Be careful, though: an atom "
+"keeps moving until it hits a wall."
+msgstr ""
+"Guidez les atomes à travers le labyrinthe pour former des molécules. Cliquez "
+"ou utilisez les flèches et « Entrée » pour choisir un atome et le déplacer. "
+"Mais soyez vigilant : un atome continue de se déplacer jusqu'à atteindre un "
+"mur."
+
+#: ../src/level-manager.c:200
+msgid "Couldn't find level sequence description."
+msgstr "Impossible de trouver le niveau de la description de séquence."
+
+#: ../src/level-manager.c:214
+msgid "No level found."
+msgstr "Aucun niveau trouvé."
+
+#: ../src/level-manager.c:283
+#, c-format
+msgid "Found level '%s' in: %s"
+msgstr "A trouvé le niveau « %s » dans : %s"
+
+#: ../src/main.c:135
+msgid "translator-credits"
+msgstr ""
+"Christophe Merlet <redfox at redfoxcenter.org>\n"
+"Jonathan Ernst <jonathan at ernstfamily.ch>"
+
+#: ../src/main.c:438
+msgid "Congratulations! You have finished all Atomix levels."
+msgstr "Félicitations ! Vous avez fini tous les niveaux d'Atomix."
+
+#: ../src/theme-manager.c:225
msgid "No themes found."
msgstr "Aucun thème trouvé."
-#: ../src/theme-manager.c:194
+#: ../src/theme-manager.c:283
#, c-format
msgid "Found theme '%s' in: %s"
msgstr "A trouvé le thème « %s » dans : %s"
-#: ../atomix.desktop.in.h:2
-msgid "Molecule puzzle game"
-msgstr "Jeu de mémoire sur les molécules"
+#~ msgid "Could not show link"
+#~ msgstr "Impossible d'afficher le lien"
+
+#~ msgid "Time"
+#~ msgstr "Date"
+
+#~ msgid "Score"
+#~ msgstr "Score"
+
+#~ msgid "%dm %ds"
+#~ msgstr "%dm %ds"
+
+#~ msgid "Name"
+#~ msgstr "Nom"
+
+#~ msgid "Error"
+#~ msgstr "Erreur"
+
+#~ msgid "Couldn't find at least one level."
+#~ msgstr "Impossible de trouver au moins un niveau."
+
+#~ msgid "Do you want to finish the game?"
+#~ msgstr "Voulez-vous finir le jeu ?"
+
+#~ msgid "_Game"
+#~ msgstr "_Jeu"
+
+#~ msgid "_Scores..."
+#~ msgstr "_Scores..."
diff --git a/po/ga.po b/po/ga.po
index 02b32b6..98e3c69 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -11,6 +11,7 @@ msgstr ""
"PO-Revision-Date: 2004-0-22 08:02+0000\n"
"Last-Translator: Alastair McKinstry <mckinstry at computer.org>\n"
"Language-Team: Irish <gaeilge-gnulinux at lists.sourceforge.net>\n"
+"Language: ga\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/gu.po b/po/gu.po
index 5fb53e1..620d19d 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -13,6 +13,7 @@ msgstr ""
"PO-Revision-Date: 2006-01-06 13:01+0530\n"
"Last-Translator: Ankit Patel <ankit644 at yahoo.com>\n"
"Language-Team: Gujarati <indianoss-gujarati at lists.sourceforge.net>\n"
+"Language: gu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/he.po b/po/he.po
index bc27fe6..dae8409 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: atomix.txt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-03 20:37+0200\n"
-"PO-Revision-Date: 2016-03-03 20:46+0200\n"
+"POT-Creation-Date: 2016-08-14 18:32+0300\n"
+"PO-Revision-Date: 2016-08-14 18:33+0300\n"
"Last-Translator: Yosef Or Boczko <yoseforb at gmail.com>\n"
"Language-Team: עברית <>\n"
"Language: he\n"
@@ -241,14 +241,13 @@ msgstr "יציאה"
#: ../src/board-gtk.c:338
msgid ""
-"Guide the atoms through the maze to form molecules.\n"
-"Click, or use the arrow keys and Enter, to select an atom and move it.\n"
-"Be careful, though: an atom keeps moving until it hits a wall.\n"
+"Guide the atoms through the maze to form molecules. Click, or use the arrow "
+"keys and Enter, to select an atom and move it. Be careful, though: an atom "
+"keeps moving until it hits a wall."
msgstr ""
-"יש להדריך את האטומים דרך המבוך ליצירת מולקולות.\n"
-"יש ללחוץ, או להשתמש במקשי החצים ו־Enter, לבחירת אטום ולהזזתו.\n"
-"ואמנם יש להיזהר: אום ממשיך לזוז עד שהוא פוגע בקיר.\n"
-""
+"יש להדריך את האטומים דרך המבוך ליצירת מולקולות.אטום"
+"יש ללחוץ, או להשתמש במקשי החצים ו־Enter, לבחירת אטום ולהזזתו.אטום"
+"ואמנם יש להיזהר: אטום ממשיך לזוז עד שהוא פוגע בקיר.אטום"
#: ../src/level-manager.c:200
msgid "Couldn't find level sequence description."
diff --git a/po/hi.po b/po/hi.po
index f0eec67..943739e 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,6 +10,7 @@ msgstr ""
"PO-Revision-Date: 2003-01-03 18:26+0530\n"
"Last-Translator: G Karunakar <karunakar at freedomink.org>\n"
"Language-Team: Gnome Hindi Team<indlinux-hindi-gnome at lists.sourceforge.net>\n"
+"Language: hi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/hu.po b/po/hu.po
index d4cad45..bf593a7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,22 +1,21 @@
-# Hungarian translation of atomix.
-# Copyright (C) 2002-2004, 2006, 2007, 2010 Free Software Foundation, Inc.
+# Hungarian translation for atomix.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
# This file is distributed under the same license as the atomix package.
#
# Andras Timar <timar at gnome dot hu>, 2002.
# Laszlo Dvornik <dvornikl at mailbox dot hu>, 2004.
# Gabor Kelemen <kelemeng at gnome dot hu>, 2006, 2007. 2010.
-# Balázs Úr <urbalazs at gmail dot com>, 2015.
-# Balázs Úr <urbalazs at gmail.com>, 2016.
+# Balázs Úr <urbalazs at gmail dot com>, 2015, 2016.
msgid ""
msgstr ""
"Project-Id-Version: atomix master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=atomix&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-12-26 18:13+0000\n"
-"PO-Revision-Date: 2016-03-04 22:01+0100\n"
+"POT-Creation-Date: 2016-08-13 10:04+0000\n"
+"PO-Revision-Date: 2016-08-19 20:48+0200\n"
"Last-Translator: Balázs Úr <urbalazs at gmail.com>\n"
"Language-Team: Hungarian <openscope at gmail dot com>\n"
-"Language: \n"
+"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -209,60 +208,55 @@ msgid "Statistics"
msgstr "Statisztika"
#: ../data/ui/interface.ui.h:20
-#| msgid "_New Game"
msgid "New Game"
msgstr "Új játék"
#: ../data/ui/interface.ui.h:21
-#| msgid "_End Game"
msgid "End Game"
msgstr "Játék befejezése"
#: ../data/ui/interface.ui.h:22
-#| msgid "_Skip Level"
msgid "Skip Level"
msgstr "Szint kihagyása"
#: ../data/ui/interface.ui.h:23
-#| msgid "_Reset Level"
msgid "Reset Level"
msgstr "Szint visszaállítása"
#: ../data/ui/interface.ui.h:24
-#| msgid "_Undo Move"
msgid "Undo Move"
msgstr "Mozgatás visszavonása"
#: ../data/ui/interface.ui.h:25
-#| msgid "_Pause Game"
msgid "Pause Game"
msgstr "Játék szüneteltetése"
#: ../data/ui/interface.ui.h:26
-#| msgid "_Continue Game"
msgid "Continue Game"
msgstr "Játék folytatása"
#: ../data/ui/interface.ui.h:27
-#| msgid "_About"
msgid "About"
msgstr "Névjegy"
#: ../data/ui/interface.ui.h:28
-#| msgid "_Quit"
msgid "Quit"
msgstr "Kilépés"
#: ../src/board-gtk.c:338
+#| msgid ""
+#| "Guide the atoms through the maze to form molecules.\n"
+#| "Click, or use the arrow keys and Enter, to select an atom and move it.\n"
+#| "Be careful, though: an atom keeps moving until it hits a wall.\n"
msgid ""
-"Guide the atoms through the maze to form molecules.\n"
-"Click, or use the arrow keys and Enter, to select an atom and move it.\n"
-"Be careful, though: an atom keeps moving until it hits a wall.\n"
+"Guide the atoms through the maze to form molecules. Click, or use the arrow "
+"keys and Enter, to select an atom and move it. Be careful, though: an atom "
+"keeps moving until it hits a wall."
msgstr ""
-"Vezesd át az atomokat a labirintuson molekulák kialakításához.\n"
-"Egy atom kiválasztásához és mozgatásához kattints, vagy használd a nyíl és az "
-"Enter billentyűket.\n"
-"Légy óvatos, ugyanis egy atom addig mozog, amíg falnak nem ütközik.\n"
+"Vezesd át az atomokat a labirintuson molekulák kialakításához. Egy atom "
+"kiválasztásához és mozgatásához kattints, vagy használd a nyíl és "
+"az Enter billentyűket. Légy óvatos, ugyanis egy atom addig mozog, amíg falnak "
+"nem ütközik."
#: ../src/level-manager.c:200
msgid "Couldn't find level sequence description."
@@ -283,7 +277,8 @@ msgstr ""
"Dvornik László <dvornik at gnome.hu>\n"
"Kelemen Gábor <kelemeng at gnome.hu>\n"
"Nyitrai István <sianis at gmail.com>\n"
-"Tímár András <timar at gnome.hu>"
+"Tímár András <timar at gnome.hu>\n"
+"Úr Balázs <urbalazs at gmail.com>"
#: ../src/main.c:438
msgid "Congratulations! You have finished all Atomix levels."
@@ -298,32 +293,3 @@ msgstr "Nincs téma."
msgid "Found theme '%s' in: %s"
msgstr "\"%s\" téma megtalálható ebben: %s"
-#~ msgid "Could not show link"
-#~ msgstr "Nem lehet megjeleníteni a hivatkozást"
-
-#~ msgid "Time"
-#~ msgstr "Idő"
-
-#~ msgid "Score"
-#~ msgstr "Pontszám"
-
-#~ msgid "%dm %ds"
-#~ msgstr "%dp %ds"
-
-#~ msgid "Name"
-#~ msgstr "Név"
-
-#~ msgid "Error"
-#~ msgstr "Hiba"
-
-#~ msgid "Couldn't find at least one level."
-#~ msgstr "Nincs egy szint sem."
-
-#~ msgid "Do you want to finish the game?"
-#~ msgstr "Befejezi a játékot?"
-
-#~ msgid "_Game"
-#~ msgstr "_Játék"
-
-#~ msgid "_Scores..."
-#~ msgstr "_Pontszámok…"
diff --git a/po/id.po b/po/id.po
index 34bc66b..4d38975 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,249 +6,277 @@
msgid ""
msgstr ""
"Project-Id-Version: atomix master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=atomix&component=general\n"
-"POT-Creation-Date: 2010-12-13 20:12+0000\n"
-"PO-Revision-Date: 2011-01-21 10:37+0700\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=atomix&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-05-19 14:59+0000\n"
+"PO-Revision-Date: 2016-07-07 14:16+0700\n"
"Last-Translator: Andika Triwidada <andika at gmail.com>\n"
"Language-Team: GNOME Indonesian Translation Team <gnome at i15n.org>\n"
+"Language: id\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Indonesian\n"
-"X-Poedit-Country: Indonesia\n"
"X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: Poedit 1.8.8\n"
-#: ../level/aceticacid.atomix.xml.h:1
+#: ../data/atomix.appdata.xml.in.h:1 ../data/atomix.desktop.in.h:1
+#: ../data/ui/interface.ui.h:1 ../src/main.c:128 ../src/main.c:669
+msgid "Atomix"
+msgstr "Atomix"
+
+#: ../data/atomix.appdata.xml.in.h:2
+msgid "Build molecules out of single atoms"
+msgstr "Bangun molekul dari atom-atom tunggal"
+
+#: ../data/atomix.appdata.xml.in.h:3
+msgid ""
+"Atomix is a puzzle game where your goal is to assemble molecules from "
+"compound atoms by moving them on the playfield. However, atoms don't just "
+"move wherever you want to move them to, they slide until they hit either a "
+"wall or another atom."
+msgstr ""
+"Atomix adalah permainan teka-teki dimana sasaran Anda adalah merakit molekul "
+"dari atom kompon dengen memindah mereka pada bidang permainan. Namun atom-"
+"atom tidak sekedar bergerak ke manapun Anda mau memindah mereka, mereka "
+"meluncur sampai menabrak tembok atau atom lain."
+
+#: ../data/atomix.appdata.xml.in.h:4
+msgid ""
+"Try to build the molecules as fast as you can on each level to earn a higher "
+"score."
+msgstr ""
+"Cobalah membangun molekul secepat mungkin pada setiap tingkat untuk "
+"mendapatkan skor lebih tinggi."
+
+#: ../data/atomix.desktop.in.h:2
+msgid "Molecule puzzle game"
+msgstr "Permainan teka-teki molekul"
+
+#: ../data/atomix.desktop.in.h:3 ../src/main.c:131
+msgid "A puzzle game about atoms and molecules"
+msgstr "Teka-teki tentang atom dan molekul"
+
+#: ../data/level/aceticacid.atomix.xml.h:1
msgid "Acetic Acid"
msgstr "Asam Asetat"
-#: ../level/acetone.atomix.xml.h:1
+#: ../data/level/acetone.atomix.xml.h:1
msgid "Acetone"
msgstr "Aseton"
-#: ../level/butanol.atomix.xml.h:1
+#: ../data/level/butanol.atomix.xml.h:1
msgid "Butanol"
msgstr "Butanol"
-#: ../level/cyclobutane.atomix.xml.h:1
+#: ../data/level/cyclobutane.atomix.xml.h:1
msgid "Cyclobutane"
msgstr "Siklobutana"
-#: ../level/dimethylether.atomix.xml.h:1
+#: ../data/level/dimethylether.atomix.xml.h:1
msgid "Dimethyl Ether"
msgstr "Dimetil Eter"
-#: ../level/ethanal.atomix.xml.h:1
+#: ../data/level/ethanal.atomix.xml.h:1
msgid "Ethanal"
msgstr "Etanal"
-#: ../level/ethane.atomix.xml.h:1
+#: ../data/level/ethane.atomix.xml.h:1
msgid "Ethane"
msgstr "Etana"
-#: ../level/ethanol.atomix.xml.h:1
+#: ../data/level/ethanol.atomix.xml.h:1
msgid "Ethanol"
msgstr "Etanol"
-#: ../level/ethylene.atomix.xml.h:1
+#: ../data/level/ethylene.atomix.xml.h:1
msgid "Ethylene"
msgstr "Etilen"
-#: ../level/glycerin.atomix.xml.h:1
+#: ../data/level/glycerin.atomix.xml.h:1
msgid "Glycerin"
msgstr "Gliserin"
-#: ../level/lactic-acid.atomix.xml.h:1
+#: ../data/level/lactic-acid.atomix.xml.h:1
msgid "Lactic Acid"
msgstr "Asam Laktat"
-#: ../level/methanal.atomix.xml.h:1
+#: ../data/level/methanal.atomix.xml.h:1
msgid "Methanal"
msgstr "Metanal"
-#: ../level/methane.atomix.xml.h:1
+#: ../data/level/methane.atomix.xml.h:1
msgid "Methane"
msgstr "Metana"
-#: ../level/methanol.atomix.xml.h:1
+#: ../data/level/methanol.atomix.xml.h:1
msgid "Methanol"
msgstr "Metanol"
-#: ../level/propanal.atomix.xml.h:1
+#: ../data/level/propanal.atomix.xml.h:1
msgid "Propanal"
msgstr "Propanal"
-#: ../level/propylene.atomix.xml.h:1
+#: ../data/level/propylene.atomix.xml.h:1
msgid "Propylene"
msgstr "Propilen"
-#: ../level/pyran.atomix.xml.h:1
+#: ../data/level/pyran.atomix.xml.h:1
msgid "Pyran"
msgstr "Pyran"
-#: ../level/transbutylen.atomix.xml.h:1
+#: ../data/level/transbutylen.atomix.xml.h:1
msgid "Trans Butylen"
msgstr "Trans Butilen"
-#: ../level/water.atomix.xml.h:1
+#: ../data/level/water.atomix.xml.h:1
msgid "Water"
msgstr "Air"
-#: ../src/games-runtime.c:273
-msgid "Could not show link"
-msgstr "Tak bisa menampilkan taut"
+#: ../data/ui/interface.ui.h:2
+msgid "_File"
+msgstr "_Berkas"
-#: ../src/games-scores-dialog.c:113
-#| msgid "Time:"
-msgid "Time"
-msgstr "Waktu"
+#: ../data/ui/interface.ui.h:3
+msgid "_New Game"
+msgstr "Permai_nan Baru"
-#. Note that this assumes the default style is plain.
-#: ../src/games-scores-dialog.c:118
-#: ../src/games-scores-dialog.c:545
-#| msgid "Score:"
-msgid "Score"
-msgstr "Nilai"
+#: ../data/ui/interface.ui.h:4
+msgid "_End Game"
+msgstr "Akhiri P_ermainan"
-#. Translators: this is for a minutes, seconds time display.
-#: ../src/games-scores-dialog.c:276
-#, c-format
-msgid "%dm %ds"
-msgstr "%dm %dd"
+#: ../data/ui/interface.ui.h:5
+msgid "_Skip Level"
+msgstr "_Lewati Tingkat"
-#: ../src/games-scores-dialog.c:437
-#: ../src/main.c:736
-#| msgid "_New Game"
-msgid "New Game"
-msgstr "Permainan Baru"
+#: ../data/ui/interface.ui.h:6
+msgid "_Reset Level"
+msgstr "_Reset Tingkat"
-#: ../src/games-scores-dialog.c:537
-#| msgid "_Game"
-msgid "Name"
-msgstr "Nama"
+#: ../data/ui/interface.ui.h:7
+msgid "_Undo Move"
+msgstr "_Tak Jadi Memindahkan"
-#. Empty title shows up as "<unnamed>" on maemo
-#: ../src/games-show.c:151
-msgid "Error"
-msgstr "Galat"
-
-#: ../src/level-manager.c:176
-msgid "Couldn't find level sequence description."
-msgstr "Tak temukan keterangan urutan tingkat."
-
-#: ../src/level-manager.c:190
-msgid "No level found."
-msgstr "Tingkat tak ditemukan."
-
-#: ../src/level-manager.c:286
-#, c-format
-msgid "Found level '%s' in: %s"
-msgstr "Menemukan tingkat '%s' dalam: %s"
-
-#: ../src/main.c:121
-#: ../src/main.c:775
-#: ../src/main.c:832
-#: ../atomix.desktop.in.h:1
-msgid "Atomix"
-msgstr "Atomix"
-
-#: ../src/main.c:166
-msgid "A puzzle game about atoms and molecules"
-msgstr "Teka-teki tentang atom dan molekul"
-
-#: ../src/main.c:170
-msgid "translator-credits"
-msgstr "Andika Triwidada <andika at gmail.com>, 2009, 2011"
+#: ../data/ui/interface.ui.h:8
+msgid "_Pause Game"
+msgstr "_Jeda Permainan"
-#: ../src/main.c:493
-msgid "Congratulations! You have finished all Atomix levels."
-msgstr "Selamat! Anda telah menyelesaikan semua tingkat Atomix."
+#: ../data/ui/interface.ui.h:9
+msgid "_Continue Game"
+msgstr "_Lanjutkan Permainan"
-#: ../src/main.c:503
-msgid "Couldn't find at least one level."
-msgstr "Tak temukan paling tidak satu tingkat."
+#: ../data/ui/interface.ui.h:10
+msgid "_Quit"
+msgstr "_Keluar"
-#: ../src/main.c:508
-msgid "Do you want to finish the game?"
-msgstr "Anda ingin mengakhiri permainan?"
+#: ../data/ui/interface.ui.h:11
+msgid "_Help"
+msgstr "_Bantuan"
-#. create statistics frame
-#: ../src/main.c:701
-msgid "Statistics"
-msgstr "Statistik"
+#: ../data/ui/interface.ui.h:12
+msgid "_About"
+msgstr "Ihw_al"
-#: ../src/main.c:707
+#: ../data/ui/interface.ui.h:13
msgid "Level:"
msgstr "Tingkat:"
-#: ../src/main.c:708
+#: ../data/ui/interface.ui.h:14
msgid "Molecule:"
msgstr "Molekul:"
-#: ../src/main.c:709
+#: ../data/ui/interface.ui.h:15
msgid "Formula:"
msgstr "Rumus:"
-#: ../src/main.c:710
+#: ../data/ui/interface.ui.h:16
msgid "Score:"
msgstr "Nilai:"
-#: ../src/main.c:711
+#: ../data/ui/interface.ui.h:17
msgid "Time:"
msgstr "Waktu:"
-#: ../src/main.c:734
-msgid "_Game"
-msgstr "_Permainan"
+#: ../data/ui/interface.ui.h:18
+msgid "empty"
+msgstr "kosong"
-#: ../src/main.c:735
-msgid "_Help"
-msgstr "_Bantuan"
+#: ../data/ui/interface.ui.h:19
+msgid "Statistics"
+msgstr "Statistik"
-#: ../src/main.c:737
-#| msgid "_End Game"
+#: ../data/ui/interface.ui.h:20
+msgid "New Game"
+msgstr "Permainan Baru"
+
+#: ../data/ui/interface.ui.h:21
msgid "End Game"
msgstr "Akhiri Permainan"
-#: ../src/main.c:738
-#| msgid "Skip _level"
+#: ../data/ui/interface.ui.h:22
msgid "Skip Level"
msgstr "Lewati Tingkat"
-#: ../src/main.c:739
-#| msgid "Reset level"
+#: ../data/ui/interface.ui.h:23
msgid "Reset Level"
msgstr "Tata Ulang Tingkat"
-#: ../src/main.c:741
-#| msgid "_Pause game"
-msgid "_Pause Game"
-msgstr "_Jeda Permainan"
+#: ../data/ui/interface.ui.h:24
+msgid "Undo Move"
+msgstr "Batalkan Langkah"
-#: ../src/main.c:742
-#| msgid "_Continue game"
-msgid "_Continue Game"
-msgstr "_Lanjutkan Permainan"
+#: ../data/ui/interface.ui.h:25
+msgid "Pause Game"
+msgstr "Jeda Bermain"
-#: ../src/main.c:743
-#| msgid "_Scores ..."
-msgid "_Scores..."
-msgstr "_Nilai..."
+#: ../data/ui/interface.ui.h:26
+msgid "Continue Game"
+msgstr "Lanjutkan Bermain"
-#: ../src/main.c:745
+#: ../data/ui/interface.ui.h:27
msgid "About"
msgstr "Tentang"
-#: ../src/theme-manager.c:136
+#: ../data/ui/interface.ui.h:28
+msgid "Quit"
+msgstr "Keluar"
+
+#: ../src/board-gtk.c:338
+msgid ""
+"Guide the atoms through the maze to form molecules.\n"
+"Click, or use the arrow keys and Enter, to select an atom and move it.\n"
+"Be careful, though: an atom keeps moving until it hits a wall.\n"
+msgstr ""
+"Pandu atom-atom melalui labirin untuk membentuk molekul.\n"
+"Klik atau gunakan tombol panah dan Enter untuk memilih sebuah atom dan "
+"menggerakkannya.\n"
+"Berhati-hatilah, sebuah atom terus bergerak sampai menabrak tembok.\n"
+
+#: ../src/level-manager.c:200
+msgid "Couldn't find level sequence description."
+msgstr "Tak temukan keterangan urutan tingkat."
+
+#: ../src/level-manager.c:214
+msgid "No level found."
+msgstr "Tingkat tak ditemukan."
+
+#: ../src/level-manager.c:283
+#, c-format
+msgid "Found level '%s' in: %s"
+msgstr "Menemukan tingkat '%s' dalam: %s"
+
+#: ../src/main.c:135
+msgid "translator-credits"
+msgstr "Andika Triwidada <andika at gmail.com>, 2009, 2011, 2016"
+
+#: ../src/main.c:438
+msgid "Congratulations! You have finished all Atomix levels."
+msgstr "Selamat! Anda telah menyelesaikan semua tingkat Atomix."
+
+#: ../src/theme-manager.c:225
msgid "No themes found."
msgstr "Tak temukan tema."
-#: ../src/theme-manager.c:194
+#: ../src/theme-manager.c:283
#, c-format
msgid "Found theme '%s' in: %s"
msgstr "Menemukan tema '%s' dalam: %s"
-
-#: ../atomix.desktop.in.h:2
-msgid "Molecule puzzle game"
-msgstr "Permainan teka-teki molekul"
-
diff --git a/po/is.po b/po/is.po
index 4c07915..41f4c12 100644
--- a/po/is.po
+++ b/po/is.po
@@ -12,6 +12,7 @@ msgstr ""
"PO-Revision-Date: 2004-05-12 21:45-0000\n"
"Last-Translator: Samuel Jon Gunnarsson <sammi at techattack.nu>\n"
"Language-Team: Icelandic <gnome at techattack.nu>\n"
+"Language: is\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/it.po b/po/it.po
index 8d4ccba..2c2f19b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,6 +9,7 @@ msgstr ""
"PO-Revision-Date: 2007-01-08 22:07+0100\n"
"Last-Translator: Paolo Sammicheli <xdatap1 at siena.linux.it>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ja.po b/po/ja.po
index e20782d..7829413 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,6 +10,7 @@ msgstr ""
"PO-Revision-Date: 2006-01-08 17:30+0900\n"
"Last-Translator: Takeshi Aihana <aihana at gnome.gr.jp>\n"
"Language-Team: Japanese <translation at gnome.gr.jp>\n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ka.po b/po/ka.po
index cd12045..5fddc26 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -11,6 +11,7 @@ msgstr ""
"PO-Revision-Date: 2006-02-22 04:01+0100\n"
"Last-Translator: Gia Shervashidze <giasher at telenet.ge>\n"
"Language-Team: Georgian <www.gia.ge>\n"
+"Language: ka\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/kn.po b/po/kn.po
index ad2da4a..2ebe50e 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -10,6 +10,7 @@ msgstr ""
"PO-Revision-Date: 2002-12-17 11:56+0530\n"
"Last-Translator: Pramod <rpramod at postmaster.co.uk>\n"
"Language-Team: Kannada <LL at li.org>\n"
+"Language: kn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ko.po b/po/ko.po
index d49145b..ee1e49b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -9,6 +9,7 @@ msgstr ""
"PO-Revision-Date: 2003-05-20 23:01+0900\n"
"Last-Translator: Young Chol Song <nskystars_goo at yahoo.co.kr>\n"
"Language-Team: Korean <gnome-kr-translation at lists.sourceforge.net>\n"
+"Language: ko\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/lt.po b/po/lt.po
index 157b594..78352c5 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3,21 +3,24 @@
# This file is distributed under the same license as the atomix package.
# Žygimantas Beručka <zygis at gnome.org>, 2005.
# Mantas Kriaučiūnas <mantas at akl.lt>, 2015.
+# Aurimas Černius <aurisc4 at gmail.com>, 2016.
#
msgid ""
msgstr ""
"Project-Id-Version: atomix HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=atomix&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-01-07 22:07+0000\n"
-"PO-Revision-Date: 2016-01-08 02:33+0200\n"
-"Last-Translator: Mantas Kriaučiūnas <mantas at akl.lt>\n"
-"Language-Team: Lithuanian <komp_lt at konferencijos.lt>\n"
+"POT-Creation-Date: 2016-08-13 10:04+0000\n"
+"PO-Revision-Date: 2016-08-14 21:36+0300\n"
+"Last-Translator: Aurimas Černius <aurisc4 at gmail.com>\n"
+"Language-Team: Lietuvių <gnome-lt at lists.akl.lt>\n"
"Language: lt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Gtranslator 2.91.7\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"
#: ../data/atomix.appdata.xml.in.h:1 ../data/atomix.desktop.in.h:1
#: ../data/ui/interface.ui.h:1 ../src/main.c:128 ../src/main.c:669
@@ -240,15 +243,19 @@ msgid "Quit"
msgstr "Išeiti"
#: ../src/board-gtk.c:338
+#| msgid ""
+#| "Guide the atoms through the maze to form molecules.\n"
+#| "Click, or use the arrow keys and Enter, to select an atom and move it.\n"
+#| "Be careful, though: an atom keeps moving until it hits a wall.\n"
msgid ""
-"Guide the atoms through the maze to form molecules.\n"
-"Click, or use the arrow keys and Enter, to select an atom and move it.\n"
-"Be careful, though: an atom keeps moving until it hits a wall.\n"
+"Guide the atoms through the maze to form molecules. Click, or use the arrow "
+"keys and Enter, to select an atom and move it. Be careful, though: an atom "
+"keeps moving until it hits a wall."
msgstr ""
-"Lydėkite atomus per labirintą, kad suformuotumėte molekules.\n"
-"Spustelėkite arba naudokite krypties klavišus ir Įvedimo klavišą, kad "
-"pasirinktumėte atomą ir jį perkeltumėte.\n"
-"Tačiau būkite atsargūs: atomas juda tol, kol neatsiremia į sieną.\n"
+"Lydėkite atomus per labirintą, kad suformuotumėte molekules. Spustelėkite "
+"arba naudokite krypties klavišus ir įvedimo klavišą, kad pasirinktumėte "
+"atomą ir jį perkeltumėte. Tačiau būkite atsargūs: atomas juda tol, kol "
+"neatsiremia į sieną."
#: ../src/level-manager.c:200
msgid "Couldn't find level sequence description."
diff --git a/po/lv.po b/po/lv.po
index 2988f0a..fb96fcb 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -11,6 +11,7 @@ msgstr ""
"PO-Revision-Date: 2011-03-31 01:23+0300\n"
"Last-Translator: Rūdofls Mazurs <rudolfs.mazurs at gmail.com>\n"
"Language-Team: Latvian <ll10nt at ttc.lv>\n"
+"Language: lv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/mk.po b/po/mk.po
index 31eaca5..1ee090f 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -15,6 +15,7 @@ msgstr ""
"PO-Revision-Date: 2006-02-06 10:47+0100\n"
"Last-Translator: Arangel Angov <ufo at linux.net.mk>\n"
"Language-Team: Macedonian <ossm-members at hedona.on.net.mk>\n"
+"Language: mk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ml.po b/po/ml.po
index ca0951f..5f9540c 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -10,6 +10,7 @@ msgstr ""
"PO-Revision-Date: 2003-07-05 10:29+0530\n"
"Last-Translator: FSF-India <locale at gnu.org.in>\n"
"Language-Team: Malayalam <locale at gnu.org.in>\n"
+"Language: ml\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ms.po b/po/ms.po
index fc32389..fdb94cf 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -9,6 +9,7 @@ msgstr ""
"PO-Revision-Date: 2002-02-20 09:49+0800\n"
"Last-Translator: Hasbullah Bin Pit <sebol at ikhlas.com>\n"
"Language-Team: Bahasa Melayu <gabai-penyumbang at lists.sourceforge.net>\n"
+"Language: ms\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/nb.po b/po/nb.po
index d58ada6..6b67d9e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,6 +10,7 @@ msgstr ""
"PO-Revision-Date: 2006-01-23 11:22+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas at gnome.org>\n"
"Language-Team: Norwegian <i18n-nb at lister.ping.uio.no>\n"
+"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
diff --git a/po/nl.po b/po/nl.po
index c794fab..37c1b55 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,6 +11,7 @@ msgstr ""
"PO-Revision-Date: 2006-01-06 17:56+0100\n"
"Last-Translator: Tino Meinen <a.t.meinen at chello.nl>\n"
"Language-Team: Dutch <vertaling at nl.linux.org>\n"
+"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/oc.po b/po/oc.po
index 409d082..ce6c573 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -14,7 +14,7 @@ msgstr ""
"PO-Revision-Date: 2015-06-09 09:06+0200\n"
"Last-Translator: Cédric Valmary (Tot en Òc) <cvalmary at yahoo.fr>\n"
"Language-Team: www.totenoc.eu\n"
-"Language: fr\n"
+"Language: oc\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pa.po b/po/pa.po
index 22190dc..a43eb4f 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -11,6 +11,7 @@ msgstr ""
"PO-Revision-Date: 2005-11-20 20:26+0530\n"
"Last-Translator: Amanpreet Singh Alam <amanpreetalam at yahoo.com>\n"
"Language-Team: Punjabi <fedora-trans-pa at redhat.com>\n"
+"Language: pa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pl.po b/po/pl.po
index b6ee6a6..bc8bc97 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,28 +1,24 @@
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Aviary.pl
-# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz
-# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
-# gnomepl at aviary.pl
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# Polish translation for atomix.
+# Copyright © 2002-2016 the atomix authors.
+# This file is distributed under the same license as the atomix package.
# Zbigniew Chyla <zbigniew.chyla at gmail.com>, 2002.
-# Piotr Drąg <piotrdrag at gmail.com>, 2012-2015.
-# Aviary.pl <gnomepl at aviary.pl>, 2012-2015.
+# Piotr Drąg <piotrdrag at gmail.com>, 2012-2016.
+# Aviary.pl <community-poland at mozilla.org>, 2012-2016.
+#
msgid ""
msgstr ""
"Project-Id-Version: atomix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-28 01:01+0100\n"
-"PO-Revision-Date: 2015-12-28 01:02+0100\n"
+"POT-Creation-Date: 2016-08-16 09:57+0200\n"
+"PO-Revision-Date: 2016-08-16 09:58+0200\n"
"Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
-"Language-Team: Polish <gnomepl at aviary.pl>\n"
+"Language-Team: Polish <community-poland at mozilla.org>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-Language: Polish\n"
-"X-Poedit-Country: Poland\n"
#: ../data/atomix.appdata.xml.in.h:1 ../data/atomix.desktop.in.h:1
#: ../data/ui/interface.ui.h:1 ../src/main.c:128 ../src/main.c:669
@@ -31,7 +27,7 @@ msgstr "Atomix"
#: ../data/atomix.appdata.xml.in.h:2
msgid "Build molecules out of single atoms"
-msgstr "Budowanie cząsteczek z pojedynczych atomów"
+msgstr "Budowanie cząsteczek z pojedynczych atomów"
#: ../data/atomix.appdata.xml.in.h:3
msgid ""
@@ -40,9 +36,9 @@ msgid ""
"move wherever you want to move them to, they slide until they hit either a "
"wall or another atom."
msgstr ""
-"Atomix to gra logiczna, której celem jest złożenie cząsteczek z atomów przez "
-"przesuwanie ich na planszy. Jednakże, atomy nie przemieszczają się w dowolny "
-"sposób, tylko ślizgają się, aż uderzą w ścianę lub inny atom."
+"Atomix to gra logiczna, której celem jest złożenie cząsteczek z atomów przez "
+"przesuwanie ich na planszy. Jednakże, atomy nie przemieszczają się w dowolny "
+"sposób, tylko ślizgają się, aż uderzą w ścianę lub inny atom."
#: ../data/atomix.appdata.xml.in.h:4
msgid ""
@@ -54,11 +50,11 @@ msgstr ""
#: ../data/atomix.desktop.in.h:2
msgid "Molecule puzzle game"
-msgstr "Gra logiczna w układanie cząsteczek"
+msgstr "Gra logiczna w układanie cząsteczek"
#: ../data/atomix.desktop.in.h:3 ../src/main.c:131
msgid "A puzzle game about atoms and molecules"
-msgstr "Gra logiczna o atomach i cząsteczkach"
+msgstr "Gra logiczna o atomach i cząsteczkach"
#: ../data/level/aceticacid.atomix.xml.h:1
msgid "Acetic Acid"
@@ -238,7 +234,7 @@ msgstr "Kontynuuj grę"
#: ../data/ui/interface.ui.h:27
msgid "About"
-msgstr "O grze"
+msgstr "O grze"
#: ../data/ui/interface.ui.h:28
msgid "Quit"
@@ -246,13 +242,13 @@ msgstr "Zakończ"
#: ../src/board-gtk.c:338
msgid ""
-"Guide the atoms through the maze to form molecules.\n"
-"Click, or use the arrow keys and Enter, to select an atom and move it.\n"
-"Be careful, though: an atom keeps moving until it hits a wall.\n"
+"Guide the atoms through the maze to form molecules. Click, or use the arrow "
+"keys and Enter, to select an atom and move it. Be careful, though: an atom "
+"keeps moving until it hits a wall."
msgstr ""
-"Należy przeprowadzić atomy przez labirynt, aby stworzyć cząsteczki.\n"
-"Kliknięcie lub klawisze strzałek i Enter zaznaczają atom i go przenoszą.\n"
-"Należy zachować ostrożność: atomy zatrzymują się tylko na ścianach.\n"
+"Należy przeprowadzić atomy przez labirynt, aby stworzyć cząsteczki. "
+"Kliknięcie lub klawisze strzałek i Enter zaznaczają atom i go przenoszą. "
+"Należy zachować ostrożność: atomy zatrzymują się tylko na ścianach."
#: ../src/level-manager.c:200
msgid "Couldn't find level sequence description."
@@ -271,8 +267,8 @@ msgstr "Odnaleziono poziom „%s” w: %s"
msgid "translator-credits"
msgstr ""
"Zbigniew Chyla <zbigniew.chyla at gmail.com>, 2002\n"
-"Piotr Drąg <piotrdrag at gmail.com>, 2012-2015\n"
-"Aviary.pl <gnomepl at aviary.pl>, 2012-2015"
+"Piotr Drąg <piotrdrag at gmail.com>, 2012-2016\n"
+"Aviary.pl <community-poland at mozilla.org>, 2012-2016"
#: ../src/main.c:438
msgid "Congratulations! You have finished all Atomix levels."
diff --git a/po/pt.po b/po/pt.po
index 5171a99..d32723c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,25 +2,26 @@
# Copyright (C) 2001 Free Software Foundation, Inc.
# Duarte Loreto <happyguy_pt at hotmail.com>, 2001, 2002
# Pedro Albuquerque <palbuquerque73 at gmail.com>, 2015.
+# Tiago Santos <tiagofsantos81 at sapo.pt>, 2016.
#
msgid ""
msgstr ""
"Project-Id-Version: 2.0\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=atomix&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-12-05 03:58+0000\n"
-"PO-Revision-Date: 2015-12-05 08:05+0000\n"
-"Last-Translator: Pedro Albuquerque <palbuquerque73 at gmail.com>\n"
+"POT-Creation-Date: 2016-08-13 10:04+0000\n"
+"PO-Revision-Date: 2016-09-07 07:04+0100\n"
+"Last-Translator: Tiago Santos <tiagofsantos81 at sapo.pt>\n"
"Language-Team: Português <palbuquerque73 at gmail.com>\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\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\\n;\n"
+"X-Generator: Poedit 1.8.7.1\n"
#: ../data/atomix.appdata.xml.in.h:1 ../data/atomix.desktop.in.h:1
-#: ../data/ui/interface.ui.h:1 ../src/main.c:127 ../src/main.c:684
+#: ../data/ui/interface.ui.h:1 ../src/main.c:128 ../src/main.c:669
msgid "Atomix"
msgstr "Atomix"
@@ -52,7 +53,7 @@ msgstr ""
msgid "Molecule puzzle game"
msgstr "Jogo de estratégia molecular"
-#: ../data/atomix.desktop.in.h:3 ../src/main.c:129
+#: ../data/atomix.desktop.in.h:3 ../src/main.c:131
msgid "A puzzle game about atoms and molecules"
msgstr "Um jogo de estratégia sobre átomos e moléculas"
@@ -204,15 +205,51 @@ msgstr "vazio"
msgid "Statistics"
msgstr "Estatísticas"
+#: ../data/ui/interface.ui.h:20
+msgid "New Game"
+msgstr "Novo jogo"
+
+#: ../data/ui/interface.ui.h:21
+msgid "End Game"
+msgstr "Terminar jogo"
+
+#: ../data/ui/interface.ui.h:22
+msgid "Skip Level"
+msgstr "Saltar nível"
+
+#: ../data/ui/interface.ui.h:23
+msgid "Reset Level"
+msgstr "Repor nível"
+
+#: ../data/ui/interface.ui.h:24
+msgid "Undo Move"
+msgstr "Desfazer jogada"
+
+#: ../data/ui/interface.ui.h:25
+msgid "Pause Game"
+msgstr "Pausar jogo"
+
+#: ../data/ui/interface.ui.h:26
+msgid "Continue Game"
+msgstr "Continuar jogo"
+
+#: ../data/ui/interface.ui.h:27
+msgid "About"
+msgstr "Sobre"
+
+#: ../data/ui/interface.ui.h:28
+msgid "Quit"
+msgstr "Sair"
+
#: ../src/board-gtk.c:338
msgid ""
-"Guide the atoms through the maze to form molecules.\n"
-"Click, or use the arrow keys and Enter, to select an atom and move it.\n"
-"Be careful, though: an atom keeps moving until it hits a wall.\n"
+"Guide the atoms through the maze to form molecules. Click, or use the arrow "
+"keys and Enter, to select an atom and move it. Be careful, though: an atom "
+"keeps moving until it hits a wall."
msgstr ""
-"Guie os átomos através do labirinto para formar moléculas.\n"
-"Clique ou use as setas e Enter para selecionar um átomo e movê-lo.\n"
-"Tenha cuidado, um átomo mantén-se em movimento até bater numa parede.\n"
+"Guie os átomos através do labirinto para formar moléculas. Clique ou use as "
+"setas e Enter para selecionar um átomo e movê-lo. Mas tenha cuidado, um "
+"átomo mantém-se em movimento até bater numa parede."
#: ../src/level-manager.c:200
msgid "Couldn't find level sequence description."
@@ -227,11 +264,13 @@ msgstr "Nenhum nível encontrado."
msgid "Found level '%s' in: %s"
msgstr "Encontrado o nível \"%s\" em: %s"
-#: ../src/main.c:133
+#: ../src/main.c:135
msgid "translator-credits"
-msgstr "Pedro Albuquerque <palbuquerque73 at gmail.com>"
+msgstr ""
+"Pedro Albuquerque <palbuquerque73 at gmail.com>Tiago Santos "
+"<tiagofsantos81 at sapo.pt>"
-#: ../src/main.c:440
+#: ../src/main.c:438
msgid "Congratulations! You have finished all Atomix levels."
msgstr "Parabéns! Terminou todos os níveis do Atomix."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6b39aa5..b09dd49 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,24 +1,25 @@
# Brazilian Portuguese translation of Atomix.
# This file is distributed under the same license as the Atomix package.
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Copyright (C) 2016 Free Software Foundation, Inc.
# Estêvão Samuel Procópio <tevaum at ig.com.br>, 2005.
# Guilherme de S. Pastore <gpastore at gnome.org>, 2005.
-# Rafael Ferreira <rafael.f.f1 at gmail.com>, 2015.
-#
+# Rafael Fontenelle <rafaelff at gnome.org>, 2015, 2016.
msgid ""
msgstr ""
"Project-Id-Version: atomix\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=atomix&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-12-26 18:13+0000\n"
-"PO-Revision-Date: 2016-02-24 06:38-0300\n"
-"Last-Translator: Rafael Fontenelle <rffontenelle at gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=atomix&"
+"keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-08-10 03:06+0000\n"
+"PO-Revision-Date: 2016-08-11 02:10-0200\n"
+"Last-Translator: Rafael Fontenelle <rafaelff at gnome.org>\n"
"Language-Team: Brazilian Portuguese <gnome-pt_br-list at gnome.org>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Project-Style: gnome\n"
#: ../data/atomix.appdata.xml.in.h:1 ../data/atomix.desktop.in.h:1
#: ../data/ui/interface.ui.h:1 ../src/main.c:128 ../src/main.c:669
@@ -242,15 +243,18 @@ msgid "Quit"
msgstr "Sair"
#: ../src/board-gtk.c:338
+#| msgid ""
+#| "Guide the atoms through the maze to form molecules.\n"
+#| "Click, or use the arrow keys and Enter, to select an atom and move it.\n"
+#| "Be careful, though: an atom keeps moving until it hits a wall.\n"
msgid ""
-"Guide the atoms through the maze to form molecules.\n"
-"Click, or use the arrow keys and Enter, to select an atom and move it.\n"
-"Be careful, though: an atom keeps moving until it hits a wall.\n"
+"Guide the atoms through the maze to form molecules. Click, or use the arrow "
+"keys and Enter, to select an atom and move it. Be careful, though: an atom "
+"keeps moving until it hits a wall."
msgstr ""
-"Guie os átomos pelo quebra-cabeça para formar moléculas.\n"
-"Clique, ou use as teclas de setas e Enter, para selecionar um átomo e movê-"
-"lo.\n"
-"Porém, tenha cuidado: um átomo continua a se mover até acertar a parede.\n"
+"Guie os átomos pelo quebra-cabeça para formar moléculas. Clique, ou use as "
+"teclas de setas e Enter, para selecionar um átomo e movê-lo. Porém, tenha "
+"cuidado: um átomo continua a se mover até acertar a parede."
#: ../src/level-manager.c:200
msgid "Couldn't find level sequence description."
@@ -270,7 +274,7 @@ msgid "translator-credits"
msgstr ""
"Estêvão Samuel Procópio <tevaum at ig.com.br>\n"
"Guilherme de S. Pastore <gpastore at gnome.org>\n"
-"Rafael Fontenelle <rffontenelle at gmail.com>"
+"Rafael Fontenelle <rafaelff at gnome.org>"
#: ../src/main.c:438
msgid "Congratulations! You have finished all Atomix levels."
diff --git a/po/sl.po b/po/sl.po
index 5ab2c7a..ead013a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -13,7 +13,7 @@ msgstr ""
"PO-Revision-Date: 2010-12-17 20:08+0100\n"
"Last-Translator: Matej Urbančič <mateju at svn.gnome.org>\n"
"Language-Team: Slovenian GNOME Translation Team <gnome-si at googlegroups.com>\n"
-"Language: \n"
+"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/sq.po b/po/sq.po
index 90b657a..ba2d3c1 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -11,6 +11,7 @@ msgstr ""
"PO-Revision-Date: 2006-01-30 17:42+0100\n"
"Last-Translator: Laurent Dhima <laurenti at alblinux.net>\n"
"Language-Team: Albanian <gnome-albanian-perkthyesit at lists.sourceforge.net>\n"
+"Language: sq\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/sr.po b/po/sr.po
index 8e3dfa2..5061c33 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,15 +1,15 @@
# Serbian translation of atomix
-# Courtesy of Prevod.org team (http://www.prevod.org/) -- 2003—2015
+# Courtesy of Prevod.org team (http://www.prevod.org/) -- 2003—2016
# This file is distributed under the same license as the atomix package.
# Александар Урошевић <urke at gmx.net>, 2003—2006
-# Мирослав Николић <miroslavnikolic at rocketmail.com>, 2011—2015.
+# Мирослав Николић <miroslavnikolic at rocketmail.com>, 2011—2016.
msgid ""
msgstr ""
"Project-Id-Version: atomix\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=atomix&"
"keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-12-26 18:13+0000\n"
-"PO-Revision-Date: 2015-12-28 11:45+0200\n"
+"POT-Creation-Date: 2016-08-13 10:04+0000\n"
+"PO-Revision-Date: 2016-08-20 22:50+0200\n"
"Last-Translator: Мирослав Николић <miroslavnikolic at rocketmail.com>\n"
"Language-Team: Serbian <gnom at prevod.org>\n"
"Language: sr\n"
@@ -138,27 +138,22 @@ msgid "_File"
msgstr "_Датотека"
#: ../data/ui/interface.ui.h:3
-#| msgid "New Game"
msgid "_New Game"
msgstr "_Нова игра"
#: ../data/ui/interface.ui.h:4
-#| msgid "End Game"
msgid "_End Game"
msgstr "_Крај игре"
#: ../data/ui/interface.ui.h:5
-#| msgid "Skip Level"
msgid "_Skip Level"
msgstr "Прескочи _ниво"
#: ../data/ui/interface.ui.h:6
-#| msgid "Reset Level"
msgid "_Reset Level"
msgstr "_Поново постави ниво"
#: ../data/ui/interface.ui.h:7
-#| msgid "_Undo move"
msgid "_Undo Move"
msgstr "_Опозови потез"
@@ -179,7 +174,6 @@ msgid "_Help"
msgstr "По_моћ"
#: ../data/ui/interface.ui.h:12
-#| msgid "About"
msgid "_About"
msgstr "_О игри"
@@ -228,17 +222,14 @@ msgid "Reset Level"
msgstr "Поново постави ниво"
#: ../data/ui/interface.ui.h:24
-#| msgid "_Undo move"
msgid "Undo Move"
msgstr "Опозови потез"
#: ../data/ui/interface.ui.h:25
-#| msgid "_Pause Game"
msgid "Pause Game"
msgstr "Паузирај игру"
#: ../data/ui/interface.ui.h:26
-#| msgid "_Continue Game"
msgid "Continue Game"
msgstr "Настави игру"
@@ -251,15 +242,19 @@ msgid "Quit"
msgstr "Изађи"
#: ../src/board-gtk.c:338
+#| msgid ""
+#| "Guide the atoms through the maze to form molecules.\n"
+#| "Click, or use the arrow keys and Enter, to select an atom and move it.\n"
+#| "Be careful, though: an atom keeps moving until it hits a wall.\n"
msgid ""
-"Guide the atoms through the maze to form molecules.\n"
-"Click, or use the arrow keys and Enter, to select an atom and move it.\n"
-"Be careful, though: an atom keeps moving until it hits a wall.\n"
+"Guide the atoms through the maze to form molecules. Click, or use the arrow "
+"keys and Enter, to select an atom and move it. Be careful, though: an atom "
+"keeps moving until it hits a wall."
msgstr ""
-"Водите атоме кроз гомилу како би створили молекуле.\n"
-"Притисните тастер миша, или користите тастере стрелица и Унеси, да изаберете "
-"атом и да га преместите.\n"
-"Будите пажљиви, јер: атом наставља да се креће све док не лупи о зид.\n"
+"Водите атоме кроз гомилу како би створили молекуле. Притисните тастер миша, "
+"или користите тастере стрелица и Унеси, да изаберете атом и да га "
+"преместите. Будите пажљиви, јер: атом наставља да се креће све док не лупи о "
+"зид."
#: ../src/level-manager.c:200
msgid "Couldn't find level sequence description."
diff --git a/po/sr at latin.po b/po/sr at latin.po
index d9b98af..8f2c08f 100644
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@ -1,15 +1,15 @@
# Serbian translation of atomix
-# Courtesy of Prevod.org team (http://www.prevod.org/) -- 2003—2015
+# Courtesy of Prevod.org team (http://www.prevod.org/) -- 2003—2016
# This file is distributed under the same license as the atomix package.
# Aleksandar Urošević <urke at gmx.net>, 2003—2006
-# Miroslav Nikolić <miroslavnikolic at rocketmail.com>, 2011—2015.
+# Miroslav Nikolić <miroslavnikolic at rocketmail.com>, 2011—2016.
msgid ""
msgstr ""
"Project-Id-Version: atomix\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=atomix&"
"keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-12-26 18:13+0000\n"
-"PO-Revision-Date: 2015-12-28 11:45+0200\n"
+"POT-Creation-Date: 2016-08-13 10:04+0000\n"
+"PO-Revision-Date: 2016-08-20 22:50+0200\n"
"Last-Translator: Miroslav Nikolić <miroslavnikolic at rocketmail.com>\n"
"Language-Team: Serbian <gnom at prevod.org>\n"
"Language: sr\n"
@@ -138,27 +138,22 @@ msgid "_File"
msgstr "_Datoteka"
#: ../data/ui/interface.ui.h:3
-#| msgid "New Game"
msgid "_New Game"
msgstr "_Nova igra"
#: ../data/ui/interface.ui.h:4
-#| msgid "End Game"
msgid "_End Game"
msgstr "_Kraj igre"
#: ../data/ui/interface.ui.h:5
-#| msgid "Skip Level"
msgid "_Skip Level"
msgstr "Preskoči _nivo"
#: ../data/ui/interface.ui.h:6
-#| msgid "Reset Level"
msgid "_Reset Level"
msgstr "_Ponovo postavi nivo"
#: ../data/ui/interface.ui.h:7
-#| msgid "_Undo move"
msgid "_Undo Move"
msgstr "_Opozovi potez"
@@ -179,7 +174,6 @@ msgid "_Help"
msgstr "Po_moć"
#: ../data/ui/interface.ui.h:12
-#| msgid "About"
msgid "_About"
msgstr "_O igri"
@@ -228,17 +222,14 @@ msgid "Reset Level"
msgstr "Ponovo postavi nivo"
#: ../data/ui/interface.ui.h:24
-#| msgid "_Undo move"
msgid "Undo Move"
msgstr "Opozovi potez"
#: ../data/ui/interface.ui.h:25
-#| msgid "_Pause Game"
msgid "Pause Game"
msgstr "Pauziraj igru"
#: ../data/ui/interface.ui.h:26
-#| msgid "_Continue Game"
msgid "Continue Game"
msgstr "Nastavi igru"
@@ -251,15 +242,19 @@ msgid "Quit"
msgstr "Izađi"
#: ../src/board-gtk.c:338
+#| msgid ""
+#| "Guide the atoms through the maze to form molecules.\n"
+#| "Click, or use the arrow keys and Enter, to select an atom and move it.\n"
+#| "Be careful, though: an atom keeps moving until it hits a wall.\n"
msgid ""
-"Guide the atoms through the maze to form molecules.\n"
-"Click, or use the arrow keys and Enter, to select an atom and move it.\n"
-"Be careful, though: an atom keeps moving until it hits a wall.\n"
+"Guide the atoms through the maze to form molecules. Click, or use the arrow "
+"keys and Enter, to select an atom and move it. Be careful, though: an atom "
+"keeps moving until it hits a wall."
msgstr ""
-"Vodite atome kroz gomilu kako bi stvorili molekule.\n"
-"Pritisnite taster miša, ili koristite tastere strelica i Unesi, da izaberete "
-"atom i da ga premestite.\n"
-"Budite pažljivi, jer: atom nastavlja da se kreće sve dok ne lupi o zid.\n"
+"Vodite atome kroz gomilu kako bi stvorili molekule. Pritisnite taster miša, "
+"ili koristite tastere strelica i Unesi, da izaberete atom i da ga "
+"premestite. Budite pažljivi, jer: atom nastavlja da se kreće sve dok ne lupi o "
+"zid."
#: ../src/level-manager.c:200
msgid "Couldn't find level sequence description."
diff --git a/po/sv.po b/po/sv.po
index 6a2d5b9..92f2e99 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,15 +9,15 @@ msgstr ""
"Project-Id-Version: atomix\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=atomix&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-12-26 18:13+0000\n"
-"PO-Revision-Date: 2016-01-26 22:41+0100\n"
+"POT-Creation-Date: 2016-08-10 03:06+0000\n"
+"PO-Revision-Date: 2016-08-13 12:03+0200\n"
"Last-Translator: Anders Jonsson <anders.jonsson at norsjovallen.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 1.8.8\n"
#: ../data/atomix.appdata.xml.in.h:1 ../data/atomix.desktop.in.h:1
#: ../data/ui/interface.ui.h:1 ../src/main.c:128 ../src/main.c:669
@@ -244,14 +244,13 @@ msgstr "Avsluta"
#: ../src/board-gtk.c:338
msgid ""
-"Guide the atoms through the maze to form molecules.\n"
-"Click, or use the arrow keys and Enter, to select an atom and move it.\n"
-"Be careful, though: an atom keeps moving until it hits a wall.\n"
+"Guide the atoms through the maze to form molecules. Click, or use the arrow "
+"keys and Enter, to select an atom and move it. Be careful, though: an atom "
+"keeps moving until it hits a wall."
msgstr ""
-"Guida atomerna genom labyrinten för att bilda molekyler.\n"
-"Klicka, eller använd piltangenterna och Retur för att välja en atom och "
-"flytta den.\n"
-"Men var försiktig, atomer fortsätter röra sig till de träffar en vägg.\n"
+"Guida atomerna genom labyrinten för att bilda molekyler. Klicka, eller "
+"använd piltangenterna och Retur för att välja en atom och flytta den. Men "
+"var försiktig, atomer fortsätter röra sig till de träffar en vägg."
#: ../src/level-manager.c:200
msgid "Couldn't find level sequence description."
diff --git a/po/ta.po b/po/ta.po
index d92cc18..f91f238 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -10,6 +10,7 @@ msgstr ""
"PO-Revision-Date: 2002-11-03 05:31+0100\n"
"Last-Translator: Elango Sundaram <esundara at yahoo.com>\n"
"Language-Team: Tamil <tamilinix at yahoogroups.com>\n"
+"Language: ta\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/th.po b/po/th.po
index 6789d3d..ef0946d 100644
--- a/po/th.po
+++ b/po/th.po
@@ -12,6 +12,7 @@ msgstr ""
"PO-Revision-Date: 2007-01-11 00:06+0700\n"
"Last-Translator: Neutron Soutmun <neo.neutron at gmail.com>\n"
"Language-Team: Thai <l10n at opentle.org>\n"
+"Language: th\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/uk.po b/po/uk.po
index 2ecb36e..99d2ff7 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,6 +9,7 @@ msgstr ""
"PO-Revision-Date: 2002-02-28 09:27+0200\n"
"Last-Translator: Yuriy Syrota <yuri at renome.rovno.ua>\n"
"Language-Team: Ukrainian <uk at li.org>\n"
+"Language: uk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/vi.po b/po/vi.po
index 14f1bbb..4734a4c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -11,6 +11,7 @@ msgstr "Project-Id-Version: atomix HEAD\n"
"PO-Revision-Date: 2006-01-07 22:16+1030\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
"Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
+"Language: vi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/wa.po b/po/wa.po
index c47c517..01ae435 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -17,6 +17,7 @@ msgstr ""
"PO-Revision-Date: 2004-03-30 23:00+0200\n"
"Last-Translator: Pablo Saratxaga <pablo at walon.org>\n"
"Language-Team: Walloon <linux-wa at walon.org>\n"
+"Language: wa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ca6407c..c489846 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,6 +12,7 @@ msgstr ""
"PO-Revision-Date: 2010-07-22 23:48+0800\n"
"Last-Translator: Wang Li <charlesw1234 at 163.com>\n"
"Language-Team: zh_CN <i18n-translation at lists.linux.net.cn>\n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index b8a550d..81c5ba5 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -10,6 +10,7 @@ msgstr ""
"PO-Revision-Date: 2006-01-11 05:56+0800\n"
"Last-Translator: Abel Cheung <abel at oaka.org>\n"
"Language-Team: Chinese (Hong Kong) <community at linuxhall.org>\n"
+"Language: zh_HK\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b16cf79..908e1ef 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,6 +10,7 @@ msgstr ""
"PO-Revision-Date: 2006-01-11 05:55+0800\n"
"Last-Translator: Abel Cheung <abel at oaka.org>\n"
"Language-Team: Chinese (Taiwan) <community at linuxhall.org>\n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/Makefile.am b/src/Makefile.am
index 8e40ef8..9389e69 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,14 +2,20 @@
scoredir = $(localstatedir)/games
uidir = $(datadir)/gnome-2.0/ui
-INCLUDES = -I$(top_srcdir) \
- $(ATOMIX_CFLAGS) \
- $(WARN_CFLAGS) \
+AM_CPPFLAGS = \
+ -I$(top_srcdir) \
-DPKGDATADIR="\"$(pkgdatadir)\"" \
-DDATADIR=\""$(datadir)"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DSCORESDIR=\""$(scoredir)"\"
+AM_CFLAGS = \
+ $(ATOMIX_CFLAGS) \
+ $(WARN_CFLAGS)
+
+AM_LDFLAGS = \
+ $(WARN_LDFLAGS)
+
bin_PROGRAMS = atomix
noinst_PROGRAMS = pf-test
diff --git a/src/board-gtk.c b/src/board-gtk.c
index 3551d11..3013e95 100644
--- a/src/board-gtk.c
+++ b/src/board-gtk.c
@@ -86,7 +86,7 @@ static void render_tile (Tile *tile, gint row, gint col);
GtkWidget* create_tile (double x, double y, Tile *tile);
void move_item (GtkWidget *item, ItemDirection direc);
int move_item_anim (void *data);
-static GtkWidget *get_item_by_row_col (gint row, gint col);
+static GtkWidget *get_item_by_row_col (guint row, guint col);
static void selector_move_to (SelectorData *data, guint row, guint col);
static void selector_unselect (SelectorData *data);
@@ -99,7 +99,7 @@ static void selector_arrows_hide (SelectorData *data);
/* Function implementations */
-static GtkWidget *get_item_by_row_col (gint row, gint col)
+static GtkWidget *get_item_by_row_col (guint row, guint col)
{
gint width, height;
gint item_point_x, item_point_y;
@@ -167,10 +167,12 @@ void move_item (GtkWidget *item, ItemDirection direc)
case RIGHT:
tmp_col = tmp_col + 1;
break;
+ default:
+ break;
}
- if (tmp_row < 0 || tmp_row >= playfield_get_n_rows (board_sce) ||
- tmp_col < 0 || tmp_col >= playfield_get_n_cols (board_sce))
+ if (tmp_row >= playfield_get_n_rows (board_sce) ||
+ tmp_col >= playfield_get_n_cols (board_sce))
break;
tile = playfield_get_tile (board_sce, tmp_row, tmp_col);
@@ -220,7 +222,7 @@ void move_item (GtkWidget *item, ItemDirection direc)
}
int move_item_anim (void *data) {
- AnimData *anim_data = (AnimData *) data;
+ //AnimData *anim_data = (AnimData *) data;
gint x, y;
if (anim_data->counter > 0) {
@@ -325,7 +327,7 @@ static void create_logo (void)
theme_get_tile_size (board_theme, &tile_width, &tile_height);
pixbuf = gdk_pixbuf_new_from_file (DATADIR "/atomix/atomix-logo.png", NULL);
- level_items->logo = gtk_box_new (GTK_ORIENTATION_VERTICAL, 15);
+ level_items->logo = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
context = gtk_widget_get_style_context (level_items->logo);
provider = gtk_css_provider_new ();
@@ -335,9 +337,9 @@ static void create_logo (void)
gtk_widget_set_valign (logo_image, GTK_ALIGN_END);
gtk_box_pack_start (GTK_BOX (level_items->logo), logo_image, TRUE, TRUE, 12);
- tips_label = gtk_label_new (_("Guide the atoms through the maze to form molecules.\n"
- "Click, or use the arrow keys and Enter, to select an atom and move it.\n"
- "Be careful, though: an atom keeps moving until it hits a wall.\n"));
+ tips_label = gtk_label_new (_("Guide the atoms through the maze to form molecules. "
+ "Click, or use the arrow keys and Enter, to select an atom and move it. "
+ "Be careful, though: an atom keeps moving until it hits a wall."));
gtk_box_pack_start (GTK_BOX (level_items->logo), tips_label, TRUE, TRUE, 12);
gtk_widget_set_valign (tips_label, GTK_ALIGN_START);
gtk_widget_show_all (level_items->logo);
@@ -437,8 +439,8 @@ void board_gtk_init (Theme * theme, gpointer canvas)
selector_data = selector_create ();
}
-void board_gtk_render () {
- gint row, col;
+void board_gtk_render (void) {
+ guint row, col;
Tile *tile;
g_return_if_fail (board_theme != NULL);
@@ -477,35 +479,25 @@ void board_gtk_render () {
}
static void render_tile (Tile *tile, gint row, gint col) {
- gboolean create = FALSE;
TileType type;
gint x, y;
type = tile_get_tile_type (tile);
switch (type) {
case TILE_TYPE_ATOM:
- create = TRUE;
- break;
-
case TILE_TYPE_WALL:
- create = TRUE;
- break;
-
case TILE_TYPE_SHADOW:
- create = TRUE;
+ convert_to_canvas (board_theme, board_env, row, col, &x, &y);
+ create_tile (x, y, tile);
break;
case TILE_TYPE_UNKNOWN:
case TILE_TYPE_FLOOR:
+ case TILE_TYPE_NONE:
+ case TILE_TYPE_LAST:
default:
break;
}
-
-
- if (create) {
- convert_to_canvas (board_theme, board_env, row, col, &x, &y);
- create_tile (x, y, tile);
- }
}
static void show_sensitive (GtkWidget *widget)
@@ -764,7 +756,7 @@ gboolean board_gtk_handle_key_event (GObject * canvas, GdkEventKey * event,
gpointer data)
{
GtkWidget *item;
- gint new_row, new_col;
+ guint new_row, new_col;
Tile *tile;
g_return_val_if_fail (selector_data != NULL, FALSE);
@@ -805,7 +797,7 @@ gboolean board_gtk_handle_key_event (GObject * canvas, GdkEventKey * event,
selector_data->mouse_steering = FALSE;
if (!selector_data->selected) {
new_col--;
- if (new_col >= 0) {
+ if (new_col < playfield_get_n_cols (board_env)) {
selector_show (selector_data);
selector_move_to (selector_data, new_row, new_col);
}
@@ -833,7 +825,7 @@ gboolean board_gtk_handle_key_event (GObject * canvas, GdkEventKey * event,
selector_data->mouse_steering = FALSE;
if (!selector_data->selected) {
new_row--;
- if (new_row >= 0) {
+ if (new_row < playfield_get_n_rows (board_env)) {
selector_show (selector_data);
selector_move_to (selector_data, new_row, new_col);
}
@@ -906,7 +898,7 @@ static void check_for_arrow (gint r, gint c, GtkWidget *arrow) {
static void selector_arrows_show (SelectorData *data)
{
- gint r, c;
+ guint r, c;
if (board_sce == NULL)
{
@@ -916,7 +908,7 @@ static void selector_arrows_show (SelectorData *data)
r = data->row - 1;
c = data->col;
- if (r >= 0)
+// if (r >= 0)
check_for_arrow (r, c, data->arrow_top);
r = data->row;
@@ -934,7 +926,7 @@ static void selector_arrows_show (SelectorData *data)
r = data->row;
c = data->col - 1;
- if (c >= 0)
+// if (c >= 0)
check_for_arrow (r, c, data->arrow_left);
if (data->mouse_steering)
@@ -950,9 +942,9 @@ static void selector_arrows_show (SelectorData *data)
static void selector_select (SelectorData *data, GtkWidget *item)
{
- g_return_if_fail (data != NULL);
gint x, y;
+ g_return_if_fail (data != NULL);
gtk_container_child_get (GTK_CONTAINER(board_canvas), item, "x", &x, "y", &y, NULL);
data->selected = TRUE;
diff --git a/src/clock.c b/src/clock.c
index 895508a..346e430 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -51,8 +51,9 @@ GType clock_get_type (void)
static void clock_destroy (GtkWidget *object)
{
- g_return_if_fail (object != NULL);
Clock *clock = CLOCK (object);
+
+ g_return_if_fail (object != NULL);
clock_stop (clock);
GTK_WIDGET_CLASS (parent_class)->destroy (object);
@@ -98,7 +99,7 @@ static gint clock_timer_callback (gpointer data)
return TRUE;
}
-GtkWidget *clock_new ()
+GtkWidget *clock_new (void)
{
Clock *clock = CLOCK (g_object_new (TYPE_CLOCK, NULL));
diff --git a/src/goal-view.c b/src/goal-view.c
index 6d03ea8..f67ec3b 100644
--- a/src/goal-view.c
+++ b/src/goal-view.c
@@ -50,7 +50,7 @@ void goal_view_render (Goal *goal)
static void render_view (Goal *goal)
{
PlayField *pf;
- gint row, col;
+ guint row, col;
gdouble x;
gdouble y;
Tile *tile;
@@ -86,6 +86,10 @@ static void render_view (Goal *goal)
case TILE_TYPE_WALL:
case TILE_TYPE_UNKNOWN:
+ case TILE_TYPE_NONE:
+ case TILE_TYPE_FLOOR:
+ case TILE_TYPE_SHADOW:
+ case TILE_TYPE_LAST:
default:
break;
}
diff --git a/src/goal.c b/src/goal.c
index bb2b4a0..9cc4dfa 100644
--- a/src/goal.c
+++ b/src/goal.c
@@ -145,7 +145,7 @@ static int find_tile (gconstpointer p1, gconstpointer p2)
Goal *goal_new (PlayField *pf)
{
Goal *goal;
- gint row, col;
+ guint row, col;
Tile *tile;
goal = GOAL (g_object_new (GOAL_TYPE, NULL));
@@ -218,8 +218,8 @@ gboolean goal_reached (Goal *goal, PlayField *pf,
TileData *td;
TileData pattern;
PositionOffset *po;
- gint start_row;
- gint start_col;
+ guint start_row;
+ guint start_col;
g_return_val_if_fail (IS_GOAL (goal), FALSE);
g_return_val_if_fail (goal->priv->index != NULL, FALSE);
@@ -245,8 +245,8 @@ gboolean goal_reached (Goal *goal, PlayField *pf,
start_row = row_anchor - po->vert;
start_col = col_anchor - po->horiz;
- if (start_row >= 0 && start_row < playfield_get_n_rows (pf) &&
- start_col >= 0 && start_col < playfield_get_n_cols (pf))
+ if (start_row < playfield_get_n_rows (pf) &&
+ start_col < playfield_get_n_cols (pf))
{
comp_res =
compare_playfield_with_goal (goal, pf, start_row, start_col);
diff --git a/src/level-manager.c b/src/level-manager.c
index fd19f82..ca1101b 100644
--- a/src/level-manager.c
+++ b/src/level-manager.c
@@ -151,13 +151,13 @@ static GMarkupParser sequence_parser =
static void create_level_sequence (LevelManager *lm, gchar *file)
{
- g_return_if_fail (IS_LEVEL_MANAGER (lm));
-
GFile *sequence_file;
gchar *sequence_contents;
gsize sequence_length;
GMarkupParseContext *parse_context;
+ g_return_if_fail (IS_LEVEL_MANAGER (lm));
+
if (!g_file_test (file, G_FILE_TEST_IS_REGULAR)) {
g_warning ("File not found: %s.", file);
return;
diff --git a/src/main.c b/src/main.c
index d2342a1..cd9bab8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -222,6 +222,8 @@ static void controller_handle_action (GameAction action)
board_gtk_undo_move ();
break;
+ case GAME_ACTION_NEW:
+ case GAME_ACTION_CONTINUE:
default:
break;
}
@@ -374,7 +376,7 @@ static gboolean on_key_press_event (GObject *widget, GdkEventKey *event,
return FALSE;
}
-static void game_init ()
+static void game_init (void)
{
g_return_if_fail (app != NULL);
@@ -488,7 +490,7 @@ static void update_statistics (void)
typedef struct
{
- gchar *cmd;
+ const gchar *cmd;
gboolean enabled;
} CmdEnable;
@@ -583,7 +585,6 @@ void update_menu_item_state (void)
-------------------------------------------------------------- */
static AtomixApp *create_gui (GApplication *app_instance)
{
- AtomixApp *app;
gchar *ui_path;
GtkBuilder *builder;
GtkWidget *stats_grid;
diff --git a/src/playfield.c b/src/playfield.c
index 7942adf..90dc888 100644
--- a/src/playfield.c
+++ b/src/playfield.c
@@ -22,7 +22,7 @@
#include <string.h>
Tile *get_tile (PlayField *pf, gint row, gint col);
-void set_tile (PlayField *pf, gint row, gint col, Tile *tile);
+void set_tile (PlayField *pf, guint row, guint col, Tile *tile);
static GObjectClass *parent_class = NULL;
@@ -102,7 +102,7 @@ static void playfield_init (PlayField *pf)
static void playfield_finalize (GObject *object)
{
- gint row, col;
+ guint row, col;
PlayField *pf = PLAYFIELD (object);
#ifdef DEBUG
@@ -142,7 +142,7 @@ Tile *get_tile (PlayField *pf, gint row, gint col)
return priv->matrix[row * priv->n_cols + col];
}
-void set_tile (PlayField *pf, gint row, gint col, Tile *new_tile)
+void set_tile (PlayField *pf, guint row, guint col, Tile *new_tile)
{
Tile *tile;
PlayFieldPrivate *priv;
@@ -218,8 +218,8 @@ void playfield_add_column (PlayField *pf)
void playfield_set_matrix_size (PlayField *pf, guint n_rows, guint n_cols)
{
- gint row = 0;
- gint col = 0;
+ guint row = 0;
+ guint col = 0;
guint old_n_rows;
guint old_n_cols;
Tile **new_matrix;
@@ -264,7 +264,7 @@ void playfield_set_matrix_size (PlayField *pf, guint n_rows, guint n_cols)
PlayField *playfield_copy (PlayField *pf)
{
PlayField *pf_copy = NULL;
- gint row, col;
+ guint row, col;
gint matrix_size;
g_return_val_if_fail (IS_PLAYFIELD (pf), NULL);
@@ -289,7 +289,7 @@ void playfield_swap_tiles (PlayField *pf, guint src_row, guint src_col,
{
Tile *src_tile;
Tile *dest_tile;
- gint n_rows, n_cols;
+ guint n_rows, n_cols;
g_return_if_fail (IS_PLAYFIELD (pf));
@@ -336,7 +336,7 @@ Tile *playfield_clear_tile (PlayField *pf, guint row, guint col)
void playfield_clear (PlayField *pf)
{
- gint row, col;
+ guint row, col;
g_return_if_fail (IS_PLAYFIELD (pf));
@@ -348,12 +348,12 @@ void playfield_clear (PlayField *pf)
PlayField *playfield_strip (PlayField *pf)
{
PlayField *stripped_pf;
- gint row, col;
- gint n_rows, n_cols;
- gint max_row = 0;
- gint min_row = 10000;
- gint max_col = 0;
- gint min_col = 10000;
+ guint row, col;
+ guint n_rows, n_cols;
+ guint max_row = 0;
+ guint min_row = 10000;
+ guint max_col = 0;
+ guint min_col = 10000;
g_return_val_if_fail (IS_PLAYFIELD (pf), NULL);
@@ -424,7 +424,7 @@ void playfield_set_tile (PlayField *pf, guint row, guint col, Tile *tile)
void playfield_print (PlayField *pf)
{
PlayFieldPrivate *priv;
- int row, col;
+ guint row, col;
Tile *tile;
g_return_if_fail (IS_PLAYFIELD (pf));
@@ -458,7 +458,7 @@ void playfield_print (PlayField *pf)
typedef struct
{
GQuark id;
- gchar *string;
+ const gchar *string;
} TranslationItem;
static TranslationItem wall_map[] =
@@ -521,15 +521,11 @@ static const offset env_offset[8] =
{-1, -1} /* ENV_TOP_LEFT */
};
-static TileType get_env_tile_type (PlayField *pf, gint row, gint col)
+static TileType get_env_tile_type (PlayField *pf, guint row, guint col)
{
Tile *tile;
TileType type = TILE_TYPE_NONE;
- if (row < 0)
- return type;
- if (col < 0)
- return type;
if (row >= playfield_get_n_rows (pf))
return type;
if (col >= playfield_get_n_cols (pf))
@@ -591,14 +587,14 @@ PlayField *playfield_generate_environment (PlayField *pf, Theme *theme)
{
PlayField *env_pf;
PlayFieldPrivate *priv;
- gint row, col;
+ guint row, col;
gint tile_env[8];
Tile *env_tile;
Tile *tile = NULL;
gint n_decor_tiles;
gint max_try;
- gint min_wall[2];
- gint max_wall[2];
+ guint min_wall[2];
+ guint max_wall[2];
g_return_val_if_fail (IS_PLAYFIELD (pf), NULL);
@@ -720,7 +716,7 @@ PlayField *playfield_generate_shadow (PlayField *pf)
{
PlayField *env_pf;
PlayFieldPrivate *priv;
- gint row, col;
+ guint row, col;
gint tile_env[8];
Tile *env_tile;
Tile *tile;
diff --git a/src/tile.c b/src/tile.c
index 8cdad69..a090ff5 100644
--- a/src/tile.c
+++ b/src/tile.c
@@ -243,7 +243,7 @@ void tile_set_tile_type (Tile *tile, TileType type)
void tile_print (Tile *tile)
{
- gchar *type_str;
+ const gchar *type_str;
g_return_if_fail (IS_TILE (tile));
@@ -265,6 +265,9 @@ void tile_print (Tile *tile)
type_str = "FLOR";
break;
+ case TILE_TYPE_SHADOW:
+ case TILE_TYPE_UNKNOWN:
+ case TILE_TYPE_LAST:
default:
type_str = "UKWN";
break;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/atomix.git
More information about the Pkg-games-commits
mailing list