[gnome-games] Updated Irish translation

[Seán de Búrca <sdeburca src gnome org>]

commit e88002f81e91f42d151f821f630b877b9aad3b2e
Author: Seán de Búrca <leftmostcat gmail com>
Date:   Sun Aug 16 18:25:15 2009 -0600

    Updated Irish translation

 po/ga.po | 6166 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 3842 insertions(+), 2324 deletions(-)
---
diff --git a/po/ga.po b/po/ga.po
index 85ba14d..a3efe7b 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,16 +1,17 @@
 # Irish translations for gnome-games package.
-# Copyright (C) 1998-2008 Free Software Foundation, Inc.
+# Copyright (C) 1998-2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gnome-games package.
 # Alastair McKinstry <mckinstry computer org>, 1998.
 # Paul Duffy <dubhthach frink nuigalway ie>, 2003.
 # Alan Horkan <horkan maths tcd ie>, 2005.
-# Seán de Búrca <leftmostcat gmail com>, 2008.
+# Seán de Búrca <leftmostcat gmail com>, 2008, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-games HEAD\n"
+"Project-Id-Version: gnome-games.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-13 17:53-0700\n"
-"PO-Revision-Date: 2008-01-13 17:53-0700\n"
+"POT-Creation-Date: 2009-08-16 17:20-0600\n"
+"PO-Revision-Date: 2009-08-16 18:23-0600\n"
 "Last-Translator: Seán de Búrca <leftmostcat gmail com>\n"
 "Language-Team: Irish <gaeilge-gnulinux lists sourceforge net>\n"
 "MIME-Version: 1.0\n"
@@ -20,9 +21,8 @@ msgstr ""
 "10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n"
 
 #: ../aisleriot/aisleriot.schemas.in.h:1
-#, fuzzy
 msgid "A list of recently played games."
-msgstr "Ainmneach Imreoiri"
+msgstr "Liosta cluichí imeartha le déanaí"
 
 #: ../aisleriot/aisleriot.schemas.in.h:2
 msgid ""
@@ -32,152 +32,949 @@ msgid ""
 msgstr ""
 
 #: ../aisleriot/aisleriot.schemas.in.h:3
-#, fuzzy
+msgid "Animations"
+msgstr "�omhánna Beo"
+
+#: ../aisleriot/aisleriot.schemas.in.h:4
 msgid "Recently played games"
-msgstr "Ainmneach Imreoiri"
+msgstr "Cluichí imeartha le déanaí"
 
-#: ../aisleriot/aisleriot.schemas.in.h:4 ../gnotravex/gnotravex.schemas.in.h:3
+#: ../aisleriot/aisleriot.schemas.in.h:5 ../gnotravex/gnotravex.schemas.in.h:3
 msgid "Select the style of control"
-msgstr ""
+msgstr "Roghnaigh an stíl rialaithe"
 
-#: ../aisleriot/aisleriot.schemas.in.h:5
+#: ../aisleriot/aisleriot.schemas.in.h:6
 msgid ""
 "Select whether to drag the cards or to click on the source then the "
 "destination."
 msgstr ""
 
-#: ../aisleriot/aisleriot.schemas.in.h:6 ../gnect/data/gnect.schemas.in.h:11
-#: ../iagno/iagno.schemas.in.h:1
+#: ../aisleriot/aisleriot.schemas.in.h:7 ../gnect/data/gnect.schemas.in.h:11
+#: ../gnobots2/properties.c:478 ../iagno/iagno.schemas.in.h:1
 msgid "Sound"
 msgstr "Fuaim"
 
-#: ../aisleriot/aisleriot.schemas.in.h:7
+#: ../aisleriot/aisleriot.schemas.in.h:8
 msgid "Statistics of games played"
 msgstr ""
 
-#: ../aisleriot/aisleriot.schemas.in.h:8
+#: ../aisleriot/aisleriot.schemas.in.h:9
 msgid "The game file to use"
 msgstr ""
 
-#: ../aisleriot/aisleriot.schemas.in.h:9
+#: ../aisleriot/aisleriot.schemas.in.h:10
 #: ../blackjack/data/blackjack.schemas.in.h:7
 msgid "The name of the file with the graphics for the cards."
 msgstr ""
 
-#: ../aisleriot/aisleriot.schemas.in.h:10
+#: ../aisleriot/aisleriot.schemas.in.h:11
 msgid "The name of the scheme file containing the solitaire game to play."
 msgstr ""
 
-#: ../aisleriot/aisleriot.schemas.in.h:11
+#: ../aisleriot/aisleriot.schemas.in.h:12
 #: ../blackjack/data/blackjack.schemas.in.h:10
 msgid "Theme file name"
 msgstr ""
 
-#: ../aisleriot/aisleriot.schemas.in.h:12 ../aisleriot/window.c:2036
-#: ../gnect/data/gnect.schemas.in.h:13 ../iagno/iagno.schemas.in.h:2
+#: ../aisleriot/aisleriot.schemas.in.h:13
+msgid "Whether or not to animate card moves."
+msgstr ""
+
+#: ../aisleriot/aisleriot.schemas.in.h:14 ../gnect/data/gnect.schemas.in.h:13
+#: ../iagno/iagno.schemas.in.h:2
 msgid "Whether or not to play event sounds."
 msgstr ""
 
-#: ../aisleriot/aisleriot.schemas.in.h:13
-#: ../blackjack/data/blackjack.schemas.in.h:13
-msgid "Whether or not to show the toolbar"
+#: ../aisleriot/aisleriot.schemas.in.h:15
+msgid "Whether or not to show the status bar"
 msgstr ""
 
-#: ../aisleriot/aisleriot.schemas.in.h:14
-#: ../blackjack/data/blackjack.schemas.in.h:14
-msgid "Whether or not to show the toolbar."
+#: ../aisleriot/aisleriot.schemas.in.h:16
+#: ../blackjack/data/blackjack.schemas.in.h:13
+msgid "Whether or not to show the toolbar"
 msgstr ""
 
-#: ../aisleriot/freecell.desktop.in.in.h:1 ../aisleriot/sol.c:594
-#: ../aisleriot/window.c:592 ../aisleriot/window.c:600
+#: ../aisleriot/freecell.desktop.in.in.h:1 ../aisleriot/sol.c:304
+#: ../aisleriot/window.c:618 ../aisleriot/window.c:626
 msgid "FreeCell Solitaire"
-msgstr "Solitaire FreeCell"
+msgstr "Cluiche Aonair FreeCell"
 
 #: ../aisleriot/freecell.desktop.in.in.h:2
 msgid "Play the popular FreeCell card game"
 msgstr "Imir an cluiche cártaí móréilimh FreeCell"
 
-#: ../aisleriot/game.c:1094
+#: ../aisleriot/game.c:1142
 #, c-format
 msgid ""
-"Aisleriot cannot load the file \"%s\". Please check your Aisleriot "
+"Aisleriot cannot load the file â??%sâ??. Please check your Aisleriot "
 "installation."
 msgstr ""
 
-#: ../aisleriot/game.c:1528
+#: ../aisleriot/game.c:1586
 msgid "Aisleriot cannot find the last game you played."
 msgstr ""
 
-#: ../aisleriot/game.c:1529
+#: ../aisleriot/game.c:1587
 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 "
 "started instead."
 msgstr ""
 
-#: ../aisleriot/sol.c:134
-msgid "Could not show link"
+#: ../aisleriot/game.c:1945
+msgid "This game does not have hint support yet."
 msgstr ""
 
-#. %s.%s is the game name + the extension HTML or XHTML, e.g. Klondike.html"
-#: ../aisleriot/sol.c:305
+#. Both %s are card names
+#. The first %s is a card name, the 2nd %s a sentence fragment.
+#. * Yes, we know this is bad for i18n.
+#.
+#: ../aisleriot/game.c:1979 ../aisleriot/game.c:2007
 #, c-format
-msgid "Help file \"%s.%s\" not found"
-msgstr ""
-
-#. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/sol.c:310 ../aisleriot/sol.c:404 ../aisleriot/window.c:1846
-#: ../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 "Earráid"
+msgid "Move %s onto %s."
+msgstr "Bog %s ar %s."
 
-#: ../aisleriot/sol.c:385
+#: ../aisleriot/game.c:2029
 #, c-format
-msgid "Could not show help for \"%s\""
+msgid "You are searching for a %s."
 msgstr ""
 
-#: ../aisleriot/sol.c:388
-msgid "Could not show Aisleriot help"
+#: ../aisleriot/game.c:2034
+msgid "This game is unable to provide a hint."
 msgstr ""
 
-#: ../aisleriot/sol.c:495
-#, fuzzy
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. 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 "Neighbor"
+
+#. 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 "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: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 Trí Dheic"
+
+#. 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 Trí Dheic"
+
+#. 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 "Klondike"
+
+#. 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 "Iarthar"
+
+#. 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"
+
+#. 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 "Reitigh an cluiche"
+msgstr "Roghnaigh an cineál cluiche le seinm"
 
-#: ../aisleriot/sol.c:495 ../gnobots2/gnobots.c:76 ../gnobots2/gnobots.c:78
-#: ../same-gnome/same-gnome.c:137 ../same-gnome/same-gnome.c:139
+#: ../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 "AINM"
 
-#: ../aisleriot/sol.c:497
-#, fuzzy
+#: ../aisleriot/sol.c:214
 msgid "Select the game number"
-msgstr "Reitigh an cluiche"
+msgstr "Roghnaigh uimhir an chluiche"
 
-#: ../aisleriot/sol.c:497 ../gnomine/gnomine.c:964 ../gtali/gyahtzee.c:110
+#: ../aisleriot/sol.c:214 ../gnomine/gnomine.c:995 ../gtali/gyahtzee.c:110
 #: ../gtali/gyahtzee.c:112 ../gtali/gyahtzee.c:116 ../gtali/gyahtzee.c:118
-#: ../same-gnome/same-gnome.c:141
+#: ../same-gnome/same-gnome.c:131
 msgid "NUMBER"
 msgstr "UIMHIR"
 
-#: ../aisleriot/sol.c:594 ../aisleriot/window.c:601 ../aisleriot/window.c:2500
+#: ../aisleriot/sol.c:304 ../aisleriot/window.c:627 ../aisleriot/window.c:2880
 msgid "AisleRiot"
 msgstr "AisleRiot"
 
 #: ../aisleriot/sol.desktop.in.in.h:1
 msgid "AisleRiot Solitaire"
-msgstr "Solitaire AisleRiot"
+msgstr "Cluiche Aonair AisleRiot"
 
 #: ../aisleriot/sol.desktop.in.in.h:2
 msgid "Play many different solitaire games"
-msgstr ""
+msgstr "Imir neart cluichí aonair difriúla"
 
 #: ../aisleriot/sol.scm.h:1
 msgid "Unknown color"
@@ -185,7 +982,7 @@ msgstr "Dath anaithnid"
 
 #: ../aisleriot/sol.scm.h:2
 msgid "Unknown suit"
-msgstr ""
+msgstr "Dath cártaí anaithnid"
 
 #: ../aisleriot/sol.scm.h:3
 msgid "Unknown value"
@@ -197,7 +994,7 @@ msgstr "aon"
 
 #: ../aisleriot/sol.scm.h:5
 msgid "black joker"
-msgstr ""
+msgstr "fear na gcrúb dubh"
 
 #: ../aisleriot/sol.scm.h:6
 msgid "clubs"
@@ -227,7 +1024,7 @@ msgstr "hart"
 msgid "jack"
 msgstr "cuireata"
 
-#: ../aisleriot/sol.scm.h:13 ../glchess/src/lib/gtkui/chessview.py:42
+#: ../aisleriot/sol.scm.h:13
 msgid "king"
 msgstr "rí"
 
@@ -235,13 +1032,13 @@ msgstr "rí"
 msgid "nine"
 msgstr "naoi"
 
-#: ../aisleriot/sol.scm.h:15 ../glchess/src/lib/gtkui/chessview.py:41
+#: ../aisleriot/sol.scm.h:15
 msgid "queen"
 msgstr "banríon"
 
 #: ../aisleriot/sol.scm.h:16
 msgid "red joker"
-msgstr ""
+msgstr "fear na gcrúb dearg"
 
 #: ../aisleriot/sol.scm.h:17
 msgid "seven"
@@ -261,35 +1058,35 @@ msgstr "deich"
 
 #: ../aisleriot/sol.scm.h:21
 msgid "the ace of clubs"
-msgstr ""
+msgstr "an t-aon triuf"
 
 #: ../aisleriot/sol.scm.h:22
 msgid "the ace of diamonds"
-msgstr ""
+msgstr "an t-aon muileata"
 
 #: ../aisleriot/sol.scm.h:23
 msgid "the ace of hearts"
-msgstr ""
+msgstr "an t-aon hart"
 
 #: ../aisleriot/sol.scm.h:24
 msgid "the ace of spades"
-msgstr ""
+msgstr "an t-aon spéireata"
 
 #: ../aisleriot/sol.scm.h:25
 msgid "the eight of clubs"
-msgstr ""
+msgstr "an t-ocht triuf"
 
 #: ../aisleriot/sol.scm.h:26
 msgid "the eight of diamonds"
-msgstr ""
+msgstr "an t-ocht muileata"
 
 #: ../aisleriot/sol.scm.h:27
 msgid "the eight of hearts"
-msgstr ""
+msgstr "an t-ocht hart"
 
 #: ../aisleriot/sol.scm.h:28
 msgid "the eight of spades"
-msgstr ""
+msgstr "an t-ocht spéireata"
 
 #: ../aisleriot/sol.scm.h:29
 msgid "the five of clubs"
@@ -469,7 +1266,7 @@ msgstr ""
 
 #: ../aisleriot/sol.scm.h:73
 msgid "the unknown card"
-msgstr ""
+msgstr "an cárta anaithnid"
 
 #: ../aisleriot/sol.scm.h:74
 msgid "three"
@@ -479,43 +1276,54 @@ msgstr "trí"
 msgid "two"
 msgstr "dó"
 
-#: ../aisleriot/stats-dialog.c:146
+#. Translators: this is the total number of won games
+#: ../aisleriot/stats-dialog.c:150
 msgid "Wins:"
-msgstr "Cluichí Buaite:"
+msgstr "Cluichí buaite:"
 
-#: ../aisleriot/stats-dialog.c:147
+#. Translators: this is the number of games played
+#: ../aisleriot/stats-dialog.c:152
 msgid "Total:"
 msgstr "Iomlán:"
 
-#: ../aisleriot/stats-dialog.c:148
+#. Translators: this is the percentage of games won out of all games played
+#: ../aisleriot/stats-dialog.c:154
 msgid "Percentage:"
-msgstr ""
+msgstr "Céatadán:"
 
-#: ../aisleriot/stats-dialog.c:149
+#. 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:158
 msgid "Wins"
 msgstr "Cluichí Buaite"
 
-#: ../aisleriot/stats-dialog.c:155
+#. Translators: this is the best time of all wins
+#: ../aisleriot/stats-dialog.c:165
 msgid "Best:"
-msgstr ""
+msgstr "Is fearr:"
 
-#: ../aisleriot/stats-dialog.c:156
+#. Translators: this is the worst time of all wins
+#: ../aisleriot/stats-dialog.c:167
 msgid "Worst:"
-msgstr ""
+msgstr "Is measa:"
 
-#: ../aisleriot/stats-dialog.c:157
-#: ../libgames-support/games-scores-dialog.c:116
+#. Translators: this is the section title of a section containing the
+#. * best and worst time taken to win a game.
+#.
+#: ../aisleriot/stats-dialog.c:171
+#: ../libgames-support/games-scores-dialog.c:114
 msgid "Time"
 msgstr "Am"
 
-#: ../aisleriot/stats-dialog.c:189
+#: ../aisleriot/stats-dialog.c:203
 msgid "Statistics"
-msgstr ""
+msgstr "Staitisticí"
 
 #. 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:203 ../aisleriot/stats-dialog.c:209
+#: ../aisleriot/stats-dialog.c:217 ../aisleriot/stats-dialog.c:223
 #, c-format
 msgid "%d"
 msgstr "%d"
@@ -527,420 +1335,90 @@ 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:220
+#: ../aisleriot/stats-dialog.c:234
 #, c-format
 msgid "%d%%"
-msgstr ""
+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:226 ../aisleriot/stats-dialog.c:235
-#: ../aisleriot/stats-dialog.c:243 ../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/F"
 
 #. Translators: this represents minutes:seconds.
-#: ../aisleriot/stats-dialog.c:230 ../aisleriot/stats-dialog.c:238
+#: ../aisleriot/stats-dialog.c:244 ../aisleriot/stats-dialog.c:252
 #, c-format
 msgid "%d:%02d"
-msgstr ""
-
-#: ../aisleriot/translatable_game_names.h:1
-msgid "Agnes"
-msgstr "Agnes"
-
-#: ../aisleriot/translatable_game_names.h:2
-msgid "Athena"
-msgstr "Athena"
-
-#: ../aisleriot/translatable_game_names.h:3
-msgid "Auld Lang Syne"
-msgstr "Auld Lang Syne"
-
-#: ../aisleriot/translatable_game_names.h:4
-msgid "Aunt Mary"
-msgstr "Aunt Mary"
-
-#: ../aisleriot/translatable_game_names.h:5
-msgid "Backbone"
-msgstr "Backbone"
-
-#: ../aisleriot/translatable_game_names.h:6
-msgid "Bakers Dozen"
-msgstr "Bakers Dozen"
-
-#: ../aisleriot/translatable_game_names.h:7
-msgid "Bakers Game"
-msgstr "Bakers Game"
-
-#: ../aisleriot/translatable_game_names.h:8
-msgid "Beleaguered Castle"
-msgstr "Beleaguered Castle"
-
-#: ../aisleriot/translatable_game_names.h:9
-msgid "Block Ten"
-msgstr "Block Ten"
-
-#: ../aisleriot/translatable_game_names.h:10
-msgid "Bristol"
-msgstr "Bristol"
-
-#: ../aisleriot/translatable_game_names.h:11
-msgid "Camelot"
-msgstr "Camelot"
-
-#: ../aisleriot/translatable_game_names.h:12
-msgid "Canfield"
-msgstr "Canfield"
-
-#: ../aisleriot/translatable_game_names.h:13
-msgid "Carpet"
-msgstr "Carpet"
-
-#: ../aisleriot/translatable_game_names.h:14
-msgid "Chessboard"
-msgstr "Chessboard"
-
-#: ../aisleriot/translatable_game_names.h:15
-msgid "Clock"
-msgstr "Clock"
-
-#: ../aisleriot/translatable_game_names.h:16
-msgid "Cover"
-msgstr "Cover"
-
-#: ../aisleriot/translatable_game_names.h:17
-msgid "Cruel"
-msgstr "Cruel"
-
-#: ../aisleriot/translatable_game_names.h:18
-msgid "Diamond Mine"
-msgstr "Diamond Mine"
-
-#: ../aisleriot/translatable_game_names.h:19
-msgid "Doublets"
-msgstr "Doublets"
-
-#: ../aisleriot/translatable_game_names.h:20
-msgid "Eagle Wing"
-msgstr "Eagle Wing"
-
-#: ../aisleriot/translatable_game_names.h:21
-msgid "Easthaven"
-msgstr "Easthaven"
-
-#: ../aisleriot/translatable_game_names.h:22
-msgid "Eight Off"
-msgstr "Eight Off"
-
-#: ../aisleriot/translatable_game_names.h:23
-msgid "Elevator"
-msgstr "Elevator"
-
-#: ../aisleriot/translatable_game_names.h:24
-msgid "Escalator"
-msgstr "Escalator"
-
-#: ../aisleriot/translatable_game_names.h:25
-msgid "First Law"
-msgstr "First Law"
-
-#: ../aisleriot/translatable_game_names.h:26
-msgid "Fortress"
-msgstr "Fortress"
-
-#: ../aisleriot/translatable_game_names.h:27
-msgid "Fortunes"
-msgstr "Fortunes"
-
-#: ../aisleriot/translatable_game_names.h:28
-msgid "Fourteen"
-msgstr "Fourteen"
-
-#: ../aisleriot/translatable_game_names.h:29
-msgid "Freecell"
-msgstr "Freecell"
-
-#: ../aisleriot/translatable_game_names.h:30
-msgid "Gaps"
-msgstr "Gaps"
-
-#: ../aisleriot/translatable_game_names.h:31
-msgid "Gay Gordons"
-msgstr "Gay Gordons"
-
-#: ../aisleriot/translatable_game_names.h:32
-msgid "Glenwood"
-msgstr "Glenwood"
-
-#: ../aisleriot/translatable_game_names.h:33
-msgid "Gold Mine"
-msgstr "Gold Mine"
-
-#: ../aisleriot/translatable_game_names.h:34
-msgid "Golf"
-msgstr "Golf"
-
-#: ../aisleriot/translatable_game_names.h:35
-msgid "Gypsy"
-msgstr "Gypsy"
-
-#: ../aisleriot/translatable_game_names.h:36
-msgid "Helsinki"
-msgstr "Helsinki"
+msgstr "%d:%02d"
 
-#: ../aisleriot/translatable_game_names.h:37
-msgid "Hopscotch"
-msgstr "Hopscotch"
-
-#: ../aisleriot/translatable_game_names.h:38
-msgid "Isabel"
-msgstr "Isabel"
-
-#: ../aisleriot/translatable_game_names.h:39
-msgid "Jamestown"
-msgstr "Jamestown"
-
-#: ../aisleriot/translatable_game_names.h:40
-msgid "Jumbo"
-msgstr "Jumbo"
-
-#: ../aisleriot/translatable_game_names.h:41
-msgid "Kansas"
-msgstr "Kansas"
-
-#: ../aisleriot/translatable_game_names.h:42
-msgid "King Albert"
-msgstr "King Albert"
-
-#: ../aisleriot/translatable_game_names.h:43
-msgid "Kings Audience"
-msgstr "Kings Audience"
-
-#: ../aisleriot/translatable_game_names.h:44
-msgid "Klondike"
-msgstr "Klondike"
-
-#: ../aisleriot/translatable_game_names.h:45
-msgid "Labyrinth"
-msgstr "Labyrinth"
-
-#: ../aisleriot/translatable_game_names.h:46
-msgid "Lady Jane"
-msgstr "Lady Jane"
-
-#: ../aisleriot/translatable_game_names.h:47
-msgid "Maze"
-msgstr "Maze"
-
-#: ../aisleriot/translatable_game_names.h:48
-msgid "Monte Carlo"
-msgstr "Monte Carlo"
-
-#: ../aisleriot/translatable_game_names.h:49
-msgid "Napoleons Tomb"
-msgstr "Napoleons Tomb"
-
-#: ../aisleriot/translatable_game_names.h:50
-msgid "Neighbor"
-msgstr "Neighbor"
-
-#: ../aisleriot/translatable_game_names.h:51
-msgid "Odessa"
-msgstr "Odessa"
-
-#: ../aisleriot/translatable_game_names.h:52
-msgid "Osmosis"
-msgstr "Osmosis"
-
-#: ../aisleriot/translatable_game_names.h:53
-msgid "Peek"
-msgstr "Peek"
-
-#: ../aisleriot/translatable_game_names.h:54
-msgid "Pileon"
-msgstr "Pileon"
-
-#: ../aisleriot/translatable_game_names.h:55
-msgid "Plait"
-msgstr "Plait"
-
-#: ../aisleriot/translatable_game_names.h:56
-msgid "Poker"
-msgstr "Poker"
-
-#: ../aisleriot/translatable_game_names.h:57
-msgid "Quatorze"
-msgstr "Quatorze"
-
-#: ../aisleriot/translatable_game_names.h:58
-msgid "Royal East"
-msgstr "Royal East"
-
-#: ../aisleriot/translatable_game_names.h:59
-msgid "Saratoga"
-msgstr "Saratoga"
-
-#: ../aisleriot/translatable_game_names.h:60
-msgid "Scorpion"
-msgstr "Scorpion"
-
-#: ../aisleriot/translatable_game_names.h:61
-msgid "Scuffle"
-msgstr "Scuffle"
-
-#: ../aisleriot/translatable_game_names.h:62
-msgid "Seahaven"
-msgstr "Seahaven"
-
-#: ../aisleriot/translatable_game_names.h:63
-msgid "Sir Tommy"
-msgstr "Sir Tommy"
-
-#: ../aisleriot/translatable_game_names.h:64
-msgid "Spider"
-msgstr "Spider"
-
-#: ../aisleriot/translatable_game_names.h:65
-msgid "Spiderette"
-msgstr "Spiderette"
-
-#: ../aisleriot/translatable_game_names.h:66
-msgid "Spider Three Decks"
-msgstr "Spider Three Decks"
-
-#: ../aisleriot/translatable_game_names.h:67
-msgid "Straight Up"
-msgstr "Straight Up"
-
-#: ../aisleriot/translatable_game_names.h:68
-msgid "Streets And Alleys"
-msgstr "Streets And Alleys"
-
-#: ../aisleriot/translatable_game_names.h:69
-msgid "Template"
-msgstr "Template"
-
-#: ../aisleriot/translatable_game_names.h:70
-msgid "Ten Across"
-msgstr "Ten Across"
-
-#: ../aisleriot/translatable_game_names.h:71
-msgid "Thieves"
-msgstr "Thieves"
-
-#: ../aisleriot/translatable_game_names.h:72
-msgid "Thirteen"
-msgstr "Thirteen"
-
-#: ../aisleriot/translatable_game_names.h:73
-msgid "Thumb And Pouch"
-msgstr "Thumb And Pouch"
-
-#: ../aisleriot/translatable_game_names.h:74
-msgid "Treize"
-msgstr "Treize"
-
-#: ../aisleriot/translatable_game_names.h:75
-msgid "Triple Peaks"
-msgstr "Triple Peaks"
-
-#: ../aisleriot/translatable_game_names.h:76
-msgid "Union Square"
-msgstr "Union Square"
-
-#: ../aisleriot/translatable_game_names.h:77
-msgid "Valentine"
-msgstr "Valentine"
-
-#: ../aisleriot/translatable_game_names.h:78
-msgid "Westhaven"
-msgstr "Iarthar"
-
-#: ../aisleriot/translatable_game_names.h:79
-msgid "Whitehead"
-msgstr "Whitehead"
-
-#: ../aisleriot/translatable_game_names.h:80
-msgid "Will O The Wisp"
-msgstr "Will o the wisp"
-
-#: ../aisleriot/translatable_game_names.h:81
-msgid "Yield"
-msgstr "Yield"
-
-#: ../aisleriot/translatable_game_names.h:82
-msgid "Yukon"
-msgstr "Yukon"
-
-#: ../aisleriot/translatable_game_names.h:83
-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 ""
 
-#: ../aisleriot/window.c:266 ../aisleriot/window.c:2260
+#: ../aisleriot/window.c:285 ../aisleriot/window.c:2565
 msgid "Select Game"
 msgstr "Roghnaigh Cluiche"
 
-#: ../aisleriot/window.c:270
+#: ../aisleriot/window.c:289
 msgid "_Select"
 msgstr "_Roghnaigh"
 
-#: ../aisleriot/window.c:407
-#, fuzzy
+#: ../aisleriot/window.c:431
 msgid "Congratulations, you have won!"
-msgstr ""
-"Molaim thu!\n"
-"\n"
-"Bua Agat!!!|"
+msgstr "Comhghairdeas, bhuaigh tú!"
 
-#: ../aisleriot/window.c:411
-#, fuzzy
+#: ../aisleriot/window.c:435
 msgid "There are no more moves"
-msgstr "Níl aon gluaiseann fagtha."
+msgstr "Níl aon bheart fágtha"
 
 #. Empty title shows up as "<unnamed>" on maemo
-#: ../aisleriot/window.c:424 ../gnometris/blockops.cpp:229
+#: ../aisleriot/window.c:448 ../gnometris/blockops.cpp:863
 msgid "Game Over"
 msgstr "Cluiche thart"
 
-#: ../aisleriot/window.c:551 ../gnomine/gnomine.c:426
-#: ../mahjongg/mahjongg.c:904
+#: ../aisleriot/window.c:575 ../gnomine/gnomine.c:444
+#: ../mahjongg/mahjongg.c:906
 msgid "Main game:"
 msgstr "Príomhchluiche:"
 
-#: ../aisleriot/window.c:559
+#: ../aisleriot/window.c:583
 msgid "Card games:"
 msgstr "Cluichí cártaí:"
 
-#: ../aisleriot/window.c:573
-#, fuzzy
+#: ../aisleriot/window.c:597
 msgid "Card themes:"
-msgstr "Cluichí Carta:"
+msgstr "Téamaí cártaí:"
 
-#: ../aisleriot/window.c:603
+#: ../aisleriot/window.c:629
 msgid "About FreeCell Solitaire"
-msgstr "Maidir le Solitaire FreeCell"
+msgstr "Maidir Leis an Cluiche Aonair FreeCell"
 
-#: ../aisleriot/window.c:604
+#: ../aisleriot/window.c:630
 msgid "About AisleRiot"
 msgstr "Maidir le AisleRiot"
 
-#: ../aisleriot/window.c:610
+#: ../aisleriot/window.c:636
 msgid ""
 "AisleRiot provides a rule-based solitaire card engine that allows many "
 "different games to be played.\n"
-"\n"
 "AisleRiot is a part of GNOME Games."
 msgstr ""
-
-#: ../aisleriot/window.c:621 ../blackjack/src/menu.cpp:164
-#: ../glchess/src/lib/gtkui/gtkui.py:953 ../glines/glines.c:1221
-#: ../gnect/src/main.c:922 ../gnibbles/main.c:257 ../gnobots2/menu.c:269
-#: ../gnometris/tetris.cpp:1403 ../gnome-sudoku/src/lib/main.py:838
-#: ../gnomine/gnomine.c:466 ../gnotravex/gnotravex.c:1944
-#: ../gnotski/gnotski.c:1638 ../gtali/gyahtzee.c:626 ../iagno/gnothello.c:291
-#: ../mahjongg/mahjongg.c:949 ../same-gnome/ui.c:139
+"Soláthraíonn AisleRiot inneall cártaí riail-bhunaithe a cheadaíonn imirt "
+"neart cluichí difriúla.\n"
+"Is cuid de Chluichí GNOME é AisleRiot."
+
+#: ../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:1315 ../gnome-sudoku/src/lib/main.py:717
+#: ../gnomine/gnomine.c:484 ../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 ""
 "Alastair McKinstry <mckinstry computer org>\n"
@@ -948,258 +1426,277 @@ msgstr ""
 "Alan Horkan <horkan maths tcd ie>\n"
 "Seán de Búrca <leftmostcat gmail com>"
 
-#: ../aisleriot/window.c:625 ../blackjack/src/menu.cpp:163
-#: ../glchess/src/lib/defaults.py.in:50 ../glines/glines.c:1224
-#: ../gnect/src/main.c:919 ../gnibbles/main.c:260 ../gnobots2/menu.c:265
-#: ../gnometris/tetris.cpp:1400 ../gnome-sudoku/src/lib/defaults.py.in:33
-#: ../gnomine/gnomine.c:469 ../gnotravex/gnotravex.c:1947
-#: ../gnotski/gnotski.c:1641 ../gtali/gyahtzee.c:630 ../iagno/gnothello.c:293
-#: ../mahjongg/mahjongg.c:952 ../same-gnome/ui.c:143
+#: ../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:1312 ../gnome-sudoku/src/lib/defaults.py.in:43
+#: ../gnomine/gnomine.c:487 ../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 ""
-
-#: ../aisleriot/window.c:967
-msgid "This game does not have hint support yet."
-msgstr ""
-
-#. Both %s are card names
-#. The first %s is a card name, the 2nd %s a sentence fragment.
-#. * Yes, we know this is bad for i18n.
-#.
-#: ../aisleriot/window.c:1001 ../aisleriot/window.c:1029
-#, c-format
-msgid "Move %s onto %s."
-msgstr "Bog %s ar %s."
+msgstr "Suíomh Gréasáin Cluichí GNOME"
 
-#: ../aisleriot/window.c:1051
+#: ../aisleriot/window.c:1473
 #, c-format
-msgid "You are searching for a %s."
-msgstr ""
-
-#: ../aisleriot/window.c:1056
-msgid "This game is unable to provide a hint."
-msgstr ""
-
-#: ../aisleriot/window.c:1404
-#, c-format
-msgid "Play \"%s\""
+msgid "Play â??%sâ??"
 msgstr "Imir \"%s\""
 
-#: ../aisleriot/window.c:1508
+#: ../aisleriot/window.c:1644
 #, c-format
-msgid "Display cards with \"%s\" card theme"
+msgid "Display cards with â??%sâ?? card theme"
 msgstr ""
 
 #. Translators: if you want to use localised digits for the game score,
 #. * then translate this string to "%I6d", else to "%6d".
 #. * Do not translate it to anything else!
 #.
-#: ../aisleriot/window.c:1584
+#: ../aisleriot/window.c:1739
 #, c-format
-msgid "score|%6d"
-msgstr "score|%6d"
+msgctxt "score"
+msgid "%6d"
+msgstr "%6d"
 
-#: ../aisleriot/window.c:1839
+#: ../aisleriot/window.c:1994
 msgid "A scheme exception occurred"
 msgstr ""
 
-#: ../aisleriot/window.c:1842
+#: ../aisleriot/window.c:1997
 msgid "Please report this bug to the developers."
 msgstr ""
 
-#: ../aisleriot/window.c:1854
+#. 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 "Earráid"
+
+#: ../aisleriot/window.c:2009
 msgid "_Don't report"
-msgstr ""
+msgstr "_Ná tabhair tuairisc"
 
-#: ../aisleriot/window.c:1855
+#: ../aisleriot/window.c:2010
 msgid "_Report"
-msgstr "_Tuairisc"
+msgstr "Tabhair _tuairisc"
 
 #. Menu actions
-#: ../aisleriot/window.c:1941 ../blackjack/src/blackjack.cpp:333
-#: ../glchess/glade/glchess.glade.h:29 ../glines/glines.c:1698
-#: ../gnect/src/main.c:1286 ../gnibbles/main.c:774 ../gnobots2/menu.c:63
-#: ../gnometris/tetris.cpp:105 ../gnome-sudoku/src/lib/main.py:248
-#: ../gnomine/gnomine.c:802 ../gnotravex/gnotravex.c:299
-#: ../gnotski/gnotski.c:486 ../gtali/gyahtzee.c:701
-#: ../mahjongg/mahjongg.c:1274 ../same-gnome/ui.c:463
+#. Preferences Dialog: Title of game options tab
+#: ../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:109
+#: ../gnome-sudoku/src/lib/main.py:241 ../gnomine/gnomine.c:825
+#: ../gnotravex/gnotravex.c:302 ../gnotski/gnotski.c:414
+#: ../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 "_Cluiche"
 
-#: ../aisleriot/window.c:1942 ../blackjack/src/blackjack.cpp:334
-#: ../glchess/glade/glchess.glade.h:44 ../gnect/src/main.c:1287
-#: ../gnibbles/main.c:775 ../gnobots2/menu.c:64
-#: ../gnome-sudoku/src/lib/main.py:269 ../gnotravex/gnotravex.c:300
-#: ../gnotski/gnotski.c:487 ../same-gnome/ui.c:464
+#. Preferences Dialog: Title of view options tab
+#: ../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 "_Amharc"
 
-#: ../aisleriot/window.c:1943 ../blackjack/src/blackjack.cpp:343
+#: ../aisleriot/window.c:2199 ../blackjack/src/blackjack.cpp:341
 msgid "_Control"
 msgstr "_Rialú"
 
-#: ../aisleriot/window.c:1945 ../blackjack/src/blackjack.cpp:350
-#: ../glchess/glade/glchess.glade.h:30 ../glines/glines.c:1700
-#: ../gnect/src/main.c:1289 ../gnibbles/main.c:777 ../gnobots2/menu.c:67
-#: ../gnometris/tetris.cpp:107 ../gnome-sudoku/src/lib/main.py:285
-#: ../gnomine/gnomine.c:804 ../gnotravex/gnotravex.c:303
-#: ../gnotski/gnotski.c:488 ../gtali/gyahtzee.c:703
-#: ../mahjongg/mahjongg.c:1276 ../same-gnome/ui.c:466
+#: ../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:111 ../gnome-sudoku/src/lib/main.py:269
+#: ../gnomine/gnomine.c:827 ../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 "Cab_hair"
 
-#: ../aisleriot/window.c:1950 ../blackjack/src/blackjack.cpp:335
-#: ../glchess/glade/glchess.glade.h:18 ../gnobots2/menu.c:68
-#: ../libgames-support/games-stock.c:54 ../mahjongg/mahjongg.c:1277
+#: ../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 ""
+msgstr "Tosaigh cluiche nua"
 
-#: ../aisleriot/window.c:1953 ../libgames-support/games-stock.c:58
+#: ../aisleriot/window.c:2209 ../libgames-support/games-stock.c:57
 msgid "Restart the game"
-msgstr ""
+msgstr "Atosaigh an cluiche"
 
-#: ../aisleriot/window.c:1955
+#: ../aisleriot/window.c:2211
 msgid "_Select Game..."
 msgstr "_Roghnaigh Cluiche..."
 
