[gnome-games] Updated British English translation



commit 8e91df420615bf283724d3f86226ad2e97ccc139
Author: Bruce Cowan <bcowan fastmail co uk>
Date:   Sat Sep 12 19:38:18 2009 +0100

    Updated British English translation

 po/en_GB.po | 3904 ++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 2288 insertions(+), 1616 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 045dcac..4523607 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,17 +1,16 @@
 # English (British) translation.
-# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) 2007 gnome-games COPYRIGHT HOLDER
+# This file is distributed under the same licence as the PACKAGE package.
 # Abigail Brady <morwen evilmagic org>, Bastien Nocera <hadess hadess net>, 2007.
-#
-#
+# Bruce Cowan <bcowan fastmail co uk>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-games VERSION\n"
+"Project-Id-Version: gnome-games\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-20 23:45+0000\n"
-"PO-Revision-Date: 2009-02-20 23:53+0000\n"
-"Last-Translator: Philip Withnall <pwithnall svn gnome org>\n"
-"Language-Team:  <en li org>\n"
+"POT-Creation-Date: 2009-09-12 19:36+0100\n"
+"PO-Revision-Date: 2009-09-08 20:03+0100\n"
+"Last-Translator: Bruce Cowan <bcowan fastmail co uk>\n"
+"Language-Team: British English <en li org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -52,7 +51,7 @@ msgstr ""
 "destination."
 
 #: ../aisleriot/aisleriot.schemas.in.h:7 ../gnect/data/gnect.schemas.in.h:11
-#: ../iagno/iagno.schemas.in.h:1
+#: ../gnobots2/properties.c:478 ../iagno/iagno.schemas.in.h:1
 msgid "Sound"
 msgstr "Sound"
 
@@ -96,8 +95,8 @@ msgstr "Whether to show the status bar"
 msgid "Whether or not to show the toolbar"
 msgstr "Whether to show the toolbar"
 
-#: ../aisleriot/freecell.desktop.in.in.h:1 ../aisleriot/sol.c:578
-#: ../aisleriot/window.c:599 ../aisleriot/window.c:607
+#: ../aisleriot/freecell.desktop.in.in.h:1 ../aisleriot/sol.c:304
+#: ../aisleriot/window.c:618 ../aisleriot/window.c:626
 msgid "FreeCell Solitaire"
 msgstr "FreeCell Solitaire"
 
@@ -105,7 +104,7 @@ msgstr "FreeCell Solitaire"
 msgid "Play the popular FreeCell card game"
 msgstr "Play the popular FreeCell card game"
 
-#: ../aisleriot/game.c:1134
+#: ../aisleriot/game.c:1144
 #, c-format
 msgid ""
 "Aisleriot cannot load the file â??%sâ??. Please check your Aisleriot "
@@ -114,11 +113,11 @@ msgstr ""
 "AisleRiot cannot load the file â??%sâ??. Please check your Aisleriot "
 "installation."
 
-#: ../aisleriot/game.c:1575
+#: ../aisleriot/game.c:1588
 msgid "Aisleriot cannot find the last game you played."
 msgstr "AisleRiot cannot find the last game you played."
 
-#: ../aisleriot/game.c:1576
+#: ../aisleriot/game.c:1589
 msgid ""
 "This usually occurs when you run an older version of Aisleriot which does "
 "not have the game you last played. The default game, Klondike, is being "
@@ -128,7 +127,7 @@ msgstr ""
 "not have the game you last played. The default game, Canfield, is being "
 "started instead."
 
-#: ../aisleriot/game.c:1934
+#: ../aisleriot/game.c:1947
 msgid "This game does not have hint support yet."
 msgstr "This game does not have hint support yet."
 
@@ -136,71 +135,842 @@ msgstr "This game does not have hint support yet."
 #. The first %s is a card name, the 2nd %s a sentence fragment.
 #. * Yes, we know this is bad for i18n.
 #.
-#: ../aisleriot/game.c:1968 ../aisleriot/game.c:1996
+#: ../aisleriot/game.c:1981 ../aisleriot/game.c:2009
 #, c-format
 msgid "Move %s onto %s."
 msgstr "Move %s onto %s."
 
-#: ../aisleriot/game.c:2018
+#: ../aisleriot/game.c:2031
 #, c-format
 msgid "You are searching for a %s."
 msgstr "You are searching for a %s."
 
-#: ../aisleriot/game.c:2023
+#: ../aisleriot/game.c:2036
 msgid "This game is unable to provide a hint."
 msgstr "This game is unable to provide a hint."
 
-#: ../aisleriot/sol.c:121
-msgid "Could not show link"
-msgstr "Could not show link"
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:6
+msgid "Peek"
+msgstr "Peek"
 
-#. %s.%s is the game name + the extension HTML or XHTML, e.g. Klondike.html"
-#: ../aisleriot/sol.c:303
-#, c-format
-msgid "Help file \"%s.%s\" not found"
-msgstr "Help file \"%s.%s\" not found"
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:13
+msgid "Auld Lang Syne"
+msgstr "Auld Lang Syne"
 
-#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/sol.c:308 ../aisleriot/sol.c:386 ../aisleriot/window.c:1965
-#: ../dependencies/ggz-gtk/ggzclient.c:124
-#: ../dependencies/ggz-gtk/ggzclient.c:380
-#: ../dependencies/ggz-gtk/ggzclient.c:561
-#: ../dependencies/ggz-gtk/ggzclient.c:596
-#: ../dependencies/ggz-gtk/ggzclient.c:649
-#: ../dependencies/ggz-gtk/ggzclient.c:1079
-#: ../dependencies/ggz-gtk/launch.c:325
-msgid "Error"
-msgstr "Error"
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:20
+msgid "Fortunes"
+msgstr "Fortunes"
 
-#: ../aisleriot/sol.c:367
-#, c-format
-msgid "Could not show help for â??%sâ??"
-msgstr "Could not show help for â??%sâ??"
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:27
+msgid "Seahaven"
+msgstr "Seahaven"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:34
+msgid "King Albert"
+msgstr "King Albert"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:41
+msgid "First Law"
+msgstr "First Law"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:48
+msgid "Straight Up"
+msgstr "Straight Up"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:55
+msgid "Jumbo"
+msgstr "Jumbo"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:62
+msgid "Accordion"
+msgstr "Accordion"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:69
+msgid "Ten Across"
+msgstr "Ten Across"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:76
+msgid "Plait"
+msgstr "Plait"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:83
+msgid "Lady Jane"
+msgstr "Lady Jane"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:90
+msgid "Gypsy"
+msgstr "Gypsy"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:97
+msgid "Neighbor"
+msgstr "Neighbour"
 
-#: ../aisleriot/sol.c:370
-msgid "Could not show Aisleriot help"
-msgstr "Could not show AisleRiot help"
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:104
+msgid "Jamestown"
+msgstr "Jamestown"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:111
+msgid "Osmosis"
+msgstr "Osmosis"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:118
+msgid "Kings Audience"
+msgstr "Kings Audience"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:125
+msgid "Glenwood"
+msgstr "Glenwood"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:132
+msgid "Gay Gordons"
+msgstr "Gay Gordons"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:139
+msgid "Monte Carlo"
+msgstr "Monte Carlo"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:146
+msgid "Kansas"
+msgstr "Kansas"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:153
+msgid "Camelot"
+msgstr "Camelot"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:160
+msgid "Fourteen"
+msgstr "Fourteen"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:167
+msgid "Scorpion"
+msgstr "Scorpion"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:174
+msgid "Isabel"
+msgstr "Isabel"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:181
+msgid "Escalator"
+msgstr "Escalator"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:188
+msgid "Agnes"
+msgstr "Agnes"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:195
+msgid "Bristol"
+msgstr "Bristol"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:202
+msgid "Quatorze"
+msgstr "Quatorze"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:209
+msgid "Bear River"
+msgstr "Bear River"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:216
+msgid "Gold Mine"
+msgstr "Gold Mine"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:223
+msgid "Athena"
+msgstr "Athena"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:230
+msgid "Spiderette"
+msgstr "Spiderette"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:237
+msgid "Chessboard"
+msgstr "Chessboard"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:244
+msgid "Backbone"
+msgstr "Backbone"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:251
+msgid "Yukon"
+msgstr "Yukon"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:258
+msgid "Union Square"
+msgstr "Union Square"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:265
+msgid "Eight Off"
+msgstr "Eight Off"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:272
+msgid "Napoleons Tomb"
+msgstr "Napoleons Tomb"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:279
+msgid "Forty Thieves"
+msgstr "Forty Thieves"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:286
+msgid "Streets And Alleys"
+msgstr "Streets And Alleys"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:293
+msgid "Maze"
+msgstr "Maze"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:300
+msgid "Clock"
+msgstr "Clock"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:307
+msgid "Pileon"
+msgstr "Pileon"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:314
+msgid "Canfield"
+msgstr "Demon"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:321
+msgid "Thirteen"
+msgstr "Thirteen"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:328
+msgid "Bakers Game"
+msgstr "Bakers Game"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:335
+msgid "Triple Peaks"
+msgstr "Triple Peaks"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:342
+msgid "Easthaven"
+msgstr "Easthaven"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#. Translators: this string is the name of a variant of this game. If there is an established standard name for this game or game variant in your locale, use that; otherwise you can translate this string freely or literally, at your option.
+#: ../aisleriot/game-names.h:349 ../aisleriot/rules/terrace.scm.h:20
+msgid "Terrace"
+msgstr "Terrace"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:356
+msgid "Aunt Mary"
+msgstr "Aunt Mary"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:363
+msgid "Carpet"
+msgstr "Carpet"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:370
+msgid "Sir Tommy"
+msgstr "Sir Tommy"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:377
+msgid "Diamond Mine"
+msgstr "Diamond Mine"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:384
+msgid "Yield"
+msgstr "Yield"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:391
+msgid "Labyrinth"
+msgstr "Labyrinth"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:398
+msgid "Thieves"
+msgstr "Thieves"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:405
+msgid "Saratoga"
+msgstr "Saratoga"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:412
+msgid "Cruel"
+msgstr "Cruel"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:419
+msgid "Block Ten"
+msgstr "Block Ten"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:426
+msgid "Will O The Wisp"
+msgstr "Will O The Wisp"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:433
+msgid "Odessa"
+msgstr "Odessa"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:440
+msgid "Eagle Wing"
+msgstr "Eagle Wing"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:447
+msgid "Treize"
+msgstr "Treize"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:454
+msgid "Zebra"
+msgstr "Zebra"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:461
+msgid "Cover"
+msgstr "Cover"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:468
+msgid "Elevator"
+msgstr "Elevator"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:475
+msgid "Fortress"
+msgstr "Fortress"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:482
+msgid "Giant"
+msgstr "Giant"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:489
+msgid "Spider"
+msgstr "Spider"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:496
+msgid "Gaps"
+msgstr "Gaps"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:503
+msgid "Bakers Dozen"
+msgstr "Bakers Dozen"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:510
+msgid "Whitehead"
+msgstr "Whitehead"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:517
+msgid "Freecell"
+msgstr "Freecell"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:524
+msgid "Helsinki"
+msgstr "Helsinki"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:531
+msgid "Spider Three Decks"
+msgstr "Spider Three Decks"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:538
+msgid "Scuffle"
+msgstr "Scuffle"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:545
+msgid "Poker"
+msgstr "Poker"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:552
+msgid "Klondike Three Decks"
+msgstr "Klondike Three Decks"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:559
+msgid "Valentine"
+msgstr "Valentine"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:566
+msgid "Royal East"
+msgstr "Royal East"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:573
+msgid "Thumb And Pouch"
+msgstr "Thumb And Pouch"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:580
+msgid "Klondike"
+msgstr "Canfield"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:587
+msgid "Doublets"
+msgstr "Doublets"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:594
+msgid "Template"
+msgstr "Template"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:601
+msgid "Golf"
+msgstr "Golf"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:608
+msgid "Westhaven"
+msgstr "Westhaven"
+
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:615
+msgid "Beleaguered Castle"
+msgstr "Beleaguered Castle"
 
-#: ../aisleriot/sol.c:475
+#. Translators: this string is the name of a game of patience.
+#. If there is an established standard name for this game in your
+#. locale, use that; otherwise you can translate this string
+#. freely, literally, or not at all, at your option.
+#.
+#: ../aisleriot/game-names.h:622
+msgid "Hopscotch"
+msgstr "Hopscotch"
+
+#: ../aisleriot/sol.c:212
 msgid "Select the game type to play"
 msgstr "Select the game type to play"
 
-#: ../aisleriot/sol.c:475 ../gnobots2/gnobots.c:86 ../gnobots2/gnobots.c:88
+#: ../aisleriot/sol.c:212 ../gnobots2/gnobots.c:85 ../gnobots2/gnobots.c:87
 #: ../same-gnome/same-gnome.c:127 ../same-gnome/same-gnome.c:129
 msgid "NAME"
 msgstr "NAME"
 
-#: ../aisleriot/sol.c:477
+#: ../aisleriot/sol.c:214
 msgid "Select the game number"
 msgstr "Select the game number"
 
-#: ../aisleriot/sol.c:477 ../gnomine/gnomine.c:961 ../gtali/gyahtzee.c:110
+#: ../aisleriot/sol.c:214 ../gnomine/gnomine.c:1003 ../gtali/gyahtzee.c:110
 #: ../gtali/gyahtzee.c:112 ../gtali/gyahtzee.c:116 ../gtali/gyahtzee.c:118
 #: ../same-gnome/same-gnome.c:131
 msgid "NUMBER"
 msgstr "NUMBER"
 
-#: ../aisleriot/sol.c:578 ../aisleriot/window.c:608 ../aisleriot/window.c:2794
+#: ../aisleriot/sol.c:304 ../aisleriot/window.c:627 ../aisleriot/window.c:2880
 msgid "AisleRiot"
 msgstr "AisleRiot"
 
@@ -513,53 +1283,53 @@ msgid "two"
 msgstr "two"
 
 #. Translators: this is the total number of won games
-#: ../aisleriot/stats-dialog.c:151
+#: ../aisleriot/stats-dialog.c:150
 msgid "Wins:"
 msgstr "Wins:"
 
 #. Translators: this is the number of games played
-#: ../aisleriot/stats-dialog.c:153
+#: ../aisleriot/stats-dialog.c:152
 msgid "Total:"
 msgstr "Total:"
 
 #. Translators: this is the percentage of games won out of all games played
-#: ../aisleriot/stats-dialog.c:155
+#: ../aisleriot/stats-dialog.c:154
 msgid "Percentage:"
 msgstr "Percentage:"
 
 #. Translators: this is the section title of a section which contains the n
 #. * number of games played, number of games won, and the ratio of these 2 numbers.
 #.
-#: ../aisleriot/stats-dialog.c:159
+#: ../aisleriot/stats-dialog.c:158
 msgid "Wins"
 msgstr "Wins"
 
 #. Translators: this is the best time of all wins
-#: ../aisleriot/stats-dialog.c:166
+#: ../aisleriot/stats-dialog.c:165
 msgid "Best:"
 msgstr "Best:"
 
 #. Translators: this is the worst time of all wins
-#: ../aisleriot/stats-dialog.c:168
+#: ../aisleriot/stats-dialog.c:167
 msgid "Worst:"
 msgstr "Worst:"
 
 #. Translators: this is the section title of a section containing the
 #. * best and worst time taken to win a game.
 #.
-#: ../aisleriot/stats-dialog.c:172
+#: ../aisleriot/stats-dialog.c:171
 #: ../libgames-support/games-scores-dialog.c:114
 msgid "Time"
 msgstr "Time"
 
-#: ../aisleriot/stats-dialog.c:204
+#: ../aisleriot/stats-dialog.c:203
 msgid "Statistics"
 msgstr "Statistics"
 
 #. Translators: Translate this to "%Id" if you want to use localised digits,
 #. * and to "%d" otherwise. Do not translate it to anything else!
 #.
-#: ../aisleriot/stats-dialog.c:218 ../aisleriot/stats-dialog.c:224
+#: ../aisleriot/stats-dialog.c:217 ../aisleriot/stats-dialog.c:223
 #, c-format
 msgid "%d"
 msgstr "%d"
@@ -571,417 +1341,74 @@ msgstr "%d"
 #. * instead, or leave it as "%%". If you chose a character other than
 #. * "%" (U+0025 PERCENT SIGN) you do NOT need to escape it with another "%"!
 #.
-#: ../aisleriot/stats-dialog.c:235
+#: ../aisleriot/stats-dialog.c:234
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
 #. For translators: N/A means "Not Applicable", use whatever
 #. * abbreviation you have for a value that has no meaning.
-#: ../aisleriot/stats-dialog.c:241 ../aisleriot/stats-dialog.c:250
-#: ../aisleriot/stats-dialog.c:258 ../dependencies/ggz-gtk/roominfo.c:162
+#: ../aisleriot/stats-dialog.c:240 ../aisleriot/stats-dialog.c:249
+#: ../aisleriot/stats-dialog.c:257 ../dependencies/ggz-gtk/roominfo.c:162
 #: ../dependencies/ggz-gtk/roominfo.c:169
 msgid "N/A"
 msgstr "N/A"
 
 #. Translators: this represents minutes:seconds.
-#: ../aisleriot/stats-dialog.c:245 ../aisleriot/stats-dialog.c:253
+#: ../aisleriot/stats-dialog.c:244 ../aisleriot/stats-dialog.c:252
 #, c-format
 msgid "%d:%02d"
 msgstr "%d:%02d"
 
-#: ../aisleriot/translatable_game_names.h:1
-msgid "Accordion"
-msgstr "Accordion"
-
-#: ../aisleriot/translatable_game_names.h:2
-msgid "Agnes"
-msgstr "Agnes"
-
-#: ../aisleriot/translatable_game_names.h:3
-msgid "Athena"
-msgstr "Athena"
-
-#: ../aisleriot/translatable_game_names.h:4
-msgid "Auld Lang Syne"
-msgstr "Auld Lang Syne"
-
-#: ../aisleriot/translatable_game_names.h:5
-msgid "Aunt Mary"
-msgstr "Aunt Mary"
-
-#: ../aisleriot/translatable_game_names.h:6
-msgid "Backbone"
-msgstr "Backbone"
-
-#: ../aisleriot/translatable_game_names.h:7
-msgid "Bakers Dozen"
-msgstr "Bakers Dozen"
-
-#: ../aisleriot/translatable_game_names.h:8
-msgid "Bakers Game"
-msgstr "Bakers Game"
-
-#: ../aisleriot/translatable_game_names.h:9
-msgid "Beleaguered Castle"
-msgstr "Beleaguered Castle"
-
-#: ../aisleriot/translatable_game_names.h:10
-msgid "Block Ten"
-msgstr "Block Ten"
-
-#: ../aisleriot/translatable_game_names.h:11
-msgid "Bristol"
-msgstr "Bristol"
-
-#: ../aisleriot/translatable_game_names.h:12
-msgid "Camelot"
-msgstr "Camelot"
-
-#: ../aisleriot/translatable_game_names.h:13
-msgid "Canfield"
-msgstr "Demon"
-
-#: ../aisleriot/translatable_game_names.h:14
-msgid "Carpet"
-msgstr "Carpet"
-
-#: ../aisleriot/translatable_game_names.h:15
-msgid "Chessboard"
-msgstr "Chessboard"
-
-#: ../aisleriot/translatable_game_names.h:16
-msgid "Clock"
-msgstr "Clock"
-
-#: ../aisleriot/translatable_game_names.h:17
-msgid "Cover"
-msgstr "Cover"
-
-#: ../aisleriot/translatable_game_names.h:18
-msgid "Cruel"
-msgstr "Cruel"
-
-#: ../aisleriot/translatable_game_names.h:19
-msgid "Diamond Mine"
-msgstr "Diamond Mine"
-
-#: ../aisleriot/translatable_game_names.h:20
-msgid "Doublets"
-msgstr "Doublets"
-
-#: ../aisleriot/translatable_game_names.h:21
-msgid "Eagle Wing"
-msgstr "Eagle Wing"
-
-#: ../aisleriot/translatable_game_names.h:22
-msgid "Easthaven"
-msgstr "Easthaven"
-
-#: ../aisleriot/translatable_game_names.h:23
-msgid "Eight Off"
-msgstr "Eight Off"
-
-#: ../aisleriot/translatable_game_names.h:24
-msgid "Elevator"
-msgstr "Elevator"
-
-#: ../aisleriot/translatable_game_names.h:25
-msgid "Escalator"
-msgstr "Escalator"
-
-#: ../aisleriot/translatable_game_names.h:26
-msgid "First Law"
-msgstr "First Law"
-
-#: ../aisleriot/translatable_game_names.h:27
-msgid "Fortress"
-msgstr "Fortress"
-
-#: ../aisleriot/translatable_game_names.h:28
-msgid "Fortunes"
-msgstr "Fortunes"
-
-#: ../aisleriot/translatable_game_names.h:29
-msgid "Forty Thieves"
-msgstr "Forty Thieves"
-
-#: ../aisleriot/translatable_game_names.h:30
-msgid "Fourteen"
-msgstr "Fourteen"
-
-#: ../aisleriot/translatable_game_names.h:31
-msgid "Freecell"
-msgstr "Freecell"
-
-#: ../aisleriot/translatable_game_names.h:32
-msgid "Gaps"
-msgstr "Gaps"
-
-#: ../aisleriot/translatable_game_names.h:33
-msgid "Gay Gordons"
-msgstr "Gay Gordons"
-
-#: ../aisleriot/translatable_game_names.h:34
-msgid "Glenwood"
-msgstr "Glenwood"
-
-#: ../aisleriot/translatable_game_names.h:35
-msgid "Gold Mine"
-msgstr "Gold Mine"
-
-#: ../aisleriot/translatable_game_names.h:36
-msgid "Golf"
-msgstr "Golf"
-
-#: ../aisleriot/translatable_game_names.h:37
-msgid "Gypsy"
-msgstr "Gypsy"
-
-#: ../aisleriot/translatable_game_names.h:38
-msgid "Helsinki"
-msgstr "Helsinki"
-
-#: ../aisleriot/translatable_game_names.h:39
-msgid "Hopscotch"
-msgstr "Hopscotch"
-
-#: ../aisleriot/translatable_game_names.h:40
-msgid "Isabel"
-msgstr "Isabel"
-
-#: ../aisleriot/translatable_game_names.h:41
-msgid "Jamestown"
-msgstr "Jamestown"
-
-#: ../aisleriot/translatable_game_names.h:42
-msgid "Jumbo"
-msgstr "Jumbo"
-
-#: ../aisleriot/translatable_game_names.h:43
-msgid "Kansas"
-msgstr "Kansas"
-
-#: ../aisleriot/translatable_game_names.h:44
-msgid "King Albert"
-msgstr "King Albert"
-
-#: ../aisleriot/translatable_game_names.h:45
-msgid "Kings Audience"
-msgstr "Kings Audience"
-
-#: ../aisleriot/translatable_game_names.h:46
-msgid "Klondike"
-msgstr "Canfield"
-
-#: ../aisleriot/translatable_game_names.h:47
-msgid "Klondike Three Decks"
-msgstr "Klondike Three Decks"
-
-#: ../aisleriot/translatable_game_names.h:48
-msgid "Labyrinth"
-msgstr "Labyrinth"
-
-#: ../aisleriot/translatable_game_names.h:49
-msgid "Lady Jane"
-msgstr "Lady Jane"
-
-#: ../aisleriot/translatable_game_names.h:50
-msgid "Maze"
-msgstr "Maze"
-
-#: ../aisleriot/translatable_game_names.h:51
-msgid "Monte Carlo"
-msgstr "Monte Carlo"
-
-#: ../aisleriot/translatable_game_names.h:52
-msgid "Napoleons Tomb"
-msgstr "Napoleons Tomb"
-
-#: ../aisleriot/translatable_game_names.h:53
-msgid "Neighbor"
-msgstr "Neighbour"
-
-#: ../aisleriot/translatable_game_names.h:54
-msgid "Odessa"
-msgstr "Odessa"
-
-#: ../aisleriot/translatable_game_names.h:55
-msgid "Osmosis"
-msgstr "Osmosis"
-
-#: ../aisleriot/translatable_game_names.h:56
-msgid "Peek"
-msgstr "Peek"
-
-#: ../aisleriot/translatable_game_names.h:57
-msgid "Pileon"
-msgstr "Pileon"
-
-#: ../aisleriot/translatable_game_names.h:58
-msgid "Plait"
-msgstr "Plait"
-
-#: ../aisleriot/translatable_game_names.h:59
-msgid "Poker"
-msgstr "Poker"
-
-#: ../aisleriot/translatable_game_names.h:60
-msgid "Quatorze"
-msgstr "Quatorze"
-
-#: ../aisleriot/translatable_game_names.h:61
-msgid "Royal East"
-msgstr "Royal East"
-
-#: ../aisleriot/translatable_game_names.h:62
-msgid "Saratoga"
-msgstr "Saratoga"
-
-#: ../aisleriot/translatable_game_names.h:63
-msgid "Scorpion"
-msgstr "Scorpion"
-
-#: ../aisleriot/translatable_game_names.h:64
-msgid "Scuffle"
-msgstr "Scuffle"
-
-#: ../aisleriot/translatable_game_names.h:65
-msgid "Seahaven"
-msgstr "Seahaven"
-
-#: ../aisleriot/translatable_game_names.h:66
-msgid "Sir Tommy"
-msgstr "Sir Tommy"
-
-#: ../aisleriot/translatable_game_names.h:67
-msgid "Spider"
-msgstr "Spider"
-
-#: ../aisleriot/translatable_game_names.h:68
-msgid "Spiderette"
-msgstr "Spiderette"
-
-#: ../aisleriot/translatable_game_names.h:69
-msgid "Spider Three Decks"
-msgstr "Spider Three Decks"
-
-#: ../aisleriot/translatable_game_names.h:70
-msgid "Straight Up"
-msgstr "Straight Up"
-
-#: ../aisleriot/translatable_game_names.h:71
-msgid "Streets And Alleys"
-msgstr "Streets And Alleys"
-
-#: ../aisleriot/translatable_game_names.h:72
-msgid "Template"
-msgstr "Template"
-
-#: ../aisleriot/translatable_game_names.h:73
-msgid "Ten Across"
-msgstr "Ten Across"
-
-#: ../aisleriot/translatable_game_names.h:74
-#: ../aisleriot/rules/terrace.scm.h:14
-msgid "Terrace"
-msgstr "Terrace"
-
-#: ../aisleriot/translatable_game_names.h:75
-msgid "Thieves"
-msgstr "Thieves"
-
-#: ../aisleriot/translatable_game_names.h:76
-msgid "Thirteen"
-msgstr "Thirteen"
-
-#: ../aisleriot/translatable_game_names.h:77
-msgid "Thumb And Pouch"
-msgstr "Thumb And Pouch"
-
-#: ../aisleriot/translatable_game_names.h:78
-msgid "Treize"
-msgstr "Treize"
-
-#: ../aisleriot/translatable_game_names.h:79
-msgid "Triple Peaks"
-msgstr "Triple Peaks"
-
-#: ../aisleriot/translatable_game_names.h:80
-msgid "Union Square"
-msgstr "Union Square"
-
-#: ../aisleriot/translatable_game_names.h:81
-msgid "Valentine"
-msgstr "Valentine"
-
-#: ../aisleriot/translatable_game_names.h:82
-msgid "Westhaven"
-msgstr "Westhaven"
-
-#: ../aisleriot/translatable_game_names.h:83
-msgid "Whitehead"
-msgstr "Whitehead"
-
-#: ../aisleriot/translatable_game_names.h:84
-msgid "Will O The Wisp"
-msgstr "Will O The Wisp"
-
-#: ../aisleriot/translatable_game_names.h:85
-msgid "Yield"
-msgstr "Yield"
-
-#: ../aisleriot/translatable_game_names.h:86
-msgid "Yukon"
-msgstr "Yukon"
-
-#: ../aisleriot/translatable_game_names.h:87
-msgid "Zebra"
-msgstr "Zebra"
+#: ../aisleriot/util.c:86 ../aisleriot/util.c:90
+#: ../libgames-support/games-help.c:152
+#, c-format
+msgid "Could not show help for â??%sâ??"
+msgstr "Could not show help for â??%sâ??"
 
-#: ../aisleriot/window.c:273 ../aisleriot/window.c:2492
+#: ../aisleriot/window.c:285 ../aisleriot/window.c:2565
 msgid "Select Game"
 msgstr "Select Game"
 
-#: ../aisleriot/window.c:277
+#: ../aisleriot/window.c:289
 msgid "_Select"
 msgstr "_Select"
 
-#: ../aisleriot/window.c:414
+#: ../aisleriot/window.c:431
 msgid "Congratulations, you have won!"
 msgstr "Congratulations, you have won!"
 
-#: ../aisleriot/window.c:418
+#: ../aisleriot/window.c:435
 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/blockops.cpp:245
+#: ../aisleriot/window.c:448 ../gnometris/blockops.cpp:788
 msgid "Game Over"
 msgstr "Game Over"
 
-#: ../aisleriot/window.c:558 ../gnomine/gnomine.c:434
+#: ../aisleriot/window.c:575 ../gnomine/gnomine.c:446
 #: ../mahjongg/mahjongg.c:906
 msgid "Main game:"
 msgstr "Main game:"
 
-#: ../aisleriot/window.c:566
+#: ../aisleriot/window.c:583
 msgid "Card games:"
 msgstr "Card games:"
 
-#: ../aisleriot/window.c:580
+#: ../aisleriot/window.c:597
 msgid "Card themes:"
 msgstr "Card themes:"
 
-#: ../aisleriot/window.c:610
+#: ../aisleriot/window.c:629
 msgid "About FreeCell Solitaire"
 msgstr "About FreeCell Solitaire"
 
-#: ../aisleriot/window.c:611
+#: ../aisleriot/window.c:630
 msgid "About AisleRiot"
 msgstr "About AisleRiot"
 
-#: ../aisleriot/window.c:617
+#: ../aisleriot/window.c:636
 msgid ""
 "AisleRiot provides a rule-based solitaire card engine that allows many "
 "different games to be played.\n"
@@ -991,32 +1418,32 @@ msgstr ""
 "different games to be played.\n"
 "AisleRiot is a part of GNOME Games."
 
-#: ../aisleriot/window.c:628 ../blackjack/src/menu.cpp:159
-#: ../glchess/src/lib/gtkui/gtkui.py:900 ../glines/glines.c:1221
-#: ../gnect/src/main.c:925 ../gnibbles/main.c:258 ../gnobots2/menu.c:274
-#: ../gnometris/tetris.cpp:1390 ../gnome-sudoku/src/lib/main.py:804
-#: ../gnomine/gnomine.c:474 ../gnotravex/gnotravex.c:1917
-#: ../gnotski/gnotski.c:1540 ../gtali/gyahtzee.c:623 ../iagno/gnothello.c:269
+#: ../aisleriot/window.c:647 ../blackjack/src/menu.cpp:159
+#: ../glchess/src/lib/gtkui/gtkui.py:861 ../glines/glines.c:1222
+#: ../gnect/src/main.c:925 ../gnibbles/main.c:257 ../gnobots2/menu.c:274
+#: ../gnometris/tetris.cpp:1313 ../gnome-sudoku/src/lib/main.py:717
+#: ../gnomine/gnomine.c:486 ../gnotravex/gnotravex.c:1919
+#: ../gnotski/gnotski.c:1542 ../gtali/gyahtzee.c:623 ../iagno/gnothello.c:268
 #: ../mahjongg/mahjongg.c:951 ../same-gnome/ui.c:131
 msgid "translator-credits"
 msgstr "translator-credits"
 
-#: ../aisleriot/window.c:632 ../blackjack/src/menu.cpp:158
-#: ../glchess/src/lib/defaults.py.in:62 ../glines/glines.c:1224
-#: ../gnect/src/main.c:922 ../gnibbles/main.c:261 ../gnobots2/menu.c:270
-#: ../gnometris/tetris.cpp:1387 ../gnome-sudoku/src/lib/defaults.py.in:46
-#: ../gnomine/gnomine.c:477 ../gnotravex/gnotravex.c:1920
-#: ../gnotski/gnotski.c:1543 ../gtali/gyahtzee.c:627 ../iagno/gnothello.c:271
+#: ../aisleriot/window.c:651 ../blackjack/src/menu.cpp:158
+#: ../glchess/src/lib/defaults.py.in:56 ../glines/glines.c:1225
+#: ../gnect/src/main.c:922 ../gnibbles/main.c:260 ../gnobots2/menu.c:270
+#: ../gnometris/tetris.cpp:1310 ../gnome-sudoku/src/lib/defaults.py.in:43
+#: ../gnomine/gnomine.c:489 ../gnotravex/gnotravex.c:1922
+#: ../gnotski/gnotski.c:1545 ../gtali/gyahtzee.c:627 ../iagno/gnothello.c:270
 #: ../mahjongg/mahjongg.c:954 ../same-gnome/ui.c:135
 msgid "GNOME Games web site"
 msgstr "GNOME Games web site"
 
