Hello community,
here is the log from the commit of package atomix for openSUSE:Factory checked
in at 2019-08-16 15:49:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/atomix (Old)
and /work/SRC/openSUSE:Factory/.atomix.new.22127 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "atomix"
Fri Aug 16 15:49:01 2019 rev:11 rq:723729 version:3.32.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/atomix/atomix.changes 2019-04-05
12:02:04.646553654 +0200
+++ /work/SRC/openSUSE:Factory/.atomix.new.22127/atomix.changes 2019-08-16
15:49:38.745614299 +0200
@@ -1,0 +2,8 @@
+Wed Aug 14 17:35:21 UTC 2019 - Bjørn Lie <bjorn....@gmail.com>
+
+- Update to version 3.32.1:
+ + Fixed keys in menu controlling game.
+ + Fixed keyboard shortcuts.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
atomix-3.32.0.tar.xz
New:
----
atomix-3.32.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ atomix.spec ++++++
--- /var/tmp/diff_new_pack.IRVkE9/_old 2019-08-16 15:49:41.133613423 +0200
+++ /var/tmp/diff_new_pack.IRVkE9/_new 2019-08-16 15:49:41.137613422 +0200
@@ -17,7 +17,7 @@
Name: atomix
-Version: 3.32.0
+Version: 3.32.1
Release: 0
Summary: A puzzle game where you move atoms to build a molecule
License: GPL-2.0-or-later
++++++ atomix-3.32.0.tar.xz -> atomix-3.32.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/atomix-3.32.0/NEWS new/atomix-3.32.1/NEWS
--- old/atomix-3.32.0/NEWS 2019-03-11 10:08:38.000000000 +0100
+++ new/atomix-3.32.1/NEWS 2019-04-08 23:30:18.000000000 +0200
@@ -1,3 +1,9 @@
+2019-04-08: Release version 3.32.1
+
+ * Updated translations
+ * Fixed keys in menu controlling game (#17)
+ * Fixed keyboard shortcuts
+
2019-03-11: Release version 3.32.0
* Stable release version bump
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/atomix-3.32.0/data/ui/interface.ui
new/atomix-3.32.1/data/ui/interface.ui
--- old/atomix-3.32.0/data/ui/interface.ui 2019-03-11 10:08:38.000000000
+0100
+++ new/atomix-3.32.1/data/ui/interface.ui 2019-04-08 23:30:18.000000000
+0200
@@ -21,7 +21,6 @@
<object class="GtkMenuButton" id="primary-menu-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
<child>
<object class="GtkImage" id="primary-menu-image">
<property name="visible">True</property>
@@ -53,8 +52,11 @@
<property name="shadow_type">none</property>
<child>
<object class="GtkFixed" id="game_fixed">
+ <property name="receives_default">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="halign">center</property>
<property name="valign">center</property>
</object>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/atomix-3.32.0/meson.build
new/atomix-3.32.1/meson.build
--- old/atomix-3.32.0/meson.build 2019-03-11 10:08:38.000000000 +0100
+++ new/atomix-3.32.1/meson.build 2019-04-08 23:30:18.000000000 +0200
@@ -1,5 +1,5 @@
project('atomix', ['c'],
- version: '3.32.0',
+ version: '3.32.1',
meson_version: '>= 0.41',
license: 'GPLv2+',
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/atomix-3.32.0/po/de.po new/atomix-3.32.1/po/de.po
--- old/atomix-3.32.0/po/de.po 2019-03-11 10:08:38.000000000 +0100
+++ new/atomix-3.32.1/po/de.po 2019-04-08 23:30:18.000000000 +0200
@@ -7,23 +7,24 @@
# Mario Blättermann <mario.blaetterm...@gmail.com>, 2010, 2018.
# Wolfgang Stöggl <c72...@yahoo.de>, 2015.
# Mario Blättermann <mario.blaetterm...@gmail.com>, 2015, 2016.
+# Tim Sabsch <t...@sabsch.com>, 2019.
#
msgid ""
msgstr ""
"Project-Id-Version: atomix master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/atomix/issues\n";
-"POT-Creation-Date: 2018-03-25 03:22+0000\n"
-"PO-Revision-Date: 2018-03-25 18:58+0200\n"
-"Last-Translator: Mario Blättermann <mario.blaetterm...@gmail.com>\n"
+"POT-Creation-Date: 2019-03-11 09:12+0000\n"
+"PO-Revision-Date: 2019-03-11 13:55+0100\n"
+"Last-Translator: Tim Sabsch <t...@sabsch.com>\n"
"Language-Team: German <gnome...@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 2.0.6\n"
+"X-Generator: Poedit 2.2.1\n"
-#: data/atomix.appdata.xml.in:7 data/atomix.desktop.in:3 src/main.c:120
-#: src/main.c:655
+#: data/atomix.appdata.xml.in:7 data/atomix.desktop.in:3 src/main.c:121
+#: src/main.c:688
msgid "Atomix"
msgstr "Atomix"
@@ -55,7 +56,7 @@
msgid "Molecule puzzle game"
msgstr "Molekül-Puzzlespiel"
-#: data/atomix.desktop.in:5 src/main.c:123
+#: data/atomix.desktop.in:5 src/main.c:124
msgid "A puzzle game about atoms and molecules"
msgstr "Ein Puzzlespiel über Atome und Moleküle"
@@ -145,32 +146,32 @@
msgid "Water"
msgstr "Wasser"
-#: data/ui/interface.ui:72
+#: data/ui/interface.ui:99
msgid "Level:"
msgstr "Spielstufe:"
-#: data/ui/interface.ui:84
+#: data/ui/interface.ui:111
msgid "Molecule:"
msgstr "Molekül:"
-#: data/ui/interface.ui:96
+#: data/ui/interface.ui:123
msgid "Formula:"
msgstr "Formel:"
-#: data/ui/interface.ui:108
+#: data/ui/interface.ui:135
msgid "Score:"
msgstr "Punktzahl:"
-#: data/ui/interface.ui:120
+#: data/ui/interface.ui:147
msgid "Time:"
msgstr "Zeit:"
-#: data/ui/interface.ui:132 data/ui/interface.ui:143 data/ui/interface.ui:155
-#: data/ui/interface.ui:167
+#: data/ui/interface.ui:159 data/ui/interface.ui:170 data/ui/interface.ui:182
+#: data/ui/interface.ui:194
msgid "empty"
msgstr "leer"
-#: data/ui/interface.ui:186
+#: data/ui/interface.ui:213
msgid "Statistics"
msgstr "Statistik"
@@ -199,12 +200,8 @@
msgstr "Zug zurücknehmen"
#: data/ui/menu.ui:39
-msgid "About"
-msgstr "Info"
-
-#: data/ui/menu.ui:45
-msgid "Quit"
-msgstr "Beenden"
+msgid "About Atomix"
+msgstr "Info zu Atomix"
#: src/board-gtk.c:340
msgid ""
@@ -217,16 +214,22 @@
"auszuwählen und es zu verschieben. Seien Sie vorsichtig, denn ein Atom "
"bewegt sich weiter, bis es eine Wand erreicht."
-#: src/main.c:127
+#: src/main.c:128
msgid "translator-credits"
msgstr ""
"Hendrik Brandt <h...@gnome-de.org>\n"
"Christian Meyer <chris...@gnome.org>\n"
"Jens Finke <j...@gnome.org>\n"
-"Mario Blättermann <mario.blaetterm...@gmail.com>"
+"Mario Blättermann <mario.blaetterm...@gmail.com>\n"
+"Tim Sabsch <t...@sabsch.com>"
-#: src/main.c:423
+#: src/main.c:447
msgid "Congratulations! You have finished all Atomix levels."
msgstr ""
"Glückwunsch! Sie haben erfolgreich alle Atomix-Spielstufen abgeschlossen."
+#~ msgid "About"
+#~ msgstr "Info"
+
+#~ msgid "Quit"
+#~ msgstr "Beenden"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/atomix-3.32.0/po/ro.po new/atomix-3.32.1/po/ro.po
--- old/atomix-3.32.0/po/ro.po 2019-03-11 10:08:38.000000000 +0100
+++ new/atomix-3.32.1/po/ro.po 2019-04-08 23:30:18.000000000 +0200
@@ -1,156 +1,216 @@
-# Romanian translation for atomix
-# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
-# This file is distributed under the same license as the atomix package.
-# Adi Roiban https://launchpad.net/~adiroiban, 2008,2009.
-# Nicolae Antonio <anto.nico...@gmail.com>, 2010.
+# Romanian translation for atomix
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the atomix package.
+# Adi Roiban https://launchpad.net/~adiroiban, 2008,2009.
+# Nicolae Antonio <anto.nico...@gmail.com>, 2010.
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: 2011-05-25 00:16+0000\n"
-"PO-Revision-Date: 2010-12-28 23:42+0300\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/atomix/issues\n";
+"POT-Creation-Date: 2019-03-11 09:12+0000\n"
+"PO-Revision-Date: 2019-03-11 23:03+0100\n"
"Last-Translator: Nicolae Antonio <anto.nico...@gmail.com>\n"
"Language-Team: Romanian\n"
+"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
"20)) ? 1 : 2);;\n"
-"X-Generator: Virtaal 0.6.1\n"
+"X-Generator: Poedit 2.2.1\n"
+
+#: data/atomix.appdata.xml.in:7 data/atomix.desktop.in:3 src/main.c:121
+#: src/main.c:688
+msgid "Atomix"
+msgstr "Atomix"
+
+#: data/atomix.appdata.xml.in:8
+msgid "Build molecules out of single atoms"
+msgstr "Construiește molecule din atomi individual"
+
+#: data/atomix.appdata.xml.in:10
+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 este un joc puzzle unde scopul este să asamblezi molecule din atomi "
+"compuși mutându-i pe câmpul de joc. Oricum, atomii nu se pot muta oriunde "
+"doriți dumneavoastră, se pot muta până când se lovesc de un zid sau un alt "
+"atom."
+
+#: data/atomix.appdata.xml.in:16
+msgid ""
+"Try to build the molecules as fast as you can on each level to earn a higher "
+"score."
+msgstr ""
+"Încercați să construiți molecule cât de repete puteți pentru fiecare nivel "
+"pentru a câștiga un scor mai mare."
+
+#: data/atomix.desktop.in:4
+msgid "Molecule puzzle game"
+msgstr "Joc puzzle cu molecule"
+
+#: data/atomix.desktop.in:5 src/main.c:124
+msgid "A puzzle game about atoms and molecules"
+msgstr "Un joc de puzzle despre atomi și molecule"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon
file name)!
+#: data/atomix.desktop.in:8
+msgid "atomix"
+msgstr "atomix"
+
+#. Translators: Search terms to find this application. Do NOT translate or
localize the semicolons! The list MUST also end with a semicolon!
+#: data/atomix.desktop.in:13
+msgid "GNOME;game;logic;puzzle;atoms;molecules;sokoban;"
+msgstr ""
+"GNOME;game;logic;puzzle;atoms;molecules;sokoban;joc;logic;atomi;molecule;"
-#: ../level/aceticacid.atomix.xml.h:1
+#: data/level/aceticacid.atomix.xml.in:2
msgid "Acetic Acid"
msgstr "Acid acetic"
-#: ../level/acetone.atomix.xml.h:1
+#: data/level/acetone.atomix.xml.in:2
msgid "Acetone"
msgstr "Acetonă"
-#: ../level/butanol.atomix.xml.h:1
+#: data/level/butanol.atomix.xml.in:2
msgid "Butanol"
msgstr "Butanol"
-#: ../level/cyclobutane.atomix.xml.h:1
+#: data/level/cyclobutane.atomix.xml.in:2
msgid "Cyclobutane"
msgstr "Ciclobutan"
-#: ../level/dimethylether.atomix.xml.h:1
+#: data/level/dimethylether.atomix.xml.in:2
msgid "Dimethyl Ether"
msgstr "Dimetil eter"
-#: ../level/ethanal.atomix.xml.h:1
+#: data/level/ethanal.atomix.xml.in:2
msgid "Ethanal"
msgstr "Etanal"
-#: ../level/ethane.atomix.xml.h:1
+#: data/level/ethane.atomix.xml.in:2
msgid "Ethane"
msgstr "Etan"
-#: ../level/ethanol.atomix.xml.h:1
+#: data/level/ethanol.atomix.xml.in:2
msgid "Ethanol"
msgstr "Etanol"
-#: ../level/ethylene.atomix.xml.h:1
+#: data/level/ethylene.atomix.xml.in:2
msgid "Ethylene"
msgstr "Etilenă"
-#: ../level/glycerin.atomix.xml.h:1
+#: data/level/glycerin.atomix.xml.in:2
msgid "Glycerin"
msgstr "Glicerină"
-#: ../level/lactic-acid.atomix.xml.h:1
+#: data/level/lactic-acid.atomix.xml.in:2
msgid "Lactic Acid"
msgstr "Acid lactic"
-#: ../level/methanal.atomix.xml.h:1
+#: data/level/methanal.atomix.xml.in:2
msgid "Methanal"
msgstr "Metanal"
-#: ../level/methane.atomix.xml.h:1
+#: data/level/methane.atomix.xml.in:2
msgid "Methane"
msgstr "Metan"
-#: ../level/methanol.atomix.xml.h:1
+#: data/level/methanol.atomix.xml.in:2
msgid "Methanol"
msgstr "Metanol"
-#: ../level/propanal.atomix.xml.h:1
+#: data/level/propanal.atomix.xml.in:2
msgid "Propanal"
msgstr "Propanal"
-#: ../level/propylene.atomix.xml.h:1
+#: data/level/propylene.atomix.xml.in:2
msgid "Propylene"
msgstr "Propilenă"
-#: ../level/pyran.atomix.xml.h:1
+#: data/level/pyran.atomix.xml.in:2
msgid "Pyran"
msgstr "Piran"
-#: ../level/transbutylen.atomix.xml.h:1
+#: data/level/transbutylen.atomix.xml.in:2
msgid "Trans Butylen"
msgstr "Trans butilen"
-#: ../level/water.atomix.xml.h:1
+#: data/level/water.atomix.xml.in:2
msgid "Water"
msgstr "Apă"
-#: ../src/games-runtime.c:273
-msgid "Could not show link"
-msgstr "Legătura nu poate fi afișată"
-
-#: ../src/games-scores-dialog.c:113
-msgid "Time"
-msgstr "Timp"
-
-#. Note that this assumes the default style is plain.
-#: ../src/games-scores-dialog.c:118 ../src/games-scores-dialog.c:545
-msgid "Score"
-msgstr "Punctaj"
-
-#. 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:99
+msgid "Level:"
+msgstr "Nivel:"
+
+#: data/ui/interface.ui:111
+msgid "Molecule:"
+msgstr "Molecule:"
+
+#: data/ui/interface.ui:123
+msgid "Formula:"
+msgstr "Formulă:"
+
+#: data/ui/interface.ui:135
+msgid "Score:"
+msgstr "Punctaj:"
+
+#: data/ui/interface.ui:147
+msgid "Time:"
+msgstr "Timp:"
+
+#: data/ui/interface.ui:159 data/ui/interface.ui:170 data/ui/interface.ui:182
+#: data/ui/interface.ui:194
+msgid "empty"
+msgstr "gol"
-#: ../src/games-scores-dialog.c:437 ../src/main.c:736
+#: data/ui/interface.ui:213
+msgid "Statistics"
+msgstr "Statistici"
+
+#: data/ui/menu.ui:7
msgid "New Game"
msgstr "Joc nou"
-#: ../src/games-scores-dialog.c:537
-msgid "Name"
-msgstr "Nume"
-
-#. Empty title shows up as "<unnamed>" on maemo
-#: ../src/games-show.c:151
-msgid "Error"
-msgstr "Eroare"
-
-#: ../src/level-manager.c:176
-msgid "Couldn't find level sequence description."
-msgstr "Nu s-a găsit descrierea secvenței nivelului."
-
-#: ../src/level-manager.c:190
-msgid "No level found."
-msgstr "Nu s-a găsit niciun nivel."
-
-#: ../src/level-manager.c:286
-#, c-format
-msgid "Found level '%s' in: %s"
-msgstr "S-a găsit nivelul „%s” în: %s"
+#: data/ui/menu.ui:12
+msgid "Pause/Continue Game"
+msgstr "Pune pauză/Continuă jocul"
-#: ../src/main.c:121 ../src/main.c:775 ../src/main.c:832
-#: ../atomix.desktop.in.h:1
-msgid "Atomix"
-msgstr "Atomix"
+#: data/ui/menu.ui:17
+msgid "End Game"
+msgstr "Termină jocul"
-#: ../src/main.c:166
-msgid "A puzzle game about atoms and molecules"
-msgstr "Un joc de puzzle despre atomi și molecule"
+#: data/ui/menu.ui:23
+msgid "Skip Level"
+msgstr "Omite nivelul"
+
+#: data/ui/menu.ui:28
+msgid "Reset Level"
+msgstr "Restabilește nivelul"
+
+#: data/ui/menu.ui:32
+msgid "Undo Move"
+msgstr "Anulează mișcarea"
+
+#: data/ui/menu.ui:39
+msgid "About Atomix"
+msgstr "Despre Atomix"
-#: ../src/main.c:170
+#: src/board-gtk.c:340
+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 ""
+"Ghidați atomii prin labirint pentru a forma molecule. Clic, sau utilizați "
+"săgețile și Enter, pentru a selecta un atom și a-l muta. Aveți grijă: un "
+"atom va continua să se miște până când se lovește de un zid."
+
+#: src/main.c:128
msgid "translator-credits"
msgstr ""
"Contribuții Launchpad:\n"
@@ -162,91 +222,63 @@
" Mircea Petrea https://launchpad.net/~domirtm\n";
" Nicolae Antonio <anto_nico...@yahoo.com>"
-#: ../src/main.c:493
+#: src/main.c:447
msgid "Congratulations! You have finished all Atomix levels."
msgstr "Felicitări! Ați terminat toate nivelurile Atomix."
-#: ../src/main.c:503
-msgid "Couldn't find at least one level."
-msgstr "Nu s-a găsit cel puțin un nivel."
-
-#: ../src/main.c:508
-msgid "Do you want to finish the game?"
-msgstr "Doriți să încheiați jocul?"
+#~ msgid "Could not show link"
+#~ msgstr "Legătura nu poate fi afișată"
-#. create statistics frame
-#: ../src/main.c:701
-msgid "Statistics"
-msgstr "Statistici"
+#~ msgid "Time"
+#~ msgstr "Timp"
-#: ../src/main.c:707
-msgid "Level:"
-msgstr "Nivel:"
+#~ msgid "Score"
+#~ msgstr "Punctaj"
-#: ../src/main.c:708
-msgid "Molecule:"
-msgstr "Molecule:"
+#~ msgid "%dm %ds"
+#~ msgstr "%dm %ds"
-#: ../src/main.c:709
-msgid "Formula:"
-msgstr "Formulă:"
+#~ msgid "Name"
+#~ msgstr "Nume"
-#: ../src/main.c:710
-msgid "Score:"
-msgstr "Punctaj:"
+#~ msgid "Error"
+#~ msgstr "Eroare"
-#: ../src/main.c:711
-msgid "Time:"
-msgstr "Timp:"
+#~ msgid "Couldn't find level sequence description."
+#~ msgstr "Nu s-a găsit descrierea secvenței nivelului."
-#: ../src/main.c:734
-msgid "_Game"
-msgstr "_Joc"
-
-#: ../src/main.c:735
-msgid "_Help"
-msgstr "A_jutor"
+#~ msgid "No level found."
+#~ msgstr "Nu s-a găsit niciun nivel."
-#: ../src/main.c:737
-msgid "End Game"
-msgstr "Termină jocul"
+#~ msgid "Found level '%s' in: %s"
+#~ msgstr "S-a găsit nivelul „%s” în: %s"
-#: ../src/main.c:738
-msgid "Skip Level"
-msgstr "Omite nivelul"
+#~ msgid "Couldn't find at least one level."
+#~ msgstr "Nu s-a găsit cel puțin un nivel."
-#: ../src/main.c:739
-msgid "Reset Level"
-msgstr "Restabilește nivelul"
+#~ msgid "Do you want to finish the game?"
+#~ msgstr "Doriți să încheiați jocul?"
-#: ../src/main.c:741
-msgid "_Pause Game"
-msgstr "Întreru_pe jocul"
-
-#: ../src/main.c:742
-msgid "_Continue Game"
-msgstr "_Continuă jocul"
-
-#: ../src/main.c:743
-msgid "_Scores..."
-msgstr "_Punctaj..."
-
-#: ../src/main.c:745
-msgid "About"
-msgstr "Despre"
-
-#: ../src/theme-manager.c:136
-msgid "No themes found."
-msgstr "Nu s-a găsit nicio temă."
-
-#: ../src/theme-manager.c:194
-#, c-format
-msgid "Found theme '%s' in: %s"
-msgstr "A fost găsită tema „%s” în: %s"
+#~ msgid "_Game"
+#~ msgstr "_Joc"
-#: ../atomix.desktop.in.h:2
-msgid "Molecule puzzle game"
-msgstr "Joc puzzle cu molecule"
+#~ msgid "_Help"
+#~ msgstr "A_jutor"
+
+#~ msgid "_Pause Game"
+#~ msgstr "Întreru_pe jocul"
+
+#~ msgid "_Scores..."
+#~ msgstr "_Punctaj..."
+
+#~ msgid "About"
+#~ msgstr "Despre"
+
+#~ msgid "No themes found."
+#~ msgstr "Nu s-a găsit nicio temă."
+
+#~ msgid "Found theme '%s' in: %s"
+#~ msgstr "A fost găsită tema „%s” în: %s"
#~ msgid "Continue paused game"
#~ msgstr "Continuă joc întrerupt"
@@ -278,9 +310,6 @@
#~ msgid "_Preferences ..."
#~ msgstr "_Preferințe..."
-#~ msgid "_Undo move"
-#~ msgstr "An_ulare mișcare"
-
#~ msgid ""
#~ "You have not achieved any scores yet. Play a little before coming back!"
#~ msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/atomix-3.32.0/po/sr.po new/atomix-3.32.1/po/sr.po
--- old/atomix-3.32.0/po/sr.po 2019-03-11 10:08:38.000000000 +0100
+++ new/atomix-3.32.1/po/sr.po 2019-04-08 23:30:18.000000000 +0200
@@ -6,33 +6,33 @@
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: 2016-08-13 10:04+0000\n"
-"PO-Revision-Date: 2016-08-20 22:50+0200\n"
-"Last-Translator: Мирослав Николић <miroslavniko...@rocketmail.com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/atomix/issues\n";
+"POT-Creation-Date: 2019-03-11 09:12+0000\n"
+"PO-Revision-Date: 2019-03-11 19:06+0100\n"
+"Last-Translator: Марко М. Костић <marko.m.kos...@gmail.com>\n"
"Language-Team: Serbian <g...@prevod.org>\n"
"Language: sr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
-"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Project-Style: gnome\n"
+"X-Generator: Poedit 2.2.1\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
+#: data/atomix.appdata.xml.in:7 data/atomix.desktop.in:3 src/main.c:121
+#: src/main.c:688
msgid "Atomix"
msgstr "Атомикс"
-#: ../data/atomix.appdata.xml.in.h:2
+#: data/atomix.appdata.xml.in:8
msgid "Build molecules out of single atoms"
msgstr "Изградите молекуле од појединачних атома"
-#: ../data/atomix.appdata.xml.in.h:3
+#: data/atomix.appdata.xml.in:10
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 "
+"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 ""
@@ -41,7 +41,7 @@
"иду тамо где ви желите да их преместите, већ се померају све док не ударе "
"или у зид или у други атом."
-#: ../data/atomix.appdata.xml.in.h:4
+#: data/atomix.appdata.xml.in:16
msgid ""
"Try to build the molecules as fast as you can on each level to earn a higher "
"score."
@@ -49,203 +49,160 @@
"Покушајте да изградите молекуле што брже можете на сваком нивоу да остварите "
"већи резултат."
-#: ../data/atomix.desktop.in.h:2
+#: data/atomix.desktop.in:4
msgid "Molecule puzzle game"
msgstr "Логичка слагалица са молекулима"
-#: ../data/atomix.desktop.in.h:3 ../src/main.c:131
+#: data/atomix.desktop.in:5 src/main.c:124
msgid "A puzzle game about atoms and molecules"
msgstr "Логичка слагалица са атомима и молекулима"
-#: ../data/level/aceticacid.atomix.xml.h:1
+#. Translators: Do NOT translate or transliterate this text (this is an icon
file name)!
+#: data/atomix.desktop.in:8
+msgid "atomix"
+msgstr "atomix"
+
+#. Translators: Search terms to find this application. Do NOT translate or
localize the semicolons! The list MUST also end with a semicolon!
+#: data/atomix.desktop.in:13
+msgid "GNOME;game;logic;puzzle;atoms;molecules;sokoban;"
+msgstr ""
+"GNOME;game;logic;puzzle;atoms;molecules;sokoban;Гном;игра;логика;слагалица;"
+"атоми;молекули;сокобан;"
+
+#: data/level/aceticacid.atomix.xml.in:2
msgid "Acetic Acid"
msgstr "Ацетна киселина"
-#: ../data/level/acetone.atomix.xml.h:1
+#: data/level/acetone.atomix.xml.in:2
msgid "Acetone"
msgstr "Ацетин"
-#: ../data/level/butanol.atomix.xml.h:1
+#: data/level/butanol.atomix.xml.in:2
msgid "Butanol"
msgstr "Бутанол"
-#: ../data/level/cyclobutane.atomix.xml.h:1
+#: data/level/cyclobutane.atomix.xml.in:2
msgid "Cyclobutane"
msgstr "Циклобутан"
-#: ../data/level/dimethylether.atomix.xml.h:1
+#: data/level/dimethylether.atomix.xml.in:2
msgid "Dimethyl Ether"
msgstr "Диметил Етер"
-#: ../data/level/ethanal.atomix.xml.h:1
+#: data/level/ethanal.atomix.xml.in:2
msgid "Ethanal"
msgstr "Етанал"
-#: ../data/level/ethane.atomix.xml.h:1
+#: data/level/ethane.atomix.xml.in:2
msgid "Ethane"
msgstr "Етан"
-#: ../data/level/ethanol.atomix.xml.h:1
+#: data/level/ethanol.atomix.xml.in:2
msgid "Ethanol"
msgstr "Етанол"
-#: ../data/level/ethylene.atomix.xml.h:1
+#: data/level/ethylene.atomix.xml.in:2
msgid "Ethylene"
msgstr "Еталин"
-#: ../data/level/glycerin.atomix.xml.h:1
+#: data/level/glycerin.atomix.xml.in:2
msgid "Glycerin"
msgstr "Глицерин"
-#: ../data/level/lactic-acid.atomix.xml.h:1
+#: data/level/lactic-acid.atomix.xml.in:2
msgid "Lactic Acid"
msgstr "Млечна киселина"
-#: ../data/level/methanal.atomix.xml.h:1
+#: data/level/methanal.atomix.xml.in:2
msgid "Methanal"
msgstr "Метанал"
-#: ../data/level/methane.atomix.xml.h:1
+#: data/level/methane.atomix.xml.in:2
msgid "Methane"
msgstr "Метан"
-#: ../data/level/methanol.atomix.xml.h:1
+#: data/level/methanol.atomix.xml.in:2
msgid "Methanol"
msgstr "Метанол"
-#: ../data/level/propanal.atomix.xml.h:1
+#: data/level/propanal.atomix.xml.in:2
msgid "Propanal"
msgstr "Пропанол"
-#: ../data/level/propylene.atomix.xml.h:1
+#: data/level/propylene.atomix.xml.in:2
msgid "Propylene"
msgstr "Пропилен"
-#: ../data/level/pyran.atomix.xml.h:1
+#: data/level/pyran.atomix.xml.in:2
msgid "Pyran"
msgstr "Пиран"
-#: ../data/level/transbutylen.atomix.xml.h:1
+#: data/level/transbutylen.atomix.xml.in:2
msgid "Trans Butylen"
msgstr "Транс-бутелин"
-#: ../data/level/water.atomix.xml.h:1
+#: data/level/water.atomix.xml.in:2
msgid "Water"
msgstr "Вода"
-#: ../data/ui/interface.ui.h:2
-msgid "_File"
-msgstr "_Датотека"
-
-#: ../data/ui/interface.ui.h:3
-msgid "_New Game"
-msgstr "_Нова игра"
-
-#: ../data/ui/interface.ui.h:4
-msgid "_End Game"
-msgstr "_Крај игре"
-
-#: ../data/ui/interface.ui.h:5
-msgid "_Skip Level"
-msgstr "Прескочи _ниво"
-
-#: ../data/ui/interface.ui.h:6
-msgid "_Reset Level"
-msgstr "_Поново постави ниво"
-
-#: ../data/ui/interface.ui.h:7
-msgid "_Undo Move"
-msgstr "_Опозови потез"
-
-#: ../data/ui/interface.ui.h:8
-msgid "_Pause Game"
-msgstr "Паузирај _игру"
-
-#: ../data/ui/interface.ui.h:9
-msgid "_Continue Game"
-msgstr "_Настави игру"
-
-#: ../data/ui/interface.ui.h:10
-msgid "_Quit"
-msgstr "_Изађи"
-
-#: ../data/ui/interface.ui.h:11
-msgid "_Help"
-msgstr "По_моћ"
-
-#: ../data/ui/interface.ui.h:12
-msgid "_About"
-msgstr "_О игри"
-
-#: ../data/ui/interface.ui.h:13
+#: data/ui/interface.ui:99
msgid "Level:"
msgstr "Ниво:"
-#: ../data/ui/interface.ui.h:14
+#: data/ui/interface.ui:111
msgid "Molecule:"
msgstr "Молекул:"
-#: ../data/ui/interface.ui.h:15
+#: data/ui/interface.ui:123
msgid "Formula:"
msgstr "Формула:"
-#: ../data/ui/interface.ui.h:16
+#: data/ui/interface.ui:135
msgid "Score:"
msgstr "Резултат:"
-#: ../data/ui/interface.ui.h:17
+#: data/ui/interface.ui:147
msgid "Time:"
msgstr "Време:"
-#: ../data/ui/interface.ui.h:18
+#: data/ui/interface.ui:159 data/ui/interface.ui:170 data/ui/interface.ui:182
+#: data/ui/interface.ui:194
msgid "empty"
msgstr "празно"
-#: ../data/ui/interface.ui.h:19
+#: data/ui/interface.ui:213
msgid "Statistics"
msgstr "Статистика"
-#: ../data/ui/interface.ui.h:20
+#: data/ui/menu.ui:7
msgid "New Game"
msgstr "Нова игра"
-#: ../data/ui/interface.ui.h:21
+#: data/ui/menu.ui:12
+msgid "Pause/Continue Game"
+msgstr "Заустави или настави игру"
+
+#: data/ui/menu.ui:17
msgid "End Game"
msgstr "Крај игре"
-#: ../data/ui/interface.ui.h:22
+#: data/ui/menu.ui:23
msgid "Skip Level"
msgstr "Прескочи ниво"
-#: ../data/ui/interface.ui.h:23
+#: data/ui/menu.ui:28
msgid "Reset Level"
msgstr "Поново постави ниво"
-#: ../data/ui/interface.ui.h:24
+#: data/ui/menu.ui:32
msgid "Undo Move"
msgstr "Опозови потез"
-#: ../data/ui/interface.ui.h:25
-msgid "Pause Game"
-msgstr "Паузирај игру"
-
-#: ../data/ui/interface.ui.h:26
-msgid "Continue Game"
-msgstr "Настави игру"
-
-#: ../data/ui/interface.ui.h:27
-msgid "About"
-msgstr "О игри"
-
-#: ../data/ui/interface.ui.h:28
-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"
+#: data/ui/menu.ui:39
+msgid "About Atomix"
+msgstr "О Атомиксу"
+
+#: src/board-gtk.c:340
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 "
@@ -256,39 +213,75 @@
"преместите. Будите пажљиви, јер: атом наставља да се креће све док не лупи о "
"зид."
-#: ../src/level-manager.c:200
-msgid "Couldn't find level sequence description."
-msgstr "Не могу пронаћи опис радњи нивоа."
-
-#: ../src/level-manager.c:214
-msgid "No level found."
-msgstr "Ниво није пронађен."
-
-#: ../src/level-manager.c:283
-#, c-format
-msgid "Found level '%s' in: %s"
-msgstr "Пронађен ниво „%s“ у: %s"
-
-#: ../src/main.c:135
+#: src/main.c:128
msgid "translator-credits"
msgstr ""
"Александар Урошевић <u...@gmx.net>\n"
"Мирослав Николић <miroslavniko...@rocketmail.com>\n"
+"Марко М. Костић <marko.m.kos...@gmail.com>\n"
"\n"
"http://prevod.org — преводи на српски језик"
-#: ../src/main.c:438
+#: src/main.c:447
msgid "Congratulations! You have finished all Atomix levels."
msgstr "Честитам! Прешли сте све нивое Атомикса."
-#: ../src/theme-manager.c:225
-msgid "No themes found."
-msgstr "Тема није пронађена."
-
-#: ../src/theme-manager.c:283
-#, c-format
-msgid "Found theme '%s' in: %s"
-msgstr "Пронађена је тема „%s‟ у: %s"
+#~ msgid "_File"
+#~ msgstr "_Датотека"
+
+#~ msgid "_New Game"
+#~ msgstr "_Нова игра"
+
+#~ msgid "_End Game"
+#~ msgstr "_Крај игре"
+
+#~ msgid "_Skip Level"
+#~ msgstr "Прескочи _ниво"
+
+#~ msgid "_Reset Level"
+#~ msgstr "_Поново постави ниво"
+
+#~ msgid "_Undo Move"
+#~ msgstr "_Опозови потез"
+
+#~ msgid "_Pause Game"
+#~ msgstr "Паузирај _игру"
+
+#~ msgid "_Continue Game"
+#~ msgstr "_Настави игру"
+
+#~ msgid "_Quit"
+#~ msgstr "_Изађи"
+
+#~ msgid "_Help"
+#~ msgstr "По_моћ"
+
+#~ msgid "_About"
+#~ msgstr "_О игри"
+
+#~ msgid "Pause Game"
+#~ msgstr "Паузирај игру"
+
+#~ msgid "About"
+#~ msgstr "О игри"
+
+#~ msgid "Quit"
+#~ msgstr "Изађи"
+
+#~ msgid "Couldn't find level sequence description."
+#~ msgstr "Не могу пронаћи опис радњи нивоа."
+
+#~ msgid "No level found."
+#~ msgstr "Ниво није пронађен."
+
+#~ msgid "Found level '%s' in: %s"
+#~ msgstr "Пронађен ниво „%s“ у: %s"
+
+#~ msgid "No themes found."
+#~ msgstr "Тема није пронађена."
+
+#~ msgid "Found theme '%s' in: %s"
+#~ msgstr "Пронађена је тема „%s‟ у: %s"
#~ msgid "Could not show link"
#~ msgstr "Не могу да прикажем везицу"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/atomix-3.32.0/src/board-gtk.c
new/atomix-3.32.1/src/board-gtk.c
--- old/atomix-3.32.0/src/board-gtk.c 2019-03-11 10:08:38.000000000 +0100
+++ new/atomix-3.32.1/src/board-gtk.c 2019-04-08 23:30:18.000000000 +0200
@@ -81,6 +81,8 @@
/* Forward declarations of internal functions */
+static gboolean on_key_press_event (GObject *widget, GdkEventKey *event,
+ gpointer user_data);
void board_gtk_render (void);
static void render_tile (Tile *tile, gint row, gint col);
GtkWidget* create_tile (double x, double y, Tile *tile);
@@ -250,6 +252,7 @@
GdkEventButton *event,
gpointer direction)
{
+ gtk_widget_grab_focus (GTK_WIDGET (board_canvas));
/* is currently an object moved? */
if (anim_data->timeout_id != -1)
return FALSE;
@@ -433,6 +436,10 @@
create_logo ();
gtk_widget_show_all (GTK_WIDGET(board_canvas));
+ /* add playfield canvas to left side */
+ g_signal_connect (GTK_WIDGET(board_canvas), "key-press-event",
+ G_CALLBACK (on_key_press_event), app);
+
selector_data = selector_create ();
}
@@ -516,6 +523,7 @@
gboolean just_unselect;
guint new_row, new_col;
+ gtk_widget_grab_focus (GTK_WIDGET (board_canvas));
/* is currently an object moved? */
if (anim_data->timeout_id != -1)
return FALSE;
@@ -851,6 +859,14 @@
return FALSE;
}
+static gboolean on_key_press_event (GObject *widget, GdkEventKey *event,
+ gpointer user_data)
+{
+ if ((app->state == GAME_STATE_RUNNING) || (app->state ==
GAME_STATE_RUNNING_UNMOVED))
+ return board_gtk_handle_key_event (NULL, event, NULL);
+
+ return FALSE;
+}
static void selector_move_to (SelectorData *data, guint row, guint col)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/atomix-3.32.0/src/main.c new/atomix-3.32.1/src/main.c
--- old/atomix-3.32.0/src/main.c 2019-03-11 10:08:38.000000000 +0100
+++ new/atomix-3.32.1/src/main.c 2019-04-08 23:30:19.000000000 +0200
@@ -49,8 +49,6 @@
static void setup_level (void);
static void level_cleanup_view (void);
static void atomix_exit (void);
-static gboolean on_key_press_event (GObject *widget, GdkEventKey *event,
- gpointer user_data);
static void game_init (void);
static void update_statistics (void);
static void view_congratulations (void);
@@ -232,6 +230,7 @@
update_menu_item_state ();
update_statistics ();
+ gtk_widget_grab_focus (GTK_WIDGET (app->fi_matrix));
}
static void
@@ -374,15 +373,6 @@
}
-static gboolean on_key_press_event (GObject *widget, GdkEventKey *event,
- gpointer user_data)
-{
- if ((app->state == GAME_STATE_RUNNING) || (app->state ==
GAME_STATE_RUNNING_UNMOVED))
- return board_gtk_handle_key_event (NULL, event, NULL);
-
- return FALSE;
-}
-
static void game_init (void)
{
g_return_if_fail (app != NULL);
@@ -633,10 +623,6 @@
gtk_grid_attach_next_to (GTK_GRID (stats_grid), app->clock,
time_label, GTK_POS_RIGHT, 1, 1);
- /* add playfield canvas to left side */
- g_signal_connect (G_OBJECT (app->mainwin), "key-press-event",
- G_CALLBACK (on_key_press_event), app);
-
app->lb_level = GTK_WIDGET (gtk_builder_get_object (builder, "level_value"));
app->lb_name = GTK_WIDGET (gtk_builder_get_object (builder,
"molecule_value"));
app->lb_formula = GTK_WIDGET (gtk_builder_get_object (builder,
"formula_value"));
@@ -646,6 +632,16 @@
headerbar = GTK_WIDGET (gtk_builder_get_object(builder, "headerbar"));
gtk_application_add_window (GTK_APPLICATION (app->app_instance), GTK_WINDOW
(app->mainwin));
+
+ const char *new_game_accels[] = {"<Primary>N", NULL};
+ gtk_application_set_accels_for_action (GTK_APPLICATION (app->app_instance),
"win.GameNew", new_game_accels);
+ const char *pause_game_accels[] = {"<Primary>P", NULL};
+ gtk_application_set_accels_for_action (GTK_APPLICATION (app->app_instance),
"win.GamePause", pause_game_accels);
+ const char *skip_level_accels[] = {"<Primary>S", NULL};
+ gtk_application_set_accels_for_action (GTK_APPLICATION (app->app_instance),
"win.LevelSkip", skip_level_accels);
+ const char *undo_move_accels[] = {"<Primary>Z", NULL};
+ gtk_application_set_accels_for_action (GTK_APPLICATION (app->app_instance),
"win.GameUndo", undo_move_accels);
+
gtk_window_set_titlebar (GTK_WINDOW (app->mainwin), headerbar);
GMenu * menu = G_MENU (gtk_builder_get_object (builder, "primary-menu"));