-#: ../aisleriot/window.c:1957
-#, fuzzy
+#: ../aisleriot/window.c:2213
 msgid "Play a different game"
-msgstr "Roghnaigh Cluiche eile"
+msgstr "Imir cluiche eile"
 
-#: ../aisleriot/window.c:1959
-#, fuzzy
+#: ../aisleriot/window.c:2215
 msgid "_Recently Played"
-msgstr "Ainmneach Imreoiri"
+msgstr "_Imeartha le Déanaí"
 
-#: ../aisleriot/window.c:1960
+#: ../aisleriot/window.c:2216
 msgid "S_tatistics"
-msgstr ""
+msgstr "_Staitisticí"
 
-#: ../aisleriot/window.c:1961
+#: ../aisleriot/window.c:2217
 msgid "Show gameplay statistics"
 msgstr ""
 
-#: ../aisleriot/window.c:1964 ../libgames-support/games-stock.c:63
+#: ../aisleriot/window.c:2220 ../libgames-support/games-stock.c:62
 msgid "Close this window"
 msgstr ""
 
-#: ../aisleriot/window.c:1967 ../libgames-support/games-stock.c:61
-#: ../mahjongg/mahjongg.c:1285
+#: ../aisleriot/window.c:2223 ../libgames-support/games-stock.c:60
+#: ../mahjongg/mahjongg.c:1253
 msgid "Undo the last move"
 msgstr ""
 
-#: ../aisleriot/window.c:1970 ../libgames-support/games-stock.c:57
+#: ../aisleriot/window.c:2226 ../libgames-support/games-stock.c:56
 msgid "Redo the undone move"
 msgstr ""
 
-#. FIXMEchpe
-#: ../aisleriot/window.c:1972
-#, fuzzy
-msgid "_Deal"
-msgstr "Cabhair"
-
-#: ../aisleriot/window.c:1973
+#: ../aisleriot/window.c:2229
 msgid "Deal next card or cards"
 msgstr ""
 
-#: ../aisleriot/window.c:1976 ../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 ""
 
-#: ../aisleriot/window.c:1979
+#: ../aisleriot/window.c:2235
 msgid "View help for Aisleriot"
 msgstr ""
 
-#: ../aisleriot/window.c:1983 ../libgames-support/games-stock.c:47
+#: ../aisleriot/window.c:2239 ../libgames-support/games-stock.c:46
 msgid "View help for this game"
 msgstr ""
 
-#: ../aisleriot/window.c:1986 ../libgames-support/games-stock.c:62
+#: ../aisleriot/window.c:2242 ../libgames-support/games-stock.c:61
 msgid "About this game"
 msgstr "Maidir leis an gcluiche seo"
 
-#: ../aisleriot/window.c:1994
+#: ../aisleriot/window.c:2245
+msgid "Install card themesâ?¦"
+msgstr ""
+
+#: ../aisleriot/window.c:2246
+msgid "Install new card themes from the distribution packages repositories"
+msgstr ""
+
+#: ../aisleriot/window.c:2255
 #, fuzzy
 msgid "_Card Style"
 msgstr "Cartai fagtha"
 
-#: ../aisleriot/window.c:2026 ../blackjack/src/blackjack.cpp:356
-#: ../glchess/glade/glchess.glade.h:42 ../gnobots2/menu.c:91
-#: ../mahjongg/mahjongg.c:1305
+#: ../aisleriot/window.c:2295 ../blackjack/src/blackjack.cpp:354
+#: ../gnobots2/menu.c:96 ../mahjongg/mahjongg.c:1273
 msgid "_Toolbar"
 msgstr "_Barra Uirlisí"
 
-#: ../aisleriot/window.c:2027 ../gnobots2/menu.c:91
-#: ../mahjongg/mahjongg.c:1305
+#: ../aisleriot/window.c:2296 ../glchess/data/preferences.ui.h:17
+#: ../gnobots2/menu.c:96 ../mahjongg/mahjongg.c:1273
 #, fuzzy
 msgid "Show or hide the toolbar"
 msgstr "Taispeáin no cur i bhfolach an toolbar"
 
-#: ../aisleriot/window.c:2031 ../gnotravex/gnotravex.c:348
+#: ../aisleriot/window.c:2301
+msgid "_Statusbar"
+msgstr "Barra _Stádais"
+
+#: ../aisleriot/window.c:2302
+#, fuzzy
+msgid "Show or hide statusbar"
+msgstr "Taispeáin no cur i bhfolach an toolbar"
+
+#: ../aisleriot/window.c:2307 ../gnotravex/gnotravex.c:351
 msgid "_Click to Move"
-msgstr ""
+msgstr "_Cliceáil Chun Bogtha"
 
-#: ../aisleriot/window.c:2032
+#: ../aisleriot/window.c:2308
 msgid "Pick up and drop cards by clicking"
 msgstr ""
 
-#. not active by default
-#: ../aisleriot/window.c:2035 ../gnobots2/properties.c:502
-#: ../gnometris/tetris.cpp:754
-msgid "_Enable sounds"
+#: ../aisleriot/window.c:2312
+#, fuzzy
+msgid "_Sound"
+msgstr "Fuaim"
+
+#: ../aisleriot/window.c:2313
+msgid "Whether or not to play event sounds"
+msgstr ""
+
+#: ../aisleriot/window.c:2318
+#, fuzzy
+msgid "_Animations"
+msgstr "Beochan"
+
+#: ../aisleriot/window.c:2319
+msgid "Whether or not to animate card moves"
 msgstr ""
 
 #. Add "Highscore" label
-#: ../aisleriot/window.c:2287 ../dependencies/ggz-gtk/playerinfo.c:241
-#: ../glines/glines.c:1932 ../gnobots2/statusbar.c:65
-#: ../gnometris/scoreframe.cpp:49 ../gnomine/gnomine.c:429
+#: ../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:447
 msgid "Score:"
 msgstr "Scór:"
 
-#: ../aisleriot/window.c:2299 ../gnotravex/gnotravex.c:1386
-#: ../mahjongg/mahjongg.c:1510
+#: ../aisleriot/window.c:2604 ../gnotravex/gnotravex.c:1383
+#: ../mahjongg/mahjongg.c:1465
 msgid "Time:"
 msgstr "Am:"
 
-#: ../aisleriot/window.c:2560
+#: ../aisleriot/window.c:2940
 #, c-format
-msgid "Cannot start the game \"%s\""
+msgid "Cannot start the game â??%sâ??"
 msgstr ""
 
-#: ../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/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 ""
 
-#: ../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/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 ""
 
-#: ../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/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 ""
 
-#: ../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/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 ""
 
-#: ../aisleriot/rules/agnes.scm.h:5
+#: ../aisleriot/rules/agnes.scm.h:5 ../aisleriot/rules/terrace.scm.h:5
 msgid "Base Card: ~a"
 msgstr ""
 
@@ -1217,6 +1714,7 @@ msgstr ""
 #: ../aisleriot/rules/eagle_wing.scm.h:11 ../aisleriot/rules/easthaven.scm.h:4
 #: ../aisleriot/rules/elevator.scm.h:2 ../aisleriot/rules/escalator.scm.h:2
 #: ../aisleriot/rules/first_law.scm.h:17 ../aisleriot/rules/fortunes.scm.h:4
+#: ../aisleriot/rules/forty_thieves.scm.h:3
 #: ../aisleriot/rules/glenwood.scm.h:11 ../aisleriot/rules/gypsy.scm.h:3
 #: ../aisleriot/rules/helsinki.scm.h:1 ../aisleriot/rules/hopscotch.scm.h:3
 #: ../aisleriot/rules/jamestown.scm.h:1 ../aisleriot/rules/jumbo.scm.h:4
@@ -1226,7 +1724,8 @@ msgstr ""
 #: ../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/thieves.scm.h:2 ../aisleriot/rules/thirteen.scm.h:3
+#: ../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
 #: ../aisleriot/rules/union_square.scm.h:2
@@ -1257,7 +1756,7 @@ msgstr ""
 #: ../aisleriot/rules/athena.scm.h:1 ../aisleriot/rules/klondike.scm.h:8
 #: ../aisleriot/rules/osmosis.scm.h:5 ../aisleriot/rules/saratoga.scm.h:1
 msgid "Three card deals"
-msgstr ""
+msgstr "Rannta trí chárta"
 
 #: ../aisleriot/rules/auld_lang_syne.scm.h:1
 #: ../aisleriot/rules/bristol.scm.h:1 ../aisleriot/rules/first_law.scm.h:1
@@ -1271,7 +1770,7 @@ msgstr ""
 #: ../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/straight_up.scm.h:1 ../aisleriot/rules/terrace.scm.h:8
 msgid "Deal a new card from the deck"
 msgstr ""
 
@@ -1280,39 +1779,44 @@ msgstr ""
 #: ../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:13
 #: ../aisleriot/rules/thumb_and_pouch.scm.h:3 ../aisleriot/rules/zebra.scm.h:3
 msgid "Redeals left:"
 msgstr ""
 
-#: ../aisleriot/rules/backbone.scm.h:5
+#: ../aisleriot/rules/backbone.scm.h:5 ../aisleriot/rules/terrace.scm.h:23
 msgid "an empty slot on the foundation"
 msgstr ""
 
-#: ../aisleriot/rules/backbone.scm.h:6
+#: ../aisleriot/rules/backbone.scm.h:6 ../aisleriot/rules/terrace.scm.h:24
 msgid "an empty slot on the tableau"
 msgstr ""
 
 #: ../aisleriot/rules/bakers_dozen.scm.h:2
-#: ../aisleriot/rules/bakers_game.scm.h:2
 #: ../aisleriot/rules/chessboard.scm.h:8 ../aisleriot/rules/easthaven.scm.h:5
 #: ../aisleriot/rules/eight_off.scm.h:2 ../aisleriot/rules/fortress.scm.h:2
-#: ../aisleriot/rules/gypsy.scm.h:4 ../aisleriot/rules/jumbo.scm.h:6
-#: ../aisleriot/rules/kansas.scm.h:9 ../aisleriot/rules/king_albert.scm.h:2
-#: ../aisleriot/rules/seahaven.scm.h:2
+#: ../aisleriot/rules/forty_thieves.scm.h:4 ../aisleriot/rules/gypsy.scm.h:4
+#: ../aisleriot/rules/jumbo.scm.h:6 ../aisleriot/rules/kansas.scm.h:9
+#: ../aisleriot/rules/king_albert.scm.h:2 ../aisleriot/rules/seahaven.scm.h:2
 #: ../aisleriot/rules/streets_and_alleys.scm.h:2
 #: ../aisleriot/rules/westhaven.scm.h:3 ../aisleriot/rules/whitehead.scm.h:4
 #: ../aisleriot/rules/yukon.scm.h:1
 msgid "an empty foundation"
 msgstr ""
 
-#: ../aisleriot/rules/bakers_game.scm.h:1 ../aisleriot/rules/eight_off.scm.h:1
-#: ../aisleriot/rules/seahaven.scm.h:1
-msgid "Move something on to an empty reserve"
+#: ../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 ""
 
-#: ../aisleriot/rules/bakers_game.scm.h:3 ../aisleriot/rules/eight_off.scm.h:3
-#: ../aisleriot/rules/seahaven.scm.h:3
-msgid "an empty tableau"
+#: ../aisleriot/rules/bear_river.scm.h:6
+msgid "Move something onto an empty right-hand tableau slot"
+msgstr ""
+
+#: ../aisleriot/rules/bear_river.scm.h:7
+msgid "an empty foundation slot"
 msgstr ""
 
 #: ../aisleriot/rules/camelot.scm.h:3
@@ -1349,12 +1853,6 @@ msgstr ""
 msgid "itself"
 msgstr ""
 
-#: ../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 ""
-
 #: ../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
@@ -1470,6 +1968,14 @@ msgstr ""
 msgid "No hint available right now"
 msgstr ""
 
+#: ../aisleriot/rules/eight_off.scm.h:1 ../aisleriot/rules/seahaven.scm.h:1
+msgid "Move something on to an empty reserve"
+msgstr ""
+
+#: ../aisleriot/rules/eight_off.scm.h:3 ../aisleriot/rules/seahaven.scm.h:3
+msgid "an empty tableau"
+msgstr ""
+
 #: ../aisleriot/rules/first_law.scm.h:2
 msgid "I'm not sure"
 msgstr ""
@@ -1538,6 +2044,19 @@ msgstr ""
 msgid "Move ~a off the board"
 msgstr ""
 
+#: ../aisleriot/rules/forty_thieves.scm.h:1
+msgid "Bug! make-hint called on false move."
+msgstr ""
+
+#: ../aisleriot/rules/forty_thieves.scm.h:2
+#, fuzzy
+msgid "Deal a card from stock"
+msgstr "Gluais carta as an Bruscar"
+
+#: ../aisleriot/rules/forty_thieves.scm.h:5
+msgid "an empty space"
+msgstr ""
+
 #: ../aisleriot/rules/freecell.scm.h:1
 msgid "No moves are possible. Undo or start again."
 msgstr ""
@@ -1554,7 +2073,7 @@ msgstr ""
 msgid "an open tableau"
 msgstr ""
 
-#: ../aisleriot/rules/freecell.scm.h:5
+#: ../aisleriot/rules/freecell.scm.h:5 ../aisleriot/rules/terrace.scm.h:26
 msgid "the foundation"
 msgstr ""
 
@@ -1567,9 +2086,8 @@ msgid "Double click any card to redeal."
 msgstr ""
 
 #: ../aisleriot/rules/gaps.scm.h:3
-#, fuzzy
 msgid "No hint available."
-msgstr "Níl aon nod ann"
+msgstr "Níl aon leid le fáil."
 
 #: ../aisleriot/rules/gaps.scm.h:4
 msgid "Place a two in the leftmost slot of row ~a."
@@ -1583,6 +2101,44 @@ msgstr ""
 msgid "Randomly Placed Gaps on Redeal"
 msgstr ""
 
+#: ../aisleriot/rules/giant.scm.h:1
+msgid "Alternating colors"
+msgstr ""
+
+#: ../aisleriot/rules/giant.scm.h:2
+msgid "Deal a row"
+msgstr ""
+
+#: ../aisleriot/rules/giant.scm.h:3
+#, fuzzy
+msgid "Deals left: ~a"
+msgstr "Cartai fagtha"
+
+#: ../aisleriot/rules/giant.scm.h:4
+#, fuzzy
+msgid "Same suit"
+msgstr "Tidéal cluiche"
+
+#: ../aisleriot/rules/giant.scm.h:5
+msgid "Try dealing a row of cards"
+msgstr ""
+
+#: ../aisleriot/rules/giant.scm.h:6
+msgid "Try moving a card to the reserve"
+msgstr ""
+
+#: ../aisleriot/rules/giant.scm.h:7 ../aisleriot/rules/spider.scm.h:7
+msgid "Try moving card piles around"
+msgstr ""
+
+#: ../aisleriot/rules/giant.scm.h:8
+msgid "an empty foundation place"
+msgstr ""
+
+#: ../aisleriot/rules/giant.scm.h:9
+msgid "an empty tableau place"
+msgstr ""
+
 #: ../aisleriot/rules/glenwood.scm.h:7
 msgid "Move a card from the reserve on to the empty tableau slot"
 msgstr ""
@@ -1640,11 +2196,11 @@ msgstr ""
 
 #: ../aisleriot/rules/klondike.scm.h:4
 msgid "No redeals"
-msgstr ""
+msgstr "Gan athroinnt"
 
 #: ../aisleriot/rules/klondike.scm.h:6
 msgid "Single card deals"
-msgstr ""
+msgstr "Rannta cárta aonair"
 
 #: ../aisleriot/rules/klondike.scm.h:9
 msgid "Try moving cards down from the foundation"
@@ -1668,7 +2224,7 @@ msgstr ""
 msgid "Redeals left: ~a"
 msgstr ""
 
-#: ../aisleriot/rules/pileon.scm.h:2
+#: ../aisleriot/rules/pileon.scm.h:2 ../aisleriot/rules/terrace.scm.h:25
 msgid "something"
 msgstr ""
 
@@ -1729,14 +2285,14 @@ msgstr ""
 msgid "Please fill in empty pile first."
 msgstr ""
 
-#: ../aisleriot/rules/spider.scm.h:7
-msgid "Try moving card piles around"
-msgstr ""
-
 #: ../aisleriot/rules/spider.scm.h:8
 msgid "Two Suits"
 msgstr ""
 
+#: ../aisleriot/rules/spider.scm.h:9
+msgid "Undo until there are enough cards to fill all tableau piles"
+msgstr ""
+
 #: ../aisleriot/rules/ten_across.scm.h:1
 msgid "Allow temporary spots use"
 msgstr ""
@@ -1747,16 +2303,37 @@ msgstr ""
 
 #: ../aisleriot/rules/ten_across.scm.h:3
 msgid "No hint available"
-msgstr "Níl aon leid ar fáil"
-
-#: ../aisleriot/rules/ten_across.scm.h:5
-#, fuzzy
-msgid "and all cards below it"
-msgstr "agus gach cartai faoi sin"
-
-#: ../aisleriot/rules/ten_across.scm.h:6
-msgid "empty slot(s)"
-msgstr ""
+msgstr "Níl aon leid le fáil"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. 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"
 
 #: ../aisleriot/rules/thieves.scm.h:1
 msgid "Deal a card from the deck"
@@ -1786,8 +2363,8 @@ msgstr ""
 msgid "the appropriate Foundation pile"
 msgstr ""
 
-#: ../blackjack/data/blackjack.desktop.in.in.h:1 ../blackjack/src/menu.cpp:152
-#: ../blackjack/src/splash.cpp:93
+#: ../blackjack/data/blackjack.desktop.in.in.h:1 ../blackjack/src/menu.cpp:147
+#: ../blackjack/src/splash.cpp:95
 msgid "Blackjack"
 msgstr "Blackjack"
 
@@ -1839,206 +2416,214 @@ msgstr ""
 msgid "Use a quick deal with no delay between each card."
 msgstr ""
 
-#: ../blackjack/src/blackjack.cpp:94
+#: ../blackjack/data/blackjack.schemas.in.h:14
+msgid "Whether or not to show the toolbar."
+msgstr ""
+
+#: ../blackjack/src/blackjack.cpp:92
 #, c-format
 msgid "Blackjack - %s"
 msgstr "Blackjack - %s"
 
-#: ../blackjack/src/blackjack.cpp:336 ../mahjongg/mahjongg.c:1280
+#: ../blackjack/src/blackjack.cpp:334 ../mahjongg/mahjongg.c:1248
 msgid "Restart the current game"
 msgstr ""
 
-#: ../blackjack/src/blackjack.cpp:337 ../mahjongg/mahjongg.c:1289
+#: ../blackjack/src/blackjack.cpp:335 ../mahjongg/mahjongg.c:1257
 msgid "Show a hint"
-msgstr ""
+msgstr "Taispeáin leid"
 
-#: ../blackjack/src/blackjack.cpp:339 ../glines/glines.c:1699
-#: ../gnect/src/main.c:1288 ../gnibbles/main.c:776 ../gnobots2/menu.c:66
-#: ../gnometris/tetris.cpp:106 ../gnomine/gnomine.c:803
-#: ../gtali/gyahtzee.c:702 ../mahjongg/mahjongg.c:1275
+#: ../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:110 ../gnomine/gnomine.c:826
+#: ../gtali/gyahtzee.c:702 ../iagno/gnothello.c:813
+#: ../mahjongg/mahjongg.c:1243
 msgid "_Settings"
 msgstr "_Socruithe"
 
-#: ../blackjack/src/blackjack.cpp:344
+#: ../blackjack/src/blackjack.cpp:342
 msgid "D_eal"
 msgstr ""
 
-#: ../blackjack/src/blackjack.cpp:344 ../blackjack/src/dialog.cpp:98
-#: ../blackjack/src/dialog.cpp:101
+#: ../blackjack/src/blackjack.cpp:342 ../blackjack/src/dialog.cpp:99
+#: ../blackjack/src/dialog.cpp:102
 msgid "Deal a new hand"
 msgstr ""
 
-#: ../blackjack/src/blackjack.cpp:345
-#, fuzzy
+#: ../blackjack/src/blackjack.cpp:343
 msgid "_Hit"
-msgstr "Thit"
+msgstr "_Buail"
 
-#: ../blackjack/src/blackjack.cpp:345
+#: ../blackjack/src/blackjack.cpp:343
 msgid "Add a card to the hand"
 msgstr ""
 
-#: ../blackjack/src/blackjack.cpp:346
+#: ../blackjack/src/blackjack.cpp:344
 #, fuzzy
 msgid "_Stand"
 msgstr "_Fuaim"
 
-#: ../blackjack/src/blackjack.cpp:346
+#: ../blackjack/src/blackjack.cpp:344
 msgid "Stop adding cards to the hand"
 msgstr ""
 
-#: ../blackjack/src/blackjack.cpp:347
+#: ../blackjack/src/blackjack.cpp:345
 msgid "S_urrender"
 msgstr ""
 
-#: ../blackjack/src/blackjack.cpp:347
+#: ../blackjack/src/blackjack.cpp:345
 msgid "Forfeit this hand for half of your wager"
 msgstr ""
 
-#: ../blackjack/src/blackjack.cpp:348
+#: ../blackjack/src/blackjack.cpp:346
 #, fuzzy
 msgid "_Double down"
 msgstr "Doublets"
 
-#: ../blackjack/src/blackjack.cpp:348
+#: ../blackjack/src/blackjack.cpp:346
 msgid "Double your wager for a single hit"
 msgstr ""
 
-#: ../blackjack/src/blackjack.cpp:349
+#: ../blackjack/src/blackjack.cpp:347
 msgid "S_plit the hand"
 msgstr ""
 
-#: ../blackjack/src/blackjack.cpp:349
+#: ../blackjack/src/blackjack.cpp:347
 msgid "Split cards in two new hands"
 msgstr ""
 
-#: ../blackjack/src/blackjack.cpp:356 ../gnobots2/gnobots2.schemas.in.h:23
+#: ../blackjack/src/blackjack.cpp:354 ../gnobots2/gnobots2.schemas.in.h:21
 #, fuzzy
 msgid "Show toolbar"
 msgstr "Taispeáin tool bar"
 
-#: ../blackjack/src/blackjack.cpp:393
+#: ../blackjack/src/blackjack.cpp:391
 #, fuzzy
 msgid "Cards left:"
 msgstr "Cartai fagtha"
 
-#: ../blackjack/src/blackjack.cpp:402
+#: ../blackjack/src/blackjack.cpp:400
 msgid "Wager:"
 msgstr ""
 
-#: ../blackjack/src/blackjack.cpp:415
+#: ../blackjack/src/blackjack.cpp:413
 msgid "Balance:"
 msgstr ""
 
-#: ../blackjack/src/blackjack.cpp:455
+#: ../blackjack/src/blackjack.cpp:451
 msgid "Place your wager or deal a hand"
 msgstr ""
 
-#: ../blackjack/src/blackjack.cpp:659
+#: ../blackjack/src/blackjack.cpp:658
 #, fuzzy
 msgid "Blackjack rule set to use"
 msgstr "Roghnachais Blackjack"
 
+#: ../blackjack/src/card-selector.cpp:123
+msgid "Card Style"
+msgstr ""
+
 #: ../blackjack/src/dialog.cpp:51
 msgid "Would you like insurance?"
 msgstr ""
 
-#: ../blackjack/src/dialog.cpp:52
-#, c-format
+#: ../blackjack/src/dialog.cpp:53
+#, no-c-format
 msgid ""
-"Insurance is a side wager of 50%% of the original wager that the dealer has "
-"a natural 21 (aka blackjack) that is offered when the dealer's face up card "
-"is an ace. If the dealer has a natural 21 then the player is paid double."
+"Insurance is a side wager of 50% of the original wager that the dealer has a "
+"natural 21 (aka blackjack) that is offered when the dealer's face up card is "
+"an ace. If the dealer has a natural 21 then the player is paid double."
 msgstr ""
 
-#: ../blackjack/src/dialog.cpp:99
+#: ../blackjack/src/dialog.cpp:100
 msgid "Set your wager and click in the white outline to deal a new hand."
 msgstr ""
 
-#: ../blackjack/src/dialog.cpp:102
+#: ../blackjack/src/dialog.cpp:103
 msgid "Set your wager or click on the cards to deal a new hand."
 msgstr ""
 
-#: ../blackjack/src/dialog.cpp:230
+#: ../blackjack/src/dialog.cpp:225
 msgid "Blackjack Preferences"
 msgstr "Sainroghanna Blackjack"
 
-#: ../blackjack/src/dialog.cpp:246 ../dependencies/ggz-gtk/client.c:919
-#: ../gnect/src/prefs.c:298 ../gnibbles/preferences.c:251
-#: ../gnobots2/properties.c:523 ../gnometris/tetris.cpp:681
-#: ../iagno/properties.c:421
+#: ../blackjack/src/dialog.cpp:241 ../dependencies/ggz-gtk/client.c:953
+#: ../gnect/src/prefs.c:301 ../gnibbles/preferences.c:253
+#: ../gnobots2/properties.c:491 ../gnometris/tetris.cpp:596
+#: ../iagno/properties.c:416
 msgid "Game"
 msgstr "Cluiche"
 
-#: ../blackjack/src/dialog.cpp:253
+#: ../blackjack/src/dialog.cpp:248
 #, fuzzy
 msgid "_Display hand probabilities"
 msgstr "Taispeain na staidreamh"
 
-#: ../blackjack/src/dialog.cpp:263
+#: ../blackjack/src/dialog.cpp:258
 msgid "_Quick deals (no delay between each card)"
 msgstr ""
 
-#: ../blackjack/src/dialog.cpp:272
+#: ../blackjack/src/dialog.cpp:267
 msgid "_Never take insurance"
 msgstr ""
 
-#: ../blackjack/src/dialog.cpp:279
+#: ../blackjack/src/dialog.cpp:274
 msgid "_Reset Balance"
 msgstr ""
 
 #. Rules Tab
-#: ../blackjack/src/dialog.cpp:285
+#: ../blackjack/src/dialog.cpp:280
 msgid "Rules"
-msgstr "Ceannas"
+msgstr "Rialacha"
 
-#: ../blackjack/src/dialog.cpp:310 ../dependencies/ggz-gtk/types.c:176
-#: ../dependencies/ggz-gtk/playerlist.c:362
-#: ../libgames-support/games-dlg-players.c:221
-#: ../libgames-support/games-scores-dialog.c:531
+#: ../blackjack/src/dialog.cpp:305 ../dependencies/ggz-gtk/types.c:176
+#: ../dependencies/ggz-gtk/playerlist.c:364
+#: ../libgames-support/games-dlg-players.c:224
+#: ../libgames-support/games-scores-dialog.c:538
 msgid "Name"
 msgstr "Ainm"
 
-#: ../blackjack/src/dialog.cpp:315
+#: ../blackjack/src/dialog.cpp:310
 msgid "Decks"
 msgstr ""
 
-#: ../blackjack/src/dialog.cpp:320
+#: ../blackjack/src/dialog.cpp:315
 msgid "Hit Soft 17"
 msgstr ""
 
-#: ../blackjack/src/dialog.cpp:325
+#: ../blackjack/src/dialog.cpp:320
 msgid "Double Any Total"
 msgstr ""
 
-#: ../blackjack/src/dialog.cpp:330
+#: ../blackjack/src/dialog.cpp:325
 msgid "Double 9"
 msgstr ""
 
-#: ../blackjack/src/dialog.cpp:335
+#: ../blackjack/src/dialog.cpp:330
 msgid "Double Soft"
 msgstr ""
 
-#: ../blackjack/src/dialog.cpp:340
+#: ../blackjack/src/dialog.cpp:335
 msgid "Double After Hit"
 msgstr ""
 
-#: ../blackjack/src/dialog.cpp:345
+#: ../blackjack/src/dialog.cpp:340
 msgid "Double After Split"
 msgstr ""
 
-#: ../blackjack/src/dialog.cpp:350
+#: ../blackjack/src/dialog.cpp:345
 msgid "Resplit"
 msgstr ""
 
-#: ../blackjack/src/dialog.cpp:355
+#: ../blackjack/src/dialog.cpp:350
 msgid "Resplit Aces"
 msgstr ""
 
-#: ../blackjack/src/dialog.cpp:360 ../blackjack/src/player.cpp:303
+#: ../blackjack/src/dialog.cpp:355 ../blackjack/src/player.cpp:303
 msgid "Surrender"
 msgstr ""
 
-#: ../blackjack/src/dialog.cpp:365
+#: ../blackjack/src/dialog.cpp:360
 msgid "Dealer Speed"
 msgstr ""
 
@@ -2072,11 +2657,11 @@ msgstr ""
 msgid "Click to deal a new hand"
 msgstr ""
 
-#: ../blackjack/src/game.cpp:483
+#: ../blackjack/src/game.cpp:394
 msgid "Blackjack can't load the requested file"
 msgstr ""
 
-#: ../blackjack/src/game.cpp:485
+#: ../blackjack/src/game.cpp:396
 msgid "Please check your Blackjack installation"
 msgstr ""
 
@@ -2132,7 +2717,7 @@ msgid ""
 "this by selecting the option from the Control menu."
 msgstr ""
 
-#: ../blackjack/src/menu.cpp:159
+#: ../blackjack/src/menu.cpp:154
 msgid ""
 "Blackjack is a casino-style card game.\n"
 "\n"
@@ -2157,7 +2742,7 @@ msgstr "Bog"
 
 #: ../blackjack/src/player.cpp:189
 msgid "Win"
-msgstr "Bua"
+msgstr "Buaigh"
 
 #: ../blackjack/src/player.cpp:190
 msgid "Push"
@@ -2177,7 +2762,7 @@ msgstr ""
 
 #: ../blackjack/src/player.cpp:266
 msgid "Hit"
-msgstr "Thit"
+msgstr "Buail"
 
 #: ../blackjack/src/player.cpp:277
 msgid "Double"
@@ -2225,8 +2810,10 @@ msgstr ""
 msgid "Error joining room: %s"
 msgstr ""
 
+#. 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:1396
+#: ../dependencies/ggz-gtk/client.c:1430
+#: ../glchess/src/lib/gtkui/network.py:28
 msgid "GGZ Gaming Zone"
 msgstr ""
 
@@ -2285,7 +2872,7 @@ msgstr ""
 msgid "You have left the table."
 msgstr ""
 
-#: ../dependencies/ggz-gtk/ggzclient.c:624 ../gnibbles/main.c:704
+#: ../dependencies/ggz-gtk/ggzclient.c:624 ../gnibbles/main.c:693
 #, fuzzy, c-format
 msgid "The game is over."
 msgstr "Cluiche nua tosnu"
@@ -2301,7 +2888,7 @@ msgid "Error leaving table: %s"
 msgstr ""
 
 #: ../dependencies/ggz-gtk/ggzclient.c:718
-#: ../dependencies/ggz-gtk/client.c:1121
+#: ../dependencies/ggz-gtk/client.c:1155
 msgid "Current Room:"
 msgstr ""
 
@@ -2400,64 +2987,68 @@ msgstr ""
 msgid "Login failed for unknown reason: %s"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/login.c:553
+#: ../dependencies/ggz-gtk/login.c:336 ../dependencies/ggz-gtk/client.c:307
+msgid "Unable to open help file"
+msgstr ""
+
+#: ../dependencies/ggz-gtk/login.c:587
 #, fuzzy
 msgid "Network Game"
 msgstr "Cluiche Nua"
 
-#: ../dependencies/ggz-gtk/login.c:570
+#: ../dependencies/ggz-gtk/login.c:604
 msgid "Server Profile"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/login.c:580 ../dependencies/ggz-gtk/props.c:909
+#: ../dependencies/ggz-gtk/login.c:614 ../dependencies/ggz-gtk/props.c:909
 msgid "Profile:"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/login.c:600
+#: ../dependencies/ggz-gtk/login.c:634
 msgid "Edit Profiles"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/login.c:608 ../dependencies/ggz-gtk/props.c:930
+#: ../dependencies/ggz-gtk/login.c:642 ../dependencies/ggz-gtk/props.c:930
 msgid "Server:"
 msgstr "Freastalaí:"
 
-#: ../dependencies/ggz-gtk/login.c:620 ../dependencies/ggz-gtk/props.c:945
+#: ../dependencies/ggz-gtk/login.c:654 ../dependencies/ggz-gtk/props.c:945
 msgid "Port:"
 msgstr "Port:"
 
-#: ../dependencies/ggz-gtk/login.c:643 ../dependencies/ggz-gtk/props.c:1434
+#: ../dependencies/ggz-gtk/login.c:677 ../dependencies/ggz-gtk/props.c:1434
 msgid "User Information"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/login.c:656 ../dependencies/ggz-gtk/props.c:977
+#: ../dependencies/ggz-gtk/login.c:690 ../dependencies/ggz-gtk/props.c:977
 msgid "Username:"
 msgstr "Ainm �sáideora:"
 
-#: ../dependencies/ggz-gtk/login.c:671 ../dependencies/ggz-gtk/props.c:998
+#: ../dependencies/ggz-gtk/login.c:705 ../dependencies/ggz-gtk/props.c:998
 msgid "Password:"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/login.c:687
+#: ../dependencies/ggz-gtk/login.c:721
 msgid "Email:"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/login.c:702
+#: ../dependencies/ggz-gtk/login.c:736
 msgid "Authentication type"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/login.c:711 ../dependencies/ggz-gtk/props.c:1041
+#: ../dependencies/ggz-gtk/login.c:745 ../dependencies/ggz-gtk/props.c:1041
 msgid "Normal Login"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/login.c:722 ../dependencies/ggz-gtk/props.c:1049
+#: ../dependencies/ggz-gtk/login.c:756 ../dependencies/ggz-gtk/props.c:1049
 msgid "Guest Login"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/login.c:730
+#: ../dependencies/ggz-gtk/login.c:764
 msgid "First-time Login"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/login.c:754 ../dependencies/ggz-gtk/client.c:892
+#: ../dependencies/ggz-gtk/login.c:788 ../dependencies/ggz-gtk/client.c:926
 msgid "Connect"
 msgstr "Nasc"
 
@@ -2556,126 +3147,126 @@ msgid ""
 "Would you like to create some default server profiles?"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:96
+#: ../dependencies/ggz-gtk/chat.c:95
 msgid "/msg <username> <message> . Private message a player"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:98
+#: ../dependencies/ggz-gtk/chat.c:97
 msgid "/table <message> .......... Message to your table"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:100
+#: ../dependencies/ggz-gtk/chat.c:99
 msgid "/wall <message> ........... Admin command"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:102
+#: ../dependencies/ggz-gtk/chat.c:101
 msgid "/beep <username> .......... Beep a player"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:104
+#: ../dependencies/ggz-gtk/chat.c:103
 msgid "/help ..................... Get help"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:106
+#: ../dependencies/ggz-gtk/chat.c:105
 msgid "/friends .................. List your friends"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:108
+#: ../dependencies/ggz-gtk/chat.c:107
 msgid "/ignore ................... List people you're ignoring"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:111
+#: ../dependencies/ggz-gtk/chat.c:110
 msgid "/kick <username> .......... Kick a player from the room"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:114
+#: ../dependencies/ggz-gtk/chat.c:113
 msgid "/gag <username> ........... Gag a player to prevent them from talking"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:117
+#: ../dependencies/ggz-gtk/chat.c:116
 msgid ""
 "/ungag <username> ......... Reverse the gag operation to allow a player to "
 "talk"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:120
+#: ../dependencies/ggz-gtk/chat.c:119
 msgid "/ban <username> ........... Ban a player from the server"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:261
+#: ../dependencies/ggz-gtk/chat.c:260
 #, c-format
 msgid "You have received an unknown message from %s."
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:325
+#: ../dependencies/ggz-gtk/chat.c:324
 #, c-format
 msgid "You've been beeped by %s."
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:446
+#: ../dependencies/ggz-gtk/chat.c:445
 msgid "Usage: /msg <username> <message>"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:448
+#: ../dependencies/ggz-gtk/chat.c:447
 msgid "    Sends a private message to a user on the network."
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:502
+#: ../dependencies/ggz-gtk/chat.c:501
 #, fuzzy, c-format
 msgid "Beep sent to %s."
 msgstr "Gluais %s onto %s."
 
-#: ../dependencies/ggz-gtk/chat.c:530
+#: ../dependencies/ggz-gtk/chat.c:529
 #, c-format
 msgid "%s (logged on)"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:568
+#: ../dependencies/ggz-gtk/chat.c:567
 #, c-format
 msgid "%s (logged off)"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:594
+#: ../dependencies/ggz-gtk/chat.c:593
 msgid "Chat Commands"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:595
+#: ../dependencies/ggz-gtk/chat.c:594
 msgid "-------------"
-msgstr ""
+msgstr "-------------"
 
-#: ../dependencies/ggz-gtk/chat.c:599
+#: ../dependencies/ggz-gtk/chat.c:598
 msgid "/me <action> .............. Send an action"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:792