-#: ../aisleriot/window.c:1441
+#: ../aisleriot/window.c:1473
 #, c-format
 msgid "Play â??%sâ??"
 msgstr "Play â??%sâ??"
 
-#: ../aisleriot/window.c:1608
+#: ../aisleriot/window.c:1644
 #, c-format
 msgid "Display cards with â??%sâ?? card theme"
 msgstr "Display cards with â??%sâ?? card theme"
@@ -1025,230 +1452,244 @@ msgstr "Display cards with â??%sâ?? card theme"
 #. * then translate this string to "%I6d", else to "%6d".
 #. * Do not translate it to anything else!
 #.
-#: ../aisleriot/window.c:1703
+#: ../aisleriot/window.c:1739
 #, c-format
 msgctxt "score"
 msgid "%6d"
 msgstr "%6d"
 
-#: ../aisleriot/window.c:1958
+#: ../aisleriot/window.c:1994
 msgid "A scheme exception occurred"
 msgstr "A scheme exception occurred"
 
-#: ../aisleriot/window.c:1961
+#: ../aisleriot/window.c:1997
 msgid "Please report this bug to the developers."
 msgstr "Please report this bug to the developers."
 
-#: ../aisleriot/window.c:1973
+#. Empty title shows up as "<unnamed>" on maemo
+#: ../aisleriot/window.c:2001 ../dependencies/ggz-gtk/ggzclient.c:124
+#: ../dependencies/ggz-gtk/ggzclient.c:380
+#: ../dependencies/ggz-gtk/ggzclient.c:561
+#: ../dependencies/ggz-gtk/ggzclient.c:596
+#: ../dependencies/ggz-gtk/ggzclient.c:649
+#: ../dependencies/ggz-gtk/ggzclient.c:1079
+#: ../dependencies/ggz-gtk/launch.c:325 ../libgames-support/games-show.c:151
+msgid "Error"
+msgstr "Error"
+
+#: ../aisleriot/window.c:2009
 msgid "_Don't report"
 msgstr "_Don't report"
 
-#: ../aisleriot/window.c:1974
+#: ../aisleriot/window.c:2010
 msgid "_Report"
 msgstr "_Report"
 
 #. Menu actions
 #. Preferences Dialog: Title of game options tab
-#: ../aisleriot/window.c:2134 ../blackjack/src/blackjack.cpp:331
-#: ../glchess/glade/preferences.glade.h:30 ../glchess/glade/glchess.glade.h:34
-#: ../glines/glines.c:1688 ../gnect/src/main.c:1289 ../gnibbles/main.c:764
-#: ../gnobots2/menu.c:68 ../gnometris/tetris.cpp:119
-#: ../gnome-sudoku/src/lib/main.py:231 ../gnomine/gnomine.c:791
+#: ../aisleriot/window.c:2197 ../blackjack/src/blackjack.cpp:331
+#: ../glchess/data/glchess.ui.h:24 ../glchess/data/preferences.ui.h:24
+#: ../glines/glines.c:1690 ../gnect/src/main.c:1289 ../gnibbles/main.c:763
+#: ../gnobots2/menu.c:68 ../gnometris/tetris.cpp:107
+#: ../gnome-sudoku/src/lib/main.py:241 ../gnomine/gnomine.c:830
 #: ../gnotravex/gnotravex.c:302 ../gnotski/gnotski.c:414
-#: ../gtali/gyahtzee.c:701 ../iagno/gnothello.c:802
-#: ../mahjongg/mahjongg.c:1242 ../same-gnome/ui.c:455
+#: ../gtali/gyahtzee.c:701 ../iagno/gnothello.c:812
+#: ../lightsoff/data/lightsoff.ui.h:2 ../mahjongg/mahjongg.c:1242
+#: ../same-gnome/ui.c:455 ../same-gnome-clutter/data/same-gnome.ui.h:2
 msgid "_Game"
 msgstr "_Game"
 
 #. Preferences Dialog: Title of view options tab
-#: ../aisleriot/window.c:2135 ../blackjack/src/blackjack.cpp:332
-#: ../glchess/glade/preferences.glade.h:36 ../glchess/glade/glchess.glade.h:39
-#: ../gnect/src/main.c:1290 ../gnibbles/main.c:765 ../gnobots2/menu.c:69
-#: ../gnome-sudoku/src/lib/main.py:241 ../gnotravex/gnotravex.c:303
+#: ../aisleriot/window.c:2198 ../blackjack/src/blackjack.cpp:332
+#: ../glchess/data/glchess.ui.h:29 ../glchess/data/preferences.ui.h:30
+#: ../gnect/src/main.c:1290 ../gnibbles/main.c:764 ../gnobots2/menu.c:69
+#: ../gnome-sudoku/src/lib/main.py:251 ../gnotravex/gnotravex.c:303
 #: ../gnotski/gnotski.c:415 ../same-gnome/ui.c:456
 msgid "_View"
 msgstr "_View"
 
-#: ../aisleriot/window.c:2136 ../blackjack/src/blackjack.cpp:341
+#: ../aisleriot/window.c:2199 ../blackjack/src/blackjack.cpp:341
 msgid "_Control"
 msgstr "_Control"
 
-#: ../aisleriot/window.c:2138 ../blackjack/src/blackjack.cpp:348
-#: ../glchess/glade/glchess.glade.h:35 ../glines/glines.c:1690
-#: ../gnect/src/main.c:1292 ../gnibbles/main.c:767 ../gnobots2/menu.c:72
-#: ../gnometris/tetris.cpp:121 ../gnome-sudoku/src/lib/main.py:257
-#: ../gnomine/gnomine.c:793 ../gnotravex/gnotravex.c:306
-#: ../gnotski/gnotski.c:416 ../gtali/gyahtzee.c:703 ../iagno/gnothello.c:804
-#: ../mahjongg/mahjongg.c:1244 ../same-gnome/ui.c:458
+#: ../aisleriot/window.c:2201 ../blackjack/src/blackjack.cpp:348
+#: ../glchess/data/glchess.ui.h:25 ../glines/glines.c:1692
+#: ../gnect/src/main.c:1292 ../gnibbles/main.c:766 ../gnobots2/menu.c:72
+#: ../gnometris/tetris.cpp:109 ../gnome-sudoku/src/lib/main.py:269
+#: ../gnomine/gnomine.c:832 ../gnotravex/gnotravex.c:306
+#: ../gnotski/gnotski.c:416 ../gtali/gyahtzee.c:703 ../iagno/gnothello.c:814
+#: ../lightsoff/data/lightsoff.ui.h:3 ../mahjongg/mahjongg.c:1244
+#: ../same-gnome/ui.c:458 ../same-gnome-clutter/data/same-gnome.ui.h:3
 msgid "_Help"
 msgstr "_Help"
 
-#. Tooltip for the New Game toolbar button
-#: ../aisleriot/window.c:2143 ../blackjack/src/blackjack.cpp:333
-#: ../glchess/glade/glchess.glade.h:26 ../gnobots2/menu.c:73
-#: ../libgames-support/games-stock.c:54 ../mahjongg/mahjongg.c:1245
+#: ../aisleriot/window.c:2206 ../blackjack/src/blackjack.cpp:333
+#: ../glchess/data/glchess.ui.h:18 ../gnobots2/menu.c:73
+#: ../libgames-support/games-stock.c:53 ../mahjongg/mahjongg.c:1245
 msgid "Start a new game"
 msgstr "Start a new game"
 
-#: ../aisleriot/window.c:2146 ../libgames-support/games-stock.c:58
+#: ../aisleriot/window.c:2209 ../libgames-support/games-stock.c:57
 msgid "Restart the game"
 msgstr "Restart the game"
 
-#: ../aisleriot/window.c:2148
+#: ../aisleriot/window.c:2211
 msgid "_Select Game..."
-msgstr "_Select Game..."
+msgstr "_Select Gameâ?¦"
 
-#: ../aisleriot/window.c:2150
+#: ../aisleriot/window.c:2213
 msgid "Play a different game"
 msgstr "Play a different game"
 
-#: ../aisleriot/window.c:2152
+#: ../aisleriot/window.c:2215
 msgid "_Recently Played"
 msgstr "_Recently Played"
 
-#: ../aisleriot/window.c:2153
+#: ../aisleriot/window.c:2216
 msgid "S_tatistics"
 msgstr "S_tatistics"
 
-#: ../aisleriot/window.c:2154
+#: ../aisleriot/window.c:2217
 msgid "Show gameplay statistics"
 msgstr "Show gameplay statistics"
 
-#: ../aisleriot/window.c:2157 ../libgames-support/games-stock.c:63
+#: ../aisleriot/window.c:2220 ../libgames-support/games-stock.c:62
 msgid "Close this window"
 msgstr "Close this window"
 
-#: ../aisleriot/window.c:2160 ../libgames-support/games-stock.c:61
+#: ../aisleriot/window.c:2223 ../libgames-support/games-stock.c:60
 #: ../mahjongg/mahjongg.c:1253
 msgid "Undo the last move"
 msgstr "Undo the last move"
 
-#: ../aisleriot/window.c:2163 ../libgames-support/games-stock.c:57
+#: ../aisleriot/window.c:2226 ../libgames-support/games-stock.c:56
 msgid "Redo the undone move"
 msgstr "Redo the undone move"
 
-#: ../aisleriot/window.c:2166
+#: ../aisleriot/window.c:2229
 msgid "Deal next card or cards"
 msgstr "Deal next card or cards"
 
-#: ../aisleriot/window.c:2169 ../libgames-support/games-stock.c:50
+#: ../aisleriot/window.c:2232 ../libgames-support/games-stock.c:49
 msgid "Get a hint for your next move"
 msgstr "Get a hint for your next move"
 
-#: ../aisleriot/window.c:2172
+#: ../aisleriot/window.c:2235
 msgid "View help for Aisleriot"
 msgstr "View help for AisleRiot"
 
-#: ../aisleriot/window.c:2176 ../libgames-support/games-stock.c:47
+#: ../aisleriot/window.c:2239 ../libgames-support/games-stock.c:46
 msgid "View help for this game"
 msgstr "View help for this game"
 
-#: ../aisleriot/window.c:2179 ../libgames-support/games-stock.c:62
+#: ../aisleriot/window.c:2242 ../libgames-support/games-stock.c:61
 msgid "About this game"
 msgstr "About this game"
 
-#: ../aisleriot/window.c:2182
+#: ../aisleriot/window.c:2245
 msgid "Install card themesâ?¦"
 msgstr "Install card themesâ?¦"
 
-#: ../aisleriot/window.c:2183
+#: ../aisleriot/window.c:2246
 msgid "Install new card themes from the distribution packages repositories"
 msgstr "Install new card themes from the distribution's package repositories"
 
-#: ../aisleriot/window.c:2192
+#: ../aisleriot/window.c:2255
 msgid "_Card Style"
 msgstr "_Card Style"
 
-#: ../aisleriot/window.c:2232 ../blackjack/src/blackjack.cpp:354
+#: ../aisleriot/window.c:2295 ../blackjack/src/blackjack.cpp:354
 #: ../gnobots2/menu.c:96 ../mahjongg/mahjongg.c:1273
 msgid "_Toolbar"
 msgstr "_Toolbar"
 
-#. Preferences Dialog: Tooltip for Show Toolbar option
-#: ../aisleriot/window.c:2233 ../glchess/glade/preferences.glade.h:20
+#: ../aisleriot/window.c:2296 ../glchess/data/preferences.ui.h:17
 #: ../gnobots2/menu.c:96 ../mahjongg/mahjongg.c:1273
 msgid "Show or hide the toolbar"
 msgstr "Show or hide the toolbar"
 
-#: ../aisleriot/window.c:2237
+#: ../aisleriot/window.c:2301
 msgid "_Statusbar"
 msgstr "_Statusbar"
 
-#: ../aisleriot/window.c:2238
+#: ../aisleriot/window.c:2302
 msgid "Show or hide statusbar"
 msgstr "Show or hide statusbar"
 
-#: ../aisleriot/window.c:2242 ../gnotravex/gnotravex.c:351
+#: ../aisleriot/window.c:2307 ../gnotravex/gnotravex.c:351
 msgid "_Click to Move"
 msgstr "_Click to Move"
 
-#: ../aisleriot/window.c:2243
+#: ../aisleriot/window.c:2308
 msgid "Pick up and drop cards by clicking"
 msgstr "Pick up and drop cards by clicking"
 
-#. not active by default
-#: ../aisleriot/window.c:2246
+#: ../aisleriot/window.c:2312
 msgid "_Sound"
 msgstr "_Sound"
 
-#: ../aisleriot/window.c:2247
+#: ../aisleriot/window.c:2313
 msgid "Whether or not to play event sounds"
 msgstr "Whether to play event sounds"
 
-#: ../aisleriot/window.c:2251
+#: ../aisleriot/window.c:2318
 msgid "_Animations"
 msgstr "_Animations"
 
-#: ../aisleriot/window.c:2252
+#: ../aisleriot/window.c:2319
 msgid "Whether or not to animate card moves"
 msgstr "Whether to animate card moves"
 
 #. Add "Highscore" label
-#: ../aisleriot/window.c:2519 ../dependencies/ggz-gtk/playerinfo.c:241
-#: ../glines/glines.c:1900 ../gnobots2/statusbar.c:67
-#: ../gnometris/scoreframe.cpp:47 ../gnomine/gnomine.c:437
+#: ../aisleriot/window.c:2592 ../dependencies/ggz-gtk/playerinfo.c:241
+#: ../glines/glines.c:1904 ../gnobots2/statusbar.c:67
+#: ../gnometris/scoreframe.cpp:47 ../gnomine/gnomine.c:449
 msgid "Score:"
 msgstr "Score:"
 
-#: ../aisleriot/window.c:2531 ../gnotravex/gnotravex.c:1382
-#: ../mahjongg/mahjongg.c:1463
+#: ../aisleriot/window.c:2604 ../gnotravex/gnotravex.c:1383
+#: ../mahjongg/mahjongg.c:1465
 msgid "Time:"
 msgstr "Time:"
 
-#: ../aisleriot/window.c:2854
+#: ../aisleriot/window.c:2940
 #, c-format
 msgid "Cannot start the game â??%sâ??"
 msgstr "Cannot start the game â??%sâ??"
 
-#: ../aisleriot/rules/agnes.scm.h:1 ../aisleriot/rules/canfield.scm.h:2
-#: ../aisleriot/rules/chessboard.scm.h:2 ../aisleriot/rules/eagle_wing.scm.h:2
-#: ../aisleriot/rules/glenwood.scm.h:2 ../aisleriot/rules/kansas.scm.h:2
-#: ../aisleriot/rules/lady_jane.scm.h:2 ../aisleriot/rules/plait.scm.h:2
-#: ../aisleriot/rules/royal_east.scm.h:2 ../aisleriot/rules/terrace.scm.h:1
+#: ../aisleriot/rules/agnes.scm.h:1 ../aisleriot/rules/bear_river.scm.h:2
+#: ../aisleriot/rules/canfield.scm.h:2 ../aisleriot/rules/chessboard.scm.h:2
+#: ../aisleriot/rules/eagle_wing.scm.h:2 ../aisleriot/rules/glenwood.scm.h:2
+#: ../aisleriot/rules/kansas.scm.h:2 ../aisleriot/rules/lady_jane.scm.h:2
+#: ../aisleriot/rules/plait.scm.h:2 ../aisleriot/rules/royal_east.scm.h:2
+#: ../aisleriot/rules/terrace.scm.h:1
 msgid "Base Card: Ace"
 msgstr "Base Card: Ace"
 
-#: ../aisleriot/rules/agnes.scm.h:2 ../aisleriot/rules/canfield.scm.h:3
-#: ../aisleriot/rules/chessboard.scm.h:3 ../aisleriot/rules/eagle_wing.scm.h:3
-#: ../aisleriot/rules/glenwood.scm.h:3 ../aisleriot/rules/kansas.scm.h:3
-#: ../aisleriot/rules/lady_jane.scm.h:3 ../aisleriot/rules/plait.scm.h:3
-#: ../aisleriot/rules/royal_east.scm.h:3 ../aisleriot/rules/terrace.scm.h:2
+#: ../aisleriot/rules/agnes.scm.h:2 ../aisleriot/rules/bear_river.scm.h:3
+#: ../aisleriot/rules/canfield.scm.h:3 ../aisleriot/rules/chessboard.scm.h:3
+#: ../aisleriot/rules/eagle_wing.scm.h:3 ../aisleriot/rules/glenwood.scm.h:3
+#: ../aisleriot/rules/kansas.scm.h:3 ../aisleriot/rules/lady_jane.scm.h:3
+#: ../aisleriot/rules/plait.scm.h:3 ../aisleriot/rules/royal_east.scm.h:3
+#: ../aisleriot/rules/terrace.scm.h:2
 msgid "Base Card: Jack"
 msgstr "Base Card: Jack"
 
-#: ../aisleriot/rules/agnes.scm.h:3 ../aisleriot/rules/canfield.scm.h:4
-#: ../aisleriot/rules/chessboard.scm.h:4 ../aisleriot/rules/eagle_wing.scm.h:4
-#: ../aisleriot/rules/glenwood.scm.h:4 ../aisleriot/rules/kansas.scm.h:4
-#: ../aisleriot/rules/lady_jane.scm.h:4 ../aisleriot/rules/plait.scm.h:4
-#: ../aisleriot/rules/royal_east.scm.h:4 ../aisleriot/rules/terrace.scm.h:3
+#: ../aisleriot/rules/agnes.scm.h:3 ../aisleriot/rules/bear_river.scm.h:4
+#: ../aisleriot/rules/canfield.scm.h:4 ../aisleriot/rules/chessboard.scm.h:4
+#: ../aisleriot/rules/eagle_wing.scm.h:4 ../aisleriot/rules/glenwood.scm.h:4
+#: ../aisleriot/rules/kansas.scm.h:4 ../aisleriot/rules/lady_jane.scm.h:4
+#: ../aisleriot/rules/plait.scm.h:4 ../aisleriot/rules/royal_east.scm.h:4
+#: ../aisleriot/rules/terrace.scm.h:3
 msgid "Base Card: King"
 msgstr "Base Card: King"
 
-#: ../aisleriot/rules/agnes.scm.h:4 ../aisleriot/rules/canfield.scm.h:5
-#: ../aisleriot/rules/chessboard.scm.h:5 ../aisleriot/rules/eagle_wing.scm.h:5
-#: ../aisleriot/rules/glenwood.scm.h:5 ../aisleriot/rules/kansas.scm.h:5
-#: ../aisleriot/rules/lady_jane.scm.h:5 ../aisleriot/rules/plait.scm.h:5
-#: ../aisleriot/rules/royal_east.scm.h:5 ../aisleriot/rules/terrace.scm.h:4
+#: ../aisleriot/rules/agnes.scm.h:4 ../aisleriot/rules/bear_river.scm.h:5
+#: ../aisleriot/rules/canfield.scm.h:5 ../aisleriot/rules/chessboard.scm.h:5
+#: ../aisleriot/rules/eagle_wing.scm.h:5 ../aisleriot/rules/glenwood.scm.h:5
+#: ../aisleriot/rules/kansas.scm.h:5 ../aisleriot/rules/lady_jane.scm.h:5
+#: ../aisleriot/rules/plait.scm.h:5 ../aisleriot/rules/royal_east.scm.h:5
+#: ../aisleriot/rules/terrace.scm.h:4
 msgid "Base Card: Queen"
 msgstr "Base Card: Queen"
 
@@ -1280,7 +1721,7 @@ msgstr "Deal more cards"
 #: ../aisleriot/rules/plait.scm.h:11 ../aisleriot/rules/quatorze.scm.h:1
 #: ../aisleriot/rules/royal_east.scm.h:7 ../aisleriot/rules/scuffle.scm.h:4
 #: ../aisleriot/rules/sir_tommy.scm.h:3 ../aisleriot/rules/straight_up.scm.h:5
-#: ../aisleriot/rules/terrace.scm.h:13 ../aisleriot/rules/thieves.scm.h:2
+#: ../aisleriot/rules/terrace.scm.h:18 ../aisleriot/rules/thieves.scm.h:2
 #: ../aisleriot/rules/thirteen.scm.h:3
 #: ../aisleriot/rules/thumb_and_pouch.scm.h:4
 #: ../aisleriot/rules/treize.scm.h:2 ../aisleriot/rules/triple_peaks.scm.h:4
@@ -1326,7 +1767,7 @@ msgstr "Deal another round"
 #: ../aisleriot/rules/canfield.scm.h:6 ../aisleriot/rules/carpet.scm.h:1
 #: ../aisleriot/rules/glenwood.scm.h:6 ../aisleriot/rules/klondike.scm.h:2
 #: ../aisleriot/rules/osmosis.scm.h:1 ../aisleriot/rules/plait.scm.h:6
-#: ../aisleriot/rules/straight_up.scm.h:1 ../aisleriot/rules/terrace.scm.h:7
+#: ../aisleriot/rules/straight_up.scm.h:1 ../aisleriot/rules/terrace.scm.h:8
 msgid "Deal a new card from the deck"
 msgstr "Deal a new card from the deck"
 
@@ -1335,16 +1776,16 @@ msgstr "Deal a new card from the deck"
 #: ../aisleriot/rules/glenwood.scm.h:9 ../aisleriot/rules/jumbo.scm.h:3
 #: ../aisleriot/rules/klondike.scm.h:5 ../aisleriot/rules/plait.scm.h:10
 #: ../aisleriot/rules/scuffle.scm.h:2 ../aisleriot/rules/straight_up.scm.h:3
-#: ../aisleriot/rules/terrace.scm.h:10
+#: ../aisleriot/rules/terrace.scm.h:13
 #: ../aisleriot/rules/thumb_and_pouch.scm.h:3 ../aisleriot/rules/zebra.scm.h:3
 msgid "Redeals left:"
 msgstr "Redeals left:"
 
-#: ../aisleriot/rules/backbone.scm.h:5 ../aisleriot/rules/terrace.scm.h:16
+#: ../aisleriot/rules/backbone.scm.h:5 ../aisleriot/rules/terrace.scm.h:23
 msgid "an empty slot on the foundation"
 msgstr "an empty slot on the foundation"
 
-#: ../aisleriot/rules/backbone.scm.h:6 ../aisleriot/rules/terrace.scm.h:17
+#: ../aisleriot/rules/backbone.scm.h:6 ../aisleriot/rules/terrace.scm.h:24
 msgid "an empty slot on the tableau"
 msgstr "an empty slot on the tableau"
 
@@ -1360,6 +1801,21 @@ msgstr "an empty slot on the tableau"
 msgid "an empty foundation"
 msgstr "an empty foundation"
 
+#: ../aisleriot/rules/bear_river.scm.h:1 ../aisleriot/rules/canfield.scm.h:1
+#: ../aisleriot/rules/chessboard.scm.h:1 ../aisleriot/rules/eagle_wing.scm.h:1
+#: ../aisleriot/rules/glenwood.scm.h:1 ../aisleriot/rules/kansas.scm.h:1
+#: ../aisleriot/rules/plait.scm.h:1
+msgid "Base Card: "
+msgstr "Base Card: "
+
+#: ../aisleriot/rules/bear_river.scm.h:6
+msgid "Move something onto an empty right-hand tableau slot"
+msgstr "Move something onto an empty right-hand tableau slot"
+
+#: ../aisleriot/rules/bear_river.scm.h:7
+msgid "an empty foundation slot"
+msgstr "an empty foundation slot"
+
 #: ../aisleriot/rules/camelot.scm.h:3
 msgid "an empty bottom slot"
 msgstr "an empty bottom slot"
@@ -1394,12 +1850,6 @@ msgstr "an empty top slot"
 msgid "itself"
 msgstr "itself"
 
-#: ../aisleriot/rules/canfield.scm.h:1 ../aisleriot/rules/chessboard.scm.h:1
-#: ../aisleriot/rules/eagle_wing.scm.h:1 ../aisleriot/rules/glenwood.scm.h:1
-#: ../aisleriot/rules/kansas.scm.h:1 ../aisleriot/rules/plait.scm.h:1
-msgid "Base Card: "
-msgstr "Base Card: "
-
 #: ../aisleriot/rules/canfield.scm.h:7 ../aisleriot/rules/eagle_wing.scm.h:7
 #: ../aisleriot/rules/glenwood.scm.h:8 ../aisleriot/rules/plait.scm.h:7
 #: ../aisleriot/rules/straight_up.scm.h:2
@@ -1442,7 +1892,7 @@ msgstr "Have you read the help file?"
 
 #: ../aisleriot/rules/clock.scm.h:4
 msgid "I could sure use a backrub right about now..."
-msgstr "I could sure use a backrub right about now..."
+msgstr "I could sure use a backrub right about nowâ?¦"
 
 #: ../aisleriot/rules/clock.scm.h:5
 msgid "If you're ever lost and alone in the woods, hug a tree"
@@ -1460,7 +1910,7 @@ msgstr "Look both ways before you cross the street"
 
 #: ../aisleriot/rules/clock.scm.h:8
 msgid "Monitors won't give you Vitamin D -- but sunlight will..."
-msgstr "Monitors won't give you Vitamin D -- but sunlight will..."
+msgstr "Monitors won't give you Vitamin D â?? but sunlight willâ?¦"
 
 #: ../aisleriot/rules/clock.scm.h:9
 msgid "Never blow in a dog's ear"
@@ -1619,7 +2069,7 @@ msgstr "an empty reserve"
 msgid "an open tableau"
 msgstr "an open tableau"
 
-#: ../aisleriot/rules/freecell.scm.h:5 ../aisleriot/rules/terrace.scm.h:19
+#: ../aisleriot/rules/freecell.scm.h:5 ../aisleriot/rules/terrace.scm.h:26
 msgid "the foundation"
 msgstr "the foundation"
 
@@ -1647,6 +2097,42 @@ msgstr "Place the ~a next to ~a."
 msgid "Randomly Placed Gaps on Redeal"
 msgstr "Randomly Placed Gaps on Redeal"
 
+#: ../aisleriot/rules/giant.scm.h:1
+msgid "Alternating colors"
+msgstr "Alternating colours"
+
+#: ../aisleriot/rules/giant.scm.h:2
+msgid "Deal a row"
+msgstr "Deal a row"
+
+#: ../aisleriot/rules/giant.scm.h:3
+msgid "Deals left: ~a"
+msgstr "Deals left: ~a"
+
+#: ../aisleriot/rules/giant.scm.h:4
+msgid "Same suit"
+msgstr "Same suit"
+
+#: ../aisleriot/rules/giant.scm.h:5
+msgid "Try dealing a row of cards"
+msgstr "Try dealing a row of cards"
+
+#: ../aisleriot/rules/giant.scm.h:6
+msgid "Try moving a card to the reserve"
+msgstr "Try moving a card to the reserve"
+
+#: ../aisleriot/rules/giant.scm.h:7 ../aisleriot/rules/spider.scm.h:7
+msgid "Try moving card piles around"
+msgstr "Try moving card piles around"
+
+#: ../aisleriot/rules/giant.scm.h:8
+msgid "an empty foundation place"
+msgstr "an empty foundation place"
+
+#: ../aisleriot/rules/giant.scm.h:9
+msgid "an empty tableau place"
+msgstr "an empty tableau place"
+
 #: ../aisleriot/rules/glenwood.scm.h:7
 msgid "Move a card from the reserve on to the empty tableau slot"
 msgstr "Move a card from the reserve on to the empty tableau slot"
@@ -1733,7 +2219,7 @@ msgstr "Deal new cards from the deck"
 msgid "Redeals left: ~a"
 msgstr "Redeals left: ~a"
 
-#: ../aisleriot/rules/pileon.scm.h:2 ../aisleriot/rules/terrace.scm.h:18
+#: ../aisleriot/rules/pileon.scm.h:2 ../aisleriot/rules/terrace.scm.h:25
 msgid "something"
 msgstr "something"
 
@@ -1791,14 +2277,14 @@ msgstr "Place something on empty slot"
 msgid "Please fill in empty pile first."
 msgstr "Please fill in empty pile first."
 
-#: ../aisleriot/rules/spider.scm.h:7
-msgid "Try moving card piles around"
-msgstr "Try moving card piles around"
-
 #: ../aisleriot/rules/spider.scm.h:8
 msgid "Two Suits"
 msgstr "Two Suits"
 
+#: ../aisleriot/rules/spider.scm.h:9
+msgid "Undo until there are enough cards to fill all tableau piles"
+msgstr "Undo until there are enough cards to fill all tableau piles"
+
 #: ../aisleriot/rules/ten_across.scm.h:1
 msgid "Allow temporary spots use"
 msgstr "Allow temporary spots use"
@@ -1811,27 +2297,33 @@ msgstr "Move a card to an empty temporary slot"
 msgid "No hint available"
 msgstr "No hint available"
 
-#: ../aisleriot/rules/terrace.scm.h:6
+#. Translators: this string is the name of a variant of this game. If there is an established standard name for this game or game variant in your locale, use that; otherwise you can translate this string freely or literally, at your option.
+#: ../aisleriot/rules/terrace.scm.h:7
 msgid "Blondes and Brunettes"
 msgstr "Blondes and Brunettes"
 
-#: ../aisleriot/rules/terrace.scm.h:8
+#. Translators: this string is the name of a variant of this game. If there is an established standard name for this game or game variant in your locale, use that; otherwise you can translate this string freely or literally, at your option.
+#: ../aisleriot/rules/terrace.scm.h:10
 msgid "Falling Stars"
 msgstr "Falling Stars"
 
-#: ../aisleriot/rules/terrace.scm.h:9
-msgid "General Patience"
-msgstr "General Patience"
+#. Translators: this string is the name of a variant of this game. If there is an established standard name for this game or game variant in your locale, use that; otherwise you can translate this string freely or literally, at your option.
+#: ../aisleriot/rules/terrace.scm.h:12
+msgid "General's Patience"
+msgstr "General's Patience"
 
-#: ../aisleriot/rules/terrace.scm.h:11
+#. Translators: this string is the name of a variant of this game. If there is an established standard name for this game or game variant in your locale, use that; otherwise you can translate this string freely or literally, at your option.
+#: ../aisleriot/rules/terrace.scm.h:15
 msgid "Redheads"
 msgstr "Redheads"
 
-#: ../aisleriot/rules/terrace.scm.h:12
+#. Translators: this string is the name of a variant of this game. If there is an established standard name for this game or game variant in your locale, use that; otherwise you can translate this string freely or literally, at your option.
+#: ../aisleriot/rules/terrace.scm.h:17
 msgid "Signora"
 msgstr "Signora"
 
-#: ../aisleriot/rules/terrace.scm.h:15
+#. Translators: this string is the name of a variant of this game. If there is an established standard name for this game or game variant in your locale, use that; otherwise you can translate this string freely or literally, at your option.
+#: ../aisleriot/rules/terrace.scm.h:22
 msgid "Wood"
 msgstr "Wood"
 
@@ -1935,10 +2427,10 @@ msgstr "Restart the current game"
 msgid "Show a hint"
 msgstr "Show a hint"
 
-#: ../blackjack/src/blackjack.cpp:337 ../glchess/glade/glchess.glade.h:37
-#: ../glines/glines.c:1689 ../gnect/src/main.c:1291 ../gnibbles/main.c:766
-#: ../gnobots2/menu.c:71 ../gnometris/tetris.cpp:120 ../gnomine/gnomine.c:792
-#: ../gtali/gyahtzee.c:702 ../iagno/gnothello.c:803
+#: ../blackjack/src/blackjack.cpp:337 ../glchess/data/glchess.ui.h:27
+#: ../glines/glines.c:1691 ../gnect/src/main.c:1291 ../gnibbles/main.c:765
+#: ../gnobots2/menu.c:71 ../gnometris/tetris.cpp:108 ../gnomine/gnomine.c:831
+#: ../gtali/gyahtzee.c:702 ../iagno/gnothello.c:813
 #: ../mahjongg/mahjongg.c:1243
 msgid "_Settings"
 msgstr "_Settings"
