[gnome-games] Remove noclutter version of Gnometris; update translations to reflect
- From: Jason Clinton <jclinton src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-games] Remove noclutter version of Gnometris; update translations to reflect
- Date: Mon, 20 Apr 2009 23:44:39 -0400 (EDT)
commit cf55d7f74ffdd31042ffc8af2ace85d7d16d8f06
Author: jclinton <jclinton 1eca851f-d525-0410-b55f-d2baa8e04955>
Date: Mon Mar 30 01:26:37 2009 +0000
Remove noclutter version of Gnometris; update translations to reflect
---
gnometris/Makefile.am | 52 +----
gnometris/blockops-noclutter.cpp | 392 -----------------------------
gnometris/blockops-noclutter.h | 83 ------
gnometris/blockops.h | 1 -
gnometris/field-noclutter.cpp | 311 -----------------------
gnometris/field-noclutter.h | 81 ------
gnometris/main.cpp | 7 -
gnometris/preview-noclutter.cpp | 182 --------------
gnometris/preview-noclutter.h | 64 -----
gnometris/renderer-noclutter.cpp | 513 --------------------------------------
gnometris/renderer-noclutter.h | 99 --------
gnometris/tetris.cpp | 86 -------
gnometris/tetris.h | 7 -
po/POTFILES.in | 4 +-
po/POTFILES.skip | 2 -
po/af.po | 12 +-
po/am.po | 8 +-
po/ar.po | 12 +-
po/as.po | 12 +-
po/az.po | 8 +-
po/be.po | 8 +-
po/bg.po | 12 +-
po/bn.po | 8 +-
po/bn_IN.po | 12 +-
po/ca.po | 12 +-
po/cs.po | 12 +-
po/cy.po | 8 +-
po/da.po | 12 +-
po/de.po | 12 +-
po/dz.po | 12 +-
po/el.po | 12 +-
po/en_CA.po | 8 +-
po/en_GB.po | 12 +-
po/es.po | 12 +-
po/et.po | 12 +-
po/eu.po | 12 +-
po/fa.po | 8 +-
po/fi.po | 12 +-
po/fr.po | 12 +-
po/ga.po | 12 +-
po/gl.po | 12 +-
po/gu.po | 12 +-
po/he.po | 12 +-
po/hi.po | 12 +-
po/hr.po | 12 +-
po/hu.po | 12 +-
po/id.po | 8 +-
po/is.po | 8 +-
po/it.po | 12 +-
po/ja.po | 12 +-
po/ka.po | 8 +-
po/kn.po | 12 +-
po/ko.po | 12 +-
po/ku.po | 8 +-
po/lt.po | 12 +-
po/lv.po | 8 +-
po/mai.po | 12 +-
po/mk.po | 12 +-
po/ml.po | 12 +-
po/mn.po | 8 +-
po/mr.po | 12 +-
po/ms.po | 8 +-
po/nb.po | 12 +-
po/ne.po | 12 +-
po/nl.po | 12 +-
po/nn.po | 12 +-
po/oc.po | 12 +-
po/or.po | 12 +-
po/pa.po | 12 +-
po/pl.po | 12 +-
po/pt.po | 12 +-
po/pt_BR.po | 12 +-
po/ro.po | 12 +-
po/ru.po | 12 +-
po/rw.po | 8 +-
po/si.po | 8 +-
po/sk.po | 12 +-
po/sl.po | 12 +-
po/sq.po | 8 +-
po/sr.po | 12 +-
po/sr latin po | 12 +-
po/sv.po | 12 +-
po/ta.po | 12 +-
po/te.po | 12 +-
po/th.po | 12 +-
po/tr.po | 12 +-
po/uk.po | 12 +-
po/vi.po | 12 +-
po/wa.po | 8 +-
po/xh.po | 8 +-
po/zh_CN.po | 12 +-
po/zh_HK.po | 12 +-
po/zh_TW.po | 12 +-
93 files changed, 438 insertions(+), 2306 deletions(-)
diff --git a/gnometris/Makefile.am b/gnometris/Makefile.am
index 14c72b0..2d19300 100644
--- a/gnometris/Makefile.am
+++ b/gnometris/Makefile.am
@@ -11,27 +11,13 @@ gnometris_SOURCES = \
scoreframe.cpp \
scoreframe.h \
tetris.cpp \
- tetris.h
-
-if HAVE_CLUTTER
-gnometris_SOURCES += \
+ tetris.h \
preview.cpp \
preview.h \
blockops.cpp \
blockops.h \
renderer.cpp \
renderer.h
-else
-gnometris_SOURCES += \
- field-noclutter.cpp \
- field-noclutter.h \
- preview-noclutter.cpp \
- preview-noclutter.h \
- blockops-noclutter.cpp \
- blockops-noclutter.h \
- renderer-noclutter.cpp \
- renderer-noclutter.h
-endif
gnometris_CPPFLAGS = \
-I$(top_srcdir) \
@@ -39,10 +25,14 @@ gnometris_CPPFLAGS = \
gnometris_CXXFLAGS = \
$(GTK_CFLAGS) \
+ $(CLUTTER_CFLAGS) \
+ $(CLUTTER_GTK_CFLAGS) \
$(AM_CXXFLAGS)
gnometris_LDADD = \
$(top_builddir)/libgames-support/libgames-support.la \
+ $(CLUTTER_LIBS) \
+ $(CLUTTER_GTK_LIBS) \
$(GTK_LIBS) \
$(INTLLIBS)
@@ -52,7 +42,7 @@ gnometris_LDADD += $(GNOME_LIBS)
endif
if HAVE_RSVG
-gnometris_CXXFLAGS += $(RSVG_CFLAGS)
+gnometris_CXXFLAGS += $(RSVG_CFLAGS)
gnometris_LDADD += $(RSVG_LIBS)
endif
@@ -61,36 +51,6 @@ gnometris_CXXFLAGS += $(GHTREAD_CFLAGS)
gnometris_LDADD += $(GTHREAD_LIBS)
endif
-if HAVE_CLUTTER
-#noinst_PROGRAMS = gnometris-noclutter
-
-#gnometris_noclutter_SOURCES = \
-# main.cpp \
-# blocks.cpp \
-# blocks.h \
-# preview-noclutter.cpp \
-# preview-noclutter.h \
-# blockops-noclutter.cpp \
-# blockops-noclutter.h \
-# field-noclutter.cpp \
-# field-noclutter.h \
-# highscores.cpp \
-# highscores.h \
-# renderer-noclutter.cpp \
-# renderer-noclutter.h \
-# scoreframe.cpp \
-# scoreframe.h \
-# tetris.cpp \
-# tetris.h
-
-#gnometris_noclutter_CPPFLAGS = $(gnometris_CPPFLAGS) -UHAVE_CLUTTER
-#gnometris_noclutter_CXXFLAGS = $(gnometris_CXXFLAGS) -UHAVE_CLUTTER
-#gnometris_noclutter_LDADD = $(gnometris_LDADD)
-gnometris_CPPFLAGS += -DHAVE_CLUTTER
-gnometris_CXXFLAGS += $(CLUTTER_CFLAGS) $(CLUTTER_GTK_CFLAGS)
-gnometris_LDADD += $(CLUTTER_LIBS) $(CLUTTER_GTK_LIBS)
-endif
-
pixmapdir = $(pkgdatadir)/gnometris/pixmaps
pixmap_DATA = gnometris.svg
diff --git a/gnometris/blockops-noclutter.cpp b/gnometris/blockops-noclutter.cpp
deleted file mode 100644
index 9f87d86..0000000
--- a/gnometris/blockops-noclutter.cpp
+++ /dev/null
@@ -1,392 +0,0 @@
-/* -*- mode:C++; tab-width:8; c-basic-offset:8; indent-tabs-mode:true -*- */
-/*
- * written by J. Marcin Gorycki <marcin gorycki intel com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * For more details see the file COPYING.
- */
-
-#include <config.h>
-#include "blockops-noclutter.h"
-#include "blocks.h"
-
-BlockOps::BlockOps() :
- useTarget (false),
- blocknr (0),
- rot (0),
- color (0)
-{
- field = new Block*[COLUMNS];
-
- posx = COLUMNS / 2;
- posy = 0;
-
- for (int i = 0; i < COLUMNS; ++i)
- field[i] = new Block[LINES];
-
- emptyField();
-}
-
-BlockOps::~BlockOps()
-{
- for (int i = 0; i < COLUMNS; ++i)
- delete[] field[i];
-
- delete[] field;
-}
-
-bool
-BlockOps::blockOkHere(int x, int y, int b, int r)
-{
- x -= 2;
-
- for (int x1 = 0; x1 < 4; ++x1)
- {
- for (int y1 = 0; y1 < 4; ++y1)
- {
- if (blockTable[b][r][x1][y1] && (x1 + x < 0))
- return false;
- if (blockTable[b][r][x1][y1] && (x1 + x >= COLUMNS))
- return false;
- if (blockTable[b][r][x1][y1] && (y1 + y >= LINES))
- return false;
- if (blockTable[b][r][x1][y1] && field[x + x1][y1 + y].what == LAYING)
- return false;
- }
- }
-
- return true;
-}
-
-int
-BlockOps::getLinesToBottom()
-{
- int lines = LINES;
-
- for (int x = 0; x < 4; ++x)
- {
- for (int y = 3; y >= 0; --y)
- {
- if (!blockTable[blocknr][rot][x][y])
- continue;
- int yy = posy + y;
- for (; yy < LINES; ++yy)
- {
- if (field[posx + x - 2][yy].what == LAYING)
- break;
- }
- int tmp = yy - posy - y;
- if (lines > tmp)
- lines = tmp;
- }
- }
-
- return lines;
-}
-
-bool
-BlockOps::moveBlockLeft()
-{
- bool moved = false;
-
- if (blockOkHere(posx - 1, posy, blocknr, rot))
- {
- putBlockInField(true);
- --posx;
- putBlockInField(false);
- moved = true;
- }
-
- return moved;
-}
-
-bool
-BlockOps::moveBlockRight()
-{
- bool moved = false;
-
- if (blockOkHere(posx + 1, posy, blocknr, rot))
- {
- putBlockInField(true);
- ++posx;
- putBlockInField(false);
- moved = true;
- }
-
- return moved;
-}
-
-bool
-BlockOps::rotateBlock(bool rotateCCW)
-{
- bool moved = false;
-
- int r = rot;
-
- if ( rotateCCW )
- {
- if (--r < 0) r = 3;
- }
- else
- {
- if (++r >= 4) r = 0;
- }
-
- if (blockOkHere(posx, posy, blocknr, r))
- {
- putBlockInField(true);
- rot = r;
- putBlockInField(false);
- moved = true;
- }
-
- return moved;
-}
-
-bool
-BlockOps::moveBlockDown()
-{
- bool fallen = false;
-
- if (!blockOkHere(posx, posy + 1, blocknr, rot))
- fallen = true;
-
- if (!fallen)
- {
- putBlockInField(true);
- ++posy;
- putBlockInField(false);
- }
-
- return fallen;
-}
-
-void
-BlockOps::clearTarget ()
-{
- for (int x = 0; x < COLUMNS; ++x)
- for (int y = 0; y < LINES; ++y)
- if (field[x][y].what == TARGET)
- field[x][y].what = EMPTY;
-}
-
-// The target is the set of blocks which the currently falling block
-// will occupy when it lands. It is an aid for beginners.
-void
-BlockOps::generateTarget ()
-{
- if (!useTarget)
- return;
-
- clearTarget ();
-
- // FIXME: Check that this is actually guaranteed
- // to terminate (i.e. posx, posy, blocknr and rot
- // are guaranteed to be valid).
- int n = 0;
- do {
- n++;
- } while (blockOkHere (posx, posy + n, blocknr, rot));
- n--;
-
- // Mark the relevant places.
- putBlockInField (posx, posy + n, blocknr, rot, TARGET);
-}
-
-void
-BlockOps::setUseTarget (bool use)
-{
- useTarget = use;
- if (!useTarget)
- clearTarget ();
-}
-
-int
-BlockOps::dropBlock()
-{
- int count = 0;
-
- while (!moveBlockDown())
- count++;
-
- return count;
-}
-
-void
-BlockOps::fallingToLaying()
-{
- for (int x = 0; x < COLUMNS; ++x)
- for (int y = 0; y < LINES; ++y)
- if (field[x][y].what == FALLING)
- field[x][y].what = LAYING;
-}
-
-void
-BlockOps::eliminateLine(int l)
-{
- for (int y = l; y > 0; --y)
- {
- for (int x = 0; x < COLUMNS; ++x)
- {
- field[x][y] = field[x][y - 1];
-
- field[x][y - 1].what = EMPTY;
- field[x][y - 1].color = 0;
- }
- }
-}
-
-int
-BlockOps::checkFullLines()
-{
- // we can have at most 4 full lines (vertical block)
- int fullLines[4] = {0, };
- int numFullLines = 0;
-
- for (int y = posy; y < MIN(posy + 4, LINES); ++y)
- {
- bool f = true;
- for (int x = 0; x < COLUMNS; ++x)
- {
- if (field[x][y].what != LAYING)
- {
- f = false;
- break;
- }
- }
-
- if (f)
- {
- fullLines[numFullLines] = y;
- ++numFullLines;
- }
- }
-
- if (numFullLines > 0)
- {
- for (int i = 0; i < numFullLines; ++i)
- {
- eliminateLine(fullLines[i]);
- }
- }
-
- return numFullLines;
-}
-
-bool
-BlockOps::generateFallingBlock()
-{
- posx = COLUMNS / 2 + 1;
- posy = 0;
-
- blocknr = blocknr_next == -1 ? g_random_int_range(0, tableSize) :
- blocknr_next;
- rot = rot_next == -1 ? g_random_int_range(0, 4) : rot_next;
- int cn = random_block_colors ? g_random_int_range(0, NCOLOURS) :
- blocknr % NCOLOURS;
- color = color_next == -1 ? cn : color_next;
-
- blocknr_next = g_random_int_range(0, tableSize);
- rot_next = g_random_int_range(0, 4);
- color_next = random_block_colors ? g_random_int_range(0, NCOLOURS) :
- blocknr_next % NCOLOURS;
-
- if (!blockOkHere(posx, posy, blocknr, rot))
- return false;
-
- return true;
-}
-
-void
-BlockOps::emptyField(int filled_lines, int fill_prob)
-{
- int blank;
-
- for (int y = 0; y < LINES; ++y)
- {
- // Allow for at least one blank per line
- blank = g_random_int_range(0, COLUMNS);
-
- for (int x = 0; x < COLUMNS; ++x)
- {
- field[x][y].what = EMPTY;
- field[x][y].color = 0;
-
- if ((y>=(LINES - filled_lines)) && (x != blank) &&
- ((g_random_int_range(0, 10)) < fill_prob)) {
- field[x][y].what = LAYING;
- field[x][y].color =
- g_random_int_range(0, NCOLOURS);
- }
- }
- }
-}
-
-void
-BlockOps::emptyField(void)
-{
- emptyField(0,5);
-}
-
-void
-BlockOps::putBlockInField (int bx, int by, int block, int rotation,
- SlotType fill)
-{
- for (int x = 0; x < 4; ++x)
- {
- for (int y = 0; y < 4; ++y)
- {
- if (blockTable[block][rotation][x][y])
- {
- int i = bx - 2 + x;
- int j = y + by;
-
- if ((fill == TARGET) &&
- (field[i][j].what != EMPTY))
- return;
-
- field[i][j].what = fill;
- if ((fill == FALLING) || (fill == LAYING))
- field[i][j].color = color;
- else
- field[i][j].color = 0;
- }
- }
- }
-}
-
-// This is now just a wrapper. I'm not sure which version should be
-// used in general: having the field keep track of the block worries
-// me, but I can't say it is definitely wrong.
-void
-BlockOps::putBlockInField (bool erase)
-{
- if (erase)
- putBlockInField (posx, posy, blocknr, rot, EMPTY);
- else
- putBlockInField (posx, posy, blocknr, rot, FALLING);
-}
-
-bool
-BlockOps::isFieldEmpty (void)
-{
- for (int x = 0; x < COLUMNS; x++) {
- if (field[x][LINES-1].what != EMPTY)
- return false;
- }
-
- return true;
-}
diff --git a/gnometris/blockops-noclutter.h b/gnometris/blockops-noclutter.h
deleted file mode 100644
index 3321444..0000000
--- a/gnometris/blockops-noclutter.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- mode:C++; tab-width:8; c-basic-offset:8; indent-tabs-mode:true -*- */
-#ifndef __blockops_h__
-#define __blockops_h__
-
-/*
- * written by J. Marcin Gorycki <marcin gorycki intel com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * For more details see the file COPYING.
- */
-
-#include "tetris.h"
-
-enum SlotType {
- EMPTY,
- TARGET,
- FALLING,
- LAYING
-};
-
-struct Block {
- SlotType what;
- int color;
-};
-
-class BlockOps {
-public:
- BlockOps ();
- ~BlockOps ();
-
- bool moveBlockLeft ();
- bool moveBlockRight ();
- bool moveBlockDown ();
- bool rotateBlock (bool);
- int dropBlock ();
- void fallingToLaying ();
- int checkFullLines ();
- bool generateFallingBlock ();
- void emptyField (void);
- void emptyField (int filled_lines, int fill_prob);
- void putBlockInField (bool erase);
- int getLinesToBottom ();
- bool isFieldEmpty (void);
- void setUseTarget (bool);
- bool getUseTarget () {
- return useTarget;
- };
-
-private:
- void putBlockInField (int bx, int by, int blocknr, int rotation,
- SlotType fill);
- bool blockOkHere (int x, int y, int b, int r);
- void eliminateLine (int l);
-
- bool useTarget;
-protected:
- void clearTarget ();
- void generateTarget ();
-
- Block **field;
-
- int blocknr;
- int rot;
- int color;
-
- int posx;
- int posy;
-};
-
-#endif //__blockops_h__
diff --git a/gnometris/blockops.h b/gnometris/blockops.h
index 4c573aa..1fe8ebe 100644
--- a/gnometris/blockops.h
+++ b/gnometris/blockops.h
@@ -24,7 +24,6 @@
#include "tetris.h"
#include "renderer.h"
-
#include <clutter/clutter.h>
enum SlotType {
diff --git a/gnometris/field-noclutter.cpp b/gnometris/field-noclutter.cpp
deleted file mode 100644
index 6de293c..0000000
--- a/gnometris/field-noclutter.cpp
+++ /dev/null
@@ -1,311 +0,0 @@
-/* -*- mode:C++; tab-width:8; c-basic-offset:8; indent-tabs-mode:true -*- */
-/*
- * written by J. Marcin Gorycki <marcin gorycki intel com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * For more details see the file COPYING.
- */
-
-#include <config.h>
-#include "field-noclutter.h"
-#include "blocks.h"
-#include "renderer-noclutter.h"
-
-#define FONT "Sans Bold"
-
-Field::Field():
- BlockOps(),
- buffer(NULL),
- background(NULL),
- showPause(false),
- showGameOver(false),
- backgroundImage(NULL),
- backgroundImageTiled(false),
- useBGImage(false),
- backgroundColor(NULL)
-{
- themeID = 0;
- renderer = NULL;
- rendererTheme = -1;
-
- w = gtk_drawing_area_new();
-
- g_signal_connect (w, "expose_event", G_CALLBACK (expose), this);
- g_signal_connect (w, "configure_event", G_CALLBACK (configure), this);
- /* We do our own double-buffering. */
- gtk_widget_set_double_buffered(w, FALSE);
-
- gtk_widget_set_size_request (w, COLUMNS*190/LINES, 190);
-
- gtk_widget_show (w);
-}
-
-Field::~Field()
-{
- if (buffer)
- cairo_surface_destroy(buffer);
- if (background)
- cairo_surface_destroy(background);
-
- if (renderer)
- delete renderer;
-}
-
-void
-Field::rescaleBackground ()
-{
- cairo_t *bg_cr;
- cairo_t *tmp_cr;
-
- if (!buffer)
- return;
-
- tmp_cr = cairo_create (buffer);
-
- if (background)
- cairo_surface_destroy(background);
-
- background = cairo_surface_create_similar (cairo_get_target (tmp_cr),
- CAIRO_CONTENT_COLOR,
- w->allocation.width,
- w->allocation.height);
-
- cairo_destroy (tmp_cr);
-
- bg_cr = cairo_create (background);
-
- if (useBGImage && backgroundImage) {
- gdouble xscale, yscale;
- cairo_matrix_t m;
-
- /* FIXME: This doesn't handle tiled backgrounds in the obvious way. */
- gdk_cairo_set_source_pixbuf(bg_cr, backgroundImage, 0, 0);
- xscale = 1.0*gdk_pixbuf_get_width (backgroundImage)/width;
- yscale = 1.0*gdk_pixbuf_get_height (backgroundImage)/height;
- cairo_matrix_init_scale (&m, xscale, yscale);
- cairo_pattern_set_matrix (cairo_get_source (bg_cr), &m);
- } else if (backgroundColor)
- gdk_cairo_set_source_color(bg_cr, backgroundColor);
- else
- cairo_set_source_rgb(bg_cr, 0., 0., 0.);
-
- cairo_paint(bg_cr);
-
- cairo_destroy(bg_cr);
-
- redraw ();
-}
-
-gboolean
-Field::configure(GtkWidget *widget, GdkEventConfigure *event, Field *field)
-{
- cairo_t *cr;
-
- field->width = widget->allocation.width;
- field->height = widget->allocation.height;
-
- cr = gdk_cairo_create (widget->window);
-
- if (field->buffer)
- cairo_surface_destroy(field->buffer);
-
- // backing buffer
- field->buffer = cairo_surface_create_similar (cairo_get_target (cr),
- CAIRO_CONTENT_COLOR,
- widget->allocation.width,
- widget->allocation.height);
-
- cairo_destroy (cr);
-
-
- field->rescaleBackground ();
-
- return TRUE;
-}
-
-void
-Field::draw (gint x, gint y, gint wd, gint ht)
-{
- cairo_t *cr;
-
- cr = gdk_cairo_create (w->window);
-
- cairo_set_source_surface (cr, buffer, 0, 0);
- cairo_rectangle (cr, x, y, wd, ht);
- cairo_fill (cr);
-
- cairo_destroy (cr);
-}
-
-void
-Field::draw (void)
-{
- draw (0, 0, width, height);
-}
-
-gboolean
-Field::expose(GtkWidget *widget, GdkEventExpose *event, Field *field)
-{
- field->draw (event->area.x, event->area.y,
- event->area.width, event->area.height);
-
- return TRUE;
-}
-
-void
-Field::drawMessage(cairo_t *cr, const char *msg)
-{
- PangoLayout *dummy_layout;
- PangoLayout *layout;
- PangoFontDescription *desc;
- int lw, lh;
-
- cairo_save(cr);
-
- // Center coordinates
- cairo_translate(cr, width / 2, height / 2);
-
- desc = pango_font_description_from_string(FONT);
-
- layout = pango_cairo_create_layout(cr);
- pango_layout_set_text(layout, msg, -1);
-
- dummy_layout = pango_layout_copy(layout);
- pango_layout_set_font_description(dummy_layout, desc);
- pango_layout_get_size(dummy_layout, &lw, &lh);
- g_object_unref(dummy_layout);
-
- // desired height : lh = widget width * 0.9 : lw
- pango_font_description_set_absolute_size(desc, ((float) lh / lw) * PANGO_SCALE * width * 0.8);
- pango_layout_set_font_description(layout, desc);
- pango_font_description_free(desc);
-
- pango_layout_get_size(layout, &lw, &lh);
- cairo_move_to(cr, -((double)lw / PANGO_SCALE) / 2, -((double)lh / PANGO_SCALE) / 2);
- pango_cairo_layout_path(cr, layout);
- cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
- cairo_fill_preserve (cr);
- cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
- /* A linewidth of 2 pixels at the default size. */
- cairo_set_line_width (cr, width/220.0);
- cairo_stroke (cr);
-
- g_object_unref(layout);
-
- cairo_restore(cr);
-}
-
-void
-Field::redraw()
-{
- cairo_t *cr;
-
- g_return_if_fail(buffer);
-
- generateTarget ();
-
- if (rendererTheme != themeID) {
-
- if (renderer)
- delete renderer;
-
- renderer = rendererFactory (themeID, buffer, background, field,
- COLUMNS, LINES, width, height);
- rendererTheme = themeID;
- } else {
- renderer->setTarget (buffer);
- renderer->setBackground (background);
- renderer->data = field;
- renderer->width = COLUMNS;
- renderer->height = LINES;
- renderer->pxwidth = width;
- renderer->pxheight = height;
- }
-
- renderer->render ();
-
- cr = cairo_create(buffer);
-
- if (showPause)
- drawMessage(cr, _("Paused"));
- else if (showGameOver)
- drawMessage(cr, _("Game Over"));
-
- cairo_destroy(cr);
-
- draw ();
-}
-
-void
-Field::setBackground(GdkPixbuf *bgImage)//, bool tiled)
-{
- backgroundImage = (GdkPixbuf *) g_object_ref(bgImage);
- useBGImage = true;
- // backgroundImageTiled = tiled;
-
- rescaleBackground ();
-}
-
-void
-Field::setBackground(GdkColor *bgColor)
-{
- backgroundColor = gdk_color_copy(bgColor);
- if (backgroundImage) {
- g_object_unref (backgroundImage);
- backgroundImage = NULL;
- }
- useBGImage = false;
-
- rescaleBackground ();
-}
-
-void
-Field::showPauseMessage()
-{
- showPause = true;
-
- redraw();
-}
-
-void
-Field::hidePauseMessage()
-{
- showPause = false;
-
- redraw();
-}
-
-void
-Field::showGameOverMessage()
-{
- showGameOver = true;
-
- redraw();
-}
-
-void
-Field::hideGameOverMessage()
-{
- showGameOver = false;
-
- redraw();
-}
-
-void
-Field::setTheme (gint id)
-{
- themeID = id;
-}
diff --git a/gnometris/field-noclutter.h b/gnometris/field-noclutter.h
deleted file mode 100644
index c37c9b4..0000000
--- a/gnometris/field-noclutter.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- mode:C++; tab-width:8; c-basic-offset:8; indent-tabs-mode:true -*- */
-#ifndef __field_noclutter_h__
-#define __field_noclutter_h__
-
-/*
- * written by J. Marcin Gorycki <marcin gorycki intel com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * For more details see the file COPYING.
- */
-
-#include "tetris.h"
-#include "blockops-noclutter.h"
-#include "renderer-noclutter.h"
-
-class Field:public BlockOps {
-public:
- Field ();
- ~Field ();
-
- void setBackground (GdkPixbuf * bgImage); //, bool tiled); fixme: move tiling here.
- void setBackground (GdkColor * bgColor);
- void placeBlock (int x, int y, int bcolor, bool remove);
- void showPauseMessage ();
- void hidePauseMessage ();
- void showGameOverMessage ();
- void hideGameOverMessage ();
- void redraw ();
- void setTheme (gint id);
-
- GtkWidget *getWidget () {
- return w;
- }
-private:
- GtkWidget * w;
-
- int width;
- int height;
-
- cairo_surface_t *buffer;
- cairo_surface_t *background;
- cairo_surface_t **blocks;
-
- bool showPause;
- bool showGameOver;
- Renderer *renderer;
- gint rendererTheme;
-
- GdkPixbuf *backgroundImage;
- bool backgroundImageTiled;
- bool useBGImage;
- GdkColor *backgroundColor;
- gint themeID;
-
- void drawMessage (cairo_t * cr, const char *msg);
- void redrawAll ();
- void draw (gint x, gint y, gint w, gint h);
- void draw ();
- void rescaleBackground ();
-
- static gboolean configure (GtkWidget * widget, GdkEventConfigure * event,
- Field * field);
- static gboolean expose (GtkWidget * widget, GdkEventExpose * event,
- Field * field);
-
-};
-
-#endif //__field_noclutter_h__
diff --git a/gnometris/main.cpp b/gnometris/main.cpp
index 18a838a..e8cab66 100644
--- a/gnometris/main.cpp
+++ b/gnometris/main.cpp
@@ -25,10 +25,7 @@
#include <libgames-support/games-sound.h>
#include <libgames-support/games-conf.h>
#include <libgames-support/games-runtime.h>
-
-#ifdef HAVE_CLUTTER
#include <clutter-gtk/gtk-clutter-embed.h>
-#endif
#include "tetris.h"
@@ -54,9 +51,7 @@ main(int argc, char *argv[])
GOptionContext *context = g_option_context_new (NULL);
g_option_context_add_group (context, gtk_get_option_group (TRUE));
-#ifdef HAVE_CLUTTER
g_option_context_add_group (context, clutter_get_option_group_without_init ());
-#endif
g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
games_sound_add_option_group (context);
@@ -74,13 +69,11 @@ main(int argc, char *argv[])
games_conf_initialise ("Gnometris");
-#ifdef HAVE_CLUTTER
if (gtk_clutter_init_with_args (NULL, NULL, NULL, NULL, NULL, &error) != CLUTTER_INIT_SUCCESS) {
g_printerr ("Failed to initialise clutter: %s\n", error->message);
g_error_free (error);
return 1;
}
-#endif
Tetris *t = new Tetris(cmdlineLevel);
diff --git a/gnometris/preview-noclutter.cpp b/gnometris/preview-noclutter.cpp
deleted file mode 100644
index 43b3228..0000000
--- a/gnometris/preview-noclutter.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/* -*- mode:C++; tab-width:8; c-basic-offset:8; indent-tabs-mode:true -*- */
-
-/*
- * written by J. Marcin Gorycki <marcin gorycki intel com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * For more details see the file COPYING.
- */
-
-#include <config.h>
-#include "preview-noclutter.h"
-#include "blocks.h"
-
-#define PREVIEW_WIDTH 6
-#define PREVIEW_HEIGHT 6
-
-// FIXME: Remove
-#define PREVIEW_SIZE 5
-
-Preview::Preview():
- blocknr(-1),
- blockrot(0),
- blockcolor(0),
- enabled(true),
- themeID (0),
- background (0)
-{
- blocks = new Block*[PREVIEW_WIDTH];
- for (int i = 0; i < PREVIEW_WIDTH; i++) {
- blocks[i] = new Block [PREVIEW_HEIGHT];
- for (int j = 0; j < PREVIEW_HEIGHT; j++) {
- blocks[i][j].what = EMPTY;
- blocks[i][j].color = 0;
- }
- }
-
- w = gtk_drawing_area_new();
-
- g_signal_connect (w, "expose_event", G_CALLBACK (expose), this);
- g_signal_connect (w, "configure_event", G_CALLBACK (configure), this);
-
- /* FIXME: We should scale with the rest of the UI, but that requires
- * changes to the widget layout - i.e. wrap the preview in an
- * fixed-aspect box. */
- gtk_widget_set_size_request (w, PREVIEW_SIZE * 20,
- PREVIEW_SIZE * 20);
-
- gtk_widget_show (w);
-}
-
-Preview::~Preview ()
-{
- for (int i = 0; i < PREVIEW_WIDTH; i++)
- delete[] blocks[i];
-
- delete[] blocks;
-}
-
-void
-Preview::enable(bool en)
-{
- enabled = en;
- gtk_widget_queue_draw (w);
-}
-
-void
-Preview::setTheme (int id)
-{
- themeID = id;
-}
-
-void
-Preview::previewBlock(int bnr, int brot, int bcolor)
-{
- int x, y;
-
- blocknr = bnr;
- blockrot = brot;
- blockcolor = bcolor;
-
- for (x = 1; x < PREVIEW_WIDTH - 1; x++) {
- for (y = 1; y < PREVIEW_HEIGHT - 1; y++) {
- if ((blocknr != -1) &&
- blockTable[blocknr][blockrot][x-1][y-1]) {
- blocks[x][y].what = LAYING;
- blocks[x][y].color = blockcolor;
- } else {
- blocks[x][y].what = EMPTY;
- }
- }
- }
-
-}
-
-gint
-Preview::configure(GtkWidget * widget, GdkEventConfigure * event, Preview * preview)
-{
- cairo_t *cr;
-
- preview->width = event->width;
- preview->height = event->height;
-
- cr = gdk_cairo_create (widget->window);
-
- if (preview->background)
- cairo_surface_destroy (preview->background);
-
- preview->background =
- cairo_surface_create_similar (cairo_get_target (cr),
- CAIRO_CONTENT_COLOR,
- event->width,
- event->height);
-
- cairo_destroy (cr);
-
- cr = cairo_create (preview->background);
- cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
- cairo_paint (cr);
- cairo_destroy (cr);
-
- return TRUE;
-}
-
-gint
-Preview::expose(GtkWidget * widget, GdkEventExpose * event, Preview * preview)
-{
- cairo_t *cr;
- Renderer *r;
-
- cr = gdk_cairo_create (widget->window);
-
- if (!preview->enabled)
- {
- cairo_scale (cr, 1.0*widget->allocation.width/PREVIEW_WIDTH,
- 1.0*widget->allocation.height/PREVIEW_HEIGHT);
- cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
-
- cairo_set_source_rgb (cr, 0, 0, 0);
- cairo_paint (cr);
-
- cairo_set_source_rgb (cr, 0.8, 0.1, 0.1);
- cairo_set_line_width (cr, 0.5);
-
- cairo_move_to (cr, 1, 1);
- cairo_line_to (cr, PREVIEW_WIDTH-1, PREVIEW_HEIGHT-1);
- cairo_move_to (cr, PREVIEW_WIDTH-1, 1);
- cairo_line_to (cr, 1, PREVIEW_HEIGHT-1);
-
- cairo_stroke (cr);
- }
- else
- {
- cairo_surface_t *dst;
-
- dst = cairo_get_target (cr);
-
- r = rendererFactory (preview->themeID, dst,
- preview->background, preview->blocks,
- PREVIEW_WIDTH, PREVIEW_HEIGHT,
- preview->width, preview->height);
-
- r->render ();
- delete r;
- }
-
- cairo_destroy (cr);
-
- return TRUE;
-}
diff --git a/gnometris/preview-noclutter.h b/gnometris/preview-noclutter.h
deleted file mode 100644
index a8f31b4..0000000
--- a/gnometris/preview-noclutter.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- mode:C++; tab-width:8; c-basic-offset:8; indent-tabs-mode:true -*- */
-#ifndef __preview_noclutter_h__
-#define __preview_noclutter_h__
-
-/*
- * written by J. Marcin Gorycki <marcin gorycki intel com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * For more details see the file COPYING.
- */
-
-#include "tetris.h"
-#include "blockops-noclutter.h"
-#include "renderer-noclutter.h"
-
-class Preview {
-public:
- Preview ();
- ~Preview ();
-
- GtkWidget *getWidget () {
- return w;
- }
-
- void enable (bool enable);
- void previewBlock (int bnr, int brot, int bcolor);
- void setTheme (int id);
-
-private:
- GtkWidget * w;
- gint width;
- gint height;
-
- int blocknr;
- int blockrot;
- int blockcolor;
-
- bool enabled;
-
- int themeID;
- cairo_surface_t *background;
-
- static gint configure (GtkWidget * widget, GdkEventConfigure * event,
- Preview * preview);
- static gint expose (GtkWidget * widget, GdkEventExpose * event,
- Preview * preview);
-
-Block **blocks;
-};
-
-#endif //__preview_h__
diff --git a/gnometris/renderer-noclutter.cpp b/gnometris/renderer-noclutter.cpp
deleted file mode 100644
index 5b07273..0000000
--- a/gnometris/renderer-noclutter.cpp
+++ /dev/null
@@ -1,513 +0,0 @@
-/* -*- mode:C++; tab-width:8; c-basic-offset:8; indent-tabs-mode:true -*- */
-/*
- * written by Callum McKenzie <callum spooky-possum org>
- *
- * Copyright (C) 2005 by Callum McKenzie
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * For more details see the file COPYING.
- */
-
-
-#include <config.h>
-
-#include <string.h>
-
-#include "renderer-noclutter.h"
-
-const ThemeTableEntry ThemeTable[] = {{N_("Plain"), "plain"},
- {N_("Joined"), "joined"},
- {N_("Tango Flat"), "tangoflat"},
- {N_("Tango Shaded"), "tangoshaded"},
- {NULL, NULL}};
-
-
-gint themeNameToNumber (const gchar *id)
-{
- int i;
- const ThemeTableEntry *t;
-
- if (id == NULL)
- return 0;
-
- t = ThemeTable;
- i = 0;
- while (t->id) {
- if (strcmp (t->id, id) == 0)
- return i;
- t++;
- i++;
- }
-
- return 0;
-}
-
-Renderer * rendererFactory (gint id, cairo_surface_t *dst,
- cairo_surface_t *bg, Block **src, int w,
- int h, int pxw, int pxh)
-{
- switch (id) {
- case 3:
- return new TangoBlock (dst, bg, src, w, h, pxw, pxh, TRUE);
- case 2:
- return new TangoBlock (dst, bg, src, w, h, pxw, pxh, FALSE);
- case 1:
- return new JoinedUp (dst, bg, src, w, h, pxw, pxh);
- case 0:
- default:
- return new Renderer (dst, bg, src, w, h, pxw, pxh);
- }
-}
-
-/* The Renderer class is a basic drawing class that is structured to
- be easily customised by subclasses. The most basic customisation
- would be to override drawCell to customise the drawing of one
- cell. If more sophisticated drawing is required for either the
- foreground or the background is required then drawForeground and
- drawBackground are the functions to alter. If a completely
- different drawing regime is required then the render method - the
- only entry point from external code - can be replaced. */
-
-/* Note that the default renderer is designed to be reasonably fast
- and flexible, not flashy. Also note that the renderer may be used
- for the preview widget and possibly the theme previewer, so make no
- assumptions. */
-
-Renderer::Renderer (cairo_surface_t *dst, cairo_surface_t *bg, Block **src,
- int w, int h, int pxw, int pxh)
-{
- target = cairo_surface_reference (dst);
- background = cairo_surface_reference (bg);
- data = src;
- width = w;
- height = h;
- pxwidth = pxw;
- pxheight = pxh;
-}
-
-Renderer::~Renderer ()
-{
- cairo_surface_destroy (target);
- cairo_surface_destroy (background);
-}
-
-void Renderer::setTarget (cairo_surface_t * dst)
-{
- cairo_surface_destroy (target);
- target = cairo_surface_reference (dst);
-}
-
-void Renderer::setBackground (cairo_surface_t *bg)
-{
- cairo_surface_destroy (background);
- background = cairo_surface_reference (bg);
-}
-
-void Renderer::drawCell (cairo_t *cr, gint x, gint y)
-{
- int i;
- const gdouble colours[7][3] = {{1.0, 0.0, 0.0},
- {0.0, 1.0, 0.0},
- {0.0, 0.0, 1.0},
- {1.0, 1.0, 1.0},
- {1.0, 1.0, 0.0},
- {1.0, 0.0, 1.0},
- {0.0, 1.0, 1.0}};
-
- if (data[x][y].what == EMPTY)
- return;
-
- if (data[x][y].what == TARGET) {
- cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.3);
- } else {
- i = data[x][y].color;
- i = CLAMP (i, 0, 6);
-
- cairo_set_source_rgb(cr, colours[i][0],
- colours[i][1],
- colours[i][2]);
- }
-
- cairo_rectangle(cr, x+0.05, y+0.05,
- 0.9, 0.9);
- cairo_fill (cr);
-}
-
-void Renderer::drawBackground (cairo_t *cr)
-{
- cairo_set_source_surface (cr, background, 0, 0);
- cairo_paint (cr);
-}
-
-void Renderer::drawForeground (cairo_t *cr)
-{
- int x, y;
-
- cairo_scale(cr, 1.0 * pxwidth / width, 1.0 * pxheight / height);
-
- for (y = 0; y<height; y++) {
- for (x = 0; x<width; x++) {
- drawCell (cr, x, y);
- }
- }
-}
-
-void Renderer::render ()
-{
- cairo_t *cr;
-
- cr = cairo_create (target);
-
- drawBackground (cr);
- drawForeground (cr);
-
- cairo_destroy (cr);
-}
-
-/*--------------------------------------------------------*/
-
-void JoinedUp::drawInnerCorner (cairo_t *cr)
-{
- border = 0.2;
- cairo_move_to (cr, 0, 0);
- cairo_line_to (cr, border, border);
- cairo_line_to (cr, border, 0);
- cairo_move_to (cr, border, border);
- cairo_line_to (cr, 0, border);
- cairo_stroke (cr);
-}
-
-void JoinedUp::drawOuterCorner (cairo_t *cr)
-{
- border = 0.2;
- cairo_move_to (cr, 0, 0.5);
- cairo_line_to (cr, 0, 0);
- cairo_line_to (cr, 0.5, 0);
- cairo_move_to (cr, 0, 0);
- cairo_line_to (cr, border, border);
- cairo_line_to (cr, 0.5, border);
- cairo_move_to (cr, border, border);
- cairo_line_to (cr, border, 0.5);
- cairo_stroke (cr);
-}
-
-void JoinedUp::drawHEdge (cairo_t *cr)
-{
- border = 0.2;
- cairo_move_to (cr, 0, 0);
- cairo_line_to (cr, 0.5, 0);
- cairo_move_to (cr, 0, border);
- cairo_line_to (cr, 0.5, border);
- cairo_stroke (cr);
-}
-
-void JoinedUp::drawVEdge (cairo_t *cr)
-{
- border = 0.2;
- cairo_move_to (cr, 0, 0);
- cairo_line_to (cr, 0, 0.5);
- cairo_move_to (cr, border, 0);
- cairo_line_to (cr, border, 0.5);
- cairo_stroke (cr);
-}
-
-void JoinedUp::drawCell (cairo_t *cr, gint x, gint y)
-{
- int i, m, n;
- int segments[4];
- double xofs;
- double yofs;
- int c;
- int neighbours[8];
- static const int formtable[4][8] = {{0, 7, 0, 7, 4, 9, 4, 8},
- {1, 4, 1, 4, 5, 10, 5, 8},
- {2, 6, 2, 6, 7, 11, 7, 8},
- {3, 5, 3, 5, 6, 12, 6, 8}};
- static const gdouble colours[7][3] = {{1.0, 0.0, 0.0},
- {0.1, 0.8, 0.1},
- {0.1, 0.1, 0.8},
- {1.0, 1.0, 1.0},
- {1.0, 1.0, 0.0},
- {0.8, 0.1, 0.8},
- {0.0, 1.0, 1.0}};
- static const int neighbourmap[8][2] = {{-1, -1}, {0, -1}, {+1, -1},
- {-1, 0}, {+1, 0},
- {-1, +1}, {0, +1}, {+1, +1}};
-
- if (data[x][y].what == EMPTY)
- return;
-
- i = data[x][y].color;
- i = CLAMP (i, 0, 6);
-
- cairo_save (cr);
- cairo_translate (cr, x, y);
-
- cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
- cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
- cairo_set_line_width (cr, 0.05);
-
- if (data[x][y].what == TARGET) {
- cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0);
- } else {
- cairo_set_source_rgb (cr, colours[i][0],
- colours[i][1],
- colours[i][2]);
- }
- cairo_rectangle (cr, -0.025, -0.025, 1.025, 1.025);
- cairo_fill (cr);
- cairo_set_source_rgb (cr, 0.5, 0.5, 0.5);
-
- // Enumerate the neighbours.
- c = data[x][y].color;
- for (i=0; i<8; i++) {
- m = x + neighbourmap[i][0];
- n = y + neighbourmap[i][1];
- if ((m < 0) || (n < 0) || (m >= width) || (n >= height))
- neighbours[i] = 0;
- else
- neighbours[i] = ((data[m][n].what != EMPTY) &&
- (data[m][n].color == c)) ? 1 : 0;
- }
-
- // Sort out which quadrant of the square is drawn in what way.
- segments[0] = formtable [0][neighbours[3]*4 +
- neighbours[0]*2 +
- neighbours[1]];
- segments[1] = formtable [1][neighbours[1]*4 +
- neighbours[2]*2 +
- neighbours[4]];
- segments[2] = formtable [2][neighbours[6]*4 +
- neighbours[5]*2 +
- neighbours[3]];
- segments[3] = formtable [3][neighbours[4]*4 +
- neighbours[7]*2 +
- neighbours[6]];
-
- // Finally: do the actual drawing.
- for (i=0; i<4; i++) {
- cairo_save (cr);
- xofs = 0.5*(i % 2);
- yofs = 0.5*(i / 2);
- cairo_translate (cr, xofs, yofs);
- switch (segments[i]) {
- case 0:
- drawOuterCorner (cr);
- break;
- case 1:
- cairo_scale (cr, -1.0, 1.0);
- cairo_translate (cr, -0.5, 0);
- drawOuterCorner (cr);
- break;
- case 2:
- cairo_scale (cr, 1.0, -1.0);
- cairo_translate (cr, 0, -0.5);
- drawOuterCorner (cr);
- break;
- case 3:
- cairo_scale (cr, -1.0, -1.0);
- cairo_translate (cr, -0.5, -0.5);
- drawOuterCorner (cr);
- break;
- case 4:
- drawHEdge (cr);
- break;
- case 5:
- cairo_scale (cr, -1.0, 1.0);
- cairo_translate (cr, -0.5, 0);
- drawVEdge (cr);
- break;
- case 6:
- cairo_scale (cr, 1.0, -1.0);
- cairo_translate (cr, 0, -0.5);
- drawHEdge (cr);
- break;
- case 7:
- drawVEdge (cr);
- break;
-
- case 8:
- break;
- case 9:
- drawInnerCorner (cr);
- break;
- case 10:
- cairo_scale (cr, -1.0, 1.0);
- cairo_translate (cr, -0.5, 0);
- drawInnerCorner (cr);
- break;
- case 11:
- cairo_scale (cr, 1.0, -1.0);
- cairo_translate (cr, 0, -0.5);
- drawInnerCorner (cr);
- break;
- case 12:
- cairo_scale (cr, -1.0, -1.0);
- cairo_translate (cr, -0.5, -0.5);
- drawInnerCorner (cr);
- break;
- }
- cairo_restore (cr);
- }
-
- cairo_restore (cr);
-}
-
-/*--------------------------------------------------------*/
-
-TangoBlock::TangoBlock (cairo_surface_t * dst, cairo_surface_t * bg, Block ** src,
- int w, int h, int pxw, int pxh, gboolean grad) : Renderer (dst, bg, src, w, h, pxw, pxh)
-{
- usegrads = grad;
-}
-
-void TangoBlock::drawCell (cairo_t *cr, gint x, gint y)
-{
-
- int i;
- cairo_pattern_t *pat = NULL;
- /* the following garbage is derived from the official tango style guide */
- const gdouble colours[8][3][3] = {
- {{0.93725490196078431, 0.16078431372549021, 0.16078431372549021},
- {0.8, 0.0, 0.0},
- {0.64313725490196083, 0.0, 0.0}}, /* red */
-
- {{0.54117647058823526, 0.88627450980392153, 0.20392156862745098},
- {0.45098039215686275, 0.82352941176470584, 0.086274509803921567},
- {0.30588235294117649, 0.60392156862745094, 0.023529411764705882}}, /* green */
-
- {{0.44705882352941179, 0.62352941176470589, 0.81176470588235294},
- {0.20392156862745098, 0.396078431372549, 0.64313725490196083},
- {0.12549019607843137, 0.29019607843137257, 0.52941176470588236}}, /* blue */
-
- {{0.93333333333333335, 0.93333333333333335, 0.92549019607843142},
- {0.82745098039215681, 0.84313725490196079, 0.81176470588235294},
- {0.72941176470588232, 0.74117647058823533, 0.71372549019607845}}, /* white */
-
- {{0.9882352941176471, 0.9137254901960784, 0.30980392156862746},
- {0.92941176470588238, 0.83137254901960789, 0.0},
- {0.7686274509803922, 0.62745098039215685, 0.0}}, /* yellow */
-
- {{0.67843137254901964, 0.49803921568627452, 0.6588235294117647},
- {0.45882352941176469, 0.31372549019607843, 0.4823529411764706},
- {0.36078431372549019, 0.20784313725490197, 0.4}}, /* purple */
-
- {{0.9882352941176471, 0.68627450980392157, 0.24313725490196078},
- {0.96078431372549022, 0.47450980392156861, 0.0},
- {0.80784313725490198, 0.36078431372549019, 0.0}}, /* orange (replacing cyan) */
-
- {{0.33, 0.34, 0.32},
- {0.18, 0.2, 0.21},
- {0.10, 0.12, 0.13}} /* grey */
- };
-
- if (data[x][y].what == EMPTY)
- return;
-
- if (data[x][y].what == TARGET) {
- i = 7;
- } else {
- i = data[x][y].color;
- i = CLAMP (i, 0, 6);
- }
-
- if (usegrads) {
- pat = cairo_pattern_create_linear (x+0.35, y, x+0.55, y+0.9);
- cairo_pattern_add_color_stop_rgb (pat, 0.0, colours[i][0][0],
- colours[i][0][1],
- colours[i][0][2]);
- cairo_pattern_add_color_stop_rgb (pat, 1.0, colours[i][1][0],
- colours[i][1][1],
- colours[i][1][2]);
- cairo_set_source (cr, pat);
- } else {
- cairo_set_source_rgb (cr, colours[i][0][0],
- colours[i][0][1],
- colours[i][0][2]);
- }
-
- drawRoundedRectangle (cr, x+0.05, y+0.05, 0.9, 0.9, 0.2);
- cairo_fill_preserve (cr); /* fill with shaded gradient */
-
-
- if (usegrads)
- cairo_pattern_destroy(pat);
- cairo_set_source_rgb(cr, colours[i][2][0],
- colours[i][2][1],
- colours[i][2][2]);
-
- cairo_set_line_width (cr, 0.1);
- cairo_stroke (cr); /* add darker outline */
-
- drawRoundedRectangle (cr, x+0.15, y+0.15, 0.7, 0.7, 0.08);
- if (data[x][y].what != TARGET) {
- if (usegrads) {
- pat = cairo_pattern_create_linear (x-0.3, y-0.3, x+0.8, y+0.8);
- switch (i) { /* yellow and white blocks need a brighter highlight */
- case 3:
- case 4:
- cairo_pattern_add_color_stop_rgba (pat, 0.0, 1.0,
- 1.0,
- 1.0,
- 1.0);
- cairo_pattern_add_color_stop_rgba (pat, 1.0, 1.0,
- 1.0,
- 1.0,
- 0.0);
- break;
- default:
- cairo_pattern_add_color_stop_rgba (pat, 0.0, 0.9295,
- 0.9295,
- 0.9295,
- 1.0);
- cairo_pattern_add_color_stop_rgba (pat, 1.0, 0.9295,
- 0.9295,
- 0.9295,
- 0.0);
- break;
- }
- cairo_set_source (cr, pat);
- } else {
- cairo_set_source_rgba (cr, 1.0,
- 1.0,
- 1.0,
- 0.35);
- }
- } else { /* black preview block, use a much weaker highlight */
- cairo_set_source_rgba (cr, 1.0,
- 1.0,
- 1.0,
- 0.15);
- }
- cairo_stroke (cr); /* add inner edge highlight */
-
- if (usegrads && (data[x][y].what != TARGET))
- cairo_pattern_destroy (pat);
-}
-
-void TangoBlock::drawRoundedRectangle (cairo_t * cr, gdouble x, gdouble y, gdouble w, gdouble h, gdouble r)
-{
- cairo_move_to(cr, x+r, y);
- cairo_line_to(cr, x+w-r, y);
- cairo_curve_to(cr, x+w-(r/2), y, x+w, y+(r/2), x+w, y+r);
- cairo_line_to(cr, x+w, y+h-r);
- cairo_curve_to(cr, x+w, y+h-(r/2), x+w-(r/2), y+h, x+w-r, y+h);
- cairo_line_to(cr, x+r, y+h);
- cairo_curve_to(cr, x+(r/2), y+h, x, y+h-(r/2), x, y+h-r);
- cairo_line_to(cr, x, y+r);
- cairo_curve_to(cr, x, y+(r/2), x+(r/2), y, x+r, y);
-}
-
diff --git a/gnometris/renderer-noclutter.h b/gnometris/renderer-noclutter.h
deleted file mode 100644
index 99bc75a..0000000
--- a/gnometris/renderer-noclutter.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- mode:C++; tab-width:8; c-basic-offset:8; indent-tabs-mode:true -*- */
-/*
- * written by Callum McKenzie <callum spooky-possum org>
- *
- * Copyright (C) 2005 by Callum McKenzie
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * For more details see the file COPYING.
- */
-
-#ifndef __renderer_h__
-#define __renderer_h__
-
-#include <cairo.h>
-#include <glib.h>
-
-#include "blocks.h"
-#include "blockops-noclutter.h"
-
-struct ThemeTableEntry {
- const gchar *name;
- const gchar *id;
-};
-
-extern const ThemeTableEntry ThemeTable[];
-
-class Renderer {
-public:
- Renderer (cairo_surface_t * dst, cairo_surface_t * bg, Block ** src,
- int w, int h, int pxw, int pxh);
- virtual ~ Renderer ();
- virtual void render ();
-
- void setTarget (cairo_surface_t *target);
- void setBackground (cairo_surface_t *background);
-
- Block **data;
- int width;
- int height;
- int pxwidth;
- int pxheight;
-protected:
-
- cairo_surface_t * target;
- cairo_surface_t *background;
-
- virtual void drawCell (cairo_t * cr, gint x, gint y);
- virtual void drawBackground (cairo_t * cr);
- virtual void drawForeground (cairo_t * cr);
-};
-
-Renderer *rendererFactory (gint id, cairo_surface_t * dst,
- cairo_surface_t * bg, Block ** src, int w,
- int h, int pxw, int pxh);
-gint themeNameToNumber (const gchar * id);
-
-class JoinedUp:public Renderer {
-public:
- JoinedUp (cairo_surface_t * dst, cairo_surface_t * bg, Block ** src,
- int w, int h, int pxw, int pxh):Renderer (dst, bg, src, w, h, pxw,
- pxh) {}
-protected:
- virtual void drawCell (cairo_t * cr, gint x, gint y);
-
-private:
- double border;
- void drawInnerCorner (cairo_t * cr);
- void drawOuterCorner (cairo_t * cr);
- void drawHEdge (cairo_t * cr);
- void drawVEdge (cairo_t * cr);
-};
-
-class TangoBlock:public Renderer {
-public:
- TangoBlock (cairo_surface_t * dst, cairo_surface_t * bg, Block ** src,
- int w, int h, int pxw, int pxh, gboolean grad);
-
-protected:
- virtual void drawCell (cairo_t * cr, gint x, gint y);
- gboolean usegrads;
-
-private:
- void drawRoundedRectangle (cairo_t * cr, gdouble x, gdouble y, gdouble w, gdouble h, gdouble r);
-};
-
-#endif // __renderer_h__
diff --git a/gnometris/tetris.cpp b/gnometris/tetris.cpp
index 77de305..8e8bf0a 100644
--- a/gnometris/tetris.cpp
+++ b/gnometris/tetris.cpp
@@ -42,17 +42,9 @@
#include "blocks.h"
#include "scoreframe.h"
#include "highscores.h"
-
-#ifdef HAVE_CLUTTER
#include "preview.h"
#include "renderer.h"
#include "blockops.h"
-#else
-#include "preview-noclutter.h"
-#include "field-noclutter.h"
-#include "renderer-noclutter.h"
-#include "blockops-noclutter.h"
-#endif
int LINES = 20;
int COLUMNS = 14;
@@ -89,9 +81,6 @@ Tetris::Tetris(int cmdlLevel):
timeoutId(0),
onePause(false),
inPlay(false),
-#ifndef HAVE_CLUTTER
- useTarget(false),
-#endif
bgimage(0),
setupdialog(0),
cmdlineLevel(cmdlLevel),
@@ -188,12 +177,7 @@ Tetris::Tetris(int cmdlLevel):
games_conf_add_window (GTK_WINDOW (w), KEY_SAVED_GROUP);
preview = new Preview ();
-#ifdef HAVE_CLUTTER
field = new BlockOps ();
-#else
- field = new Field();
- field->setUseTarget (false);
-#endif
initOptions ();
@@ -446,10 +430,6 @@ Tetris::initOptions ()
games_sound_enable (confGetBoolean (KEY_OPTIONS_GROUP, KEY_SOUND, TRUE));
-#ifndef HAVE_CLUTTER
- useTarget = confGetBoolean (KEY_OPTIONS_GROUP, KEY_USE_TARGET, FALSE);
-#endif
-
do_preview = confGetBoolean (KEY_OPTIONS_GROUP, KEY_DO_PREVIEW, TRUE);
if (preview) {
@@ -500,9 +480,6 @@ Tetris::setOptions ()
if (theme_preview) {
theme_preview->setTheme (themeno);
-#ifndef HAVE_CLUTTER
- gtk_widget_queue_draw(theme_preview->getWidget());
-#endif
}
}
@@ -551,21 +528,6 @@ Tetris::setSelection(GtkWidget *widget, void *data)
ThemeTable[t->themeno].id);
}
-#ifndef HAVE_CLUTTER
-void
-Tetris::setTarget (GtkWidget *widget, void *data)
-{
- Tetris *t;
-
- t = (Tetris *)data;
-
- t->useTarget = GTK_TOGGLE_BUTTON (widget)->active;
-
- games_conf_set_boolean (KEY_OPTIONS_GROUP, KEY_USE_TARGET,
- t->useTarget);
-}
-#endif
-
void
Tetris::lineFillHeightChanged (GtkWidget *spin, gpointer data)
{
@@ -741,12 +703,6 @@ Tetris::gameProperties(GtkAction *action, void *d)
0, 0, 0);
t->useTargetToggle = gtk_check_button_new_with_mnemonic (_("Show _where the block will land"));
-#ifndef HAVE_CLUTTER
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (t->useTargetToggle),
- t->useTarget);
- g_signal_connect (t->useTargetToggle, "clicked",
- G_CALLBACK (setTarget), d);
-#endif
gtk_box_pack_start (GTK_BOX (fvbox), t->useTargetToggle,
0, 0, 0);
@@ -810,11 +766,7 @@ Tetris::gameProperties(GtkAction *action, void *d)
t->theme_preview->setTheme (t->themeno);
gtk_box_pack_start(GTK_BOX(fvbox), t->theme_preview->getWidget(), TRUE, TRUE, 0);
-#ifndef HAVE_CLUTTER
- t->theme_preview->previewBlock(4, 0, 0);
-#else
t->theme_preview->previewBlock(4, 0);
-#endif
gtk_widget_show_all (t->setupdialog);
gtk_action_set_sensitive(t->new_game_action, FALSE);
@@ -913,20 +865,12 @@ Tetris::timeoutHandler(void *d)
if (t->onePause)
{
t->onePause = false;
-#ifdef HAVE_CLUTTER
t->field->drawMessage();
-#else
- t->field->redraw();
-#endif
}
else
{
bool res = t->field->moveBlockDown();
-#ifndef HAVE_CLUTTER
- t->field->redraw();
-#endif
-
if (res)
{
t->manageFallen();
@@ -990,10 +934,6 @@ Tetris::keyPressHandler(GtkWidget *widget, GdkEvent *event, Tetris *t)
}
}
-#ifndef HAVE_CLUTTER
- t->field->redraw();
-#endif
-
return res;
}
@@ -1242,14 +1182,8 @@ Tetris::generate()
{
if (field->generateFallingBlock())
{
-#ifndef HAVE_CLUTTER
- field->putBlockInField(false);
- preview->previewBlock(blocknr_next, rot_next, color_next);
- gtk_widget_queue_draw(preview->getWidget());
-#else
field->putBlockInField(FALLING);
preview->previewBlock(blocknr_next, color_next);
-#endif
onePause = true;
}
else
@@ -1273,12 +1207,7 @@ Tetris::endOfGame()
color_next = -1;
blocknr_next = -1;
rot_next = -1;
-#ifndef HAVE_CLUTTER
- preview->previewBlock(-1, -1, -1);
- gtk_widget_queue_draw(preview->getWidget());
-#else
preview->previewBlock(-1, -1);
-#endif
field->hidePauseMessage();
field->showGameOverMessage();
games_sound_play ("gameover");
@@ -1289,10 +1218,6 @@ Tetris::endOfGame()
int pos = high_scores->add (scoreFrame->getScore());
high_scores->show (GTK_WINDOW (w), pos);
}
-
-#ifndef HAVE_CLUTTER
- field->setUseTarget (false);
-#endif
}
int
@@ -1320,10 +1245,6 @@ Tetris::gameNew(GtkAction *action, void *d)
t->scoreFrame->setLevel(level);
t->scoreFrame->setStartingLevel(level);
-#ifndef HAVE_CLUTTER
- t->field->setUseTarget (t->useTarget);
-#endif
-
t->generateTimer (level);
t->field->emptyField(t->line_fill_height,t->line_fill_prob);
@@ -1331,15 +1252,8 @@ Tetris::gameNew(GtkAction *action, void *d)
t->paused = false;
t->field->generateFallingBlock();
-#ifndef HAVE_CLUTTER
- t->field->redraw();
-
- t->preview->previewBlock(blocknr_next, rot_next, color_next);
- gtk_widget_queue_draw(t->preview->getWidget());
-#else
t->field->putBlockInField(FALLING);
t->preview->previewBlock(blocknr_next, color_next);
-#endif
gtk_action_set_visible(t->pause_action, TRUE);
gtk_action_set_visible(t->resume_action, FALSE);
diff --git a/gnometris/tetris.h b/gnometris/tetris.h
index 504eca1..f65ede8 100644
--- a/gnometris/tetris.h
+++ b/gnometris/tetris.h
@@ -65,9 +65,6 @@ extern int rot_next;
extern bool random_block_colors;
-#ifndef HAVE_CLUTTER
-class Field;
-#endif
class Preview;
class BlockOps;
class ScoreFrame;
@@ -95,11 +92,7 @@ private:
char *defaultPixmap;
gint themeno;
-#ifdef HAVE_CLUTTER
BlockOps *field;
-#else
- Field *field;
-#endif
Preview *preview;
ScoreFrame *scoreFrame;
HighScores *high_scores;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6d0096a..e2c4313 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -221,11 +221,11 @@ gnobots2/graphics.c
gnobots2/menu.c
gnobots2/properties.c
gnobots2/statusbar.c
-gnometris/field-noclutter.cpp
+gnometris/field.cpp
gnometris/gnometris.desktop.in.in
gnometris/gnometris.schemas.in
gnometris/main.cpp
-gnometris/renderer-noclutter.cpp
+gnometris/renderer.cpp
gnometris/scoreframe.cpp
gnometris/tetris.cpp
gnometris/highscores.cpp
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 0e6b0a7..1451a68 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -10,8 +10,6 @@ gnobots2/gnobots2.desktop.in
gnome-sudoku/gnome-sudoku.desktop.in
gnome-sudoku/src/lib/defaults.py
gnometris/gnometris.desktop.in
-gnometris/blockops.cpp
-gnometris/renderer.cpp
gnomine/gnomine.desktop.in
gnotravex/gnotravex.desktop.in
gnotski/gnotski.desktop.in
diff --git a/po/af.po b/po/af.po
index bb73da3..5da5445 100644
--- a/po/af.po
+++ b/po/af.po
@@ -895,7 +895,7 @@ msgid "There are no more moves"
msgstr "Daar is nie meer skuiwe nie"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:423 ../gnometris/field-noclutter.cpp:229
+#: ../aisleriot/window.c:423 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "Speletjie verby"
@@ -5469,7 +5469,7 @@ msgstr ""
msgid "Remaining:"
msgstr ""
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:202
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
msgid "Paused"
@@ -5616,19 +5616,19 @@ msgstr ""
msgid "LEVEL"
msgstr ""
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr ""
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr ""
-#: ../gnometris/renderer-noclutter.cpp:29
+#: ../gnometris/renderer.cpp:29
msgid "Tango Flat"
msgstr ""
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Tango Shaded"
msgstr ""
diff --git a/po/am.po b/po/am.po
index f6a3774..84dcd1b 100644
--- a/po/am.po
+++ b/po/am.po
@@ -4486,7 +4486,7 @@ msgstr ""
msgid "Extra Life"
msgstr ""
-#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field-noclutter.cpp:229
+#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr ""
@@ -5095,7 +5095,7 @@ msgstr "á?°á?¨á??á?¦"
msgid "Remaining:"
msgstr ""
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:176
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:215
#, fuzzy
@@ -5244,12 +5244,12 @@ msgstr ""
msgid "LEVEL"
msgstr "á?°á?¨á??"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
#, fuzzy
msgid "Plain"
msgstr "á??á? á?á? á??á?? á? á?³á?á??"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
#, fuzzy
msgid "Joined"
msgstr "á??á??á??"
diff --git a/po/ar.po b/po/ar.po
index 347f907..f752ea1 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -924,7 +924,7 @@ msgstr "Ù?ا Ù?زÙ?د Ù?Ù? اÙ?Ù?Ù?Ù?ات."
#. Empty title shows up as "<unnamed>" on maemo
#: ../aisleriot/window.c:425
-#: ../gnometris/field-noclutter.cpp:244
+#: ../gnometris/field.cpp:244
msgid "Game Over"
msgstr "اÙ?تÙ?ت اÙ?Ù?عبة"
@@ -6004,7 +6004,7 @@ msgstr "اÙ?Ù?ستÙ?Ù?:"
msgid "Remaining:"
msgstr "Ù?تبÙ?:"
-#: ../gnometris/field-noclutter.cpp:242
+#: ../gnometris/field.cpp:242
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:185
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:224
msgid "Paused"
@@ -6149,19 +6149,19 @@ msgstr "ضبط Ù?ستÙ?Ù? اÙ?بدأ (1-Ø£Ù? Ø£Ù?ثر)"
msgid "LEVEL"
msgstr "اÙ?Ù?ستÙ?Ù?"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "صرÙ?Ù?"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "Ù?Ù?صÙ?Ø©"
-#: ../gnometris/renderer-noclutter.cpp:29
+#: ../gnometris/renderer.cpp:29
msgid "Tango Flat"
msgstr "تاÙ?غÙ? Ù?سطÙ?Ø"
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Tango Shaded"
msgstr "تاÙ?غÙ? Ù?ظÙ?Ù?"
diff --git a/po/as.po b/po/as.po
index 692c7e3..44105f6 100644
--- a/po/as.po
+++ b/po/as.po
@@ -970,7 +970,7 @@ msgid "There are no more moves"
msgstr "There are no more moves"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "��ল �তম"
@@ -6710,7 +6710,7 @@ msgstr "��লাৰ দ��ষতা স�তৰ:"
msgid "Remaining:"
msgstr "�বশিষ��:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6858,19 +6858,19 @@ msgstr "পà§?ৰাৰমà§?à¦à¦¿à¦? দà¦?à§?ষতা সà§?তৰ (১ ব
msgid "LEVEL"
msgstr "স�তৰ"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "সাদামা�া"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "য���ত"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango Flat"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango Shaded"
diff --git a/po/az.po b/po/az.po
index ef701b5..b7a2be5 100644
--- a/po/az.po
+++ b/po/az.po
@@ -4590,7 +4590,7 @@ msgstr "HÉ?diyÉ?ni Ye"
msgid "Extra Life"
msgstr "Æ?lavÉ? Can"
-#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field-noclutter.cpp:229
+#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "Oyun Bitdi"
@@ -5241,7 +5241,7 @@ msgstr "SÉ?viyyÉ?:"
msgid "Remaining:"
msgstr "Qalan:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:176
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:215
msgid "Paused"
@@ -5400,12 +5400,12 @@ msgstr "BaÅ?lanÄ?ıc sÉ?viyyÉ?sini seç (1-10)"
msgid "LEVEL"
msgstr "SÆ?VÄ°YYÆ?"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
#, fuzzy
msgid "Plain"
msgstr "Plait"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
#, fuzzy
msgid "Joined"
msgstr "Yoxdur"
diff --git a/po/be.po b/po/be.po
index 7de68af..fcf1311 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4700,7 +4700,7 @@ msgstr "Ð?онÑ?Ñ? зÑ?едзенÑ?"
msgid "Extra Life"
msgstr "Ð?адаÑ?ковае жÑ?Ñ?Ñ?Ñ?Ñ?"
-#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field-noclutter.cpp:229
+#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "Ð?Ñ?лÑ?нÑ? Ñ?конÑ?ана"
@@ -5338,7 +5338,7 @@ msgstr "УзÑ?овенÑ?:"
msgid "Remaining:"
msgstr "Ð?аÑ?Ñ?алоÑ?Ñ?:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:176
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:215
#, fuzzy
@@ -5502,12 +5502,12 @@ msgstr "Ð?адаÑ?Ñ? паÑ?аÑ?ковÑ? Ñ?зÑ?овенÑ? (1-10)"
msgid "LEVEL"
msgstr "УÐ?Ð Ð?Ð?Ð?Ð?Ь"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
#, fuzzy
msgid "Plain"
msgstr "Ð?оÑ?ка"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
#, fuzzy
msgid "Joined"
msgstr "Ð?Ñ?ма"
diff --git a/po/bg.po b/po/bg.po
index d8d2598..6cd39f8 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -958,7 +958,7 @@ msgid "There are no more moves"
msgstr "Ð?Ñ?ма повеÑ?е Ñ?одове"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Ð?Ñ?ай на игÑ?аÑ?а"
@@ -6460,7 +6460,7 @@ msgstr "Ð?иво:"
msgid "Remaining:"
msgstr "Ð?Ñ?Ñ?аваÑ?:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6609,19 +6609,19 @@ msgstr "Ð?адаване на наÑ?ално ниво (1 или повеÑ?е)"
msgid "LEVEL"
msgstr "Ð?Ð?Ð?Ð?"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Ð?бикновен"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "СвÑ?Ñ?зани"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango без полÑ?Ñ?енки"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango Ñ? полÑ?Ñ?енки"
diff --git a/po/bn.po b/po/bn.po
index 28a0fbf..48a4726 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -4582,7 +4582,7 @@ msgstr "ব�নাস ���� নিন"
msgid "Extra Life"
msgstr "�তিরি��ত ��বন"
-#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field-noclutter.cpp:229
+#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "��ল �তম"
@@ -5221,7 +5221,7 @@ msgstr "��লার দ��ষতা স�তর:"
msgid "Remaining:"
msgstr "�বশিষ��:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:176
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:215
msgid "Paused"
@@ -5374,11 +5374,11 @@ msgstr "পà§?রারমà§?à¦à¦¿à¦? দà¦?à§?ষতা সà§?তর (১ ব
msgid "LEVEL"
msgstr "স�তর"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "সমতল"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "য���ত"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index f6431d7..388fa11 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -911,7 +911,7 @@ msgid "There are no more moves"
msgstr "à¦?র à¦?à§?নà§? à¦?াল দà§?à¦?à§?া সমà§?à¦à¦¬ নà§?"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:425 ../gnometris/field-noclutter.cpp:244
+#: ../aisleriot/window.c:425 ../gnometris/field.cpp:244
msgid "Game Over"
msgstr "��ল �তম"
@@ -5977,7 +5977,7 @@ msgstr "��লার দ��ষতা স�তর:"
msgid "Remaining:"
msgstr "�বশিষ��:"
-#: ../gnometris/field-noclutter.cpp:242
+#: ../gnometris/field.cpp:242
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:185
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:224
msgid "Paused"
@@ -6131,19 +6131,19 @@ msgstr "পà§?রারমà§?à¦à¦¿à¦? দà¦?à§?ষতা সà§?তর (১ ব
msgid "LEVEL"
msgstr "স�তর"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "সমতল"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "য���ত"
-#: ../gnometris/renderer-noclutter.cpp:29
+#: ../gnometris/renderer.cpp:29
msgid "Tango Flat"
msgstr ""
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Tango Shaded"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 5d63eda..e833647 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -960,7 +960,7 @@ msgid "There are no more moves"
msgstr "No hi ha més moviments"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Joc acabat"
@@ -6503,7 +6503,7 @@ msgstr "Nivell:"
msgid "Remaining:"
msgstr "Restants:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6654,19 +6654,19 @@ msgstr "Especifica el nivell inicial (1 o més gran)"
msgid "LEVEL"
msgstr "Nivell"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Simple"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Unit"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango pla"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango ombrejat"
diff --git a/po/cs.po b/po/cs.po
index e749c62..b4c0971 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -967,7 +967,7 @@ msgid "There are no more moves"
msgstr "Nejsou možné žádné dalšà tahy"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Konec hry"
@@ -6461,7 +6461,7 @@ msgstr "Ã?roveÅ?:"
msgid "Remaining:"
msgstr "Zbývá:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:171
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:210
msgid "Paused"
@@ -6610,19 +6610,19 @@ msgstr "Nastavte poÄ?áteÄ?nà úroveÅ? (1 nebo vyÅ¡Å¡Ã)"
msgid "LEVEL"
msgstr "Ã?ROVEÅ?"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Jednoduché"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Spojené"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Oblé prosté"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Oblé stÃnované"
diff --git a/po/cy.po b/po/cy.po
index c58534c..02735a0 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -4680,7 +4680,7 @@ msgstr "Bwyta Bonws"
msgid "Extra Life"
msgstr "Bywyd Ychwanegol"
-#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field-noclutter.cpp:229
+#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "Gêm Drosodd"
@@ -5308,7 +5308,7 @@ msgstr "Lefel:"
msgid "Remaining:"
msgstr "Ar Ã?l:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:203
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:242
msgid "Paused"
@@ -5458,11 +5458,11 @@ msgstr "Gosod y lefel gychwyn (1 neu fwy)"
msgid "LEVEL"
msgstr "LEFEL"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "Plaen"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "Wedi Ymuno"
diff --git a/po/da.po b/po/da.po
index aa0240a..2be5276 100644
--- a/po/da.po
+++ b/po/da.po
@@ -996,7 +996,7 @@ msgid "There are no more moves"
msgstr "Der er ikke flere træk"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Spillet er slut"
@@ -6515,7 +6515,7 @@ msgstr "Bane:"
msgid "Remaining:"
msgstr "Tilbage:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:171
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:210
msgid "Paused"
@@ -6666,19 +6666,19 @@ msgstr "Sæt startbane (1 eller mere)"
msgid "LEVEL"
msgstr "BANE"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Enkel"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Tilsluttet"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango flad"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango skyggelagt"
diff --git a/po/de.po b/po/de.po
index d0344f3..80aea99 100644
--- a/po/de.po
+++ b/po/de.po
@@ -978,7 +978,7 @@ msgid "There are no more moves"
msgstr "Es gibt keine gültigen Züge mehr."
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Spiel vorbei"
@@ -6558,7 +6558,7 @@ msgstr "Level:"
msgid "Remaining:"
msgstr "Verbleibend:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:171
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:210
msgid "Paused"
@@ -6712,19 +6712,19 @@ msgid "LEVEL"
msgstr "STUFE"
# bezieht sich auf die Form der Steine!
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Einfach"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Zusammengefügt"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango flach"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango schattiert"
diff --git a/po/dz.po b/po/dz.po
index ea83352..7c6f61b 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -905,7 +905,7 @@ msgstr "�ེ�ས��ཤུ��འ���ས��ི��འ�ུ�
#. Empty title shows up as "<unnamed>" on maemo
#: ../aisleriot/window.c:424
-#: ../gnometris/field-noclutter.cpp:247
+#: ../gnometris/field.cpp:247
msgid "Game Over"
msgstr "རྩེ��འ�ྲ��རྫོ�ས�སོ�"
@@ -5912,7 +5912,7 @@ msgstr "��ས�རི��"
msgid "Remaining:"
msgstr "ལྷ��ལུས�"
-#: ../gnometris/field-noclutter.cpp:245
+#: ../gnometris/field.cpp:245
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:185
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:224
msgid "Paused"
@@ -6057,19 +6057,19 @@ msgstr "འ�ོ���ུ�ས��ྱི���ས�རི����
msgid "LEVEL"
msgstr "��ས�རི��"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "ར�ྱ���ོ�"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "འ�ུལ�ཡོ���"
-#: ../gnometris/renderer-noclutter.cpp:29
+#: ../gnometris/renderer.cpp:29
msgid "Tango Flat"
msgstr "�ོ���ོ� ལེ���ེ�� "
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Tango Shaded"
msgstr "����ྲི����ོ�ཡོ���འི� �ེ���ོ�"
diff --git a/po/el.po b/po/el.po
index 0a7a900..e30f64e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -979,7 +979,7 @@ msgid "There are no more moves"
msgstr "Î?εν Ï?Ï?άÏ?Ï?οÏ?ν άλλεÏ? κινήÏ?ειÏ?"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "ΤÎλοÏ? Ï?αιÏ?νιδιοÏ?"
@@ -6496,7 +6496,7 @@ msgstr "Î?Ï?ίÏ?εδο:"
msgid "Remaining:"
msgstr "Î?Ï?ομÎνοÏ?ν:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:171
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:210
msgid "Paused"
@@ -6651,19 +6651,19 @@ msgstr "Î?Ï?ίÏ?Ï?ε Ï?ο αÏ?Ï?ικÏ? εÏ?ίÏ?εδο (1 ή Ï?Ï?ηλÏ?Ï?εÏ?ο)"
msgid "LEVEL"
msgstr "Î?Î Î?Î Î?Î?Î?"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Î?Ï?λÏ?"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "ΣÏ?νθεÏ?ο"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango Flat"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango Shaded"
diff --git a/po/en_CA.po b/po/en_CA.po
index 16da27f..94e80fa 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -4564,7 +4564,7 @@ msgstr "Eat Bonus"
msgid "Extra Life"
msgstr "Extra Life"
-#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field-noclutter.cpp:229
+#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "Game Over"
@@ -5193,7 +5193,7 @@ msgstr "Level:"
msgid "Remaining:"
msgstr "Remaining:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:176
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:215
msgid "Paused"
@@ -5347,11 +5347,11 @@ msgstr "Set starting level (1 or greater)"
msgid "LEVEL"
msgstr "LEVEL"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "Plain"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "Joined"
diff --git a/po/en_GB.po b/po/en_GB.po
index 550c263..a6e43e7 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -956,7 +956,7 @@ msgid "There are no more moves"
msgstr "There are no more moves"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Game Over"
@@ -6437,7 +6437,7 @@ msgstr "Level:"
msgid "Remaining:"
msgstr "Remaining:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6591,19 +6591,19 @@ msgstr "Set starting level (1 or greater)"
msgid "LEVEL"
msgstr "LEVEL"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Plain"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Joined"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango Flat"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango Shaded"
diff --git a/po/es.po b/po/es.po
index dc2fc8b..53e2a5a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -962,7 +962,7 @@ msgid "There are no more moves"
msgstr "No hay más jugadas"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:427 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:427 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Juego terminado"
@@ -6499,7 +6499,7 @@ msgstr "Nivel:"
msgid "Remaining:"
msgstr "Quedan:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6654,19 +6654,19 @@ msgstr "Definir nivel inicial (1 o mayor)"
msgid "LEVEL"
msgstr "NIVEL"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Plano"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Unido"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango liso"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango sombreado"
diff --git a/po/et.po b/po/et.po
index 2a6b853..cac8c4b 100644
--- a/po/et.po
+++ b/po/et.po
@@ -905,7 +905,7 @@ msgid "There are no more moves"
msgstr "Rohkem käike ei ole"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:425 ../gnometris/field-noclutter.cpp:244
+#: ../aisleriot/window.c:425 ../gnometris/field.cpp:244
msgid "Game Over"
msgstr "Mäng on läbi"
@@ -5771,7 +5771,7 @@ msgstr "Tase:"
msgid "Remaining:"
msgstr "Jäänud:"
-#: ../gnometris/field-noclutter.cpp:242
+#: ../gnometris/field.cpp:242
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:185
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:224
msgid "Paused"
@@ -5918,19 +5918,19 @@ msgstr "Vali algustase (1 või suurem)"
msgid "LEVEL"
msgstr "TASE"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "Lihtne"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "Ã?hendatud"
-#: ../gnometris/renderer-noclutter.cpp:29
+#: ../gnometris/renderer.cpp:29
msgid "Tango Flat"
msgstr "Lame Tango"
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Tango Shaded"
msgstr "Varjuga Tango"
diff --git a/po/eu.po b/po/eu.po
index 9e4ffc1..a0953fd 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -957,7 +957,7 @@ msgid "There are no more moves"
msgstr "Ezin da mugimendu gehiago egin"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Jokoa amaitu da"
@@ -6437,7 +6437,7 @@ msgstr "Maila:"
msgid "Remaining:"
msgstr "Falta:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6587,19 +6587,19 @@ msgstr "Ezarri hasierako maila (1 edo handiagoa)"
msgid "LEVEL"
msgstr "MAILA"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Soila"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Elkartuta"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango laua"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango itzaleztatua"
diff --git a/po/fa.po b/po/fa.po
index a167460..ba32c58 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -4552,7 +4552,7 @@ msgstr "جاÛ?زÙ? را بخÙ?رÛ?د"
msgid "Extra Life"
msgstr "جاÙ? اضاÙ?Û?"
-#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field-noclutter.cpp:229
+#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "بازÛ? تÙ?اÙ? شد"
@@ -5180,7 +5180,7 @@ msgstr "Ù?رØÙ?Ù?:"
msgid "Remaining:"
msgstr "باÙ?Û?â??Ù?اÙ?دÙ?:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:176
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:215
msgid "Paused"
@@ -5329,11 +5329,11 @@ msgstr "تÙ?ظÛ?Ù? Ù?رØÙ?Ù?â??Û? شرÙ?ع (Û± Û?ا بÛ?شتر)"
msgid "LEVEL"
msgstr "Ù?رØÙ?Ù?"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "سادÙ?"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "Ù?تصÙ?"
diff --git a/po/fi.po b/po/fi.po
index 4f2b67a..6f13a61 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -957,7 +957,7 @@ msgid "There are no more moves"
msgstr "Siirtoja ei ole jäljellä"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Peli loppu"
@@ -6509,7 +6509,7 @@ msgstr "Taso:"
msgid "Remaining:"
msgstr "Jäljellä:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6658,19 +6658,19 @@ msgstr "Aseta aloitustaso (1 tai suurempi)"
msgid "LEVEL"
msgstr "TASO"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Paljas"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Yhdistetty"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango, litteä"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango, varjostettu"
diff --git a/po/fr.po b/po/fr.po
index b5fecd7..7602a2b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -978,7 +978,7 @@ msgid "There are no more moves"
msgstr "Il n'y a plus de déplacement possible"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Fin de partie"
@@ -6532,7 +6532,7 @@ msgstr "Niveau :"
msgid "Remaining:"
msgstr "Restant :"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6688,19 +6688,19 @@ msgstr "Choix du niveau de départ (1 ou supérieur)"
msgid "LEVEL"
msgstr "NIVEAU"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Ordinaire"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Joint"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango plat"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango ombré"
diff --git a/po/ga.po b/po/ga.po
index 1b87e24..9dd2430 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -900,7 +900,7 @@ msgid "There are no more moves"
msgstr "NÃl aon gluaiseann fagtha."
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:424 ../gnometris/field-noclutter.cpp:229
+#: ../aisleriot/window.c:424 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "Cluiche thart"
@@ -5701,7 +5701,7 @@ msgstr "Leibhéal:"
msgid "Remaining:"
msgstr ""
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:184
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:223
msgid "Paused"
@@ -5849,21 +5849,21 @@ msgstr ""
msgid "LEVEL"
msgstr "LEIBHÃ?AL"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
#, fuzzy
msgid "Plain"
msgstr "Plait"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
#, fuzzy
msgid "Joined"
msgstr "Tada"
-#: ../gnometris/renderer-noclutter.cpp:29
+#: ../gnometris/renderer.cpp:29
msgid "Tango Flat"
msgstr ""
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Tango Shaded"
msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 099a8e6..ce447b7 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -962,7 +962,7 @@ msgid "There are no more moves"
msgstr "Non hai máis movementos posÃbeis"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Fin da partida"
@@ -6469,7 +6469,7 @@ msgstr "Nivel:"
msgid "Remaining:"
msgstr "Restante:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:171
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:210
msgid "Paused"
@@ -6622,19 +6622,19 @@ msgstr "Difinir o nivel inicial (1 ou superior)"
msgid "LEVEL"
msgstr "NIVEL"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Simple"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Unido"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango plano"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango sombreado"
diff --git a/po/gu.po b/po/gu.po
index 48f3069..ee80e8a 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1026,7 +1026,7 @@ msgid "There are no more moves"
msgstr "હવ� ��� �ાલ રહ� નથ�"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "રમત પ�ર�"
@@ -6853,7 +6853,7 @@ msgstr "સ�તર:"
msgid "Remaining:"
msgstr "બા�� રહ�લ��:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -7013,19 +7013,19 @@ msgstr "સ�તર"
# #-#-#-#-# libgnomeprint.gnome-2-2.hi.po (libgnomeprint VERSION) #-#-#-#-#
# libgnomeprint/gpa/gpa-media.c:343
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "સપા�"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "��ડાય�લ"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "��ન��� સપા�"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "��ન��� �ાયાવાળ��"
diff --git a/po/he.po b/po/he.po
index 699feda..42b8c1d 100644
--- a/po/he.po
+++ b/po/he.po
@@ -961,7 +961,7 @@ msgid "There are no more moves"
msgstr "×?×? × ×?תר×? ×?×?×?×?×?×? ×?פשר×?×?×?"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "×?×?ש×?ק ×?סת×?×?×?"
@@ -6420,7 +6420,7 @@ msgstr "ר×?×?:"
msgid "Remaining:"
msgstr "× ×?תר×?:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6575,19 +6575,19 @@ msgstr "Set starting level (1 or greater)"
msgid "LEVEL"
msgstr "LEVEL"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "ר×?×?×?"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "×?ש×?×?×?"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr ""
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 022ea7d..e6854e8 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1020,7 +1020,7 @@ msgid "There are no more moves"
msgstr "��� �ाल बा�� नह��"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "��ल �त�म"
@@ -6707,7 +6707,7 @@ msgstr "स�तर:"
msgid "Remaining:"
msgstr "बा��:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6867,19 +6867,19 @@ msgstr "स�तर"
# #-#-#-#-# libgnomeprint.gnome-2-2.hi.po (libgnomeprint VERSION) #-#-#-#-#
# libgnomeprint/gpa/gpa-media.c:343
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "सादा"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "��� शामिल नह��"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "����� फ�ल��"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "����� �ाया��ित"
diff --git a/po/hr.po b/po/hr.po
index b802b92..5d47bae 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -912,7 +912,7 @@ msgid "There are no more moves"
msgstr ""
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:425 ../gnometris/field-noclutter.cpp:244
+#: ../aisleriot/window.c:425 ../gnometris/field.cpp:244
msgid "Game Over"
msgstr "Igra je gotova"
@@ -5868,7 +5868,7 @@ msgstr "Razina:"
msgid "Remaining:"
msgstr "Preostalo:"
-#: ../gnometris/field-noclutter.cpp:242
+#: ../gnometris/field.cpp:242
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:185
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:224
msgid "Paused"
@@ -6022,21 +6022,21 @@ msgstr "Podesi poÄ?etni nivo (1-10)"
msgid "LEVEL"
msgstr "RAZINA"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
#, fuzzy
msgid "Plain"
msgstr "Plejt"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
#, fuzzy
msgid "Joined"
msgstr "Nijedan"
-#: ../gnometris/renderer-noclutter.cpp:29
+#: ../gnometris/renderer.cpp:29
msgid "Tango Flat"
msgstr ""
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Tango Shaded"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 724497a..0a9a1cf 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -974,7 +974,7 @@ msgid "There are no more moves"
msgstr "Nincs több lépés"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:427 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:427 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Vége a játéknak"
@@ -6751,7 +6751,7 @@ msgstr "Szint:"
msgid "Remaining:"
msgstr "Hátra van:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6901,19 +6901,19 @@ msgstr "A kezdÅ? pálya beállÃtása (1 vagy nagyobb)"
msgid "LEVEL"
msgstr "SZINT"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Egyszerű"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Csatolt"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Sima Tango"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "�rnyékolt Tango"
diff --git a/po/id.po b/po/id.po
index 3f0b151..a7e92b2 100644
--- a/po/id.po
+++ b/po/id.po
@@ -4969,7 +4969,7 @@ msgstr "Bonus Makanan"
msgid "Extra Life"
msgstr "Nyawa Ekstra"
-#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field-noclutter.cpp:229
+#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "Permainan Usai"
@@ -5689,7 +5689,7 @@ msgstr "Level:"
msgid "Remaining:"
msgstr "Sisa:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:203
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:242
msgid "Paused"
@@ -5842,12 +5842,12 @@ msgstr "Tentukan tingkat mulai (1 atau lebih)"
msgid "LEVEL"
msgstr "TINGKAT"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
#, fuzzy
msgid "Plain"
msgstr "Sedang bermain "
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "Gabung"
diff --git a/po/is.po b/po/is.po
index bacc478..ea22acb 100644
--- a/po/is.po
+++ b/po/is.po
@@ -4626,7 +4626,7 @@ msgstr "�ta bónus"
msgid "Extra Life"
msgstr "AukalÃf"
-#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field-noclutter.cpp:229
+#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "Leik lokið"
@@ -5257,7 +5257,7 @@ msgstr "Borð:"
msgid "Remaining:"
msgstr "Eftir:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:176
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:215
msgid "Paused"
@@ -5416,12 +5416,12 @@ msgstr "Upphafsborð (1-10)"
msgid "LEVEL"
msgstr "BORÃ?"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
#, fuzzy
msgid "Plain"
msgstr "Plait"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
#, fuzzy
msgid "Joined"
msgstr "Ekkert"
diff --git a/po/it.po b/po/it.po
index 04868fc..7fd5bb4 100644
--- a/po/it.po
+++ b/po/it.po
@@ -961,7 +961,7 @@ msgid "There are no more moves"
msgstr "Non ci sono più mosse"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Partita finita"
@@ -6518,7 +6518,7 @@ msgstr "Livello:"
msgid "Remaining:"
msgstr "Rimasti:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6672,19 +6672,19 @@ msgstr "Imposta il livello iniziale (1 o maggiore)"
msgid "LEVEL"
msgstr "LIVELLO"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Semplice"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Unito"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango semplice"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango sfumato"
diff --git a/po/ja.po b/po/ja.po
index 90d4d0c..a7ae35c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -959,7 +959,7 @@ msgid "There are no more moves"
msgstr "æ®?念ã?ªã??ã??æ??è©°ã?¾ã??ã?§ã??"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "ã?²ã?¼ã? ã?ªã?¼ã??ã?¼"
@@ -6462,7 +6462,7 @@ msgstr "ã?¬ã??ã?«:"
msgid "Remaining:"
msgstr "æ®?ã??:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6611,19 +6611,19 @@ msgstr "é??å§?æ??ã?®ã?¬ã??ã?«ã??ã?»ã??ã??ã??ã?? (1 以ä¸?)"
msgid "LEVEL"
msgstr "ã?¬ã??ã?«"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "ã??ã?¬ã?¼ã?³"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "��"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango ã??ã?©ã??ã??"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango å½±ä»?ã??"
diff --git a/po/ka.po b/po/ka.po
index 75e93ad..9a07e14 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -4719,7 +4719,7 @@ msgstr ""
msgid "Extra Life"
msgstr ""
-#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field-noclutter.cpp:229
+#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field.cpp:229
#, fuzzy
msgid "Game Over"
msgstr "á??á??á??á??á?¨á??"
@@ -5374,7 +5374,7 @@ msgstr "á??á??á??á??:"
msgid "Remaining:"
msgstr "á??á??á? á?©á??á??á??á??á?? á??á? á??:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:176
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:215
msgid "Paused"
@@ -5542,12 +5542,12 @@ msgstr ""
msgid "LEVEL"
msgstr ""
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
#, fuzzy
msgid "Plain"
msgstr "á??á??á?£á??á??"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
#, fuzzy
msgid "Joined"
msgstr "á??á? á??"
diff --git a/po/kn.po b/po/kn.po
index ac02b06..95e8341 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -955,7 +955,7 @@ msgid "There are no more moves"
msgstr "ಮ��ದ� �ನ�ಯಾವ�ದ� �ಾಲನ��ಳಿಲ�ಲ"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "�� ಮ��ಿದಿದ�"
@@ -6439,7 +6439,7 @@ msgstr "ಮ���:"
msgid "Remaining:"
msgstr "ಬಾ�ಿ �ರ�ವ:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:171
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:210
msgid "Paused"
@@ -6589,19 +6589,19 @@ msgstr "à²?ರà²?à²à²¦ ಹà²?ತವನà³?ನà³? à²?ಣಿà²?à³?ಳಿಸಿ (
msgid "LEVEL"
msgstr "LEVEL"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "ಸರಳ"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "ಸ�ರಿಸಲಾದ"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "ಸಪಾ�ಾದ ��ಯಾ���"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "ಮಬ�ಬಾ�ಿಸಿದ ��ಯಾ���"
diff --git a/po/ko.po b/po/ko.po
index e3e61ef..51b991a 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -953,7 +953,7 @@ msgid "There are no more moves"
msgstr "ë?? ì?´ì?? ì??ì§?ì?¼ ì?? ì??ì?µë??ë?¤"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:427 ../gnometris/field-noclutter.cpp:238
+#: ../aisleriot/window.c:427 ../gnometris/field.cpp:238
msgid "Game Over"
msgstr "ê²?ì?? ë??"
@@ -6442,7 +6442,7 @@ msgstr "��:"
msgid "Remaining:"
msgstr "ë?¨ì?? ì??:"
-#: ../gnometris/field-noclutter.cpp:236
+#: ../gnometris/field.cpp:236
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6591,19 +6591,19 @@ msgstr "ì??ì?? ë??ì?´ë??를 ì?¤ì ?í?©ë??ë?¤ (1 ì?´ì??)"
msgid "LEVEL"
msgstr "ë??ì?´ë??"
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Plain"
msgstr "ë?¨ì??"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Joined"
msgstr "ì??ì²´"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Tango Flat"
msgstr "í?±ê³ í??í??í?¨"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Shaded"
msgstr "í?±ê³ 그림ì??"
diff --git a/po/ku.po b/po/ku.po
index 4b3df5a..4ee4b0b 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -4416,7 +4416,7 @@ msgstr ""
msgid "Extra Life"
msgstr ""
-#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field-noclutter.cpp:229
+#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr ""
@@ -5020,7 +5020,7 @@ msgstr "Ast:"
msgid "Remaining:"
msgstr ""
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:176
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:215
msgid "Paused"
@@ -5169,11 +5169,11 @@ msgstr ""
msgid "LEVEL"
msgstr ""
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr ""
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
#, fuzzy
msgid "Joined"
msgstr "Tune"
diff --git a/po/lt.po b/po/lt.po
index 50c47a5..29e3205 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -963,7 +963,7 @@ msgid "There are no more moves"
msgstr "NebÄ?ra galimų Ä?jimų."
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Žaidimas baigtas"
@@ -6450,7 +6450,7 @@ msgstr "Lygis:"
msgid "Remaining:"
msgstr "Liko:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:171
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:210
msgid "Paused"
@@ -6599,19 +6599,19 @@ msgstr "Nustatyti pradinį lygį (1 ar didesnis)"
msgid "LEVEL"
msgstr "LYGIS"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Paprasta"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Sujungta"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Paprastas tango"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Paslaptingas tango"
diff --git a/po/lv.po b/po/lv.po
index 5f49e3c..2a865e6 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -4726,7 +4726,7 @@ msgstr "Ä?st bonusu"
msgid "Extra Life"
msgstr "Papildus dzīvība"
-#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field-noclutter.cpp:229
+#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "SpÄ?les beigas"
@@ -5416,7 +5416,7 @@ msgstr "LÄ«menis:"
msgid "Remaining:"
msgstr "Atlicis:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:203
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:242
msgid "Paused"
@@ -5563,11 +5563,11 @@ msgstr "Iestatiet sÄ?kuma lÄ«meni (1 vai vairak)"
msgid "LEVEL"
msgstr "LĪMENIS"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "VienkÄ?rÅ¡s"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "PieslÄ?gts"
diff --git a/po/mai.po b/po/mai.po
index b2c2bc0..3af9f70 100644
--- a/po/mai.po
+++ b/po/mai.po
@@ -896,7 +896,7 @@ msgid "There are no more moves"
msgstr ""
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:425 ../gnometris/field-noclutter.cpp:244
+#: ../aisleriot/window.c:425 ../gnometris/field.cpp:244
msgid "Game Over"
msgstr "��ल �त�म"
@@ -5698,7 +5698,7 @@ msgstr "स�तर:"
msgid "Remaining:"
msgstr "बा��:"
-#: ../gnometris/field-noclutter.cpp:242
+#: ../gnometris/field.cpp:242
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:185
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:224
msgid "Paused"
@@ -5846,19 +5846,19 @@ msgstr "पà¥?रारà¤?à¤à¤¿à¤? सà¥?तर नियत à¤?रà¥? (1 à¤?
msgid "LEVEL"
msgstr "स�तर"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "सादा"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "��न� सामिल नहि"
-#: ../gnometris/renderer-noclutter.cpp:29
+#: ../gnometris/renderer.cpp:29
msgid "Tango Flat"
msgstr ""
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Tango Shaded"
msgstr ""
diff --git a/po/mk.po b/po/mk.po
index 3d76939..22c45cc 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -915,7 +915,7 @@ msgid "There are no more moves"
msgstr "Ð?ема повеÑ?е поÑ?ези."
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:424 ../gnometris/field-noclutter.cpp:229
+#: ../aisleriot/window.c:424 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "Ð?гÑ?аÑ?а завÑ?Ñ?и"
@@ -5751,7 +5751,7 @@ msgstr "Ð?иво:"
msgid "Remaining:"
msgstr "Ð?Ñ?еоÑ?Ñ?анаÑ?о:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:185
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:224
msgid "Paused"
@@ -5901,19 +5901,19 @@ msgstr "Ð?амеÑ?Ñ?и поÑ?еÑ?но ниво (1 или повиÑ?око)"
msgid "LEVEL"
msgstr "Ð?Ð?Ð?Ð?"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "Ð?Ñ?азно"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "Се пÑ?иклÑ?Ñ?ивÑ?е"
-#: ../gnometris/renderer-noclutter.cpp:29
+#: ../gnometris/renderer.cpp:29
msgid "Tango Flat"
msgstr "Tango Flat"
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Tango Shaded"
msgstr "Tango Ð?аÑ?енеÑ?о"
diff --git a/po/ml.po b/po/ml.po
index 6ea71b2..94503e5 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -953,7 +953,7 @@ msgid "There are no more moves"
msgstr "à´?നി à´¨àµ?à´?àµ?à´?à´?àµ?à´?à´³àµ?â?? à´?à´²àµ?à´²"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "�ളി �വസാനി���ിരി����ന�ന�"
@@ -6386,7 +6386,7 @@ msgstr "ലവലàµ?â??:"
msgid "Remaining:"
msgstr "ബാ���ിയ�ള�ളവ:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6533,19 +6533,19 @@ msgstr "à´?à´¤àµ? നിലയിലàµ?â?? à´¤àµ?à´?à´?àµ?à´?à´£à´?? (1-10) "
msgid "LEVEL"
msgstr "നില"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "à´ªàµ?à´³àµ?യിനàµ?â??"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "à´?àµ?à´°àµ?â??à´¨àµ?à´¨àµ?"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "�ാ���� ഫ�ളാറ�റ�"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "�ാ���� ഷ�ഡഡ�"
diff --git a/po/mn.po b/po/mn.po
index 035dff9..7c656be 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -4633,7 +4633,7 @@ msgstr "Шагнал аваÑ?"
msgid "Extra Life"
msgstr "Ð?Ñ?мүү амÑ?дÑ?ал"
-#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field-noclutter.cpp:229
+#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "Тоглоом дÑ?Ñ?Ñ?лаа"
@@ -5257,7 +5257,7 @@ msgstr "Үе:"
msgid "Remaining:"
msgstr "ҮлдÑ?гдÑ?л:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:176
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:215
msgid "Paused"
@@ -5414,12 +5414,12 @@ msgstr "ÐÑ?лÑ?Ñ? үеÑ? Ñ?онго (1-10)"
msgid "LEVEL"
msgstr "Ò®Ð?"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
#, fuzzy
msgid "Plain"
msgstr "Ð¥Ñ?ниаÑ?"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
#, fuzzy
msgid "Joined"
msgstr "Үгүй"
diff --git a/po/mr.po b/po/mr.po
index 5d1a3ec..82049dd 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -951,7 +951,7 @@ msgid "There are no more moves"
msgstr "�ण�� �ाल नाह�"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "��ळ समाप�त"
@@ -6591,7 +6591,7 @@ msgstr "पातळ�:"
msgid "Remaining:"
msgstr "बा��:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6739,19 +6739,19 @@ msgstr "स�र�वात��� पातळ� (१ �ि�वा म
msgid "LEVEL"
msgstr "पातळ�"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "साध�"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "��ळल�ल�"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango सपा�"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango ��ा��त"
diff --git a/po/ms.po b/po/ms.po
index 5d10089..07669cd 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -4624,7 +4624,7 @@ msgstr "Bonus Makan"
msgid "Extra Life"
msgstr "Nyawa Tambahan"
-#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field-noclutter.cpp:229
+#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "Permainan Tamat"
@@ -5260,7 +5260,7 @@ msgstr "Peringkat:"
msgid "Remaining:"
msgstr "Baki:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:176
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:215
msgid "Paused"
@@ -5410,12 +5410,12 @@ msgstr "Set aras permulaan (1-10)"
msgid "LEVEL"
msgstr "ARAS"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
#, fuzzy
msgid "Plain"
msgstr "Teks Plain"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
#, fuzzy
msgid "Joined"
msgstr "Tiada"
diff --git a/po/nb.po b/po/nb.po
index f8cf86c..746088b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -950,7 +950,7 @@ msgid "There are no more moves"
msgstr "Ingen flere trekk"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Spillet over"
@@ -6481,7 +6481,7 @@ msgstr "Nivå:"
msgid "Remaining:"
msgstr "Gjenstår:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:171
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:210
msgid "Paused"
@@ -6634,19 +6634,19 @@ msgstr "Sett startnivå (1 eller større)"
msgid "LEVEL"
msgstr "NIVÃ?"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Vanlig"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Sammenslått"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango flat"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango skyggelagt"
diff --git a/po/ne.po b/po/ne.po
index a398395..a6486a2 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -888,7 +888,7 @@ msgid "There are no more moves"
msgstr "�ब �र� �ाल ��नन�"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:423 ../gnometris/field-noclutter.cpp:229
+#: ../aisleriot/window.c:423 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "��ल समाप�त"
@@ -5494,7 +5494,7 @@ msgstr "स�तर:"
msgid "Remaining:"
msgstr "बा���:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:202
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
msgid "Paused"
@@ -5640,19 +5640,19 @@ msgstr "स�र��त स�तर स�� �र�न� या न�
msgid "LEVEL"
msgstr "स�तर"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "सादा"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "स��ल��न"
-#: ../gnometris/renderer-noclutter.cpp:29
+#: ../gnometris/renderer.cpp:29
msgid "Tango Flat"
msgstr "à¤?à¥?याà¤?à¥?â??à¤?à¥? फà¥?लà¥?याà¤?"
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Tango Shaded"
msgstr "à¤?à¥?याà¤?à¥?â??à¤?à¥? à¤?ाया पारिà¤?à¤?à¥?"
diff --git a/po/nl.po b/po/nl.po
index a186569..046c9dd 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1002,7 +1002,7 @@ msgstr "Er zijn geen geldige zetten meer"
# voorbij/afgelopen
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Spel afgelopen"
@@ -6670,7 +6670,7 @@ msgstr "Niveau:"
msgid "Remaining:"
msgstr "Overgebleven:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:171
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:210
msgid "Paused"
@@ -6832,21 +6832,21 @@ msgstr "NIVEAU"
# Plat/Gewoon/normaal
# Dit is de vorm van de tetrisblokken
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Normaal"
# samen/gevoegd
# wat is de goede vertaling
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Samengevoegd"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango egaal"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango schaduw"
diff --git a/po/nn.po b/po/nn.po
index 87e62a0..a169c70 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -923,7 +923,7 @@ msgid "There are no more moves"
msgstr "Inga fleire trekk"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:424 ../gnometris/field-noclutter.cpp:247
+#: ../aisleriot/window.c:424 ../gnometris/field.cpp:247
msgid "Game Over"
msgstr "Spelet er slutt"
@@ -6356,7 +6356,7 @@ msgstr "Brett:"
msgid "Remaining:"
msgstr "Står att:"
-#: ../gnometris/field-noclutter.cpp:245
+#: ../gnometris/field.cpp:245
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:185
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:224
msgid "Paused"
@@ -6514,22 +6514,22 @@ msgid "LEVEL"
msgstr "NIVÃ?"
#
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "Vanleg"
#
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "Samanslått"
#
-#: ../gnometris/renderer-noclutter.cpp:29
+#: ../gnometris/renderer.cpp:29
msgid "Tango Flat"
msgstr "Tango flat"
#
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Tango Shaded"
msgstr "Tango skuggelagt"
diff --git a/po/oc.po b/po/oc.po
index feb0e64..fb53a31 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -896,7 +896,7 @@ msgid "There are no more moves"
msgstr ""
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:424 ../gnometris/field-noclutter.cpp:244
+#: ../aisleriot/window.c:424 ../gnometris/field.cpp:244
msgid "Game Over"
msgstr "Jòc acabat"
@@ -5621,7 +5621,7 @@ msgstr "Nivèl :"
msgid "Remaining:"
msgstr ""
-#: ../gnometris/field-noclutter.cpp:242
+#: ../gnometris/field.cpp:242
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:185
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:224
msgid "Paused"
@@ -5768,19 +5768,19 @@ msgstr ""
msgid "LEVEL"
msgstr "NIVÃ?L"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "Simpla"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr ""
-#: ../gnometris/renderer-noclutter.cpp:29
+#: ../gnometris/renderer.cpp:29
msgid "Tango Flat"
msgstr ""
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Tango Shaded"
msgstr ""
diff --git a/po/or.po b/po/or.po
index e46b039..35f34fc 100644
--- a/po/or.po
+++ b/po/or.po
@@ -952,7 +952,7 @@ msgid "There are no more moves"
msgstr ""
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "à¬?à?ଳ ଶà?ଷହà?à¬?à¬?ି"
@@ -6362,7 +6362,7 @@ msgstr "ସà?ତର:"
msgid "Remaining:"
msgstr "ବା�ିରହି�ି:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6508,19 +6508,19 @@ msgstr "ପà?ରାରମà?à¬à¬¿à¬? ସà?ତର ସà?ଥିର à¬?ର( à§
msgid "LEVEL"
msgstr "LEVEL"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "ସାଧା"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "à?à?à¬?ଦà?ଲà?"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr ""
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr ""
diff --git a/po/pa.po b/po/pa.po
index f9b2cb2..b0cd6a5 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -963,7 +963,7 @@ msgid "There are no more moves"
msgstr "��� ਹ�ਰ �ਾਲ ਨਹ�� ਬ��"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "��ਡ �ਤਮ"
@@ -6473,7 +6473,7 @@ msgstr "ਪੱਧਰ:"
msgid "Remaining:"
msgstr "ਬਾ��:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6621,19 +6621,19 @@ msgstr "ਸ਼�ਰ��ਤ� ਦਰ�ਾ ਦਿ� (1 �ਾ� ਵੱਧ)"
msgid "LEVEL"
msgstr "ਪੱਧਰ"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "ਸਮਤਲ"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "ਦਾ�ਲ"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "�ਾ��� ਫਲ��"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "�ਾ��� ਸ਼�ਡਡ"
diff --git a/po/pl.po b/po/pl.po
index 808fd2e..12597d6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -971,7 +971,7 @@ msgstr "Brak możliwoÅ?ci ruchu"
#. Empty title shows up as "<unnamed>" on maemo
#: ../aisleriot/window.c:431
-#: ../gnometris/field-noclutter.cpp:245
+#: ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Koniec gry"
@@ -6647,7 +6647,7 @@ msgstr "Poziom:"
msgid "Remaining:"
msgstr "PozostaÅ?o:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6793,19 +6793,19 @@ msgstr "Ustawienie poziomu poczÄ?tkowego (1 lub wyższy)"
msgid "LEVEL"
msgstr "POZIOM"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "ZwykÅ?y"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "PoÅ?Ä?czony"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango pÅ?askie"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango cieniowane"
diff --git a/po/pt.po b/po/pt.po
index fa3b8b7..7348b54 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -966,7 +966,7 @@ msgid "There are no more moves"
msgstr "Não existem mais jogadas"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Jogo Terminado"
@@ -6737,7 +6737,7 @@ msgstr "NÃvel:"
msgid "Remaining:"
msgstr "Restantes:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6890,19 +6890,19 @@ msgstr "Definir nÃvel inicial (1 ou maior)"
msgid "LEVEL"
msgstr "NÃ?VEL"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Simples"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Reunido"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango Alisado"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango Sombreado"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index cb013a7..247f326 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -970,7 +970,7 @@ msgid "There are no more moves"
msgstr "Não há mais movimentos válidos"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Fim do jogo"
@@ -6133,7 +6133,7 @@ msgstr "NÃvel:"
msgid "Remaining:"
msgstr "Restantes:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:172
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:211
msgid "Paused"
@@ -6286,19 +6286,19 @@ msgstr "Definir nÃvel inicial (1 ou maior)"
msgid "LEVEL"
msgstr "NÃ?VEL"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Plano"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Junto"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango Plano"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango Sombreado"
diff --git a/po/ro.po b/po/ro.po
index 7e3b6a5..98b7048 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -963,7 +963,7 @@ msgstr "Nu mai sunt mutÄ?ri"
#. Empty title shows up as "<unnamed>" on maemo
#: ../aisleriot/window.c:431
-#: ../gnometris/field-noclutter.cpp:245
+#: ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Jocul s-a terminat"
@@ -6613,7 +6613,7 @@ msgstr "Nivel:"
msgid "Remaining:"
msgstr "Mai rÄ?mân:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6759,19 +6759,19 @@ msgstr "SetaÈ?i nivelul de pornire(1 sau mai mare)"
msgid "LEVEL"
msgstr "NIVEL"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Simplu"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Unit"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr ""
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index bd175d7..322810e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -960,7 +960,7 @@ msgid "There are no more moves"
msgstr "Ð?олÑ?Ñ?е неÑ? ваÑ?ианÑ?ов Ñ?одов"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Ð?гÑ?а оконÑ?ена"
@@ -6464,7 +6464,7 @@ msgstr "УÑ?овенÑ?:"
msgid "Remaining:"
msgstr "Ð?Ñ?Ñ?алоÑ?Ñ?:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6613,19 +6613,19 @@ msgstr "УÑ?Ñ?ановиÑ?Ñ? наÑ?алÑ?нÑ?й Ñ?Ñ?овенÑ? (1 или бол
msgid "LEVEL"
msgstr "УРÐ?Ð?Ð?Ð?Ь"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Ð?Ñ?оÑ?Ñ?ой"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Ð?Ñ?иÑ?оединилÑ?Ñ?"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Ð?Ñ?оÑ?Ñ?ой Танго"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Танго Ñ? Ñ?енÑ?ми"
diff --git a/po/rw.po b/po/rw.po
index 46812ff..1d4c9d2 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -5027,7 +5027,7 @@ msgstr ""
msgid "Extra Life"
msgstr ""
-#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field-noclutter.cpp:229
+#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr ""
@@ -5752,7 +5752,7 @@ msgid "Remaining:"
msgstr ""
# svtools/source\dialogs\prnsetup.src:STR_SVT_PRNDLG_PAUSED.text
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:176
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:215
msgid "Paused"
@@ -5947,12 +5947,12 @@ msgstr "urwego 1. 10"
msgid "LEVEL"
msgstr "urwego"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr ""
# goodies/source\filter.vcl\eps\dlgeps.src:DLG_EXPORT_EPS.RB_COMPRESSION_NONE.text
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
#, fuzzy
msgid "Joined"
msgstr "Nta na kimwe"
diff --git a/po/si.po b/po/si.po
index e17eb6e..6235196 100644
--- a/po/si.po
+++ b/po/si.po
@@ -886,7 +886,7 @@ msgid "There are no more moves"
msgstr ""
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:423 ../gnometris/field-noclutter.cpp:229
+#: ../aisleriot/window.c:423 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "à¶à¶»à¶?ය à¶?à·?à·?නà·?"
@@ -5376,7 +5376,7 @@ msgstr ""
msgid "Remaining:"
msgstr "à¶?à¶à·?රà·?à·? à¶?à¶à·?:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:202
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
msgid "Paused"
@@ -5522,11 +5522,11 @@ msgstr ""
msgid "LEVEL"
msgstr "LEVEL"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "�රල"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr ""
diff --git a/po/sk.po b/po/sk.po
index e0696d5..2c941ce 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -972,7 +972,7 @@ msgid "There are no more moves"
msgstr "Žiadne platné Å¥ahy už nie sú k dispozÃcii."
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:417 ../gnometris/field-noclutter.cpp:236
+#: ../aisleriot/window.c:417 ../gnometris/field.cpp:236
msgid "Game Over"
msgstr "Koniec hry"
@@ -6601,7 +6601,7 @@ msgstr "Ã?roveÅ?:"
msgid "Remaining:"
msgstr "Ostáva:"
-#: ../gnometris/field-noclutter.cpp:234
+#: ../gnometris/field.cpp:234
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
#, fuzzy
@@ -6765,21 +6765,21 @@ msgstr "Nastavte Å¡tartovaciu úroveÅ? (1-10)"
msgid "LEVEL"
msgstr "Ã?ROVEÅ?"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
#, fuzzy
msgid "Plain"
msgstr "Prepletenec"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
#, fuzzy
msgid "Joined"
msgstr "Žiadna"
-#: ../gnometris/renderer-noclutter.cpp:29
+#: ../gnometris/renderer.cpp:29
msgid "Tango Flat"
msgstr ""
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Tango Shaded"
msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 341d492..0a4476f 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -962,7 +962,7 @@ msgstr "Ni veÄ? mogoÄ?ih korakov."
#. Empty title shows up as "<unnamed>" on maemo
#: ../aisleriot/window.c:431
-#: ../gnometris/field-noclutter.cpp:245
+#: ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Konec igre!"
@@ -6627,7 +6627,7 @@ msgstr "Stopnja:"
msgid "Remaining:"
msgstr "Preostanek:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:171
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:210
msgid "Paused"
@@ -6773,19 +6773,19 @@ msgstr "Nastavi zaÄ?etno stopnjo (1 ali veÄ?je)"
msgid "LEVEL"
msgstr "STOPNJA"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "ObiÄ?ajno"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Povezano"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango Flat"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango Shaded"
diff --git a/po/sq.po b/po/sq.po
index 7a801de..e91e49c 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -4562,7 +4562,7 @@ msgstr "Përdor Shpërblimin"
msgid "Extra Life"
msgstr "Jetë Tepër"
-#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field-noclutter.cpp:229
+#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "Loja Mbarojë"
@@ -5178,7 +5178,7 @@ msgstr "Etiketa:"
msgid "Remaining:"
msgstr "Të Mbetura:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:176
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:215
msgid "Paused"
@@ -5328,11 +5328,11 @@ msgstr "Cakto nivelin e fillimit (1 ose më i madh)"
msgid "LEVEL"
msgstr "NIVELI"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "Qartë"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "Lidhur"
diff --git a/po/sr.po b/po/sr.po
index e1d8e61..1d2805a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -921,7 +921,7 @@ msgstr "Ð?ема виÑ?е поÑ?еза"
#. Empty title shows up as "<unnamed>" on maemo
#: ../aisleriot/window.c:425
-#: ../gnometris/field-noclutter.cpp:244
+#: ../gnometris/field.cpp:244
msgid "Game Over"
msgstr "Ð?гÑ?а завÑ?Ñ?ена"
@@ -6002,7 +6002,7 @@ msgstr "Ð?иво:"
msgid "Remaining:"
msgstr "Ð?Ñ?еоÑ?Ñ?ало:"
-#: ../gnometris/field-noclutter.cpp:242
+#: ../gnometris/field.cpp:242
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:185
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:224
msgid "Paused"
@@ -6147,19 +6147,19 @@ msgstr "Ð?оÑ?Ñ?ави поÑ?еÑ?ни ниво (1 или веÑ?и)"
msgid "LEVEL"
msgstr "Ð?Ð?Ð?Ð?"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "Равно"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "СпоÑ?ен"
-#: ../gnometris/renderer-noclutter.cpp:29
+#: ../gnometris/renderer.cpp:29
msgid "Tango Flat"
msgstr "Равни Ñ?анго"
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Tango Shaded"
msgstr "Танго Ñ?а Ñ?енкама"
diff --git a/po/sr latin po b/po/sr latin po
index 8bd07e8..b3cd3c8 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -921,7 +921,7 @@ msgstr "Nema više poteza"
#. Empty title shows up as "<unnamed>" on maemo
#: ../aisleriot/window.c:425
-#: ../gnometris/field-noclutter.cpp:244
+#: ../gnometris/field.cpp:244
msgid "Game Over"
msgstr "Igra završena"
@@ -6002,7 +6002,7 @@ msgstr "Nivo:"
msgid "Remaining:"
msgstr "Preostalo:"
-#: ../gnometris/field-noclutter.cpp:242
+#: ../gnometris/field.cpp:242
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:185
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:224
msgid "Paused"
@@ -6147,19 +6147,19 @@ msgstr "Postavi poÄ?etni nivo (1 ili veÄ?i)"
msgid "LEVEL"
msgstr "NIVO"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "Ravno"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "Spojen"
-#: ../gnometris/renderer-noclutter.cpp:29
+#: ../gnometris/renderer.cpp:29
msgid "Tango Flat"
msgstr "Ravni tango"
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Tango Shaded"
msgstr "Tango sa senkama"
diff --git a/po/sv.po b/po/sv.po
index 768d714..acba644 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -983,7 +983,7 @@ msgstr "Det finns inga fler drag"
#. Empty title shows up as "<unnamed>" on maemo
#: ../aisleriot/window.c:431
-#: ../gnometris/field-noclutter.cpp:245
+#: ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Spelet är slut"
@@ -6672,7 +6672,7 @@ msgstr "Nivå:"
msgid "Remaining:"
msgstr "Kvarvarande:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6818,19 +6818,19 @@ msgstr "Ställ in startnivå (1 eller större)"
msgid "LEVEL"
msgstr "NIVÃ?"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Enkel"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Sammanslagen"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango platt"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango skuggad"
diff --git a/po/ta.po b/po/ta.po
index cac0d85..4a904cc 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -970,7 +970,7 @@ msgid "There are no more moves"
msgstr "���த�த ந�ர�த�தல��ள� �ல�ல�."
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "����ம� ம��ிந�தத�"
@@ -6689,7 +6689,7 @@ msgstr "ம���ம�:"
msgid "Remaining:"
msgstr "ம�தியானவ�:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6837,19 +6837,19 @@ msgstr "�ரம�ப நில� �ம�த�தல�(1-10)"
msgid "LEVEL"
msgstr "ம���ம�"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "வ�ற�ம�"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "����ி"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "�ா���� த����"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "�ா���� நிழலி���"
diff --git a/po/te.po b/po/te.po
index 6acdc57..c703d58 100644
--- a/po/te.po
+++ b/po/te.po
@@ -967,7 +967,7 @@ msgid "There are no more moves"
msgstr "���ా � �త�త�ల� ల�వ�"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "�� �యిప�యి�ది"
@@ -6432,7 +6432,7 @@ msgstr "స�థాయి:"
msgid "Remaining:"
msgstr "మి�ిలివ�న�న:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6578,19 +6578,19 @@ msgstr ""
msgid "LEVEL"
msgstr "స�థాయి"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "సమమ�న"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "��రినది"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr ""
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr ""
diff --git a/po/th.po b/po/th.po
index f035e06..0dfc58a 100644
--- a/po/th.po
+++ b/po/th.po
@@ -946,7 +946,7 @@ msgid "There are no more moves"
msgstr "หม��า��ิ��ล�ว"
#. Empty title shows up as "<unnamed>" on maemo
-#: aisleriot/window.c:431 gnometris/field-noclutter.cpp:245
+#: aisleriot/window.c:431 gnometris/field.cpp:245
msgid "Game Over"
msgstr "à¸à¸§à¸ªà¸²à¸?"
@@ -6337,7 +6337,7 @@ msgstr "ระ�ั�:"
msgid "Remaining:"
msgstr "à¸?à¸?à¹?หลืà¸:"
-#: gnometris/field-noclutter.cpp:243
+#: gnometris/field.cpp:243
#: gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6486,19 +6486,19 @@ msgstr "�ั��ระ�ั��ริ�ม�����ม (1 �ึ
msgid "LEVEL"
msgstr "LEVEL"
-#: gnometris/renderer-noclutter.cpp:31
+#: gnometris/renderer.cpp:31
msgid "Plain"
msgstr "�รรม�า"
-#: gnometris/renderer-noclutter.cpp:32
+#: gnometris/renderer.cpp:32
msgid "Joined"
msgstr "à¹?à¸?ืà¹?à¸à¸¡à¸?à¹?à¸"
-#: gnometris/renderer-noclutter.cpp:33
+#: gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango ������"
-#: gnometris/renderer-noclutter.cpp:34
+#: gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango ���มี�ส���า"
diff --git a/po/tr.po b/po/tr.po
index 95f6d7c..7c9ce9b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -919,7 +919,7 @@ msgid "There are no more moves"
msgstr "Daha baÅ?ka hamle yok"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:425 ../gnometris/field-noclutter.cpp:244
+#: ../aisleriot/window.c:425 ../gnometris/field.cpp:244
msgid "Game Over"
msgstr "Oyun Bitti"
@@ -5805,7 +5805,7 @@ msgstr "Seviye:"
msgid "Remaining:"
msgstr "Kalan:"
-#: ../gnometris/field-noclutter.cpp:242
+#: ../gnometris/field.cpp:242
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:185
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:224
msgid "Paused"
@@ -5956,19 +5956,19 @@ msgstr "BaÅ?langıç seviyesini belirle (1 ya da daha büyük)"
msgid "LEVEL"
msgstr "SEVÄ°YE"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "Düz"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "Katıldı"
-#: ../gnometris/renderer-noclutter.cpp:29
+#: ../gnometris/renderer.cpp:29
msgid "Tango Flat"
msgstr "Tango Düz"
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Tango Shaded"
msgstr "Tango Gölgeli"
diff --git a/po/uk.po b/po/uk.po
index 801eaf4..3e2b56e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -896,7 +896,7 @@ msgid "There are no more moves"
msgstr "Ð?Ñ?лÑ?Ñ?е немаÑ? ваÑ?Ñ?анÑ?Ñ?в Ñ?одÑ?."
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:421 ../gnometris/field-noclutter.cpp:229
+#: ../aisleriot/window.c:421 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "Ð?Ñ?Ñ? закÑ?нÑ?ено"
@@ -5588,7 +5588,7 @@ msgstr "Ð Ñ?венÑ?:"
msgid "Remaining:"
msgstr "Ð?иÑ?аÑ?Ñ?Ñ?Ñ?Ñ?:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:202
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:241
msgid "Paused"
@@ -5737,19 +5737,19 @@ msgstr "Ð?Ñ?Ñ?ановиÑ?и поÑ?аÑ?ковий Ñ?Ñ?венÑ? (1 або бÑ?л
msgid "LEVEL"
msgstr "Ð Ð?Ð?Ð?Ð?Ь"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "Ð?Ñ?оÑ?Ñ?ий"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "Ð?Ñ?иÑ?днавÑ?Ñ?"
-#: ../gnometris/renderer-noclutter.cpp:29
+#: ../gnometris/renderer.cpp:29
msgid "Tango Flat"
msgstr "Ð?Ñ?оÑ?Ñ?ий Танго"
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Tango Shaded"
msgstr "Танго з Ñ?Ñ?нÑ?ми"
diff --git a/po/vi.po b/po/vi.po
index 41ad8a4..74d8704 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -971,7 +971,7 @@ msgstr "Hết lượt"
#. Empty title shows up as "<unnamed>" on maemo
#: ../aisleriot/window.c:431
-#: ../gnometris/field-noclutter.cpp:245
+#: ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "Hết lượt chơi"
@@ -6927,7 +6927,7 @@ msgstr "Cấp:"
msgid "Remaining:"
msgstr "Còn lại:"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -7073,19 +7073,19 @@ msgstr "Láºp cấp khá»?i Ä?ầu (1 hay nhiá»?u hÆ¡n)"
msgid "LEVEL"
msgstr "CẤP"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "Chuẩn"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "Ä?ã ná»?i kết"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango Phẳng"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango Ä?á»? Bóng"
diff --git a/po/wa.po b/po/wa.po
index 595e727..5ca31dd 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -4538,7 +4538,7 @@ msgstr ""
msgid "Extra Life"
msgstr ""
-#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field-noclutter.cpp:229
+#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "Li djeu est houte"
@@ -5157,7 +5157,7 @@ msgstr "Livea:"
msgid "Remaining:"
msgstr "I dmeure:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:176
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:215
msgid "Paused"
@@ -5306,12 +5306,12 @@ msgstr "Diner l' livea po cmincî (1-10)"
msgid "LEVEL"
msgstr "LIVEA"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
#, fuzzy
msgid "Plain"
msgstr "Djoker"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
#, fuzzy
msgid "Joined"
msgstr "Nole"
diff --git a/po/xh.po b/po/xh.po
index 60cc2bb..098d124 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -4665,7 +4665,7 @@ msgstr "Yitya Ibhonasi"
msgid "Extra Life"
msgstr "Ubomi Obuthe Xhaxhe"
-#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field-noclutter.cpp:229
+#: ../gnibbles/gnibbles.soundlist.in.h:5 ../gnometris/field.cpp:229
msgid "Game Over"
msgstr "Umdlalo Uphelile"
@@ -5333,7 +5333,7 @@ msgstr "Inqanaba:"
msgid "Remaining:"
msgstr "Eziseleyo:"
-#: ../gnometris/field-noclutter.cpp:227
+#: ../gnometris/field.cpp:227
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:176
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:215
msgid "Paused"
@@ -5486,12 +5486,12 @@ msgstr "Misela inqanaba emakuqalwe kulo (1-10)"
msgid "LEVEL"
msgstr "INQANABA"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
#, fuzzy
msgid "Plain"
msgstr "I-Plait"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
#, fuzzy
msgid "Joined"
msgstr "Akukho nanye"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 83288d0..9febe73 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -878,7 +878,7 @@ msgid "There are no more moves"
msgstr "没æ??æ?´å¤?ç??æ³?äº?"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:424 ../gnometris/field-noclutter.cpp:247
+#: ../aisleriot/window.c:424 ../gnometris/field.cpp:247
msgid "Game Over"
msgstr "游æ??ç»?æ??"
@@ -5536,7 +5536,7 @@ msgstr "级��"
msgid "Remaining:"
msgstr "���"
-#: ../gnometris/field-noclutter.cpp:245
+#: ../gnometris/field.cpp:245
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:185
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:224
msgid "Paused"
@@ -5676,19 +5676,19 @@ msgstr "设å®?èµ·å§?级å?« (大äº?ç?äº?1)"
msgid "LEVEL"
msgstr "级�"
-#: ../gnometris/renderer-noclutter.cpp:27
+#: ../gnometris/renderer.cpp:27
msgid "Plain"
msgstr "平�"
-#: ../gnometris/renderer-noclutter.cpp:28
+#: ../gnometris/renderer.cpp:28
msgid "Joined"
msgstr "ç«?ä½?"
-#: ../gnometris/renderer-noclutter.cpp:29
+#: ../gnometris/renderer.cpp:29
msgid "Tango Flat"
msgstr "Tango 平�"
-#: ../gnometris/renderer-noclutter.cpp:30
+#: ../gnometris/renderer.cpp:30
msgid "Tango Shaded"
msgstr "Tango é?´å½±"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 6b38a4b..f70c202 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -971,7 +971,7 @@ msgid "There are no more moves"
msgstr "å·²ç¶?æ²?æ??å?¶ä»?å?¯ç§»å??ç??æ?¹æ³?äº?"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "���"
@@ -6410,7 +6410,7 @@ msgstr "���"
msgid "Remaining:"
msgstr "���"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6557,19 +6557,19 @@ msgstr "è¨å®?é??å§?ç??ç´?æ?¸ (1 æ??以ä¸?)"
msgid "LEVEL"
msgstr "ç´?æ?¸"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "æ?¹æ ¼"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "��"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango 平�"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango é?°å½±"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 15a526e..0039408 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -975,7 +975,7 @@ msgid "There are no more moves"
msgstr "å·²ç¶?æ²?æ??å?¶ä»?å?¯ç§»å??ç??æ?¹æ³?äº?"
#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:431 ../gnometris/field-noclutter.cpp:245
+#: ../aisleriot/window.c:431 ../gnometris/field.cpp:245
msgid "Game Over"
msgstr "���"
@@ -6439,7 +6439,7 @@ msgstr "���"
msgid "Remaining:"
msgstr "���"
-#: ../gnometris/field-noclutter.cpp:243
+#: ../gnometris/field.cpp:243
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
msgid "Paused"
@@ -6588,19 +6588,19 @@ msgstr "è¨å®?é??å§?ç??ç´?æ?¸ (1 æ??以ä¸?)"
msgid "LEVEL"
msgstr "ç´?æ?¸"
-#: ../gnometris/renderer-noclutter.cpp:31
+#: ../gnometris/renderer.cpp:31
msgid "Plain"
msgstr "æ?¹æ ¼"
-#: ../gnometris/renderer-noclutter.cpp:32
+#: ../gnometris/renderer.cpp:32
msgid "Joined"
msgstr "��"
-#: ../gnometris/renderer-noclutter.cpp:33
+#: ../gnometris/renderer.cpp:33
msgid "Tango Flat"
msgstr "Tango 平�"
-#: ../gnometris/renderer-noclutter.cpp:34
+#: ../gnometris/renderer.cpp:34
msgid "Tango Shaded"
msgstr "Tango é?°å½±"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