+#: ../dependencies/ggz-gtk/chat.c:796
 #, c-format
 msgid "Added %s to your friends list."
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:816
+#: ../dependencies/ggz-gtk/chat.c:820
 #, c-format
 msgid "Removed %s from your friends list."
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:847
+#: ../dependencies/ggz-gtk/chat.c:851
 #, c-format
 msgid "Added %s to your ignore list."
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:872
+#: ../dependencies/ggz-gtk/chat.c:876
 #, c-format
 msgid "Removed %s from your ignore list."
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:948
+#: ../dependencies/ggz-gtk/chat.c:952
 msgid "People currently your friends"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:962
+#: ../dependencies/ggz-gtk/chat.c:966
 msgid "People you're currently ignoring"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/chat.c:1038
+#: ../dependencies/ggz-gtk/chat.c:1042
 msgid "Multiple matches:"
 msgstr ""
 
@@ -2713,8 +3304,8 @@ msgid "You can only play one game at a time."
 msgstr ""
 
 #: ../dependencies/ggz-gtk/game.c:297 ../dependencies/ggz-gtk/game.c:305
-#: ../dependencies/ggz-gtk/launch.c:335 ../dependencies/ggz-gtk/client.c:549
-#: ../dependencies/ggz-gtk/client.c:590
+#: ../dependencies/ggz-gtk/launch.c:335 ../dependencies/ggz-gtk/client.c:583
+#: ../dependencies/ggz-gtk/client.c:624
 #, fuzzy
 msgid "Game Error"
 msgstr "Cluiche thart"
@@ -2745,7 +3336,7 @@ msgid ""
 "to be able to play this game."
 msgstr ""
 
-#: ../dependencies/ggz-gtk/about.c:87 ../dependencies/ggz-gtk/client.c:1043
+#: ../dependencies/ggz-gtk/about.c:87 ../dependencies/ggz-gtk/client.c:1077
 msgid "About"
 msgstr ""
 
@@ -2753,7 +3344,7 @@ msgstr ""
 msgid "Message of the Day"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/types.c:113 ../iagno/properties.c:543
+#: ../dependencies/ggz-gtk/types.c:113 ../iagno/properties.c:538
 msgid "None"
 msgstr "Neamhní"
 
@@ -2765,14 +3356,14 @@ msgid ""
 msgstr ""
 
 #: ../dependencies/ggz-gtk/types.c:151 ../dependencies/ggz-gtk/client.c:237
-#: ../dependencies/ggz-gtk/client.c:249 ../dependencies/ggz-gtk/client.c:510
+#: ../dependencies/ggz-gtk/client.c:249 ../dependencies/ggz-gtk/client.c:544
 #, fuzzy
 msgid "Not Implemented"
 msgstr "Criochnaithe"
 
-#: ../dependencies/ggz-gtk/types.c:183 ../dependencies/ggz-gtk/tablelist.c:201
-#: ../glchess/src/lib/gtkui/network.py:65
-#: ../glchess/src/lib/gtkui/network.py:100
+#. 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:192
 #, fuzzy
 msgid "Description"
 msgstr "Scorpion"
@@ -2785,7 +3376,7 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/types.c:237 ../dependencies/ggz-gtk/client.c:1015
+#: ../dependencies/ggz-gtk/types.c:237 ../dependencies/ggz-gtk/client.c:1049
 #, fuzzy
 msgid "Game Types"
 msgstr "Saghas Cluiche"
@@ -2839,7 +3430,7 @@ msgstr "Dubh:"
 
 #. Add "Private chat" label
 #: ../dependencies/ggz-gtk/playerinfo.c:259
-#: ../dependencies/ggz-gtk/client.c:1202
+#: ../dependencies/ggz-gtk/client.c:1236
 msgid "Message:"
 msgstr ""
 
@@ -2867,7 +3458,7 @@ msgid "Administrator"
 msgstr ""
 
 #: ../dependencies/ggz-gtk/playerinfo.c:349
-#: ../libgames-support/games-dlg-players.c:126
+#: ../libgames-support/games-dlg-players.c:127
 msgid "Bot"
 msgstr ""
 
@@ -2875,7 +3466,7 @@ msgstr ""
 #: ../dependencies/ggz-gtk/playerlist.c:94
 #: ../dependencies/ggz-gtk/tablelist.c:84
 #: ../dependencies/ggz-gtk/roomlist.c:144
-#: ../libgames-support/games-dlg-players.c:419
+#: ../libgames-support/games-dlg-players.c:415
 #, fuzzy
 msgid "Info"
 msgstr "Iagno"
@@ -2894,17 +3485,19 @@ msgstr "Iagno"
 msgid "#%d"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/playerlist.c:346
+#. Translators: L is short for 'Network Latency'.
+#: ../dependencies/ggz-gtk/playerlist.c:347
 msgid "L"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/playerlist.c:351
-#: ../dependencies/ggz-gtk/tablelist.c:191
+#. Translators: T# is short for 'Table Number'.
+#: ../dependencies/ggz-gtk/playerlist.c:353
+#: ../dependencies/ggz-gtk/tablelist.c:192
 msgid "T#"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/playerlist.c:356
-#: ../dependencies/ggz-gtk/client.c:1096
+#: ../dependencies/ggz-gtk/playerlist.c:358
+#: ../dependencies/ggz-gtk/client.c:1130
 msgid "Stats"
 msgstr ""
 
@@ -2917,15 +3510,13 @@ msgid "Don't ask me again."
 msgstr ""
 
 #: ../dependencies/ggz-gtk/tablelist.c:74
-#: ../dependencies/ggz-gtk/roomlist.c:150 ../dependencies/ggz-gtk/client.c:935
-#: ../dependencies/ggz-gtk/client.c:1066
-#: ../glchess/glade/network_game.glade.h:6
+#: ../dependencies/ggz-gtk/roomlist.c:150 ../dependencies/ggz-gtk/client.c:969
+#: ../dependencies/ggz-gtk/client.c:1100
 msgid "Join"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/tablelist.c:77 ../dependencies/ggz-gtk/client.c:954
-#: ../dependencies/ggz-gtk/client.c:1082
-#: ../glchess/glade/network_game.glade.h:8
+#: ../dependencies/ggz-gtk/tablelist.c:77 ../dependencies/ggz-gtk/client.c:988
+#: ../dependencies/ggz-gtk/client.c:1116
 #, fuzzy
 msgid "Leave"
 msgstr "Leibheal"
@@ -2935,8 +3526,9 @@ msgstr "Leibheal"
 msgid "No description available."
 msgstr "Níl aon nod ann"
 
-#: ../dependencies/ggz-gtk/tablelist.c:196
-#: ../glchess/src/lib/gtkui/network.py:96
+#. Translators: Available GGZ Tables: Seat status column title
+#: ../dependencies/ggz-gtk/tablelist.c:197
+#: ../glchess/src/lib/gtkui/network.py:187
 #, fuzzy
 msgid "Seats"
 msgstr "hartí"
@@ -3003,7 +3595,6 @@ msgid "Other Rooms"
 msgstr ""
 
 #: ../dependencies/ggz-gtk/roomlist.c:424
-#: ../glchess/src/lib/gtkui/network.py:59
 msgid "Room"
 msgstr "Seomra"
 
@@ -3037,8 +3628,8 @@ msgstr ""
 msgid "Invalid number of bots specified"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/launch.c:334 ../dependencies/ggz-gtk/client.c:548
-#: ../dependencies/ggz-gtk/client.c:589
+#: ../dependencies/ggz-gtk/launch.c:334 ../dependencies/ggz-gtk/client.c:582
+#: ../dependencies/ggz-gtk/client.c:623
 msgid "Error launching game module."
 msgstr ""
 
@@ -3058,7 +3649,7 @@ msgstr "Uimhir na Miana:"
 
 #: ../dependencies/ggz-gtk/launch.c:513
 msgid "Description:"
-msgstr "Cur Síos:"
+msgstr "Cur síos:"
 
 #: ../dependencies/ggz-gtk/launch.c:586
 #, c-format
@@ -3081,18 +3672,18 @@ msgstr ""
 msgid "Game Description   "
 msgstr ""
 
-#: ../dependencies/ggz-gtk/launch.c:693 ../dependencies/ggz-gtk/client.c:928
-#: ../dependencies/ggz-gtk/client.c:1058
+#: ../dependencies/ggz-gtk/launch.c:693 ../dependencies/ggz-gtk/client.c:962
+#: ../dependencies/ggz-gtk/client.c:1092
 msgid "Launch"
 msgstr ""
 
 #: ../dependencies/ggz-gtk/client.c:142
 msgid "Are you sure you want to quit?"
-msgstr ""
+msgstr "An bhfuil tú cinnte gur mhaith leat scor?"
 
 #: ../dependencies/ggz-gtk/client.c:142
 msgid "Quit?"
-msgstr ""
+msgstr "Scoir?"
 
 #: ../dependencies/ggz-gtk/client.c:235
 msgid ""
@@ -3101,147 +3692,146 @@ msgid ""
 "http://www.ggzgamingzone.org/";
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:246 ../dependencies/ggz-gtk/client.c:508
+#: ../dependencies/ggz-gtk/client.c:246 ../dependencies/ggz-gtk/client.c:542
 msgid ""
 "Player stats are not implemented yet. If\n"
 "you would like to help head over to\n"
 "http://www.ggzgamingzone.org/";
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:529
+#: ../dependencies/ggz-gtk/client.c:563
 msgid "You must highlight a table before you can join it."
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:530 ../dependencies/ggz-gtk/client.c:539
-#: ../dependencies/ggz-gtk/client.c:578
+#: ../dependencies/ggz-gtk/client.c:564 ../dependencies/ggz-gtk/client.c:573
+#: ../dependencies/ggz-gtk/client.c:612
 msgid "Error Joining"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:539 ../dependencies/ggz-gtk/client.c:577
+#: ../dependencies/ggz-gtk/client.c:573 ../dependencies/ggz-gtk/client.c:611
 msgid "That table is full."
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:563
+#: ../dependencies/ggz-gtk/client.c:597
 msgid "You must highlight a table before you can watch it."
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:565
+#: ../dependencies/ggz-gtk/client.c:599
 msgid "Error Spectating"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:610
+#: ../dependencies/ggz-gtk/client.c:644
 msgid ""
 "Failed to join table.\n"
 "Join aborted."
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:611
+#: ../dependencies/ggz-gtk/client.c:645
 msgid "Join Error"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:640
+#: ../dependencies/ggz-gtk/client.c:674
 msgid "Disconnect from the GGZ Gaming Zone server"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:642
+#: ../dependencies/ggz-gtk/client.c:676
 msgid "Start playing a game at a new table"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:644
+#: ../dependencies/ggz-gtk/client.c:678
 msgid "Join an existing game"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:646
+#: ../dependencies/ggz-gtk/client.c:680
 msgid "Watch an existing game - become a spectator of the table"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:649
+#: ../dependencies/ggz-gtk/client.c:683
 msgid "Leave the game you're currently playing"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:651
+#: ../dependencies/ggz-gtk/client.c:685
 msgid "Show the properties dialog to change the client settings"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:655
+#: ../dependencies/ggz-gtk/client.c:689
 msgid "Show the game stats for the current room's game type"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:658
+#: ../dependencies/ggz-gtk/client.c:692
 msgid "Exit the GGZ client application."
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:689
+#: ../dependencies/ggz-gtk/client.c:723
 msgid "Compiled with debugging."
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:884
+#: ../dependencies/ggz-gtk/client.c:918
 msgid "GGZ"
-msgstr ""
+msgstr "GGZ"
 
 #. We should use gtk_tool_button_new_from_stock but for some reason
 #. * the connect and disconnect stock items don't have text included.
-#: ../dependencies/ggz-gtk/client.c:899 ../dependencies/ggz-gtk/client.c:1105
+#: ../dependencies/ggz-gtk/client.c:933 ../dependencies/ggz-gtk/client.c:1139
 #, fuzzy
 msgid "Disconnect"
 msgstr "Gnect"
 
-#: ../dependencies/ggz-gtk/client.c:912
+#: ../dependencies/ggz-gtk/client.c:946
 msgid "Quit"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:942 ../dependencies/ggz-gtk/client.c:1074
+#: ../dependencies/ggz-gtk/client.c:976 ../dependencies/ggz-gtk/client.c:1108
 #, fuzzy
 msgid "Watch"
 msgstr "Fan"
 
-#: ../dependencies/ggz-gtk/client.c:961
+#: ../dependencies/ggz-gtk/client.c:995
 msgid "Edit"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:969
+#: ../dependencies/ggz-gtk/client.c:1003
 msgid "Properties"
-msgstr ""
+msgstr "Airíonna"
 
-#: ../dependencies/ggz-gtk/client.c:976
+#: ../dependencies/ggz-gtk/client.c:1010
 msgid "View"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:985
+#: ../dependencies/ggz-gtk/client.c:1019
 msgid "Room List"
-msgstr ""
+msgstr "Liosta Seomraí"
 
 #.
 #. * Create outer window.
 #.
-#: ../dependencies/ggz-gtk/client.c:991
-#: ../libgames-support/games-dlg-players.c:263
-#, fuzzy
+#: ../dependencies/ggz-gtk/client.c:1025
+#: ../libgames-support/games-dlg-players.c:266
 msgid "Player List"
-msgstr "Imreoiri"
+msgstr "Liosta Imreoirí"
 
-#: ../dependencies/ggz-gtk/client.c:1003
+#: ../dependencies/ggz-gtk/client.c:1037
 msgid "Server Stats"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:1007
+#: ../dependencies/ggz-gtk/client.c:1041
 #, fuzzy
 msgid "Player Stats"
 msgstr "Ainmneach Imreoiri"
 
-#: ../dependencies/ggz-gtk/client.c:1024 ../dependencies/ggz-gtk/props.c:1448
+#: ../dependencies/ggz-gtk/client.c:1058 ../dependencies/ggz-gtk/props.c:1448
 msgid "MOTD"
 msgstr ""
 
-#: ../dependencies/ggz-gtk/client.c:1031
+#: ../dependencies/ggz-gtk/client.c:1065
 msgid "Help"
 msgstr "Cabhair"
 
-#: ../dependencies/ggz-gtk/client.c:1039
+#: ../dependencies/ggz-gtk/client.c:1073
 msgid "Contents"
 msgstr "Inneachar"
 
-#: ../dependencies/ggz-gtk/client.c:1220
+#: ../dependencies/ggz-gtk/client.c:1254
 #, fuzzy
 msgid "Send"
 msgstr "Luas"
@@ -3294,9 +3884,8 @@ msgid "Word Wrap"
 msgstr ""
 
 #: ../dependencies/ggz-gtk/props.c:1171
-#, fuzzy
 msgid "Chat Color"
-msgstr "Dathanna"
+msgstr "Dath Comhrá"
 
 #: ../dependencies/ggz-gtk/props.c:1220
 msgid "Default chat color assigned to your friends"
@@ -3333,9 +3922,8 @@ msgid "White Background"
 msgstr "Dath Cúlra"
 
 #: ../dependencies/ggz-gtk/props.c:1298
-#, fuzzy
 msgid "Chat"
-msgstr "Camelot"
+msgstr "Comhrá"
 
 #: ../dependencies/ggz-gtk/props.c:1310
 msgid "All of the following information is optional."
@@ -3384,9 +3972,9 @@ msgid "Display None"
 msgstr "Taispeain na staidreamh"
 
 #. Options
-#: ../dependencies/ggz-gtk/props.c:1493 ../gnibbles/preferences.c:308
-#: ../gnibbles/preferences.c:453 ../gnobots2/properties.c:470
-#: ../iagno/properties.c:572
+#: ../dependencies/ggz-gtk/props.c:1493 ../gnibbles/preferences.c:310
+#: ../gnibbles/preferences.c:455 ../gnobots2/properties.c:455
+#: ../iagno/properties.c:567
 msgid "Options"
 msgstr "Roghanna"
 
@@ -3495,384 +4083,423 @@ msgid "A flag to show move comments"
 msgstr ""
 
 #: ../glchess/data/glchess.schemas.in.h:11
-msgid "The amount of time each player has to move in new games"
+msgid "A flag to smooth (anti-alias) the 3D display"
 msgstr ""
 
 #: ../glchess/data/glchess.schemas.in.h:12
+msgid "The amount of time each player has to move in new games"
+msgstr ""
+
+#: ../glchess/data/glchess.schemas.in.h:13
 #, fuzzy
 msgid "The board side to display"
 msgstr "Méid páirce"
 
-#: ../glchess/data/glchess.schemas.in.h:13
+#: ../glchess/data/glchess.schemas.in.h:14
 msgid "The default player difficulty for black in new games"
 msgstr ""
 
-#: ../glchess/data/glchess.schemas.in.h:14
+#: ../glchess/data/glchess.schemas.in.h:15
 msgid "The default player difficulty for white in new games"
 msgstr ""
 
-#: ../glchess/data/glchess.schemas.in.h:15
+#: ../glchess/data/glchess.schemas.in.h:16
 msgid "The default player type for black in new games"
 msgstr ""
 
-#: ../glchess/data/glchess.schemas.in.h:16
+#: ../glchess/data/glchess.schemas.in.h:17
 msgid "The default player type for white in new games"
 msgstr ""
 
-#: ../glchess/data/glchess.schemas.in.h:17
+#: ../glchess/data/glchess.schemas.in.h:18
 msgid "The directory to open the load game dialog in"
 msgstr ""
 
-#: ../glchess/data/glchess.schemas.in.h:18
+#: ../glchess/data/glchess.schemas.in.h:19
 msgid "The directory to open the save game dialog in"
 msgstr ""
 
-#: ../glchess/data/glchess.schemas.in.h:19
+#: ../glchess/data/glchess.schemas.in.h:20
 msgid "The format to display moves in"
 msgstr ""
 
-#: ../glchess/data/glchess.schemas.in.h:20
+#: ../glchess/data/glchess.schemas.in.h:21
 msgid ""
 "The format to display moves in, can be either 'human' (human readable), "
 "'lan' (long algebraic notation) or 'san' (standard algebraic notation)"
 msgstr ""
 
-#: ../glchess/data/glchess.schemas.in.h:21
+#: ../glchess/data/glchess.schemas.in.h:22
 #, fuzzy
 msgid "The height of the main window in pixels."
 msgstr "Airde na greille"
 
-#: ../glchess/data/glchess.schemas.in.h:22
+#: ../glchess/data/glchess.schemas.in.h:23
 msgid "The height of the window"
 msgstr ""
 
-#: ../glchess/data/glchess.schemas.in.h:23
+#: ../glchess/data/glchess.schemas.in.h:24
 msgid "The piece to promote pawns to"
 msgstr ""
 
-#: ../glchess/data/glchess.schemas.in.h:24
+#: ../glchess/data/glchess.schemas.in.h:25
 msgid ""
 "The piece to promote to when a human player moves a pawn to the far rank. "
 "Can be one of: 'queen', 'knight', 'rook', 'bishop'."
 msgstr ""
 
-#: ../glchess/data/glchess.schemas.in.h:25
+#: ../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 ""
 
-#: ../glchess/data/glchess.schemas.in.h:26
+#: ../glchess/data/glchess.schemas.in.h:27
 #, fuzzy
 msgid "The width of the main window in pixels."
 msgstr "Airde na greille"
 
-#: ../glchess/data/glchess.schemas.in.h:27
+#: ../glchess/data/glchess.schemas.in.h:28
 msgid "The width of the window"
 msgstr ""
 
-#: ../glchess/glade/save_game.glade.h:1
-#, fuzzy
-msgid "Save Chess Game"
-msgstr "Reitigh an cluiche"
-
-#: ../glchess/glade/log.glade.h:1
-#, fuzzy
-msgid "Communication:"
-msgstr "Beochan"
-
-#: ../glchess/glade/log.glade.h:2
-msgid "Executable:"
-msgstr ""
-
-#: ../glchess/glade/log.glade.h:3
-#, fuzzy
-msgid "Playing as:"
-msgstr "Ag imirt leibheal %s"
-
-#: ../glchess/glade/network_game.glade.h:1
-#, fuzzy
-msgid "<b>Game</b>"
-msgstr "Imreoiri"
-
-#: ../glchess/glade/network_game.glade.h:2
-#, fuzzy
-msgid "<b>Rooms</b>"
-msgstr "Imreoiri"
-
-#: ../glchess/glade/network_game.glade.h:3
-#, fuzzy
-msgid "<b>Server</b>"
-msgstr "Imreoiri"
-
-#: ../glchess/glade/network_game.glade.h:4
-msgid "<b>Status/Chat</b>"
-msgstr ""
-
-#: ../glchess/glade/network_game.glade.h:5
+#. Preferences Dialog: Check box for selecting if 3D view is available
+#: ../glchess/data/glchess.ui.h:1 ../glchess/data/preferences.ui.h:2
 #, fuzzy
-msgid "Game Name"
-msgstr "Ainm Cluiche:"
-
-#: ../glchess/glade/network_game.glade.h:7
-#, fuzzy
-msgid "Join Game"
-msgstr "_Cluiche"
-
-#: ../glchess/glade/network_game.glade.h:9
-msgid "_Profile:"
-msgstr ""
-
-#: ../glchess/glade/load_game.glade.h:1
-#, fuzzy
-msgid "Load Chess Game"
-msgstr "Cluichí Carta:"
-
-#: ../glchess/glade/glchess.glade.h:1
-msgid "Board _Numbering"
-msgstr ""
-
-#: ../glchess/glade/glchess.glade.h:2
-#, fuzzy
-msgid "Chess _Board"
-msgstr "Clár Ficheall"
+msgid "3_D Chess View"
+msgstr "_Ficheall"
 
-#: ../glchess/glade/glchess.glade.h:3
+#: ../glchess/data/glchess.ui.h:2
 msgid "Claim _Draw"
 msgstr ""
 
-#: ../glchess/glade/glchess.glade.h:4
-#, fuzzy
-msgid "Leave _Fullscreen"
-msgstr "Ceathair Déag"
-
-#: ../glchess/glade/glchess.glade.h:5
+#: ../glchess/data/glchess.ui.h:3
 msgid "Load a saved game"
 msgstr ""
 
-#: ../glchess/glade/glchess.glade.h:6
+#. The title of the log dialaog
+#: ../glchess/data/glchess.ui.h:5
 msgid "Logs"
 msgstr ""
 
-#: ../glchess/glade/glchess.glade.h:7
-#, fuzzy
-msgid "Move _Comments"
-msgstr "Bog ar clé"
-
-#: ../glchess/glade/glchess.glade.h:8
-#, fuzzy
-msgid "Move _Hints"
-msgstr "Bog ar deis"
-
-#: ../glchess/glade/glchess.glade.h:9 ../libgames-support/games-stock.c:308
+#. The Network Game toolbar button
+#: ../glchess/data/glchess.ui.h:7 ../libgames-support/games-stock.c:334
 #, fuzzy
 msgid "Network _Game"
 msgstr "Cluiche Nua"
 
-#: ../glchess/glade/glchess.glade.h:10 ../glchess/glade/new_game.glade.h:9
-#: ../libgames-support/games-scores-dialog.c:432
+#. The New Game toolbar button
+#. Title of the new game dialog
+#: ../glchess/data/glchess.ui.h:9 ../glchess/data/new_game.ui.h:13
+#: ../libgames-support/games-scores-dialog.c:438
 msgid "New Game"
 msgstr "Cluiche Nua"
 
-#: ../glchess/glade/glchess.glade.h:11
+#. The tooltip for the Resign toolbar button
+#: ../glchess/data/glchess.ui.h:11
 msgid "Resign"
 msgstr ""
 
-#: ../glchess/glade/glchess.glade.h:12
+#: ../glchess/data/glchess.ui.h:12
 #, fuzzy
 msgid "Rewind to the game start"
 msgstr "Cluiche nua tosnu"
 
-#: ../glchess/glade/glchess.glade.h:13
+#: ../glchess/data/glchess.ui.h:13
 #, fuzzy
 msgid "Save the current game"
 msgstr "Reitigh an cluiche"
 
-#: ../glchess/glade/glchess.glade.h:14
+#: ../glchess/data/glchess.ui.h:14
 #, fuzzy
 msgid "Show _Logs"
 msgstr "Taispeáin tool bar"
 
-#: ../glchess/glade/glchess.glade.h:15
+#: ../glchess/data/glchess.ui.h:15
 msgid "Show the current move"
 msgstr ""
 
-#: ../glchess/glade/glchess.glade.h:16
+#: ../glchess/data/glchess.ui.h:16
 msgid "Show the next move"
 msgstr ""
 
-#: ../glchess/glade/glchess.glade.h:17
+#: ../glchess/data/glchess.ui.h:17
 msgid "Show the previous move"
 msgstr ""
 
-#: ../glchess/glade/glchess.glade.h:19 ../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 ""
 
-#: ../glchess/glade/glchess.glade.h:20
-msgid "Summary"
-msgstr ""
-
-#: ../glchess/glade/glchess.glade.h:21
+#. Message displayed in log window when no logs are present
+#: ../glchess/data/glchess.ui.h:21
 #, fuzzy
 msgid "There are no active logs."
 msgstr "Níl aon gluaiseann fagtha."
 
-#: ../glchess/glade/glchess.glade.h:22
-msgid "_3D"
-msgstr "_3T"
-
-#: ../glchess/glade/glchess.glade.h:23
-msgid "_Bishop"
-msgstr ""
-
-#: ../glchess/glade/glchess.glade.h:24
-#, fuzzy
-msgid "_Black Side"
-msgstr "Imreoiri"
-
-#: ../glchess/glade/glchess.glade.h:25
-msgid "_Chess"
-msgstr "_Ficheall"
+#: ../glchess/data/glchess.ui.h:22
+msgid "Undo Move"
+msgstr "Cealaigh Beart"
 
-#: ../glchess/glade/glchess.glade.h:26 ../gnome-sudoku/src/lib/main.py:289
-#: ../libgames-support/games-stock.c:293
+#: ../glchess/data/glchess.ui.h:23 ../gnome-sudoku/src/lib/main.py:273
+#: ../libgames-support/games-stock.c:318
 msgid "_Contents"
 msgstr "_Inneachar"
 
-#: ../glchess/glade/glchess.glade.h:27
-msgid "_Current Player"
-msgstr ""
+#: ../glchess/data/glchess.ui.h:26
+#, fuzzy
+msgid "_Resign"
+msgstr "_Deis"
+
+#: ../glchess/data/glchess.ui.h:28 ../libgames-support/games-stock.c:330
+msgid "_Undo Move"
+msgstr "_Cealaigh Beart"
 
-#: ../glchess/glade/glchess.glade.h:28 ../libgames-support/games-stock.c:294
+#. Title of load game dialog
+#: ../glchess/data/load_game.ui.h:2
 #, fuzzy
-msgid "_Fullscreen"
-msgstr "Ceathair Déag"
+msgid "Load Chess Game"
+msgstr "Cluichí Carta:"
 
-#: ../glchess/glade/glchess.glade.h:31
-msgid "_History"
-msgstr "_Stair"
+#. Log window: Title above data being logged
+#: ../glchess/data/log.ui.h:2
+#, fuzzy
+msgid "Communication:"
+msgstr "Beochan"
 
-#: ../glchess/glade/glchess.glade.h:32
-msgid "_Human"
+#. Log window: Label before name of executable being logged
+#: ../glchess/data/log.ui.h:4
+msgid "Executable:"
 msgstr ""
 
-#: ../glchess/glade/glchess.glade.h:33
-msgid "_Human Side"
-msgstr ""
+#. Log window: Label before name of player being logged
+#: ../glchess/data/log.ui.h:6
+#, fuzzy
+msgid "Playing as:"
+msgstr "Ag imirt leibheal %s"
 
-#: ../glchess/glade/glchess.glade.h:34
-msgid "_Knight"
-msgstr "_Ridire"
+#. Network Game Dialog: Title above the game settings. Do not translate the <b> tag.
+#: ../glchess/data/network_game.ui.h:2
+#, fuzzy
+msgid "<b>Game</b>"
+msgstr "Imreoiri"
 
-#: ../glchess/glade/glchess.glade.h:35
-msgid "_Long Algebraic"
-msgstr ""
+#. Network Game Dialog: Title above room list. Do not translate the <b> tag.
+#: ../glchess/data/network_game.ui.h:4
+#, fuzzy
+msgid "<b>Rooms</b>"
+msgstr "Imreoiri"
 
-#: ../glchess/glade/glchess.glade.h:36
+#. Network Game Dialog: Title above the server settings. Do not translate the <b> tag.
+#: ../glchess/data/network_game.ui.h:6
 #, fuzzy
-msgid "_Move Format"
-msgstr "Bog ar deis"
+msgid "<b>Server</b>"
+msgstr "Imreoiri"
 
-#: ../glchess/glade/glchess.glade.h:37
-msgid "_Promotion Type"
+#. 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 ""
 
-#: ../glchess/glade/glchess.glade.h:38
-msgid "_Queen"
-msgstr "_Banríon"
+#. Title of network game dialog
+#: ../glchess/data/network_game.ui.h:10
+#, fuzzy
+msgid "Join Game"
+msgstr "_Cluiche"
 
-#: ../glchess/glade/glchess.glade.h:39
+#. Network Game Dialog: Button to join a table
+#: ../glchess/data/network_game.ui.h:12
 #, fuzzy
-msgid "_Resign"
-msgstr "_Deis"
+msgid "_Join"
+msgstr "Tada"
 
-#: ../glchess/glade/glchess.glade.h:40
+#. Network Game Dialog: Leave table button
+#: ../glchess/data/network_game.ui.h:14
 #, fuzzy
-msgid "_Rook"
-msgstr "Robots"
+msgid "_Leave"
+msgstr "Leibheal"
+
+#. Network Game Dialog: Label before the server profile combo box
+#: ../glchess/data/network_game.ui.h:16
+msgid "_Profile:"
+msgstr ""
 
-#: ../glchess/glade/glchess.glade.h:41
-msgid "_Standard Algebraic"
+#: ../glchess/data/network_new_server.ui.h:1
+msgid "Add Account"
 msgstr ""
 
-#: ../glchess/glade/glchess.glade.h:43 ../libgames-support/games-stock.c:305
+#. Add Network Profile Dialog: Label beside username entry
+#: ../glchess/data/network_new_server.ui.h:3
 #, fuzzy
-msgid "_Undo Move"
-msgstr "_Gluais"
+msgid "User _Name:"
+msgstr "Ainm �sáideora:"
 
-#: ../glchess/glade/glchess.glade.h:45
-#, fuzzy
-msgid "_White Side"
-msgstr "Imreoiri"
+#. Add Network Profile Dialog: Button to accept values and add profile
+#: ../glchess/data/network_new_server.ui.h:5
+msgid "_Add Account"
+msgstr ""
+
+#. Add Network Profile Dialog: Label beside custom hostname entry
+#: ../glchess/data/network_new_server.ui.h:7
+msgid "_Host:"
+msgstr "Ã?_stach:"
 
-#: ../glchess/glade/new_game.glade.h:1
+#. 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 "_Freastalaí:"
+
+#. New Game Dialog: Title above difficulty options
+#: ../glchess/data/new_game.ui.h:2
 msgid "<b>Difficulty</b>"
 msgstr ""
 
-#: ../glchess/glade/new_game.glade.h:2
+#. New Game Dialog: Title above the game properties widgets
+#: ../glchess/data/new_game.ui.h:4
 msgid "<b>Game Properties</b>"
 msgstr ""
 
-#: ../glchess/glade/new_game.glade.h:3
+#. New Game Dialog: Title above player options
+#: ../glchess/data/new_game.ui.h:6
 #, fuzzy
 msgid "<b>Players</b>"
 msgstr "Imreoiri"
 
-#: ../glchess/glade/new_game.glade.h:4
-msgid "Allow remote clients to watch this game"
-msgstr ""
-
-#: ../glchess/glade/new_game.glade.h:5
+#. New Game Dialog: Label before black player difficulty
+#: ../glchess/data/new_game.ui.h:8
 msgid "B_lack:"
 msgstr "_Dubh:"
 
-#: ../glchess/glade/new_game.glade.h:6
+#: ../glchess/data/new_game.ui.h:9
 msgid "Enter the title for this game"
 msgstr ""
 
-#: ../glchess/glade/new_game.glade.h:7
-#, fuzzy
-msgid "Local chess game"
-msgstr "Cluichí Carta:"
-
-#: ../glchess/glade/new_game.glade.h:8
+#. New Game Dialog: Label before game timer settings
+#: ../glchess/data/new_game.ui.h:11
 #, fuzzy
 msgid "Move _Time:"
 msgstr "Gluaiseann Fagtha"
 
-#: ../glchess/glade/new_game.glade.h:10
+#: ../glchess/data/new_game.ui.h:14
 msgid "Start the game. The game can be started once all fields are complete"
 msgstr ""
 
-#: ../glchess/glade/new_game.glade.h:11
+#. New Game Dialog: Label before white player difficulty
+#: ../glchess/data/new_game.ui.h:16
 msgid "W_hite:"
 msgstr "_Bán:"
 
-#: ../glchess/glade/new_game.glade.h:12
-msgid "_Allow spectators"
-msgstr ""
-
-#: ../glchess/glade/new_game.glade.h:13
+#. New Game Dialog: Label before black player combo box
+#: ../glchess/data/new_game.ui.h:18
 msgid "_Black:"
 msgstr "_Dubh:"
 
-#: ../glchess/glade/new_game.glade.h:14
+#. New Game Dialog: Label before the game name entry
+#: ../glchess/data/new_game.ui.h:20
 #, fuzzy
 msgid "_Game name:"
 msgstr "Ainm Cluiche:"
 
-#: ../glchess/glade/new_game.glade.h:15
+#. New Game Dialog: Button to start a new game
+#: ../glchess/data/new_game.ui.h:22
 msgid "_Start"
 msgstr "_Tosaigh"
 
-#: ../glchess/glade/new_game.glade.h:16
+#. New Game Dialog: Label before white player combo box
+#: ../glchess/data/new_game.ui.h:24
 msgid "_White:"
 msgstr "_Bán:"
 
-#. Translators: This is the window title when not playing a game
-#: ../glchess/glchess.desktop.in.in.h:1 ../glchess/src/lib/gtkui/gtkui.py:375
+#. Preferences Dialog: Label before board orientation combo box
+#: ../glchess/data/preferences.ui.h:4
+#, fuzzy
+msgid "Board Orientation:"
+msgstr "Méid páirce"
+
+#. Preferences Dialog: Label before move format combo box
+#: ../glchess/data/preferences.ui.h:6
+#, fuzzy
+msgid "Move Format:"
+msgstr "Bog ar deis"
+
+#. Title for preferences dialog
+#: ../glchess/data/preferences.ui.h:8 ../glines/glines.c:196
+#: ../mahjongg/mahjongg.c:140
+msgid "Preferences"
+msgstr "Sainroghanna"
+
+#. Preferences Dialog: Label before promotion type combo box
+#: ../glchess/data/preferences.ui.h:10
+msgid "Promotion Type:"
+msgstr ""
+
+#. Preferences Dialog: Check box for selecting if history browser is visible
+#: ../glchess/data/preferences.ui.h:12
+#, fuzzy
+msgid "Show _History"
+msgstr "_Stair"
+
+#. Preferences Dialog: Check box for selecting if toolbar is visible
+#: ../glchess/data/preferences.ui.h:14 ../gnome-sudoku/src/lib/main.py:293
+#, fuzzy
+msgid "Show _Toolbar"
+msgstr "Taispeáin tool bar"
+
+#: ../glchess/data/preferences.ui.h:15
+#, fuzzy
+msgid "Show or hide numbering on the chess board"
+msgstr "Taispeáin no cur i bhfolach an toolbar"
+
+#: ../glchess/data/preferences.ui.h:16
+#, fuzzy
+msgid "Show or hide the game history panel"
+msgstr "Taispeáin no cur i bhfolach an toolbar"
+
+#: ../glchess/data/preferences.ui.h:18
+msgid "Shows hints during chess games"
+msgstr ""
+
+#: ../glchess/data/preferences.ui.h:19
+msgid "Smooth edges of the 3D elements (anti-alias)"
+msgstr ""
+
+#: ../glchess/data/preferences.ui.h:20
+msgid ""
+"View the chess board by default in 2D mode, or optionally in 3D mode using "
+"OpenGL."
+msgstr ""
+
+#. Preferences Dialog: Check box for selecting if board numbering is visible
+#: ../glchess/data/preferences.ui.h:22
+msgid "_Board Numbering"
+msgstr ""
+
+#. Preferences Dialog: Check box for selecting if move hints are visible
+#: ../glchess/data/preferences.ui.h:26
+#, fuzzy
+msgid "_Move Hints"
+msgstr "Bog ar deis"
+
+#. Preferences Dialog: Check box for selecting if the 3D view is smoothed (anti-aliased)
+#: ../glchess/data/preferences.ui.h:28
+msgid "_Smooth Display"
+msgstr ""
+
+#. Title of save game dialog
+#: ../glchess/data/save_game.ui.h:2
+#, fuzzy
+msgid "Save Chess Game"
+msgstr "Reitigh an cluiche"
+
+#. Translators: Window title when not playing a game
+#: ../glchess/glchess.desktop.in.in.h:1 ../glchess/src/lib/gtkui/gtkui.py:332
 msgid "Chess"
 msgstr "Ficheall"
 
@@ -3880,145 +4507,273 @@ msgstr "Ficheall"
 msgid "Play the classic two-player boardgame of chess"
 msgstr ""
 