@@ -1992,7 +2484,7 @@ msgstr "S_plit the hand"
 msgid "Split cards in two new hands"
 msgstr "Split cards in two new hands"
 
-#: ../blackjack/src/blackjack.cpp:354 ../gnobots2/gnobots2.schemas.in.h:23
+#: ../blackjack/src/blackjack.cpp:354 ../gnobots2/gnobots2.schemas.in.h:21
 msgid "Show toolbar"
 msgstr "Show toolbar"
 
@@ -2016,6 +2508,10 @@ msgstr "Place your wager or deal a hand"
 msgid "Blackjack rule set to use"
 msgstr "Blackjack rule set to use"
 
+#: ../blackjack/src/card-selector.cpp:123
+msgid "Card Style"
+msgstr "Card Style"
+
 #: ../blackjack/src/dialog.cpp:51
 msgid "Would you like insurance?"
 msgstr "Would you like insurance?"
@@ -2045,7 +2541,7 @@ msgstr "Blackjack Preferences"
 
 #: ../blackjack/src/dialog.cpp:241 ../dependencies/ggz-gtk/client.c:953
 #: ../gnect/src/prefs.c:301 ../gnibbles/preferences.c:253
-#: ../gnobots2/properties.c:519 ../gnometris/tetris.cpp:632
+#: ../gnobots2/properties.c:491 ../gnometris/tetris.cpp:594
 #: ../iagno/properties.c:416
 msgid "Game"
 msgstr "Game"
@@ -2152,11 +2648,11 @@ msgstr "Click to finish adding cards to your hand"
 msgid "Click to deal a new hand"
 msgstr "Click to deal a new hand"
 
-#: ../blackjack/src/game.cpp:402
+#: ../blackjack/src/game.cpp:394
 msgid "Blackjack can't load the requested file"
 msgstr "Blackjack can't load the requested file"
 
-#: ../blackjack/src/game.cpp:404
+#: ../blackjack/src/game.cpp:396
 msgid "Please check your Blackjack installation"
 msgstr "Please check your Blackjack installation"
 
@@ -2236,7 +2732,7 @@ msgstr ""
 
 #: ../blackjack/src/player.cpp:57
 msgid "Computing basic strategy..."
-msgstr "Computing basic strategy..."
+msgstr "Computing basic strategyâ?¦"
 
 #: ../blackjack/src/player.cpp:178 ../blackjack/src/player.cpp:433
 msgid "Bust"
@@ -2323,7 +2819,7 @@ msgstr "Error joining room: %s"
 #. Translators: Add Network Profile Dialog: Connect to the GGZ Gaming Zone server (the default)
 #: ../dependencies/ggz-gtk/ggzclient.c:400
 #: ../dependencies/ggz-gtk/client.c:1430
-#: ../glchess/src/lib/gtkui/network.py:27
+#: ../glchess/src/lib/gtkui/network.py:28
 msgid "GGZ Gaming Zone"
 msgstr "GGZ Gaming Zone"
 
@@ -2381,7 +2877,7 @@ msgstr "You have been booted from the table by %s."
 msgid "You have left the table."
 msgstr "You have left the table."
 
-#: ../dependencies/ggz-gtk/ggzclient.c:624 ../gnibbles/main.c:694
+#: ../dependencies/ggz-gtk/ggzclient.c:624 ../gnibbles/main.c:693
 #, c-format
 msgid "The game is over."
 msgstr "The game is over."
@@ -2496,7 +2992,6 @@ msgid "Login failed for unknown reason: %s"
 msgstr "Login failed for unknown reason: %s"
 
 #: ../dependencies/ggz-gtk/login.c:336 ../dependencies/ggz-gtk/client.c:307
-#: ../libgames-support/games-help.c:57
 msgid "Unable to open help file"
 msgstr "Unable to open help file"
 
@@ -2885,7 +3380,7 @@ msgstr "Not Implemented"
 
 #. Translators: Available GGZ Tables: Table description column title
 #: ../dependencies/ggz-gtk/types.c:183 ../dependencies/ggz-gtk/tablelist.c:202
-#: ../glchess/src/lib/gtkui/network.py:190
+#: ../glchess/src/lib/gtkui/network.py:192
 msgid "Description"
 msgstr "Description"
 
@@ -3037,7 +3532,7 @@ msgstr "No description available."
 
 #. Translators: Available GGZ Tables: Seat status column title
 #: ../dependencies/ggz-gtk/tablelist.c:197
-#: ../glchess/src/lib/gtkui/network.py:185
+#: ../glchess/src/lib/gtkui/network.py:187
 msgid "Seats"
 msgstr "Seats"
 
@@ -3476,7 +3971,7 @@ msgstr "Display None"
 
 #. Options
 #: ../dependencies/ggz-gtk/props.c:1493 ../gnibbles/preferences.c:310
-#: ../gnibbles/preferences.c:455 ../gnobots2/properties.c:474
+#: ../gnibbles/preferences.c:455 ../gnobots2/properties.c:455
 #: ../iagno/properties.c:567
 msgid "Options"
 msgstr "Options"
@@ -3655,12 +4150,14 @@ msgstr ""
 #: ../glchess/data/glchess.schemas.in.h:26
 msgid ""
 "The side of the board that is in the foreground, either 'white', 'black', "
-"'current' (the current player) or 'human' (the side of the current human "
-"player)"
+"'current' (the current player), 'human' (the side of the current human "
+"player) or 'facetoface' (suitable for players on each side of screen, e.g. "
+"handhelds)"
 msgstr ""
 "The side of the board that is in the foreground, either 'white', 'black', "
-"'current' (the current player) or 'human' (the side of the current human "
-"player)"
+"'current' (the current player), 'human' (the side of the current human "
+"player) or 'facetoface' (suitable for players on each side of screen, e.g. "
+"handhelds)"
 
 #: ../glchess/data/glchess.schemas.in.h:27
 msgid "The width of the main window in pixels."
@@ -3670,337 +4167,315 @@ msgstr "The width of the main window in pixels."
 msgid "The width of the window"
 msgstr "The width of the window"
 
-#. Title of save game dialog
-#: ../glchess/glade/save_game.glade.h:2
-msgid "Save Chess Game"
-msgstr "Save Chess Game"
-
-#. Log window: Title above data being logged
-#: ../glchess/glade/log.glade.h:2
-msgid "Communication:"
-msgstr "Communication:"
-
-#. Log window: Label before name of executable being logged
-#: ../glchess/glade/log.glade.h:4
-msgid "Executable:"
-msgstr "Executable:"
-
-#. Log window: Label before name of player being logged
-#: ../glchess/glade/log.glade.h:6
-msgid "Playing as:"
-msgstr "Playing as:"
-
-#. Network Game Dialog: Title above the game settings. Do not translate the <b> tag.
-#: ../glchess/glade/network_game.glade.h:2
-msgid "<b>Game</b>"
-msgstr "<b>Game</b>"
-
-#. Network Game Dialog: Title above room list. Do not translate the <b> tag.
-#: ../glchess/glade/network_game.glade.h:4
-msgid "<b>Rooms</b>"
-msgstr "<b>Rooms</b>"
-
-#. Network Game Dialog: Title above the server settings. Do not translate the <b> tag.
-#: ../glchess/glade/network_game.glade.h:6
-msgid "<b>Server</b>"
-msgstr "<b>Server</b>"
-
-#. Network Game Dialog: Title above the chat text. Do not translate the <b> tag.
-#: ../glchess/glade/network_game.glade.h:8
-msgid "<b>Status/_Chat</b>"
-msgstr "<b>Status/_Chat</b>"
-
-#: ../glchess/glade/network_game.glade.h:9
-msgid "Add Account"
-msgstr "Add Account"
-
-#. Title of network game dialog
-#: ../glchess/glade/network_game.glade.h:11
-msgid "Join Game"
-msgstr "Join Game"
-
-#. Add Network Profile Dialog: Label beside username entry
-#: ../glchess/glade/network_game.glade.h:13
-msgid "User _Name:"
-msgstr "User _Name:"
-
-#. Add Network Profile Dialog: Button to accept values and add profile
-#: ../glchess/glade/network_game.glade.h:15
-msgid "_Add Account"
-msgstr "_Add Account"
-
-#. Add Network Profile Dialog: Label beside custom hostname entry
-#: ../glchess/glade/network_game.glade.h:17
-msgid "_Host:"
-msgstr "_Host:"
-
-#. Network Game Dialog: Button to join a table
-#: ../glchess/glade/network_game.glade.h:19
-msgid "_Join"
-msgstr "_Join"
-
-#. Network Game Dialog: Leave table button
-#: ../glchess/glade/network_game.glade.h:21
-msgid "_Leave"
-msgstr "_Leave"
-
-#. Add Network Profile Dialog: Label beside custom port entry
-#: ../glchess/glade/network_game.glade.h:23
-msgid "_Port:"
-msgstr "_Port:"
-
-#. Network Game Dialog: Label before the server profile combo box
-#: ../glchess/glade/network_game.glade.h:25
-msgid "_Profile:"
-msgstr "_Profile:"
-
-#. Add Network Profile Dialog: Label beside server combo
-#: ../glchess/glade/network_game.glade.h:27
-msgid "_Server:"
-msgstr "_Server:"
-
 #. Preferences Dialog: Check box for selecting if 3D view is available
-#: ../glchess/glade/preferences.glade.h:2 ../glchess/glade/glchess.glade.h:1
+#: ../glchess/data/glchess.ui.h:1 ../glchess/data/preferences.ui.h:2
 msgid "3_D Chess View"
 msgstr "3_D Chess View"
 
-#. Preferences Dialog: Label before board orientation combo box
-#: ../glchess/glade/preferences.glade.h:4
-msgid "Board Orientation:"
-msgstr "Board Orientation:"
-
-#. Preferences Dialog: Label before move format combo box
-#: ../glchess/glade/preferences.glade.h:6
-msgid "Move Format:"
-msgstr "Move Format:"
-
-#. Title for preferences dialog
-#: ../glchess/glade/preferences.glade.h:8 ../glines/glines.c:196
-#: ../mahjongg/mahjongg.c:140
-msgid "Preferences"
-msgstr "Preferences"
-
-#. Preferences Dialog: Label before promotion type combo box
-#: ../glchess/glade/preferences.glade.h:10
-msgid "Promotion Type:"
-msgstr "Promotion Type:"
-
-#. Preferences Dialog: Check box for selecting if history browser is visible
-#: ../glchess/glade/preferences.glade.h:12
-msgid "Show _History"
-msgstr "Show _History"
-
-#. Preferences Dialog: Check box for selecting if toolbar is visible
-#: ../glchess/glade/preferences.glade.h:14 ../gnome-sudoku/src/lib/main.py:281
-msgid "Show _Toolbar"
-msgstr "Show _Toolbar"
-
-#. Preferences Dialog: Tooltip for Board Numbering option
-#: ../glchess/glade/preferences.glade.h:16
-msgid "Show or hide numbering on the chess board"
-msgstr "Show or hide numbering on the chess board"
-
-#. Preferences Dialog: Tooltip for Show History option
-#: ../glchess/glade/preferences.glade.h:18
-msgid "Show or hide the game history panel"
-msgstr "Show or hide the game history panel"
-
-#. Preferences Dialog: Tooltip for Move Hints option
-#: ../glchess/glade/preferences.glade.h:22
-msgid "Shows hints during chess games"
-msgstr "Shows hints during chess games"
-
-#. Preferences Dialog: Tooltip for 3D Chess smooth view option
-#: ../glchess/glade/preferences.glade.h:24
-msgid "Smooth edges of the 3D elements (anti-alias)"
-msgstr "Smooth edges of the 3D elements (anti-alias)"
-
-#. Preferences Dialog: Tooltip for 3D Chess View option
-#: ../glchess/glade/preferences.glade.h:26
-msgid ""
-"View the chess board by default in 2D mode, or optionally in 3D mode using "
-"OpenGL."
-msgstr ""
-"View the chess board by default in 2D mode, or optionally in 3D mode using "
-"OpenGL."
-
-#. Preferences Dialog: Check box for selecting if board numbering is visible
-#: ../glchess/glade/preferences.glade.h:28
-msgid "_Board Numbering"
-msgstr "_Board Numbering"
-
-#. Preferences Dialog: Check box for selecting if move hints are visible
-#: ../glchess/glade/preferences.glade.h:32
-msgid "_Move Hints"
-msgstr "_Move Hints"
-
-#. Preferences Dialog: Check box for selecting if the 3D view is smoothed (anti-aliased)
-#: ../glchess/glade/preferences.glade.h:34
-msgid "_Smooth Display"
-msgstr "_Smooth Display"
-
-#. Title of load game dialog
-#: ../glchess/glade/load_game.glade.h:2
-msgid "Load Chess Game"
-msgstr "Load Chess Game"
-
-#: ../glchess/glade/glchess.glade.h:2
+#: ../glchess/data/glchess.ui.h:2
 msgid "Claim _Draw"
 msgstr "Claim _Draw"
 
-#: ../glchess/glade/glchess.glade.h:3
-msgid "Leave _Fullscreen"
-msgstr "Leave _Fullscreen"
-
-#. The tooltip for the Open toolbar button
-#: ../glchess/glade/glchess.glade.h:5
+#: ../glchess/data/glchess.ui.h:3
 msgid "Load a saved game"
 msgstr "Load a saved game"
 
 #. The title of the log dialaog
-#: ../glchess/glade/glchess.glade.h:7
+#: ../glchess/data/glchess.ui.h:5
 msgid "Logs"
 msgstr "Logs"
 
 #. The Network Game toolbar button
-#: ../glchess/glade/glchess.glade.h:9 ../libgames-support/games-stock.c:331
+#: ../glchess/data/glchess.ui.h:7 ../libgames-support/games-stock.c:334
 msgid "Network _Game"
 msgstr "Network _Game"
 
 #. The New Game toolbar button
 #. Title of the new game dialog
-#: ../glchess/glade/glchess.glade.h:11 ../glchess/glade/new_game.glade.h:14
+#: ../glchess/data/glchess.ui.h:9 ../glchess/data/new_game.ui.h:13
 #: ../libgames-support/games-scores-dialog.c:438
 msgid "New Game"
 msgstr "New Game"
 
 #. The tooltip for the Resign toolbar button
-#: ../glchess/glade/glchess.glade.h:13
+#: ../glchess/data/glchess.ui.h:11
 msgid "Resign"
 msgstr "Resign"
 
-#. The tooltip for the go to start button on the move navigator
-#: ../glchess/glade/glchess.glade.h:15
+#: ../glchess/data/glchess.ui.h:12
 msgid "Rewind to the game start"
 msgstr "Rewind to the game start"
 
-#. The tooltip for the Save toolbar button
-#: ../glchess/glade/glchess.glade.h:17
+#: ../glchess/data/glchess.ui.h:13
 msgid "Save the current game"
 msgstr "Save the current game"
 
-#: ../glchess/glade/glchess.glade.h:18
+#: ../glchess/data/glchess.ui.h:14
 msgid "Show _Logs"
 msgstr "Show _Logs"
 
-#. The tooltip for the show current move button on the move navigator
-#: ../glchess/glade/glchess.glade.h:20
+#: ../glchess/data/glchess.ui.h:15
 msgid "Show the current move"
 msgstr "Show the current move"
 
-#. The tooltip for the go to next move button on the move navigator
-#: ../glchess/glade/glchess.glade.h:22
+#: ../glchess/data/glchess.ui.h:16
 msgid "Show the next move"
 msgstr "Show the next move"
 
-#. The tooltip for the go to previous move button on the move navigator
-#: ../glchess/glade/glchess.glade.h:24
+#: ../glchess/data/glchess.ui.h:17
 msgid "Show the previous move"
 msgstr "Show the previous move"
 
-#. Tooltip for the Network Game toolbar button
-#: ../glchess/glade/glchess.glade.h:28 ../libgames-support/games-stock.c:52
+#: ../glchess/data/glchess.ui.h:19 ../libgames-support/games-stock.c:51
 msgid "Start a new multiplayer network game"
 msgstr "Start a new multiplayer network game"
 
 #. Message displayed in log window when no logs are present
-#: ../glchess/glade/glchess.glade.h:30
+#: ../glchess/data/glchess.ui.h:21
 msgid "There are no active logs."
 msgstr "There are no active logs."
 
-#: ../glchess/glade/glchess.glade.h:31
+#: ../glchess/data/glchess.ui.h:22
 msgid "Undo Move"
 msgstr "Undo Move"
 
-#: ../glchess/glade/glchess.glade.h:32 ../gnome-sudoku/src/lib/main.py:261
-#: ../libgames-support/games-stock.c:315
+#: ../glchess/data/glchess.ui.h:23 ../gnome-sudoku/src/lib/main.py:273
+#: ../libgames-support/games-stock.c:318
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../glchess/glade/glchess.glade.h:33 ../libgames-support/games-stock.c:316
-msgid "_Fullscreen"
-msgstr "_Fullscreen"
-
-#: ../glchess/glade/glchess.glade.h:36
+#: ../glchess/data/glchess.ui.h:26
 msgid "_Resign"
 msgstr "_Resign"
 
-#: ../glchess/glade/glchess.glade.h:38 ../libgames-support/games-stock.c:327
+#: ../glchess/data/glchess.ui.h:28 ../libgames-support/games-stock.c:330
 msgid "_Undo Move"
 msgstr "_Undo Move"
 
+#. Title of load game dialog
+#: ../glchess/data/load_game.ui.h:2
+msgid "Load Chess Game"
+msgstr "Load Chess Game"
+
+#. Log window: Title above data being logged
+#: ../glchess/data/log.ui.h:2
+msgid "Communication:"
+msgstr "Communication:"
+
+#. Log window: Label before name of executable being logged
+#: ../glchess/data/log.ui.h:4
+msgid "Executable:"
+msgstr "Executable:"
+
+#. Log window: Label before name of player being logged
+#: ../glchess/data/log.ui.h:6
+msgid "Playing as:"
+msgstr "Playing as:"
+
+#. Network Game Dialog: Title above the game settings. Do not translate the <b> tag.
+#: ../glchess/data/network_game.ui.h:2
+msgid "<b>Game</b>"
+msgstr "<b>Game</b>"
+
+#. Network Game Dialog: Title above room list. Do not translate the <b> tag.
+#: ../glchess/data/network_game.ui.h:4
+msgid "<b>Rooms</b>"
+msgstr "<b>Rooms</b>"
+
+#. Network Game Dialog: Title above the server settings. Do not translate the <b> tag.
+#: ../glchess/data/network_game.ui.h:6
+msgid "<b>Server</b>"
+msgstr "<b>Server</b>"
+
+#. Network Game Dialog: Title above the chat text. Do not translate the <b> tag.
+#: ../glchess/data/network_game.ui.h:8
+msgid "<b>Status/_Chat</b>"
+msgstr "<b>Status/_Chat</b>"
+
+#. Title of network game dialog
+#: ../glchess/data/network_game.ui.h:10
+msgid "Join Game"
+msgstr "Join Game"
+
+#. Network Game Dialog: Button to join a table
+#: ../glchess/data/network_game.ui.h:12
+msgid "_Join"
+msgstr "_Join"
+
+#. Network Game Dialog: Leave table button
+#: ../glchess/data/network_game.ui.h:14
+msgid "_Leave"
+msgstr "_Leave"
+
+#. Network Game Dialog: Label before the server profile combo box
+#: ../glchess/data/network_game.ui.h:16
+msgid "_Profile:"
+msgstr "_Profile:"
+
+#: ../glchess/data/network_new_server.ui.h:1
+msgid "Add Account"
+msgstr "Add Account"
+
+#. Add Network Profile Dialog: Label beside username entry
+#: ../glchess/data/network_new_server.ui.h:3
+msgid "User _Name:"
+msgstr "User _Name:"
+
+#. Add Network Profile Dialog: Button to accept values and add profile
+#: ../glchess/data/network_new_server.ui.h:5
+msgid "_Add Account"
+msgstr "_Add Account"
+
+#. Add Network Profile Dialog: Label beside custom hostname entry
+#: ../glchess/data/network_new_server.ui.h:7
+msgid "_Host:"
+msgstr "_Host:"
+
+#. Add Network Profile Dialog: Label beside custom port entry
+#: ../glchess/data/network_new_server.ui.h:9
+msgid "_Port:"
+msgstr "_Port:"
+
+#. Add Network Profile Dialog: Label beside server combo
+#: ../glchess/data/network_new_server.ui.h:11
+msgid "_Server:"
+msgstr "_Server:"
+
 #. New Game Dialog: Title above difficulty options
-#: ../glchess/glade/new_game.glade.h:2
+#: ../glchess/data/new_game.ui.h:2
 msgid "<b>Difficulty</b>"
 msgstr "<b>Difficulty</b>"
 
 #. New Game Dialog: Title above the game properties widgets
-#: ../glchess/glade/new_game.glade.h:4
+#: ../glchess/data/new_game.ui.h:4
 msgid "<b>Game Properties</b>"
 msgstr "<b>Game Properties</b>"
 
 #. New Game Dialog: Title above player options
-#: ../glchess/glade/new_game.glade.h:6
+#: ../glchess/data/new_game.ui.h:6
 msgid "<b>Players</b>"
 msgstr "<b>Players</b>"
 
 #. New Game Dialog: Label before black player difficulty
-#: ../glchess/glade/new_game.glade.h:8
+#: ../glchess/data/new_game.ui.h:8
 msgid "B_lack:"
 msgstr "B_lack:"
 
-#. New Game Dialog: Tooltip for the game name entry
-#: ../glchess/glade/new_game.glade.h:10
+#: ../glchess/data/new_game.ui.h:9
 msgid "Enter the title for this game"
 msgstr "Enter the title for this game"
 
 #. New Game Dialog: Label before game timer settings
-#: ../glchess/glade/new_game.glade.h:12
+#: ../glchess/data/new_game.ui.h:11
 msgid "Move _Time:"
 msgstr "Move _Time:"
 
-#. New Game Dialog: Tooltip on start game button
-#: ../glchess/glade/new_game.glade.h:16
+#: ../glchess/data/new_game.ui.h:14
 msgid "Start the game. The game can be started once all fields are complete"
 msgstr "Start the game. The game can be started once all fields are complete"
 
 #. New Game Dialog: Label before white player difficulty
-#: ../glchess/glade/new_game.glade.h:18
+#: ../glchess/data/new_game.ui.h:16
 msgid "W_hite:"
 msgstr "W_hite:"
 
 #. New Game Dialog: Label before black player combo box
-#: ../glchess/glade/new_game.glade.h:20
+#: ../glchess/data/new_game.ui.h:18
 msgid "_Black:"
 msgstr "_Black:"
 
 #. New Game Dialog: Label before the game name entry
-#: ../glchess/glade/new_game.glade.h:22
+#: ../glchess/data/new_game.ui.h:20
 msgid "_Game name:"
 msgstr "_Game name:"
 
 #. New Game Dialog: Button to start a new game
-#: ../glchess/glade/new_game.glade.h:24
+#: ../glchess/data/new_game.ui.h:22
 msgid "_Start"
 msgstr "_Start"
 
 #. New Game Dialog: Label before white player combo box
-#: ../glchess/glade/new_game.glade.h:26
+#: ../glchess/data/new_game.ui.h:24
 msgid "_White:"
 msgstr "_White:"
 
+#. Preferences Dialog: Label before board orientation combo box
+#: ../glchess/data/preferences.ui.h:4
+msgid "Board Orientation:"
+msgstr "Board Orientation:"
+
+#. Preferences Dialog: Label before move format combo box
+#: ../glchess/data/preferences.ui.h:6
+msgid "Move Format:"
+msgstr "Move Format:"
+
+#. Title for preferences dialog
+#: ../glchess/data/preferences.ui.h:8 ../glines/glines.c:196
+#: ../mahjongg/mahjongg.c:140
+msgid "Preferences"
+msgstr "Preferences"
+
+#. Preferences Dialog: Label before promotion type combo box
+#: ../glchess/data/preferences.ui.h:10
+msgid "Promotion Type:"
+msgstr "Promotion Type:"
+
+#. Preferences Dialog: Check box for selecting if history browser is visible
+#: ../glchess/data/preferences.ui.h:12
+msgid "Show _History"
+msgstr "Show _History"
+
+#. Preferences Dialog: Check box for selecting if toolbar is visible
+#: ../glchess/data/preferences.ui.h:14 ../gnome-sudoku/src/lib/main.py:293
+msgid "Show _Toolbar"
+msgstr "Show _Toolbar"
+
+#: ../glchess/data/preferences.ui.h:15
+msgid "Show or hide numbering on the chess board"
+msgstr "Show or hide numbering on the chess board"
+
+#: ../glchess/data/preferences.ui.h:16
+msgid "Show or hide the game history panel"
+msgstr "Show or hide the game history panel"
+
+#: ../glchess/data/preferences.ui.h:18
+msgid "Shows hints during chess games"
+msgstr "Shows hints during chess games"
+
+#: ../glchess/data/preferences.ui.h:19
+msgid "Smooth edges of the 3D elements (anti-alias)"
+msgstr "Smooth edges of the 3D elements (anti-alias)"
+
+#: ../glchess/data/preferences.ui.h:20
+msgid ""
+"View the chess board by default in 2D mode, or optionally in 3D mode using "
+"OpenGL."
+msgstr ""
+"View the chess board by default in 2D mode, or optionally in 3D mode using "
+"OpenGL."
+
+#. Preferences Dialog: Check box for selecting if board numbering is visible
+#: ../glchess/data/preferences.ui.h:22
+msgid "_Board Numbering"
+msgstr "_Board Numbering"
+
+#. Preferences Dialog: Check box for selecting if move hints are visible
+#: ../glchess/data/preferences.ui.h:26
+msgid "_Move Hints"
+msgstr "_Move Hints"
+
+#. Preferences Dialog: Check box for selecting if the 3D view is smoothed (anti-aliased)
+#: ../glchess/data/preferences.ui.h:28
+msgid "_Smooth Display"
+msgstr "_Smooth Display"
+
+#. Title of save game dialog
+#: ../glchess/data/save_game.ui.h:2
+msgid "Save Chess Game"
+msgstr "Save Chess Game"
+
 #. Translators: Window title when not playing a game
-#: ../glchess/glchess.desktop.in.in.h:1 ../glchess/src/lib/gtkui/gtkui.py:371
+#: ../glchess/glchess.desktop.in.in.h:1 ../glchess/src/lib/gtkui/gtkui.py:332
 msgid "Chess"
 msgstr "Chess"
 
@@ -4050,7 +4525,7 @@ msgstr "One hour"
 #. Translators: Time Combo: User will configure game duration
 #. Translators: Add Network Profile Dialog: Use a custom server
 #: ../glchess/src/lib/gtkui/dialogs.py:135
-#: ../glchess/src/lib/gtkui/network.py:29
+#: ../glchess/src/lib/gtkui/network.py:30
 msgid "Custom"
 msgstr "Custom"
 
@@ -4071,7 +4546,7 @@ msgstr "hours"
 
 #. Translators: AI Difficulty Combo: AI set to easy difficulty
 #: ../glchess/src/lib/gtkui/dialogs.py:178
-#: ../gnome-sudoku/src/lib/sudoku.py:593
+#: ../gnome-sudoku/src/lib/sudoku.py:515
 msgid "Easy"
 msgstr "Easy"
 
@@ -4082,7 +4557,7 @@ msgstr "Normal"
 
 #. Translators: AI Difficulty Combo: AI set to hard diffuculty
 #: ../glchess/src/lib/gtkui/dialogs.py:182
-#: ../gnome-sudoku/src/lib/sudoku.py:591
+#: ../gnome-sudoku/src/lib/sudoku.py:513
 msgid "Hard"
 msgstr "Hard"
 
@@ -4115,8 +4590,8 @@ msgstr "%(white)s versus %(black)s"
 #. Translators: GGZ seat is occupied by the white player
 #. Translators: Name of white player in a default game
 #: ../glchess/src/lib/gtkui/dialogs.py:351
-#: ../glchess/src/lib/gtkui/network.py:358
-#: ../glchess/src/lib/gtkui/network.py:535 ../glchess/src/lib/main.py:708
+#: ../glchess/src/lib/gtkui/network.py:360
+#: ../glchess/src/lib/gtkui/network.py:537 ../glchess/src/lib/main.py:687
 msgid "White"
 msgstr "White"
 
@@ -4124,140 +4599,149 @@ msgstr "White"
 #. Translators: GGZ seat is occupied by the black player
 #. Translators: Name of black player in a default game
 #: ../glchess/src/lib/gtkui/dialogs.py:358
-#: ../glchess/src/lib/gtkui/network.py:361
-#: ../glchess/src/lib/gtkui/network.py:541 ../glchess/src/lib/main.py:710
+#: ../glchess/src/lib/gtkui/network.py:363
+#: ../glchess/src/lib/gtkui/network.py:543 ../glchess/src/lib/main.py:689
 msgid "Black"
 msgstr "Black"
 
 #. Translators: Load Game Dialog: Name of filter to show only PGN files
-#: ../glchess/src/lib/gtkui/dialogs.py:442
+#: ../glchess/src/lib/gtkui/dialogs.py:443
 msgid "PGN files"
 msgstr "PGN files"
 
 #. Translators: Load Game Dialog: Name of filter to show all files
-#: ../glchess/src/lib/gtkui/dialogs.py:448
+#: ../glchess/src/lib/gtkui/dialogs.py:449
 msgid "All files"
 msgstr "All files"
 
 #. Translators: Load Game Dialog: Message displayed when no file is selected
-#: ../glchess/src/lib/gtkui/dialogs.py:470
+#: ../glchess/src/lib/gtkui/dialogs.py:471
 msgid "Please select a file to load"
 msgstr "Please select a file to load"
 
 #. Translators: Title of error box when unable to load game
-#: ../glchess/src/lib/gtkui/dialogs.py:478
+#: ../glchess/src/lib/gtkui/dialogs.py:479
 msgid "Unabled to load game"
 msgstr "Unable to load game"
 
 #. Translators: Save Game Dialog: Error displayed when no file name entered
-#: ../glchess/src/lib/gtkui/dialogs.py:548
+#: ../glchess/src/lib/gtkui/dialogs.py:550
 msgid "Please enter a file name"
 msgstr "Please enter a file name"
 
 #. Translators: Save Game Dialog: Error title when unable to save game
-#: ../glchess/src/lib/gtkui/dialogs.py:561
+#: ../glchess/src/lib/gtkui/dialogs.py:563
 msgid "Unabled to save game"
 msgstr "Unable to save game"
 
 #. Translators: Move Format Combo: Moves shown in human descriptive notation
 #. Translators: Player Type Combo: Player is human controlled
-#: ../glchess/src/lib/gtkui/dialogs.py:587
-#: ../glchess/src/lib/gtkui/gtkui.py:236 ../gnect/src/prefs.c:249
-#: ../gtali/gyahtzee.c:988 ../gtali/yahtzee.c:69 ../iagno/properties.c:449
+#: ../glchess/src/lib/gtkui/dialogs.py:590
+#: ../glchess/src/lib/gtkui/gtkui.py:205 ../gnect/src/prefs.c:249
+#: ../gtali/gyahtzee.c:990 ../gtali/yahtzee.c:69 ../iagno/properties.c:449
 #: ../iagno/properties.c:490
 msgid "Human"
 msgstr "Human"
 
 #. Translators: Move Format Combo: Moves shown in standard algebraic notation (SAN)
-#: ../glchess/src/lib/gtkui/dialogs.py:589
+#: ../glchess/src/lib/gtkui/dialogs.py:592
 msgid "Standard Algebraic"
 msgstr "Standard Algebraic"
 
 #. Translators: Move Format Combo: Moves shown in standard figurine algebraic notation (FAN)
-#: ../glchess/src/lib/gtkui/dialogs.py:591
+#: ../glchess/src/lib/gtkui/dialogs.py:594
 msgid "Figurine"
 msgstr "Figurine"
 
 #. Translators: Move Format Combo: Moves shown in long algebraic notation (LAN)
-#: ../glchess/src/lib/gtkui/dialogs.py:593
+#: ../glchess/src/lib/gtkui/dialogs.py:596
 msgid "Long Algebraic"
 msgstr "Long Algebraic"
 
 #. Translators: Board Side Combo: Camera will face white player's side
