[atomix] 01/04: Imported Upstream version 3.19.2
Markus Koschany
apo-guest at moszumanska.debian.org
Mon Dec 7 23:41:11 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository atomix.
commit 3ab09ffdc244b4eabf5dcb95bac93b29c44fb7f4
Author: Markus Koschany <apo at debian.org>
Date: Tue Dec 8 00:31:42 2015 +0100
Imported Upstream version 3.19.2
---
NEWS | 7 ++
configure.ac | 2 +-
data/atomix.desktop.in | 3 +-
po/fi.po | 321 +++++++++++++++++++++++++-----------------------
po/sk.po | 322 ++++++++++++++++++++++++++-----------------------
src/board-gtk.c | 32 ++++-
src/board-gtk.h | 1 +
7 files changed, 384 insertions(+), 304 deletions(-)
diff --git a/NEWS b/NEWS
index f90eee6..ab13883 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+2015-11-23: Release version 3.19.2
+
+ * New and updated translations
+ - fi, courtesy of Jiri Grönroos
+ - sk, courtesy of Dušan Kazik
+ * Show gameplay tips (bug #587868)
+
2015-09-21: Release version 3.18.0
2015-09-14: Release version 3.17.92
diff --git a/configure.ac b/configure.ac
index b94ef67..9f97d73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.63])
-AC_INIT([atomix],[3.18.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=atomix])
+AC_INIT([atomix],[3.19.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=atomix])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([src/main.c])
diff --git a/data/atomix.desktop.in b/data/atomix.desktop.in
index e1ba7d0..3511f4e 100644
--- a/data/atomix.desktop.in
+++ b/data/atomix.desktop.in
@@ -1,6 +1,7 @@
[Desktop Entry]
_Name=Atomix
-_Comment=Molecule puzzle game
+_GenericName=Molecule puzzle game
+_Comment=A puzzle game about atoms and molecules
Exec=atomix
Icon=atomix-icon
Terminal=false
diff --git a/po/fi.po b/po/fi.po
index 1a40b13..8f1101c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4,267 +4,295 @@
# 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.
#
msgid ""
msgstr ""
"Project-Id-Version: atomix\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-07 12:38+0200\n"
-"PO-Revision-Date: 2006-01-07 14:17+0200\n"
-"Last-Translator: Ilkka Tuohela <hile at iki.fi>\n"
-"Language-Team: Finnish <gnome-fi-laatu at lists.sourceforge.net>\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"
+"Last-Translator: Jiri Grönroos <jiri.gronroos+l10n at iki.fi>\n"
+"Language-Team: suomi <gnome-fi-laatu at lists.sourceforge.net>\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"
-#: ../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:127 ../src/main.c:684
+msgid "Atomix"
+msgstr "Atomix"
+
+#: ../data/atomix.appdata.xml.in.h:2
+msgid "Build molecules out of single atoms"
+msgstr "Rakenna molekyylejä yksittäisistä atomeista"
+
+#: ../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 on pulmapeli, jossa tavoitteena on koota molekyylejä yksittäisistä "
+"atomeista siirtämällä niitä pelialueella. Atomit eivät kuitenkaan liiku "
+"juuri sinne, minne haluat, vaan ne liukuvat kunnes osuvat seinämään tai "
+"toisiin atomeihin."
+
+#: ../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 ""
+"Yritä rakentaa molekyylejä mahdollisimman nopeasti jokaisella tasolla "
+"ansaitaksesi huippupisteet."
+
+#: ../data/atomix.desktop.in.h:2
+msgid "Molecule puzzle game"
+msgstr "Molekyyliälypeli"
+
+#: ../data/level/aceticacid.atomix.xml.h:1
msgid "Acetic Acid"
msgstr "Etikkahappo"
-#: ../level/acetone.atomix.xml.h:1
+#: ../data/level/acetone.atomix.xml.h:1
msgid "Acetone"
msgstr "Asetoni"
-#: ../level/butanol.atomix.xml.h:1
+#: ../data/level/butanol.atomix.xml.h:1
msgid "Butanol"
msgstr "Butanoli"
-#: ../level/cyclobutane.atomix.xml.h:1
+#: ../data/level/cyclobutane.atomix.xml.h:1
msgid "Cyclobutane"
msgstr "Syklobutaani"
-#: ../level/dimethylether.atomix.xml.h:1
+#: ../data/level/dimethylether.atomix.xml.h:1
msgid "Dimethyl Ether"
msgstr "Dimetyylieetteri"
-#: ../level/ethanal.atomix.xml.h:1
+#: ../data/level/ethanal.atomix.xml.h:1
msgid "Ethanal"
msgstr "Asetaldehydi"
-#: ../level/ethane.atomix.xml.h:1
+#: ../data/level/ethane.atomix.xml.h:1
msgid "Ethane"
msgstr "Etaani"
-#: ../level/ethanol.atomix.xml.h:1
+#: ../data/level/ethanol.atomix.xml.h:1
msgid "Ethanol"
msgstr "Etanoli"
-#: ../level/ethylene.atomix.xml.h:1
+#: ../data/level/ethylene.atomix.xml.h:1
msgid "Ethylene"
msgstr "Etyleeni"
-#: ../level/glycerin.atomix.xml.h:1
+#: ../data/level/glycerin.atomix.xml.h:1
msgid "Glycerin"
msgstr "Glyseriini"
-#: ../level/lactic-acid.atomix.xml.h:1
+#: ../data/level/lactic-acid.atomix.xml.h:1
msgid "Lactic Acid"
msgstr "Maitohappo"
-#: ../level/methanal.atomix.xml.h:1
+#: ../data/level/methanal.atomix.xml.h:1
msgid "Methanal"
msgstr "Formaldehydi"
-#: ../level/methane.atomix.xml.h:1
+#: ../data/level/methane.atomix.xml.h:1
msgid "Methane"
msgstr "Metaani"
-#: ../level/methanol.atomix.xml.h:1
+#: ../data/level/methanol.atomix.xml.h:1
msgid "Methanol"
msgstr "Metanoli"
-#: ../level/propanal.atomix.xml.h:1
+#: ../data/level/propanal.atomix.xml.h:1
msgid "Propanal"
msgstr "Propionaldehydi"
-#: ../level/propylene.atomix.xml.h:1
+#: ../data/level/propylene.atomix.xml.h:1
msgid "Propylene"
msgstr "Propyleeni"
-#: ../level/pyran.atomix.xml.h:1
+#: ../data/level/pyran.atomix.xml.h:1
msgid "Pyran"
msgstr "Pyraani"
-#: ../level/transbutylen.atomix.xml.h:1
+#: ../data/level/transbutylen.atomix.xml.h:1
msgid "Trans Butylen"
msgstr "Trans-butyleeni"
-#: ../level/water.atomix.xml.h:1
+#: ../data/level/water.atomix.xml.h:1
msgid "Water"
msgstr "Vesi"
-#: ../src/atomix-ui.xml.h:1
-msgid "Continue paused game"
-msgstr "Jatka pysäytettyä peliä"
-
-#: ../src/atomix-ui.xml.h:2
-msgid "End a game"
-msgstr "Lopeta peli"
-
-#: ../src/atomix-ui.xml.h:3
-msgid "Pause the running game"
-msgstr "Pysäytä peli"
+#: ../data/ui/interface.ui.h:2
+msgid "_File"
+msgstr "_Tiedosto"
-#: ../src/atomix-ui.xml.h:4
-msgid "Reset level"
-msgstr "Aloita taso uudelleen"
-
-#: ../src/atomix-ui.xml.h:5
-msgid "Restores start situation"
-msgstr "Palauttaa lähtötilanteen"
+#: ../data/ui/interface.ui.h:3
+msgid "_New Game"
+msgstr "_Uusi peli"
-#: ../src/atomix-ui.xml.h:6
-msgid "Set preferences"
-msgstr "Määritä asetukset"
+#: ../data/ui/interface.ui.h:4
+msgid "_End Game"
+msgstr "_Lopeta peli"
-#: ../src/atomix-ui.xml.h:7
-msgid "Skip _level"
+#: ../data/ui/interface.ui.h:5
+#| msgid "Skip _level"
+msgid "_Skip Level"
msgstr "Ohita _taso"
-#: ../src/atomix-ui.xml.h:8
-msgid "Skip the current level"
-msgstr "Ohita nykyinen taso"
+#: ../data/ui/interface.ui.h:6
+#| msgid "Reset level"
+msgid "_Reset Level"
+msgstr "Aloita taso uu_delleen"
-#: ../src/atomix-ui.xml.h:9
-msgid "Start a new game"
-msgstr "Aloita uusi peli"
+#: ../data/ui/interface.ui.h:7
+#| msgid "_Undo move"
+msgid "_Undo Move"
+msgstr "_Kumoa siirto"
-#: ../src/atomix-ui.xml.h:10
-msgid "Undo the last move"
-msgstr "Kumoa viimeinen siirto"
+#: ../data/ui/interface.ui.h:8
+#| msgid "_Pause game"
+msgid "_Pause Game"
+msgstr "K_eskeytä peli"
-#: ../src/atomix-ui.xml.h:11
-msgid "View highscores"
-msgstr "Näytä parhaat tulokset"
-
-#: ../src/atomix-ui.xml.h:12
-msgid "_Continue game"
+#: ../data/ui/interface.ui.h:9
+#| msgid "_Continue game"
+msgid "_Continue Game"
msgstr "_Jatka peliä"
-#: ../src/atomix-ui.xml.h:13
-msgid "_End Game"
-msgstr "_Lopeta peli"
+#: ../data/ui/interface.ui.h:10
+msgid "_Quit"
+msgstr "_Lopeta"
-#: ../src/atomix-ui.xml.h:14
-msgid "_Game"
-msgstr "_Peli"
-
-#. submenu name="Edit" _label="_Edit">
-#.
-#. <menuitem name="EditPreferences" verb=""/>
-#.
-#. </submenu
-#: ../src/atomix-ui.xml.h:20
+#: ../data/ui/interface.ui.h:11
msgid "_Help"
msgstr "O_hje"
-#: ../src/atomix-ui.xml.h:21
-msgid "_New Game"
-msgstr "_Uusi peli"
+#: ../data/ui/interface.ui.h:12
+msgid "_About"
+msgstr "_Tietoja"
-#: ../src/atomix-ui.xml.h:22
-msgid "_Pause game"
-msgstr "P_ysäytä peli"
+#: ../data/ui/interface.ui.h:13
+msgid "Level:"
+msgstr "Taso:"
-#: ../src/atomix-ui.xml.h:23
-msgid "_Preferences ..."
-msgstr "_Asetukset..."
+#: ../data/ui/interface.ui.h:14
+msgid "Molecule:"
+msgstr "Molekyyli:"
-#: ../src/atomix-ui.xml.h:24
-msgid "_Scores ..."
-msgstr "_Tulokset..."
+#: ../data/ui/interface.ui.h:15
+msgid "Formula:"
+msgstr "Kaava:"
-#: ../src/atomix-ui.xml.h:25
-msgid "_Undo move"
-msgstr "_Peru siirto"
+#: ../data/ui/interface.ui.h:16
+msgid "Score:"
+msgstr "Pisteet:"
-#: ../src/level-manager.c:174
+#: ../data/ui/interface.ui.h:17
+msgid "Time:"
+msgstr "Aika:"
+
+#: ../data/ui/interface.ui.h:18
+msgid "empty"
+msgstr "tyhjä"
+
+#: ../data/ui/interface.ui.h:19
+msgid "Statistics"
+msgstr "Tilasto"
+
+#: ../src/level-manager.c:200
msgid "Couldn't find level sequence description."
msgstr "Tason sarjan kuvausta ei löytynyt."
-#: ../src/level-manager.c:188
+#: ../src/level-manager.c:214
msgid "No level found."
msgstr "Tasoa ei löytynyt."
-#: ../src/level-manager.c:284
+#: ../src/level-manager.c:283
#, c-format
msgid "Found level '%s' in: %s"
msgstr "Taso '%s' löytyi paikasta: %s"
-#: ../src/main.c:126
-msgid "You have not achieved any scores yet. Play a little before coming back!"
-msgstr "Et ole vielä pelannut mitään tulosta. Pelaa vähän lisää ensin!"
-
-#: ../src/main.c:173
+#: ../src/main.c:129
msgid "A puzzle game about atoms and molecules"
msgstr "Älypeli atomeista ja molekyyleistä"
-#: ../src/main.c:177
+#: ../src/main.c:133
msgid "translator-credits"
msgstr ""
"Lauri Nurmi, 2002.\n"
"Ilkka Tuohela, 2005.\n"
-"\n"
-"http://www.gnome.fi/"
-
-#: ../src/main.c:488 ../atomix.desktop.in.h:1
-msgid "Atomix"
-msgstr "Atomix"
+"Jiri Grönroos, 2015."
-#: ../src/main.c:499
+#: ../src/main.c:440
msgid "Congratulations! You have finished all Atomix levels."
msgstr "Onnittelut! Olet läpäissyt kaikki Atomixin tasot."
-#: ../src/main.c:509
-msgid "Couldn't find at least one level."
-msgstr "Yhtään tasoa ei löytynyt."
+#: ../src/theme-manager.c:225
+msgid "No themes found."
+msgstr "Teemoja ei löytynyt."
-#: ../src/main.c:514
-msgid "Do you want to finish the game?"
-msgstr "Haluatko päättää pelin?"
+#: ../src/theme-manager.c:283
+#, c-format
+msgid "Found theme '%s' in: %s"
+msgstr "Teema '%s' löytyi paikasta: %s"
-#. create statistics frame
-#: ../src/main.c:728
-msgid "Statistics"
-msgstr "Tilasto"
+#~ msgid "Continue paused game"
+#~ msgstr "Jatka pysäytettyä peliä"
-#: ../src/main.c:734
-msgid "Level:"
-msgstr "Taso:"
+#~ msgid "End a game"
+#~ msgstr "Lopeta peli"
-#: ../src/main.c:735
-msgid "Molecule:"
-msgstr "Molekyyli:"
+#~ msgid "Pause the running game"
+#~ msgstr "Pysäytä peli"
-#: ../src/main.c:736
-msgid "Formula:"
-msgstr "Kaava:"
+#~ msgid "Restores start situation"
+#~ msgstr "Palauttaa lähtötilanteen"
-#: ../src/main.c:737
-msgid "Score:"
-msgstr "Pisteet:"
+#~ msgid "Set preferences"
+#~ msgstr "Määritä asetukset"
-#: ../src/main.c:738
-msgid "Time:"
-msgstr "Aika:"
+#~ msgid "Skip the current level"
+#~ msgstr "Ohita nykyinen taso"
-#: ../src/main.c:778
-#, c-format
-msgid "Couldn't find file: %s"
-msgstr "Tiedostoa %s ei löytynyt"
+#~ msgid "Start a new game"
+#~ msgstr "Aloita uusi peli"
-#: ../src/theme-manager.c:135
-msgid "No themes found."
-msgstr "Teemoja ei löytynyt."
+#~ msgid "Undo the last move"
+#~ msgstr "Kumoa viimeinen siirto"
-#: ../src/theme-manager.c:193
-#, c-format
-msgid "Found theme '%s' in: %s"
-msgstr "Teema '%s' löytyi paikasta: %s"
+#~ msgid "View highscores"
+#~ msgstr "Näytä parhaat tulokset"
-#: ../atomix.desktop.in.h:2
-msgid "Molecule puzzle game"
-msgstr "Molekyyliälypeli"
+#~ msgid "_Game"
+#~ msgstr "_Peli"
+
+#~ msgid "_Preferences ..."
+#~ msgstr "_Asetukset..."
+
+#~ msgid "_Scores ..."
+#~ msgstr "_Tulokset..."
+
+#~ msgid ""
+#~ "You have not achieved any scores yet. Play a little before coming back!"
+#~ msgstr "Et ole vielä pelannut mitään tulosta. Pelaa vähän lisää ensin!"
+
+#~ msgid "Couldn't find at least one level."
+#~ msgstr "Yhtään tasoa ei löytynyt."
+
+#~ msgid "Do you want to finish the game?"
+#~ msgstr "Haluatko päättää pelin?"
+
+#~ msgid "Couldn't find file: %s"
+#~ msgstr "Tiedostoa %s ei löytynyt"
#~ msgid "E_xit"
#~ msgstr "P_oistu"
@@ -275,9 +303,6 @@ msgstr "Molekyyliälypeli"
#~ msgid "View game credits"
#~ msgstr "Näytä pelin "
-#~ msgid "_About"
-#~ msgstr "_Tietoja"
-
#~ msgid "_Edit"
#~ msgstr "_Muokkaa"
diff --git a/po/sk.po b/po/sk.po
index 13cb333..0cbc670 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,264 +2,288 @@
# Copyright (C) 2001, 2002, 2005, 2006 Free Software Foundation, Inc.
# Stanislav Višňovský <visnovsky at nenya.ms.mff.cuni.cz>, 2001,2002.
# Marcel Telka <marcel at telka.sk>, 2005, 2006.
+# Dušan Kazik <prescott66 at gmail.com>, 2015.
#
# $Id$
#
msgid ""
msgstr ""
"Project-Id-Version: atomix\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-19 21:44+0200\n"
-"PO-Revision-Date: 2006-06-19 21:45+0200\n"
-"Last-Translator: Marcel Telka <marcel at telka.sk>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=atomix&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2015-09-27 13:19+0000\n"
+"PO-Revision-Date: 2015-10-01 09:58+0200\n"
+"Last-Translator: Dušan Kazik <prescott66 at gmail.com>\n"
"Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
+"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.4\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:127 ../src/main.c:684
+msgid "Atomix"
+msgstr "Atomix"
+
+#: ../data/atomix.appdata.xml.in.h:2
+msgid "Build molecules out of single atoms"
+msgstr "Zostavuje molekuly z jednotlivých atómov"
+
+#: ../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 je hlavolam, pri ktorom je vaším cieľom poskladať molekuly zložené z "
+"atómov ich posúvaním na hracom poli. Avšak atómy nie je možné posúvať kam "
+"chcete. Atómy sa posúvajú až kým nenarazia do steny, alebo do iného atómu."
+
+#: ../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 ""
+"Pokúste sa na každej úrovni zostaviť molekuly najrýchlejšie ako viete, aby "
+"ste získali čo najvyššie skóre."
+
+#: ../data/atomix.desktop.in.h:2
+msgid "Molecule puzzle game"
+msgstr "Skladačková hra s molekulami"
+
+#: ../data/level/aceticacid.atomix.xml.h:1
msgid "Acetic Acid"
msgstr "Kyselina octová"
-#: ../level/acetone.atomix.xml.h:1
+#: ../data/level/acetone.atomix.xml.h:1
msgid "Acetone"
msgstr "Acetón"
-#: ../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 "Cyklobután"
-#: ../level/dimethylether.atomix.xml.h:1
+#: ../data/level/dimethylether.atomix.xml.h:1
msgid "Dimethyl Ether"
msgstr "Dimetyléter"
-#: ../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 "Etán"
-#: ../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 "Etylén"
-#: ../level/glycerin.atomix.xml.h:1
+#: ../data/level/glycerin.atomix.xml.h:1
msgid "Glycerin"
msgstr "Glycerín"
-#: ../level/lactic-acid.atomix.xml.h:1
+#: ../data/level/lactic-acid.atomix.xml.h:1
msgid "Lactic Acid"
msgstr "Kyselina mliečna"
-#: ../level/methanal.atomix.xml.h:1
+#: ../data/level/methanal.atomix.xml.h:1
msgid "Methanal"
msgstr "Formaldehyd"
-#: ../level/methane.atomix.xml.h:1
+#: ../data/level/methane.atomix.xml.h:1
msgid "Methane"
msgstr "Metán"
-#: ../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 "Propylén"
-#: ../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 "Butén"
-#: ../level/water.atomix.xml.h:1
+#: ../data/level/water.atomix.xml.h:1
msgid "Water"
msgstr "Voda"
-#: ../src/atomix-ui.xml.h:1
-msgid "Continue paused game"
-msgstr "Pokračovať v pozastavenej hre"
-
-#: ../src/atomix-ui.xml.h:2
-msgid "End a game"
-msgstr "Ukončí hru"
-
-#: ../src/atomix-ui.xml.h:3
-msgid "Pause the running game"
-msgstr "Pozastaví bežiacu hru"
+#: ../data/ui/interface.ui.h:2
+msgid "_File"
+msgstr "_Súbor"
-#: ../src/atomix-ui.xml.h:4
-msgid "Reset level"
-msgstr "Reštart úrovne"
+#: ../data/ui/interface.ui.h:3
+msgid "_New Game"
+msgstr "_Nová hra"
-#: ../src/atomix-ui.xml.h:5
-msgid "Restores start situation"
-msgstr "Obnoví pôvodnú situáciu"
+#: ../data/ui/interface.ui.h:4
+msgid "_End Game"
+msgstr "_Ukončiť hru"
-#: ../src/atomix-ui.xml.h:6
-msgid "Set preferences"
-msgstr "Nastaviť"
+#: ../data/ui/interface.ui.h:5
+msgid "_Skip Level"
+msgstr "P_reskočiť úroveň"
-#: ../src/atomix-ui.xml.h:7
-msgid "Skip _level"
-msgstr "_Preskočiť úroveň"
+#: ../data/ui/interface.ui.h:6
+msgid "_Reset Level"
+msgstr "_Reštartovať úroveň"
-#: ../src/atomix-ui.xml.h:8
-msgid "Skip the current level"
-msgstr "Preskočí aktuálnu úroveň"
+#: ../data/ui/interface.ui.h:7
+msgid "_Undo Move"
+msgstr "Vrátiť _späť ťah"
-#: ../src/atomix-ui.xml.h:9
-msgid "Start a new game"
-msgstr "Spustí novú hru"
+#: ../data/ui/interface.ui.h:8
+msgid "_Pause Game"
+msgstr "_Pozastaviť hru"
-#: ../src/atomix-ui.xml.h:10
-msgid "Undo the last move"
-msgstr "Vráti posledný ťah"
+#: ../data/ui/interface.ui.h:9
+msgid "_Continue Game"
+msgstr "Pokračovať v _hre"
-#: ../src/atomix-ui.xml.h:11
-msgid "View highscores"
-msgstr "Zobraziť najvyššie skóre"
+#: ../data/ui/interface.ui.h:10
+msgid "_Quit"
+msgstr "U_končiť"
-#: ../src/atomix-ui.xml.h:12
-msgid "_Continue game"
-msgstr "_Pokračovať v hre"
+#: ../data/ui/interface.ui.h:11
+msgid "_Help"
+msgstr "_Pomocník"
-#: ../src/atomix-ui.xml.h:13
-msgid "_End Game"
-msgstr "_Ukončiť hru"
+#: ../data/ui/interface.ui.h:12
+msgid "_About"
+msgstr "_O programe"
-#: ../src/atomix-ui.xml.h:14
-msgid "_Game"
-msgstr "_Hra"
+#: ../data/ui/interface.ui.h:13
+msgid "Level:"
+msgstr "Úroveň:"
-#. submenu name="Edit" _label="_Edit">
-#.
-#. <menuitem name="EditPreferences" verb=""/>
-#.
-#. </submenu
-#: ../src/atomix-ui.xml.h:20
-msgid "_Help"
-msgstr "_Pomocník"
+#: ../data/ui/interface.ui.h:14
+msgid "Molecule:"
+msgstr "Molekula:"
-#: ../src/atomix-ui.xml.h:21
-msgid "_New Game"
-msgstr "_Nová hra"
+#: ../data/ui/interface.ui.h:15
+msgid "Formula:"
+msgstr "Vzorec:"
-#: ../src/atomix-ui.xml.h:22
-msgid "_Pause game"
-msgstr "_Zastaviť hru"
+#: ../data/ui/interface.ui.h:16
+msgid "Score:"
+msgstr "Skóre:"
-#: ../src/atomix-ui.xml.h:23
-msgid "_Preferences ..."
-msgstr "_Nastavenia..."
+#: ../data/ui/interface.ui.h:17
+msgid "Time:"
+msgstr "Čas:"
-#: ../src/atomix-ui.xml.h:24
-msgid "_Scores ..."
-msgstr "_Skóre..."
+#: ../data/ui/interface.ui.h:18
+msgid "empty"
+msgstr "prázdne"
-#: ../src/atomix-ui.xml.h:25
-msgid "_Undo move"
-msgstr "_Späť ťah"
+#: ../data/ui/interface.ui.h:19
+msgid "Statistics"
+msgstr "Štatistika"
-#: ../src/level-manager.c:174
+#: ../src/level-manager.c:200
msgid "Couldn't find level sequence description."
msgstr "Nepodarilo sa nájsť popis sekvencie úrovní."
-#: ../src/level-manager.c:188
+#: ../src/level-manager.c:214
msgid "No level found."
-msgstr "Úroveň nenájdená."
+msgstr "Nenašla sa žiadna úroveň."
-#: ../src/level-manager.c:284
+#: ../src/level-manager.c:283
#, c-format
msgid "Found level '%s' in: %s"
-msgstr "Nájdená úroveň '%s' v: %s"
-
-#: ../src/main.c:126
-msgid "You have not achieved any scores yet. Play a little before coming back!"
-msgstr ""
-"Nedosiahli ste zatiaľ žiadne skóre. Trochu si zahrajte predtým, ako sa sem "
-"vrátite!"
+msgstr "Našla sa úroveň „%s“ v: %s"
-#: ../src/main.c:173
+#: ../src/main.c:129
msgid "A puzzle game about atoms and molecules"
msgstr "Skladačková hra s atómami a molekulami"
-#: ../src/main.c:177
+#: ../src/main.c:133
msgid "translator-credits"
-msgstr "Marcel Telka <marcel at telka.sk>"
-
-#: ../src/main.c:488 ../atomix.desktop.in.h:1
-msgid "Atomix"
-msgstr "Atomix"
+msgstr ""
+"Marcel Telka <marcel at telka.sk>\n"
+"Dušan Kazik <prescott66 at gmail.com>"
-#: ../src/main.c:499
+#: ../src/main.c:440
msgid "Congratulations! You have finished all Atomix levels."
-msgstr "Blahoželáme! Dokončili ste všetky úrovne Atomix."
+msgstr "Blahoželáme! Dokončili ste všetky úrovne hry Atomix."
-#: ../src/main.c:509
-msgid "Couldn't find at least one level."
-msgstr "Nepodarilo sa nájsť ani jednu úroveň."
+#: ../src/theme-manager.c:225
+msgid "No themes found."
+msgstr "Nenájdené žiadne témy."
-#: ../src/main.c:514
-msgid "Do you want to finish the game?"
-msgstr "Chcete skončiť hru?"
+#: ../src/theme-manager.c:283
+#, c-format
+msgid "Found theme '%s' in: %s"
+msgstr "Nájdená téma '%s' v:%s"
-#. create statistics frame
-#: ../src/main.c:728
-msgid "Statistics"
-msgstr "Štatistika"
+#~ msgid "Continue paused game"
+#~ msgstr "Pokračovať v pozastavenej hre"
-#: ../src/main.c:734
-msgid "Level:"
-msgstr "Úroveň:"
+#~ msgid "End a game"
+#~ msgstr "Ukončí hru"
-#: ../src/main.c:735
-msgid "Molecule:"
-msgstr "Molekula:"
+#~ msgid "Pause the running game"
+#~ msgstr "Pozastaví bežiacu hru"
-#: ../src/main.c:736
-msgid "Formula:"
-msgstr "Vzorec:"
+#~ msgid "Restores start situation"
+#~ msgstr "Obnoví pôvodnú situáciu"
-#: ../src/main.c:737
-msgid "Score:"
-msgstr "Skóre:"
+#~ msgid "Set preferences"
+#~ msgstr "Nastaviť"
-#: ../src/main.c:738
-msgid "Time:"
-msgstr "Čas:"
+#~ msgid "Skip the current level"
+#~ msgstr "Preskočí aktuálnu úroveň"
-#: ../src/main.c:778
-#, c-format
-msgid "Couldn't find file: %s"
-msgstr "Nepodarilo sa nájsť súbor: %s"
+#~ msgid "Start a new game"
+#~ msgstr "Spustí novú hru"
-#: ../src/theme-manager.c:135
-msgid "No themes found."
-msgstr "Nenájdené žiadne témy."
+#~ msgid "Undo the last move"
+#~ msgstr "Vráti posledný ťah"
-#: ../src/theme-manager.c:193
-#, c-format
-msgid "Found theme '%s' in: %s"
-msgstr "Nájdená téma '%s' v:%s"
+#~ msgid "View highscores"
+#~ msgstr "Zobraziť najvyššie skóre"
-#: ../atomix.desktop.in.h:2
-msgid "Molecule puzzle game"
-msgstr "Skladačková hra s molekulami"
+#~ msgid "_Game"
+#~ msgstr "_Hra"
+
+#~ msgid "_Preferences ..."
+#~ msgstr "_Nastavenia..."
+
+#~ msgid "_Scores ..."
+#~ msgstr "_Skóre..."
+
+#~ msgid ""
+#~ "You have not achieved any scores yet. Play a little before coming back!"
+#~ msgstr ""
+#~ "Nedosiahli ste zatiaľ žiadne skóre. Trochu si zahrajte predtým, ako sa "
+#~ "sem vrátite!"
+
+#~ msgid "Couldn't find at least one level."
+#~ msgstr "Nepodarilo sa nájsť ani jednu úroveň."
+
+#~ msgid "Do you want to finish the game?"
+#~ msgstr "Chcete skončiť hru?"
+
+#~ msgid "Couldn't find file: %s"
+#~ msgstr "Nepodarilo sa nájsť súbor: %s"
diff --git a/src/board-gtk.c b/src/board-gtk.c
index 561ebe6..3551d11 100644
--- a/src/board-gtk.c
+++ b/src/board-gtk.c
@@ -317,16 +317,38 @@ static void create_logo (void)
{
GdkPixbuf *pixbuf;
int tile_width, tile_height;
+ GtkWidget *logo_image;
+ GtkWidget *tips_label;
+ GtkCssProvider *provider;
+ GtkStyleContext *context;
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_image_new_from_pixbuf (pixbuf);
- gtk_widget_show (level_items->logo);
- gtk_fixed_put (GTK_FIXED (board_canvas), level_items->logo,
- BGR_FLOOR_COLS * tile_width/2 - gdk_pixbuf_get_width (pixbuf)/2,
- BGR_FLOOR_ROWS * tile_height/2 - gdk_pixbuf_get_height (pixbuf)/2);
+ level_items->logo = gtk_box_new (GTK_ORIENTATION_VERTICAL, 15);
+
+ context = gtk_widget_get_style_context (level_items->logo);
+ provider = gtk_css_provider_new ();
+ gtk_css_provider_load_from_data (provider, "* { background-color: rgba(230, 230, 230, 0.6); }", -1, NULL);
+ gtk_style_context_add_provider (context, GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ logo_image = gtk_image_new_from_pixbuf (pixbuf);
+ 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"));
+ 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);
+
+ gtk_fixed_put (GTK_FIXED (board_canvas), level_items->logo,
+ 0, 0);
+ gtk_widget_set_size_request (level_items->logo, BGR_FLOOR_COLS * tile_width, BGR_FLOOR_ROWS * tile_height);
+ gtk_widget_set_size_request (GTK_WIDGET (tips_label), BGR_FLOOR_COLS * tile_width, -1);
+ gtk_label_set_justify (GTK_LABEL (tips_label), GTK_JUSTIFY_CENTER);
+ gtk_label_set_line_wrap (GTK_LABEL (tips_label), TRUE);
+
g_object_unref (pixbuf);
}
diff --git a/src/board-gtk.h b/src/board-gtk.h
index 563dc7e..8800796 100644
--- a/src/board-gtk.h
+++ b/src/board-gtk.h
@@ -21,6 +21,7 @@
#define _ATOMIX_BOARD_GTK_H_
#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include <math.h>
#include "theme.h"
#include "playfield.h"
--
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