-#: ../glchess/src/glchess.in.in:39
+#: ../glchess/src/glchess.in.in:50
 msgid "Chess incorrectly installed"
 msgstr ""
 
-#: ../glchess/src/glchess.in.in:40
+#: ../glchess/src/glchess.in.in:52
 msgid ""
 "Chess is not able to start because required application files are not "
 "installed. If you are currently upgrading your system please wait until the "
 "upgrade has completed."
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/dialogs.py:126
+#. Translators: Time Combo: There is no time limit
+#: ../glchess/src/lib/gtkui/dialogs.py:125
 #, fuzzy
 msgid "Unlimited"
 msgstr "Beochan"
 
+#. Translators: Time Combo: Game will last one minute
 #: ../glchess/src/lib/gtkui/dialogs.py:127
 #, fuzzy
 msgid "One minute"
 msgstr "naoi"
 
-#: ../glchess/src/lib/gtkui/dialogs.py:128
+#. Translators: Time Combo: Game will last five minutes
+#: ../glchess/src/lib/gtkui/dialogs.py:129
 msgid "Five minutes"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/dialogs.py:129
+#. Translators: Time Combo: Game will last 30 minutes
+#: ../glchess/src/lib/gtkui/dialogs.py:131
 msgid "30 minutes"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/dialogs.py:130
+#. Translators: Time Combo: Game will last one hour
+#: ../glchess/src/lib/gtkui/dialogs.py:133
 msgid "One hour"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/dialogs.py:131 ../gnomine/gnomine.c:92
-#: ../gnomine/gnomine.c:682
+#. 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:30
 msgid "Custom"
 msgstr "Saincheaptha"
 
-#: ../glchess/src/lib/gtkui/dialogs.py:151
+#. Translators: Custom Time Combo: User specifying number of seconds for game duration
+#: ../glchess/src/lib/gtkui/dialogs.py:156
 msgid "seconds"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/dialogs.py:152
-#, fuzzy
+#. Translators: Custom Time Combo: User specifying number of minutes for game duration
+#: ../glchess/src/lib/gtkui/dialogs.py:158
 msgid "minutes"
-msgstr "Leathfhocal"
+msgstr "nóiméad"
 
-#: ../glchess/src/lib/gtkui/dialogs.py:153
-#, fuzzy
+#. Translators: Custom Time Combo: User specifying number of hours for game duration
+#: ../glchess/src/lib/gtkui/dialogs.py:160
 msgid "hours"
-msgstr "ceithre"
+msgstr "uair"
 
-#: ../glchess/src/lib/gtkui/dialogs.py:170
-#: ../gnome-sudoku/src/lib/sudoku.py:661 ../gtali/setup.c:347
+#. Translators: AI Difficulty Combo: AI set to easy difficulty
+#: ../glchess/src/lib/gtkui/dialogs.py:178
+#: ../gnome-sudoku/src/lib/sudoku.py:515
 msgid "Easy"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/dialogs.py:171
+#. Translators: AI Difficulty Combo: AI set to normal diffuculty
+#: ../glchess/src/lib/gtkui/dialogs.py:180
 msgid "Normal"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/dialogs.py:172
-#: ../gnome-sudoku/src/lib/sudoku.py:659 ../gtali/setup.c:349
+#. Translators: AI Difficulty Combo: AI set to hard diffuculty
+#: ../glchess/src/lib/gtkui/dialogs.py:182
+#: ../gnome-sudoku/src/lib/sudoku.py:513
 msgid "Hard"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/dialogs.py:236
-#: ../glchess/src/lib/gtkui/dialogs.py:239
+#. Translators: Error displayed when unable to load a game due to
+#. the require game engine not being available. %s is replaced with
+#. the name of the missing engine.
+#: ../glchess/src/lib/gtkui/dialogs.py:247
 #, python-format
-msgid "Unable to find %s engine\n"
+msgid "Unable to find %s engine"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/dialogs.py:245
+#. Translators: New Game Dialog: Title of the dialog when continuing a loaded game
+#: ../glchess/src/lib/gtkui/dialogs.py:259
 #, fuzzy, python-format
 msgid "Configure loaded game (%i moves)"
 msgstr "Reitigh an cluiche"
 
-#: ../glchess/src/lib/gtkui/dialogs.py:249
+#. Translators: New Game Dialog: Title of error box when loaded game had AI engines missing
+#: ../glchess/src/lib/gtkui/dialogs.py:264
 msgid "Game settings changed"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/dialogs.py:311
+#. Translators: Default name for a new game. %(white) and %(black) are substituted for the names of the white and black players.
+#: ../glchess/src/lib/gtkui/dialogs.py:327
 #, python-format
 msgid "%(white)s versus %(black)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/dialogs.py:334
-#: ../glchess/src/lib/gtkui/network.py:250
-#: ../glchess/src/lib/gtkui/network.py:391 ../glchess/src/lib/main.py:685
+#. Translators: Default name for the white player
+#. 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:360
+#: ../glchess/src/lib/gtkui/network.py:537 ../glchess/src/lib/main.py:680
 #, fuzzy
 msgid "White"
 msgstr "Whitehead"
 
-#: ../glchess/src/lib/gtkui/dialogs.py:340
-#: ../glchess/src/lib/gtkui/network.py:252
-#: ../glchess/src/lib/gtkui/network.py:397 ../glchess/src/lib/main.py:685
+#. Translators: Default name for the black player
+#. 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:363
+#: ../glchess/src/lib/gtkui/network.py:543 ../glchess/src/lib/main.py:682
 #, fuzzy
 msgid "Black"
 msgstr "Clog"
 
-#: ../glchess/src/lib/gtkui/dialogs.py:466
+#. Translators: Load Game Dialog: Name of filter to show only PGN files
+#: ../glchess/src/lib/gtkui/dialogs.py:443
+msgid "PGN files"
+msgstr "Comhaid PGN"
+
+#. Translators: Load Game Dialog: Name of filter to show all files
+#: ../glchess/src/lib/gtkui/dialogs.py:449
+msgid "All files"
+msgstr "Gach comhad"
+
+#. Translators: Load Game Dialog: Message displayed when no file is selected
+#: ../glchess/src/lib/gtkui/dialogs.py:471
+msgid "Please select a file to load"
+msgstr ""
+
+#. Translators: Title of error box when unable to load game
+#: ../glchess/src/lib/gtkui/dialogs.py:479
 msgid "Unabled to load game"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/dialogs.py:541
+#. Translators: Save Game Dialog: Error displayed when no file name entered
+#: ../glchess/src/lib/gtkui/dialogs.py:550
 msgid "Please enter a file name"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/dialogs.py:553
+#. Translators: Save Game Dialog: Error title when unable to save game
+#: ../glchess/src/lib/gtkui/dialogs.py:563
 msgid "Unabled to save game"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/gtkui.py:246 ../gnect/src/prefs.c:246
-#: ../gtali/gyahtzee.c:983 ../gtali/yahtzee.c:69 ../iagno/properties.c:454
-#: ../iagno/properties.c:495
+#. Translators: Move Format Combo: Moves shown in human descriptive notation
+#. Translators: Player Type Combo: Player is human controlled
+#: ../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 ""
 
-#. Translators: This is the window title when playing a game that needs saving
-#: ../glchess/src/lib/gtkui/gtkui.py:369
+#. Translators: Move Format Combo: Moves shown in standard algebraic notation (SAN)
+#: ../glchess/src/lib/gtkui/dialogs.py:592
+msgid "Standard Algebraic"
+msgstr ""
+
+#. Translators: Move Format Combo: Moves shown in standard figurine algebraic notation (FAN)
+#: ../glchess/src/lib/gtkui/dialogs.py:594
+msgid "Figurine"
+msgstr ""
+
+#. Translators: Move Format Combo: Moves shown in long algebraic notation (LAN)
+#: ../glchess/src/lib/gtkui/dialogs.py:596
+msgid "Long Algebraic"
+msgstr ""
+
+#. Translators: Board Side Combo: Camera will face white player's side
+#: ../glchess/src/lib/gtkui/dialogs.py:606
+#, fuzzy
+msgid "White Side"
+msgstr "Imreoiri"
+
+#. Translators: Board Side Combo: Camera will face black player's side
+#: ../glchess/src/lib/gtkui/dialogs.py:608
+#, fuzzy
+msgid "Black Side"
+msgstr "Imreoiri"
+
+#. Translators: Board Side Combo: Camera will face human player's side
+#: ../glchess/src/lib/gtkui/dialogs.py:610
+msgid "Human Side"
+msgstr ""
+
+#. Translators: Board Side Combo: Camera will face current player's side
+#: ../glchess/src/lib/gtkui/dialogs.py:612
+#, fuzzy
+msgid "Current Player"
+msgstr "Ainmneach Imreoiri"
+
+#. 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 ""
+
+#. Translators: Promotion Combo: Promote to a queen
+#: ../glchess/src/lib/gtkui/dialogs.py:624
+#, fuzzy
+msgctxt "chess-piece"
+msgid "Queen"
+msgstr "_Banríon"
+
+#. Translators: Promotion Combo: Promote to a knight
+#: ../glchess/src/lib/gtkui/dialogs.py:626
+#, fuzzy
+msgctxt "chess-piece"
+msgid "Knight"
+msgstr "Ridire"
+
+#. Translators: Promotion Combo: Promote to a rook
+#: ../glchess/src/lib/gtkui/dialogs.py:628
+#, fuzzy
+msgctxt "chess-piece"
+msgid "Rook"
+msgstr "Robots"
+
+#. Translators: Promotion Combo: Promote to a bishop
+#: ../glchess/src/lib/gtkui/dialogs.py:630
+#, fuzzy
+msgctxt "chess-piece"
+msgid "Bishop"
+msgstr "Bristol"
+
+#. Translators: Window title when playing a game that needs saving
+#: ../glchess/src/lib/gtkui/gtkui.py:326
 #, python-format
 msgid "Chess - *%(game_name)s"
 msgstr ""
 
-#. Translators: This is the window title when playing a game that is saved
-#: ../glchess/src/lib/gtkui/gtkui.py:372
+#. Translators: Window title when playing a game that is saved
+#: ../glchess/src/lib/gtkui/gtkui.py:329
 #, python-format
 msgid "Chess - %(game_name)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/gtkui.py:472
+#. Translators: Game Timer Label: Indicates that game has no time limit
+#: ../glchess/src/lib/gtkui/gtkui.py:344
+msgid "â??"
+msgstr "â??"
+
+#. Translators: Save Game Dialog: Notice that game needs saving
+#: ../glchess/src/lib/gtkui/gtkui.py:417
+msgid "If you don't save the changes to this game will be permanently lost"
+msgstr ""
+
+#. Translators: Save Game Dialog: Discard game button
+#: ../glchess/src/lib/gtkui/gtkui.py:419
 msgid "Close _without saving"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/gtkui.py:592
+#. Translators: No 3D Dialog: Title
+#: ../glchess/src/lib/gtkui/gtkui.py:534
 msgid "Unable to enable 3D mode"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/gtkui.py:594
+#. 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:538
 #, python-format
 msgid ""
 "You are unable to play in 3D mode due to the following problems:\n"
@@ -4028,370 +4783,791 @@ msgid ""
 "then you will be able to play chess in 2D mode."
 msgstr ""
 
+#. Translators: Draw Dialog: Title
+#: ../glchess/src/lib/gtkui/gtkui.py:800
+msgid "Unable to claim draw"
+msgstr ""
+
+#. Translators: Draw Dialog: Notify user why they cannot claim draw
+#: ../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"
+"b) Fifty moves have occurred where no pawn has moved and no piece has been "
+"captured (50 move rule)"
+msgstr ""
+
 #. TODO: This should be a pop-up dialog
 #. FIXME: This should create a pop-up dialog
-#: ../glchess/src/lib/gtkui/gtkui.py:917 ../gnome-sudoku/src/lib/main.py:849
+#: ../glchess/src/lib/gtkui/gtkui.py:824 ../gnome-sudoku/src/lib/main.py:727
 #, python-format
 msgid "Unable to display help: %s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:17
+#. Translators: Error message displayed when 3D mode is not available due to no Python OpenGL libraries
+#: ../glchess/src/lib/gtkui/chessview.py:21
 msgid "No Python OpenGL support"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:22
+#. Translators: Error message displayed when 3D mode is not available due to no Python GTKGLExt libraries
+#: ../glchess/src/lib/gtkui/chessview.py:27
 msgid "No Python GTKGLExt support"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:32
+#. 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
 msgid "OpenGL libraries do not support required display mode"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:37
+#. Translators: Move History Combo: Go to the start of the game
+#: ../glchess/src/lib/gtkui/chessview.py:253
+#: ../glchess/src/lib/gtkui/chessview.py:286
+msgid "Game Start"
+msgstr "Tús Cluiche"
+
+#. Translators: Comment text when move has no comment
+#: ../glchess/src/lib/gtkui/chessview.py:291
 #, fuzzy
-msgid "pawn"
-msgstr "Síos"
+msgid "No comment"
+msgstr "Criochnaithe"
 
-#: ../glchess/src/lib/gtkui/chessview.py:38
-msgid "rook"
+#. Translators: Human Move String: Description of the white player making a long castle
+#: ../glchess/src/lib/gtkui/chessview.py:418
+msgid "White castles long"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:39
-#, fuzzy
-msgid "knight"
-msgstr "ocht"
+#. Translators: Human Move String: Description of the black player making a long castle
+#: ../glchess/src/lib/gtkui/chessview.py:420
+msgid "Black castles long"
+msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:40
-msgid "bishop"
+#. Translators: Human Move String: Description of the white player making a short castle
+#: ../glchess/src/lib/gtkui/chessview.py:423
+msgid "White castles short"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:247
-#, fuzzy
-msgid "Game Start"
-msgstr "Tidéal cluiche"
+#. Translators: Human Move String: Description of the black player making a short castle
+#: ../glchess/src/lib/gtkui/chessview.py:425
+msgid "Black castles short"
+msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:280
-#, fuzzy
-msgid "Game start"
-msgstr "Tidéal cluiche"
+#. 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:429
+#, python-format
+msgid "White pawn moves from %(start)s to %(end)s"
+msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:284
-#, fuzzy
-msgid "No comment"
-msgstr "Criochnaithe"
+#: ../glchess/src/lib/gtkui/chessview.py:430
+#, python-format
+msgid "White pawn at %(start)s takes the black pawn at %(end)s"
+msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:400
-#, fuzzy
-msgid "Check"
-msgstr "Clog"
+#: ../glchess/src/lib/gtkui/chessview.py:431
+#, python-format
+msgid "White pawn at %(start)s takes the black rook at %(end)s"
+msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:402
-#, fuzzy
-msgid "Checkmate"
-msgstr "Camelot"
+#: ../glchess/src/lib/gtkui/chessview.py:432
+#, python-format
+msgid "White pawn at %(start)s takes the black knight at %(end)s"
+msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:404
-#, fuzzy
-msgid "Stalemate"
-msgstr "Pioc cluiche"
+#: ../glchess/src/lib/gtkui/chessview.py:433
+#, python-format
+msgid "White pawn at %(start)s takes the black bishop at %(end)s"
+msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:409
+#: ../glchess/src/lib/gtkui/chessview.py:434
 #, python-format
-msgid "%(movenum)2iw."
+msgid "White pawn at %(start)s takes the black queen at %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:410
+#. 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:436
 #, python-format
-msgid "%(movenum)2ib."
+msgid "White rook moves from %(start)s to %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:413
+#: ../glchess/src/lib/gtkui/chessview.py:437
 #, python-format
-msgid "%(move)s White castles long (%(result)s)"
+msgid "White rook at %(start)s takes the black pawn at %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:414
+#: ../glchess/src/lib/gtkui/chessview.py:438
 #, python-format
-msgid "%(move)s White castles long"
+msgid "White rook at %(start)s takes the black rook at %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:415
+#: ../glchess/src/lib/gtkui/chessview.py:439
 #, python-format
-msgid "%(move)s Black castles long (%(result)s)"
+msgid "White rook at %(start)s takes the black knight at %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:416
+#: ../glchess/src/lib/gtkui/chessview.py:440
 #, python-format
-msgid "%(move)s Black castles long"
+msgid "White rook at %(start)s takes the black bishop at %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:418
+#: ../glchess/src/lib/gtkui/chessview.py:441
 #, python-format
-msgid "%(move)s White castles short (%(result)s)"
+msgid "White rook at %(start)s takes the black queen at %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:419
+#. 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:443
 #, python-format
-msgid "%(move)s White castles short"
+msgid "White knight moves from %(start)s to %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:420
+#: ../glchess/src/lib/gtkui/chessview.py:444
 #, python-format
-msgid "%(move)s Black castles short (%(result)s)"
+msgid "White knight at %(start)s takes the black pawn at %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:421
+#: ../glchess/src/lib/gtkui/chessview.py:445
 #, python-format
-msgid "%(move)s Black castles short"
+msgid "White knight at %(start)s takes the black rook at %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:423
+#: ../glchess/src/lib/gtkui/chessview.py:446
 #, python-format
-msgid ""
-"%(move)s White %(piece)s at %(start)s takes the black %(victim_piece)s at %"
-"(end)s (%(result)s)"
+msgid "White knight at %(start)s takes the black knight at %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:424
+#: ../glchess/src/lib/gtkui/chessview.py:447
 #, python-format
-msgid ""
-"%(move)s White %(piece)s at %(start)s takes the black %(victim_piece)s at %"
-"(end)s"
+msgid "White knight at %(start)s takes the black bishop at %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:425
+#: ../glchess/src/lib/gtkui/chessview.py:448
 #, python-format
-msgid ""
-"%(move)s Black %(piece)s at %(start)s takes the white %(victim_piece)s at %"
-"(end)s (%(result)s)"
+msgid "White knight at %(start)s takes the black queen at %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:426
+#. 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:450
 #, python-format
-msgid ""
-"%(move)s Black %(piece)s at %(start)s takes the white %(victim_piece)s at %"
-"(end)s"
+msgid "White bishop moves from %(start)s to %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:428
+#: ../glchess/src/lib/gtkui/chessview.py:451
 #, python-format
-msgid "%(move)s White %(piece)s moves from %(start)s to %(end)s (%(result)s)"
+msgid "White bishop at %(start)s takes the black pawn at %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:429
+#: ../glchess/src/lib/gtkui/chessview.py:452
 #, python-format
-msgid "%(move)s White %(piece)s moves from %(start)s to %(end)s"
+msgid "White bishop at %(start)s takes the black rook at %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:430
+#: ../glchess/src/lib/gtkui/chessview.py:453
 #, python-format
-msgid "%(move)s Black %(piece)s moves from %(start)s to %(end)s (%(result)s)"
+msgid "White bishop at %(start)s takes the black knight at %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:431
+#: ../glchess/src/lib/gtkui/chessview.py:454
+#, python-format
+msgid "White bishop at %(start)s takes the black bishop at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:455
+#, python-format
+msgid "White bishop at %(start)s takes the black queen at %(end)s"
+msgstr ""
+
+#. 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:457
 #, python-format
-msgid "%(move)s Black %(piece)s moves from %(start)s to %(end)s"
+msgid "White queen moves from %(start)s to %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:456
 #: ../glchess/src/lib/gtkui/chessview.py:458
-#, fuzzy, python-format
-msgid "%s wins"
-msgstr "Tá an bua agam!"
+#, python-format
+msgid "White queen at %(start)s takes the black pawn at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:459
+#, python-format
+msgid "White queen at %(start)s takes the black rook at %(end)s"
+msgstr ""
 
 #: ../glchess/src/lib/gtkui/chessview.py:460
-#, fuzzy
-msgid "Game is drawn"
-msgstr "Scór an Cluiche"
+#, python-format
+msgid "White queen at %(start)s takes the black knight at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:461
+#, python-format
+msgid "White queen at %(start)s takes the black bishop at %(end)s"
+msgstr ""
 
+#: ../glchess/src/lib/gtkui/chessview.py:462
+#, python-format
+msgid "White queen at %(start)s takes the black queen at %(end)s"
+msgstr ""
+
+#. 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:464
-msgid "Opponent is in check and cannot move (checkmate)"
+#, python-format
+msgid "White king moves from %(start)s to %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:465
+#, python-format
+msgid "White king at %(start)s takes the black pawn at %(end)s"
 msgstr ""
 
 #: ../glchess/src/lib/gtkui/chessview.py:466
-msgid "Opponent cannot move (stalemate)"
+#, python-format
+msgid "White king at %(start)s takes the black rook at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:467
+#, python-format
+msgid "White king at %(start)s takes the black knight at %(end)s"
 msgstr ""
 
 #: ../glchess/src/lib/gtkui/chessview.py:468
-msgid "No piece has been taken or pawn moved in the last fifty moves"
+#, python-format
+msgid "White king at %(start)s takes the black bishop at %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:470
-msgid "Opponent has run out of time"
+#: ../glchess/src/lib/gtkui/chessview.py:469
+#, python-format
+msgid "White king at %(start)s takes the black queen at %(end)s"
+msgstr ""
+
+#. 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:471
+#, python-format
+msgid "Black pawn moves from %(start)s to %(end)s"
 msgstr ""
 
 #: ../glchess/src/lib/gtkui/chessview.py:472
-msgid "The same board state has occurred three times (three fold repetition)"
+#, python-format
+msgid "Black pawn at %(start)s takes the white pawn at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:473
+#, python-format
+msgid "Black pawn at %(start)s takes the white rook at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:474
+#, python-format
+msgid "Black pawn at %(start)s takes the white knight at %(end)s"
 msgstr ""
 
 #: ../glchess/src/lib/gtkui/chessview.py:475
-msgid "Neither player can cause checkmate (insufficient material)"
+#, python-format
+msgid "Black pawn at %(start)s takes the white bishop at %(end)s"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:477
-msgid "Black player is unable to cause checkmate (insufficient material)"
+#: ../glchess/src/lib/gtkui/chessview.py:476
+#, python-format
+msgid "Black pawn at %(start)s takes the white queen at %(end)s"
+msgstr ""
+
+#. 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:478
+#, python-format
+msgid "Black rook moves from %(start)s to %(end)s"
 msgstr ""
 
 #: ../glchess/src/lib/gtkui/chessview.py:479
-msgid "White player is unable to cause checkmate (insufficient material)"
+#, python-format
+msgid "Black rook at %(start)s takes the white pawn at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:480
+#, python-format
+msgid "Black rook at %(start)s takes the white rook at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:481
+#, python-format
+msgid "Black rook at %(start)s takes the white knight at %(end)s"
 msgstr ""
 
 #: ../glchess/src/lib/gtkui/chessview.py:482
+#, python-format
+msgid "Black rook at %(start)s takes the white bishop at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:483
+#, python-format
+msgid "Black rook at %(start)s takes the white queen at %(end)s"
+msgstr ""
+
+#. 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:485
+#, python-format
+msgid "Black knight moves from %(start)s to %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:486
+#, python-format
+msgid "Black knight at %(start)s takes the white pawn at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:487
+#, python-format
+msgid "Black knight at %(start)s takes the white rook at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:488
+#, python-format
+msgid "Black knight at %(start)s takes the white knight at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:489
+#, python-format
+msgid "Black knight at %(start)s takes the white bishop at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:490
+#, python-format
+msgid "Black knight at %(start)s takes the white queen at %(end)s"
+msgstr ""
+
+#. 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:492
+#, python-format
+msgid "Black bishop moves from %(start)s to %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:493
+#, python-format
+msgid "Black bishop at %(start)s takes the white pawn at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:494
+#, python-format
+msgid "Black bishop at %(start)s takes the white rook at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:495
+#, python-format
+msgid "Black bishop at %(start)s takes the white knight at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:496
+#, python-format
+msgid "Black bishop at %(start)s takes the white bishop at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:497
+#, python-format
+msgid "Black bishop at %(start)s takes the white queen at %(end)s"
+msgstr ""
+
+#. 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:499
+#, python-format
+msgid "Black queen moves from %(start)s to %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:500
+#, python-format
+msgid "Black queen at %(start)s takes the white pawn at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:501
+#, python-format
+msgid "Black queen at %(start)s takes the white rook at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:502
+#, python-format
+msgid "Black queen at %(start)s takes the white knight at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:503
+#, python-format
+msgid "Black queen at %(start)s takes the white bishop at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:504
+#, python-format
+msgid "Black queen at %(start)s takes the white queen at %(end)s"
+msgstr ""
+
+#. 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:506
+#, python-format
+msgid "Black king moves from %(start)s to %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:507
+#, python-format
+msgid "Black king at %(start)s takes the white pawn at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:508
+#, python-format
+msgid "Black king at %(start)s takes the white rook at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:509
+#, python-format
+msgid "Black king at %(start)s takes the white knight at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:510
+#, python-format
+msgid "Black king at %(start)s takes the white bishop at %(end)s"
+msgstr ""
+
+#: ../glchess/src/lib/gtkui/chessview.py:511
+#, python-format
+msgid "Black king at %(start)s takes the white queen at %(end)s"
+msgstr ""
+
+#. Translators: Human Move String: White player has made move %(description) and the opponent is in check
+#: ../glchess/src/lib/gtkui/chessview.py:536
+#, python-format
+msgid "%(movenum)2iw. %(description)s (Check)"
+msgstr ""
+
+#. Translators: Human Move String: White player has made move %(description) and the opponent is in checkmate
+#: ../glchess/src/lib/gtkui/chessview.py:538
+#, python-format
+msgid "%(movenum)2iw. %(description)s (Checkmate)"
+msgstr ""
+
+#. Translators: Human Move String: White player has made move %(description) and the opponent is in stalemate
+#: ../glchess/src/lib/gtkui/chessview.py:540
+#, python-format
+msgid "%(movenum)2iw. %(description)s (Stalemate)"
+msgstr ""
+
+#. 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:542
+#, python-format
+msgid "%(movenum)2iw. %(description)s"
+msgstr ""
+
+#. Translators: Human Move String: Black player has made move %(description) and the opponent is in check
+#: ../glchess/src/lib/gtkui/chessview.py:544
+#, python-format
+msgid "%(movenum)2ib. %(description)s (Check)"
+msgstr ""
+
+#. Translators: Human Move String: Black player has made move %(description) and the opponent is in checkmate
+#: ../glchess/src/lib/gtkui/chessview.py:546
+#, python-format
+msgid "%(movenum)2ib. %(description)s (Checkmate)"
+msgstr ""
+
+#. Translators: Human Move String: Black player has made move %(description) and the opponent is in stalemate
+#: ../glchess/src/lib/gtkui/chessview.py:548
+#, python-format
+msgid "%(movenum)2ib. %(description)s (Stalemate)"
+msgstr ""
+
+#. 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:550
+#, python-format
+msgid "%(movenum)2ib. %(description)s"
+msgstr ""
+
+#. Translators: Message displayed when a player wins. The %s is substituted with the winning player's name
+#: ../glchess/src/lib/gtkui/chessview.py:581
+#, python-format
+msgid "%s wins"
+msgstr "Bhuaigh %s"
+
+#. Translators: Message displayed when a game is drawn
+#: ../glchess/src/lib/gtkui/chessview.py:590
+#, fuzzy
+msgid "Game is drawn"
+msgstr "Scór an Cluiche"
+
+#. Translators: Message displayed when the game ends due to a player being checkmated
+#: ../glchess/src/lib/gtkui/chessview.py:595
+msgid "Opponent is in check and cannot move (checkmate)"
+msgstr ""
+
+#. Translators: Message displayed when the game terminates due to a stalemate
+#: ../glchess/src/lib/gtkui/chessview.py:598
+msgid "Opponent cannot move (stalemate)"
+msgstr ""
+
+#. Translators: Message displayed when the game is drawn due to the fifty move rule
+#: ../glchess/src/lib/gtkui/chessview.py:601
+msgid "No piece has been taken or pawn moved in the last fifty moves"
+msgstr ""
+
+#. Translators: Message displayed when the game ends due to one player's clock stopping
+#: ../glchess/src/lib/gtkui/chessview.py:604
+msgid "Opponent has run out of time"
+msgstr ""
+
+#. Translators: Message displayed when the game is drawn due to the three-fold-repitition rule
+#: ../glchess/src/lib/gtkui/chessview.py:607
+msgid "The same board state has occurred three times (three fold repetition)"
+msgstr ""
+
+#. Translators: Message displayed when the game is drawn due to the insufficient material rule
+#: ../glchess/src/lib/gtkui/chessview.py:610
+msgid "Neither player can cause checkmate (insufficient material)"
+msgstr ""
+
+#. Translators: Message displayed when the game ends due to the black player resigning
+#: ../glchess/src/lib/gtkui/chessview.py:614
 msgid "The black player has resigned"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:484
+#. Translators: Message displayed when the game ends due to the white player resigning
+#: ../glchess/src/lib/gtkui/chessview.py:617
 msgid "The white player has resigned"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/chessview.py:488
-msgid "One of the players has died"
+#. Translators: Message displayed when a game is abandoned
+#: ../glchess/src/lib/gtkui/chessview.py:622
+msgid "The game has been abandoned"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/network.py:51
-#: ../libgames-support/games-dlg-players.c:205
-msgid "#"
+#. Translators: Message displayed when the game ends due to a player dying
+#: ../glchess/src/lib/gtkui/chessview.py:625
+msgid "One of the players has died"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/network.py:79
-#: ../glchess/src/lib/gtkui/network.py:109
+#. Translators: Server Combo Box: Not connected to a server
+#: ../glchess/src/lib/gtkui/network.py:117
 #, fuzzy
-msgid "Player"
-msgstr "Imreoiri"
+msgid "Disconnected"
+msgstr "Gnect"
+
+#. Translators: Server Combo Box: Add new profile
+#: ../glchess/src/lib/gtkui/network.py:122
+msgid "New profile..."
+msgstr ""
 
-#: ../glchess/src/lib/gtkui/network.py:92
+#. Translators: Available GGZ Tables: Table name column title
+#: ../glchess/src/lib/gtkui/network.py:182
 #, fuzzy
 msgid "Table"
 msgstr "Iomlán"
 
-#: ../glchess/src/lib/gtkui/network.py:106
+#. Translators: Current GGZ Table: Seat name column title
+#: ../glchess/src/lib/gtkui/network.py:199
 #, fuzzy
 msgid "Seat"
 msgstr "hartí"
 
-#: ../glchess/src/lib/gtkui/network.py:254
-#: ../libgames-support/games-dlg-players.c:168
+#. Translators: Current GGZ Table: Player name column title
+#: ../glchess/src/lib/gtkui/network.py:203
+#, fuzzy
+msgid "Player"
+msgstr "Imreoiri"
+
+#. Translators: GGZ seat is occupied by a spectator
+#: ../glchess/src/lib/gtkui/network.py:366
+#: ../libgames-support/games-dlg-players.c:171
 #, fuzzy
 msgid "Spectator"
 msgstr "Elevator"
 
-#: ../glchess/src/lib/gtkui/network.py:261
+#. 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:375
 #, fuzzy, python-format
 msgid "Reserved for %s"
 msgstr "seacht"
 
-#: ../glchess/src/lib/gtkui/network.py:263
+#. Translators: GGZ seat status: This seat is not taken
+#: ../glchess/src/lib/gtkui/network.py:378
 msgid "Seat empty"
 msgstr ""
 
-#: ../glchess/src/lib/gtkui/network.py:265
+#. 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:382
 #, python-format
 msgid "AI (%s)"
 msgstr ""
 
-#. Chess board columns (files) label marked for translation. Please translate to the first eight letters of your alphabet, or the most appropriate eight characters/symbols for labelling the columns of a chess board.
-#: ../glchess/src/lib/scene/cairo/__init__.py:370
+#. Translators: The first file on the chess board
+#: ../glchess/src/lib/chess/__init__.py:11
+msgctxt "chess-file"
 msgid "a"
-msgstr ""
+msgstr "a"
 
-#: ../glchess/src/lib/scene/cairo/__init__.py:370
+#. Translators: The second file on the chess board
+#: ../glchess/src/lib/chess/__init__.py:13
+msgctxt "chess-file"
 msgid "b"
-msgstr ""
+msgstr "b"
 
-#: ../glchess/src/lib/scene/cairo/__init__.py:370
+#. Translators: The third file on the chess board
+#: ../glchess/src/lib/chess/__init__.py:15
+msgctxt "chess-file"
 msgid "c"
-msgstr ""
+msgstr "c"
 
-#: ../glchess/src/lib/scene/cairo/__init__.py:370
+#. Translators: The fourth file on the chess board
+#: ../glchess/src/lib/chess/__init__.py:17
+msgctxt "chess-file"
 msgid "d"
-msgstr ""
+msgstr "d"
 
-#: ../glchess/src/lib/scene/cairo/__init__.py:370
+#. Translators: The fifth file on the chess board
+#: ../glchess/src/lib/chess/__init__.py:19
+msgctxt "chess-file"
 msgid "e"
-msgstr ""
+msgstr "e"
 
-#: ../glchess/src/lib/scene/cairo/__init__.py:370
+#. Translators: The sixth file on the chess board
+#: ../glchess/src/lib/chess/__init__.py:21
+msgctxt "chess-file"
 msgid "f"
-msgstr ""
+msgstr "f"
 
-#: ../glchess/src/lib/scene/cairo/__init__.py:370
+#. Translators: The seventh file on the chess board
+#: ../glchess/src/lib/chess/__init__.py:23
+msgctxt "chess-file"
 msgid "g"
-msgstr ""
+msgstr "g"
 
-#: ../glchess/src/lib/scene/cairo/__init__.py:370
+#. Translators: The eigth file on the chess board
+#: ../glchess/src/lib/chess/__init__.py:25
+msgctxt "chess-file"
 msgid "h"
-msgstr ""
+msgstr "h"
 
-#. Chess board rows (ranks) label marked for translation. Please translate to the first eight numbers with your native number symbols, or the most appropriate eight numbers/symbols for labelling the rows of a chess board.
-#: ../glchess/src/lib/scene/cairo/__init__.py:372 ../gnotravex/gnotravex.c:66
-msgid "8"
-msgstr ""
+#. Translators: The first rank on the chess board
+#: ../glchess/src/lib/chess/__init__.py:28
+msgctxt "chess-rank"
+msgid "1"
+msgstr "1"
 
-#: ../glchess/src/lib/scene/cairo/__init__.py:372 ../gnotravex/gnotravex.c:65
-msgid "7"
-msgstr "7"
+#. Translators: The second rank on the chess board
+#: ../glchess/src/lib/chess/__init__.py:30
+msgctxt "chess-rank"
+msgid "2"
+msgstr "2"
 
-#: ../glchess/src/lib/scene/cairo/__init__.py:372 ../gnotravex/gnotravex.c:65
-msgid "6"
-msgstr "6"
+#. 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
+#: ../glchess/src/lib/chess/__init__.py:34
+msgctxt "chess-rank"
+msgid "4"
+msgstr "4"
 
-#: ../glchess/src/lib/scene/cairo/__init__.py:372 ../gnotravex/gnotravex.c:65
+#. Translators: The fifth rank on the chess board
+#: ../glchess/src/lib/chess/__init__.py:36
+msgctxt "chess-rank"
 msgid "5"
 msgstr "5"
 
-#: ../glchess/src/lib/scene/cairo/__init__.py:372 ../gnotravex/gnotravex.c:65
-msgid "4"
-msgstr "4"
+#. Translators: The sixth rank on the chess board
+#: ../glchess/src/lib/chess/__init__.py:38
+msgctxt "chess-rank"
+msgid "6"
+msgstr "6"
 
-#: ../glchess/src/lib/scene/cairo/__init__.py:372 ../gnotravex/gnotravex.c:65
-msgid "3"
-msgstr "3"
+#. Translators: The seventh rank on the chess board
+#: ../glchess/src/lib/chess/__init__.py:40
+msgctxt "chess-rank"
+msgid "7"
+msgstr "7"
 
-#: ../glchess/src/lib/scene/cairo/__init__.py:372 ../gnotravex/gnotravex.c:65
-msgid "2"
-msgstr "2"
+#. Translators: The eigth rank on the chess board
+#: ../glchess/src/lib/chess/__init__.py:42
+msgctxt "chess-rank"
+msgid "8"
+msgstr "8"
 
-#: ../glchess/src/lib/scene/cairo/__init__.py:372 ../gnotravex/gnotravex.c:65
-msgid "1"
-msgstr "1"
+#. Translators: The notation form of a pawn.
+#. See http://en.wikipedia.org/wiki/Algebraic_chess_notation#Figurine_Algebraic_Notation for translations.
+#: ../glchess/src/lib/chess/__init__.py:46
+msgctxt "chess-notation"
+msgid "P"
+msgstr ""
+
+#. Translators: The notation form of a knight
+#: ../glchess/src/lib/chess/__init__.py:48
+msgctxt "chess-notation"
+msgid "N"
+msgstr ""
+
+#. Translators: The notation form of a bishop
+#: ../glchess/src/lib/chess/__init__.py:50
+msgctxt "chess-notation"
+msgid "B"
+msgstr ""
+
+#. Translators: The notation form of a rook
+#: ../glchess/src/lib/chess/__init__.py:52
+msgctxt "chess-notation"
+msgid "R"
+msgstr ""
 