-#: ../glchess/src/lib/gtkui/dialogs.py:603
+#: ../glchess/src/lib/gtkui/dialogs.py:606
 msgid "White Side"
 msgstr "White Side"
 
 #. Translators: Board Side Combo: Camera will face black player's side
-#: ../glchess/src/lib/gtkui/dialogs.py:605
+#: ../glchess/src/lib/gtkui/dialogs.py:608
 msgid "Black Side"
 msgstr "Black Side"
 
 #. Translators: Board Side Combo: Camera will face human player's side
-#: ../glchess/src/lib/gtkui/dialogs.py:607
+#: ../glchess/src/lib/gtkui/dialogs.py:610
 msgid "Human Side"
 msgstr "Human Side"
 
 #. Translators: Board Side Combo: Camera will face current player's side
-#: ../glchess/src/lib/gtkui/dialogs.py:609
+#: ../glchess/src/lib/gtkui/dialogs.py:612
 msgid "Current Player"
 msgstr "Current Player"
 
-#. Translators: Promotion Combo: Promote to a queen. Do not translate the 'chess-piece|' text.
-#: ../glchess/src/lib/gtkui/dialogs.py:619
-msgid "chess-piece|Queen"
+#. Translators: Board Side Combo: Board will be drawn suitable for players on each side of screen, e.g. handhelds
+#: ../glchess/src/lib/gtkui/dialogs.py:614
+msgid "Face to Face"
+msgstr "Face to Face"
+
+#. Translators: Promotion Combo: Promote to a queen
+#: ../glchess/src/lib/gtkui/dialogs.py:624
+msgctxt "chess-piece"
+msgid "Queen"
 msgstr "Queen"
 
-#. Translators: Promotion Combo: Promote to a knight. Do not translate the 'chess-piece|' text.
-#: ../glchess/src/lib/gtkui/dialogs.py:621
-msgid "chess-piece|Knight"
+#. Translators: Promotion Combo: Promote to a knight
+#: ../glchess/src/lib/gtkui/dialogs.py:626
+msgctxt "chess-piece"
+msgid "Knight"
 msgstr "Knight"
 
-#. Translators: Promotion Combo: Promote to a rook. Do not translate the 'chess-piece|' text.
-#: ../glchess/src/lib/gtkui/dialogs.py:623
-msgid "chess-piece|Rook"
+#. Translators: Promotion Combo: Promote to a rook
+#: ../glchess/src/lib/gtkui/dialogs.py:628
+msgctxt "chess-piece"
+msgid "Rook"
 msgstr "Rook"
 
-#. Translators: Promotion Combo: Promote to a bishop. Do not translate the 'chess-piece|' text.
-#: ../glchess/src/lib/gtkui/dialogs.py:625
-msgid "chess-piece|Bishop"
+#. Translators: Promotion Combo: Promote to a bishop
+#: ../glchess/src/lib/gtkui/dialogs.py:630
+msgctxt "chess-piece"
+msgid "Bishop"
 msgstr "Bishop"
 
 #. Translators: Window title when playing a game that needs saving
-#: ../glchess/src/lib/gtkui/gtkui.py:365
+#: ../glchess/src/lib/gtkui/gtkui.py:326
 #, python-format
 msgid "Chess - *%(game_name)s"
 msgstr "Chess - *%(game_name)s"
 
 #. Translators: Window title when playing a game that is saved
-#: ../glchess/src/lib/gtkui/gtkui.py:368
+#: ../glchess/src/lib/gtkui/gtkui.py:329
 #, python-format
 msgid "Chess - %(game_name)s"
 msgstr "Chess - %(game_name)s"
 
 #. Translators: Game Timer Label: Indicates that game has no time limit
-#: ../glchess/src/lib/gtkui/gtkui.py:383
+#: ../glchess/src/lib/gtkui/gtkui.py:344
 msgid "â??"
 msgstr "â??"
 
 #. Translators: Save Game Dialog: Notice that game needs saving
-#: ../glchess/src/lib/gtkui/gtkui.py:456
+#: ../glchess/src/lib/gtkui/gtkui.py:417
 msgid "If you don't save the changes to this game will be permanently lost"
 msgstr "If you don't save the changes, this game will be permanently lost"
 
 #. Translators: Save Game Dialog: Discard game button
-#: ../glchess/src/lib/gtkui/gtkui.py:458
+#: ../glchess/src/lib/gtkui/gtkui.py:419
 msgid "Close _without saving"
 msgstr "Close _without saving"
 
 #. Translators: No 3D Dialog: Title
-#: ../glchess/src/lib/gtkui/gtkui.py:573
+#: ../glchess/src/lib/gtkui/gtkui.py:534
 msgid "Unable to enable 3D mode"
 msgstr "Unable to enable 3D mode"
 
 #. Translators: No 3D Dialog: Notification to user that they do not have libraries required to enable 3D.
 #. %(error)s will be replaced with a list of reasons why 3D is not available.
-#: ../glchess/src/lib/gtkui/gtkui.py:577
+#: ../glchess/src/lib/gtkui/gtkui.py:538
 #, python-format
 msgid ""
 "You are unable to play in 3D mode due to the following problems:\n"
@@ -4273,12 +4757,12 @@ msgstr ""
 "then you will be able to play chess in 2D mode."
 
 #. Translators: Draw Dialog: Title
-#: ../glchess/src/lib/gtkui/gtkui.py:839
+#: ../glchess/src/lib/gtkui/gtkui.py:800
 msgid "Unable to claim draw"
 msgstr "Unable to claim draw"
 
 #. Translators: Draw Dialog: Notify user why they cannot claim draw
-#: ../glchess/src/lib/gtkui/gtkui.py:841
+#: ../glchess/src/lib/gtkui/gtkui.py:802
 msgid ""
 "You may claim a draw when:\n"
 "a) The board has been in the same state three times (Three fold repetition)\n"
@@ -4292,729 +4776,750 @@ msgstr ""
 
 #. TODO: This should be a pop-up dialog
 #. FIXME: This should create a pop-up dialog
-#: ../glchess/src/lib/gtkui/gtkui.py:863 ../gnome-sudoku/src/lib/main.py:814
+#: ../glchess/src/lib/gtkui/gtkui.py:824 ../gnome-sudoku/src/lib/main.py:727
 #, python-format
 msgid "Unable to display help: %s"
 msgstr "Unable to display help: %s"
 
 #. Translators: Error message displayed when 3D mode is not available due to no Python OpenGL libraries
-#: ../glchess/src/lib/gtkui/chessview.py:21
+#: ../glchess/src/lib/gtkui/chessview.py:22
 msgid "No Python OpenGL support"
 msgstr "No Python OpenGL support"
 
 #. Translators: Error message displayed when 3D mode is not available due to no Python GTKGLExt libraries
-#: ../glchess/src/lib/gtkui/chessview.py:27
+#: ../glchess/src/lib/gtkui/chessview.py:28
 msgid "No Python GTKGLExt support"
 msgstr "No Python GTKGLExt support"
 
 #. Translators: Error message displayed when 3D mode is not available due to their 3D drivers not being able to provide a suitable display mode
-#: ../glchess/src/lib/gtkui/chessview.py:41
+#: ../glchess/src/lib/gtkui/chessview.py:42
 msgid "OpenGL libraries do not support required display mode"
 msgstr "OpenGL libraries do not support required display mode"
 
 #. Translators: Move History Combo: Go to the start of the game
-#: ../glchess/src/lib/gtkui/chessview.py:254
-#: ../glchess/src/lib/gtkui/chessview.py:287
+#: ../glchess/src/lib/gtkui/chessview.py:270
+#: ../glchess/src/lib/gtkui/chessview.py:303
 msgid "Game Start"
 msgstr "Game Start"
 
 #. Translators: Comment text when move has no comment
-#: ../glchess/src/lib/gtkui/chessview.py:292
+#: ../glchess/src/lib/gtkui/chessview.py:308
 msgid "No comment"
 msgstr "No comment"
 
 #. Translators: Human Move String: Description of the white player making a long castle
-#: ../glchess/src/lib/gtkui/chessview.py:419
+#: ../glchess/src/lib/gtkui/chessview.py:435
 msgid "White castles long"
 msgstr "White castles long"
 
 #. Translators: Human Move String: Description of the black player making a long castle
-#: ../glchess/src/lib/gtkui/chessview.py:421
+#: ../glchess/src/lib/gtkui/chessview.py:437
 msgid "Black castles long"
 msgstr "Black castles long"
 
 #. Translators: Human Move String: Description of the white player making a short castle
-#: ../glchess/src/lib/gtkui/chessview.py:424
+#: ../glchess/src/lib/gtkui/chessview.py:440
 msgid "White castles short"
 msgstr "White castles short"
 
 #. Translators: Human Move String: Description of the black player making a short castle
-#: ../glchess/src/lib/gtkui/chessview.py:426
+#: ../glchess/src/lib/gtkui/chessview.py:442
 msgid "Black castles short"
 msgstr "Black castles short"
 
 #. Note there are no move formats for pieces taking kings and this is not allowed in Chess rules
 #. Translators: Human Move String: Description of a white pawn moving from %(start)s to %(end)s, e.g. 'c2 to c4'
-#: ../glchess/src/lib/gtkui/chessview.py:430
+#: ../glchess/src/lib/gtkui/chessview.py:446
 #, python-format
 msgid "White pawn moves from %(start)s to %(end)s"
 msgstr "White pawn moves from %(start)s to %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:431
+#: ../glchess/src/lib/gtkui/chessview.py:447
 #, python-format
 msgid "White pawn at %(start)s takes the black pawn at %(end)s"
 msgstr "White pawn at %(start)s takes the black pawn at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:432
+#: ../glchess/src/lib/gtkui/chessview.py:448
 #, python-format
 msgid "White pawn at %(start)s takes the black rook at %(end)s"
 msgstr "White pawn at %(start)s takes the black rook at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:433
+#: ../glchess/src/lib/gtkui/chessview.py:449
 #, python-format
 msgid "White pawn at %(start)s takes the black knight at %(end)s"
 msgstr "White pawn at %(start)s takes the black knight at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:434
+#: ../glchess/src/lib/gtkui/chessview.py:450
 #, python-format
 msgid "White pawn at %(start)s takes the black bishop at %(end)s"
 msgstr "White pawn at %(start)s takes the black bishop at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:435
+#: ../glchess/src/lib/gtkui/chessview.py:451
 #, python-format
 msgid "White pawn at %(start)s takes the black queen at %(end)s"
 msgstr "White pawn at %(start)s takes the black queen at %(end)s"
 
 #. Translators: Human Move String: Description of a white rook moving from %(start)s to %(end)s, e.g. 'a1 to a5'
-#: ../glchess/src/lib/gtkui/chessview.py:437
+#: ../glchess/src/lib/gtkui/chessview.py:453
 #, python-format
 msgid "White rook moves from %(start)s to %(end)s"
 msgstr "White rook moves from %(start)s to %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:438
+#: ../glchess/src/lib/gtkui/chessview.py:454
 #, python-format
 msgid "White rook at %(start)s takes the black pawn at %(end)s"
 msgstr "White rook at %(start)s takes the black pawn at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:439
+#: ../glchess/src/lib/gtkui/chessview.py:455
 #, python-format
 msgid "White rook at %(start)s takes the black rook at %(end)s"
 msgstr "White rook at %(start)s takes the black rook at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:440
+#: ../glchess/src/lib/gtkui/chessview.py:456
 #, python-format
 msgid "White rook at %(start)s takes the black knight at %(end)s"
 msgstr "White rook at %(start)s takes the black knight at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:441
+#: ../glchess/src/lib/gtkui/chessview.py:457
 #, python-format
 msgid "White rook at %(start)s takes the black bishop at %(end)s"
 msgstr "White rook at %(start)s takes the black bishop at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:442
+#: ../glchess/src/lib/gtkui/chessview.py:458
 #, python-format
 msgid "White rook at %(start)s takes the black queen at %(end)s"
 msgstr "White rook at %(start)s takes the black queen at %(end)s"
 
 #. Translators: Human Move String: Description of a white knight moving from %(start)s to %(end)s, e.g. 'b1 to c3'
-#: ../glchess/src/lib/gtkui/chessview.py:444
+#: ../glchess/src/lib/gtkui/chessview.py:460
 #, python-format
 msgid "White knight moves from %(start)s to %(end)s"
 msgstr "White knight moves from %(start)s to %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:445
+#: ../glchess/src/lib/gtkui/chessview.py:461
 #, python-format
 msgid "White knight at %(start)s takes the black pawn at %(end)s"
 msgstr "White knight at %(start)s takes the black pawn at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:446
+#: ../glchess/src/lib/gtkui/chessview.py:462
 #, python-format
 msgid "White knight at %(start)s takes the black rook at %(end)s"
 msgstr "White knight at %(start)s takes the black rook at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:447
+#: ../glchess/src/lib/gtkui/chessview.py:463
 #, python-format
 msgid "White knight at %(start)s takes the black knight at %(end)s"
 msgstr "White knight at %(start)s takes the black knight at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:448
+#: ../glchess/src/lib/gtkui/chessview.py:464
 #, python-format
 msgid "White knight at %(start)s takes the black bishop at %(end)s"
 msgstr "White knight at %(start)s takes the black bishop at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:449
+#: ../glchess/src/lib/gtkui/chessview.py:465
 #, python-format
 msgid "White knight at %(start)s takes the black queen at %(end)s"
 msgstr "White knight at %(start)s takes the black queen at %(end)s"
 
 #. Translators: Human Move String: Description of a white bishop moving from %(start)s to %(end)s, e.g. 'f1 to b5'
-#: ../glchess/src/lib/gtkui/chessview.py:451
+#: ../glchess/src/lib/gtkui/chessview.py:467
 #, python-format
 msgid "White bishop moves from %(start)s to %(end)s"
 msgstr "White bishop moves from %(start)s to %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:452
+#: ../glchess/src/lib/gtkui/chessview.py:468
 #, python-format
 msgid "White bishop at %(start)s takes the black pawn at %(end)s"
 msgstr "White bishop at %(start)s takes the black pawn at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:453
+#: ../glchess/src/lib/gtkui/chessview.py:469
 #, python-format
 msgid "White bishop at %(start)s takes the black rook at %(end)s"
 msgstr "White bishop at %(start)s takes the black rook at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:454
+#: ../glchess/src/lib/gtkui/chessview.py:470
 #, python-format
 msgid "White bishop at %(start)s takes the black knight at %(end)s"
 msgstr "White bishop at %(start)s takes the black knight at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:455
+#: ../glchess/src/lib/gtkui/chessview.py:471
 #, python-format
 msgid "White bishop at %(start)s takes the black bishop at %(end)s"
 msgstr "White bishop at %(start)s takes the black bishop at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:456
+#: ../glchess/src/lib/gtkui/chessview.py:472
 #, python-format
 msgid "White bishop at %(start)s takes the black queen at %(end)s"
 msgstr "White bishop at %(start)s takes the black queen at %(end)s"
 
 #. Translators: Human Move String: Description of a white queen moving from %(start)s to %(end)s, e.g. 'd1 to d4'
-#: ../glchess/src/lib/gtkui/chessview.py:458
+#: ../glchess/src/lib/gtkui/chessview.py:474
 #, python-format
 msgid "White queen moves from %(start)s to %(end)s"
 msgstr "White queen moves from %(start)s to %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:459
+#: ../glchess/src/lib/gtkui/chessview.py:475
 #, python-format
 msgid "White queen at %(start)s takes the black pawn at %(end)s"
 msgstr "White queen at %(start)s takes the black pawn at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:460
+#: ../glchess/src/lib/gtkui/chessview.py:476
 #, python-format
 msgid "White queen at %(start)s takes the black rook at %(end)s"
 msgstr "White queen at %(start)s takes the black rook at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:461
+#: ../glchess/src/lib/gtkui/chessview.py:477
 #, python-format
 msgid "White queen at %(start)s takes the black knight at %(end)s"
 msgstr "White queen at %(start)s takes the black knight at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:462
+#: ../glchess/src/lib/gtkui/chessview.py:478
 #, python-format
 msgid "White queen at %(start)s takes the black bishop at %(end)s"
 msgstr "White queen at %(start)s takes the black bishop at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:463
+#: ../glchess/src/lib/gtkui/chessview.py:479
 #, python-format
 msgid "White queen at %(start)s takes the black queen at %(end)s"
 msgstr "White queen at %(start)s takes the black queen at %(end)s"
 
 #. Translators: Human Move String: Description of a white king moving from %(start)s to %(end)s, e.g. 'e1 to f1'
-#: ../glchess/src/lib/gtkui/chessview.py:465
+#: ../glchess/src/lib/gtkui/chessview.py:481
 #, python-format
 msgid "White king moves from %(start)s to %(end)s"
 msgstr "White king moves from %(start)s to %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:466
+#: ../glchess/src/lib/gtkui/chessview.py:482
 #, python-format
 msgid "White king at %(start)s takes the black pawn at %(end)s"
 msgstr "White king at %(start)s takes the black pawn at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:467
+#: ../glchess/src/lib/gtkui/chessview.py:483
 #, python-format
 msgid "White king at %(start)s takes the black rook at %(end)s"
 msgstr "White king at %(start)s takes the black rook at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:468
+#: ../glchess/src/lib/gtkui/chessview.py:484
 #, python-format
 msgid "White king at %(start)s takes the black knight at %(end)s"
 msgstr "White king at %(start)s takes the black knight at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:469
+#: ../glchess/src/lib/gtkui/chessview.py:485
 #, python-format
 msgid "White king at %(start)s takes the black bishop at %(end)s"
 msgstr "White king at %(start)s takes the black bishop at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:470
+#: ../glchess/src/lib/gtkui/chessview.py:486
 #, python-format
 msgid "White king at %(start)s takes the black queen at %(end)s"
 msgstr "White king at %(start)s takes the black queen at %(end)s"
 
 #. Translators: Human Move String: Description of a black pawn moving from %(start)s to %(end)s, e.g. 'c8 to c6'
-#: ../glchess/src/lib/gtkui/chessview.py:472
+#: ../glchess/src/lib/gtkui/chessview.py:488
 #, python-format
 msgid "Black pawn moves from %(start)s to %(end)s"
 msgstr "Black pawn moves from %(start)s to %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:473
+#: ../glchess/src/lib/gtkui/chessview.py:489
 #, python-format
 msgid "Black pawn at %(start)s takes the white pawn at %(end)s"
 msgstr "Black pawn at %(start)s takes the white pawn at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:474
+#: ../glchess/src/lib/gtkui/chessview.py:490
 #, python-format
 msgid "Black pawn at %(start)s takes the white rook at %(end)s"
 msgstr "Black pawn at %(start)s takes the white rook at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:475
+#: ../glchess/src/lib/gtkui/chessview.py:491
 #, python-format
 msgid "Black pawn at %(start)s takes the white knight at %(end)s"
 msgstr "Black pawn at %(start)s takes the white knight at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:476
+#: ../glchess/src/lib/gtkui/chessview.py:492
 #, python-format
 msgid "Black pawn at %(start)s takes the white bishop at %(end)s"
 msgstr "Black pawn at %(start)s takes the white bishop at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:477
+#: ../glchess/src/lib/gtkui/chessview.py:493
 #, python-format
 msgid "Black pawn at %(start)s takes the white queen at %(end)s"
 msgstr "Black pawn at %(start)s takes the white queen at %(end)s"
 
 #. Translators: Human Move String: Description of a black rook moving from %(start)s to %(end)s, e.g. 'a8 to a4'
-#: ../glchess/src/lib/gtkui/chessview.py:479
+#: ../glchess/src/lib/gtkui/chessview.py:495
 #, python-format
 msgid "Black rook moves from %(start)s to %(end)s"
 msgstr "Black rook moves from %(start)s to %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:480
+#: ../glchess/src/lib/gtkui/chessview.py:496
 #, python-format
 msgid "Black rook at %(start)s takes the white pawn at %(end)s"
 msgstr "Black rook at %(start)s takes the white pawn at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:481
+#: ../glchess/src/lib/gtkui/chessview.py:497
 #, python-format
 msgid "Black rook at %(start)s takes the white rook at %(end)s"
 msgstr "Black rook at %(start)s takes the white rook at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:482
+#: ../glchess/src/lib/gtkui/chessview.py:498
 #, python-format
 msgid "Black rook at %(start)s takes the white knight at %(end)s"
 msgstr "Black rook at %(start)s takes the white knight at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:483
+#: ../glchess/src/lib/gtkui/chessview.py:499
 #, python-format
 msgid "Black rook at %(start)s takes the white bishop at %(end)s"
 msgstr "Black rook at %(start)s takes the white bishop at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:484
+#: ../glchess/src/lib/gtkui/chessview.py:500
 #, python-format
 msgid "Black rook at %(start)s takes the white queen at %(end)s"
 msgstr "Black rook at %(start)s takes the white queen at %(end)s"
 
 #. Translators: Human Move String: Description of a black knight moving from %(start)s to %(end)s, e.g. 'b8 to c6'
-#: ../glchess/src/lib/gtkui/chessview.py:486
+#: ../glchess/src/lib/gtkui/chessview.py:502
 #, python-format
 msgid "Black knight moves from %(start)s to %(end)s"
 msgstr "Black knight moves from %(start)s to %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:487
+#: ../glchess/src/lib/gtkui/chessview.py:503
 #, python-format
 msgid "Black knight at %(start)s takes the white pawn at %(end)s"
 msgstr "Black knight at %(start)s takes the white pawn at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:488
+#: ../glchess/src/lib/gtkui/chessview.py:504
 #, python-format
 msgid "Black knight at %(start)s takes the white rook at %(end)s"
 msgstr "Black knight at %(start)s takes the white rook at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:489
+#: ../glchess/src/lib/gtkui/chessview.py:505
 #, python-format
 msgid "Black knight at %(start)s takes the white knight at %(end)s"
 msgstr "Black knight at %(start)s takes the white knight at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:490
+#: ../glchess/src/lib/gtkui/chessview.py:506
 #, python-format
 msgid "Black knight at %(start)s takes the white bishop at %(end)s"
 msgstr "Black knight at %(start)s takes the white bishop at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:491
+#: ../glchess/src/lib/gtkui/chessview.py:507
 #, python-format
 msgid "Black knight at %(start)s takes the white queen at %(end)s"
 msgstr "Black knight at %(start)s takes the white queen at %(end)s"
 
 #. Translators: Human Move String: Description of a black bishop moving from %(start)s to %(end)s, e.g. 'f8 to b3'
-#: ../glchess/src/lib/gtkui/chessview.py:493
+#: ../glchess/src/lib/gtkui/chessview.py:509
 #, python-format
 msgid "Black bishop moves from %(start)s to %(end)s"
 msgstr "Black bishop moves from %(start)s to %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:494
+#: ../glchess/src/lib/gtkui/chessview.py:510
 #, python-format
 msgid "Black bishop at %(start)s takes the white pawn at %(end)s"
 msgstr "Black bishop at %(start)s takes the white pawn at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:495
+#: ../glchess/src/lib/gtkui/chessview.py:511
 #, python-format
 msgid "Black bishop at %(start)s takes the white rook at %(end)s"
 msgstr "Black bishop at %(start)s takes the white rook at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:496
+#: ../glchess/src/lib/gtkui/chessview.py:512
 #, python-format
 msgid "Black bishop at %(start)s takes the white knight at %(end)s"
 msgstr "Black bishop at %(start)s takes the white knight at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:497
+#: ../glchess/src/lib/gtkui/chessview.py:513
 #, python-format
 msgid "Black bishop at %(start)s takes the white bishop at %(end)s"
 msgstr "Black bishop at %(start)s takes the white bishop at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:498
+#: ../glchess/src/lib/gtkui/chessview.py:514
 #, python-format
 msgid "Black bishop at %(start)s takes the white queen at %(end)s"
 msgstr "Black bishop at %(start)s takes the white queen at %(end)s"
 
 #. Translators: Human Move String: Description of a black queen moving from %(start)s to %(end)s, e.g. 'd8 to d5'
-#: ../glchess/src/lib/gtkui/chessview.py:500
+#: ../glchess/src/lib/gtkui/chessview.py:516
 #, python-format
 msgid "Black queen moves from %(start)s to %(end)s"
 msgstr "Black queen moves from %(start)s to %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:501
+#: ../glchess/src/lib/gtkui/chessview.py:517
 #, python-format
 msgid "Black queen at %(start)s takes the white pawn at %(end)s"
 msgstr "Black queen at %(start)s takes the white pawn at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:502
+#: ../glchess/src/lib/gtkui/chessview.py:518
 #, python-format
 msgid "Black queen at %(start)s takes the white rook at %(end)s"
 msgstr "Black queen at %(start)s takes the white rook at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:503
+#: ../glchess/src/lib/gtkui/chessview.py:519
 #, python-format
 msgid "Black queen at %(start)s takes the white knight at %(end)s"
 msgstr "Black queen at %(start)s takes the white knight at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:504
+#: ../glchess/src/lib/gtkui/chessview.py:520
 #, python-format
 msgid "Black queen at %(start)s takes the white bishop at %(end)s"
 msgstr "Black queen at %(start)s takes the white bishop at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:505
+#: ../glchess/src/lib/gtkui/chessview.py:521
 #, python-format
 msgid "Black queen at %(start)s takes the white queen at %(end)s"
 msgstr "Black queen at %(start)s takes the white queen at %(end)s"
 
 #. Translators: Human Move String: Description of a black king moving from %(start)s to %(end)s, e.g. 'e8 to f8'
-#: ../glchess/src/lib/gtkui/chessview.py:507
+#: ../glchess/src/lib/gtkui/chessview.py:523
 #, python-format
 msgid "Black king moves from %(start)s to %(end)s"
 msgstr "Black king moves from %(start)s to %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:508
+#: ../glchess/src/lib/gtkui/chessview.py:524
 #, python-format
 msgid "Black king at %(start)s takes the white pawn at %(end)s"
 msgstr "Black king at %(start)s takes the white pawn at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:509
+#: ../glchess/src/lib/gtkui/chessview.py:525
 #, python-format
 msgid "Black king at %(start)s takes the white rook at %(end)s"
 msgstr "Black king at %(start)s takes the white rook at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:510
+#: ../glchess/src/lib/gtkui/chessview.py:526
 #, python-format
 msgid "Black king at %(start)s takes the white knight at %(end)s"
 msgstr "Black king at %(start)s takes the white knight at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:511
+#: ../glchess/src/lib/gtkui/chessview.py:527
 #, python-format
 msgid "Black king at %(start)s takes the white bishop at %(end)s"
 msgstr "Black king at %(start)s takes the white bishop at %(end)s"
 
-#: ../glchess/src/lib/gtkui/chessview.py:512
+#: ../glchess/src/lib/gtkui/chessview.py:528
 #, python-format
 msgid "Black king at %(start)s takes the white queen at %(end)s"
 msgstr "Black king at %(start)s takes the white queen at %(end)s"
 
 #. Translators: Human Move String: White player has made move %(description) and the opponent is in check
-#: ../glchess/src/lib/gtkui/chessview.py:537
+#: ../glchess/src/lib/gtkui/chessview.py:553
 #, python-format
 msgid "%(movenum)2iw. %(description)s (Check)"
 msgstr "%(movenum)2iw. %(description)s (Check)"
 
 #. Translators: Human Move String: White player has made move %(description) and the opponent is in checkmate
-#: ../glchess/src/lib/gtkui/chessview.py:539
+#: ../glchess/src/lib/gtkui/chessview.py:555
 #, python-format
 msgid "%(movenum)2iw. %(description)s (Checkmate)"
 msgstr "%(movenum)2iw. %(description)s (Checkmate)"
 
 #. Translators: Human Move String: White player has made move %(description) and the opponent is in stalemate
-#: ../glchess/src/lib/gtkui/chessview.py:541
+#: ../glchess/src/lib/gtkui/chessview.py:557
 #, python-format
 msgid "%(movenum)2iw. %(description)s (Stalemate)"
 msgstr "%(movenum)2iw. %(description)s (Stalemate)"
 
 #. Translators: Human Move String: White player has made move %(description) and the opponent is not in check or mate
-#: ../glchess/src/lib/gtkui/chessview.py:543
+#: ../glchess/src/lib/gtkui/chessview.py:559
 #, python-format
 msgid "%(movenum)2iw. %(description)s"
 msgstr "%(movenum)2iw. %(description)s"
 
 #. Translators: Human Move String: Black player has made move %(description) and the opponent is in check
-#: ../glchess/src/lib/gtkui/chessview.py:545
+#: ../glchess/src/lib/gtkui/chessview.py:561
 #, python-format
 msgid "%(movenum)2ib. %(description)s (Check)"
 msgstr "%(movenum)2ib. %(description)s (Check)"
 
 #. Translators: Human Move String: Black player has made move %(description) and the opponent is in checkmate
-#: ../glchess/src/lib/gtkui/chessview.py:547
+#: ../glchess/src/lib/gtkui/chessview.py:563
 #, python-format
 msgid "%(movenum)2ib. %(description)s (Checkmate)"
 msgstr "%(movenum)2ib. %(description)s (Checkmate)"
 
 #. Translators: Human Move String: Black player has made move %(description) and the opponent is in stalemate
-#: ../glchess/src/lib/gtkui/chessview.py:549
+#: ../glchess/src/lib/gtkui/chessview.py:565
 #, python-format
 msgid "%(movenum)2ib. %(description)s (Stalemate)"
 msgstr "%(movenum)2ib. %(description)s (Stalemate)"
 
 #. Translators: Human Move String: Black player has made move %(description) and the opponent is not in check or mate
-#: ../glchess/src/lib/gtkui/chessview.py:551
+#: ../glchess/src/lib/gtkui/chessview.py:567
 #, python-format
 msgid "%(movenum)2ib. %(description)s"
 msgstr "%(movenum)2ib. %(description)s"
 
 #. Translators: Message displayed when a player wins. The %s is substituted with the winning player's name
-#: ../glchess/src/lib/gtkui/chessview.py:582
+#: ../glchess/src/lib/gtkui/chessview.py:598
 #, python-format
 msgid "%s wins"
 msgstr "%s wins"
 
 #. Translators: Message displayed when a game is drawn
-#: ../glchess/src/lib/gtkui/chessview.py:591
+#: ../glchess/src/lib/gtkui/chessview.py:607
 msgid "Game is drawn"
 msgstr "Game is drawn"
 
 #. Translators: Message displayed when the game ends due to a player being checkmated
-#: ../glchess/src/lib/gtkui/chessview.py:596
+#: ../glchess/src/lib/gtkui/chessview.py:612
 msgid "Opponent is in check and cannot move (checkmate)"
 msgstr "Opponent is in check and cannot move (checkmate)"
 
 #. Translators: Message displayed when the game terminates due to a stalemate
-#: ../glchess/src/lib/gtkui/chessview.py:599
+#: ../glchess/src/lib/gtkui/chessview.py:615
 msgid "Opponent cannot move (stalemate)"
 msgstr "Opponent cannot move (stalemate)"
 
 #. Translators: Message displayed when the game is drawn due to the fifty move rule
-#: ../glchess/src/lib/gtkui/chessview.py:602
+#: ../glchess/src/lib/gtkui/chessview.py:618
 msgid "No piece has been taken or pawn moved in the last fifty moves"
 msgstr "No piece has been taken or pawn moved in the last fifty moves"
 
 #. Translators: Message displayed when the game ends due to one player's clock stopping
-#: ../glchess/src/lib/gtkui/chessview.py:605
+#: ../glchess/src/lib/gtkui/chessview.py:621
 msgid "Opponent has run out of time"
 msgstr "Opponent has run out of time"
 
 #. Translators: Message displayed when the game is drawn due to the three-fold-repitition rule
-#: ../glchess/src/lib/gtkui/chessview.py:608
+#: ../glchess/src/lib/gtkui/chessview.py:624
 msgid "The same board state has occurred three times (three fold repetition)"
 msgstr "The same board state has occurred three times (three fold repetition)"
 
 #. Translators: Message displayed when the game is drawn due to the insufficient material rule
-#: ../glchess/src/lib/gtkui/chessview.py:611
+#: ../glchess/src/lib/gtkui/chessview.py:627
 msgid "Neither player can cause checkmate (insufficient material)"
 msgstr "Neither player can cause checkmate (insufficient material)"
 
 #. Translators: Message displayed when the game ends due to the black player resigning
-#: ../glchess/src/lib/gtkui/chessview.py:615
+#: ../glchess/src/lib/gtkui/chessview.py:631
 msgid "The black player has resigned"
 msgstr "The black player has resigned"
 
 #. Translators: Message displayed when the game ends due to the white player resigning