+#. Translators: The notation form of a queen
+#: ../glchess/src/lib/chess/__init__.py:54
+msgctxt "chess-notation"
+msgid "Q"
+msgstr ""
+
+#. Translators: The notation form of a king
+#: ../glchess/src/lib/chess/__init__.py:56
+msgctxt "chess-notation"
+msgid "K"
+msgstr ""
+
+#. 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:113
 #, python-format
 msgid "'%(name)s' in '%(game)s'"
 msgstr ""
 
-#: ../glchess/src/lib/main.py:674
+#. Translators: Name of the log that displays application events
+#: ../glchess/src/lib/main.py:423
+msgid "Application Log"
+msgstr ""
+
+#. FIXME: Should be in a dialog
+#. Translators: Text displayed on the command-line if an unknown argument is passed
+#: ../glchess/src/lib/main.py:667
 #, python-format
 msgid "Usage: %s [game]"
-msgstr ""
+msgstr "�sáid: %s [cluiche]"
 
-#: ../glchess/src/lib/main.py:684
+#. Translators: Name of a human versus AI game. The %s is replaced with the name of the AI player
+#: ../glchess/src/lib/main.py:678
 #, python-format
 msgid "Human versus %s"
 msgstr ""
 
-#: ../glchess/src/lib/main.py:693
+#. FIXME: Isn't this done by bug-buddy?
+#: ../glchess/src/lib/main.py:692
 msgid ""
-"glChess has crashed. Please report this bug to http://bugzilla.gnome.org";
-msgstr ""
-
-#: ../glchess/src/lib/main.py:694
-msgid "Debug output:"
+"glChess has crashed. Please report this bug to http://bugzilla.gnome.org\n";
+"Debug output:"
 msgstr ""
 
-#: ../glchess/src/lib/main.py:710 ../gnome-sudoku/src/lib/main.py:523
+#: ../glchess/src/lib/main.py:709 ../gnome-sudoku/src/lib/main.py:473
 msgid "Save game before closing?"
 msgstr ""
 
-#: ../glchess/src/lib/defaults.py.in:44
+#: ../glchess/src/lib/defaults.py.in:50
 msgid "glChess"
 msgstr "glChess"
 
-#: ../glchess/src/lib/defaults.py.in:47
-msgid "Copyright 2005-2007 Robert Ancell (and contributors)"
+#: ../glchess/src/lib/defaults.py.in:53
+msgid "Copyright 2005-2008 Robert Ancell (and contributors)"
 msgstr ""
 
-#: ../glchess/src/lib/defaults.py.in:48
+#: ../glchess/src/lib/defaults.py.in:54
 msgid ""
 "The 2D/3D chess game for GNOME. \n"
 "\n"
@@ -4400,21 +5576,22 @@ 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
-#. %s is replaced with the name of the game in gnome-games.
-#: ../glchess/src/lib/defaults.py.in:56
-#: ../gnome-sudoku/src/lib/defaults.py.in:39
-#: ../libgames-support/games-stock.c:373
-#, c-format, python-format
+#: ../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 "
 "terms of the GNU General Public License as published by the Free Software "
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
 msgstr ""
+"Is bogearraí saor é %s; is féidir leat é a athdháileadh nó a athrú faoi "
+"théarmaí an GNU General Public License mar foilsíodh é ag an Free Software "
+"Foundation; leagan 2 an License, nó (de do rogha) aon leagan níos déanaí."
 
-#: ../glchess/src/lib/defaults.py.in:60
-#: ../gnome-sudoku/src/lib/defaults.py.in:43
-#: ../libgames-support/games-stock.c:378
+#: ../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 "
@@ -4422,51 +5599,81 @@ msgid ""
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
 msgstr ""
+"Dáileadh %s le súil go mbeidh sé úsáideach, ach GAN AON BHAR�NTA; gan an "
+"baránta intuigthe IND�OLT�IREACHTA nó OIRI�NACHTA D'FHEIDHM �IRITHE fiú. "
+"Féach an GNU General Public License le haghaidh tuilleadh mionsonraí."
 
-#: ../glchess/src/lib/defaults.py.in:64
-#: ../gnome-sudoku/src/lib/defaults.py.in:47
-#: ../libgames-support/games-stock.c:383
+#: ../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 "
 "%s; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, "
 "Fifth Floor, Boston, MA  02110-1301  USA"
 msgstr ""
+"Ba chóir go bhfuair tú cóip an GNU General Public License in éineacht le %s; "
+"mura bhfuair tú é, scríobh chuig an Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA."
 
-#: ../glchess/src/lib/defaults.py.in:76
-#: ../gnome-sudoku/src/lib/defaults.py.in:58
+#: ../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 ""
 
-#: ../glchess/src/lib/network.py:213
+#. Translators: GGZ disconnection error when the supplied password is incorrect
+#: ../glchess/src/lib/ggz/client.py:205
+msgid "Incorrect password"
+msgstr ""
+
+#. Translators: GGZ disconnection error when the selected account is already in use
+#: ../glchess/src/lib/ggz/client.py:211
+msgid "Account in use"
+msgstr ""
+
+#. Translators: GGZ disconnection error when the network link has broken. %s is the system provided error
+#: ../glchess/src/lib/ggz/client.py:457
+#, python-format
+msgid "Connection closed: %s"
+msgstr ""
+
+#. Translators: GGZ disconnection error when a password was required for the selected account
+#: ../glchess/src/lib/ggz/client.py:598
+msgid "A password is required"
+msgstr ""
+
+#: ../glchess/src/lib/network.py:309
+msgid "Disconnected from server"
+msgstr ""
+
+#: ../glchess/src/lib/network.py:359
 msgid "No description"
-msgstr "Gan cur síos"
+msgstr "Gan chur síos"
 
-#. GstElement *sound_player;
-#: ../glines/glines.c:84 ../gnomine/gnomine.c:89 ../gnomine/gnomine.c:654
-#: ../same-gnome/same-gnome.c:57
+#: ../glines/glines.c:88 ../gnomine/gnomine.c:101
+#: ../same-gnome/same-gnome.c:54
+msgctxt "board size"
 msgid "Small"
 msgstr "Beag"
 
-#: ../glines/glines.c:85
-msgid "glines|Medium"
-msgstr "Meán"
+#: ../glines/glines.c:89 ../gnomine/gnomine.c:102
+#: ../same-gnome/same-gnome.c:55
+msgctxt "board size"
+msgid "Medium"
+msgstr "Méan"
 
-#: ../glines/glines.c:86 ../gnomine/gnomine.c:91 ../gnomine/gnomine.c:673
-#: ../same-gnome/same-gnome.c:59
+#: ../glines/glines.c:90 ../gnomine/gnomine.c:103
+#: ../same-gnome/same-gnome.c:56
+msgctxt "board size"
 msgid "Large"
 msgstr "Mór"
 
-#: ../glines/glines.c:194
+#: ../glines/glines.c:190
 msgid "Could not load theme"
 msgstr ""
 
-#: ../glines/glines.c:200 ../mahjongg/mahjongg.c:160
-msgid "Preferences"
-msgstr "Sainroghanna"
-
-#: ../glines/glines.c:220
+#: ../glines/glines.c:218
 #, c-format
 msgid ""
 "Unable to locate file:\n"
@@ -4475,7 +5682,7 @@ msgid ""
 "The default theme will be loaded instead."
 msgstr ""
 
-#: ../glines/glines.c:227
+#: ../glines/glines.c:225
 #, c-format
 msgid ""
 "Unable to locate file:\n"
@@ -4484,34 +5691,34 @@ msgid ""
 "Please check that Five or More is installed correctly."
 msgstr ""
 
-#: ../glines/glines.c:423
+#: ../glines/glines.c:429
 msgid "Match five objects of the same type in a row to score!"
 msgstr ""
 
-#: ../glines/glines.c:484
+#: ../glines/glines.c:490
 msgid "GNOME Five or More"
-msgstr "Cúig nó Níos Mó GNOME"
+msgstr "Cúig nó Breis GNOME"
 
-#: ../glines/glines.c:486
-#, fuzzy
+#: ../glines/glines.c:492
 msgid "_Board size:"
-msgstr "Méid páirce"
+msgstr "_Méid chláir:"
 
-#: ../glines/glines.c:513
+#: ../glines/glines.c:510
 msgid "Game Over!"
 msgstr "Cluiche Thart!"
 
 #. Can't move there!
-#: ../glines/glines.c:672
+#: ../glines/glines.c:668
 msgid "You can't move there!"
 msgstr ""
 
-#: ../glines/glines.c:1206 ../glines/glines.c:1210 ../glines/glines.c:1212
-#: ../glines/glines.c:1872 ../glines/glines.desktop.in.in.h:1
+#: ../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 "Cúig nó Níos Mó"
+msgstr "Cúig nó Breis"
 
-#: ../glines/glines.c:1215
+#: ../glines/glines.c:1216
 #, fuzzy
 msgid ""
 "GNOME port of the once-popular Color Lines game.\n"
@@ -4519,49 +5726,37 @@ msgid ""
 "Five or More is a part of GNOME Games."
 msgstr "Leagan Gnome as an cluiche Linte Daite"
 
-#: ../glines/glines.c:1440
+#: ../glines/glines.c:1446
 msgid "Five or More Preferences"
-msgstr "Sainroghanna Cúig nó Níos Mó"
+msgstr "Sainroghanna Cúig nó Breis"
 
-#: ../glines/glines.c:1460
+#: ../glines/glines.c:1466
 msgid "Themes"
 msgstr ""
 
-#: ../glines/glines.c:1468
+#: ../glines/glines.c:1474
 msgid "_Image:"
 msgstr ""
 
-#: ../glines/glines.c:1479
-#, fuzzy
+#: ../glines/glines.c:1485
 msgid "B_ackground color:"
-msgstr "Dath Cúlra"
+msgstr "Dath an _chúlra:"
 
-#: ../glines/glines.c:1494
+#: ../glines/glines.c:1500
 msgid "Board Size"
 msgstr "Méid Chláir"
 
-#: ../glines/glines.c:1500 ../same-gnome/ui.c:486
-msgid "_Small"
-msgstr "_Beag"
-
-#: ../glines/glines.c:1509 ../gnome-sudoku/glade/print_games.glade.h:9
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:16 ../same-gnome/ui.c:487
-msgid "_Medium"
-msgstr "_Meán"
-
-#: ../glines/glines.c:1518 ../same-gnome/ui.c:488
-msgid "_Large"
-msgstr "_Mór"
-
-#: ../glines/glines.c:1526
-msgid "glines|General"
+#: ../glines/glines.c:1519
+#, fuzzy
+msgctxt "preferences"
+msgid "General"
 msgstr "Ginearálta"
 
-#: ../glines/glines.c:1533
+#: ../glines/glines.c:1525
 msgid "_Use fast moves"
 msgstr ""
 
-#: ../glines/glines.c:1902
+#: ../glines/glines.c:1874
 msgid "Next:"
 msgstr ""
 
@@ -4571,7 +5766,7 @@ msgstr ""
 
 #: ../glines/glines.schemas.in.h:1 ../gnobots2/gnobots2.schemas.in.h:1
 msgid "Background color"
-msgstr "Dath cúlra"
+msgstr "Dath an chúlra"
 
 #: ../glines/glines.schemas.in.h:2 ../gnobots2/gnobots2.schemas.in.h:2
 msgid "Background color. The hex specification of the background color."
@@ -4627,24 +5822,29 @@ msgstr ""
 msgid "Time between moves in milliseconds."
 msgstr ""
 
-#: ../gnect/data/gnect.desktop.in.in.h:1 ../gnect/src/main.c:910
-#: ../gnect/src/main.c:913 ../gnect/src/main.c:1397
+#. This is the short name for the room
+#: ../gnect/data/gnect.desktop.in.in.h:1 ../gnect/data/gnect.room.in.h:4
 msgid "Four-in-a-Row"
-msgstr "Four-in-a-Row"
+msgstr "Ceathair-ina-Líne"
 
 #: ../gnect/data/gnect.desktop.in.in.h:2
 msgid "Make lines of the same color to win"
 msgstr ""
 
+#. This is the long descriptive name for the room
+#: ../gnect/data/gnect.room.in.h:2
+msgid "Connect four tiles in a row"
+msgstr ""
+
 #: ../gnect/data/gnect.schemas.in.h:1
 msgid "A number specifying the preferred theme."
 msgstr ""
 
 #: ../gnect/data/gnect.schemas.in.h:2
 msgid "Animate"
-msgstr "Beochan"
+msgstr "Beoigh"
 
-#: ../gnect/data/gnect.schemas.in.h:3 ../gnect/src/prefs.c:378
+#: ../gnect/data/gnect.schemas.in.h:3 ../gnect/src/prefs.c:372
 msgid "Drop marble"
 msgstr ""
 
@@ -4662,28 +5862,27 @@ msgstr ""
 
 #: ../gnect/data/gnect.schemas.in.h:7
 msgid "Level of Player One"
-msgstr "Leibheal Imreoir a hAon"
+msgstr "Leibhéal Imreora a hAon"
 
 #: ../gnect/data/gnect.schemas.in.h:8
-#, fuzzy
 msgid "Level of Player Two"
-msgstr "Leibheal Imreoir a Do"
+msgstr "Leibhéal Imreora a Dó"
 
-#: ../gnect/data/gnect.schemas.in.h:9 ../gnect/src/prefs.c:376
-#: ../gnibbles/gnibbles.schemas.in.h:16 ../gnibbles/preferences.c:444
-#: ../gnometris/gnometris.schemas.in.h:13 ../gnometris/tetris.cpp:824
+#: ../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:744
 msgid "Move left"
-msgstr "Bog ar clé"
+msgstr "Bog ar chlé"
 
-#: ../gnect/data/gnect.schemas.in.h:10 ../gnect/src/prefs.c:377
-#: ../gnibbles/gnibbles.schemas.in.h:17 ../gnibbles/preferences.c:445
-#: ../gnometris/gnometris.schemas.in.h:14 ../gnometris/tetris.cpp:825
+#: ../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:745
 msgid "Move right"
-msgstr "Bog ar deis"
+msgstr "Bog ar dheis"
 
 #: ../gnect/data/gnect.schemas.in.h:12
 msgid "Theme ID"
-msgstr ""
+msgstr "CA Téama"
 
 #: ../gnect/data/gnect.schemas.in.h:14
 msgid "Whether or not to use animation."
@@ -4695,80 +5894,80 @@ msgid ""
 "player."
 msgstr ""
 
-#: ../gnect/src/gfx.c:263
+#: ../gnect/src/gfx.c:268
 #, c-format
 msgid ""
 "Unable to load image:\n"
 "%s"
 msgstr ""
 
-#: ../gnect/src/ggz-network.c:115
+#: ../gnect/src/ggz-network.c:117
 msgid "A network error has occurred."
 msgstr ""
 
-#: ../gnect/src/ggz-network.c:129 ../iagno/ggz-network.c:94
+#: ../gnect/src/ggz-network.c:131 ../iagno/ggz-network.c:99
 msgid "Waiting for an opponent to join the game."
 msgstr ""
 
-#: ../gnect/src/ggz-network.c:245 ../gnibbles/ggz-network.c:369
+#: ../gnect/src/ggz-network.c:247 ../gnibbles/ggz-network.c:372
 #, c-format
 msgid "Welcome to a network game of %s."
 msgstr ""
 
-#: ../gnect/src/main.c:566
+#: ../gnect/src/main.c:569
 msgid "It's a draw!"
 msgstr ""
 
-#: ../gnect/src/main.c:580 ../gnome-sudoku/src/lib/main.py:473
+#: ../gnect/src/main.c:583 ../gnome-sudoku/src/lib/main.py:435
 msgid "You win!"
-msgstr "Tá an bua agat!"
+msgstr "Bhuaigh tú!"
 
-#: ../gnect/src/main.c:582 ../gnect/src/main.c:615
+#: ../gnect/src/main.c:585 ../gnect/src/main.c:618
 msgid "It is your move."
 msgstr ""
 
-#: ../gnect/src/main.c:585
+#: ../gnect/src/main.c:588
 msgid "I win!"
-msgstr "Tá an bua agam!"
+msgstr "Bhuaigh mé!"
 
-#: ../gnect/src/main.c:587 ../gnect/src/main.c:720
+#: ../gnect/src/main.c:590 ../gnect/src/main.c:723
 msgid "Thinking..."
 msgstr ""
 
-#: ../gnect/src/main.c:608 ../gnect/src/main.c:612
+#: ../gnect/src/main.c:611 ../gnect/src/main.c:615
 #, c-format
 msgid "%s wins!"
-msgstr ""
+msgstr "Bhuaigh %s!"
 
-#: ../gnect/src/main.c:618
+#: ../gnect/src/main.c:621
 #, c-format
 msgid "Waiting for %s to move."
 msgstr ""
 
-#: ../gnect/src/main.c:737
+#: ../gnect/src/main.c:740
 #, c-format
 msgid "Hint: Column %d"
 msgstr ""
 
-#: ../gnect/src/main.c:765 ../gnect/src/main.c:769
+#: ../gnect/src/main.c:768 ../gnect/src/main.c:772
 msgid "You:"
 msgstr "Tusa:"
 
-#: ../gnect/src/main.c:766 ../gnect/src/main.c:768
+#: ../gnect/src/main.c:769 ../gnect/src/main.c:771
 msgid "Me:"
 msgstr "Mise:"
 
-#: ../gnect/src/main.c:814
+#: ../gnect/src/main.c:817
 #, fuzzy
 msgid "Scores"
 msgstr "Scór"
 
-#: ../gnect/src/main.c:865
+#: ../gnect/src/main.c:868
 #, fuzzy
 msgid "Drawn:"
 msgstr "Síos"
 
-#: ../gnect/src/main.c:918
+#: ../gnect/src/main.c:921
 #, fuzzy
 msgid ""
 "\"Four in a Row\" for GNOME, with a computer player driven by Giuliano "
@@ -4779,176 +5978,190 @@ msgstr ""
 "Four-in-a-row for Gnome, with a computer player driven by Giuliano "
 "Bertoletti's Velena Engine.  "
 
-#: ../gnect/src/prefs.c:113
-#, fuzzy, c-format
+#: ../gnect/src/prefs.c:116
+#, c-format
 msgid ""
 "Player One:\n"
 "%s"
-msgstr "Ainmneach Imreoiri"
+msgstr ""
+"Imreoir a hAon:\n"
+"%s"
 
-#: ../gnect/src/prefs.c:117
-#, fuzzy, c-format
+#: ../gnect/src/prefs.c:120
+#, c-format
 msgid ""
 "Player Two:\n"
 "%s"
-msgstr "Ta an bua agat"
+msgstr ""
+"Imreoir a Dó:\n"
+"%s"
 
-#: ../gnect/src/prefs.c:248 ../iagno/properties.c:463
-#: ../iagno/properties.c:504
-#, fuzzy
+#: ../gnect/src/prefs.c:251 ../iagno/properties.c:458
+#: ../iagno/properties.c:499
 msgid "Level one"
-msgstr "Leibheal a hAon"
+msgstr "Leibhéal a haon"
 
-#: ../gnect/src/prefs.c:250 ../iagno/properties.c:472
-#: ../iagno/properties.c:513
-#, fuzzy
+#: ../gnect/src/prefs.c:253 ../iagno/properties.c:467
+#: ../iagno/properties.c:508
 msgid "Level two"
-msgstr "Leibheal a Do"
+msgstr "Leibhéal a dó"
 
-#: ../gnect/src/prefs.c:252 ../iagno/properties.c:481
-#: ../iagno/properties.c:522
+#: ../gnect/src/prefs.c:255 ../iagno/properties.c:476
+#: ../iagno/properties.c:517
 msgid "Level three"
 msgstr "Leibhéal a trí"
 
-#: ../gnect/src/prefs.c:276
+#: ../gnect/src/prefs.c:279
 msgid "Four-in-a-Row Preferences"
-msgstr ""
+msgstr "Sainroghanna Ceathair-ina-Líne"
 
-#: ../gnect/src/prefs.c:330 ../gnobots2/properties.c:562
-#: ../iagno/properties.c:533
+#: ../gnect/src/prefs.c:333 ../gnobots2/properties.c:530
+#: ../iagno/properties.c:528 ../same-gnome-clutter/data/settings.ui.h:1
 msgid "Appearance"
 msgstr "Cuma"
 
-#: ../gnect/src/prefs.c:339
+#: ../gnect/src/prefs.c:342
 msgid "_Theme:"
 msgstr "_Téama:"
 
-#: ../gnect/src/prefs.c:354
+#: ../gnect/src/prefs.c:357
 #, fuzzy
 msgid "Enable _animation"
 msgstr "Beochan"
 
-#: ../gnect/src/prefs.c:358 ../gnibbles/preferences.c:335
-#: ../iagno/properties.c:442
+#: ../gnect/src/prefs.c:361 ../gnibbles/preferences.c:337
+#: ../iagno/properties.c:437
 msgid "E_nable sounds"
 msgstr ""
 
-#: ../gnect/src/prefs.c:364 ../gnometris/tetris.cpp:813
-msgid "Controls"
-msgstr ""
-
-#: ../gnect/src/prefs.c:368 ../gnibbles/preferences.c:434
-#: ../gnobots2/properties.c:569 ../gnometris/tetris.cpp:816
+#. keyboard tab
+#: ../gnect/src/prefs.c:366 ../gnibbles/preferences.c:436
+#: ../gnobots2/properties.c:537 ../gnometris/tetris.cpp:736
 msgid "Keyboard Controls"
 msgstr ""
 
-#: ../gnect/src/theme.c:42
+#: ../gnect/src/theme.c:45
 msgid "Classic"
-msgstr ""
+msgstr "Clasaiceach"
 
-#: ../gnect/src/theme.c:47 ../gnect/src/theme.c:71 ../gnect/src/theme.c:79
-#: ../gnect/src/theme.c:87 ../gnibbles/preferences.c:472
+#: ../gnect/src/theme.c:50 ../gnect/src/theme.c:74 ../gnect/src/theme.c:82
+#: ../gnect/src/theme.c:90 ../gnibbles/preferences.c:474
 msgid "Red"
 msgstr "Dearg"
 
-#: ../gnect/src/theme.c:47 ../gnect/src/theme.c:87
-#: ../gnibbles/preferences.c:475
+#: ../gnect/src/theme.c:50 ../gnect/src/theme.c:90
+#: ../gnibbles/preferences.c:477
 msgid "Yellow"
 msgstr "Buí"
 
-#: ../gnect/src/theme.c:50
+#: ../gnect/src/theme.c:53
 msgid "High Contrast"
 msgstr ""
 
-#: ../gnect/src/theme.c:55 ../gnect/src/theme.c:63 ../iagno/properties.c:490
+#: ../gnect/src/theme.c:58 ../gnect/src/theme.c:66 ../iagno/properties.c:485
 msgid "Light"
 msgstr "Geal"
 
-#: ../gnect/src/theme.c:55 ../gnect/src/theme.c:63 ../iagno/properties.c:449
+#: ../gnect/src/theme.c:58 ../gnect/src/theme.c:66 ../iagno/properties.c:444
 msgid "Dark"
 msgstr "Dorcha"
 
-#: ../gnect/src/theme.c:58
+#: ../gnect/src/theme.c:61
 msgid "High Contrast Inverse"
 msgstr ""
 
-#: ../gnect/src/theme.c:66
+#: ../gnect/src/theme.c:69
 msgid "Cream Marbles"
 msgstr ""
 
-#: ../gnect/src/theme.c:71 ../gnect/src/theme.c:79 ../gnect/src/theme.c:95
-#: ../gnibbles/preferences.c:474
+#: ../gnect/src/theme.c:74 ../gnect/src/theme.c:82 ../gnect/src/theme.c:98
+#: ../gnibbles/preferences.c:476
 msgid "Blue"
 msgstr "Gorm"
 
-#: ../gnect/src/theme.c:74
+#: ../gnect/src/theme.c:77
 msgid "Glass Marbles"
 msgstr ""
 
-#: ../gnect/src/theme.c:82
+#: ../gnect/src/theme.c:85
 msgid "Nightfall"
 msgstr ""
 
-#: ../gnect/src/theme.c:90
+#: ../gnect/src/theme.c:93
 #, fuzzy
 msgid "Blocks"
 msgstr "Clog"
 
-#: ../gnect/src/theme.c:95
+#: ../gnect/src/theme.c:98
 msgid "Orange"
 msgstr "Oráiste"
 
-#: ../gnibbles/ggz-network.c:136
+#: ../gnibbles/ggz-network.c:139
 #, fuzzy, c-format
 msgid "%s joined the game.\n"
 msgstr "Reitigh an cluiche"
 
-#: ../gnibbles/ggz-network.c:146
+#: ../gnibbles/ggz-network.c:149
 #, c-format
 msgid "The game ended because the host %s left the game.\n"
 msgstr ""
 
-#: ../gnibbles/ggz-network.c:152
+#: ../gnibbles/ggz-network.c:155
 #, fuzzy, c-format
 msgid "%s left the game.\n"
 msgstr "Reitigh an cluiche"
 
-#: ../gnibbles/gnibbles.c:94
+#: ../gnibbles/gnibbles.c:101
+#, c-format
+msgid ""
+"Nibbles couldn't find pixmap file:\n"
+"%s\n"
+"\n"
+"Please check your Nibbles installation"
+msgstr ""
+
+#: ../gnibbles/gnibbles.c:259
 #, c-format
 msgid ""
-"Gnibbles couldn't find pixmap file:\n"
+"Nibbles couldn't load level file:\n"
 "%s\n"
 "\n"
-"Please check your Gnibbles installation"
+"Please check your Nibbles installation"
 msgstr ""
 
-#: ../gnibbles/gnibbles.c:246
+#: ../gnibbles/gnibbles.c:281
 #, c-format
 msgid ""
-"Gnibbles couldn't load level file:\n"
+"Level file appears to be damaged:\n"
 "%s\n"
 "\n"
-"Please check your Gnibbles installation"
+"Please check your Nibbles installation"
 msgstr ""
 
-#: ../gnibbles/gnibbles.c:599
+#: ../gnibbles/gnibbles.c:619
 #, fuzzy
 msgid "Nibbles Scores"
 msgstr "Scóranna Gnect"
 
-#: ../gnibbles/gnibbles.c:602
+#: ../gnibbles/gnibbles.c:622
 msgid "Speed:"
 msgstr "Luas:"
 
-#: ../gnibbles/gnibbles.c:607 ../gnobots2/game.c:178 ../gnomine/gnomine.c:218
-#: ../gnotravex/gnotravex.c:1240 ../gnotski/gnotski.c:930
-#: ../gtali/gyahtzee.c:208 ../mahjongg/mahjongg.c:685 ../same-gnome/ui.c:201
+#: ../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 "Comhghairdeas!"
 
-#: ../gnibbles/gnibbles.c:608 ../gnobots2/game.c:179 ../gnomine/gnomine.c:219
-#: ../gnotravex/gnotravex.c:1241 ../gnotski/gnotski.c:931
-#: ../gtali/gyahtzee.c:209 ../mahjongg/mahjongg.c:686 ../same-gnome/ui.c:202
+#: ../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 ""
+
+#: ../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 ""
 
@@ -4957,10 +6170,21 @@ msgid "Guide a worm around a maze"
 msgstr ""
 
 #: ../gnibbles/gnibbles.desktop.in.in.h:2 ../gnibbles/main.c:243
-#: ../gnibbles/main.c:247 ../gnibbles/main.c:249 ../gnibbles/main.c:994
+#: ../gnibbles/main.c:247 ../gnibbles/main.c:249 ../gnibbles/main.c:871
+#: ../gnibbles/main.c:989 ../gnibbles/main.c:1053
 msgid "Nibbles"
 msgstr "Nibbles"
 
+#. This is the short name for the room
+#: ../gnibbles/gnibbles.room.in.h:2
+msgid "Gnibbles"
+msgstr "Gnibbles"
+
+#. This is the long descriptive name for the room
+#: ../gnibbles/gnibbles.room.in.h:4
+msgid "Gnibbles is a worms game for GNOME."
+msgstr ""
+
 #: ../gnibbles/gnibbles.schemas.in.h:1
 msgid "Color to use for worm"
 msgstr ""
@@ -5017,12 +6241,12 @@ msgstr ""
 msgid "Key to use for motion up."
 msgstr ""
 
-#: ../gnibbles/gnibbles.schemas.in.h:15 ../gnibbles/preferences.c:447
-#: ../gnometris/gnometris.schemas.in.h:12 ../gnometris/tetris.cpp:826
+#: ../gnibbles/gnibbles.schemas.in.h:15 ../gnibbles/preferences.c:449
+#: ../gnometris/gnometris.schemas.in.h:12 ../gnometris/tetris.cpp:746
 msgid "Move down"
 msgstr "Bog síos"
 
-#: ../gnibbles/gnibbles.schemas.in.h:18 ../gnibbles/preferences.c:446
+#: ../gnibbles/gnibbles.schemas.in.h:18 ../gnibbles/preferences.c:448
 msgid "Move up"
 msgstr "Bog suas"
 
@@ -5070,37 +6294,46 @@ msgstr ""
 msgid "Use relative movement (ie. left or right only)."
 msgstr ""
 
-#: ../gnibbles/main.c:60
+#: ../gnibbles/main.c:66
+msgctxt "game speed"
 msgid "Beginner"
 msgstr ""
 
-#: ../gnibbles/main.c:61
+#: ../gnibbles/main.c:67
 #, fuzzy
+msgctxt "game speed"
 msgid "Slow"
 msgstr "Buí"
 
-#: ../gnibbles/main.c:62
-msgid "gnibbles|Medium"
-msgstr "Meán"
+#: ../gnibbles/main.c:68
+#, fuzzy
+msgctxt "game speed"
+msgid "Medium"
+msgstr "Méan"
 
-#: ../gnibbles/main.c:63
+#: ../gnibbles/main.c:69
 #, fuzzy
+msgctxt "game speed"
 msgid "Fast"
 msgstr "Aghaidheanna"
 
-#: ../gnibbles/main.c:64
+#: ../gnibbles/main.c:70
+msgctxt "game speed"
 msgid "Beginner with Fakes"
 msgstr ""
 
-#: ../gnibbles/main.c:65
+#: ../gnibbles/main.c:71
+msgctxt "game speed"
 msgid "Slow with Fakes"
 msgstr ""
 
-#: ../gnibbles/main.c:66
+#: ../gnibbles/main.c:72
+msgctxt "game speed"
 msgid "Medium with Fakes"
 msgstr ""
 
-#: ../gnibbles/main.c:67
+#: ../gnibbles/main.c:73
+msgctxt "game speed"
 msgid "Fast with Fakes"
 msgstr ""
 
@@ -5111,122 +6344,121 @@ msgid ""
 "Nibbles is a part of GNOME Games."
 msgstr ""
 
-#: ../gnibbles/main.c:653
+#: ../gnibbles/main.c:642
 #, c-format
 msgid "Game over! The game has been won by %s!"
 msgstr ""
 
 #. Translators: This string will be included in the intro screen, so don't make sure it fits!
-#: ../gnibbles/main.c:1008
+#: ../gnibbles/main.c:1003
 msgid "A worm game for GNOME."
 msgstr ""
 
-#: ../gnibbles/preferences.c:238
+#: ../gnibbles/preferences.c:240
 msgid "Nibbles Preferences"
 msgstr "Sainroghanna Nibbles"
 
-#: ../gnibbles/preferences.c:258
+#: ../gnibbles/preferences.c:260
 msgid "Speed"
 msgstr "Luas"
 
-#: ../gnibbles/preferences.c:268
+#: ../gnibbles/preferences.c:270
 msgid "Nibbles newbie"
 msgstr ""
 
-#: ../gnibbles/preferences.c:278
+#: ../gnibbles/preferences.c:280
 msgid "My second day"
 msgstr ""
 
-#: ../gnibbles/preferences.c:288
+#: ../gnibbles/preferences.c:290
 msgid "Not too shabby"
 msgstr ""
 
-#: ../gnibbles/preferences.c:298
+#: ../gnibbles/preferences.c:300
 msgid "Finger-twitching good"
 msgstr ""
 
-#: ../gnibbles/preferences.c:315
+#: ../gnibbles/preferences.c:317
 msgid "_Play levels in random order"
 msgstr ""
 
-#: ../gnibbles/preferences.c:325
+#: ../gnibbles/preferences.c:327
 msgid "_Enable fake bonuses"
 msgstr ""
 
 #. starting level
-#: ../gnibbles/preferences.c:348 ../gnometris/tetris.cpp:728
-#, fuzzy
+#: ../gnibbles/preferences.c:350 ../gnometris/tetris.cpp:643
 msgid "_Starting level:"
-msgstr "Leibheal Sokoban:"
+msgstr "Leibhéal _tosaithe:"
 
-#: ../gnibbles/preferences.c:377
+#: ../gnibbles/preferences.c:379
 #, fuzzy
 msgid "Number of _human players:"
 msgstr "Uimhir na Miana:"
 
-#: ../gnibbles/preferences.c:398
+#: ../gnibbles/preferences.c:400
 #, fuzzy
 msgid "Number of _AI players:"
 msgstr "Uimhir na Miana:"
 
-#: ../gnibbles/preferences.c:425
+#: ../gnibbles/preferences.c:427
 msgid "Worm"
-msgstr ""
+msgstr "Péist"
 
-#: ../gnibbles/preferences.c:459
+#: ../gnibbles/preferences.c:461
 msgid "_Use relative movement"
 msgstr ""
 
-#: ../gnibbles/preferences.c:466
+#: ../gnibbles/preferences.c:468
 msgid "_Worm color:"
-msgstr ""
+msgstr "Dath _péiste:"
 
-#: ../gnibbles/preferences.c:473
+#: ../gnibbles/preferences.c:475
 msgid "Green"
-msgstr "Glas"
+msgstr "Uaine"
 
-#: ../gnibbles/preferences.c:476
+#: ../gnibbles/preferences.c:478
 msgid "Cyan"
-msgstr ""
+msgstr "Cian"
 
-#: ../gnibbles/preferences.c:477
+#: ../gnibbles/preferences.c:479
 msgid "Purple"
 msgstr "Corcra"
 
-#: ../gnibbles/preferences.c:478
+#: ../gnibbles/preferences.c:480
 msgid "Gray"
 msgstr "Liath"
 
-#: ../gnibbles/scoreboard.c:45
+#: ../gnibbles/scoreboard.c:49
 #, c-format
 msgid "Worm %d:"
-msgstr ""
+msgstr "Péist %d:"
 
-#: ../gnobots2/game.c:149 ../gtali/gyahtzee.c:227 ../same-gnome/ui.c:178
+#: ../gnobots2/game.c:153 ../gtali/gyahtzee.c:221 ../same-gnome/ui.c:170
 msgid "Game over!"
 msgstr "Cluiche thart!"
 
-#: ../gnobots2/game.c:151 ../gnomine/gnomine.c:194 ../gnotski/gnotski.c:905
+#: ../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 ""
 
 #. Translators: This "_New Game" is for the game-over dialogue
-#: ../gnobots2/game.c:153 ../gnomine/gnomine.c:196 ../gnotski/gnotski.c:907
-#: ../libgames-support/games-stock.c:299 ../same-gnome/ui.c:184
+#: ../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 "Cluiche _Nua"
 
-#: ../gnobots2/game.c:166
+#: ../gnobots2/game.c:170
 #, fuzzy
 msgid "Robots Scores"
 msgstr "Scóranna Gnect"
 
-#: ../gnobots2/game.c:169 ../mahjongg/mahjongg.c:683
-#: ../mahjongg/mahjongg.c:1002
+#: ../gnobots2/game.c:173 ../mahjongg/mahjongg.c:666
+#: ../mahjongg/mahjongg.c:995
 msgid "Map:"
 msgstr "Mapa:"
 
-#: ../gnobots2/game.c:411 ../gnobots2/game.c:427
+#: ../gnobots2/game.c:415 ../gnobots2/game.c:431
 msgid ""
 "Congratulations, You Have Defeated the Robots!! \n"
 "But Can You do it Again?"
@@ -5241,111 +6473,112 @@ msgstr ""
 msgid "There are no safe locations to teleport to!!"
 msgstr ""
 
-#: ../gnobots2/gnobots.c:76
+#: ../gnobots2/gnobots.c:85
 msgid "Set game scenario"
 msgstr "Roghnaigh Cnámhscéal cluiche"
 
-#: ../gnobots2/gnobots.c:78
+#: ../gnobots2/gnobots.c:87
 msgid "Set game configuration"
 msgstr ""
 
-#: ../gnobots2/gnobots.c:80 ../gnobots2/gnobots.c:82
+#: ../gnobots2/gnobots.c:89 ../gnobots2/gnobots.c:91
 msgid "Initial window position"
 msgstr ""
 
-#: ../gnobots2/gnobots.c:80 ../gnomine/gnomine.c:960 ../gnomine/gnomine.c:968
-#: ../gnotravex/gnotravex.c:396 ../gnotski/gnotski.c:542
-#: ../iagno/gnothello.c:130
+#: ../gnobots2/gnobots.c:89 ../gnomine/gnomine.c:991 ../gnomine/gnomine.c:999
+#: ../gnotravex/gnotravex.c:399 ../gnotski/gnotski.c:467
+#: ../iagno/gnothello.c:146
 msgid "X"
 msgstr "X"
 
-#: ../gnobots2/gnobots.c:82 ../gnomine/gnomine.c:962 ../gnomine/gnomine.c:970
-#: ../gnotravex/gnotravex.c:398 ../gnotski/gnotski.c:544
-#: ../iagno/gnothello.c:132
+#: ../gnobots2/gnobots.c:91 ../gnomine/gnomine.c:993 ../gnomine/gnomine.c:1001
+#: ../gnotravex/gnotravex.c:401 ../gnotski/gnotski.c:469
+#: ../iagno/gnothello.c:148
 msgid "Y"
 msgstr "Y"
 
-#: ../gnobots2/gnobots.c:87
+#: ../gnobots2/gnobots.c:96
 msgid "Classic robots"
 msgstr ""
 
-#: ../gnobots2/gnobots.c:88
+#: ../gnobots2/gnobots.c:97
 msgid "Classic robots with safe moves"
 msgstr ""
 
-#: ../gnobots2/gnobots.c:89
+#: ../gnobots2/gnobots.c:98
 msgid "Classic robots with super-safe moves"
 msgstr ""
 
-#: ../gnobots2/gnobots.c:90
+#: ../gnobots2/gnobots.c:99
 msgid "Nightmare"
 msgstr ""
 
-#: ../gnobots2/gnobots.c:91
+#: ../gnobots2/gnobots.c:100
 msgid "Nightmare with safe moves"
 msgstr ""
 
-#: ../gnobots2/gnobots.c:92
+#: ../gnobots2/gnobots.c:101
 msgid "Nightmare with super-safe moves"
 msgstr ""
 
-#: ../gnobots2/gnobots.c:93
+#: ../gnobots2/gnobots.c:102
 msgid "Robots2"
-msgstr "Robots2"
+msgstr "Róbait2"
 
-#: ../gnobots2/gnobots.c:94
+#: ../gnobots2/gnobots.c:103
 msgid "Robots2 with safe moves"
 msgstr ""
 
-#: ../gnobots2/gnobots.c:95
+#: ../gnobots2/gnobots.c:104
 msgid "Robots2 with super-safe moves"
 msgstr ""
 
-#: ../gnobots2/gnobots.c:96
+#: ../gnobots2/gnobots.c:105
 #, fuzzy
 msgid "Robots2 easy"
 msgstr "Robots"
 
-#: ../gnobots2/gnobots.c:97
+#: ../gnobots2/gnobots.c:106
 msgid "Robots2 easy with safe moves"
 msgstr ""
 
-#: ../gnobots2/gnobots.c:98
+#: ../gnobots2/gnobots.c:107
 msgid "Robots2 easy with super-safe moves"
 msgstr ""
 
-#: ../gnobots2/gnobots.c:99
+#: ../gnobots2/gnobots.c:108
 msgid "Robots with safe teleport"
 msgstr ""
 
-#: ../gnobots2/gnobots.c:100
+#: ../gnobots2/gnobots.c:109
 msgid "Robots with safe teleport with safe moves"
 msgstr ""
 
-#: ../gnobots2/gnobots.c:101
+#: ../gnobots2/gnobots.c:110
 msgid "Robots with safe teleport with super-safe moves"
 msgstr ""
 
-#: ../gnobots2/gnobots.c:233 ../gnobots2/gnobots2.desktop.in.in.h:2
-#: ../gnobots2/menu.c:258 ../gnobots2/menu.c:261
+#: ../gnobots2/gnobots.c:239 ../gnobots2/gnobots.c:260
+#: ../gnobots2/gnobots2.desktop.in.in.h:2 ../gnobots2/menu.c:263
+#: ../gnobots2/menu.c:266
 msgid "Robots"
-msgstr "Robots"
+msgstr "Róbait"
 
-#: ../gnobots2/gnobots.c:295
+#: ../gnobots2/gnobots.c:322
 msgid "No game data could be found."
 msgstr ""
 
-#: ../gnobots2/gnobots.c:297
+#: ../gnobots2/gnobots.c:324
 msgid ""
 "The program Robots was unable to find any valid game configuration files. "
 "Please check that the program is installed correctly."
 msgstr ""
 
-#: ../gnobots2/gnobots.c:316
+#: ../gnobots2/gnobots.c:340
 msgid "Some graphics files are missing or corrupt."
 msgstr ""
 
-#: ../gnobots2/gnobots.c:318
+#: ../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."
@@ -5365,359 +6598,326 @@ msgid "Enable game sounds. Play sounds for various events throughout the game."
 msgstr ""
 
 #: ../gnobots2/gnobots2.schemas.in.h:5
-msgid "Enable splats"
-msgstr ""
-
-#: ../gnobots2/gnobots2.schemas.in.h:6
-msgid "Enable splats. Play a sound and show a \"Splat!\" on the screen."
-msgstr ""
-
-#: ../gnobots2/gnobots2.schemas.in.h:7
 msgid "Game type"
-msgstr "Saghas Cluiche:"
+msgstr "Cineál cluiche"
 
-#: ../gnobots2/gnobots2.schemas.in.h:8
+#: ../gnobots2/gnobots2.schemas.in.h:6
 msgid "Game type. The name of the game variation to use."
 msgstr ""
 
-#: ../gnobots2/gnobots2.schemas.in.h:9 ../gnobots2/properties.c:584
+#: ../gnobots2/gnobots2.schemas.in.h:7 ../gnobots2/properties.c:552
 msgid "Key to hold"
 msgstr ""
 
-#: ../gnobots2/gnobots2.schemas.in.h:10 ../gnobots2/properties.c:580
+#: ../gnobots2/gnobots2.schemas.in.h:8 ../gnobots2/properties.c:548
 msgid "Key to move E"
 msgstr ""
 
-#: ../gnobots2/gnobots2.schemas.in.h:11 ../gnobots2/properties.c:577
+#: ../gnobots2/gnobots2.schemas.in.h:9 ../gnobots2/properties.c:545
 msgid "Key to move N"
 msgstr ""
 
-#: ../gnobots2/gnobots2.schemas.in.h:12 ../gnobots2/properties.c:578
+#: ../gnobots2/gnobots2.schemas.in.h:10 ../gnobots2/properties.c:546
 msgid "Key to move NE"
 msgstr ""
 
-#: ../gnobots2/gnobots2.schemas.in.h:13 ../gnobots2/properties.c:576
+#: ../gnobots2/gnobots2.schemas.in.h:11 ../gnobots2/properties.c:544
 msgid "Key to move NW"
 msgstr ""
 
-#: ../gnobots2/gnobots2.schemas.in.h:14 ../gnobots2/properties.c:582
+#: ../gnobots2/gnobots2.schemas.in.h:12 ../gnobots2/properties.c:550
 msgid "Key to move S"
 msgstr ""
 
-#: ../gnobots2/gnobots2.schemas.in.h:15 ../gnobots2/properties.c:583
+#: ../gnobots2/gnobots2.schemas.in.h:13 ../gnobots2/properties.c:551
 msgid "Key to move SE"
 msgstr ""
 
-#: ../gnobots2/gnobots2.schemas.in.h:16 ../gnobots2/properties.c:581
+#: ../gnobots2/gnobots2.schemas.in.h:14 ../gnobots2/properties.c:549
 msgid "Key to move SW"
 msgstr ""
 
-#: ../gnobots2/gnobots2.schemas.in.h:17 ../gnobots2/properties.c:579
+#: ../gnobots2/gnobots2.schemas.in.h:15 ../gnobots2/properties.c:547
 msgid "Key to move W"
 msgstr ""
 
-#: ../gnobots2/gnobots2.schemas.in.h:18 ../gnobots2/properties.c:585
+#: ../gnobots2/gnobots2.schemas.in.h:16 ../gnobots2/properties.c:553
 #, fuzzy
 msgid "Key to teleport"
 msgstr "Imreoir Teleport"
 
-#: ../gnobots2/gnobots2.schemas.in.h:19 ../gnobots2/properties.c:586
+#: ../gnobots2/gnobots2.schemas.in.h:17 ../gnobots2/properties.c:554
 msgid "Key to teleport randomly"
 msgstr ""
 
-#: ../gnobots2/gnobots2.schemas.in.h:20 ../gnobots2/properties.c:587
+#: ../gnobots2/gnobots2.schemas.in.h:18 ../gnobots2/properties.c:555
 msgid "Key to wait"
 msgstr ""
 
-#: ../gnobots2/gnobots2.schemas.in.h:21
+#: ../gnobots2/gnobots2.schemas.in.h:19
 msgid "Robot image theme"
 msgstr ""
 
-#: ../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 ""
 
-#: ../gnobots2/gnobots2.schemas.in.h:24
+#: ../gnobots2/gnobots2.schemas.in.h:22
 msgid "Show toolbar. A standard option for toolbars."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
-#: ../gnobots2/gnobots2.schemas.in.h:37
+#: ../gnobots2/gnobots2.schemas.in.h:35
 msgid "Use safe moves"
 msgstr ""
 
-#: ../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 "
 "when there is a safe move available you will not be allowed to proceed."
 msgstr ""
 
-#: ../gnobots2/gnobots2.schemas.in.h:39
+#: ../gnobots2/gnobots2.schemas.in.h:37
 msgid "Use super safe moves"
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../gnobots2/graphics.c:152 ../iagno/gnothello.c:440
+#: ../gnobots2/graphics.c:155 ../iagno/gnothello.c:415
 #, c-format
 msgid "Could not find '%s' pixmap file\n"
 msgstr ""
 
-#: ../gnobots2/menu.c:65 ../gnotravex/gnotravex.c:301
+#: ../gnobots2/menu.c:70 ../gnotravex/gnotravex.c:304
 msgid "_Move"
 msgstr "_Bog"
 
-#: ../gnobots2/menu.c:72
+#: ../gnobots2/menu.c:77
 #, fuzzy
 msgid "_Teleport"
 msgstr "Imreoir Teleport"
 
-#: ../gnobots2/menu.c:73
+#: ../gnobots2/menu.c:78
 msgid "Teleport, safely if possible"
 msgstr ""
 
-#: ../gnobots2/menu.c:74
+#: ../gnobots2/menu.c:79
 msgid "_Random"
-msgstr ""
+msgstr "_Randamach"
 
-#: ../gnobots2/menu.c:75
+#: ../gnobots2/menu.c:80
 msgid "Teleport randomly"
 msgstr ""
 
-#: ../gnobots2/menu.c:76
+#: ../gnobots2/menu.c:81
 msgid "_Wait"
 msgstr "_Fan"
 
-#: ../gnobots2/menu.c:76
+#: ../gnobots2/menu.c:81
 msgid "Wait for the robots"
 msgstr ""
 
-#: ../gnobots2/menu.c:266
+#: ../gnobots2/menu.c:271
 msgid ""
 "Based on classic BSD Robots.\n"
 "\n"
 "Robots is a part of GNOME Games."
 msgstr ""
 
-#: ../gnobots2/properties.c:331
+#: ../gnobots2/properties.c:316
 msgid "classic robots"
 msgstr ""
 
-#: ../gnobots2/properties.c:332
+#: ../gnobots2/properties.c:317
 msgid "robots2"
 msgstr ""
 
-#: ../gnobots2/properties.c:333
+#: ../gnobots2/properties.c:318
 msgid "robots2 easy"
 msgstr ""
 
-#: ../gnobots2/properties.c:334
+#: ../gnobots2/properties.c:319
 msgid "robots with safe teleport"
 msgstr ""
 
-#: ../gnobots2/properties.c:335
+#: ../gnobots2/properties.c:320
 msgid "nightmare"
 msgstr ""
 
-#: ../gnobots2/properties.c:371
+#: ../gnobots2/properties.c:359
 msgid "robots"
-msgstr ""
+msgstr "róbait"
 
-#: ../gnobots2/properties.c:372
+#: ../gnobots2/properties.c:360
 msgid "cows"
 msgstr ""
 
-#: ../gnobots2/properties.c:373
+#: ../gnobots2/properties.c:361
 msgid "eggs"
 msgstr ""
 
-#: ../gnobots2/properties.c:374
+#: ../gnobots2/properties.c:362
 msgid "gnomes"
 msgstr ""
 
-#: ../gnobots2/properties.c:375
+#: ../gnobots2/properties.c:363
 msgid "mice"
 msgstr ""
 
-#: ../gnobots2/properties.c:376
+#: ../gnobots2/properties.c:364
 msgid "ufo"
 msgstr ""
 
-#: ../gnobots2/properties.c:377
+#: ../gnobots2/properties.c:365
 msgid "boo"
 msgstr ""
 
-#: ../gnobots2/properties.c:434
+#: ../gnobots2/properties.c:419
 msgid "Robots Preferences"
-msgstr "Sainroghanna Robots"
+msgstr "Sainroghanna Róbat"
 
 #. --- Combo (yahtzee or kismet style ----
-#: ../gnobots2/properties.c:455 ../gtali/setup.c:360
+#: ../gnobots2/properties.c:440 ../gtali/setup.c:361
 msgid "Game Type"
-msgstr "Saghas Cluiche"
+msgstr "Cineál Cluiche"
 
-#: ../gnobots2/properties.c:480
+#: ../gnobots2/properties.c:460
 msgid "_Use safe moves"
 msgstr ""
 
-#: ../gnobots2/properties.c:487
-msgid "Prevent some dangerous moves"
-msgstr ""
-
-#: ../gnobots2/properties.c:489
+#: ../gnobots2/properties.c:467
 msgid "Prevent accidental moves that result in getting killed."
 msgstr ""
 
-#: ../gnobots2/properties.c:491
+#: ../gnobots2/properties.c:469
 msgid "U_se super safe moves"
 msgstr ""
 
-#: ../gnobots2/properties.c:498
-msgid "Prevent all dangerous moves"
-msgstr ""
-
-#: ../gnobots2/properties.c:500
+#: ../gnobots2/properties.c:476
 msgid "Prevents all moves that result in getting killed."
 msgstr ""
 
-#: ../gnobots2/properties.c:508
-msgid "Play sounds for major events"
+#: ../gnobots2/properties.c:483 ../gnometris/tetris.cpp:669
+msgid "_Enable sounds"
 msgstr ""
 
-#: ../gnobots2/properties.c:510
+#: ../gnobots2/properties.c:489
 msgid "Play sounds for events like winning a level and dying."
 msgstr ""
 
-#: ../gnobots2/properties.c:512
-msgid "E_nable splats"
-msgstr ""
-
-#: ../gnobots2/properties.c:519
-msgid "Play a sound when two robots collide"
-msgstr ""
-
-#: ../gnobots2/properties.c:521
-msgid "Play the most common, and potentially the most annoying, sound."
-msgstr ""
-
-#: ../gnobots2/properties.c:531
+#: ../gnobots2/properties.c:499
 msgid "Graphics Theme"
 msgstr ""
 
-#: ../gnobots2/properties.c:539
+#: ../gnobots2/properties.c:507
 msgid "_Image theme:"
 msgstr ""
 
-#: ../gnobots2/properties.c:550 ../mahjongg/mahjongg.c:792
+#: ../gnobots2/properties.c:518 ../mahjongg/mahjongg.c:775
 msgid "_Background color:"
-msgstr "_Dath cúlra:"
+msgstr "_Dath an chúlra:"
 
-#: ../gnobots2/properties.c:596
+#: ../gnobots2/properties.c:564
 msgid "_Restore Defaults"
 msgstr ""
 
-#: ../gnobots2/properties.c:601
+#: ../gnobots2/properties.c:569
 msgid "Keyboard"
 msgstr "Mearchlár"
 
-#: ../gnobots2/statusbar.c:75
+#: ../gnobots2/statusbar.c:77
 msgid "Safe Teleports:"
 msgstr ""
 
-#: ../gnobots2/statusbar.c:85 ../gnometris/scoreframe.cpp:70
+#: ../gnobots2/statusbar.c:87 ../gnometris/scoreframe.cpp:68
 msgid "Level:"
 msgstr "Leibhéal:"
 
-#: ../gnobots2/statusbar.c:95
+#: ../gnobots2/statusbar.c:97
 msgid "Remaining:"
 msgstr ""
 
-#: ../gnometris/blockops.cpp:227
-#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:184
-#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:223
-msgid "Paused"
-msgstr ""
-
+#. ********************************************************************
 #: ../gnometris/gnometris.desktop.in.in.h:1
 msgid "Fit falling blocks together"
 msgstr ""
 
-#: ../gnometris/gnometris.desktop.in.in.h:2 ../gnometris/tetris.cpp:159
-#: ../gnometris/tetris.cpp:1388 ../gnometris/tetris.cpp:1392
-#: ../gnometris/tetris.cpp:1394
+#: ../gnometris/gnometris.desktop.in.in.h:2 ../gnometris/main.cpp:66
+#: ../gnometris/tetris.cpp:162 ../gnometris/tetris.cpp:1300
+#: ../gnometris/tetris.cpp:1304 ../gnometris/tetris.cpp:1306
 msgid "Gnometris"
 msgstr "Gnometris"
 
-#: ../gnometris/gnometris.schemas.in.h:1 ../gnometris/tetris.cpp:827
+#: ../gnometris/gnometris.schemas.in.h:1 ../gnometris/tetris.cpp:747
 msgid "Drop"
 msgstr ""
 
@@ -5753,18 +6953,17 @@ msgstr ""
 msgid "Level to start with."
 msgstr ""
 
-#: ../gnometris/gnometris.schemas.in.h:15 ../gnometris/tetris.cpp:829
+#: ../gnometris/gnometris.schemas.in.h:15 ../gnometris/tetris.cpp:749
 msgid "Pause"
 msgstr "Sos"
 
-#: ../gnometris/gnometris.schemas.in.h:16 ../gnometris/tetris.cpp:828
+#: ../gnometris/gnometris.schemas.in.h:16 ../gnometris/tetris.cpp:748
 msgid "Rotate"
 msgstr ""
 
 #: ../gnometris/gnometris.schemas.in.h:17
-#, fuzzy
 msgid "The background color"
-msgstr "Dath Cúlra"
+msgstr "Dath an chúlra"
 
 #: ../gnometris/gnometris.schemas.in.h:18
 msgid "The background color, in a format gdk_color_parse understands."
@@ -5841,103 +7040,108 @@ msgstr ""
 msgid "Whether to use the background image"
 msgstr ""
 
-#: ../gnometris/main.cpp:42
+#: ../gnometris/main.cpp:48
 msgid "Set starting level (1 or greater)"
 msgstr ""
 
-#: ../gnometris/main.cpp:42
+#: ../gnometris/main.cpp:48
 msgid "LEVEL"
 msgstr "LEIBHÃ?AL"
 
-#: ../gnometris/renderer.cpp:27
+#: ../gnometris/renderer.cpp:30
 #, fuzzy
 msgid "Plain"
 msgstr "Plait"
 
-#: ../gnometris/renderer.cpp:28
-#, fuzzy
-msgid "Joined"
-msgstr "Tada"
-
-#: ../gnometris/renderer.cpp:29
+#: ../gnometris/renderer.cpp:31
 msgid "Tango Flat"
 msgstr ""
 
-#: ../gnometris/renderer.cpp:30
+#: ../gnometris/renderer.cpp:32
 msgid "Tango Shaded"
 msgstr ""
 
-#: ../gnometris/scoreframe.cpp:59
+#: ../gnometris/scoreframe.cpp:57
 msgid "Lines:"
 msgstr "Línte:"
 
-#: ../gnometris/tetris.cpp:631 ../gnometris/tetris.cpp:632
-msgid "<none>"
-msgstr "<neamhní>"
-
-#: ../gnometris/tetris.cpp:660
+#: ../gnometris/tetris.cpp:575
 msgid "Gnometris Preferences"
 msgstr "Sainroghanna Gnometris"
 
-#: ../gnometris/tetris.cpp:684
+#: ../gnometris/tetris.cpp:599 ../same-gnome-clutter/data/settings.ui.h:6
 msgid "Setup"
 msgstr "Socrú"
 
 #. pre-filled rows
-#: ../gnometris/tetris.cpp:690
+#: ../gnometris/tetris.cpp:605
 #, fuzzy
 msgid "_Number of pre-filled rows:"
 msgstr "Uimhir na Miana:"
 
 #. pre-filled rows density
-#: ../gnometris/tetris.cpp:709
+#: ../gnometris/tetris.cpp:624
 msgid "_Density of blocks in a pre-filled row:"
 msgstr ""
 
-#: ../gnometris/tetris.cpp:749
+#: ../gnometris/tetris.cpp:664 ../same-gnome-clutter/data/settings.ui.h:4
 msgid "Operation"
 msgstr ""
 
-#: ../gnometris/tetris.cpp:763
+#: ../gnometris/tetris.cpp:678
 msgid "_Preview next block"
 msgstr ""
 
-#: ../gnometris/tetris.cpp:772
+#: ../gnometris/tetris.cpp:687
 msgid "_Use random block colors"
 msgstr ""
 
-#: ../gnometris/tetris.cpp:783
+#: ../gnometris/tetris.cpp:698
+msgid "_Bastard mode"
+msgstr ""
+
+#: ../gnometris/tetris.cpp:707
 msgid "_Rotate blocks counterclockwise"
 msgstr ""
 
-#: ../gnometris/tetris.cpp:792
+#: ../gnometris/tetris.cpp:716
 msgid "Show _where the block will land"
 msgstr ""
 
-#: ../gnometris/tetris.cpp:804 ../gnometris/tetris.cpp:837
-#: ../same-gnome/ui.c:328
+#: ../gnometris/tetris.cpp:724 ../gnometris/tetris.cpp:757
+#: ../same-gnome/ui.c:324
 msgid "Theme"
 msgstr ""
 
-#: ../gnometris/tetris.cpp:840
+#: ../gnometris/tetris.cpp:733
+msgid "Controls"
+msgstr ""
+
+#: ../gnometris/tetris.cpp:760
 #, fuzzy
 msgid "Block Style"
 msgstr "Block ten"
 
-#: ../gnometris/tetris.cpp:1397
+#: ../gnometris/tetris.cpp:1309
 msgid ""
 "A classic game of fitting falling blocks together.\n"
 "\n"
 "Gnometris is a part of GNOME Games."
 msgstr ""
 
-#: ../gnometris/highscores.cpp:56
+#: ../gnometris/highscores.cpp:52
 #, fuzzy
 msgid "Gnometris Scores"
 msgstr "Scóranna Gnect"
 
+#: ../gnometris/blockops.cpp:861
+#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:173
+#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
+msgid "Paused"
+msgstr "Ar Sos"
+
 #: ../gnome-sudoku/gnome-sudoku.desktop.in.in.h:1
-#: ../gnome-sudoku/src/lib/defaults.py.in:28
+#: ../gnome-sudoku/src/lib/defaults.py.in:38
 msgid "Sudoku"
 msgstr "Sudoku"
 
@@ -5945,151 +7149,199 @@ msgstr "Sudoku"
 msgid "Test your logic skills in this number grid puzzle"
 msgstr ""
 
-#: ../gnome-sudoku/glade/print_games.glade.h:1
-msgid "<b><i>Details</i></b>"
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:1
+msgid "Color of the grid border"
 msgstr ""
 
-#: ../gnome-sudoku/glade/print_games.glade.h:2
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:2
+msgid "Generate new puzzles in the background"
+msgstr ""
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:3
+#, fuzzy
+msgid "Height of application window in pixels"
+msgstr "Airde na greille"
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:4
+msgid "Mark printed games as played"
+msgstr ""
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:5
+#, fuzzy
+msgid "Number of puzzles to print on a page"
+msgstr "Uimhir na Miana:"
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:6
+msgid "Print games that have been played"
+msgstr ""
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:7
+msgid "Show hint highlights"
+msgstr ""
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:8
+msgid "Show hints"
+msgstr "Taispeáin leideanna"
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:9
+msgid "Show the application toolbar"
+msgstr "Taispeáin barra uirlisí an fheidhmchláir"
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:10
+msgid "The number of seconds between automatic saves"
+msgstr ""
+
+#: ../gnome-sudoku/data/gnome-sudoku.schemas.in.h:11
+#, fuzzy
+msgid "Width of application window in pixels"
+msgstr "Airde na greille"
+
+#: ../gnome-sudoku/data/print_games.ui.h:1
+msgid "<b><i>Details</i></b>"
+msgstr "<b><i>Mionsonraí</i></b>"
+
+#: ../gnome-sudoku/data/print_games.ui.h:2
 msgid "<b><i>Levels of difficulty to print</i></b>"
 msgstr ""
 
-#: ../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 ""
 
-#: ../gnome-sudoku/glade/print_games.glade.h:4
+#: ../gnome-sudoku/data/print_games.ui.h:4
 msgid "Print Sudokus"
 msgstr ""
 
-#: ../gnome-sudoku/glade/print_games.glade.h:5
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:13
-#, fuzzy
+#: ../gnome-sudoku/data/print_games.ui.h:5
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:13
 msgid "_Easy"
-msgstr "Fan"
+msgstr "Ã?_asca"
 
-#: ../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 ""
+msgstr "_Deacair"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../gnome-sudoku/glade/print_games.glade.h:10
+#: ../gnome-sudoku/data/print_games.ui.h:9
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:16 ../same-gnome/ui.c:479
+msgid "_Medium"
+msgstr "_Measartha"
+
+#: ../gnome-sudoku/data/print_games.ui.h:10
 #, fuzzy
 msgid "_Number of sudoku to print: "
 msgstr "Uimhir na Miana:"
 
-#: ../gnome-sudoku/glade/print_games.glade.h:11
+#: ../gnome-sudoku/data/print_games.ui.h:11
 msgid "_Sudokus per page: "
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:2
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:2
 msgid "<i>Easy:</i>"
-msgstr ""
+msgstr "<i>Ã?asca:</i>"
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:3
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:3
 msgid "<i>Hard:</i>"
-msgstr ""
+msgstr "<i>Deacair:</i>"
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:4
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:4
 msgid "<i>Medium:</i>"
-msgstr "<i>Meán:</i>"
+msgstr "<i>Measartha:</i>"
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:5
-#, fuzzy
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:5
 msgid "<i>Very Hard:</i>"
-msgstr "Méan"
+msgstr "<i>An-Deacair:</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 ""
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:7
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:7
 msgid "Criteria:"
 msgstr ""
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:8
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:8
 #, fuzzy
 msgid "Generate Policy"
 msgstr "Gineréal"
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:9
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:9
 msgid "Generate new puzzles _until stopped"
 msgstr ""
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:10
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:10
 msgid "Generate until _reaching target"
 msgstr ""
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:11
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:11
 msgid "Puzzle Generator"
 msgstr ""
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:12
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:12
 msgid "Target _number of sudokus:"
 msgstr ""
 
-#: ../gnome-sudoku/glade/puzzle_generator.glade.h:14
-#, fuzzy
+#: ../gnome-sudoku/data/puzzle_generator.ui.h:14
 msgid "_Generate"
-msgstr "Gineréal"
+msgstr "_Gin"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../gnome-sudoku/glade/tracker.glade.h:1
+#: ../gnome-sudoku/data/tracker.ui.h:1
 msgid "Clear _Others"
 msgstr ""
 
-#: ../gnome-sudoku/glade/tracker.glade.h:2
+#: ../gnome-sudoku/data/tracker.ui.h:2
 msgid "_Add Tracker"
 msgstr ""
 
-#: ../gnome-sudoku/glade/tracker.glade.h:3 ../gnome-sudoku/src/lib/main.py:905
+#: ../gnome-sudoku/data/tracker.ui.h:3 ../gnome-sudoku/src/lib/main.py:784
 msgid "_Clear Tracker"
 msgstr ""
 
-#: ../gnome-sudoku/glade/tracker.glade.h:4
+#: ../gnome-sudoku/data/tracker.ui.h:4
 msgid "_Trackers"
 msgstr ""
 
-#: ../gnome-sudoku/src/gnome-sudoku.in.in:42
+#: ../gnome-sudoku/src/gnome-sudoku.in.in:59
 msgid "Sudoku incorrectly installed"
 msgstr ""
 
-#: ../gnome-sudoku/src/gnome-sudoku.in.in:43
+#: ../gnome-sudoku/src/gnome-sudoku.in.in:60
 msgid ""
 "Sudoku is not able to start because required application files are not "
 "installed. If you are currently upgrading your system please wait until the "
 "upgrade has completed."
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/defaults.py.in:27
-#, fuzzy
+#: ../gnome-sudoku/src/lib/defaults.py.in:37
 msgid "GNOME Sudoku"
-msgstr "Clocha Gnome"
+msgstr "Sudoku GNOME"
 
-#: ../gnome-sudoku/src/lib/defaults.py.in:30
+#: ../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"
@@ -6097,406 +7349,394 @@ msgid ""
 "GNOME Sudoku is a part of GNOME Games."
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:31
+#: ../gnome-sudoku/src/lib/saver.py:122
+msgid "No Space"
+msgstr "Gan Spás"
+
+#: ../gnome-sudoku/src/lib/saver.py:123
+msgid "No space left on disk"
+msgstr "Níl aon spás fágtha ar an diosca"
+
+#: ../gnome-sudoku/src/lib/saver.py:125 ../gnome-sudoku/src/lib/saver.py:132
+#, python-format
+msgid "Unable to create data folder %(path)s."
+msgstr ""
+
+#: ../gnome-sudoku/src/lib/saver.py:126
+msgid "There is no disk space left!"
+msgstr ""
+
+#: ../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 ""
+
+#: ../gnome-sudoku/src/lib/saver.py:153 ../gnome-sudoku/src/lib/saver.py:154
+msgid "Sudoku unable to save game."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../gnome-sudoku/src/lib/main.py:43
 #, fuzzy
 msgid "Track moves"
 msgstr "Beart na dubh"
 
-#: ../gnome-sudoku/src/lib/main.py:37
-#, fuzzy
-msgid "Full Screen"
-msgstr "Ceathair Déag"
-
-#: ../gnome-sudoku/src/lib/main.py:250
+#: ../gnome-sudoku/src/lib/main.py:243
 msgid "New game"
 msgstr "Cluiche nua"
 
-#: ../gnome-sudoku/src/lib/main.py:252
+#: ../gnome-sudoku/src/lib/main.py:245
 msgid "Print current game"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:253
+#: ../gnome-sudoku/src/lib/main.py:246
 msgid "Print _Multiple Sudokus"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:254
+#: ../gnome-sudoku/src/lib/main.py:247
 msgid "Print more than one sudoku at a time."
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:258
+#: ../gnome-sudoku/src/lib/main.py:249
 msgid "Close Sudoku"
 msgstr "Dún Sudoku"
 
-#. ('Save',gtk.STOCK_SAVE,_('_Save'),
-#. '<Control>s','Save game to play later.',
-#. self.save_game_cb),
-#. ('ByHand',gtk.STOCK_EDIT,_('_Enter custom game'),
-#. None,_('Enter new puzzle by hand (use this to copy a puzzle from another source).'),
-#. self.enter_game_by_hand),
-#. ('Open',gtk.STOCK_OPEN,_('Open game'),
-#. '<Control>o',_('Open a saved game from file.'),
-#. self.open_game),
-#: ../gnome-sudoku/src/lib/main.py:268
+#: ../gnome-sudoku/src/lib/main.py:250
 msgid "_Tools"
 msgstr "_Uirlisí"
 
-#: ../gnome-sudoku/src/lib/main.py:270 ../libgames-support/games-stock.c:295
+#: ../gnome-sudoku/src/lib/main.py:252 ../libgames-support/games-stock.c:320
 msgid "_Hint"
 msgstr "_Leid"
 
-#: ../gnome-sudoku/src/lib/main.py:272
+#: ../gnome-sudoku/src/lib/main.py:254
 msgid "Show which numbers could go in the current square."
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:274
+#: ../gnome-sudoku/src/lib/main.py:256
 msgid "_Fill"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:275
+#: ../gnome-sudoku/src/lib/main.py:257
 msgid "Automatically fill in the current square if possible."
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:277
+#: ../gnome-sudoku/src/lib/main.py:259
 msgid "Fill _all squares"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:278
+#: ../gnome-sudoku/src/lib/main.py:260
 msgid ""
 "Automatically fill in all squares for which there is only one valid value."
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:282
+#: ../gnome-sudoku/src/lib/main.py:264
+msgid "_Generate new puzzles"
+msgstr ""
+
+#: ../gnome-sudoku/src/lib/main.py:264
+msgid "Generate new puzzles."
+msgstr ""
+
+#: ../gnome-sudoku/src/lib/main.py:266
 msgid "Puzzle _Statistics"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:283
+#: ../gnome-sudoku/src/lib/main.py:267
 msgid "Show statistics about current puzzle"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:298
+#: ../gnome-sudoku/src/lib/main.py:279
 msgid "_Always show hint"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:300
+#: ../gnome-sudoku/src/lib/main.py:281
 msgid "Always show possible numbers in a square"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:304
+#: ../gnome-sudoku/src/lib/main.py:285
 msgid "Warn about _unfillable squares"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:306
+#: ../gnome-sudoku/src/lib/main.py:287
 msgid "Warn about squares made unfillable by a move"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:308
+#: ../gnome-sudoku/src/lib/main.py:289
 msgid "_Track additions"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:310
+#: ../gnome-sudoku/src/lib/main.py:291
 msgid "Mark new additions in a separate color so you can keep track of them."
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:312
-#, fuzzy
-msgid "Show _Toolbar"
-msgstr "Taispeáin tool bar"
-
-#: ../gnome-sudoku/src/lib/main.py:313
+#: ../gnome-sudoku/src/lib/main.py:294
 msgid "_Highlighter"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:314
+#: ../gnome-sudoku/src/lib/main.py:295
 msgid "Highlight the current row, column and box"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:315
+#: ../gnome-sudoku/src/lib/main.py:296
 msgid "Generate new puzzles _while you play"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:317
+#: ../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."
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:323
+#: ../gnome-sudoku/src/lib/main.py:304
 msgid "_Edit"
 msgstr "_Eagar"
 
-#: ../gnome-sudoku/src/lib/main.py:324
+#: ../gnome-sudoku/src/lib/main.py:305
 msgid "_Undo"
 msgstr "Cea_laigh"
 
-#: ../gnome-sudoku/src/lib/main.py:324
+#: ../gnome-sudoku/src/lib/main.py:305
 msgid "Undo last action"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:325
+#: ../gnome-sudoku/src/lib/main.py:306
 msgid "_Redo"
 msgstr "_Athfheidhmigh"
 
-#: ../gnome-sudoku/src/lib/main.py:325
+#: ../gnome-sudoku/src/lib/main.py:306
 msgid "Redo last action"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:326 ../gnome-sudoku/src/lib/gsudoku.py:84
+#: ../gnome-sudoku/src/lib/main.py:307
+#: ../gnome-sudoku/src/lib/number_box.py:54
 msgid "_Clear"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:326
+#: ../gnome-sudoku/src/lib/main.py:307
 msgid "Clear entries you've filled in"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:327
+#: ../gnome-sudoku/src/lib/main.py:308
 msgid "Clear _Notes"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:327
+#: ../gnome-sudoku/src/lib/main.py:308
 msgid "Clear notes and hints"
 msgstr ""
 
-#. Trackers...
-#. Our initial row...
-#: ../gnome-sudoku/src/lib/main.py:329 ../gnome-sudoku/src/lib/main.py:896
-#, fuzzy
-msgid "No Tracker"
-msgstr "Tada"
-
-#: ../gnome-sudoku/src/lib/main.py:330
-msgid "_Generate new puzzles"
-msgstr ""
-
-#: ../gnome-sudoku/src/lib/main.py:330
-msgid "Generate new puzzles."
-msgstr ""
-
-#: ../gnome-sudoku/src/lib/main.py:400
-msgid "Entering custom grid..."
-msgstr ""
-
-#: ../gnome-sudoku/src/lib/main.py:404
-#, fuzzy
-msgid "_Play game"
-msgstr "Ainmneach Imreoiri"
-
-#: ../gnome-sudoku/src/lib/main.py:458
+#: ../gnome-sudoku/src/lib/main.py:417
 #, python-format
 msgid "You completed the puzzle in %(totalTime)s (%(activeTime)s active)"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:462
+#: ../gnome-sudoku/src/lib/main.py:421
 #, python-format
 msgid "You got %(n)s hint"
 msgid_plural "You got %(n)s hints"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gnome-sudoku/src/lib/main.py:465
+#: ../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] ""
 msgstr[1] ""
 
-#: ../gnome-sudoku/src/lib/main.py:470
+#: ../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] ""
 msgstr[1] ""
 
-#: ../gnome-sudoku/src/lib/main.py:503
+#: ../gnome-sudoku/src/lib/main.py:453
 msgid "Save this game before starting new one?"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:504
+#: ../gnome-sudoku/src/lib/main.py:454
 msgid "_Save game for later"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:505
+#: ../gnome-sudoku/src/lib/main.py:455
 #, fuzzy
 msgid "_Abandon game"
 msgstr "_Cluiche"
 
-#: ../gnome-sudoku/src/lib/main.py:737
+#: ../gnome-sudoku/src/lib/main.py:649
 #, python-format
 msgid "Playing %(difficulty)s puzzle."
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:770
+#: ../gnome-sudoku/src/lib/main.py:665
 msgid "Puzzle Information"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:771