-#: ../glchess/src/lib/gtkui/chessview.py:618
+#: ../glchess/src/lib/gtkui/chessview.py:634
 msgid "The white player has resigned"
 msgstr "The white player has resigned"
 
 #. Translators: Message displayed when a game is abandoned
-#: ../glchess/src/lib/gtkui/chessview.py:623
+#: ../glchess/src/lib/gtkui/chessview.py:639
 msgid "The game has been abandoned"
 msgstr "The game has been abandoned"
 
 #. Translators: Message displayed when the game ends due to a player dying
-#: ../glchess/src/lib/gtkui/chessview.py:626
+#: ../glchess/src/lib/gtkui/chessview.py:642
 msgid "One of the players has died"
 msgstr "One of the players has died"
 
 #. Translators: Server Combo Box: Not connected to a server
-#: ../glchess/src/lib/gtkui/network.py:115
+#: ../glchess/src/lib/gtkui/network.py:117
 msgid "Disconnected"
 msgstr "Disconnected"
 
 #. Translators: Server Combo Box: Add new profile
-#: ../glchess/src/lib/gtkui/network.py:120
+#: ../glchess/src/lib/gtkui/network.py:122
 msgid "New profile..."
-msgstr "New profile..."
+msgstr "New profileâ?¦"
 
 #. Translators: Available GGZ Tables: Table name column title
-#: ../glchess/src/lib/gtkui/network.py:180
+#: ../glchess/src/lib/gtkui/network.py:182
 msgid "Table"
 msgstr "Table"
 
 #. Translators: Current GGZ Table: Seat name column title
-#: ../glchess/src/lib/gtkui/network.py:197
+#: ../glchess/src/lib/gtkui/network.py:199
 msgid "Seat"
 msgstr "Seat"
 
 #. Translators: Current GGZ Table: Player name column title
-#: ../glchess/src/lib/gtkui/network.py:201
+#: ../glchess/src/lib/gtkui/network.py:203
 msgid "Player"
 msgstr "Player"
 
 #. Translators: GGZ seat is occupied by a spectator
-#: ../glchess/src/lib/gtkui/network.py:364
+#: ../glchess/src/lib/gtkui/network.py:366
 #: ../libgames-support/games-dlg-players.c:171
 msgid "Spectator"
 msgstr "Spectator"
 
 #. Translators: GGZ seat status: This seat is reserved. %s is replaced with
 #. the name of the player the seat is reserved for.
-#: ../glchess/src/lib/gtkui/network.py:373
+#: ../glchess/src/lib/gtkui/network.py:375
 #, python-format
 msgid "Reserved for %s"
 msgstr "Reserved for %s"
 
 #. Translators: GGZ seat status: This seat is not taken
-#: ../glchess/src/lib/gtkui/network.py:376
+#: ../glchess/src/lib/gtkui/network.py:378
 msgid "Seat empty"
 msgstr "Seat empty"
 
 #. Translators: GGZ seat status: This seat contains an AI player.
 #. %s is replaced with the name of the AI.
-#: ../glchess/src/lib/gtkui/network.py:380
+#: ../glchess/src/lib/gtkui/network.py:382
 #, python-format
 msgid "AI (%s)"
 msgstr "AI (%s)"
 
-#. Translators: The first file on the chess board. Do not translate the 'chess-file|' text
-#: ../glchess/src/lib/chess/__init__.py:12
-msgid "chess-file|a"
+#. Translators: The first file on the chess board
+#: ../glchess/src/lib/chess/__init__.py:11
+msgctxt "chess-file"
+msgid "a"
 msgstr "a"
 
-#. Translators: The second file on the chess board. Do not translate the 'chess-file|' text
-#: ../glchess/src/lib/chess/__init__.py:14
-msgid "chess-file|b"
+#. Translators: The second file on the chess board
+#: ../glchess/src/lib/chess/__init__.py:13
+msgctxt "chess-file"
+msgid "b"
 msgstr "b"
 
-#. Translators: The third file on the chess board. Do not translate the 'chess-file|' text
-#: ../glchess/src/lib/chess/__init__.py:16
-msgid "chess-file|c"
+#. Translators: The third file on the chess board
+#: ../glchess/src/lib/chess/__init__.py:15
+msgctxt "chess-file"
+msgid "c"
 msgstr "c"
 
-#. Translators: The fourth file on the chess board. Do not translate the 'chess-file|' text
-#: ../glchess/src/lib/chess/__init__.py:18
-msgid "chess-file|d"
+#. Translators: The fourth file on the chess board
+#: ../glchess/src/lib/chess/__init__.py:17
+msgctxt "chess-file"
+msgid "d"
 msgstr "d"
 
-#. Translators: The fifth file on the chess board. Do not translate the 'chess-file|' text
-#: ../glchess/src/lib/chess/__init__.py:20
-msgid "chess-file|e"
+#. Translators: The fifth file on the chess board
+#: ../glchess/src/lib/chess/__init__.py:19
+msgctxt "chess-file"
+msgid "e"
 msgstr "e"
 
-#. Translators: The sixth file on the chess board. Do not translate the 'chess-file|' text
-#: ../glchess/src/lib/chess/__init__.py:22
-msgid "chess-file|f"
+#. Translators: The sixth file on the chess board
+#: ../glchess/src/lib/chess/__init__.py:21
+msgctxt "chess-file"
+msgid "f"
 msgstr "f"
 
-#. Translators: The seventh file on the chess board. Do not translate the 'chess-file|' text
-#: ../glchess/src/lib/chess/__init__.py:24
-msgid "chess-file|g"
+#. Translators: The seventh file on the chess board
+#: ../glchess/src/lib/chess/__init__.py:23
+msgctxt "chess-file"
+msgid "g"
 msgstr "g"
 
-#. Translators: The eigth file on the chess board. Do not translate the 'chess-file|' text
-#: ../glchess/src/lib/chess/__init__.py:26
-msgid "chess-file|h"
+#. Translators: The eigth file on the chess board
+#: ../glchess/src/lib/chess/__init__.py:25
+msgctxt "chess-file"
+msgid "h"
 msgstr "h"
 
-#. Translators: The first rank on the chess board. Do not translate the 'chess-rank|' text
-#: ../glchess/src/lib/chess/__init__.py:35
-msgid "chess-rank|1"
+#. Translators: The first rank on the chess board
+#: ../glchess/src/lib/chess/__init__.py:28
+msgctxt "chess-rank"
+msgid "1"
 msgstr "1"
 
-#. Translators: The second rank on the chess board. Do not translate the 'chess-rank|' text
-#: ../glchess/src/lib/chess/__init__.py:37
-msgid "chess-rank|2"
+#. Translators: The second rank on the chess board
+#: ../glchess/src/lib/chess/__init__.py:30
+msgctxt "chess-rank"
+msgid "2"
 msgstr "2"
 
-#. Translators: The third rank on the chess board. Do not translate the 'chess-rank|' text
-#: ../glchess/src/lib/chess/__init__.py:39
-msgid "chess-rank|3"
+#. Translators: The third rank on the chess board
+#: ../glchess/src/lib/chess/__init__.py:32
+msgctxt "chess-rank"
+msgid "3"
 msgstr "3"
 
-#. Translators: The fourth rank on the chess board. Do not translate the 'chess-rank|' text
-#: ../glchess/src/lib/chess/__init__.py:41
-msgid "chess-rank|4"
+#. Translators: The fourth rank on the chess board
+#: ../glchess/src/lib/chess/__init__.py:34
+msgctxt "chess-rank"
+msgid "4"
 msgstr "4"
 
-#. Translators: The fifth rank on the chess board. Do not translate the 'chess-rank|' text
-#: ../glchess/src/lib/chess/__init__.py:43
-msgid "chess-rank|5"
+#. Translators: The fifth rank on the chess board
+#: ../glchess/src/lib/chess/__init__.py:36
+msgctxt "chess-rank"
+msgid "5"
 msgstr "5"
 
-#. Translators: The sixth rank on the chess board. Do not translate the 'chess-rank|' text
-#: ../glchess/src/lib/chess/__init__.py:45
-msgid "chess-rank|6"
+#. Translators: The sixth rank on the chess board
+#: ../glchess/src/lib/chess/__init__.py:38
+msgctxt "chess-rank"
+msgid "6"
 msgstr "6"
 
-#. Translators: The seventh rank on the chess board. Do not translate the 'chess-rank|' text
-#: ../glchess/src/lib/chess/__init__.py:47
-msgid "chess-rank|7"
+#. Translators: The seventh rank on the chess board
+#: ../glchess/src/lib/chess/__init__.py:40
+msgctxt "chess-rank"
+msgid "7"
 msgstr "7"
 
-#. Translators: The eigth rank on the chess board. Do not translate the 'chess-rank|' text
-#: ../glchess/src/lib/chess/__init__.py:49
-msgid "chess-rank|8"
+#. Translators: The eigth rank on the chess board
+#: ../glchess/src/lib/chess/__init__.py:42
+msgctxt "chess-rank"
+msgid "8"
 msgstr "8"
 
 #. Translators: The notation form of a pawn.
 #. See http://en.wikipedia.org/wiki/Algebraic_chess_notation#Figurine_Algebraic_Notation for translations.
-#. Do not translate the 'chess-notation|' text.
-#: ../glchess/src/lib/chess/__init__.py:61
-msgid "chess-notation|P"
+#: ../glchess/src/lib/chess/__init__.py:46
+msgctxt "chess-notation"
+msgid "P"
 msgstr "P"
 
-#. Translators: The notation form of a knight. Do not translate the 'chess-notation|' text
-#: ../glchess/src/lib/chess/__init__.py:63
-msgid "chess-notation|N"
+#. Translators: The notation form of a knight
+#: ../glchess/src/lib/chess/__init__.py:48
+msgctxt "chess-notation"
+msgid "N"
 msgstr "N"
 
-#. Translators: The notation form of a bishop. Do not translate the 'chess-notation|' text
-#: ../glchess/src/lib/chess/__init__.py:65
-msgid "chess-notation|B"
+#. Translators: The notation form of a bishop
+#: ../glchess/src/lib/chess/__init__.py:50
+msgctxt "chess-notation"
+msgid "B"
 msgstr "B"
 
-#. Translators: The notation form of a rook. Do not translate the 'chess-notation|' text
-#: ../glchess/src/lib/chess/__init__.py:67
-msgid "chess-notation|R"
+#. Translators: The notation form of a rook
+#: ../glchess/src/lib/chess/__init__.py:52
+msgctxt "chess-notation"
+msgid "R"
 msgstr "R"
 
-#. Translators: The notation form of a queen. Do not translate the 'chess-notation|' text
-#: ../glchess/src/lib/chess/__init__.py:69
-msgid "chess-notation|Q"
+#. Translators: The notation form of a queen
+#: ../glchess/src/lib/chess/__init__.py:54
+msgctxt "chess-notation"
+msgid "Q"
 msgstr "Q"
 
-#. Translators: The notation form of a king. Do not translate the 'chess-notation|' text
-#: ../glchess/src/lib/chess/__init__.py:71
-msgid "chess-notation|K"
+#. Translators: The notation form of a king
+#: ../glchess/src/lib/chess/__init__.py:56
+msgctxt "chess-notation"
+msgid "K"
 msgstr "K"
 
 #. Translators: Description of an AI player used in log window. %(name)s is replaced with
 #. the name of the AI player. %(game)s is replaced with the name of the game the AI player
 #. is in.
-#: ../glchess/src/lib/main.py:118
+#: ../glchess/src/lib/main.py:113
 #, python-format
 msgid "'%(name)s' in '%(game)s'"
 msgstr "'%(name)s' in '%(game)s'"
 
 #. Translators: Name of the log that displays application events
-#: ../glchess/src/lib/main.py:451
+#: ../glchess/src/lib/main.py:423
 msgid "Application Log"
 msgstr "Application Log"
 
 #. FIXME: Should be in a dialog
 #. Translators: Text displayed on the command-line if an unknown argument is passed
-#: ../glchess/src/lib/main.py:695
+#: ../glchess/src/lib/main.py:667
 #, python-format
 msgid "Usage: %s [game]"
 msgstr "Usage: %s [game]"
 
 #. Translators: Name of a human versus AI game. The %s is replaced with the name of the AI player
-#: ../glchess/src/lib/main.py:706
+#: ../glchess/src/lib/main.py:685
 #, python-format
 msgid "Human versus %s"
 msgstr "Human versus %s"
 
 #. FIXME: Isn't this done by bug-buddy?
-#: ../glchess/src/lib/main.py:720
+#: ../glchess/src/lib/main.py:699
 msgid ""
 "glChess has crashed. Please report this bug to http://bugzilla.gnome.org\n";
 "Debug output:"
@@ -5022,19 +5527,19 @@ msgstr ""
 "glChess has crashed. Please report this bug to http://bugzilla.gnome.org\n";
 "Debug output:"
 
-#: ../glchess/src/lib/main.py:737 ../gnome-sudoku/src/lib/main.py:488
+#: ../glchess/src/lib/main.py:716 ../gnome-sudoku/src/lib/main.py:473
 msgid "Save game before closing?"
 msgstr "Save game before closing?"
 
-#: ../glchess/src/lib/defaults.py.in:56
+#: ../glchess/src/lib/defaults.py.in:50
 msgid "glChess"
 msgstr "glChess"
 
-#: ../glchess/src/lib/defaults.py.in:59
+#: ../glchess/src/lib/defaults.py.in:53
 msgid "Copyright 2005-2008 Robert Ancell (and contributors)"
 msgstr "Copyright 2005-2008 Robert Ancell (and contributors)"
 
-#: ../glchess/src/lib/defaults.py.in:60
+#: ../glchess/src/lib/defaults.py.in:54
 msgid ""
 "The 2D/3D chess game for GNOME. \n"
 "\n"
@@ -5046,8 +5551,8 @@ msgstr ""
 
 #. The GPL license string will be translated, and the game name inserted.
 #. This license is the same as in libgames-support/games-stock.c
-#: ../glchess/src/lib/defaults.py.in:69
-#: ../gnome-sudoku/src/lib/defaults.py.in:52
+#: ../glchess/src/lib/defaults.py.in:63
+#: ../gnome-sudoku/src/lib/defaults.py.in:49
 #, python-format
 msgid ""
 "%s is free software; you can redistribute it and/or modify it under the "
@@ -5060,9 +5565,9 @@ msgstr ""
 "Foundation; either version 2 of the Licence, or (at your option) any later "
 "version."
 
-#: ../glchess/src/lib/defaults.py.in:73
-#: ../gnome-sudoku/src/lib/defaults.py.in:56
-#: ../libgames-support/games-stock.c:412
+#: ../glchess/src/lib/defaults.py.in:67
+#: ../gnome-sudoku/src/lib/defaults.py.in:53
+#: ../libgames-support/games-stock.c:415
 #, c-format, python-format
 msgid ""
 "%s is distributed in the hope that it will be useful, but WITHOUT ANY "
@@ -5075,9 +5580,9 @@ msgstr ""
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public Licence for more "
 "details."
 
-#: ../glchess/src/lib/defaults.py.in:77
-#: ../gnome-sudoku/src/lib/defaults.py.in:60
-#: ../libgames-support/games-stock.c:417
+#: ../glchess/src/lib/defaults.py.in:71
+#: ../gnome-sudoku/src/lib/defaults.py.in:57
+#: ../libgames-support/games-stock.c:420
 #, c-format, python-format
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
@@ -5088,54 +5593,54 @@ msgstr ""
 "%s; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, "
 "Fifth Floor, Boston, MA  02110-1301  USA"
 
-#: ../glchess/src/lib/defaults.py.in:89
-#: ../gnome-sudoku/src/lib/defaults.py.in:71
+#: ../glchess/src/lib/defaults.py.in:83
+#: ../gnome-sudoku/src/lib/defaults.py.in:68
 #, python-format
 msgid "Unable to make data directory %(dir)s: %(error)s"
 msgstr "Unable to make data directory %(dir)s: %(error)s"
 
 #. Translators: GGZ disconnection error when the supplied password is incorrect
-#: ../glchess/src/lib/ggz/client.py:212
+#: ../glchess/src/lib/ggz/client.py:205
 msgid "Incorrect password"
 msgstr "Incorrect password"
 
 #. Translators: GGZ disconnection error when the selected account is already in use
-#: ../glchess/src/lib/ggz/client.py:218
+#: ../glchess/src/lib/ggz/client.py:211
 msgid "Account in use"
 msgstr "Account in use"
 
 #. Translators: GGZ disconnection error when the network link has broken. %s is the system provided error
-#: ../glchess/src/lib/ggz/client.py:464
+#: ../glchess/src/lib/ggz/client.py:457
 #, python-format
 msgid "Connection closed: %s"
 msgstr "Connection closed: %s"
 
 #. Translators: GGZ disconnection error when a password was required for the selected account
-#: ../glchess/src/lib/ggz/client.py:605
+#: ../glchess/src/lib/ggz/client.py:598
 msgid "A password is required"
 msgstr "A password is required"
 
-#: ../glchess/src/lib/network.py:306
+#: ../glchess/src/lib/network.py:309
 msgid "Disconnected from server"
 msgstr "Disconnected from server"
 
-#: ../glchess/src/lib/network.py:356
+#: ../glchess/src/lib/network.py:359
 msgid "No description"
 msgstr "No description"
 
-#: ../glines/glines.c:88 ../gnomine/gnomine.c:100
+#: ../glines/glines.c:88 ../gnomine/gnomine.c:101
 #: ../same-gnome/same-gnome.c:54
 msgctxt "board size"
 msgid "Small"
 msgstr "Small"
 
-#: ../glines/glines.c:89 ../gnomine/gnomine.c:101
+#: ../glines/glines.c:89 ../gnomine/gnomine.c:102
 #: ../same-gnome/same-gnome.c:55
 msgctxt "board size"
 msgid "Medium"
 msgstr "Medium"
 
-#: ../glines/glines.c:90 ../gnomine/gnomine.c:102
+#: ../glines/glines.c:90 ../gnomine/gnomine.c:103
 #: ../same-gnome/same-gnome.c:56
 msgctxt "board size"
 msgid "Large"
@@ -5192,13 +5697,13 @@ msgstr "Game Over!"
 msgid "You can't move there!"
 msgstr "You can't move there!"
 
-#: ../glines/glines.c:1206 ../glines/glines.c:1210 ../glines/glines.c:1212
-#: ../glines/glines.c:1809 ../glines/glines.c:1841
+#: ../glines/glines.c:1207 ../glines/glines.c:1211 ../glines/glines.c:1213
+#: ../glines/glines.c:1813 ../glines/glines.c:1845
 #: ../glines/glines.desktop.in.in.h:1
 msgid "Five or More"
 msgstr "Five or More"
 
-#: ../glines/glines.c:1215
+#: ../glines/glines.c:1216
 msgid ""
 "GNOME port of the once-popular Color Lines game.\n"
 "\n"
@@ -5208,36 +5713,36 @@ msgstr ""
 "\n"
 "Five or More is a part of GNOME Games."
 
-#: ../glines/glines.c:1445
+#: ../glines/glines.c:1446
 msgid "Five or More Preferences"
 msgstr "Five or More Preferences"
 
-#: ../glines/glines.c:1465
+#: ../glines/glines.c:1466
 msgid "Themes"
 msgstr "Themes"
 
-#: ../glines/glines.c:1473
+#: ../glines/glines.c:1474
 msgid "_Image:"
 msgstr "_Image:"
 
-#: ../glines/glines.c:1484
+#: ../glines/glines.c:1485
 msgid "B_ackground color:"
 msgstr "B_ackground colour:"
 
-#: ../glines/glines.c:1499
+#: ../glines/glines.c:1500
 msgid "Board Size"
 msgstr "Board Size"
 
-#: ../glines/glines.c:1518
+#: ../glines/glines.c:1519
 msgctxt "preferences"
 msgid "General"
 msgstr "General"
 
-#: ../glines/glines.c:1524
+#: ../glines/glines.c:1525
 msgid "_Use fast moves"
 msgstr "_Use fast moves"
 
-#: ../glines/glines.c:1870
+#: ../glines/glines.c:1874
 msgid "Next:"
 msgstr "Next:"
 
@@ -5351,13 +5856,13 @@ msgstr "Level of Player Two"
 
 #: ../gnect/data/gnect.schemas.in.h:9 ../gnect/src/prefs.c:370
 #: ../gnibbles/gnibbles.schemas.in.h:16 ../gnibbles/preferences.c:446
-#: ../gnometris/gnometris.schemas.in.h:13 ../gnometris/tetris.cpp:777
+#: ../gnometris/gnometris.schemas.in.h:13 ../gnometris/tetris.cpp:742
 msgid "Move left"
 msgstr "Move left"
 
 #: ../gnect/data/gnect.schemas.in.h:10 ../gnect/src/prefs.c:371
 #: ../gnibbles/gnibbles.schemas.in.h:17 ../gnibbles/preferences.c:447
-#: ../gnometris/gnometris.schemas.in.h:14 ../gnometris/tetris.cpp:778
+#: ../gnometris/gnometris.schemas.in.h:14 ../gnometris/tetris.cpp:743
 msgid "Move right"
 msgstr "Move right"
 
@@ -5403,7 +5908,7 @@ msgstr "Welcome to a network game of %s."
 msgid "It's a draw!"
 msgstr "It's a draw!"
 
-#: ../gnect/src/main.c:583 ../gnome-sudoku/src/lib/main.py:449
+#: ../gnect/src/main.c:583 ../gnome-sudoku/src/lib/main.py:435
 msgid "You win!"
 msgstr "You win!"
 
@@ -5417,7 +5922,7 @@ msgstr "I win!"
 
 #: ../gnect/src/main.c:590 ../gnect/src/main.c:723
 msgid "Thinking..."
-msgstr "Thinking..."
+msgstr "Thinkingâ?¦"
 
 #: ../gnect/src/main.c:611 ../gnect/src/main.c:615
 #, c-format
@@ -5499,8 +6004,8 @@ msgstr "Level three"
 msgid "Four-in-a-Row Preferences"
 msgstr "Four-in-a-Row Preferences"
 
-#: ../gnect/src/prefs.c:333 ../gnobots2/properties.c:558
-#: ../iagno/properties.c:528
+#: ../gnect/src/prefs.c:333 ../gnobots2/properties.c:530
+#: ../iagno/properties.c:528 ../same-gnome-clutter/data/settings.ui.h:1
 msgid "Appearance"
 msgstr "Appearance"
 
@@ -5519,7 +6024,7 @@ msgstr "E_nable sounds"
 
 #. keyboard tab
 #: ../gnect/src/prefs.c:366 ../gnibbles/preferences.c:436
-#: ../gnobots2/properties.c:565 ../gnometris/tetris.cpp:769
+#: ../gnobots2/properties.c:537 ../gnometris/tetris.cpp:734
 msgid "Keyboard Controls"
 msgstr "Keyboard Controls"
 
@@ -5632,28 +6137,28 @@ msgstr ""
 "\n"
 "Please check your Nibbles installation"
 
-#: ../gnibbles/gnibbles.c:618
+#: ../gnibbles/gnibbles.c:619
 msgid "Nibbles Scores"
 msgstr "Nibbles Scores"
 
-#: ../gnibbles/gnibbles.c:621
+#: ../gnibbles/gnibbles.c:622
 msgid "Speed:"
 msgstr "Speed:"
 
-#: ../gnibbles/gnibbles.c:626 ../gnobots2/game.c:182 ../gnomine/gnomine.c:223
-#: ../gnotravex/gnotravex.c:1237 ../gnotski/gnotski.c:840
+#: ../gnibbles/gnibbles.c:627 ../gnobots2/game.c:182 ../gnomine/gnomine.c:224
+#: ../gnotravex/gnotravex.c:1239 ../gnotski/gnotski.c:842
 #: ../gtali/gyahtzee.c:203 ../mahjongg/mahjongg.c:668 ../same-gnome/ui.c:193
 msgid "Congratulations!"
 msgstr "Congratulations!"
 
-#: ../gnibbles/gnibbles.c:627 ../gnobots2/game.c:183 ../gnomine/gnomine.c:224
-#: ../gnotravex/gnotravex.c:1238 ../gnotski/gnotski.c:841
+#: ../gnibbles/gnibbles.c:628 ../gnobots2/game.c:183 ../gnomine/gnomine.c:225
+#: ../gnotravex/gnotravex.c:1240 ../gnotski/gnotski.c:843
 #: ../gtali/gyahtzee.c:204 ../mahjongg/mahjongg.c:669 ../same-gnome/ui.c:194
 msgid "Your score is the best!"
 msgstr "Your score is the best!"
 
-#: ../gnibbles/gnibbles.c:628 ../gnobots2/game.c:184 ../gnomine/gnomine.c:225
-#: ../gnotravex/gnotravex.c:1239 ../gnotski/gnotski.c:842
+#: ../gnibbles/gnibbles.c:629 ../gnobots2/game.c:184 ../gnomine/gnomine.c:226
+#: ../gnotravex/gnotravex.c:1241 ../gnotski/gnotski.c:844
 #: ../gtali/gyahtzee.c:205 ../mahjongg/mahjongg.c:670 ../same-gnome/ui.c:195
 msgid "Your score has made the top ten."
 msgstr "Your score has made the top ten."
@@ -5662,9 +6167,9 @@ msgstr "Your score has made the top ten."
 msgid "Guide a worm around a maze"
 msgstr "Guide a worm around a maze"
 
-#: ../gnibbles/gnibbles.desktop.in.in.h:2 ../gnibbles/main.c:244
-#: ../gnibbles/main.c:248 ../gnibbles/main.c:250 ../gnibbles/main.c:872
-#: ../gnibbles/main.c:990 ../gnibbles/main.c:1053
+#: ../gnibbles/gnibbles.desktop.in.in.h:2 ../gnibbles/main.c:243
+#: ../gnibbles/main.c:247 ../gnibbles/main.c:249 ../gnibbles/main.c:871
+#: ../gnibbles/main.c:990 ../gnibbles/main.c:1054
 msgid "Nibbles"
 msgstr "Nibbles"
 
@@ -5735,7 +6240,7 @@ msgid "Key to use for motion up."
 msgstr "Key to use for motion up."
 
 #: ../gnibbles/gnibbles.schemas.in.h:15 ../gnibbles/preferences.c:449
-#: ../gnometris/gnometris.schemas.in.h:12 ../gnometris/tetris.cpp:779
+#: ../gnometris/gnometris.schemas.in.h:12 ../gnometris/tetris.cpp:744
 msgid "Move down"
 msgstr "Move down"
 
@@ -5783,47 +6288,47 @@ msgstr "Use relative movement"
 msgid "Use relative movement (ie. left or right only)."
 msgstr "Use relative movement (ie. left or right only)."
 
-#: ../gnibbles/main.c:67
+#: ../gnibbles/main.c:66
 msgctxt "game speed"
 msgid "Beginner"
 msgstr "Beginner"
 
-#: ../gnibbles/main.c:68
+#: ../gnibbles/main.c:67
 msgctxt "game speed"
 msgid "Slow"
 msgstr "Slow"
 
-#: ../gnibbles/main.c:69
+#: ../gnibbles/main.c:68
 msgctxt "game speed"
 msgid "Medium"
 msgstr "Medium"
 
-#: ../gnibbles/main.c:70
+#: ../gnibbles/main.c:69
 msgctxt "game speed"
 msgid "Fast"
 msgstr "Fast"
 
-#: ../gnibbles/main.c:71
+#: ../gnibbles/main.c:70
 msgctxt "game speed"
 msgid "Beginner with Fakes"
 msgstr "Beginner with Fakes"
 
-#: ../gnibbles/main.c:72
+#: ../gnibbles/main.c:71
 msgctxt "game speed"
 msgid "Slow with Fakes"
 msgstr "Slow with Fakes"
 
-#: ../gnibbles/main.c:73
+#: ../gnibbles/main.c:72
 msgctxt "game speed"
 msgid "Medium with Fakes"
 msgstr "Medium with Fakes"
 
-#: ../gnibbles/main.c:74
+#: ../gnibbles/main.c:73
 msgctxt "game speed"
 msgid "Fast with Fakes"
 msgstr "Fast with Fakes"
 
-#: ../gnibbles/main.c:256
+#: ../gnibbles/main.c:255
 msgid ""
 "A worm game for GNOME.\n"
 "\n"
@@ -5833,7 +6338,7 @@ msgstr ""
 "\n"
 "Nibbles is a part of GNOME Games."
 
-#: ../gnibbles/main.c:643
+#: ../gnibbles/main.c:642
 #, c-format
 msgid "Game over! The game has been won by %s!"
 msgstr "Game over! The game has been won by %s!"
@@ -5876,7 +6381,7 @@ msgid "_Enable fake bonuses"
 msgstr "_Enable fake bonuses"
 
 #. starting level
-#: ../gnibbles/preferences.c:350 ../gnometris/tetris.cpp:679
+#: ../gnibbles/preferences.c:350 ../gnometris/tetris.cpp:641
 msgid "_Starting level:"
 msgstr "_Starting level:"
 
@@ -5925,13 +6430,13 @@ msgstr "Worm %d:"
 msgid "Game over!"
 msgstr "Game over!"
 
-#: ../gnobots2/game.c:155 ../gnomine/gnomine.c:199 ../gnotski/gnotski.c:815
+#: ../gnobots2/game.c:155 ../gnomine/gnomine.c:200 ../gnotski/gnotski.c:817
 msgid "Great work, but unfortunately your score did not make the top ten."
 msgstr "Great work, but unfortunately your score did not make the top ten."
 
 #. Translators: This "_New Game" is for the game-over dialogue
-#: ../gnobots2/game.c:157 ../gnomine/gnomine.c:201 ../gnotski/gnotski.c:817
-#: ../libgames-support/games-stock.c:321 ../same-gnome/ui.c:176
+#: ../gnobots2/game.c:157 ../gnomine/gnomine.c:202 ../gnotski/gnotski.c:819
+#: ../libgames-support/games-stock.c:324 ../same-gnome/ui.c:176
 msgid "_New Game"
 msgstr "_New Game"
 
@@ -5953,95 +6458,95 @@ msgstr ""
 "But Can You do it Again?"
 
 #. This should never happen.
-#: ../gnobots2/game.c:1252
+#: ../gnobots2/game.c:1248
 msgid "There are no teleport locations left!!"
 msgstr "There are no teleport locations left!!"
 
-#: ../gnobots2/game.c:1280
+#: ../gnobots2/game.c:1276
 msgid "There are no safe locations to teleport to!!"
 msgstr "There are no safe locations to teleport to!!"
 
-#: ../gnobots2/gnobots.c:86
+#: ../gnobots2/gnobots.c:85
 msgid "Set game scenario"
 msgstr "Set game scenario"
 
-#: ../gnobots2/gnobots.c:88
+#: ../gnobots2/gnobots.c:87
 msgid "Set game configuration"
 msgstr "Set game configuration"
 
-#: ../gnobots2/gnobots.c:90 ../gnobots2/gnobots.c:92
+#: ../gnobots2/gnobots.c:89 ../gnobots2/gnobots.c:91
 msgid "Initial window position"
 msgstr "Initial window position"
 
-#: ../gnobots2/gnobots.c:90 ../gnomine/gnomine.c:957 ../gnomine/gnomine.c:965
+#: ../gnobots2/gnobots.c:89 ../gnomine/gnomine.c:999 ../gnomine/gnomine.c:1007
 #: ../gnotravex/gnotravex.c:399 ../gnotski/gnotski.c:467
-#: ../iagno/gnothello.c:147
+#: ../iagno/gnothello.c:146
 msgid "X"
 msgstr "X"
 
-#: ../gnobots2/gnobots.c:92 ../gnomine/gnomine.c:959 ../gnomine/gnomine.c:967
-#: ../gnotravex/gnotravex.c:401 ../gnotski/gnotski.c:469
-#: ../iagno/gnothello.c:149
+#: ../gnobots2/gnobots.c:91 ../gnomine/gnomine.c:1001
+#: ../gnomine/gnomine.c:1009 ../gnotravex/gnotravex.c:401
+#: ../gnotski/gnotski.c:469 ../iagno/gnothello.c:148
 msgid "Y"
 msgstr "Y"
 
-#: ../gnobots2/gnobots.c:97
+#: ../gnobots2/gnobots.c:96
 msgid "Classic robots"
 msgstr "Classic robots"
 