+#: ../gnome-sudoku/src/lib/main.py:666
 msgid "There is no current puzzle."
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:776
+#: ../gnome-sudoku/src/lib/main.py:671
 msgid "Calculated difficulty: "
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:780
+#: ../gnome-sudoku/src/lib/main.py:675
 msgid "Number of moves instantly fillable by elimination: "
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:783
+#: ../gnome-sudoku/src/lib/main.py:678
 msgid "Number of moves instantly fillable by filling: "
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:786
+#: ../gnome-sudoku/src/lib/main.py:681
 msgid "Amount of trial-and-error required to solve: "
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:789 ../gnome-sudoku/src/lib/main.py:790
+#: ../gnome-sudoku/src/lib/main.py:684 ../gnome-sudoku/src/lib/main.py:685
 #, fuzzy
 msgid "Puzzle Statistics"
 msgstr "Ainmneach Imreoiri"
 
-#: ../gnome-sudoku/src/lib/main.py:906
+#. Our initial row...
+#: ../gnome-sudoku/src/lib/main.py:775
+#, fuzzy
+msgid "No Tracker"
+msgstr "Tada"
+
+#: ../gnome-sudoku/src/lib/main.py:785
 msgid "Clear all moves tracked by selected tracker."
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:910
+#: ../gnome-sudoku/src/lib/main.py:789
 msgid "_Clear Others"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:912
+#: ../gnome-sudoku/src/lib/main.py:791
 msgid "Clear all moves not tracked by selected tracker."
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/main.py:940
+#: ../gnome-sudoku/src/lib/main.py:816
 #, python-format
 msgid "Tracker %s"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/printing.py:200
-msgid "Print Sudoku"
-msgid_plural "Print Sudokus"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../gnome-sudoku/src/lib/printing.py:213
-msgid "Print Preview"
-msgstr ""
-
-#: ../gnome-sudoku/src/lib/game_selector.py:121
+#: ../gnome-sudoku/src/lib/game_selector.py:149
 #, python-format
 msgid "Last Played %(timeAgo)s"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/game_selector.py:122
+#: ../gnome-sudoku/src/lib/game_selector.py:150
 #, python-format
 msgid "%(level)s puzzle"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/game_selector.py:123
+#: ../gnome-sudoku/src/lib/game_selector.py:151
 #, fuzzy, python-format
 msgid "Played for %(duration)s"
 msgstr "Imreoiri"
 
-#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:111
-#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:122
+#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:113
+#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:124
 msgid "Working..."
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:160
+#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:154
 #, python-format
 msgid "%(n)s puzzle"
 msgid_plural "%(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:189
-#, fuzzy
+#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:179
 msgid "Stopped"
-msgstr "Luas"
+msgstr "Stadta"
 
+#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:194
 #: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:204
-#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:214
 #, python-format
 msgid "Generated %(n)s out of %(total)s puzzle"
 msgid_plural "Generated %(n)s out of %(total)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:222
+#: ../gnome-sudoku/src/lib/sudoku_generator_gui.py:212
 #, python-format
 msgid "Generated %(n)s puzzle"
 msgid_plural "Generated %(n)s puzzles"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gnome-sudoku/src/lib/sudoku.py:658
+#: ../gnome-sudoku/src/lib/sudoku.py:512
 msgid "Very Hard"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/sudoku.py:660 ../gtali/setup.c:348
+#: ../gnome-sudoku/src/lib/sudoku.py:514
 msgid "Medium"
 msgstr "Méan"
 
-#. setup pause button
-#: ../gnome-sudoku/src/lib/gtk_goodies/dialog_extras.py:331
-#: ../libgames-support/games-stock.c:311
-msgid "_Pause"
-msgstr "S_os"
-
-#. setup stop button
-#: ../gnome-sudoku/src/lib/gtk_goodies/dialog_extras.py:340
-msgid "_Stop"
-msgstr "+Stad"
-
-#: ../gnome-sudoku/src/lib/gtk_goodies/dialog_extras.py:357
+#: ../gnome-sudoku/src/lib/gtk_goodies/dialog_extras.py:159
 msgid "Do you really want to do this?"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/gtk_goodies/dialog_extras.py:391
+#: ../gnome-sudoku/src/lib/gtk_goodies/dialog_extras.py:193
 msgid "Don't ask me this again."
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/timer.py:20
+#: ../gnome-sudoku/src/lib/timer.py:19
 #, python-format
 msgid "%(n)s year"
 msgid_plural "%(n)s years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gnome-sudoku/src/lib/timer.py:22
+#: ../gnome-sudoku/src/lib/timer.py:21
 #, python-format
 msgid "%(n)s month"
 msgid_plural "%(n)s months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gnome-sudoku/src/lib/timer.py:24
+#: ../gnome-sudoku/src/lib/timer.py:23
 #, python-format
 msgid "%(n)s week"
 msgid_plural "%(n)s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gnome-sudoku/src/lib/timer.py:26
+#: ../gnome-sudoku/src/lib/timer.py:25
 #, python-format
 msgid "%(n)s day"
 msgid_plural "%(n)s days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gnome-sudoku/src/lib/timer.py:28
+#: ../gnome-sudoku/src/lib/timer.py:27
 #, python-format
 msgid "%(n)s hour"
 msgid_plural "%(n)s hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gnome-sudoku/src/lib/timer.py:30
+#: ../gnome-sudoku/src/lib/timer.py:29
 #, python-format
 msgid "%(n)s minute"
 msgid_plural "%(n)s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gnome-sudoku/src/lib/timer.py:32
+#: ../gnome-sudoku/src/lib/timer.py:31
 #, python-format
 msgid "%(n)s second"
 msgid_plural "%(n)s seconds"
@@ -6509,100 +7749,103 @@ msgstr[1] ""
 #. 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:52
+#: ../gnome-sudoku/src/lib/timer.py:51
 msgid " and "
-msgstr ""
+msgstr " agus "
 
-#: ../gnome-sudoku/src/lib/timer.py:52
+#: ../gnome-sudoku/src/lib/timer.py:51
 msgid ", "
-msgstr ""
+msgstr ", "
 
-#: ../gnome-sudoku/src/lib/timer.py:54
+#: ../gnome-sudoku/src/lib/timer.py:53
 msgid " "
-msgstr ""
-
-#. then we're today
-#: ../gnome-sudoku/src/lib/timer.py:71
-msgid "Today"
-msgstr "Inniu"
-
-#: ../gnome-sudoku/src/lib/timer.py:73
-msgid "Yesterday"
-msgstr ""
-
-#: ../gnome-sudoku/src/lib/timer.py:91
-#, python-format
-msgid "%(n)s minute ago"
-msgid_plural "%(n)s minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr " "
 
+#. Then we're today
 #. within the minute
-#: ../gnome-sudoku/src/lib/timer.py:94
+#: ../gnome-sudoku/src/lib/timer.py:63
 #, python-format
 msgid "%(n)s second ago"
 msgid_plural "%(n)s seconds ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gnome-sudoku/src/lib/timer.py:98
+#: ../gnome-sudoku/src/lib/timer.py:67
 #, python-format
-msgid "at %(time)s"
+msgid "%(n)s minute ago"
+msgid_plural "%(n)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Translators, see strftime manual in order to translate %? format strings
+#: ../gnome-sudoku/src/lib/timer.py:71
+msgid "at %I:%M %p"
 msgstr ""
 
-#: ../gnome-sudoku/src/lib/timer.py:100
-#, python-format
-msgid "yesterday at %s"
+#. Translators, see strftime manual in order to translate %? format strings
+#: ../gnome-sudoku/src/lib/timer.py:74
+msgid "yesterday at %I:%M %p"
+msgstr ""
+
+#. Translators, see strftime manual in order to translate %? format strings
+#: ../gnome-sudoku/src/lib/timer.py:77
+msgid "%A %I:%M %p"
 msgstr ""
 
-#: ../gnomine/gnomine.c:41 ../gnomine/gnomine.desktop.in.in.h:2
+#. Translators, see strftime manual in order to translate %? format strings
+#: ../gnome-sudoku/src/lib/timer.py:80
+msgid "%B %e"
+msgstr ""
+
+#: ../gnomine/gnomine.c:51 ../gnomine/gnomine.desktop.in.in.h:2
 msgid "Mines"
 msgstr "Mianaigh"
 
-#: ../gnomine/gnomine.c:90 ../gnomine/gnomine.c:664
-msgid "gnomine|Medium"
-msgstr "Meán"
+#: ../gnomine/gnomine.c:104
+msgctxt "board size"
+msgid "Custom"
+msgstr "Saincheaptha"
 
-#: ../gnomine/gnomine.c:164
+#: ../gnomine/gnomine.c:170
 #, fuzzy, c-format
 msgid "Flags: %d/%d"
 msgstr "Brataí:"
 
-#: ../gnomine/gnomine.c:192
+#: ../gnomine/gnomine.c:198
 msgid "The Mines Have Been Cleared!"
 msgstr ""
 
-#: ../gnomine/gnomine.c:208
+#: ../gnomine/gnomine.c:214
 #, fuzzy
 msgid "Mines Scores"
 msgstr "Scóranna Gnect"
 
-#: ../gnomine/gnomine.c:211 ../gnotravex/gnotravex.c:1235
-#: ../same-gnome/ui.c:156
+#: ../gnomine/gnomine.c:217 ../gnotravex/gnotravex.c:1234
+#: ../same-gnome/ui.c:148
 msgid "Size:"
 msgstr "Méid:"
 
-#: ../gnomine/gnomine.c:311
+#: ../gnomine/gnomine.c:320
 msgid "Click a square, any square"
 msgstr ""
 
-#: ../gnomine/gnomine.c:313
+#: ../gnomine/gnomine.c:322
 msgid "Maybe they're all mines ..."
 msgstr ""
 
-#: ../gnomine/gnomine.c:432
+#: ../gnomine/gnomine.c:450
 msgid "Resizing and SVG support:"
 msgstr ""
 
-#: ../gnomine/gnomine.c:439
+#: ../gnomine/gnomine.c:457
 msgid "Faces:"
 msgstr "Aghaidheanna"
 
-#: ../gnomine/gnomine.c:442
+#: ../gnomine/gnomine.c:460
 msgid "Graphics:"
 msgstr ""
 
-#: ../gnomine/gnomine.c:458
+#: ../gnomine/gnomine.c:476
 msgid ""
 "The popular logic puzzle minesweeper. Clear mines from a board using hints "
 "from squares you have already uncovered.\n"
@@ -6610,74 +7853,84 @@ msgid ""
 "Mines is a part of GNOME Games."
 msgstr ""
 
-#: ../gnomine/gnomine.c:650
+#: ../gnomine/gnomine.c:687
 #, fuzzy
 msgid "Field Size"
 msgstr "Méid páirce"
 
-#: ../gnomine/gnomine.c:694
+#: ../gnomine/gnomine.c:710
 #, fuzzy
 msgid "Custom Size"
 msgstr "Méid féindéanta"
 
-#: ../gnomine/gnomine.c:701
+#: ../gnomine/gnomine.c:717
 #, fuzzy
 msgid "_Number of mines:"
 msgstr "Uimhir na Miana:"
 
-#: ../gnomine/gnomine.c:714
+#: ../gnomine/gnomine.c:730
 #, fuzzy
 msgid "_Horizontal:"
 msgstr "Cothrománach:"
 
-#: ../gnomine/gnomine.c:726
+#: ../gnomine/gnomine.c:742
 #, fuzzy
 msgid "_Vertical:"
 msgstr "Ingearach:"
 
-#: ../gnomine/gnomine.c:744
+#: ../gnomine/gnomine.c:759
+#, fuzzy
+msgid "Flags"
+msgstr "Aghaidheanna"
+
+#: ../gnomine/gnomine.c:762
 msgid "_Use \"I'm not sure\" flags"
 msgstr ""
 
-#: ../gnomine/gnomine.c:755
+#: ../gnomine/gnomine.c:773
+#, fuzzy
+msgid "Warnings"
+msgstr "Cluichí Buaite"
+
+#: ../gnomine/gnomine.c:776
 msgid "_Use \"Too many flags\" warning"
 msgstr ""
 
-#: ../gnomine/gnomine.c:765
+#: ../gnomine/gnomine.c:787
 msgid "Mines Preferences"
 msgstr "Sainroghanna Mianach"
 
-#: ../gnomine/gnomine.c:960
+#: ../gnomine/gnomine.c:991
 msgid "Width of grid"
 msgstr "Leitheid na greille"
 
-#: ../gnomine/gnomine.c:961
+#: ../gnomine/gnomine.c:992
 msgid "Height of grid"
 msgstr "Airde na greille"
 
-#: ../gnomine/gnomine.c:963
+#: ../gnomine/gnomine.c:994
 msgid "Number of mines"
 msgstr "Uimhir na Miana:"
 
-#: ../gnomine/gnomine.c:966 ../gnomine/gnomine.schemas.in.h:8
+#: ../gnomine/gnomine.c:997 ../gnomine/gnomine.schemas.in.h:8
 msgid "Size of the board (0-2 = small-large, 3=custom)"
 msgstr ""
 
-#: ../gnomine/gnomine.c:967 ../gnotravex/gnotravex.c:395
-#: ../gnotski/gnotski.c:541 ../iagno/gnothello.c:129
+#: ../gnomine/gnomine.c:998 ../gnotravex/gnotravex.c:398
+#: ../gnotski/gnotski.c:466 ../iagno/gnothello.c:145
 msgid "X location of window"
 msgstr ""
 
-#: ../gnomine/gnomine.c:969 ../gnotravex/gnotravex.c:397
-#: ../gnotski/gnotski.c:543 ../iagno/gnothello.c:131
+#: ../gnomine/gnomine.c:1000 ../gnotravex/gnotravex.c:400
+#: ../gnotski/gnotski.c:468 ../iagno/gnothello.c:147
 msgid "Y location of window"
 msgstr ""
 
-#: ../gnomine/gnomine.c:1090
+#: ../gnomine/gnomine.c:1148
 msgid "Press to Resume"
 msgstr ""
 
-#: ../gnomine/gnomine.c:1124
+#: ../gnomine/gnomine.c:1182
 msgid "Time: "
 msgstr "Am: "
 
@@ -6686,6 +7939,7 @@ msgid "Clear hidden mines from a minefield"
 msgstr ""
 
 #: ../gnomine/gnomine.schemas.in.h:1
+#: ../same-gnome-clutter/same-gnome-clutter.schemas.in.h:2
 #, fuzzy
 msgid "Board size"
 msgstr "Méid páirce"
@@ -6728,181 +7982,224 @@ msgstr ""
 msgid "Warning about too many flags"
 msgstr ""
 
-#: ../gnomine/minefield.c:215
+#: ../gnomine/minefield.c:208
 msgid ""
 "Unable to find required images.\n"
 "\n"
 "Please check your gnome-games installation."
 msgstr ""
 
-#: ../gnomine/minefield.c:225
+#: ../gnomine/minefield.c:230
 msgid ""
 "Required images have been found, but refused to load.\n"
 "\n"
 "Please check your installation of gnome-games and its dependencies."
 msgstr ""
 
-#: ../gnomine/minefield.c:234
+#: ../gnomine/minefield.c:239
 msgid "Could not load images"
 msgstr ""
 
-#: ../gnotravex/gnotravex.c:44 ../gnotravex/gnotravex.desktop.in.in.h:2
+#: ../gnotravex/gnotravex.c:46 ../gnotravex/gnotravex.desktop.in.in.h:2
 msgid "Tetravex"
 msgstr "Tetravex"
 
-#: ../gnotravex/gnotravex.c:65
+#. Translators: in-game numbers, replaceable with single-character local ideograms
+#: ../gnotravex/gnotravex.c:67
+msgctxt "number"
 msgid "0"
-msgstr ""
+msgstr "0"
 
-#: ../gnotravex/gnotravex.c:66
-msgid "9"
-msgstr ""
+#: ../gnotravex/gnotravex.c:68
+msgctxt "number"
+msgid "1"
+msgstr "1"
+
+#: ../gnotravex/gnotravex.c:69
+msgctxt "number"
+msgid "2"
+msgstr "2"
+
+#: ../gnotravex/gnotravex.c:70
+msgctxt "number"
+msgid "3"
+msgstr "3"
+
+#: ../gnotravex/gnotravex.c:71
+msgctxt "number"
+msgid "4"
+msgstr "4"
+
+#: ../gnotravex/gnotravex.c:72
+msgctxt "number"
+msgid "5"
+msgstr "5"
+
+#: ../gnotravex/gnotravex.c:73
+msgctxt "number"
+msgid "6"
+msgstr "6"
+
+#: ../gnotravex/gnotravex.c:74
+msgctxt "number"
+msgid "7"
+msgstr "7"
 
 #: ../gnotravex/gnotravex.c:75
+msgctxt "number"
+msgid "8"
+msgstr "8"
+
+#: ../gnotravex/gnotravex.c:76
+msgctxt "number"
+msgid "9"
+msgstr "9"
+
+#: ../gnotravex/gnotravex.c:86
 msgid "2Ã?2"
 msgstr "2Ã?2"
 
-#: ../gnotravex/gnotravex.c:76
+#: ../gnotravex/gnotravex.c:87
 msgid "3Ã?3"
 msgstr "3Ã?3"
 
-#: ../gnotravex/gnotravex.c:77
+#: ../gnotravex/gnotravex.c:88
 msgid "4Ã?4"
 msgstr "4Ã?4"
 
-#: ../gnotravex/gnotravex.c:78
+#: ../gnotravex/gnotravex.c:89
 msgid "5Ã?5"
 msgstr "5Ã?5"
 
-#: ../gnotravex/gnotravex.c:79
+#: ../gnotravex/gnotravex.c:90
 msgid "6Ã?6"
 msgstr "6Ã?6"
 
-#: ../gnotravex/gnotravex.c:302 ../same-gnome/ui.c:465
+#: ../gnotravex/gnotravex.c:305 ../same-gnome/ui.c:457
 msgid "_Size"
-msgstr ""
+msgstr "_Méid"
 
-#: ../gnotravex/gnotravex.c:311
+#: ../gnotravex/gnotravex.c:314
 #, fuzzy
 msgid "Sol_ve"
 msgstr "Reitigh"
 
-#: ../gnotravex/gnotravex.c:311
+#: ../gnotravex/gnotravex.c:314
 #, fuzzy
 msgid "Solve the game"
 msgstr "Reitigh an cluiche"
 
-#: ../gnotravex/gnotravex.c:320
+#: ../gnotravex/gnotravex.c:323
 msgid "_Up"
 msgstr "S_uas"
 
-#: ../gnotravex/gnotravex.c:321
+#: ../gnotravex/gnotravex.c:324
 #, fuzzy
 msgid "Move the pieces up"
 msgstr "Gluais na piosai suas"
 
-#: ../gnotravex/gnotravex.c:322
+#: ../gnotravex/gnotravex.c:325
 msgid "_Left"
-msgstr "_Clé"
+msgstr "Ar _Chlé"
 
-#: ../gnotravex/gnotravex.c:323
+#: ../gnotravex/gnotravex.c:326
 #, fuzzy
 msgid "Move the pieces left"
 msgstr "Gluais na piosai ar clé"
 
-#: ../gnotravex/gnotravex.c:324
+#: ../gnotravex/gnotravex.c:327
 msgid "_Right"
-msgstr "_Deis"
+msgstr "Ar _Dheis"
 
-#: ../gnotravex/gnotravex.c:325
+#: ../gnotravex/gnotravex.c:328
 #, fuzzy
 msgid "Move the pieces right"
 msgstr "Gluais na piosai ar deis"
 
-#: ../gnotravex/gnotravex.c:326
+#: ../gnotravex/gnotravex.c:329
 msgid "_Down"
 msgstr "Sí_os"
 
-#: ../gnotravex/gnotravex.c:327
+#: ../gnotravex/gnotravex.c:330
 msgid "Move the pieces down"
 msgstr "Gluais na piosai sí_os"
 
-#: ../gnotravex/gnotravex.c:333
+#: ../gnotravex/gnotravex.c:336
 msgid "_2Ã?2"
-msgstr "_2x2"
+msgstr "_2Ã?2"
 
-#: ../gnotravex/gnotravex.c:333
+#: ../gnotravex/gnotravex.c:336
 msgid "Play on a 2Ã?2 board"
 msgstr "Imir ar chlár 2�2"
 
-#: ../gnotravex/gnotravex.c:335
+#: ../gnotravex/gnotravex.c:338
 msgid "_3Ã?3"
-msgstr "_3x3"
+msgstr "_3Ã?3"
 
-#: ../gnotravex/gnotravex.c:335
+#: ../gnotravex/gnotravex.c:338
 msgid "Play on a 3Ã?3 board"
 msgstr "Imir ar chlár 3�3"
 
-#: ../gnotravex/gnotravex.c:337
+#: ../gnotravex/gnotravex.c:340
 msgid "_4Ã?4"
-msgstr "_4x4"
+msgstr "_4Ã?4"
 
-#: ../gnotravex/gnotravex.c:337
+#: ../gnotravex/gnotravex.c:340
 msgid "Play on a 4Ã?4 board"
 msgstr "Imir ar chlár 4�4"
 
-#: ../gnotravex/gnotravex.c:339
+#: ../gnotravex/gnotravex.c:342
 msgid "_5Ã?5"
-msgstr "_5x5"
+msgstr "_5Ã?5"
 
-#: ../gnotravex/gnotravex.c:339
+#: ../gnotravex/gnotravex.c:342
 msgid "Play on a 5Ã?5 board"
 msgstr "Imir ar chlár 5�5"
 
-#: ../gnotravex/gnotravex.c:341
+#: ../gnotravex/gnotravex.c:344
 msgid "_6Ã?6"
-msgstr "_6x6"
+msgstr "_6Ã?6"
 
-#: ../gnotravex/gnotravex.c:341
+#: ../gnotravex/gnotravex.c:344
 msgid "Play on a 6Ã?6 board"
-msgstr "Imir ar chlár 6x6"
+msgstr "Imir ar chlár 6�6"
 
-#: ../gnotravex/gnotravex.c:346
+#: ../gnotravex/gnotravex.c:349
 #, fuzzy
 msgid "Tile _Colours"
 msgstr "Dathanna"
 
-#: ../gnotravex/gnotravex.c:399
+#: ../gnotravex/gnotravex.c:402
 msgid "Size of board (2-6)"
 msgstr ""
 
-#: ../gnotravex/gnotravex.c:400
+#: ../gnotravex/gnotravex.c:403
 msgid "SIZE"
 msgstr "MÃ?ID"
 
-#: ../gnotravex/gnotravex.c:1117
+#: ../gnotravex/gnotravex.c:1116
 msgid "Puzzle solved! Well done!"
 msgstr ""
 
-#: ../gnotravex/gnotravex.c:1119
+#: ../gnotravex/gnotravex.c:1118
 msgid "Puzzle solved!"
 msgstr ""
 
-#: ../gnotravex/gnotravex.c:1233
+#: ../gnotravex/gnotravex.c:1232
 #, fuzzy
 msgid "Tetravex Scores"
 msgstr "Tetravex"
 
-#: ../gnotravex/gnotravex.c:1501 ../mahjongg/mahjongg.c:975
+#: ../gnotravex/gnotravex.c:1498 ../mahjongg/mahjongg.c:977
 msgid "Game paused"
 msgstr "Cluiche moillithe"
 
-#: ../gnotravex/gnotravex.c:1656
+#: ../gnotravex/gnotravex.c:1627
 #, c-format
 msgid "Playing %dÃ?%d board"
 msgstr ""
 
-#: ../gnotravex/gnotravex.c:1934
+#: ../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"
@@ -6938,258 +8235,208 @@ msgid ""
 "valid values are 2 to 8, anything else gets set to 3."
 msgstr ""
 
-#: ../gnotski/gnotski.c:45 ../gnotski/gnotski.desktop.in.in.h:1
+#: ../gnotski/gnotski.c:47 ../gnotski/gnotski.desktop.in.in.h:1
 msgid "Klotski"
 msgstr "Klotski"
 
-#: ../gnotski/gnotski.c:100
+#: ../gnotski/gnotski.c:103
 msgid "Only 18 steps"
-msgstr ""
+msgstr "18 gcéim amháin"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:101 ../gnotski/gnotski.c:207
+#: ../gnotski/gnotski.c:104 ../gnotski/gnotski.c:194
 msgid "Daisy"
-msgstr ""
+msgstr "Daisy"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:102 ../gnotski/gnotski.c:213
+#: ../gnotski/gnotski.c:105 ../gnotski/gnotski.c:200
 msgid "Violet"
-msgstr ""
+msgstr "Violet"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:103 ../gnotski/gnotski.c:219
+#: ../gnotski/gnotski.c:106 ../gnotski/gnotski.c:206
 msgid "Poppy"
 msgstr "Poppy"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:104 ../gnotski/gnotski.c:225
+#: ../gnotski/gnotski.c:107 ../gnotski/gnotski.c:212
 msgid "Pansy"
 msgstr "Pansy"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:105 ../gnotski/gnotski.c:231
+#: ../gnotski/gnotski.c:108 ../gnotski/gnotski.c:218
 msgid "Snowdrop"
-msgstr ""
+msgstr "Snowdrop"
 
 #. puzzle name - sometimes called "Le'Ane Rouge"
-#: ../gnotski/gnotski.c:106 ../gnotski/gnotski.c:237
+#: ../gnotski/gnotski.c:109 ../gnotski/gnotski.c:224
 msgid "Red Donkey"
-msgstr ""
+msgstr "Red Donkey"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:107 ../gnotski/gnotski.c:243
+#: ../gnotski/gnotski.c:110 ../gnotski/gnotski.c:230
 msgid "Trail"
 msgstr "Trail"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:108 ../gnotski/gnotski.c:249
+#: ../gnotski/gnotski.c:111 ../gnotski/gnotski.c:236
 msgid "Ambush"
-msgstr ""
+msgstr "Ambush"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:109 ../gnotski/gnotski.c:255
+#: ../gnotski/gnotski.c:112 ../gnotski/gnotski.c:242
 msgid "Agatka"
-msgstr ""
+msgstr "Agatka"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:110 ../gnotski/gnotski.c:260
+#: ../gnotski/gnotski.c:113 ../gnotski/gnotski.c:247
 msgid "Success"
-msgstr ""
+msgstr "Success"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:111 ../gnotski/gnotski.c:265
+#: ../gnotski/gnotski.c:114 ../gnotski/gnotski.c:252
 msgid "Bone"
 msgstr "Bone"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:112 ../gnotski/gnotski.c:271
+#: ../gnotski/gnotski.c:115 ../gnotski/gnotski.c:258
 msgid "Fortune"
 msgstr "Fortune"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:113 ../gnotski/gnotski.c:279
+#: ../gnotski/gnotski.c:116 ../gnotski/gnotski.c:266
 msgid "Fool"
-msgstr ""
+msgstr "Fool"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:114 ../gnotski/gnotski.c:285
+#: ../gnotski/gnotski.c:117 ../gnotski/gnotski.c:272
 msgid "Solomon"
 msgstr "Solomon"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:115 ../gnotski/gnotski.c:292
+#: ../gnotski/gnotski.c:118 ../gnotski/gnotski.c:279
 msgid "Cleopatra"
-msgstr ""
+msgstr "Cleopatra"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:116 ../gnotski/gnotski.c:297
+#: ../gnotski/gnotski.c:119 ../gnotski/gnotski.c:284
 msgid "Shark"
 msgstr "Shark"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:117 ../gnotski/gnotski.c:305
+#: ../gnotski/gnotski.c:120 ../gnotski/gnotski.c:292
 msgid "Rome"
-msgstr ""
+msgstr "Rome"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:118 ../gnotski/gnotski.c:312
+#: ../gnotski/gnotski.c:121 ../gnotski/gnotski.c:299
 msgid "Pennant Puzzle"
-msgstr ""
+msgstr "Pennant Puzzle"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:119 ../gnotski/gnotski.c:318
+#: ../gnotski/gnotski.c:122 ../gnotski/gnotski.c:305
 msgid "Ithaca"
-msgstr ""
+msgstr "Ithaca"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:120 ../gnotski/gnotski.c:339
+#: ../gnotski/gnotski.c:123 ../gnotski/gnotski.c:326
 msgid "Pelopones"
-msgstr ""
+msgstr "Pelopones"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:121 ../gnotski/gnotski.c:346
+#: ../gnotski/gnotski.c:124 ../gnotski/gnotski.c:333
 msgid "Transeuropa"
-msgstr ""
+msgstr "Transeuropa"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:122 ../gnotski/gnotski.c:355
+#: ../gnotski/gnotski.c:125 ../gnotski/gnotski.c:342
 msgid "Lodzianka"
-msgstr ""
+msgstr "Lodzianka"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:123 ../gnotski/gnotski.c:361
+#: ../gnotski/gnotski.c:126 ../gnotski/gnotski.c:348
 msgid "Polonaise"
-msgstr ""
+msgstr "Polonaise"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:124 ../gnotski/gnotski.c:366
+#: ../gnotski/gnotski.c:127 ../gnotski/gnotski.c:353
 msgid "Baltic Sea"
-msgstr ""
+msgstr "Baltic Sea"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:125 ../gnotski/gnotski.c:371
+#: ../gnotski/gnotski.c:128 ../gnotski/gnotski.c:358
 msgid "American Pie"
-msgstr ""
+msgstr "American Pie"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:126 ../gnotski/gnotski.c:383
+#: ../gnotski/gnotski.c:129 ../gnotski/gnotski.c:370
 msgid "Traffic Jam"
-msgstr ""
+msgstr "Traffic Jam"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:127 ../gnotski/gnotski.c:390
+#: ../gnotski/gnotski.c:130 ../gnotski/gnotski.c:377
 msgid "Sunshine"
 msgstr "Sunshine"
 
 #. puzzle name
-#: ../gnotski/gnotski.c:128 ../gnotski/gnotski.c:414
-msgid "Block 10"
-msgstr "Block 10"
-
-#. puzzle name
-#: ../gnotski/gnotski.c:129 ../gnotski/gnotski.c:419
-msgid "Block 10 Pro"
-msgstr ""
-
-#. puzzle name
-#: ../gnotski/gnotski.c:130 ../gnotski/gnotski.c:424
-msgid "Climb 12"
-msgstr ""
-
-#. puzzle name
-#: ../gnotski/gnotski.c:131 ../gnotski/gnotski.c:429
-msgid "Climb 12 Pro"
-msgstr ""
-
-#. puzzle name
-#: ../gnotski/gnotski.c:132 ../gnotski/gnotski.c:434
-msgid "Climb 15 Winter"
-msgstr ""
-
-#. puzzle name
-#: ../gnotski/gnotski.c:133 ../gnotski/gnotski.c:441
-msgid "Climb 15 Spring"
-msgstr ""
-
-#. puzzle name
-#: ../gnotski/gnotski.c:134 ../gnotski/gnotski.c:448
-msgid "Climb 15 Summer"
-msgstr ""
-
-#. puzzle name
-#: ../gnotski/gnotski.c:135 ../gnotski/gnotski.c:455
-msgid "Climb 15 Fall"
-msgstr ""
-
-#. puzzle name
-#: ../gnotski/gnotski.c:136 ../gnotski/gnotski.c:462
-msgid "Climb 24 Pro"
-msgstr ""
-
-#. puzzle name
-#: ../gnotski/gnotski.c:201
+#: ../gnotski/gnotski.c:188
 msgid "Only 18 Steps"
-msgstr ""
+msgstr "18 gCéim Amháin"
 
 #. set of puzzles
-#: ../gnotski/gnotski.c:490
+#: ../gnotski/gnotski.c:418
 msgid "HuaRong Trail"
-msgstr ""
+msgstr "HuaRong Trail"
 
 #. set of puzzles
-#: ../gnotski/gnotski.c:492
+#: ../gnotski/gnotski.c:420
 msgid "Challenge Pack"
 msgstr ""
 
 #. set of puzzles
-#: ../gnotski/gnotski.c:494
+#: ../gnotski/gnotski.c:422
 msgid "Skill Pack"
 msgstr ""
 
-#. set of puzzles
-#: ../gnotski/gnotski.c:496
-msgid "Minoru Climb"
-msgstr ""
-
-#: ../gnotski/gnotski.c:497
+#: ../gnotski/gnotski.c:423
 msgid "_Restart Puzzle"
 msgstr ""
 
-#: ../gnotski/gnotski.c:499
+#: ../gnotski/gnotski.c:425
 msgid "Next Puzzle"
 msgstr ""
 
-#: ../gnotski/gnotski.c:501
+#: ../gnotski/gnotski.c:427
 msgid "Previous Puzzle"
 msgstr ""
 
-#: ../gnotski/gnotski.c:765
+#: ../gnotski/gnotski.c:677
 #, fuzzy
 msgid "Level completed."
 msgstr "Leibheal Criochnaithe "
 
-#: ../gnotski/gnotski.c:903
+#: ../gnotski/gnotski.c:815
 msgid "The Puzzle Has Been Solved!"
 msgstr ""
 
-#: ../gnotski/gnotski.c:920
+#: ../gnotski/gnotski.c:832
 #, fuzzy
 msgid "Klotski Scores"
 msgstr "Scór"
 
-#: ../gnotski/gnotski.c:923
+#: ../gnotski/gnotski.c:835
 #, fuzzy
 msgid "Puzzle:"
 msgstr "Corcra"
 
-#: ../gnotski/gnotski.c:1019
+#: ../gnotski/gnotski.c:919
 msgid ""
 "The theme for this game failed to render.\n"
 "\n"
 "Please check that Klotski is installed correctly."
 msgstr ""
 
-#: ../gnotski/gnotski.c:1264
+#: ../gnotski/gnotski.c:1166
 #, c-format
 msgid ""
 "Could not find the image:\n"
@@ -7198,12 +8445,12 @@ msgid ""
 "Please check that Klotski is installed correctly."
 msgstr ""
 
-#: ../gnotski/gnotski.c:1303
-#, fuzzy, c-format
+#: ../gnotski/gnotski.c:1205
+#, c-format
 msgid "Moves: %d"
-msgstr "Gluaiseanna"
+msgstr "Bearta: %d"
 
-#: ../gnotski/gnotski.c:1630
+#: ../gnotski/gnotski.c:1534
 msgid ""
 "Sliding Block Puzzles\n"
 "\n"
@@ -7222,16 +8469,16 @@ msgstr ""
 msgid "The puzzle in play"
 msgstr ""
 
-#: ../gtali/clist.c:157
+#: ../gtali/clist.c:158
 msgid "Already used! Where do you want to put that?"
 msgstr ""
 
-#: ../gtali/clist.c:414 ../same-gnome/ui.c:101
+#: ../gtali/clist.c:415 ../same-gnome/ui.c:93
 #, fuzzy, c-format
 msgid "Score: %d"
 msgstr "Scór:"
 
-#: ../gtali/clist.c:416
+#: ../gtali/clist.c:417
 #, fuzzy, c-format
 msgid "Field used"
 msgstr "Méid páirce"
@@ -7247,7 +8494,7 @@ msgstr "Méid páirce"
 msgid "Beat the odds in a poker-style dice game"
 msgstr ""
 
-#: ../gtali/gtali.desktop.in.in.h:2 ../gtali/gyahtzee.c:54
+#: ../gtali/gtali.desktop.in.in.h:2 ../gtali/gyahtzee.c:60
 msgid "Tali"
 msgstr "Tali"
 
@@ -7270,7 +8517,7 @@ msgid ""
 "If set to true, a dump of the AI's working will be done to standard output."
 msgstr ""
 
-#: ../gtali/gtali.schemas.in.h:5 ../gtali/setup.c:364
+#: ../gtali/gtali.schemas.in.h:5
 msgid "Regular"
 msgstr ""
 
@@ -7300,7 +8547,7 @@ msgstr ""
 
 #: ../gtali/gyahtzee.c:114
 msgid "STRING"
-msgstr ""
+msgstr "TEAGHRÃ?N"
 
 #: ../gtali/gyahtzee.c:116
 msgid "Number of computer-only games to play"
@@ -7310,113 +8557,135 @@ msgstr ""
 msgid "Number of trials for each roll for the computer"
 msgstr ""
 
-#: ../gtali/gyahtzee.c:153
+#: ../gtali/gyahtzee.c:123 ../gtali/setup.c:365
+msgctxt "game type"
+msgid "Regular"
+msgstr ""
+
+#: ../gtali/gyahtzee.c:124 ../gtali/setup.c:366
+msgctxt "game type"
+msgid "Colors"
+msgstr "Dathanna"
+
+#: ../gtali/gyahtzee.c:147
 msgid "Roll all!"
 msgstr ""
 
-#: ../gtali/gyahtzee.c:156 ../gtali/gyahtzee.c:816
+#: ../gtali/gyahtzee.c:150 ../gtali/gyahtzee.c:817
 msgid "Roll!"
 msgstr ""
 
-#: ../gtali/gyahtzee.c:191
+#: ../gtali/gyahtzee.c:185
 msgid "The game is a draw!"
 msgstr ""
 
-#: ../gtali/gyahtzee.c:206 ../gtali/gyahtzee.c:641
+#: ../gtali/gyahtzee.c:201 ../gtali/gyahtzee.c:638
 #, fuzzy
 msgid "Tali Scores"
 msgstr "Scór"
 