-#: ../gnobots2/gnobots.c:98
+#: ../gnobots2/gnobots.c:97
 msgid "Classic robots with safe moves"
 msgstr "Classic robots with safe moves"
 
-#: ../gnobots2/gnobots.c:99
+#: ../gnobots2/gnobots.c:98
 msgid "Classic robots with super-safe moves"
 msgstr "Classic robots with super-safe moves"
 
-#: ../gnobots2/gnobots.c:100
+#: ../gnobots2/gnobots.c:99
 msgid "Nightmare"
 msgstr "Nightmare"
 
-#: ../gnobots2/gnobots.c:101
+#: ../gnobots2/gnobots.c:100
 msgid "Nightmare with safe moves"
 msgstr "Nightmare with safe moves"
 
-#: ../gnobots2/gnobots.c:102
+#: ../gnobots2/gnobots.c:101
 msgid "Nightmare with super-safe moves"
 msgstr "Nightmare with super-safe moves"
 
-#: ../gnobots2/gnobots.c:103
+#: ../gnobots2/gnobots.c:102
 msgid "Robots2"
 msgstr "Robots2"
 
-#: ../gnobots2/gnobots.c:104
+#: ../gnobots2/gnobots.c:103
 msgid "Robots2 with safe moves"
 msgstr "Robots2 with safe moves"
 
-#: ../gnobots2/gnobots.c:105
+#: ../gnobots2/gnobots.c:104
 msgid "Robots2 with super-safe moves"
 msgstr "Robots2 with super-safe moves"
 
-#: ../gnobots2/gnobots.c:106
+#: ../gnobots2/gnobots.c:105
 msgid "Robots2 easy"
 msgstr "Robots2 easy"
 
-#: ../gnobots2/gnobots.c:107
+#: ../gnobots2/gnobots.c:106
 msgid "Robots2 easy with safe moves"
 msgstr "Robots2 easy with safe moves"
 
-#: ../gnobots2/gnobots.c:108
+#: ../gnobots2/gnobots.c:107
 msgid "Robots2 easy with super-safe moves"
 msgstr "Robots2 easy with super-safe moves"
 
-#: ../gnobots2/gnobots.c:109
+#: ../gnobots2/gnobots.c:108
 msgid "Robots with safe teleport"
 msgstr "Robots with safe teleport"
 
-#: ../gnobots2/gnobots.c:110
+#: ../gnobots2/gnobots.c:109
 msgid "Robots with safe teleport with safe moves"
 msgstr "Robots with safe teleport with safe moves"
 
-#: ../gnobots2/gnobots.c:111
+#: ../gnobots2/gnobots.c:110
 msgid "Robots with safe teleport with super-safe moves"
 msgstr "Robots with safe teleport with super-safe moves"
 
@@ -6063,11 +6568,11 @@ msgstr ""
 "The program Robots was unable to find any valid game configuration files. "
 "Please check that the program is installed correctly."
 
-#: ../gnobots2/gnobots.c:343
+#: ../gnobots2/gnobots.c:340
 msgid "Some graphics files are missing or corrupt."
 msgstr "Some graphics files are missing or corrupt."
 
-#: ../gnobots2/gnobots.c:345
+#: ../gnobots2/gnobots.c:342
 msgid ""
 "The program Robots was unable to load all the necessary graphics files. "
 "Please check that the program is installed correctly."
@@ -6090,94 +6595,86 @@ msgstr ""
 "Enable game sounds. Play sounds for various events throughout the game."
 
 #: ../gnobots2/gnobots2.schemas.in.h:5
-msgid "Enable splats"
-msgstr "Enable splats"
-
-#: ../gnobots2/gnobots2.schemas.in.h:6
-msgid "Enable splats. Play a sound and show a \"Splat!\" on the screen."
-msgstr "Enable splats. Play a sound and show a \"Splat!\" on the screen."
-
-#: ../gnobots2/gnobots2.schemas.in.h:7
 msgid "Game type"
 msgstr "Game type"
 
-#: ../gnobots2/gnobots2.schemas.in.h:8
+#: ../gnobots2/gnobots2.schemas.in.h:6
 msgid "Game type. The name of the game variation to use."
 msgstr "Game type. The name of the game variation to use."
 
-#: ../gnobots2/gnobots2.schemas.in.h:9 ../gnobots2/properties.c:580
+#: ../gnobots2/gnobots2.schemas.in.h:7 ../gnobots2/properties.c:552
 msgid "Key to hold"
 msgstr "Key to hold"
 
-#: ../gnobots2/gnobots2.schemas.in.h:10 ../gnobots2/properties.c:576
+#: ../gnobots2/gnobots2.schemas.in.h:8 ../gnobots2/properties.c:548
 msgid "Key to move E"
 msgstr "Key to move E"
 
-#: ../gnobots2/gnobots2.schemas.in.h:11 ../gnobots2/properties.c:573
+#: ../gnobots2/gnobots2.schemas.in.h:9 ../gnobots2/properties.c:545
 msgid "Key to move N"
 msgstr "Key to move N"
 
-#: ../gnobots2/gnobots2.schemas.in.h:12 ../gnobots2/properties.c:574
+#: ../gnobots2/gnobots2.schemas.in.h:10 ../gnobots2/properties.c:546
 msgid "Key to move NE"
 msgstr "Key to move NE"
 
-#: ../gnobots2/gnobots2.schemas.in.h:13 ../gnobots2/properties.c:572
+#: ../gnobots2/gnobots2.schemas.in.h:11 ../gnobots2/properties.c:544
 msgid "Key to move NW"
 msgstr "Key to move NW"
 
-#: ../gnobots2/gnobots2.schemas.in.h:14 ../gnobots2/properties.c:578
+#: ../gnobots2/gnobots2.schemas.in.h:12 ../gnobots2/properties.c:550
 msgid "Key to move S"
 msgstr "Key to move S"
 
-#: ../gnobots2/gnobots2.schemas.in.h:15 ../gnobots2/properties.c:579
+#: ../gnobots2/gnobots2.schemas.in.h:13 ../gnobots2/properties.c:551
 msgid "Key to move SE"
 msgstr "Key to move SE"
 
-#: ../gnobots2/gnobots2.schemas.in.h:16 ../gnobots2/properties.c:577
+#: ../gnobots2/gnobots2.schemas.in.h:14 ../gnobots2/properties.c:549
 msgid "Key to move SW"
 msgstr "Key to move SW"
 
-#: ../gnobots2/gnobots2.schemas.in.h:17 ../gnobots2/properties.c:575
+#: ../gnobots2/gnobots2.schemas.in.h:15 ../gnobots2/properties.c:547
 msgid "Key to move W"
 msgstr "Key to move W"
 
-#: ../gnobots2/gnobots2.schemas.in.h:18 ../gnobots2/properties.c:581
+#: ../gnobots2/gnobots2.schemas.in.h:16 ../gnobots2/properties.c:553
 msgid "Key to teleport"
 msgstr "Key to teleport"
 
-#: ../gnobots2/gnobots2.schemas.in.h:19 ../gnobots2/properties.c:582
+#: ../gnobots2/gnobots2.schemas.in.h:17 ../gnobots2/properties.c:554
 msgid "Key to teleport randomly"
 msgstr "Key to teleport randomly"
 
-#: ../gnobots2/gnobots2.schemas.in.h:20 ../gnobots2/properties.c:583
+#: ../gnobots2/gnobots2.schemas.in.h:18 ../gnobots2/properties.c:555
 msgid "Key to wait"
 msgstr "Key to wait"
 
-#: ../gnobots2/gnobots2.schemas.in.h:21
+#: ../gnobots2/gnobots2.schemas.in.h:19
 msgid "Robot image theme"
 msgstr "Robot image theme"
 
-#: ../gnobots2/gnobots2.schemas.in.h:22
+#: ../gnobots2/gnobots2.schemas.in.h:20
 msgid "Robot image theme. The theme of the images to use for the robots."
 msgstr "Robot image theme. The theme of the images to use for the robots."
 
-#: ../gnobots2/gnobots2.schemas.in.h:24
+#: ../gnobots2/gnobots2.schemas.in.h:22
 msgid "Show toolbar. A standard option for toolbars."
 msgstr "Show toolbar. A standard option for toolbars."
 
-#: ../gnobots2/gnobots2.schemas.in.h:25
+#: ../gnobots2/gnobots2.schemas.in.h:23
 msgid ""
 "The name of the key used to hold still. The name is a standard X key name."
 msgstr ""
 "The name of the key used to hold still. The name is a standard X key name."
 
-#: ../gnobots2/gnobots2.schemas.in.h:26
+#: ../gnobots2/gnobots2.schemas.in.h:24
 msgid ""
 "The name of the key used to move east. The name is a standard X key name."
 msgstr ""
 "The name of the key used to move east. The name is a standard X key name."
 
-#: ../gnobots2/gnobots2.schemas.in.h:27
+#: ../gnobots2/gnobots2.schemas.in.h:25
 msgid ""
 "The name of the key used to move north-east. The name is a standard X key "
 "name."
@@ -6185,7 +6682,7 @@ msgstr ""
 "The name of the key used to move north-east. The name is a standard X key "
 "name."
 
-#: ../gnobots2/gnobots2.schemas.in.h:28
+#: ../gnobots2/gnobots2.schemas.in.h:26
 msgid ""
 "The name of the key used to move north-west. The name is a standard X key "
 "name."
@@ -6193,13 +6690,13 @@ msgstr ""
 "The name of the key used to move north-west. The name is a standard X key "
 "name."
 
-#: ../gnobots2/gnobots2.schemas.in.h:29
+#: ../gnobots2/gnobots2.schemas.in.h:27
 msgid ""
 "The name of the key used to move north. The name is a standard X key name."
 msgstr ""
 "The name of the key used to move north. The name is a standard X key name."
 
-#: ../gnobots2/gnobots2.schemas.in.h:30
+#: ../gnobots2/gnobots2.schemas.in.h:28
 msgid ""
 "The name of the key used to move south-east. The name is a standard X key "
 "name."
@@ -6207,7 +6704,7 @@ msgstr ""
 "The name of the key used to move south-east. The name is a standard X key "
 "name."
 
-#: ../gnobots2/gnobots2.schemas.in.h:31
+#: ../gnobots2/gnobots2.schemas.in.h:29
 msgid ""
 "The name of the key used to move south-west. The name is a standard X key "
 "name."
@@ -6215,19 +6712,19 @@ msgstr ""
 "The name of the key used to move south-west. The name is a standard X key "
 "name."
 
-#: ../gnobots2/gnobots2.schemas.in.h:32
+#: ../gnobots2/gnobots2.schemas.in.h:30
 msgid ""
 "The name of the key used to move south. The name is a standard X key name."
 msgstr ""
 "The name of the key used to move south. The name is a standard X key name."
 
-#: ../gnobots2/gnobots2.schemas.in.h:33
+#: ../gnobots2/gnobots2.schemas.in.h:31
 msgid ""
 "The name of the key used to move west. The name is a standard X key name."
 msgstr ""
 "The name of the key used to move west. The name is a standard X key name."
 
-#: ../gnobots2/gnobots2.schemas.in.h:34
+#: ../gnobots2/gnobots2.schemas.in.h:32
 msgid ""
 "The name of the key used to teleport randomly. The name is a standard X key "
 "name."
@@ -6235,7 +6732,7 @@ msgstr ""
 "The name of the key used to teleport randomly. The name is a standard X key "
 "name."
 
-#: ../gnobots2/gnobots2.schemas.in.h:35
+#: ../gnobots2/gnobots2.schemas.in.h:33
 msgid ""
 "The name of the key used to teleport safely (if possible). The name is a "
 "standard X key name."
@@ -6243,15 +6740,15 @@ msgstr ""
 "The name of the key used to teleport safely (if possible). The name is a "
 "standard X key name."
 
-#: ../gnobots2/gnobots2.schemas.in.h:36
+#: ../gnobots2/gnobots2.schemas.in.h:34
 msgid "The name of the key used to wait. The name is a standard X key name."
 msgstr "The name of the key used to wait. The name is a standard X key name."
 
-#: ../gnobots2/gnobots2.schemas.in.h:37
+#: ../gnobots2/gnobots2.schemas.in.h:35
 msgid "Use safe moves"
 msgstr "Use safe moves"
 
-#: ../gnobots2/gnobots2.schemas.in.h:38
+#: ../gnobots2/gnobots2.schemas.in.h:36
 msgid ""
 "Use safe moves. The safe moves option will help you to avoid being killed "
 "due to a mistake. If you try to make a move that would lead to your death "
@@ -6261,11 +6758,11 @@ msgstr ""
 "due to a mistake. If you try to make a move that would lead to your death "
 "when there is a safe move available you will not be allowed to proceed."
 
-#: ../gnobots2/gnobots2.schemas.in.h:39
+#: ../gnobots2/gnobots2.schemas.in.h:37
 msgid "Use super safe moves"
 msgstr "Use super safe moves"
 
-#: ../gnobots2/gnobots2.schemas.in.h:40
+#: ../gnobots2/gnobots2.schemas.in.h:38
 msgid ""
 "Use super safe moves. The player is alerted when there is no safe move and "
 "the only option is to teleport out."
@@ -6273,7 +6770,7 @@ msgstr ""
 "Use super safe moves. The player is alerted when there is no safe move and "
 "the only option is to teleport out."
 
-#: ../gnobots2/graphics.c:155 ../iagno/gnothello.c:416
+#: ../gnobots2/graphics.c:155 ../iagno/gnothello.c:415
 #, c-format
 msgid "Could not find '%s' pixmap file\n"
 msgstr "Could not find '%s' pixmap file\n"
@@ -6316,112 +6813,104 @@ msgstr ""
 "\n"
 "Robots is a part of GNOME Games."
 
-#: ../gnobots2/properties.c:335
+#: ../gnobots2/properties.c:316
 msgid "classic robots"
 msgstr "classic robots"
 
-#: ../gnobots2/properties.c:336
+#: ../gnobots2/properties.c:317
 msgid "robots2"
 msgstr "robots2"
 
-#: ../gnobots2/properties.c:337
+#: ../gnobots2/properties.c:318
 msgid "robots2 easy"
 msgstr "robots2 easy"
 
-#: ../gnobots2/properties.c:338
+#: ../gnobots2/properties.c:319
 msgid "robots with safe teleport"
 msgstr "robots with safe teleport"
 
-#: ../gnobots2/properties.c:339
+#: ../gnobots2/properties.c:320
 msgid "nightmare"
 msgstr "nightmare"
 
-#: ../gnobots2/properties.c:378
+#: ../gnobots2/properties.c:359
 msgid "robots"
 msgstr "robots"
 
-#: ../gnobots2/properties.c:379
+#: ../gnobots2/properties.c:360
 msgid "cows"
 msgstr "cows"
 
-#: ../gnobots2/properties.c:380
+#: ../gnobots2/properties.c:361
 msgid "eggs"
 msgstr "eggs"
 
-#: ../gnobots2/properties.c:381
+#: ../gnobots2/properties.c:362
 msgid "gnomes"
 msgstr "gnomes"
 
-#: ../gnobots2/properties.c:382
+#: ../gnobots2/properties.c:363
 msgid "mice"
 msgstr "mice"
 
-#: ../gnobots2/properties.c:383
+#: ../gnobots2/properties.c:364
 msgid "ufo"
 msgstr "ufo"
 
-#: ../gnobots2/properties.c:384
+#: ../gnobots2/properties.c:365
 msgid "boo"
 msgstr "boo"
 
-#: ../gnobots2/properties.c:438
+#: ../gnobots2/properties.c:419
 msgid "Robots Preferences"
 msgstr "Robots Preferences"
 
 #. --- Combo (yahtzee or kismet style ----
-#: ../gnobots2/properties.c:459 ../gtali/setup.c:361
+#: ../gnobots2/properties.c:440 ../gtali/setup.c:361
 msgid "Game Type"
 msgstr "Game Type"
 
-#: ../gnobots2/properties.c:484
+#: ../gnobots2/properties.c:460
 msgid "_Use safe moves"
 msgstr "_Use safe moves"
 
-#: ../gnobots2/properties.c:491
+#: ../gnobots2/properties.c:467
 msgid "Prevent accidental moves that result in getting killed."
 msgstr "Prevent accidental moves that result in getting killed."
 
-#: ../gnobots2/properties.c:493
+#: ../gnobots2/properties.c:469
 msgid "U_se super safe moves"
 msgstr "U_se super safe moves"
 
-#: ../gnobots2/properties.c:500
+#: ../gnobots2/properties.c:476
 msgid "Prevents all moves that result in getting killed."
 msgstr "Prevents all moves that result in getting killed."
 
-#: ../gnobots2/properties.c:502 ../gnometris/tetris.cpp:705
+#: ../gnobots2/properties.c:483 ../gnometris/tetris.cpp:667
 msgid "_Enable sounds"
 msgstr "_Enable sounds"
 
-#: ../gnobots2/properties.c:508
+#: ../gnobots2/properties.c:489
 msgid "Play sounds for events like winning a level and dying."
 msgstr "Play sounds for events like winning a level and dying."
 
-#: ../gnobots2/properties.c:510
-msgid "E_nable splats"
-msgstr "E_nable splats"
-
-#: ../gnobots2/properties.c:517
-msgid "Play the most common, and potentially the most annoying, sound."
-msgstr "Play the most common, and potentially the most annoying, sound."
-
-#: ../gnobots2/properties.c:527
+#: ../gnobots2/properties.c:499
 msgid "Graphics Theme"
 msgstr "Graphics Theme"
 
-#: ../gnobots2/properties.c:535
+#: ../gnobots2/properties.c:507
 msgid "_Image theme:"
 msgstr "_Image theme:"
 
-#: ../gnobots2/properties.c:546 ../mahjongg/mahjongg.c:775
+#: ../gnobots2/properties.c:518 ../mahjongg/mahjongg.c:775
 msgid "_Background color:"
 msgstr "_Background colour:"
 
-#: ../gnobots2/properties.c:592
+#: ../gnobots2/properties.c:564
 msgid "_Restore Defaults"
 msgstr "_Restore Defaults"
 
-#: ../gnobots2/properties.c:597
+#: ../gnobots2/properties.c:569
 msgid "Keyboard"
 msgstr "Keyboard"
 
@@ -6437,23 +6926,18 @@ msgstr "Level:"
 msgid "Remaining:"
 msgstr "Remaining:"
 
-#: ../gnometris/blockops.cpp:243
-#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:186
-#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:225
-msgid "Paused"
-msgstr "Paused"
-
+#. ********************************************************************
 #: ../gnometris/gnometris.desktop.in.in.h:1
 msgid "Fit falling blocks together"
 msgstr "Fit falling blocks together"
 
-#: ../gnometris/gnometris.desktop.in.in.h:2 ../gnometris/main.cpp:71
-#: ../gnometris/tetris.cpp:173 ../gnometris/tetris.cpp:1375
-#: ../gnometris/tetris.cpp:1379 ../gnometris/tetris.cpp:1381
+#: ../gnometris/gnometris.desktop.in.in.h:2 ../gnometris/main.cpp:66
+#: ../gnometris/tetris.cpp:160 ../gnometris/tetris.cpp:1298
+#: ../gnometris/tetris.cpp:1302 ../gnometris/tetris.cpp:1304
 msgid "Gnometris"
 msgstr "Gnometris"
 
-#: ../gnometris/gnometris.schemas.in.h:1 ../gnometris/tetris.cpp:780
+#: ../gnometris/gnometris.schemas.in.h:1 ../gnometris/tetris.cpp:745
 msgid "Drop"
 msgstr "Drop"
 
@@ -6489,11 +6973,11 @@ msgstr "Level to start with"
 msgid "Level to start with."
 msgstr "Level to start with."
 
-#: ../gnometris/gnometris.schemas.in.h:15 ../gnometris/tetris.cpp:782
+#: ../gnometris/gnometris.schemas.in.h:15 ../gnometris/tetris.cpp:747
 msgid "Pause"
 msgstr "Pause"
 
-#: ../gnometris/gnometris.schemas.in.h:16 ../gnometris/tetris.cpp:781
+#: ../gnometris/gnometris.schemas.in.h:16 ../gnometris/tetris.cpp:746
 msgid "Rotate"
 msgstr "Rotate"
 
@@ -6583,27 +7067,23 @@ msgstr "Whether to rotate counter clock wise."
 msgid "Whether to use the background image"
 msgstr "Whether to use the background image"
 
-#: ../gnometris/main.cpp:50
+#: ../gnometris/main.cpp:48
 msgid "Set starting level (1 or greater)"
 msgstr "Set starting level (1 or greater)"
 
-#: ../gnometris/main.cpp:50
+#: ../gnometris/main.cpp:48
 msgid "LEVEL"
 msgstr "LEVEL"
 
-#: ../gnometris/renderer.cpp:31
+#: ../gnometris/renderer.cpp:30
 msgid "Plain"
 msgstr "Plain"
 
-#: ../gnometris/renderer.cpp:32
-msgid "Joined"
-msgstr "Joined"
-
-#: ../gnometris/renderer.cpp:33
+#: ../gnometris/renderer.cpp:31
 msgid "Tango Flat"
 msgstr "Tango Flat"
 
-#: ../gnometris/renderer.cpp:34
+#: ../gnometris/renderer.cpp:32
 msgid "Tango Shaded"
 msgstr "Tango Shaded"
 
@@ -6611,58 +7091,62 @@ msgstr "Tango Shaded"
 msgid "Lines:"
 msgstr "Lines:"
 
-#: ../gnometris/tetris.cpp:611
+#: ../gnometris/tetris.cpp:573
 msgid "Gnometris Preferences"
 msgstr "Gnometris Preferences"
 
-#: ../gnometris/tetris.cpp:635
+#: ../gnometris/tetris.cpp:597 ../same-gnome-clutter/data/settings.ui.h:6
 msgid "Setup"
 msgstr "Setup"
 
 #. pre-filled rows
-#: ../gnometris/tetris.cpp:641
+#: ../gnometris/tetris.cpp:603
 msgid "_Number of pre-filled rows:"
 msgstr "_Number of pre-filled rows:"
 
 #. pre-filled rows density
-#: ../gnometris/tetris.cpp:660
+#: ../gnometris/tetris.cpp:622
 msgid "_Density of blocks in a pre-filled row:"
 msgstr "_Density of blocks in a pre-filled row:"
 
-#: ../gnometris/tetris.cpp:700
+#: ../gnometris/tetris.cpp:662 ../same-gnome-clutter/data/settings.ui.h:4
 msgid "Operation"
 msgstr "Operation"
 
-#: ../gnometris/tetris.cpp:714
+#: ../gnometris/tetris.cpp:676
 msgid "_Preview next block"
 msgstr "_Preview next block"
 
-#: ../gnometris/tetris.cpp:723
+#: ../gnometris/tetris.cpp:685
 msgid "_Use random block colors"
 msgstr "_Use random block colours"
 
-#: ../gnometris/tetris.cpp:734
+#: ../gnometris/tetris.cpp:696
+msgid "_Bastard mode"
+msgstr "_Bastard mode"
+
+#: ../gnometris/tetris.cpp:705
 msgid "_Rotate blocks counterclockwise"
 msgstr "_Rotate blocks anti-clockwise"
 
-#: ../gnometris/tetris.cpp:743
+#: ../gnometris/tetris.cpp:714
 msgid "Show _where the block will land"
 msgstr "Show _where the block will land"
 
-#: ../gnometris/tetris.cpp:757 ../gnometris/tetris.cpp:790
+#: ../gnometris/tetris.cpp:722 ../gnometris/tetris.cpp:755
 #: ../same-gnome/ui.c:324
 msgid "Theme"
 msgstr "Theme"
 
-#: ../gnometris/tetris.cpp:766
+#: ../gnometris/tetris.cpp:731
 msgid "Controls"
 msgstr "Controls"
 
-#: ../gnometris/tetris.cpp:793
+#: ../gnometris/tetris.cpp:758
 msgid "Block Style"
 msgstr "Block Style"
 
-#: ../gnometris/tetris.cpp:1384
+#: ../gnometris/tetris.cpp:1307
 msgid ""
 "A classic game of fitting falling blocks together.\n"
 "\n"
@@ -6676,8 +7160,14 @@ msgstr ""
 msgid "Gnometris Scores"
 msgstr "Gnometris Scores"
 
+#: ../gnometris/blockops.cpp:786
+#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:173
+#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
+msgid "Paused"
+msgstr "Paused"
+
 #: ../gnome-sudoku/gnome-sudoku.desktop.in.in.h:1
-#: ../gnome-sudoku/src/lib/defaults.py.in:41
+#: ../gnome-sudoku/src/lib/defaults.py.in:38
 msgid "Sudoku"
 msgstr "Sudoku"
 
@@ -6685,131 +7175,175 @@ msgstr "Sudoku"
 msgid "Test your logic skills in this number grid puzzle"
 msgstr "Test your logic skills in this number grid puzzle"
 
-#: ../gnome-sudoku/glade/print_games.glade.h:1
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:1
+msgid "Color of the grid border"
+msgstr "Colour of the grid border"
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:2
+msgid "Generate new puzzles in the background"
+msgstr "Generate new puzzles in the background"
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:3
+msgid "Height of application window in pixels"
+msgstr "Height of application window in pixels"
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:4
+msgid "Mark printed games as played"
+msgstr "Mark printed games as played"
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:5
+msgid "Number of puzzles to print on a page"
+msgstr "Number of puzzles to print on a page"
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:6
+msgid "Print games that have been played"
+msgstr "Print games that have been played"
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:7
+msgid "Show hint highlights"
+msgstr "Show hint highlights"
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:8
+msgid "Show hints"
+msgstr "Show hints"
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:9
+msgid "Show the application toolbar"
+msgstr "Show the application toolbar"
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:10
+msgid "The number of seconds between automatic saves"
+msgstr "The number of seconds between automatic saves"
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:11
+msgid "Width of application window in pixels"
+msgstr "Width of application window in pixels"
+
+#: ../gnome-sudoku/data/print_games.ui.h:1
 msgid "<b><i>Details</i></b>"
 msgstr "<b><i>Details</i></b>"
 
-#: ../gnome-sudoku/glade/print_games.glade.h:2
+#: ../gnome-sudoku/data/print_games.ui.h:2
 msgid "<b><i>Levels of difficulty to print</i></b>"
 msgstr "<b><i>Levels of difficulty to print</i></b>"
 
-#: ../gnome-sudoku/glade/print_games.glade.h:3
+#: ../gnome-sudoku/data/print_games.ui.h:3
 msgid "<span size=\"larger\" weight=\"bold\">Print Games</span>"
 msgstr "<span size=\"larger\" weight=\"bold\">Print Games</span>"
 
-#: ../gnome-sudoku/glade/print_games.glade.h:4
+#: ../gnome-sudoku/data/print_games.ui.h:4
 msgid "Print Sudokus"
 msgstr "Print Sudokus"
 
-#: ../gnome-sudoku/glade/print_games.glade.h:5
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:13
+#: ../gnome-sudoku/data/print_games.ui.h:5
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:13
 msgid "_Easy"
 msgstr "_Easy"
 
-#: ../gnome-sudoku/glade/print_games.glade.h:6
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:15
+#: ../gnome-sudoku/data/print_games.ui.h:6
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:15
 msgid "_Hard"
 msgstr "_Hard"
 
-#: ../gnome-sudoku/glade/print_games.glade.h:7
+#: ../gnome-sudoku/data/print_games.ui.h:7
 msgid "_Include games you've already played in list of games to print"
 msgstr "_Include games you've already played in list of games to print"
 
-#: ../gnome-sudoku/glade/print_games.glade.h:8
+#: ../gnome-sudoku/data/print_games.ui.h:8
 msgid "_Mark games as played once you've printed them."
 msgstr "_Mark games as played once you've printed them."
 
-#: ../gnome-sudoku/glade/print_games.glade.h:9
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:16 ../same-gnome/ui.c:479
+#: ../gnome-sudoku/data/print_games.ui.h:9
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:16 ../same-gnome/ui.c:479
 msgid "_Medium"
 msgstr "_Medium"
 
-#: ../gnome-sudoku/glade/print_games.glade.h:10
+#: ../gnome-sudoku/data/print_games.ui.h:10
 msgid "_Number of sudoku to print: "
 msgstr "_Number of sudoku to print: "
 
-#: ../gnome-sudoku/glade/print_games.glade.h:11
+#: ../gnome-sudoku/data/print_games.ui.h:11
 msgid "_Sudokus per page: "
 msgstr "_Sudokus per page: "
 
-#: ../gnome-sudoku/glade/print_games.glade.h:12
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:17
+#: ../gnome-sudoku/data/print_games.ui.h:12
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:17
 msgid "_Very Hard"
 msgstr "_Very Hard"
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:1
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:1
 msgid "<i><u>Number of Puzzles</u></i>"
 msgstr "<i><u>Number of Puzzles</u></i>"
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:2
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:2
 msgid "<i>Easy:</i>"
 msgstr "<i>Easy:</i>"
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:3
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:3
 msgid "<i>Hard:</i>"
 msgstr "<i>Hard:</i>"
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:4
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:4
 msgid "<i>Medium:</i>"
 msgstr "<i>Medium:</i>"
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:5
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:5
 msgid "<i>Very Hard:</i>"
 msgstr "<i>Very Hard:</i>"
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:6
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:6
 msgid "<span size=\"larger\" weight=\"bold\">Puzzle Generator</span>"
 msgstr "<span size=\"larger\" weight=\"bold\">Puzzle Generator</span>"
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:7
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:7
 msgid "Criteria:"
 msgstr "Criteria:"
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:8
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:8
 msgid "Generate Policy"
 msgstr "Generate Policy"
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:9
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:9
 msgid "Generate new puzzles _until stopped"
 msgstr "Generate new puzzles _until stopped"
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:10
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:10
 msgid "Generate until _reaching target"
 msgstr "Generate until _reaching target"
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:11
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:11
 msgid "Puzzle Generator"
 msgstr "Puzzle Generator"
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:12
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:12
 msgid "Target _number of sudokus:"
 msgstr "Target _number of sudokus:"
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:14
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:14
 msgid "_Generate"
 msgstr "_Generate"
 
-#: ../gnome-sudoku/glade/select_game.glade.h:1
+#: ../gnome-sudoku/data/select_game.ui.h:1
 msgid "<b><span size=\"large\">_New Game</span></b>"
 msgstr "<b><span size=\"large\">_New Game</span></b>"
 
-#: ../gnome-sudoku/glade/select_game.glade.h:2
+#: ../gnome-sudoku/data/select_game.ui.h:2
 msgid "<b><span size=\"large\">_Saved Games</span></b>"
 msgstr "<b><span size=\"large\">_Saved Games</span></b>"
 
-#: ../gnome-sudoku/glade/tracker.glade.h:1
+#: ../gnome-sudoku/data/tracker.ui.h:1
 msgid "Clear _Others"
 msgstr "Clear _Others"
 
-#: ../gnome-sudoku/glade/tracker.glade.h:2
+#: ../gnome-sudoku/data/tracker.ui.h:2
 msgid "_Add Tracker"
 msgstr "_Add Tracker"
 
-#: ../gnome-sudoku/glade/tracker.glade.h:3 ../gnome-sudoku/src/lib/main.py:870
+#: ../gnome-sudoku/data/tracker.ui.h:3 ../gnome-sudoku/src/lib/main.py:784
 msgid "_Clear Tracker"
 msgstr "_Clear Tracker"
 
-#: ../gnome-sudoku/glade/tracker.glade.h:4
+#: ../gnome-sudoku/data/tracker.ui.h:4
 msgid "_Trackers"
 msgstr "_Trackers"
 
@@ -6827,11 +7361,11 @@ msgstr ""
 "installed. If you are currently upgrading your system please wait until the "
 "upgrade has completed."
 
-#: ../gnome-sudoku/src/lib/defaults.py.in:40
+#: ../gnome-sudoku/src/lib/defaults.py.in:37
 msgid "GNOME Sudoku"
 msgstr "GNOME Sudoku"
 
-#: ../gnome-sudoku/src/lib/defaults.py.in:43
+#: ../gnome-sudoku/src/lib/defaults.py.in:40
 msgid ""
 "GNOME Sudoku is a simple sudoku generator and player. Sudoku is a japanese "
 "logic puzzle.\n"
@@ -6843,152 +7377,151 @@ msgstr ""
 "\n"
 "GNOME Sudoku is a part of GNOME Games."
 
-#: ../gnome-sudoku/src/lib/saver.py:104
+#: ../gnome-sudoku/src/lib/saver.py:122
 msgid "No Space"
 msgstr "No Space"
 
-#: ../gnome-sudoku/src/lib/saver.py:105
+#: ../gnome-sudoku/src/lib/saver.py:123
 msgid "No space left on disk"
 msgstr "No space left on disk"
 
-#: ../gnome-sudoku/src/lib/saver.py:107
+#: ../gnome-sudoku/src/lib/saver.py:125 ../gnome-sudoku/src/lib/saver.py:132
 #, python-format
-msgid "Sudoku is unable to created data folder %(path)s."
-msgstr "Sudoku is unable to created data folder %(path)s."
+msgid "Unable to create data folder %(path)s."
+msgstr "Unable to create data folder %(path)s."
 
-#: ../gnome-sudoku/src/lib/saver.py:108
+#: ../gnome-sudoku/src/lib/saver.py:126
 msgid "There is no disk space left!"
 msgstr "There is no disk space left!"
 
-#: ../gnome-sudoku/src/lib/saver.py:114
-#, python-format
-msgid "Sudoku was unable to create data folder %(path)s."
-msgstr "Sudoku was unable to create data folder %(path)s."
-
-#: ../gnome-sudoku/src/lib/saver.py:115 ../gnome-sudoku/src/lib/saver.py:140
-#: ../gnome-sudoku/src/lib/saver.py:165 ../gnome-sudoku/src/lib/saver.py:183
+#: ../gnome-sudoku/src/lib/saver.py:133 ../gnome-sudoku/src/lib/saver.py:158
+#: ../gnome-sudoku/src/lib/saver.py:182 ../gnome-sudoku/src/lib/saver.py:200
 #, python-format
 msgid "Error %(errno)s: %(error)s"
 msgstr "Error %(errno)s: %(error)s"
 
-#: ../gnome-sudoku/src/lib/saver.py:135 ../gnome-sudoku/src/lib/saver.py:136
+#: ../gnome-sudoku/src/lib/saver.py:153 ../gnome-sudoku/src/lib/saver.py:154
 msgid "Sudoku unable to save game."
 msgstr "Sudoku unable to save game."
 
-#: ../gnome-sudoku/src/lib/saver.py:138 ../gnome-sudoku/src/lib/saver.py:164
-#: ../gnome-sudoku/src/lib/saver.py:182
+#: ../gnome-sudoku/src/lib/saver.py:156 ../gnome-sudoku/src/lib/saver.py:181
+#: ../gnome-sudoku/src/lib/saver.py:199
 #, python-format
 msgid "Unable to save file %(filename)s."
 msgstr "Unable to save file %(filename)s."
 
-#: ../gnome-sudoku/src/lib/saver.py:161 ../gnome-sudoku/src/lib/saver.py:162
-#: ../gnome-sudoku/src/lib/saver.py:179 ../gnome-sudoku/src/lib/saver.py:180
+#: ../gnome-sudoku/src/lib/saver.py:178 ../gnome-sudoku/src/lib/saver.py:179
+#: ../gnome-sudoku/src/lib/saver.py:196 ../gnome-sudoku/src/lib/saver.py:197
 msgid "Sudoku unable to mark game as finished."
 msgstr "Sudoku unable to mark game as finished."
 
-#: ../gnome-sudoku/src/lib/main.py:35
+#: ../gnome-sudoku/src/lib/main.py:43
 msgid "Track moves"
 msgstr "Track moves"
 
-#: ../gnome-sudoku/src/lib/main.py:41
-msgid "Full Screen"
-msgstr "Full Screen"
-
-#: ../gnome-sudoku/src/lib/main.py:233
+#: ../gnome-sudoku/src/lib/main.py:243
 msgid "New game"
 msgstr "New game"
 
-#: ../gnome-sudoku/src/lib/main.py:235
+#: ../gnome-sudoku/src/lib/main.py:245
 msgid "Print current game"
 msgstr "Print current game"
 
-#: ../gnome-sudoku/src/lib/main.py:236
+#: ../gnome-sudoku/src/lib/main.py:246
 msgid "Print _Multiple Sudokus"
 msgstr "Print _Multiple Sudokus"
 
-#: ../gnome-sudoku/src/lib/main.py:237
+#: ../gnome-sudoku/src/lib/main.py:247
 msgid "Print more than one sudoku at a time."
 msgstr "Print more than one sudoku at a time."
 
-#: ../gnome-sudoku/src/lib/main.py:239
+#: ../gnome-sudoku/src/lib/main.py:249
 msgid "Close Sudoku"
 msgstr "Close Sudoku"
 
-#: ../gnome-sudoku/src/lib/main.py:240
+#: ../gnome-sudoku/src/lib/main.py:250
 msgid "_Tools"
 msgstr "_Tools"
 
-#: ../gnome-sudoku/src/lib/main.py:242 ../libgames-support/games-stock.c:317
+#: ../gnome-sudoku/src/lib/main.py:252 ../libgames-support/games-stock.c:320
 msgid "_Hint"
 msgstr "_Hint"
 
-#: ../gnome-sudoku/src/lib/main.py:244
+#: ../gnome-sudoku/src/lib/main.py:254
 msgid "Show which numbers could go in the current square."
 msgstr "Show which numbers could go in the current square."
 
-#: ../gnome-sudoku/src/lib/main.py:246
+#: ../gnome-sudoku/src/lib/main.py:256
 msgid "_Fill"
 msgstr "_Fill"
 
-#: ../gnome-sudoku/src/lib/main.py:247
+#: ../gnome-sudoku/src/lib/main.py:257
 msgid "Automatically fill in the current square if possible."
 msgstr "Automatically fill in the current square if possible."
 
-#: ../gnome-sudoku/src/lib/main.py:249
+#: ../gnome-sudoku/src/lib/main.py:259
 msgid "Fill _all squares"
 msgstr "Fill _all squares"
 
-#: ../gnome-sudoku/src/lib/main.py:250
+#: ../gnome-sudoku/src/lib/main.py:260
 msgid ""
 "Automatically fill in all squares for which there is only one valid value."
 msgstr ""
 "Automatically fill in all squares for which there is only one valid value."
 
-#: ../gnome-sudoku/src/lib/main.py:254
+#: ../gnome-sudoku/src/lib/main.py:264
+msgid "_Generate new puzzles"
+msgstr "_Generate new puzzles"
+
+#: ../gnome-sudoku/src/lib/main.py:264
+msgid "Generate new puzzles."
+msgstr "Generate new puzzles."
+
+#: ../gnome-sudoku/src/lib/main.py:266
 msgid "Puzzle _Statistics"
 msgstr "Puzzle _Statistics"
 
-#: ../gnome-sudoku/src/lib/main.py:255
+#: ../gnome-sudoku/src/lib/main.py:267
 msgid "Show statistics about current puzzle"
 msgstr "Show statistics about current puzzle"
 
-#: ../gnome-sudoku/src/lib/main.py:267
+#: ../gnome-sudoku/src/lib/main.py:279
 msgid "_Always show hint"
 msgstr "_Always show hint"
 
-#: ../gnome-sudoku/src/lib/main.py:269
+#: ../gnome-sudoku/src/lib/main.py:281
 msgid "Always show possible numbers in a square"
 msgstr "Always show possible numbers in a square"
 
-#: ../gnome-sudoku/src/lib/main.py:273
+#: ../gnome-sudoku/src/lib/main.py:285
 msgid "Warn about _unfillable squares"
 msgstr "Warn about _unfillable squares"
 
-#: ../gnome-sudoku/src/lib/main.py:275
+#: ../gnome-sudoku/src/lib/main.py:287
 msgid "Warn about squares made unfillable by a move"
 msgstr "Warn about squares made unfillable by a move"
 
-#: ../gnome-sudoku/src/lib/main.py:277
+#: ../gnome-sudoku/src/lib/main.py:289
 msgid "_Track additions"
 msgstr "_Track additions"
 
-#: ../gnome-sudoku/src/lib/main.py:279
+#: ../gnome-sudoku/src/lib/main.py:291
 msgid "Mark new additions in a separate color so you can keep track of them."
 msgstr "Mark new additions in a separate colour so you can keep track of them."
 
-#: ../gnome-sudoku/src/lib/main.py:282
+#: ../gnome-sudoku/src/lib/main.py:294
 msgid "_Highlighter"
 msgstr "_Highlighter"
 
-#: ../gnome-sudoku/src/lib/main.py:283
+#: ../gnome-sudoku/src/lib/main.py:295
 msgid "Highlight the current row, column and box"
 msgstr "Highlight the current row, column and box"
 
-#: ../gnome-sudoku/src/lib/main.py:284
+#: ../gnome-sudoku/src/lib/main.py:296
 msgid "Generate new puzzles _while you play"
 msgstr "Generate new puzzles _while you play"
 
-#: ../gnome-sudoku/src/lib/main.py:286
+#: ../gnome-sudoku/src/lib/main.py:298
 msgid ""
 "Generate new puzzles in the background while you play. This will "
 "automatically pause when the game goes into the background."
@@ -6996,173 +7529,147 @@ msgstr ""
 "Generate new puzzles in the background while you play. This will "
 "automatically pause when the game goes into the background."
 
-#: ../gnome-sudoku/src/lib/main.py:292
+#: ../gnome-sudoku/src/lib/main.py:304
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../gnome-sudoku/src/lib/main.py:293
+#: ../gnome-sudoku/src/lib/main.py:305
 msgid "_Undo"
 msgstr "_Undo"
 
-#: ../gnome-sudoku/src/lib/main.py:293
+#: ../gnome-sudoku/src/lib/main.py:305
 msgid "Undo last action"
 msgstr "Undo last action"
 
-#: ../gnome-sudoku/src/lib/main.py:294
+#: ../gnome-sudoku/src/lib/main.py:306
 msgid "_Redo"
 msgstr "_Redo"
 
-#: ../gnome-sudoku/src/lib/main.py:294
+#: ../gnome-sudoku/src/lib/main.py:306
 msgid "Redo last action"
 msgstr "Redo last action"
 
-#: ../gnome-sudoku/src/lib/main.py:295 ../gnome-sudoku/src/lib/gsudoku.py:85
+#: ../gnome-sudoku/src/lib/main.py:307
+#: ../gnome-sudoku/src/lib/number_box.py:54
 msgid "_Clear"
 msgstr "_Clear"
 
-#: ../gnome-sudoku/src/lib/main.py:295
+#: ../gnome-sudoku/src/lib/main.py:307
 msgid "Clear entries you've filled in"
 msgstr "Clear entries you've filled in"
 
-#: ../gnome-sudoku/src/lib/main.py:296
+#: ../gnome-sudoku/src/lib/main.py:308
 msgid "Clear _Notes"
 msgstr "Clear _Notes"
 
-#: ../gnome-sudoku/src/lib/main.py:296
+#: ../gnome-sudoku/src/lib/main.py:308
 msgid "Clear notes and hints"
 msgstr "Clear notes and hints"
 
-#. Trackers...
-#. Our initial row...
-#: ../gnome-sudoku/src/lib/main.py:298 ../gnome-sudoku/src/lib/main.py:861
-msgid "No Tracker"
-msgstr "No Tracker"
-
-#: ../gnome-sudoku/src/lib/main.py:299
-msgid "_Generate new puzzles"
-msgstr "_Generate new puzzles"
-
-#: ../gnome-sudoku/src/lib/main.py:299
-msgid "Generate new puzzles."
-msgstr "Generate new puzzles."
-
-#: ../gnome-sudoku/src/lib/main.py:369
-msgid "Entering custom grid..."
-msgstr "Entering custom grid..."
-
-#: ../gnome-sudoku/src/lib/main.py:373
-msgid "_Play game"
-msgstr "_Play game"
-
-#: ../gnome-sudoku/src/lib/main.py:431
+#: ../gnome-sudoku/src/lib/main.py:417
 #, python-format
 msgid "You completed the puzzle in %(totalTime)s (%(activeTime)s active)"
 msgstr "You completed the puzzle in %(totalTime)s (%(activeTime)s active)"
 
-#: ../gnome-sudoku/src/lib/main.py:435
+#: ../gnome-sudoku/src/lib/main.py:421
 #, python-format
 msgid "You got %(n)s hint"
 msgid_plural "You got %(n)s hints"
 msgstr[0] "You got %(n)s hint"
 msgstr[1] "You got %(n)s hints"
 
-#: ../gnome-sudoku/src/lib/main.py:438
+#: ../gnome-sudoku/src/lib/main.py:424
 #, python-format
 msgid "You had %(n)s impossibility pointed out."
 msgid_plural "You had %(n)s impossibilities pointed out."
 msgstr[0] "You had %(n)s impossibility pointed out."
 msgstr[1] "You had %(n)s impossibilities pointed out."
 
-#: ../gnome-sudoku/src/lib/main.py:443
+#: ../gnome-sudoku/src/lib/main.py:429
 #, python-format
 msgid "You used the auto-fill %(n)s time"
 msgid_plural "You used the auto-fill %(n)s times"
 msgstr[0] "You used the auto-fill %(n)s time"
 msgstr[1] "You used the auto-fill %(n)s times"
 
-#: ../gnome-sudoku/src/lib/main.py:468
+#: ../gnome-sudoku/src/lib/main.py:453
 msgid "Save this game before starting new one?"
 msgstr "Save this game before starting new one?"
 
-#: ../gnome-sudoku/src/lib/main.py:469
+#: ../gnome-sudoku/src/lib/main.py:454
 msgid "_Save game for later"
 msgstr "_Save game for later"
 
-#: ../gnome-sudoku/src/lib/main.py:470
+#: ../gnome-sudoku/src/lib/main.py:455
 msgid "_Abandon game"
 msgstr "_Abandon game"
 
-#: ../gnome-sudoku/src/lib/main.py:722
+#: ../gnome-sudoku/src/lib/main.py:649
 #, python-format
 msgid "Playing %(difficulty)s puzzle."
 msgstr "Playing %(difficulty)s puzzle."
 
-#: ../gnome-sudoku/src/lib/main.py:737
+#: ../gnome-sudoku/src/lib/main.py:665
 msgid "Puzzle Information"
 msgstr "Puzzle Information"
 
-#: ../gnome-sudoku/src/lib/main.py:738
+#: ../gnome-sudoku/src/lib/main.py:666
 msgid "There is no current puzzle."
 msgstr "There is no current puzzle."
 
-#: ../gnome-sudoku/src/lib/main.py:743
+#: ../gnome-sudoku/src/lib/main.py:671
 msgid "Calculated difficulty: "
 msgstr "Calculated difficulty: "
 
-#: ../gnome-sudoku/src/lib/main.py:747
+#: ../gnome-sudoku/src/lib/main.py:675
 msgid "Number of moves instantly fillable by elimination: "
 msgstr "Number of moves instantly fillable by elimination: "
 
-#: ../gnome-sudoku/src/lib/main.py:750
+#: ../gnome-sudoku/src/lib/main.py:678
 msgid "Number of moves instantly fillable by filling: "
 msgstr "Number of moves instantly fillable by filling: "
 
-#: ../gnome-sudoku/src/lib/main.py:753
+#: ../gnome-sudoku/src/lib/main.py:681
 msgid "Amount of trial-and-error required to solve: "
 msgstr "Amount of trial-and-error required to solve: "
 
-#: ../gnome-sudoku/src/lib/main.py:756 ../gnome-sudoku/src/lib/main.py:757
+#: ../gnome-sudoku/src/lib/main.py:684 ../gnome-sudoku/src/lib/main.py:685
 msgid "Puzzle Statistics"
 msgstr "Puzzle Statistics"
 
-#: ../gnome-sudoku/src/lib/main.py:871
+#. Our initial row...
+#: ../gnome-sudoku/src/lib/main.py:775
+msgid "No Tracker"
+msgstr "No Tracker"
+
+#: ../gnome-sudoku/src/lib/main.py:785
 msgid "Clear all moves tracked by selected tracker."
 msgstr "Clear all moves tracked by selected tracker."
 
-#: ../gnome-sudoku/src/lib/main.py:875
+#: ../gnome-sudoku/src/lib/main.py:789
 msgid "_Clear Others"
 msgstr "_Clear Others"
 
-#: ../gnome-sudoku/src/lib/main.py:877
+#: ../gnome-sudoku/src/lib/main.py:791
 msgid "Clear all moves not tracked by selected tracker."
 msgstr "Clear all moves not tracked by selected tracker."
 
-#: ../gnome-sudoku/src/lib/main.py:903
+#: ../gnome-sudoku/src/lib/main.py:816
 #, python-format
 msgid "Tracker %s"
 msgstr "Tracker %s"
 
-#: ../gnome-sudoku/src/lib/printing.py:193
-msgid "Print Sudoku"
-msgid_plural "Print Sudokus"
-msgstr[0] "Print Sudoku"
-msgstr[1] "Print Sudokus"
-
-#: ../gnome-sudoku/src/lib/printing.py:205
-msgid "Print Preview"
-msgstr "Print Preview"
-
-#: ../gnome-sudoku/src/lib/game_selector.py:136
+#: ../gnome-sudoku/src/lib/game_selector.py:149
 #, python-format
 msgid "Last Played %(timeAgo)s"
 msgstr "Last Played %(timeAgo)s"
 
-#: ../gnome-sudoku/src/lib/game_selector.py:137
+#: ../gnome-sudoku/src/lib/game_selector.py:150
 #, python-format
 msgid "%(level)s puzzle"
 msgstr "%(level)s puzzle"
 
-#: ../gnome-sudoku/src/lib/game_selector.py:138
+#: ../gnome-sudoku/src/lib/game_selector.py:151
 #, python-format
 msgid "Played for %(duration)s"
 msgstr "Played for %(duration)s"
@@ -7170,104 +7677,93 @@ msgstr "Played for %(duration)s"
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:113
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:124
 msgid "Working..."
-msgstr "Working..."
+msgstr "Workingâ?¦"
 
-#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:162
+#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:154
 #, python-format
 msgid "%(n)s puzzle"
 msgid_plural "%(n)s puzzles"
 msgstr[0] "%(n)s puzzle"
 msgstr[1] "%(n)s puzzles"
 
-#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:191
+#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:179
 msgid "Stopped"
 msgstr "Stopped"
 
-#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:206
-#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:216
+#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:194
+#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:204
 #, python-format
 msgid "Generated %(n)s out of %(total)s puzzle"
 msgid_plural "Generated %(n)s out of %(total)s puzzles"
 msgstr[0] "Generated %(n)s out of %(total)s puzzle"
 msgstr[1] "Generated %(n)s out of %(total)s puzzles"
 
-#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:224
+#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:212
 #, python-format
 msgid "Generated %(n)s puzzle"
 msgid_plural "Generated %(n)s puzzles"
 msgstr[0] "Generated %(n)s puzzle"
 msgstr[1] "Generated %(n)s puzzles"
 
-#: ../gnome-sudoku/src/lib/sudoku.py:590
+#: ../gnome-sudoku/src/lib/sudoku.py:512
 msgid "Very Hard"
 msgstr "Very Hard"
 
-#: ../gnome-sudoku/src/lib/sudoku.py:592
+#: ../gnome-sudoku/src/lib/sudoku.py:514
 msgid "Medium"
 msgstr "Medium"
 
-#. setup pause button
-#: ../gnome-sudoku/src/lib/gtk_goodies/dialog_extras.py:328
-#: ../libgames-support/games-stock.c:334
-msgid "_Pause"
-msgstr "_Pause"
-
-#. setup stop button
-#: ../gnome-sudoku/src/lib/gtk_goodies/dialog_extras.py:337
-msgid "_Stop"
-msgstr "_Stop"
-
-#: ../gnome-sudoku/src/lib/gtk_goodies/dialog_extras.py:354
+#: ../gnome-sudoku/src/lib/gtk_goodies/dialog_extras.py:159
 msgid "Do you really want to do this?"
 msgstr "Do you really want to do this?"
 
-#: ../gnome-sudoku/src/lib/gtk_goodies/dialog_extras.py:388
+#: ../gnome-sudoku/src/lib/gtk_goodies/dialog_extras.py:193
 msgid "Don't ask me this again."
 msgstr "Don't ask me this again."
 
-#: ../gnome-sudoku/src/lib/timer.py:21
+#: ../gnome-sudoku/src/lib/timer.py:19
 #, python-format
 msgid "%(n)s year"
 msgid_plural "%(n)s years"
 msgstr[0] "%(n)s year"
 msgstr[1] "%(n)s years"
 
-#: ../gnome-sudoku/src/lib/timer.py:23
+#: ../gnome-sudoku/src/lib/timer.py:21
 #, python-format
 msgid "%(n)s month"
 msgid_plural "%(n)s months"
 msgstr[0] "%(n)s month"
 msgstr[1] "%(n)s months"
 
-#: ../gnome-sudoku/src/lib/timer.py:25
+#: ../gnome-sudoku/src/lib/timer.py:23
 #, python-format
 msgid "%(n)s week"
 msgid_plural "%(n)s weeks"
 msgstr[0] "%(n)s week"
 msgstr[1] "%(n)s weeks"
 
-#: ../gnome-sudoku/src/lib/timer.py:27
+#: ../gnome-sudoku/src/lib/timer.py:25
 #, python-format
 msgid "%(n)s day"
 msgid_plural "%(n)s days"
 msgstr[0] "%(n)s day"
 msgstr[1] "%(n)s days"
 
-#: ../gnome-sudoku/src/lib/timer.py:29
+#: ../gnome-sudoku/src/lib/timer.py:27
 #, python-format
 msgid "%(n)s hour"
 msgid_plural "%(n)s hours"
 msgstr[0] "%(n)s hour"
 msgstr[1] "%(n)s hours"
 
-#: ../gnome-sudoku/src/lib/timer.py:31
+#: ../gnome-sudoku/src/lib/timer.py:29
 #, python-format
 msgid "%(n)s minute"
 msgid_plural "%(n)s minutes"
 msgstr[0] "%(n)s minute"
 msgstr[1] "%(n)s minutes"
 
-#: ../gnome-sudoku/src/lib/timer.py:33
+#: ../gnome-sudoku/src/lib/timer.py:31
 #, python-format
 msgid "%(n)s second"
 msgid_plural "%(n)s seconds"
@@ -7280,123 +7776,102 @@ msgstr[1] "%(n)s seconds"
 #. You can of course make your language only use commas or
 #. ands or spaces or whatever you like by translating both
 #. ", " and " and " with the same string.
-#: ../gnome-sudoku/src/lib/timer.py:53
+#: ../gnome-sudoku/src/lib/timer.py:51
 msgid " and "
 msgstr " and "
 
-#: ../gnome-sudoku/src/lib/timer.py:53
+#: ../gnome-sudoku/src/lib/timer.py:51
 msgid ", "
 msgstr ", "
 
-#: ../gnome-sudoku/src/lib/timer.py:55
+#: ../gnome-sudoku/src/lib/timer.py:53
 msgid " "
 msgstr " "
 
-#. then we're today
-#. Translators, see strftime manual in order to translate %? format strings
-#: ../gnome-sudoku/src/lib/timer.py:73
-msgid "Today %R %p"
-msgstr "Today %R %p"
-
-#. Translators, see strftime manual in order to translate %? format strings
-#: ../gnome-sudoku/src/lib/timer.py:76
-msgid "Yesterday %R %p"
-msgstr "Yesterday %R %p"
-
-#. less than a week
-#. Translators, see strftime manual in order to translate %? format strings
-#: ../gnome-sudoku/src/lib/timer.py:79
-msgid "%A %H:%M"
-msgstr "%A %H:%M"
-
-#. Translators, see strftime manual in order to translate %? format strings
-#: ../gnome-sudoku/src/lib/timer.py:82
-msgid "%A %B %d %R %p"
-msgstr "%A %B %d %R %p"
-
-#: ../gnome-sudoku/src/lib/timer.py:96
-#, python-format
-msgid "%(n)s minute ago"
-msgid_plural "%(n)s minutes ago"
-msgstr[0] "%(n)s minute ago"
-msgstr[1] "%(n)s minutes ago"
-
+#. Then we're today
 #. within the minute
-#: ../gnome-sudoku/src/lib/timer.py:99
+#: ../gnome-sudoku/src/lib/timer.py:63
 #, python-format
 msgid "%(n)s second ago"
 msgid_plural "%(n)s seconds ago"
 msgstr[0] "%(n)s second ago"
 msgstr[1] "%(n)s seconds ago"
 
+#: ../gnome-sudoku/src/lib/timer.py:67
+#, python-format
+msgid "%(n)s minute ago"
+msgid_plural "%(n)s minutes ago"
+msgstr[0] "%(n)s minute ago"
+msgstr[1] "%(n)s minutes ago"
+
 #. Translators, see strftime manual in order to translate %? format strings
-#: ../gnome-sudoku/src/lib/timer.py:104
+#: ../gnome-sudoku/src/lib/timer.py:71
 msgid "at %I:%M %p"
 msgstr "at %I:%M %p"
 
 #. Translators, see strftime manual in order to translate %? format strings
-#: ../gnome-sudoku/src/lib/timer.py:107
+#: ../gnome-sudoku/src/lib/timer.py:74
 msgid "yesterday at %I:%M %p"
-msgstr "yesterday at %I:%M %p"
+msgstr "yesterday at %H:%M"
 
 #. Translators, see strftime manual in order to translate %? format strings
-#: ../gnome-sudoku/src/lib/timer.py:110
+#: ../gnome-sudoku/src/lib/timer.py:77
 msgid "%A %I:%M %p"
-msgstr "%A %I:%M %p"
+msgstr "%A %H:%M"
 
 #. Translators, see strftime manual in order to translate %? format strings
-#: ../gnome-sudoku/src/lib/timer.py:113
-msgid "%B%e"
-msgstr "%B%e"
+#: ../gnome-sudoku/src/lib/timer.py:80
+msgid "%B %e"
+msgstr "%e %B"
 
 #: ../gnomine/gnomine.c:51 ../gnomine/gnomine.desktop.in.in.h:2
 msgid "Mines"
 msgstr "Mines"
 
-#: ../gnomine/gnomine.c:103
+#: ../gnomine/gnomine.c:104
 msgctxt "board size"
 msgid "Custom"
 msgstr "Custom"
 
-#: ../gnomine/gnomine.c:169
+#: ../gnomine/gnomine.c:170
 #, c-format
 msgid "Flags: %d/%d"
 msgstr "Flags: %d/%d"
 
-#: ../gnomine/gnomine.c:197
+#: ../gnomine/gnomine.c:198
 msgid "The Mines Have Been Cleared!"
 msgstr "The Mines Have Been Cleared!"
 
-#: ../gnomine/gnomine.c:213
+#: ../gnomine/gnomine.c:214
 msgid "Mines Scores"
 msgstr "Mines Scores"
 
-#: ../gnomine/gnomine.c:216 ../gnotravex/gnotravex.c:1232
+#: ../gnomine/gnomine.c:217 ../gnotravex/gnotravex.c:1234
 #: ../same-gnome/ui.c:148
 msgid "Size:"
 msgstr "Size:"
 
-#: ../gnomine/gnomine.c:319
+#: ../gnomine/gnomine.c:322
 msgid "Click a square, any square"
 msgstr "Click a square, any square"
 
-#: ../gnomine/gnomine.c:321
+#: ../gnomine/gnomine.c:324
 msgid "Maybe they're all mines ..."
-msgstr "Maybe they're all mines ..."
+msgstr "Maybe they're all minesâ?¦"
 
-#: ../gnomine/gnomine.c:440
+#: ../gnomine/gnomine.c:452
 msgid "Resizing and SVG support:"
 msgstr "Resizing and SVG support:"
 
-#: ../gnomine/gnomine.c:447
+#: ../gnomine/gnomine.c:459
 msgid "Faces:"
 msgstr "Faces:"
 
-#: ../gnomine/gnomine.c:450
+#: ../gnomine/gnomine.c:462
 msgid "Graphics:"
 msgstr "Graphics:"
 
-#: ../gnomine/gnomine.c:466
+#: ../gnomine/gnomine.c:478
 msgid ""
 "The popular logic puzzle minesweeper. Clear mines from a board using hints "
 "from squares you have already uncovered.\n"
@@ -7408,69 +7883,77 @@ msgstr ""
 "\n"
 "Mines is a part of GNOME Games."
 
-#: ../gnomine/gnomine.c:660
+#: ../gnomine/gnomine.c:692
 msgid "Field Size"
 msgstr "Field Size"
 
-#: ../gnomine/gnomine.c:683
+#: ../gnomine/gnomine.c:715
 msgid "Custom Size"
 msgstr "Custom Size"
 
-#: ../gnomine/gnomine.c:690
+#: ../gnomine/gnomine.c:722
 msgid "_Number of mines:"
 msgstr "_Number of mines:"
 
-#: ../gnomine/gnomine.c:703
+#: ../gnomine/gnomine.c:735
 msgid "_Horizontal:"
 msgstr "_Horizontal:"
 
-#: ../gnomine/gnomine.c:715
+#: ../gnomine/gnomine.c:747
 msgid "_Vertical:"
 msgstr "_Vertical:"
 
-#: ../gnomine/gnomine.c:733
+#: ../gnomine/gnomine.c:764
+msgid "Flags"
+msgstr "Flags"
+
+#: ../gnomine/gnomine.c:767
 msgid "_Use \"I'm not sure\" flags"
 msgstr "_Use \"I'm not sure\" flags"
 
-#: ../gnomine/gnomine.c:744
+#: ../gnomine/gnomine.c:778
+msgid "Warnings"
+msgstr "Warnings"
+
+#: ../gnomine/gnomine.c:781
 msgid "_Use \"Too many flags\" warning"
 msgstr "_Use \"Too many flags\" warning"
 
-#: ../gnomine/gnomine.c:754
+#: ../gnomine/gnomine.c:792
 msgid "Mines Preferences"
 msgstr "Mines Preferences"
 
-#: ../gnomine/gnomine.c:957
+#: ../gnomine/gnomine.c:999
 msgid "Width of grid"
 msgstr "Width of grid"
 
-#: ../gnomine/gnomine.c:958
+#: ../gnomine/gnomine.c:1000
 msgid "Height of grid"
 msgstr "Height of grid"
 
-#: ../gnomine/gnomine.c:960
+#: ../gnomine/gnomine.c:1002
 msgid "Number of mines"
 msgstr "Number of mines"
 
-#: ../gnomine/gnomine.c:963 ../gnomine/gnomine.schemas.in.h:8
+#: ../gnomine/gnomine.c:1005 ../gnomine/gnomine.schemas.in.h:8
 msgid "Size of the board (0-2 = small-large, 3=custom)"
 msgstr "Size of the board (0-2 = small-large, 3=custom)"
 
-#: ../gnomine/gnomine.c:964 ../gnotravex/gnotravex.c:398
-#: ../gnotski/gnotski.c:466 ../iagno/gnothello.c:146
+#: ../gnomine/gnomine.c:1006 ../gnotravex/gnotravex.c:398
+#: ../gnotski/gnotski.c:466 ../iagno/gnothello.c:145
 msgid "X location of window"
 msgstr "X location of window"
 
-#: ../gnomine/gnomine.c:966 ../gnotravex/gnotravex.c:400
-#: ../gnotski/gnotski.c:468 ../iagno/gnothello.c:148
+#: ../gnomine/gnomine.c:1008 ../gnotravex/gnotravex.c:400
+#: ../gnotski/gnotski.c:468 ../iagno/gnothello.c:147
 msgid "Y location of window"
 msgstr "Y location of window"
 
-#: ../gnomine/gnomine.c:1109
+#: ../gnomine/gnomine.c:1152
 msgid "Press to Resume"
 msgstr "Press to Resume"
 
-#: ../gnomine/gnomine.c:1143
+#: ../gnomine/gnomine.c:1186
 msgid "Time: "
 msgstr "Time: "
 
@@ -7479,6 +7962,7 @@ msgid "Clear hidden mines from a minefield"
 msgstr "Clear hidden mines from a minefield"
 
 #: ../gnomine/gnomine.schemas.in.h:1
+#: ../same-gnome-clutter/same-gnome-clutter.schemas.in.h:2
 msgid "Board size"
 msgstr "Board size"
 
@@ -7717,28 +8201,28 @@ msgstr "Size of board (2-6)"
 msgid "SIZE"
 msgstr "SIZE"
 
-#: ../gnotravex/gnotravex.c:1114
+#: ../gnotravex/gnotravex.c:1116
 msgid "Puzzle solved! Well done!"
 msgstr "Puzzle solved! Well done!"
 