-#: ../gtali/gyahtzee.c:223
+#: ../gtali/gyahtzee.c:217
 #, c-format
 msgid "%s wins the game with %d point"
 msgid_plural "%s wins the game with %d points"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtali/gyahtzee.c:271
+#: ../gtali/gyahtzee.c:265
 #, c-format
 msgid "Computer playing for %s"
 msgstr ""
 
-#: ../gtali/gyahtzee.c:273
+#: ../gtali/gyahtzee.c:267
 #, c-format
 msgid "%s! -- You're up."
 msgstr ""
 
-#: ../gtali/gyahtzee.c:462
+#: ../gtali/gyahtzee.c:456
 msgid "Select dice to roll or choose a score slot."
 msgstr ""
 
-#: ../gtali/gyahtzee.c:491
+#: ../gtali/gyahtzee.c:485
 msgid "Roll"
 msgstr ""
 
-#: ../gtali/gyahtzee.c:549
+#: ../gtali/gyahtzee.c:543
 msgid "You are only allowed three rolls. Choose a score slot."
 msgstr ""
 
-#: ../gtali/gyahtzee.c:600
+#: ../gtali/gyahtzee.c:594
 msgid "GNOME version (1998):"
 msgstr "Leagan GNOME (1998):"
 
-#: ../gtali/gyahtzee.c:603
-#, fuzzy
+#: ../gtali/gyahtzee.c:597
 msgid "Console version (1992):"
-msgstr "Leagan Curses (1992):"
+msgstr "Leagan an chonsóil (1992):"
 
-#: ../gtali/gyahtzee.c:621
+#: ../gtali/gyahtzee.c:600
+msgid "Colors game and multi-level AI (2006):"
+msgstr ""
+
+#: ../gtali/gyahtzee.c:618
 msgid ""
 "A variation on poker with dice and less money.\n"
 "\n"
 "Tali is a part of GNOME Games."
 msgstr ""
 
-#: ../gtali/setup.c:122
+#: ../gtali/setup.c:123
 msgid "Current game will complete with original number of players."
 msgstr ""
 
-#: ../gtali/setup.c:265
-#, fuzzy
+#: ../gtali/setup.c:266
 msgid "Tali Preferences"
-msgstr "Roghnachais GTali"
+msgstr "Sainroghanna Tali"
 
-#: ../gtali/setup.c:287
+#: ../gtali/setup.c:288
 msgid "Human Players"
 msgstr ""
 
-#: ../gtali/setup.c:298
+#: ../gtali/setup.c:299
 #, fuzzy
 msgid "_Number of players:"
 msgstr "Uimhir na Miana:"
 
-#: ../gtali/setup.c:312
+#: ../gtali/setup.c:313
 msgid "Computer Opponents"
 msgstr ""
 
 #. --- Button ---
-#: ../gtali/setup.c:320
+#: ../gtali/setup.c:321
 msgid "_Delay between rolls"
 msgstr ""
 
-#: ../gtali/setup.c:330
+#: ../gtali/setup.c:331
 #, fuzzy
 msgid "N_umber of opponents:"
 msgstr "Uimhir na Miana:"
 
-#: ../gtali/setup.c:344
+#: ../gtali/setup.c:345
 msgid "_Difficulty:"
 msgstr ""
 
-#: ../gtali/setup.c:365 ../mahjongg/mahjongg.c:785
-msgid "Colors"
-msgstr "Dathanna"
+#: ../gtali/setup.c:348
+msgctxt "difficulty"
+msgid "Easy"
+msgstr "Ã?asca"
+
+#: ../gtali/setup.c:349
+msgctxt "difficulty"
+msgid "Medium"
+msgstr "Measartha"
+
+#: ../gtali/setup.c:350
+msgctxt "difficulty"
+msgid "Hard"
+msgstr "Deacair"
 
 #. --- PLAYER NAMES FRAME ----
-#: ../gtali/setup.c:373
-#, fuzzy
+#: ../gtali/setup.c:374
 msgid "Player Names"
-msgstr "Ainmneach Imreoiri"
+msgstr "Ainmneacha Imreoirí"
 
 #: ../gtali/yahtzee.c:85 ../gtali/yahtzee.c:109 ../gtali/yahtzee.c:516
 msgid "1s [total of 1s]"
@@ -7523,222 +8792,345 @@ msgstr ""
 msgid "5 of a Kind [total]"
 msgstr "Seans [Iomlán]"
 
-#: ../iagno/gnothello.c:46 ../iagno/iagno.desktop.in.in.h:2
+#. This is the short name for the room
+#: ../iagno/gnothello.c:55 ../iagno/iagno.desktop.in.in.h:2
+#: ../iagno/iagno.room.in.h:2
 msgid "Iagno"
 msgstr "Iagno"
 
-#: ../iagno/gnothello.c:139
-#, fuzzy
-msgid "Net_work Game"
-msgstr "Cluiche Nua"
-
-#: ../iagno/gnothello.c:145
-#, fuzzy
-msgid "_Player list"
-msgstr "Imreoiri"
-
-#: ../iagno/gnothello.c:147
-msgid "_Chat Window"
-msgstr ""
-
-#: ../iagno/gnothello.c:151
-#, fuzzy
-msgid "_Leave Game"
-msgstr "Cluiche Nua"
-
-#: ../iagno/gnothello.c:288
+#: ../iagno/gnothello.c:265
 msgid ""
 "A disk flipping game derived from Reversi.\n"
 "\n"
 "Iagno is a part of GNOME Games."
 msgstr ""
 
-#: ../iagno/gnothello.c:369
+#: ../iagno/gnothello.c:346
 msgid "Invalid move."
 msgstr ""
 
-#: ../iagno/gnothello.c:664
-msgid "Dark:"
-msgstr "Dorcha:"
-
-#: ../iagno/gnothello.c:674
-msgid "Light:"
-msgstr "Geal:"
-
-#: ../iagno/gnothello.c:689
-msgid "Welcome to Iagno!"
-msgstr "Fáilte go Iagno!"
-
-#: ../iagno/gnothello.c:697 ../iagno/gnothello.c:699
+#: ../iagno/gnothello.c:620 ../iagno/gnothello.c:622
 #, c-format
 msgid "%.2d"
 msgstr "%.2d"
 
-#: ../iagno/gnothello.c:729
+#: ../iagno/gnothello.c:644
 msgid "It is your turn to place a dark piece"
 msgstr ""
 
-#: ../iagno/gnothello.c:731
+#: ../iagno/gnothello.c:646
 msgid "It is your turn to place a light piece"
 msgstr ""
 
-#: ../iagno/gnothello.c:734
+#: ../iagno/gnothello.c:649
 #, c-format
 msgid "Waiting for %s to move"
 msgstr ""
 
-#: ../iagno/gnothello.c:741
+#: ../iagno/gnothello.c:656
 msgid "Dark's move"
 msgstr "Beart na dubh"
 
-#: ../iagno/gnothello.c:743
+#: ../iagno/gnothello.c:658
 msgid "Light's move"
 msgstr "Beart na bán"
 
+#: ../iagno/gnothello.c:945
+msgid "Dark:"
+msgstr "Dorcha:"
+
+#: ../iagno/gnothello.c:955
+msgid "Light:"
+msgstr "Geal:"
+
+#: ../iagno/gnothello.c:979
+msgid "Welcome to Iagno!"
+msgstr "Fáilte go Iagno!"
+
 #: ../iagno/iagno.desktop.in.in.h:1
 msgid "Dominate the board in a classic version of Reversi"
 msgstr ""
 
-#: ../iagno/othello.c:697
+#. This is the long descriptive name for the room
+#: ../iagno/iagno.room.in.h:4
+msgid ""
+"The GNOME version of Reversi. The goal is to control the most disks on the "
+"board."
+msgstr ""
+
+#: ../iagno/othello.c:699
 #, fuzzy
 msgid "Light player wins!"
 msgstr "Ta an bua ag an imreoir ban!"
 
-#: ../iagno/othello.c:699
+#: ../iagno/othello.c:701
 msgid "Dark player wins!"
 msgstr "Ta an bua ag an imreoir dubh"
 
-#: ../iagno/othello.c:701
+#: ../iagno/othello.c:703
 msgid "The game was a draw."
 msgstr ""
 
-#: ../iagno/othello.c:713
+#: ../iagno/othello.c:715
 msgid "Light must pass, Dark's move"
 msgstr ""
 
-#: ../iagno/othello.c:718
+#: ../iagno/othello.c:720
 msgid "Dark must pass, Light's move"
 msgstr ""
 
-#: ../iagno/properties.c:407
+#: ../iagno/properties.c:402
 msgid "Iagno Preferences"
 msgstr "Sainroghanna Iagno"
 
-#: ../iagno/properties.c:434
+#: ../iagno/properties.c:429
 msgid "_Use quick moves"
 msgstr ""
 
-#: ../iagno/properties.c:539
+#: ../iagno/properties.c:534
 msgid "Animation"
 msgstr "Beochan"
 
-#: ../iagno/properties.c:552
+#: ../iagno/properties.c:547
 msgid "Partial"
 msgstr ""
 
-#: ../iagno/properties.c:561
+#: ../iagno/properties.c:556
 msgid "Complete"
 msgstr "Críochnaithe"
 
-#: ../iagno/properties.c:575
+#: ../iagno/properties.c:570
 msgid "_Stagger flips"
 msgstr ""
 
-#: ../iagno/properties.c:583
+#: ../iagno/properties.c:578
 #, fuzzy
 msgid "S_how grid"
 msgstr "Taispeáin greille"
 
-#: ../iagno/properties.c:590
+#: ../iagno/properties.c:585
 msgid "_Flip final results"
 msgstr ""
 
-#: ../iagno/properties.c:599 ../mahjongg/mahjongg.c:750
+#: ../iagno/properties.c:594 ../mahjongg/mahjongg.c:733
 msgid "_Tile set:"
 msgstr ""
 
+#: ../libgames-support/eggdesktopfile.c:169
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr ""
+
+#: ../libgames-support/eggdesktopfile.c:192
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr ""
+
+#: ../libgames-support/eggdesktopfile.c:966
+#, c-format
+msgid "Starting %s"
+msgstr "%s á Thosú"
+
+#: ../libgames-support/eggdesktopfile.c:1108
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr ""
+
+#: ../libgames-support/eggdesktopfile.c:1176
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr ""
+
+#: ../libgames-support/eggdesktopfile.c:1381
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr ""
+
+#: ../libgames-support/eggdesktopfile.c:1402
+#, c-format
+msgid "Not a launchable item"
+msgstr ""
+
+#: ../libgames-support/eggsmclient.c:225
+msgid "Disable connection to session manager"
+msgstr ""
+
+#: ../libgames-support/eggsmclient.c:228
+msgid "Specify file containing saved configuration"
+msgstr ""
+
+#: ../libgames-support/eggsmclient.c:228
+msgid "FILE"
+msgstr "COMHAD"
+
+#: ../libgames-support/eggsmclient.c:231
+msgid "Specify session management ID"
+msgstr ""
+
+#: ../libgames-support/eggsmclient.c:231
+msgid "ID"
+msgstr "CA"
+
+#: ../libgames-support/eggsmclient.c:252
+msgid "Session management options:"
+msgstr ""
+
+#: ../libgames-support/eggsmclient.c:253
+msgid "Show session management options"
+msgstr ""
+
 #.
 #. * Create outer window.
 #.
-#: ../libgames-support/games-dlg-chat.c:178
+#: ../libgames-support/games-dlg-chat.c:181
 #, fuzzy
 msgid "Player Chat"
 msgstr "Ainmneach Imreoiri"
 
-#: ../libgames-support/games-dlg-players.c:118
+#: ../libgames-support/games-dlg-players.c:119
 msgid "Occupied"
 msgstr ""
 
-#: ../libgames-support/games-dlg-players.c:122
+#: ../libgames-support/games-dlg-players.c:123
 msgid "Empty"
 msgstr ""
 
-#: ../libgames-support/games-dlg-players.c:130
+#: ../libgames-support/games-dlg-players.c:131
 #, fuzzy
 msgid "Reserved"
 msgstr "seacht"
 
-#: ../libgames-support/games-dlg-players.c:134
+#: ../libgames-support/games-dlg-players.c:135
 msgid "Abandoned"
 msgstr ""
 
-#: ../libgames-support/games-dlg-players.c:138
+#: ../libgames-support/games-dlg-players.c:139
 msgid "-"
 msgstr ""
 
-#: ../libgames-support/games-dlg-players.c:212
-msgid "Status"
+#: ../libgames-support/games-dlg-players.c:208
+msgid "#"
 msgstr ""
 
-#: ../libgames-support/games-dlg-players.c:278
-#, fuzzy
-msgid "List of players:"
-msgstr "Uimhir na Miana:"
+#: ../libgames-support/games-dlg-players.c:215
+msgid "Status"
+msgstr ""
 
 #. FIXME: you shouldn't be able to boot yourself
-#: ../libgames-support/games-dlg-players.c:435
+#: ../libgames-support/games-dlg-players.c:431
 msgid "Boot player"
 msgstr ""
 
-#: ../libgames-support/games-dlg-players.c:453
+#: ../libgames-support/games-dlg-players.c:449
 #, fuzzy
 msgid "Sit here"
 msgstr "trí"
 
-#: ../libgames-support/games-dlg-players.c:455
+#: ../libgames-support/games-dlg-players.c:451
 #, fuzzy
 msgid "Move here"
 msgstr "Bog ar clé"
 
-#: ../libgames-support/games-dlg-players.c:471
+#: ../libgames-support/games-dlg-players.c:467
 msgid "Play with bot"
 msgstr ""
 
-#: ../libgames-support/games-dlg-players.c:485
+#: ../libgames-support/games-dlg-players.c:481
 msgid "Drop reservation"
 msgstr ""
 
-#: ../libgames-support/games-dlg-players.c:487
+#: ../libgames-support/games-dlg-players.c:483
 #, fuzzy
 msgid "Remove bot"
 msgstr "Robots"
 
-#: ../libgames-support/games-card-selector.c:63
-msgid "Card Style"
-msgstr ""
+#. Translators: this is the symbol that's on a Joker card
+#: ../libgames-support/games-card.c:182
+msgctxt "card symbol"
+msgid "JOKER"
+msgstr "FEAR NA GCRÃ?B"
+
+#. Translators: this is the symbol that's on an Ace card
+#: ../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:186
+msgctxt "card symbol"
+msgid "2"
+msgstr "2"
 
-#: ../libgames-support/games-controls.c:48
-msgid "No key"
-msgstr "Gan eochair"
+#. Translators: this is the symbol that's on a 3 card
+#: ../libgames-support/games-card.c:188
+msgctxt "card symbol"
+msgid "3"
+msgstr "3"
 
-#: ../libgames-support/games-controls.c:161
-msgid "<Press a Key>"
-msgstr ""
+#. Translators: this is the symbol that's on a 4 card
+#: ../libgames-support/games-card.c:190
+msgctxt "card symbol"
+msgid "4"
+msgstr "4"
 
-#: ../libgames-support/games-controls.c:332
-#, fuzzy
+#. Translators: this is the symbol that's on a 5 card
+#: ../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:194
+msgctxt "card symbol"
+msgid "6"
+msgstr "6"
+
+#. Translators: this is the symbol that's on a 7 card
+#: ../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:198
+msgctxt "card symbol"
+msgid "8"
+msgstr "8"
+
+#. Translators: this is the symbol that's on a 9 card
+#: ../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:202
+msgctxt "card symbol"
+msgid "J"
+msgstr "J"
+
+#. Translators: this is the symbol that's on a Queen card
+#: ../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:206
+msgctxt "card symbol"
+msgid "K"
+msgstr "K"
+
+#. Translators: this is the symbol that's on a 1 card
+#: ../libgames-support/games-card.c:210
+msgctxt "card symbol"
+msgid "1"
+msgstr "1"
+
+#: ../libgames-support/games-controls.c:286
 msgid "Unknown Command"
-msgstr "Dath anathnid"
+msgstr "Ordú Anaithnid"
 
 #: ../libgames-support/games-gridframe.c:223
 #: ../libgames-support/games-gridframe.c:231
@@ -7785,143 +9177,217 @@ msgstr ""
 msgid "The vertical alignment, from 0 (top) to 1 (bottom)"
 msgstr ""
 
+#. %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 ""
+
+#: ../libgames-support/games-runtime.c:273
+msgid "Could not show link"
+msgstr ""
+
 #. Note that this assumes the default style is plain.
-#: ../libgames-support/games-scores-dialog.c:121
-#: ../libgames-support/games-scores-dialog.c:539
+#: ../libgames-support/games-scores-dialog.c:119
+#: ../libgames-support/games-scores-dialog.c:546
 msgid "Score"
 msgstr "Scór"
 
 #. Translators: this is for a minutes, seconds time display.
-#: ../libgames-support/games-scores-dialog.c:271
+#: ../libgames-support/games-scores-dialog.c:277
 #, c-format
 msgid "%dm %ds"
-msgstr ""
-
-#: ../libgames-support/games-sound.c:75
-#, c-format
-msgid "Error playing sound: %s\n"
-msgstr ""
+msgstr "%dn %ds"
 
-#: ../libgames-support/games-sound.c:109
-#, c-format
-msgid "Error playing sound %s: %s\n"
-msgstr ""
-
-#: ../libgames-support/games-stock.c:48
+#: ../libgames-support/games-stock.c:47
 msgid "End the current game"
 msgstr ""
 
-#: ../libgames-support/games-stock.c:49
+#: ../libgames-support/games-stock.c:48
 msgid "Toggle fullscreen mode"
 msgstr ""
 
-#: ../libgames-support/games-stock.c:51
+#: ../libgames-support/games-stock.c:50
 msgid "Leave fullscreen mode"
 msgstr ""
 
-#: ../libgames-support/games-stock.c:53
+#: ../libgames-support/games-stock.c:52
 msgid "End the current network game and return to network server"
 msgstr ""
 
-#: ../libgames-support/games-stock.c:55 ../mahjongg/mahjongg.c:1281
-#, fuzzy
+#: ../libgames-support/games-stock.c:54 ../mahjongg/mahjongg.c:1249
 msgid "Pause the game"
-msgstr "Reitigh an cluiche"
+msgstr "Cuir an cluiche ar sos"
 
-#: ../libgames-support/games-stock.c:56
+#: ../libgames-support/games-stock.c:55
 msgid "Show a list of players in the network game"
 msgstr ""
 
-#: ../libgames-support/games-stock.c:59 ../mahjongg/mahjongg.c:1284
+#: ../libgames-support/games-stock.c:58 ../mahjongg/mahjongg.c:1252
 msgid "Resume the paused game"
 msgstr ""
 
-#: ../libgames-support/games-stock.c:60
+#: ../libgames-support/games-stock.c:59
 msgid "View the scores"
 msgstr ""
 
-#: ../libgames-support/games-stock.c:64
-#, fuzzy
+#: ../libgames-support/games-stock.c:63
 msgid "Configure the game"
-msgstr "Reitigh an cluiche"
+msgstr "Cumraigh an cluiche"
 
-#: ../libgames-support/games-stock.c:65
+#: ../libgames-support/games-stock.c:64
 msgid "Quit this game"
-msgstr ""
+msgstr "Scoir an cluiche seo"
+
+#: ../libgames-support/games-stock.c:319
+msgid "_Fullscreen"
+msgstr "_Lánscáileán"
 
 #. Translators: This "_New" is for the menu item 'Game->New', implies "New Game"
-#: ../libgames-support/games-stock.c:297
+#: ../libgames-support/games-stock.c:322
 msgid "_New"
 msgstr "_Nua"
 
-#: ../libgames-support/games-stock.c:300
-#, fuzzy
+#: ../libgames-support/games-stock.c:325
 msgid "_Redo Move"
-msgstr "_Gluais"
+msgstr "_Athdhéan Beart"
 
 #. Translators: this is the "Reset" scores button in a scores dialogue
-#: ../libgames-support/games-stock.c:302
+#: ../libgames-support/games-stock.c:327
 msgid "_Reset"
 msgstr "_Athshocraigh"
 
 #. Translators: "_Restart" is the menu item 'Game->Restart', implies "Restart Game"
-#: ../libgames-support/games-stock.c:304
+#: ../libgames-support/games-stock.c:329
 msgid "_Restart"
 msgstr "_Atosaigh"
 
-#: ../libgames-support/games-stock.c:307
+#: ../libgames-support/games-stock.c:331
+msgid "_Deal"
+msgstr "_Roinn"
+
+#: ../libgames-support/games-stock.c:333
 msgid "_Leave Fullscreen"
 msgstr ""
 
-#: ../libgames-support/games-stock.c:309
+#: ../libgames-support/games-stock.c:335
 #, fuzzy
 msgid "L_eave Game"
 msgstr "Cluiche Nua"
 
-#: ../libgames-support/games-stock.c:310
+#: ../libgames-support/games-stock.c:336
 #, fuzzy
 msgid "Player _List"
 msgstr "Imreoiri"
 
-#: ../libgames-support/games-stock.c:312
+#: ../libgames-support/games-stock.c:337
+msgid "_Pause"
+msgstr "S_os"
+
+#: ../libgames-support/games-stock.c:338
 msgid "Res_ume"
 msgstr ""
 
-#: ../libgames-support/games-stock.c:313
+#: ../libgames-support/games-stock.c:339
 #, fuzzy
 msgid "_Scores"
 msgstr "Scór"
 
-#: ../libgames-support/games-stock.c:314
+#: ../libgames-support/games-stock.c:340
 #, fuzzy
 msgid "_End Game"
 msgstr "_Cluiche"
 
-#: ../libgames-support/games-stock.c:319
+#. 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 "_Maidir Leis Seo"
 
-#: ../libgames-support/games-stock.c:320
-#, fuzzy
+#: ../libgames-support/games-stock.c:347
 msgid "_Cancel"
-msgstr "Canfield"
+msgstr "_Cealaigh"
 
-#: ../libgames-support/games-stock.c:321
+#: ../libgames-support/games-stock.c:348
 msgid "_Close"
 msgstr "_Dún"
 
-#: ../libgames-support/games-stock.c:322
+#: ../libgames-support/games-stock.c:349
 msgid "_OK"
-msgstr "_Tá go Maith"
+msgstr "Tá g_o Maith"
+
+#. %s is replaced with the name of the game in gnome-games.
+#: ../libgames-support/games-stock.c:410
+#, c-format
+msgid ""
+"%s is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version %d of the License, or (at your option) any later "
+"version."
+msgstr ""
+"Is bogearraí saor é %s; is féidir leat é a athdháileadh nó a athrú faoi "
+"théarmaí an GNU General Public License mar foilsíodh é ag an Free Software "
+"Foundation; leagan %d an License, nó (de do rogha) aon leagan níos déanaí."
+
+#: ../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 ""
+"Ba chóir go bhfuair tú cóip an GNU General Public License in éineacht leis "
+"an gclár seo.  Mura bhfuair tú é, féach <http://www.gnu.org/licenses/>."
+
+#: ../lightsoff/lightsoff.desktop.in.in.h:1 ../lightsoff/data/lightsoff.ui.h:1
+#: ../lightsoff/data/settings.ui.h:1
+#, fuzzy
+msgid "Lights Off"
+msgstr "Eight Off"
+
+#: ../lightsoff/lightsoff.desktop.in.in.h:2
+msgid "Turn off all the lights"
+msgstr ""
+
+#: ../lightsoff/lightsoff.schemas.in.h:1
+#, fuzzy
+msgid "The current score"
+msgstr "Reitigh an cluiche"
+
+#: ../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 ""
+
+#: ../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 ""
 
-#: ../mahjongg/drawing.c:301
+#: ../lightsoff/lightsoff.schemas.in.h:4
+msgid "The users's most recent score."
+msgstr ""
+
+#: ../lightsoff/data/settings.ui.h:2
+msgid "Look & Feel"
+msgstr "Cuma"
+
+#: ../lightsoff/data/settings.ui.h:3
+#: ../same-gnome-clutter/data/settings.ui.h:7
+msgid "Theme:"
+msgstr "Téama:"
+
+#: ../lightsoff/data/settings.ui.h:4
+msgid "Use colors from GNOME theme"
+msgstr ""
+
+#: ../mahjongg/drawing.c:306
 msgid ""
 "The selected theme failed to render.\n"
 "\n"
 "Please check that Mahjongg is installed correctly."
 msgstr ""
 
-#: ../mahjongg/drawing.c:458 ../mahjongg/drawing.c:471
+#: ../mahjongg/drawing.c:469 ../mahjongg/drawing.c:482
 #, c-format
 msgid ""
 "Unable to render file:\n"
@@ -7930,100 +9396,104 @@ msgid ""
 "Please check that Mahjongg is installed correctly."
 msgstr ""
 
-#: ../mahjongg/mahjongg.c:46 ../mahjongg/mahjongg.c:932
-#: ../mahjongg/mahjongg.c:936 ../mahjongg/mahjongg.c:938
-#: ../mahjongg/mahjongg.c:1014 ../mahjongg/mahjongg.desktop.in.in.h:2
+#: ../mahjongg/mahjongg.c:43 ../mahjongg/mahjongg.c:934
+#: ../mahjongg/mahjongg.c:938 ../mahjongg/mahjongg.c:940
+#: ../mahjongg/mahjongg.desktop.in.in.h:2
 msgid "Mahjongg"
 msgstr "Mahjongg"
 
-#: ../mahjongg/mahjongg.c:155
+#: ../mahjongg/mahjongg.c:135
 msgid "Could not load tile set"
 msgstr ""
 
-#: ../mahjongg/mahjongg.c:328
-msgid ""
-"Do you want to finish the current game or start playing with the new map "
-"immediately?"
+#: ../mahjongg/mahjongg.c:306
+msgid "Do you want to start a new game with this map?"
 msgstr ""
 
-#: ../mahjongg/mahjongg.c:330
-msgid ""
-"If you choose to finish with the old map then the next game will use the new "
-"map."
+#: ../mahjongg/mahjongg.c:308
+msgid "If you continue playing the next game will use the new map."
+msgstr ""
+
+#: ../mahjongg/mahjongg.c:310
+msgid "_Continue playing"
 msgstr ""
 
-#: ../mahjongg/mahjongg.c:332
-msgid "_Finish"
+#: ../mahjongg/mahjongg.c:311
+msgid "Use _new map"
 msgstr ""
 
-#: ../mahjongg/mahjongg.c:644
+#: ../mahjongg/mahjongg.c:614
 #, fuzzy
 msgid "There are no more moves."
 msgstr "Níl aon gluaiseann fagtha."
 
-#: ../mahjongg/mahjongg.c:648
-msgid "Shuffle"
-msgstr ""
+#: ../mahjongg/mahjongg.c:617
+msgid "_New game"
+msgstr "Cluiche _nua"
 
-#: ../mahjongg/mahjongg.c:681 ../mahjongg/mahjongg.c:1000
+#: ../mahjongg/mahjongg.c:622
+#, fuzzy
+msgid "_Shuffle"
+msgstr "Scuffle"
+
+#: ../mahjongg/mahjongg.c:664 ../mahjongg/mahjongg.c:993
 #, fuzzy
 msgid "Mahjongg Scores"
 msgstr "Mahjongg"
 
-#: ../mahjongg/mahjongg.c:722
-#, fuzzy
+#: ../mahjongg/mahjongg.c:705
 msgid "Mahjongg Preferences"
-msgstr "Roghnachais Iagno"
+msgstr "Sainroghanna Mahjongg"
 
-#: ../mahjongg/mahjongg.c:743
+#: ../mahjongg/mahjongg.c:726
 msgid "Tiles"
 msgstr ""
 
-#: ../mahjongg/mahjongg.c:764
+#: ../mahjongg/mahjongg.c:747
 msgid "Maps"
 msgstr "Mapaí"
 
-#: ../mahjongg/mahjongg.c:771
+#: ../mahjongg/mahjongg.c:754
 msgid "_Select map:"
 msgstr "_Roghnaigh mapa:"
 
-#: ../mahjongg/mahjongg.c:912
+#: ../mahjongg/mahjongg.c:768
+msgid "Colors"
+msgstr "Dathanna"
+
+#: ../mahjongg/mahjongg.c:914
 msgid "Maps:"
 msgstr "Mapaí:"
 
-#: ../mahjongg/mahjongg.c:919
+#: ../mahjongg/mahjongg.c:921
 msgid "Tiles:"
 msgstr ""
 
-#: ../mahjongg/mahjongg.c:942
+#: ../mahjongg/mahjongg.c:944
 msgid ""
 "A matching game played with Mahjongg tiles.\n"
 "\n"
 "Mahjongg is a part of GNOME Games."
 msgstr ""
 
-#: ../mahjongg/mahjongg.c:1014
+#: ../mahjongg/mahjongg.c:1188
 #, c-format
-msgid "%s - %s"
-msgstr "%s - %s"
-
-#: ../mahjongg/mahjongg.c:1240
-msgid "Sorry, I was unable to find a playable configuration."
-msgstr ""
+msgid "Mahjongg - %s"
+msgstr "Mahjongg - %s"
 
-#: ../mahjongg/mahjongg.c:1287
+#: ../mahjongg/mahjongg.c:1255
 msgid "Redo the last move"
-msgstr ""
+msgstr "Athfheidhmigh an beart is déanaí"
 
-#: ../mahjongg/mahjongg.c:1492
+#: ../mahjongg/mahjongg.c:1447
 msgid "Tiles Left:"
-msgstr ""
+msgstr "Tíleanna Fágtha:"
 
-#: ../mahjongg/mahjongg.c:1501
+#: ../mahjongg/mahjongg.c:1456
 msgid "Moves Left:"
-msgstr "Gluaiseann Fagtha"
+msgstr "Bearta Fágtha:"
 
-#: ../mahjongg/mahjongg.c:1565
+#: ../mahjongg/mahjongg.c:1518
 msgid "Remove matching pairs of tiles."
 msgstr ""
 
@@ -8031,10 +9501,10 @@ msgstr ""
 msgid "Disassemble a pile of tiles by removing matching pairs"
 msgstr ""
 
-#: ../mahjongg/maps.c:228
-#, fuzzy
-msgid "mahjongg|Easy"
-msgstr "Mahjongg"
+#: ../mahjongg/maps.c:229
+msgctxt "mahjongg map name"
+msgid "Easy"
+msgstr "Ã?asca"
 
 #.
 #. * Translatable strings file generated by get_titles.pl.
@@ -8042,71 +9512,77 @@ msgstr "Mahjongg"
 #. * DO NOT compile it as part of your application.
 #.
 #: ../mahjongg/translatable_game_names.h:6
+msgctxt "mahjongg map name"
 msgid "The Ziggurat"
 msgstr "An Siogúrat"
 
 #: ../mahjongg/translatable_game_names.h:7
+msgctxt "mahjongg map name"
 msgid "Four Bridges"
-msgstr "Four Bridges"
+msgstr "Ceithre Dhroichead"
 
 #: ../mahjongg/translatable_game_names.h:8
+msgctxt "mahjongg map name"
 msgid "Cloud"
-msgstr "Cloud"
+msgstr "Scamall"
 
 #: ../mahjongg/translatable_game_names.h:9
+msgctxt "mahjongg map name"
 msgid "Tic-Tac-Toe"
 msgstr "Tic-Tac-Toe"
 
 #: ../mahjongg/translatable_game_names.h:10
+msgctxt "mahjongg map name"
 msgid "Red Dragon"
 msgstr ""
 
 #: ../mahjongg/translatable_game_names.h:11
+msgctxt "mahjongg map name"
 msgid "Pyramid's Walls"
 msgstr ""
 
 #: ../mahjongg/translatable_game_names.h:12
+msgctxt "mahjongg map name"
 msgid "Confounding Cross"
 msgstr ""
 
 #: ../mahjongg/translatable_game_names.h:13
+msgctxt "mahjongg map name"
 msgid "Difficult"
-msgstr ""
+msgstr "Deacair"
 
 #. FIXME: This is long enough to resize the window upwards when
 #. * the game finishes.
-#: ../same-gnome/game.c:386
+#: ../same-gnome/game.c:393
 msgid "1000 point bonus for clearing the board!"
 msgstr ""
 
-#: ../same-gnome/same-gnome.c:58
-msgid "same-gnome|Medium"
-msgstr "Meán"
-
-#: ../same-gnome/same-gnome.c:137
+#: ../same-gnome/same-gnome.c:127
 msgid "Set the theme"
 msgstr "Socraigh an téama"
 
-#: ../same-gnome/same-gnome.c:139
+#: ../same-gnome/same-gnome.c:129
 msgid "For backwards compatibility"
 msgstr ""
 
-#: ../same-gnome/same-gnome.c:141
+#: ../same-gnome/same-gnome.c:131
 msgid "Game size (1=small, 3=large)"
 msgstr ""
 
 #: ../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 ""
 
 #: ../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"
 
 #: ../same-gnome/same-gnome.schemas.in.h:1
-#, fuzzy
 msgid "Height of the custom board"
-msgstr "Airde na greille"
+msgstr "Airde an chláir saincheaptha"
 
 #: ../same-gnome/same-gnome.schemas.in.h:2
 msgid ""
@@ -8115,9 +9591,8 @@ msgid ""
 msgstr ""
 
 #: ../same-gnome/same-gnome.schemas.in.h:3
-#, fuzzy
 msgid "The board size"
-msgstr "Méid páirce"
+msgstr "Méid an chláir"
 
 #: ../same-gnome/same-gnome.schemas.in.h:4
 msgid "The filename of the theme to use."
@@ -8132,10 +9607,6 @@ msgid ""
 "The size of the board to use. 1 = Custom, 2 = Small, 3 = Medium, 4 = Large."
 msgstr ""
 
-#: ../same-gnome/same-gnome.schemas.in.h:7
-msgid "The theme to use"
-msgstr ""
-
 #: ../same-gnome/same-gnome.schemas.in.h:8
 msgid "The width of the custom board, 101 &gt; width &gt; 3."
 msgstr ""
@@ -8148,18 +9619,18 @@ msgstr ""
 msgid "Width of the custom board"
 msgstr ""
 
-#: ../same-gnome/ui.c:80
+#: ../same-gnome/ui.c:72
 msgid "No points"
 msgstr ""
 
-#: ../same-gnome/ui.c:85
+#: ../same-gnome/ui.c:77
 #, c-format
 msgid "%d point"
 msgid_plural "%d points"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../same-gnome/ui.c:135
+#: ../same-gnome/ui.c:127
 msgid ""
 "I want to play that game! You know, they all go whirly-round and you click "
 "on them and they vanish!\n"
@@ -8167,34 +9638,81 @@ msgid ""
 "Same GNOME is a part of GNOME Games."
 msgstr ""
 
-#: ../same-gnome/ui.c:153
+#: ../same-gnome/ui.c:145
 #, fuzzy
 msgid "Same GNOME Scores"
 msgstr "An Gnome Céanna"
 
-#: ../same-gnome/ui.c:182
+#: ../same-gnome/ui.c:174
 msgid "Unfortunately your score did not make the top ten."
 msgstr ""
 
-#: ../same-gnome/ui.c:289
+#: ../same-gnome/ui.c:283
 msgid "Same GNOME Theme"
 msgstr "Téama Same GNOME"
 
-#: ../same-gnome/ui.c:479
+#: ../same-gnome/ui.c:471
 msgid "_Theme..."
 msgstr "_Téama..."
 
-#: ../same-gnome/ui.c:492
-#, fuzzy
+#: ../same-gnome/ui.c:478
+msgid "_Small"
+msgstr "_Beag"
+
+#: ../same-gnome/ui.c:480
+msgid "_Large"
+msgstr "_Mór"
+
+#: ../same-gnome/ui.c:484
 msgid "_Fast Animation"
-msgstr "Beochan"
+msgstr "Beochan _Tapa"
 
-#: ../same-gnome/drawing.c:364
+#: ../same-gnome/drawing.c:370
 msgid "No theme data was found."
 msgstr ""
 
-#: ../same-gnome/drawing.c:369
+#: ../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."
 msgstr ""
+
+#: ../same-gnome-clutter/data/settings.ui.h:2
+msgid "Board size:"
+msgstr "Méid chláir:"
+
+#: ../same-gnome-clutter/data/settings.ui.h:3
+msgid "Number of colors:"
+msgstr "Líon na dathanna:"
+
+#: ../same-gnome-clutter/data/settings.ui.h:8
+#, fuzzy
+msgid "Zealous Animation"
+msgstr "Beochan"
+
+#: ../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
+#, fuzzy
+msgid "Board color count"
+msgstr "Dath cúlra"
+
+#: ../same-gnome-clutter/same-gnome-clutter.schemas.in.h:3
+msgid "The number of colors of tiles to use in the game."
+msgstr ""
+
+#: ../same-gnome-clutter/same-gnome-clutter.schemas.in.h:4
+#, fuzzy
+msgid "The size of the game board."
+msgstr "Airde na greille"
+
+#: ../same-gnome-clutter/same-gnome-clutter.schemas.in.h:7
+msgid "Use more flashy, but slower, animations."
+msgstr ""
+
+#: ../same-gnome-clutter/same-gnome-clutter.schemas.in.h:8
+#, fuzzy
+msgid "Zealous animation"
+msgstr "Beochan"