-#: ../gnotravex/gnotravex.c:1116
+#: ../gnotravex/gnotravex.c:1118
 msgid "Puzzle solved!"
 msgstr "Puzzle solved!"
 
-#: ../gnotravex/gnotravex.c:1230
+#: ../gnotravex/gnotravex.c:1232
 msgid "Tetravex Scores"
 msgstr "Tetravex Scores"
 
-#: ../gnotravex/gnotravex.c:1497 ../mahjongg/mahjongg.c:977
+#: ../gnotravex/gnotravex.c:1498 ../mahjongg/mahjongg.c:977
 msgid "Game paused"
 msgstr "Game paused"
 
-#: ../gnotravex/gnotravex.c:1625
+#: ../gnotravex/gnotravex.c:1627
 #, c-format
 msgid "Playing %dÃ?%d board"
 msgstr "Playing %dÃ?%d board"
 
-#: ../gnotravex/gnotravex.c:1907
+#: ../gnotravex/gnotravex.c:1909
 msgid ""
 "GNOME Tetravex is a simple puzzle where pieces must be positioned so that "
 "the same numbers are touching each other.\n"
@@ -7957,23 +8441,23 @@ msgstr "Next Puzzle"
 msgid "Previous Puzzle"
 msgstr "Previous Puzzle"
 
-#: ../gnotski/gnotski.c:675
+#: ../gnotski/gnotski.c:677
 msgid "Level completed."
 msgstr "Level completed."
 
-#: ../gnotski/gnotski.c:813
+#: ../gnotski/gnotski.c:815
 msgid "The Puzzle Has Been Solved!"
 msgstr "The Puzzle Has Been Solved!"
 
-#: ../gnotski/gnotski.c:830
+#: ../gnotski/gnotski.c:832
 msgid "Klotski Scores"
 msgstr "Klotski Scores"
 
-#: ../gnotski/gnotski.c:833
+#: ../gnotski/gnotski.c:835
 msgid "Puzzle:"
 msgstr "Puzzle:"
 
-#: ../gnotski/gnotski.c:917
+#: ../gnotski/gnotski.c:919
 msgid ""
 "The theme for this game failed to render.\n"
 "\n"
@@ -7983,7 +8467,7 @@ msgstr ""
 "\n"
 "Please check that Klotski is installed correctly."
 
-#: ../gnotski/gnotski.c:1164
+#: ../gnotski/gnotski.c:1166
 #, c-format
 msgid ""
 "Could not find the image:\n"
@@ -7996,12 +8480,12 @@ msgstr ""
 "\n"
 "Please check that Klotski is installed correctly."
 
-#: ../gnotski/gnotski.c:1203
+#: ../gnotski/gnotski.c:1205
 #, c-format
 msgid "Moves: %d"
 msgstr "Moves: %d"
 
-#: ../gnotski/gnotski.c:1532
+#: ../gnotski/gnotski.c:1534
 msgid ""
 "Sliding Block Puzzles\n"
 "\n"
@@ -8349,12 +8833,12 @@ msgid "5 of a Kind [total]"
 msgstr "5 of a Kind [total]"
 
 #. This is the short name for the room
-#: ../iagno/gnothello.c:56 ../iagno/iagno.desktop.in.in.h:2
+#: ../iagno/gnothello.c:55 ../iagno/iagno.desktop.in.in.h:2
 #: ../iagno/iagno.room.in.h:2
 msgid "Iagno"
 msgstr "Iagno"
 
-#: ../iagno/gnothello.c:266
+#: ../iagno/gnothello.c:265
 msgid ""
 "A disk flipping game derived from Reversi.\n"
 "\n"
@@ -8364,45 +8848,45 @@ msgstr ""
 "\n"
 "Iagno is a part of GNOME Games."
 
-#: ../iagno/gnothello.c:347
+#: ../iagno/gnothello.c:346
 msgid "Invalid move."
 msgstr "Invalid move."
 
-#: ../iagno/gnothello.c:621 ../iagno/gnothello.c:623
+#: ../iagno/gnothello.c:620 ../iagno/gnothello.c:622
 #, c-format
 msgid "%.2d"
 msgstr "%.2d"
 
-#: ../iagno/gnothello.c:645
+#: ../iagno/gnothello.c:644
 msgid "It is your turn to place a dark piece"
 msgstr "It is your turn to place a dark piece"
 
-#: ../iagno/gnothello.c:647
+#: ../iagno/gnothello.c:646
 msgid "It is your turn to place a light piece"
 msgstr "It is your turn to place a light piece"
 
-#: ../iagno/gnothello.c:650
+#: ../iagno/gnothello.c:649
 #, c-format
 msgid "Waiting for %s to move"
 msgstr "Waiting for %s to move"
 
-#: ../iagno/gnothello.c:657
+#: ../iagno/gnothello.c:656
 msgid "Dark's move"
 msgstr "Dark's move"
 
-#: ../iagno/gnothello.c:659
+#: ../iagno/gnothello.c:658
 msgid "Light's move"
 msgstr "Light's move"
 
-#: ../iagno/gnothello.c:935
+#: ../iagno/gnothello.c:945
 msgid "Dark:"
 msgstr "Dark:"
 
-#: ../iagno/gnothello.c:945
+#: ../iagno/gnothello.c:955
 msgid "Light:"
 msgstr "Light:"
 
-#: ../iagno/gnothello.c:969
+#: ../iagno/gnothello.c:979
 msgid "Welcome to Iagno!"
 msgstr "Welcome to Iagno!"
 
@@ -8475,66 +8959,66 @@ msgstr "_Flip final results"
 msgid "_Tile set:"
 msgstr "_Tile set:"
 
-#: ../libgames-support/eggdesktopfile.c:165
+#: ../libgames-support/eggdesktopfile.c:169
 #, c-format
 msgid "File is not a valid .desktop file"
 msgstr "File is not a valid .desktop file"
 
-#: ../libgames-support/eggdesktopfile.c:188
+#: ../libgames-support/eggdesktopfile.c:192
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Unrecognised desktop file Version '%s'"
 
-#: ../libgames-support/eggdesktopfile.c:958
+#: ../libgames-support/eggdesktopfile.c:966
 #, c-format
 msgid "Starting %s"
 msgstr "Starting %s"
 
-#: ../libgames-support/eggdesktopfile.c:1100
+#: ../libgames-support/eggdesktopfile.c:1108
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr "Application does not accept documents on the command line"
 
-#: ../libgames-support/eggdesktopfile.c:1168
+#: ../libgames-support/eggdesktopfile.c:1176
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Unrecognised launch option: %d"
 
-#: ../libgames-support/eggdesktopfile.c:1375
+#: ../libgames-support/eggdesktopfile.c:1381
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr "Can't pass document URIs to a 'Type=Link' desktop entry"
 
-#: ../libgames-support/eggdesktopfile.c:1394
+#: ../libgames-support/eggdesktopfile.c:1402
 #, c-format
 msgid "Not a launchable item"
 msgstr "Not a launchable item"
 
-#: ../libgames-support/eggsmclient.c:224
+#: ../libgames-support/eggsmclient.c:225
 msgid "Disable connection to session manager"
 msgstr "Disable connection to session manager"
 
-#: ../libgames-support/eggsmclient.c:227
+#: ../libgames-support/eggsmclient.c:228
 msgid "Specify file containing saved configuration"
 msgstr "Specify file containing saved configuration"
 
-#: ../libgames-support/eggsmclient.c:227
+#: ../libgames-support/eggsmclient.c:228
 msgid "FILE"
 msgstr "FILE"
 
-#: ../libgames-support/eggsmclient.c:230
+#: ../libgames-support/eggsmclient.c:231
 msgid "Specify session management ID"
 msgstr "Specify session management ID"
 
-#: ../libgames-support/eggsmclient.c:230
+#: ../libgames-support/eggsmclient.c:231
 msgid "ID"
 msgstr "ID"
 
-#: ../libgames-support/eggsmclient.c:244
+#: ../libgames-support/eggsmclient.c:252
 msgid "Session management options:"
 msgstr "Session management options:"
 
-#: ../libgames-support/eggsmclient.c:245
+#: ../libgames-support/eggsmclient.c:253
 msgid "Show session management options"
 msgstr "Show session management options"
 
@@ -8599,150 +9083,148 @@ msgid "Remove bot"
 msgstr "Remove bot"
 
 #. Translators: this is the symbol that's on a Joker card
-#: ../libgames-support/games-card.c:184
+#: ../libgames-support/games-card.c:182
 msgctxt "card symbol"
 msgid "JOKER"
 msgstr "JOKER"
 
 #. Translators: this is the symbol that's on an Ace card
-#: ../libgames-support/games-card.c:186 ../libgames-support/games-card.c:210
+#: ../libgames-support/games-card.c:184 ../libgames-support/games-card.c:208
 msgctxt "card symbol"
 msgid "A"
 msgstr "A"
 
 #. Translators: this is the symbol that's on a 2 card
-#: ../libgames-support/games-card.c:188
+#: ../libgames-support/games-card.c:186
 msgctxt "card symbol"
 msgid "2"
 msgstr "2"
 
 #. Translators: this is the symbol that's on a 3 card
-#: ../libgames-support/games-card.c:190
+#: ../libgames-support/games-card.c:188
 msgctxt "card symbol"
 msgid "3"
 msgstr "3"
 
 #. Translators: this is the symbol that's on a 4 card
-#: ../libgames-support/games-card.c:192
+#: ../libgames-support/games-card.c:190
 msgctxt "card symbol"
 msgid "4"
 msgstr "4"
 
 #. Translators: this is the symbol that's on a 5 card
-#: ../libgames-support/games-card.c:194
+#: ../libgames-support/games-card.c:192
 msgctxt "card symbol"
 msgid "5"
 msgstr "5"
 
 #. Translators: this is the symbol that's on a 6 card
-#: ../libgames-support/games-card.c:196
+#: ../libgames-support/games-card.c:194
 msgctxt "card symbol"
 msgid "6"
 msgstr "6"
 
 #. Translators: this is the symbol that's on a 7 card
-#: ../libgames-support/games-card.c:198
+#: ../libgames-support/games-card.c:196
 msgctxt "card symbol"
 msgid "7"
 msgstr "7"
 
 #. Translators: this is the symbol that's on a 8 card
-#: ../libgames-support/games-card.c:200
+#: ../libgames-support/games-card.c:198
 msgctxt "card symbol"
 msgid "8"
 msgstr "8"
 
 #. Translators: this is the symbol that's on a 9 card
-#: ../libgames-support/games-card.c:202
+#: ../libgames-support/games-card.c:200
 msgctxt "card symbol"
 msgid "9"
 msgstr "9"
 
 #. Translators: this is the symbol that's on a Jack card
-#: ../libgames-support/games-card.c:204
+#: ../libgames-support/games-card.c:202
 msgctxt "card symbol"
 msgid "J"
 msgstr "J"
 
 #. Translators: this is the symbol that's on a Queen card
-#: ../libgames-support/games-card.c:206
+#: ../libgames-support/games-card.c:204
 msgctxt "card symbol"
 msgid "Q"
 msgstr "Q"
 
 #. Translators: this is the symbol that's on a King card
-#: ../libgames-support/games-card.c:208
+#: ../libgames-support/games-card.c:206
 msgctxt "card symbol"
 msgid "K"
 msgstr "K"
 
 #. Translators: this is the symbol that's on a 1 card
-#: ../libgames-support/games-card.c:212
+#: ../libgames-support/games-card.c:210
 msgctxt "card symbol"
 msgid "1"
 msgstr "1"
 
-#: ../libgames-support/games-card-selector.c:123
-msgid "Card Style"
-msgstr "Card Style"
-
-#: ../libgames-support/games-controls.c:48
-msgid "No key"
-msgstr "No key"
-
-#: ../libgames-support/games-controls.c:161
-msgid "<Press a Key>"
-msgstr "<Press a Key>"
-
-#: ../libgames-support/games-controls.c:332
+#: ../libgames-support/games-controls.c:286
 msgid "Unknown Command"
 msgstr "Unknown Command"
 
-#: ../libgames-support/games-gridframe.c:223
-#: ../libgames-support/games-gridframe.c:231
+#: ../libgames-support/games-gridframe.c:224
+#: ../libgames-support/games-gridframe.c:232
 msgid "X Padding"
 msgstr "X Padding"
 
-#: ../libgames-support/games-gridframe.c:225
+#: ../libgames-support/games-gridframe.c:226
 msgid "Extra space to add to the width allocation."
 msgstr "Extra space to add to the width allocation."
 
-#: ../libgames-support/games-gridframe.c:233
+#: ../libgames-support/games-gridframe.c:234
 msgid "Extra space to add to the height allocation."
 msgstr "Extra space to add to the height allocation."
 
-#: ../libgames-support/games-gridframe.c:239
+#: ../libgames-support/games-gridframe.c:240
 msgid "Width Multiple"
 msgstr "Width Multiple"
 
-#: ../libgames-support/games-gridframe.c:241
+#: ../libgames-support/games-gridframe.c:242
 msgid "What multiple to constrain the width to."
 msgstr "What multiple to constrain the width to."
 
-#: ../libgames-support/games-gridframe.c:247
+#: ../libgames-support/games-gridframe.c:248
 msgid "Height Multiple"
 msgstr "Height Multiple"
 
-#: ../libgames-support/games-gridframe.c:249
+#: ../libgames-support/games-gridframe.c:250
 msgid "What multiple to constrain the height to."
 msgstr "What multiple to constrain the height to."
 
-#: ../libgames-support/games-gridframe.c:254
+#: ../libgames-support/games-gridframe.c:255
 msgid "X align"
 msgstr "X align"
 
-#: ../libgames-support/games-gridframe.c:256
+#: ../libgames-support/games-gridframe.c:257
 msgid "The horizontal alignment, from 0 (left) to 1 (right)"
 msgstr "The horizontal alignment, from 0 (left) to 1 (right)"
 
-#: ../libgames-support/games-gridframe.c:261
+#: ../libgames-support/games-gridframe.c:262
 msgid "Y align"
 msgstr "Y align"
 
-#: ../libgames-support/games-gridframe.c:263
+#: ../libgames-support/games-gridframe.c:264
 msgid "The vertical alignment, from 0 (top) to 1 (bottom)"
 msgstr "The vertical alignment, from 0 (top) to 1 (bottom)"
 
+#. %s.%s is the game name + the extension HTML or XHTML, e.g. Klondike.html"
+#: ../libgames-support/games-help.c:114
+#, c-format
+msgid "Help file â??%s.%sâ?? not found"
+msgstr "Help file â??%s.%sâ?? not found"
+
+#: ../libgames-support/games-runtime.c:273
+msgid "Could not show link"
+msgstr "Could not show link"
+
 #. Note that this assumes the default style is plain.
 #: ../libgames-support/games-scores-dialog.c:119
 #: ../libgames-support/games-scores-dialog.c:546
@@ -8755,111 +9237,121 @@ msgstr "Score"
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../libgames-support/games-stock.c:48
+#: ../libgames-support/games-stock.c:47
 msgid "End the current game"
 msgstr "End the current game"
 
-#: ../libgames-support/games-stock.c:49
+#: ../libgames-support/games-stock.c:48
 msgid "Toggle fullscreen mode"
 msgstr "Toggle fullscreen mode"
 
-#: ../libgames-support/games-stock.c:51
+#: ../libgames-support/games-stock.c:50
 msgid "Leave fullscreen mode"
 msgstr "Leave fullscreen mode"
 
-#: ../libgames-support/games-stock.c:53
+#: ../libgames-support/games-stock.c:52
 msgid "End the current network game and return to network server"
 msgstr "End the current network game and return to network server"
 
-#: ../libgames-support/games-stock.c:55 ../mahjongg/mahjongg.c:1249
+#: ../libgames-support/games-stock.c:54 ../mahjongg/mahjongg.c:1249
 msgid "Pause the game"
 msgstr "Pause the game"
 
-#: ../libgames-support/games-stock.c:56
+#: ../libgames-support/games-stock.c:55
 msgid "Show a list of players in the network game"
 msgstr "Show a list of players in the network game"
 
-#: ../libgames-support/games-stock.c:59 ../mahjongg/mahjongg.c:1252
+#: ../libgames-support/games-stock.c:58 ../mahjongg/mahjongg.c:1252
 msgid "Resume the paused game"
 msgstr "Resume the paused game"
 
-#: ../libgames-support/games-stock.c:60
+#: ../libgames-support/games-stock.c:59
 msgid "View the scores"
 msgstr "View the scores"
 
-#: ../libgames-support/games-stock.c:64
+#: ../libgames-support/games-stock.c:63
 msgid "Configure the game"
 msgstr "Configure the game"
 
-#: ../libgames-support/games-stock.c:65
+#: ../libgames-support/games-stock.c:64
 msgid "Quit this game"
 msgstr "Quit this game"
 
-#. Translators: This "_New" is for the menu item 'Game->New', implies "New Game"
 #: ../libgames-support/games-stock.c:319
+msgid "_Fullscreen"
+msgstr "_Fullscreen"
+
+#. Translators: This "_New" is for the menu item 'Game->New', implies "New Game"
+#: ../libgames-support/games-stock.c:322
 msgid "_New"
 msgstr "_New"
 
-#: ../libgames-support/games-stock.c:322
+#: ../libgames-support/games-stock.c:325
 msgid "_Redo Move"
 msgstr "_Redo Move"
 
 #. Translators: this is the "Reset" scores button in a scores dialogue
-#: ../libgames-support/games-stock.c:324
+#: ../libgames-support/games-stock.c:327
 msgid "_Reset"
 msgstr "_Reset"
 
 #. Translators: "_Restart" is the menu item 'Game->Restart', implies "Restart Game"
-#: ../libgames-support/games-stock.c:326
+#: ../libgames-support/games-stock.c:329
 msgid "_Restart"
 msgstr "_Restart"
 
-#: ../libgames-support/games-stock.c:328
+#: ../libgames-support/games-stock.c:331
 msgid "_Deal"
 msgstr "_Deal"
 
-#: ../libgames-support/games-stock.c:330
+#: ../libgames-support/games-stock.c:333
 msgid "_Leave Fullscreen"
 msgstr "_Leave Fullscreen"
 
-#: ../libgames-support/games-stock.c:332
+#: ../libgames-support/games-stock.c:335
 msgid "L_eave Game"
 msgstr "L_eave Game"
 
-#: ../libgames-support/games-stock.c:333
+#: ../libgames-support/games-stock.c:336
 msgid "Player _List"
 msgstr "Player _List"
 
-#: ../libgames-support/games-stock.c:335
+#: ../libgames-support/games-stock.c:337
+msgid "_Pause"
+msgstr "_Pause"
+
+#: ../libgames-support/games-stock.c:338
 msgid "Res_ume"
 msgstr "Res_ume"
 
-#: ../libgames-support/games-stock.c:336
+#: ../libgames-support/games-stock.c:339
 msgid "_Scores"
 msgstr "_Scores"
 
-#: ../libgames-support/games-stock.c:337
+#: ../libgames-support/games-stock.c:340
 msgid "_End Game"
 msgstr "_End Game"
 
-#: ../libgames-support/games-stock.c:343
+#. Work around maemo brokenness wrt. stock item translations.
+#. * See https://bugs.maemo.org/show_bug.cgi?id=1449 .
+#: ../libgames-support/games-stock.c:346
 msgid "_About"
 msgstr "_About"
 
-#: ../libgames-support/games-stock.c:344
+#: ../libgames-support/games-stock.c:347
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../libgames-support/games-stock.c:345
+#: ../libgames-support/games-stock.c:348
 msgid "_Close"
 msgstr "_Close"
 
-#: ../libgames-support/games-stock.c:346
+#: ../libgames-support/games-stock.c:349
 msgid "_OK"
 msgstr "_OK"
 
 #. %s is replaced with the name of the game in gnome-games.
-#: ../libgames-support/games-stock.c:407
+#: ../libgames-support/games-stock.c:410
 #, c-format
 msgid ""
 "%s is free software; you can redistribute it and/or modify it under the "
@@ -8872,7 +9364,16 @@ msgstr ""
 "Foundation; either version %d of the Licence, or (at your option) any later "
 "version."
 
-#: ../lightsoff/lightsoff.desktop.in.in.h:1
+#: ../libgames-support/games-stock.c:424
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"You should have received a copy of the GNU General Public Licence along with "
+"this program.  If not, see <http://www.gnu.org/licenses/>."
+
+#: ../lightsoff/lightsoff.desktop.in.in.h:1 ../lightsoff/data/lightsoff.ui.h:1
+#: ../lightsoff/data/settings.ui.h:1
 msgid "Lights Off"
 msgstr "Lights Off"
 
@@ -8880,7 +9381,39 @@ msgstr "Lights Off"
 msgid "Turn off all the lights"
 msgstr "Turn off all the lights"
 
-#: ../mahjongg/drawing.c:305
+#: ../lightsoff/lightsoff.schemas.in.h:1
+msgid "The current score"
+msgstr "The current score"
+
+#: ../lightsoff/lightsoff.schemas.in.h:2
+#: ../same-gnome/same-gnome.schemas.in.h:7
+#: ../same-gnome-clutter/same-gnome-clutter.schemas.in.h:5
+msgid "The theme to use"
+msgstr "The theme to use"
+
+#: ../lightsoff/lightsoff.schemas.in.h:3
+#: ../same-gnome-clutter/same-gnome-clutter.schemas.in.h:6
+msgid "The title of the tile theme to use."
+msgstr "The title of the tile theme to use."
+
+#: ../lightsoff/lightsoff.schemas.in.h:4
+msgid "The users's most recent score."
+msgstr "The users's most recent score."
+
+#: ../lightsoff/data/settings.ui.h:2
+msgid "Look & Feel"
+msgstr "Look & Feel"
+
+#: ../lightsoff/data/settings.ui.h:3
+#: ../same-gnome-clutter/data/settings.ui.h:7
+msgid "Theme:"
+msgstr "Theme:"
+
+#: ../lightsoff/data/settings.ui.h:4
+msgid "Use colors from GNOME theme"
+msgstr "Use colours from GNOME theme"
+
+#: ../mahjongg/drawing.c:306
 msgid ""
 "The selected theme failed to render.\n"
 "\n"
@@ -8890,7 +9423,7 @@ msgstr ""
 "\n"
 "Please check that Mahjongg is installed correctly."
 
-#: ../mahjongg/drawing.c:465 ../mahjongg/drawing.c:478
+#: ../mahjongg/drawing.c:469 ../mahjongg/drawing.c:482
 #, c-format
 msgid ""
 "Unable to render file:\n"
@@ -8992,15 +9525,15 @@ msgstr "Mahjongg - %s"
 msgid "Redo the last move"
 msgstr "Redo the last move"
 
-#: ../mahjongg/mahjongg.c:1445
+#: ../mahjongg/mahjongg.c:1447
 msgid "Tiles Left:"
 msgstr "Tiles Left:"
 
-#: ../mahjongg/mahjongg.c:1454
+#: ../mahjongg/mahjongg.c:1456
 msgid "Moves Left:"
 msgstr "Moves Left:"
 
-#: ../mahjongg/mahjongg.c:1516
+#: ../mahjongg/mahjongg.c:1518
 msgid "Remove matching pairs of tiles."
 msgstr "Remove matching pairs of tiles."
 
@@ -9077,10 +9610,13 @@ msgid "Game size (1=small, 3=large)"
 msgstr "Game size (1=small, 3=large)"
 
 #: ../same-gnome/same-gnome.desktop.in.in.h:1
+#: ../same-gnome-clutter/same-gnome-clutter.desktop.in.in.h:1
 msgid "Clear the screen by removing groups of colored balls"
 msgstr "Clear the screen by removing groups of coloured balls"
 
 #: ../same-gnome/same-gnome.desktop.in.in.h:2
+#: ../same-gnome-clutter/data/same-gnome.ui.h:1
+#: ../same-gnome-clutter/data/settings.ui.h:5
 msgid "Same GNOME"
 msgstr "Same GNOME"
 
@@ -9114,10 +9650,6 @@ msgid ""
 msgstr ""
 "The size of the board to use. 1 = Custom, 2 = Small, 3 = Medium, 4 = Large."
 
-#: ../same-gnome/same-gnome.schemas.in.h:7
-msgid "The theme to use"
-msgstr "The theme to use"
-
 #: ../same-gnome/same-gnome.schemas.in.h:8
 msgid "The width of the custom board, 101 &gt; width &gt; 3."
 msgstr "The width of the custom board, 101 &gt; width &gt; 3."
@@ -9167,7 +9699,7 @@ msgstr "Same GNOME Theme"
 
 #: ../same-gnome/ui.c:471
 msgid "_Theme..."
-msgstr "_Theme..."
+msgstr "_Themeâ?¦"
 
 #: ../same-gnome/ui.c:478
 msgid "_Small"
@@ -9181,11 +9713,11 @@ msgstr "_Large"
 msgid "_Fast Animation"
 msgstr "_Fast Animation"
 
-#: ../same-gnome/drawing.c:367
+#: ../same-gnome/drawing.c:370
 msgid "No theme data was found."
 msgstr "No theme data was found."
 
-#: ../same-gnome/drawing.c:372
+#: ../same-gnome/drawing.c:375
 msgid ""
 "It is impossible to play the game. Please check that the game has been "
 "installed correctly and try again."
@@ -9193,6 +9725,182 @@ msgstr ""
 "It is impossible to play the game. Please check that the game has been "
 "installed correctly and try again."
 
+#: ../same-gnome-clutter/data/settings.ui.h:2
+msgid "Board size:"
+msgstr "Board size:"
+
+#: ../same-gnome-clutter/data/settings.ui.h:3
+msgid "Number of colors:"
+msgstr "Number of colours:"
+
+#: ../same-gnome-clutter/data/settings.ui.h:8
+msgid "Zealous Animation"
+msgstr "Zealous Animation"
+
+#: ../same-gnome-clutter/same-gnome-clutter.desktop.in.in.h:2
+msgid "Same GNOME (Clutter)"
+msgstr "Same GNOME (Clutter)"
+
+#: ../same-gnome-clutter/same-gnome-clutter.schemas.in.h:1
+msgid "Board color count"
+msgstr "Board colour count"
+
+#: ../same-gnome-clutter/same-gnome-clutter.schemas.in.h:3
+msgid "The number of colors of tiles to use in the game."
+msgstr "The number of colours of tiles to use in the game."
+
+#: ../same-gnome-clutter/same-gnome-clutter.schemas.in.h:4
+msgid "The size of the game board."
+msgstr "The size of the game board."
+
+#: ../same-gnome-clutter/same-gnome-clutter.schemas.in.h:7
+msgid "Use more flashy, but slower, animations."
+msgstr "Use more flashy, but slower, animations."
+
+#: ../same-gnome-clutter/same-gnome-clutter.schemas.in.h:8
+msgid "Zealous animation"
+msgstr "Zealous animation"
+
+#~ msgid "Could not show Aisleriot help"
+#~ msgstr "Could not show AisleRiot help"
+
+#~ msgid "Leave _Fullscreen"
+#~ msgstr "Leave _Fullscreen"
+
+#~ msgid "chess-piece|Queen"
+#~ msgstr "Queen"
+
+#~ msgid "chess-piece|Knight"
+#~ msgstr "Knight"
+
+#~ msgid "chess-piece|Rook"
+#~ msgstr "Rook"
+
+#~ msgid "chess-piece|Bishop"
+#~ msgstr "Bishop"
+
+#~ msgid "chess-file|a"
+#~ msgstr "a"
+
+#~ msgid "chess-file|b"
+#~ msgstr "b"
+
+#~ msgid "chess-file|c"
+#~ msgstr "c"
+
+#~ msgid "chess-file|d"
+#~ msgstr "d"
+
+#~ msgid "chess-file|e"
+#~ msgstr "e"
+
+#~ msgid "chess-file|f"
+#~ msgstr "f"
+
+#~ msgid "chess-file|g"
+#~ msgstr "g"
+
+#~ msgid "chess-file|h"
+#~ msgstr "h"
+
+#~ msgid "chess-rank|1"
+#~ msgstr "1"
+
+#~ msgid "chess-rank|2"
+#~ msgstr "2"
+
+#~ msgid "chess-rank|3"
+#~ msgstr "3"
+
+#~ msgid "chess-rank|4"
+#~ msgstr "4"
+
+#~ msgid "chess-rank|5"
+#~ msgstr "5"
+
+#~ msgid "chess-rank|6"
+#~ msgstr "6"
+
+#~ msgid "chess-rank|7"
+#~ msgstr "7"
+
+#~ msgid "chess-rank|8"
+#~ msgstr "8"
+
+#~ msgid "chess-notation|P"
+#~ msgstr "P"
+
+#~ msgid "chess-notation|N"
+#~ msgstr "N"
+
+#~ msgid "chess-notation|B"
+#~ msgstr "B"
+
+#~ msgid "chess-notation|R"
+#~ msgstr "R"
+
+#~ msgid "chess-notation|Q"
+#~ msgstr "Q"
+
+#~ msgid "chess-notation|K"
+#~ msgstr "K"
+
+#~ msgid "Enable splats"
+#~ msgstr "Enable splats"
+
+#~ msgid "Enable splats. Play a sound and show a \"Splat!\" on the screen."
+#~ msgstr "Enable splats. Play a sound and show a \"Splat!\" on the screen."
+
+#~ msgid "E_nable splats"
+#~ msgstr "E_nable splats"
+
+#~ msgid "Play the most common, and potentially the most annoying, sound."
+#~ msgstr "Play the most common, and potentially the most annoying, sound."
+
+#~ msgid "Joined"
+#~ msgstr "Joined"
+
+#~ msgid "Sudoku was unable to create data folder %(path)s."
+#~ msgstr "Sudoku was unable to create data folder %(path)s."
+
+#~ msgid "Full Screen"
+#~ msgstr "Full Screen"
+
+#~ msgid "Entering custom grid..."
+#~ msgstr "Entering custom grid..."
+
+#~ msgid "_Play game"
+#~ msgstr "_Play game"
+
+#~ msgid "Print Sudoku"
+#~ msgid_plural "Print Sudokus"
+#~ msgstr[0] "Print Sudoku"
+#~ msgstr[1] "Print Sudokus"
+
+#~ msgid "Print Preview"
+#~ msgstr "Print Preview"
+
+#~ msgid "_Stop"
+#~ msgstr "_Stop"
+
+#~ msgid "Today %R %p"
+#~ msgstr "Today %R %p"
+
+#~ msgid "Yesterday %R %p"
+#~ msgstr "Yesterday %R %p"
+
+#~ msgid "%A %H:%M"
+#~ msgstr "%A %H:%M"
+
+#~ msgid "%A %B %d %R %p"
+#~ msgstr "%A %B %d %R %p"
+
+#~ msgid "No key"
+#~ msgstr "No key"
+
+#~ msgid "<Press a Key>"
+#~ msgstr "<Press a Key>"
+
 #~ msgid "score|%6d"
 #~ msgstr "%6d"
 
@@ -9217,15 +9925,6 @@ msgstr ""
 #~ msgid "_Allow spectators"
 #~ msgstr "_Allow spectators"
 
-#~ msgid "Queen"
-#~ msgstr "Queen"
-
-#~ msgid "Rook"
-#~ msgstr "Rook"
-
-#~ msgid "Bishop"
-#~ msgstr "Bishop"
-
 #~ msgid "pawn"
 #~ msgstr "pawn"
 
@@ -9238,9 +9937,6 @@ msgstr ""
 #~ msgid "bishop"
 #~ msgstr "bishop"
 
-#~ msgid "Game start"
-#~ msgstr "Game start"
-
 #~ msgid "Check"
 #~ msgstr "Check"
 
@@ -9286,30 +9982,6 @@ msgstr ""
 #~ msgstr ""
 #~ "%(move)s Black %(piece)s moves from %(start)s to %(end)s (%(result)s)"
 
-#~ msgid "a"
-#~ msgstr "a"
-
-#~ msgid "b"
-#~ msgstr "b"
-
-#~ msgid "c"
-#~ msgstr "c"
-
-#~ msgid "d"
-#~ msgstr "d"
-
-#~ msgid "e"
-#~ msgstr "e"
-
-#~ msgid "f"
-#~ msgstr "f"
-
-#~ msgid "g"
-#~ msgstr "g"
-
-#~ msgid "h"
-#~ msgstr "h"
-
 #~ msgid "Debug output:"
 #~ msgstr "Debug output:"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]