[aisleriot] games: Change gettext binding to 'G_'



commit 5b04e58ba5f8df8223a3830d2c61325527d52237
Author: Christian Persch <chpe src gnome org>
Date:   Fri Dec 31 17:38:22 2021 +0100

    games: Change gettext binding to 'G_'
    
    ... since '_' is now reserved on guile 3.0.

 games/agnes.scm              |  18 +--
 games/api.scm                | 372 +++++++++++++++++++++----------------------
 games/athena.scm             |   2 +-
 games/auld-lang-syne.scm     |   4 +-
 games/backbone.scm           |   8 +-
 games/bakers-dozen.scm       |   2 +-
 games/bear-river.scm         |  12 +-
 games/beleaguered-castle.scm |   2 +-
 games/block-ten.scm          |   2 +-
 games/bristol.scm            |   4 +-
 games/camelot.scm            |  12 +-
 games/canfield.scm           |  20 +--
 games/card-monkey.scm        |   4 +-
 games/carpet.scm             |   4 +-
 games/chessboard.scm         |  14 +-
 games/clock.scm              |  24 +--
 games/cover.scm              |   2 +-
 games/cruel.scm              |   4 +-
 games/doublets.scm           |  32 ++--
 games/eagle-wing.scm         |  20 +--
 games/easthaven.scm          |   8 +-
 games/eight-off.scm          |   2 +-
 games/elevator.scm           |   4 +-
 games/eliminator.scm         |  10 +-
 games/escalator.scm          |   4 +-
 games/first-law.scm          |  34 ++--
 games/fortress.scm           |   2 +-
 games/fortunes.scm           |   6 +-
 games/forty-thieves.scm      |   4 +-
 games/freecell.scm           |   4 +-
 games/gaps.scm               | 108 ++++++-------
 games/giant.scm              |  14 +-
 games/glenwood.scm           |  22 +--
 games/golf.scm               |   4 +-
 games/gypsy.scm              |   6 +-
 games/hamilton.scm           |  42 ++---
 games/helsinki.scm           |  10 +-
 games/hopscotch.scm          |   6 +-
 games/jamestown.scm          |   2 +-
 games/jumbo.scm              |  10 +-
 games/kansas.scm             |  16 +-
 games/king-albert.scm        |   2 +-
 games/kings-audience.scm     |   4 +-
 games/klondike.scm           |  20 +--
 games/labyrinth.scm          |   4 +-
 games/lady-jane.scm          |  18 +--
 games/maze.scm               |   2 +-
 games/monte-carlo.scm        |   6 +-
 games/napoleons-tomb.scm     |  12 +-
 games/neighbor.scm           |  10 +-
 games/osmosis.scm            |  10 +-
 games/pileon.scm             |   4 +-
 games/plait.scm              |  18 +--
 games/poker.scm              |   4 +-
 games/quatorze.scm           |   2 +-
 games/royal-east.scm         |  14 +-
 games/saratoga.scm           |   2 +-
 games/scorpion.scm           |   2 +-
 games/scuffle.scm            |   8 +-
 games/seahaven.scm           |   2 +-
 games/sir-tommy.scm          |   6 +-
 games/spider.scm             |  20 +--
 games/straight-up.scm        |  10 +-
 games/streets-and-alleys.scm |   2 +-
 games/ten-across.scm         |   6 +-
 games/terrace.scm            |  32 ++--
 games/thieves.scm            |   4 +-
 games/thirteen.scm           |  14 +-
 games/thumb-and-pouch.scm    |   8 +-
 games/treize.scm             |  12 +-
 games/triple-peaks.scm       |   8 +-
 games/union-square.scm       |   6 +-
 games/valentine.scm          |   2 +-
 games/wall.scm               |   6 +-
 games/westhaven.scm          |   4 +-
 games/whitehead.scm          |   6 +-
 games/yield.scm              |  12 +-
 games/zebra.scm              |   8 +-
 78 files changed, 595 insertions(+), 595 deletions(-)
---
diff --git a/games/agnes.scm b/games/agnes.scm
index 39280ddc..df2bb5c1 100644
--- a/games/agnes.scm
+++ b/games/agnes.scm
@@ -69,22 +69,22 @@
 (define (get-base-string)
   (cond ((and (> BASE-VAL 1)
              (< BASE-VAL 11))
-        (format #f (_"Base Card: ~a") (number->string BASE-VAL)))
+        (format #f (G_"Base Card: ~a") (number->string BASE-VAL)))
        ((= BASE-VAL 1)
-        (_"Base Card: Ace"))
+        (G_"Base Card: Ace"))
        ((= BASE-VAL 11)
-        (_"Base Card: Jack"))
+        (G_"Base Card: Jack"))
        ((= BASE-VAL 12)
-        (_"Base Card: Queen"))
+        (G_"Base Card: Queen"))
        ((= BASE-VAL 13)
-        (_"Base Card: King"))
+        (G_"Base Card: King"))
        (#t "")))
 
 (define (get-stock-no-string)
   (if (> (length (get-cards 0)) 1)
-      (string-append (_"Stock left:") " "
+      (string-append (G_"Stock left:") " "
                     (number->string (length (get-cards 0))))
-      (string-append (_"Stock left: 0")))) 
+      (string-append (G_"Stock left: 0")))) 
 
 (define (check-straight-descending-list-base-low card-list)
   (or (< (length card-list) 2)
@@ -261,13 +261,13 @@
 
 (define (check-deal?)
   (and (dealable?)
-       (list 0 (_"Deal more cards"))))
+       (list 0 (G_"Deal more cards"))))
 
 (define (get-hint)
   (or (check-to-foundation? 5)
       (check-to-tableau? 5 6)
       (check-deal?)
-      (list 0 (_"Try rearranging the cards"))))
+      (list 0 (G_"Try rearranging the cards"))))
 
 (define (get-options) 
   #f)
diff --git a/games/api.scm b/games/api.scm
index 764a1ab9..93e322c7 100644
--- a/games/api.scm
+++ b/games/api.scm
@@ -29,7 +29,7 @@
 (fluid-set! %default-port-encoding "UTF-8")
 
 ;; Define the usual alias for gettext
-(define-public (_ msg) (gettext msg "aisleriot"))
+(define-public (G_ msg) (gettext msg "aisleriot"))
 
 ;; Feature masks:
 (define-public droppable-feature 1)
@@ -301,7 +301,7 @@
        ((eq? (get-suit card) spade) black)
        ((eq? (get-suit card) heart) red)
        ((eq? (get-suit card) diamond) red)
-       (#t (_"Unknown color"))))
+       (#t (G_"Unknown color"))))
 
 (define-public (get-value card)
       (car card))
@@ -417,7 +417,7 @@
 
 ; hint procedures
 (define-public (get-joker-name card) 
-  (if (is-black? card) (_"the black joker") (_"the red joker")))
+  (if (is-black? card) (G_"the black joker") (G_"the red joker")))
 
 (define (get-name card)
   ; Do not use this function directly. To create a hint for moving a card or
@@ -426,143 +426,143 @@
     (if (is-joker? card)
         (get-joker-name card)
         (cond ((eq? suit club) 
-               (cond ((eq? value ace) (_"the ace of clubs"))
-                     ((eq? value 2) (_"the two of clubs"))
-                     ((eq? value 3) (_"the three of clubs"))
-                     ((eq? value 4) (_"the four of clubs"))
-                     ((eq? value 5) (_"the five of clubs"))
-                     ((eq? value 6) (_"the six of clubs"))
-                     ((eq? value 7) (_"the seven of clubs"))
-                     ((eq? value 8) (_"the eight of clubs"))
-                     ((eq? value 9) (_"the nine of clubs"))
-                     ((eq? value 10) (_"the ten of clubs"))
-                     ((eq? value jack) (_"the jack of clubs"))
-                     ((eq? value queen) (_"the queen of clubs"))
-                     ((eq? value king) (_"the king of clubs"))
-                     (#t (_"the unknown card"))))
+               (cond ((eq? value ace) (G_"the ace of clubs"))
+                     ((eq? value 2) (G_"the two of clubs"))
+                     ((eq? value 3) (G_"the three of clubs"))
+                     ((eq? value 4) (G_"the four of clubs"))
+                     ((eq? value 5) (G_"the five of clubs"))
+                     ((eq? value 6) (G_"the six of clubs"))
+                     ((eq? value 7) (G_"the seven of clubs"))
+                     ((eq? value 8) (G_"the eight of clubs"))
+                     ((eq? value 9) (G_"the nine of clubs"))
+                     ((eq? value 10) (G_"the ten of clubs"))
+                     ((eq? value jack) (G_"the jack of clubs"))
+                     ((eq? value queen) (G_"the queen of clubs"))
+                     ((eq? value king) (G_"the king of clubs"))
+                     (#t (G_"the unknown card"))))
               ((eq? suit spade) 
-               (cond ((eq? value ace) (_"the ace of spades"))
-                     ((eq? value 2) (_"the two of spades"))
-                     ((eq? value 3) (_"the three of spades"))
-                     ((eq? value 4) (_"the four of spades"))
-                     ((eq? value 5) (_"the five of spades"))
-                     ((eq? value 6) (_"the six of spades"))
-                     ((eq? value 7) (_"the seven of spades"))
-                     ((eq? value 8) (_"the eight of spades"))
-                     ((eq? value 9) (_"the nine of spades"))
-                     ((eq? value 10) (_"the ten of spades"))
-                     ((eq? value jack) (_"the jack of spades"))
-                     ((eq? value queen) (_"the queen of spades"))
-                     ((eq? value king) (_"the king of spades"))
-                     (#t (_"the unknown card"))))
+               (cond ((eq? value ace) (G_"the ace of spades"))
+                     ((eq? value 2) (G_"the two of spades"))
+                     ((eq? value 3) (G_"the three of spades"))
+                     ((eq? value 4) (G_"the four of spades"))
+                     ((eq? value 5) (G_"the five of spades"))
+                     ((eq? value 6) (G_"the six of spades"))
+                     ((eq? value 7) (G_"the seven of spades"))
+                     ((eq? value 8) (G_"the eight of spades"))
+                     ((eq? value 9) (G_"the nine of spades"))
+                     ((eq? value 10) (G_"the ten of spades"))
+                     ((eq? value jack) (G_"the jack of spades"))
+                     ((eq? value queen) (G_"the queen of spades"))
+                     ((eq? value king) (G_"the king of spades"))
+                     (#t (G_"the unknown card"))))
               ((eq? suit heart) 
-               (cond ((eq? value ace) (_"the ace of hearts"))
-                     ((eq? value 2) (_"the two of hearts"))
-                     ((eq? value 3) (_"the three of hearts"))
-                     ((eq? value 4) (_"the four of hearts"))
-                     ((eq? value 5) (_"the five of hearts"))
-                     ((eq? value 6) (_"the six of hearts"))
-                     ((eq? value 7) (_"the seven of hearts"))
-                     ((eq? value 8) (_"the eight of hearts"))
-                     ((eq? value 9) (_"the nine of hearts"))
-                     ((eq? value 10) (_"the ten of hearts"))
-                     ((eq? value jack) (_"the jack of hearts"))
-                     ((eq? value queen) (_"the queen of hearts"))
-                     ((eq? value king) (_"the king of hearts"))
-                     (#t (_"the unknown card"))))
+               (cond ((eq? value ace) (G_"the ace of hearts"))
+                     ((eq? value 2) (G_"the two of hearts"))
+                     ((eq? value 3) (G_"the three of hearts"))
+                     ((eq? value 4) (G_"the four of hearts"))
+                     ((eq? value 5) (G_"the five of hearts"))
+                     ((eq? value 6) (G_"the six of hearts"))
+                     ((eq? value 7) (G_"the seven of hearts"))
+                     ((eq? value 8) (G_"the eight of hearts"))
+                     ((eq? value 9) (G_"the nine of hearts"))
+                     ((eq? value 10) (G_"the ten of hearts"))
+                     ((eq? value jack) (G_"the jack of hearts"))
+                     ((eq? value queen) (G_"the queen of hearts"))
+                     ((eq? value king) (G_"the king of hearts"))
+                     (#t (G_"the unknown card"))))
               ((eq? suit diamond) 
-               (cond ((eq? value ace) (_"the ace of diamonds"))
-                     ((eq? value 2) (_"the two of diamonds"))
-                     ((eq? value 3) (_"the three of diamonds"))
-                     ((eq? value 4) (_"the four of diamonds"))
-                     ((eq? value 5) (_"the five of diamonds"))
-                     ((eq? value 6) (_"the six of diamonds"))
-                     ((eq? value 7) (_"the seven of diamonds"))
-                     ((eq? value 8) (_"the eight of diamonds"))
-                     ((eq? value 9) (_"the nine of diamonds"))
-                     ((eq? value 10) (_"the ten of diamonds"))
-                     ((eq? value jack) (_"the jack of diamonds"))
-                     ((eq? value queen) (_"the queen of diamonds"))
-                     ((eq? value king) (_"the king of diamonds"))
-                     (#t (_"the unknown card"))))
-              (#t (_"the unknown card"))))))
+               (cond ((eq? value ace) (G_"the ace of diamonds"))
+                     ((eq? value 2) (G_"the two of diamonds"))
+                     ((eq? value 3) (G_"the three of diamonds"))
+                     ((eq? value 4) (G_"the four of diamonds"))
+                     ((eq? value 5) (G_"the five of diamonds"))
+                     ((eq? value 6) (G_"the six of diamonds"))
+                     ((eq? value 7) (G_"the seven of diamonds"))
+                     ((eq? value 8) (G_"the eight of diamonds"))
+                     ((eq? value 9) (G_"the nine of diamonds"))
+                     ((eq? value 10) (G_"the ten of diamonds"))
+                     ((eq? value jack) (G_"the jack of diamonds"))
+                     ((eq? value queen) (G_"the queen of diamonds"))
+                     ((eq? value king) (G_"the king of diamonds"))
+                     (#t (G_"the unknown card"))))
+              (#t (G_"the unknown card"))))))
 
 (define (hint-get-dest-format to-slot cards)
   (if (null? cards)
-      (cond ((member to-slot FOUNDATION-SLOTS) (if (= (length FOUNDATION-SLOTS) 1) (_"Move ~a onto the 
foundation.") (_"Move ~a onto an empty foundation slot.")))
-            ((member to-slot TABLEAU-SLOTS) (if (= (length TABLEAU-SLOTS) 1) (_"Move ~a onto the tableau.") 
(_"Move ~a onto an empty tableau slot.")))
-            ((member to-slot RESERVE-SLOTS) (if (= (length RESERVE-SLOTS) 1) (_"Move ~a onto the reserve.") 
(_"Move ~a onto an empty reserve slot.")))
-            ((member to-slot EDGE-SLOTS) (_"Move ~a onto an empty edge slot."))
-            ((member to-slot CORNER-SLOTS) (_"Move ~a onto an empty corner slot."))
-            ((member to-slot TOP-SLOTS) (_"Move ~a onto an empty top slot."))
-            ((member to-slot BOTTOM-SLOTS) (_"Move ~a onto an empty bottom slot."))
-            ((member to-slot LEFT-SLOTS) (_"Move ~a onto an empty left slot."))
-            ((member to-slot RIGHT-SLOTS) (_"Move ~a onto an empty right slot."))
-            (else (_"Move ~a onto an empty slot.")))
+      (cond ((member to-slot FOUNDATION-SLOTS) (if (= (length FOUNDATION-SLOTS) 1) (G_"Move ~a onto the 
foundation.") (G_"Move ~a onto an empty foundation slot.")))
+            ((member to-slot TABLEAU-SLOTS) (if (= (length TABLEAU-SLOTS) 1) (G_"Move ~a onto the tableau.") 
(G_"Move ~a onto an empty tableau slot.")))
+            ((member to-slot RESERVE-SLOTS) (if (= (length RESERVE-SLOTS) 1) (G_"Move ~a onto the reserve.") 
(G_"Move ~a onto an empty reserve slot.")))
+            ((member to-slot EDGE-SLOTS) (G_"Move ~a onto an empty edge slot."))
+            ((member to-slot CORNER-SLOTS) (G_"Move ~a onto an empty corner slot."))
+            ((member to-slot TOP-SLOTS) (G_"Move ~a onto an empty top slot."))
+            ((member to-slot BOTTOM-SLOTS) (G_"Move ~a onto an empty bottom slot."))
+            ((member to-slot LEFT-SLOTS) (G_"Move ~a onto an empty left slot."))
+            ((member to-slot RIGHT-SLOTS) (G_"Move ~a onto an empty right slot."))
+            (else (G_"Move ~a onto an empty slot.")))
       (let* ((card (car cards)) (value (get-value card)) (suit (get-suit card)))
              (cond ((is-joker? card)
-                    (if (is-black? card) (_"Move ~a onto the black joker.") (_"Move ~a onto the red 
joker.")))
+                    (if (is-black? card) (G_"Move ~a onto the black joker.") (G_"Move ~a onto the red 
joker.")))
                    ((eq? suit club) 
-                    (cond ((eq? value ace) (_"Move ~a onto the ace of clubs."))
-                          ((eq? value 2) (_"Move ~a onto the two of clubs."))
-                          ((eq? value 3) (_"Move ~a onto the three of clubs."))
-                          ((eq? value 4) (_"Move ~a onto the four of clubs."))
-                          ((eq? value 5) (_"Move ~a onto the five of clubs."))
-                          ((eq? value 6) (_"Move ~a onto the six of clubs."))
-                          ((eq? value 7) (_"Move ~a onto the seven of clubs."))
-                          ((eq? value 8) (_"Move ~a onto the eight of clubs."))
-                          ((eq? value 9) (_"Move ~a onto the nine of clubs."))
-                          ((eq? value 10) (_"Move ~a onto the ten of clubs."))
-                          ((eq? value jack) (_"Move ~a onto the jack of clubs."))
-                          ((eq? value queen) (_"Move ~a onto the queen of clubs."))
-                          ((eq? value king) (_"Move ~a onto the king of clubs."))
-                          (#t (_"Move ~a onto the unknown card."))))
+                    (cond ((eq? value ace) (G_"Move ~a onto the ace of clubs."))
+                          ((eq? value 2) (G_"Move ~a onto the two of clubs."))
+                          ((eq? value 3) (G_"Move ~a onto the three of clubs."))
+                          ((eq? value 4) (G_"Move ~a onto the four of clubs."))
+                          ((eq? value 5) (G_"Move ~a onto the five of clubs."))
+                          ((eq? value 6) (G_"Move ~a onto the six of clubs."))
+                          ((eq? value 7) (G_"Move ~a onto the seven of clubs."))
+                          ((eq? value 8) (G_"Move ~a onto the eight of clubs."))
+                          ((eq? value 9) (G_"Move ~a onto the nine of clubs."))
+                          ((eq? value 10) (G_"Move ~a onto the ten of clubs."))
+                          ((eq? value jack) (G_"Move ~a onto the jack of clubs."))
+                          ((eq? value queen) (G_"Move ~a onto the queen of clubs."))
+                          ((eq? value king) (G_"Move ~a onto the king of clubs."))
+                          (#t (G_"Move ~a onto the unknown card."))))
                    ((eq? suit spade) 
-                    (cond ((eq? value ace) (_"Move ~a onto the ace of spades."))
-                          ((eq? value 2) (_"Move ~a onto the two of spades."))
-                          ((eq? value 3) (_"Move ~a onto the three of spades."))
-                          ((eq? value 4) (_"Move ~a onto the four of spades."))
-                          ((eq? value 5) (_"Move ~a onto the five of spades."))
-                          ((eq? value 6) (_"Move ~a onto the six of spades."))
-                          ((eq? value 7) (_"Move ~a onto the seven of spades."))
-                          ((eq? value 8) (_"Move ~a onto the eight of spades."))
-                          ((eq? value 9) (_"Move ~a onto the nine of spades."))
-                          ((eq? value 10) (_"Move ~a onto the ten of spades."))
-                          ((eq? value jack) (_"Move ~a onto the jack of spades."))
-                          ((eq? value queen) (_"Move ~a onto the queen of spades."))
-                          ((eq? value king) (_"Move ~a onto the king of spades."))
-                          (#t (_"Move ~a onto the unknown card."))))
+                    (cond ((eq? value ace) (G_"Move ~a onto the ace of spades."))
+                          ((eq? value 2) (G_"Move ~a onto the two of spades."))
+                          ((eq? value 3) (G_"Move ~a onto the three of spades."))
+                          ((eq? value 4) (G_"Move ~a onto the four of spades."))
+                          ((eq? value 5) (G_"Move ~a onto the five of spades."))
+                          ((eq? value 6) (G_"Move ~a onto the six of spades."))
+                          ((eq? value 7) (G_"Move ~a onto the seven of spades."))
+                          ((eq? value 8) (G_"Move ~a onto the eight of spades."))
+                          ((eq? value 9) (G_"Move ~a onto the nine of spades."))
+                          ((eq? value 10) (G_"Move ~a onto the ten of spades."))
+                          ((eq? value jack) (G_"Move ~a onto the jack of spades."))
+                          ((eq? value queen) (G_"Move ~a onto the queen of spades."))
+                          ((eq? value king) (G_"Move ~a onto the king of spades."))
+                          (#t (G_"Move ~a onto the unknown card."))))
                    ((eq? suit heart) 
-                    (cond ((eq? value ace) (_"Move ~a onto the ace of hearts."))
-                          ((eq? value 2) (_"Move ~a onto the two of hearts."))
-                          ((eq? value 3) (_"Move ~a onto the three of hearts."))
-                          ((eq? value 4) (_"Move ~a onto the four of hearts."))
-                          ((eq? value 5) (_"Move ~a onto the five of hearts."))
-                          ((eq? value 6) (_"Move ~a onto the six of hearts."))
-                          ((eq? value 7) (_"Move ~a onto the seven of hearts."))
-                          ((eq? value 8) (_"Move ~a onto the eight of hearts."))
-                          ((eq? value 9) (_"Move ~a onto the nine of hearts."))
-                          ((eq? value 10) (_"Move ~a onto the ten of hearts."))
-                          ((eq? value jack) (_"Move ~a onto the jack of hearts."))
-                          ((eq? value queen) (_"Move ~a onto the queen of hearts."))
-                          ((eq? value king) (_"Move ~a onto the king of hearts."))
-                          (#t (_"Move ~a onto the unknown card."))))
+                    (cond ((eq? value ace) (G_"Move ~a onto the ace of hearts."))
+                          ((eq? value 2) (G_"Move ~a onto the two of hearts."))
+                          ((eq? value 3) (G_"Move ~a onto the three of hearts."))
+                          ((eq? value 4) (G_"Move ~a onto the four of hearts."))
+                          ((eq? value 5) (G_"Move ~a onto the five of hearts."))
+                          ((eq? value 6) (G_"Move ~a onto the six of hearts."))
+                          ((eq? value 7) (G_"Move ~a onto the seven of hearts."))
+                          ((eq? value 8) (G_"Move ~a onto the eight of hearts."))
+                          ((eq? value 9) (G_"Move ~a onto the nine of hearts."))
+                          ((eq? value 10) (G_"Move ~a onto the ten of hearts."))
+                          ((eq? value jack) (G_"Move ~a onto the jack of hearts."))
+                          ((eq? value queen) (G_"Move ~a onto the queen of hearts."))
+                          ((eq? value king) (G_"Move ~a onto the king of hearts."))
+                          (#t (G_"Move ~a onto the unknown card."))))
                    ((eq? suit diamond) 
-                    (cond ((eq? value ace) (_"Move ~a onto the ace of diamonds."))
-                          ((eq? value 2) (_"Move ~a onto the two of diamonds."))
-                          ((eq? value 3) (_"Move ~a onto the three of diamonds."))
-                          ((eq? value 4) (_"Move ~a onto the four of diamonds."))
-                          ((eq? value 5) (_"Move ~a onto the five of diamonds."))
-                          ((eq? value 6) (_"Move ~a onto the six of diamonds."))
-                          ((eq? value 7) (_"Move ~a onto the seven of diamonds."))
-                          ((eq? value 8) (_"Move ~a onto the eight of diamonds."))
-                          ((eq? value 9) (_"Move ~a onto the nine of diamonds."))
-                          ((eq? value 10) (_"Move ~a onto the ten of diamonds."))
-                          ((eq? value jack) (_"Move ~a onto the jack of diamonds."))
-                          ((eq? value queen) (_"Move ~a onto the queen of diamonds."))
-                          ((eq? value king) (_"Move ~a onto the king of diamonds."))
-                          (#t (_"Move ~a onto the unknown card."))))
-                   (#t (_"Move ~a onto the unknown card."))))))
+                    (cond ((eq? value ace) (G_"Move ~a onto the ace of diamonds."))
+                          ((eq? value 2) (G_"Move ~a onto the two of diamonds."))
+                          ((eq? value 3) (G_"Move ~a onto the three of diamonds."))
+                          ((eq? value 4) (G_"Move ~a onto the four of diamonds."))
+                          ((eq? value 5) (G_"Move ~a onto the five of diamonds."))
+                          ((eq? value 6) (G_"Move ~a onto the six of diamonds."))
+                          ((eq? value 7) (G_"Move ~a onto the seven of diamonds."))
+                          ((eq? value 8) (G_"Move ~a onto the eight of diamonds."))
+                          ((eq? value 9) (G_"Move ~a onto the nine of diamonds."))
+                          ((eq? value 10) (G_"Move ~a onto the ten of diamonds."))
+                          ((eq? value jack) (G_"Move ~a onto the jack of diamonds."))
+                          ((eq? value queen) (G_"Move ~a onto the queen of diamonds."))
+                          ((eq? value king) (G_"Move ~a onto the king of diamonds."))
+                          (#t (G_"Move ~a onto the unknown card."))))
+                   (#t (G_"Move ~a onto the unknown card."))))))
 
 (define-public (hint-move from-slot from-slot-count to-slot)
   (if (= from-slot to-slot)
@@ -575,68 +575,68 @@
 (define (get-remove-string card)
   (let ((value (get-value card)) (suit (get-suit card)))
        (cond ((is-joker? card)
-              (if (is-black? card) (_"Remove the black joker.") (_"Remove the red joker.")))
+              (if (is-black? card) (G_"Remove the black joker.") (G_"Remove the red joker.")))
              ((eq? suit club) 
-              (cond ((eq? value ace) (_"Remove the ace of clubs."))
-                    ((eq? value 2) (_"Remove the two of clubs."))
-                    ((eq? value 3) (_"Remove the three of clubs."))
-                    ((eq? value 4) (_"Remove the four of clubs."))
-                    ((eq? value 5) (_"Remove the five of clubs."))
-                    ((eq? value 6) (_"Remove the six of clubs."))
-                    ((eq? value 7) (_"Remove the seven of clubs."))
-                    ((eq? value 8) (_"Remove the eight of clubs."))
-                    ((eq? value 9) (_"Remove the nine of clubs."))
-                    ((eq? value 10) (_"Remove the ten of clubs."))
-                    ((eq? value jack) (_"Remove the jack of clubs."))
-                    ((eq? value queen) (_"Remove the queen of clubs."))
-                    ((eq? value king) (_"Remove the king of clubs."))
-                    (#t (_"Remove the unknown card."))))
+              (cond ((eq? value ace) (G_"Remove the ace of clubs."))
+                    ((eq? value 2) (G_"Remove the two of clubs."))
+                    ((eq? value 3) (G_"Remove the three of clubs."))
+                    ((eq? value 4) (G_"Remove the four of clubs."))
+                    ((eq? value 5) (G_"Remove the five of clubs."))
+                    ((eq? value 6) (G_"Remove the six of clubs."))
+                    ((eq? value 7) (G_"Remove the seven of clubs."))
+                    ((eq? value 8) (G_"Remove the eight of clubs."))
+                    ((eq? value 9) (G_"Remove the nine of clubs."))
+                    ((eq? value 10) (G_"Remove the ten of clubs."))
+                    ((eq? value jack) (G_"Remove the jack of clubs."))
+                    ((eq? value queen) (G_"Remove the queen of clubs."))
+                    ((eq? value king) (G_"Remove the king of clubs."))
+                    (#t (G_"Remove the unknown card."))))
              ((eq? suit spade) 
-              (cond ((eq? value ace) (_"Remove the ace of spades."))
-                    ((eq? value 2) (_"Remove the two of spades."))
-                    ((eq? value 3) (_"Remove the three of spades."))
-                    ((eq? value 4) (_"Remove the four of spades."))
-                    ((eq? value 5) (_"Remove the five of spades."))
-                    ((eq? value 6) (_"Remove the six of spades."))
-                    ((eq? value 7) (_"Remove the seven of spades."))
-                    ((eq? value 8) (_"Remove the eight of spades."))
-                    ((eq? value 9) (_"Remove the nine of spades."))
-                    ((eq? value 10) (_"Remove the ten of spades."))
-                    ((eq? value jack) (_"Remove the jack of spades."))
-                    ((eq? value queen) (_"Remove the queen of spades."))
-                    ((eq? value king) (_"Remove the king of spades."))
-                    (#t (_"Remove the unknown card."))))
+              (cond ((eq? value ace) (G_"Remove the ace of spades."))
+                    ((eq? value 2) (G_"Remove the two of spades."))
+                    ((eq? value 3) (G_"Remove the three of spades."))
+                    ((eq? value 4) (G_"Remove the four of spades."))
+                    ((eq? value 5) (G_"Remove the five of spades."))
+                    ((eq? value 6) (G_"Remove the six of spades."))
+                    ((eq? value 7) (G_"Remove the seven of spades."))
+                    ((eq? value 8) (G_"Remove the eight of spades."))
+                    ((eq? value 9) (G_"Remove the nine of spades."))
+                    ((eq? value 10) (G_"Remove the ten of spades."))
+                    ((eq? value jack) (G_"Remove the jack of spades."))
+                    ((eq? value queen) (G_"Remove the queen of spades."))
+                    ((eq? value king) (G_"Remove the king of spades."))
+                    (#t (G_"Remove the unknown card."))))
              ((eq? suit heart) 
-              (cond ((eq? value ace) (_"Remove the ace of hearts."))
-                    ((eq? value 2) (_"Remove the two of hearts."))
-                    ((eq? value 3) (_"Remove the three of hearts."))
-                    ((eq? value 4) (_"Remove the four of hearts."))
-                    ((eq? value 5) (_"Remove the five of hearts."))
-                    ((eq? value 6) (_"Remove the six of hearts."))
-                    ((eq? value 7) (_"Remove the seven of hearts."))
-                    ((eq? value 8) (_"Remove the eight of hearts."))
-                    ((eq? value 9) (_"Remove the nine of hearts."))
-                    ((eq? value 10) (_"Remove the ten of hearts."))
-                    ((eq? value jack) (_"Remove the jack of hearts."))
-                    ((eq? value queen) (_"Remove the queen of hearts."))
-                    ((eq? value king) (_"Remove the king of hearts."))
-                    (#t (_"Remove the unknown card."))))
+              (cond ((eq? value ace) (G_"Remove the ace of hearts."))
+                    ((eq? value 2) (G_"Remove the two of hearts."))
+                    ((eq? value 3) (G_"Remove the three of hearts."))
+                    ((eq? value 4) (G_"Remove the four of hearts."))
+                    ((eq? value 5) (G_"Remove the five of hearts."))
+                    ((eq? value 6) (G_"Remove the six of hearts."))
+                    ((eq? value 7) (G_"Remove the seven of hearts."))
+                    ((eq? value 8) (G_"Remove the eight of hearts."))
+                    ((eq? value 9) (G_"Remove the nine of hearts."))
+                    ((eq? value 10) (G_"Remove the ten of hearts."))
+                    ((eq? value jack) (G_"Remove the jack of hearts."))
+                    ((eq? value queen) (G_"Remove the queen of hearts."))
+                    ((eq? value king) (G_"Remove the king of hearts."))
+                    (#t (G_"Remove the unknown card."))))
              ((eq? suit diamond) 
-              (cond ((eq? value ace) (_"Remove the ace of diamonds."))
-                    ((eq? value 2) (_"Remove the two of diamonds."))
-                    ((eq? value 3) (_"Remove the three of diamonds."))
-                    ((eq? value 4) (_"Remove the four of diamonds."))
-                    ((eq? value 5) (_"Remove the five of diamonds."))
-                    ((eq? value 6) (_"Remove the six of diamonds."))
-                    ((eq? value 7) (_"Remove the seven of diamonds."))
-                    ((eq? value 8) (_"Remove the eight of diamonds."))
-                    ((eq? value 9) (_"Remove the nine of diamonds."))
-                    ((eq? value 10) (_"Remove the ten of diamonds."))
-                    ((eq? value jack) (_"Remove the jack of diamonds."))
-                    ((eq? value queen) (_"Remove the queen of diamonds."))
-                    ((eq? value king) (_"Remove the king of diamonds."))
-                    (#t (_"Remove the unknown card."))))
-             (#t (_"Remove the unknown card.")))))
+              (cond ((eq? value ace) (G_"Remove the ace of diamonds."))
+                    ((eq? value 2) (G_"Remove the two of diamonds."))
+                    ((eq? value 3) (G_"Remove the three of diamonds."))
+                    ((eq? value 4) (G_"Remove the four of diamonds."))
+                    ((eq? value 5) (G_"Remove the five of diamonds."))
+                    ((eq? value 6) (G_"Remove the six of diamonds."))
+                    ((eq? value 7) (G_"Remove the seven of diamonds."))
+                    ((eq? value 8) (G_"Remove the eight of diamonds."))
+                    ((eq? value 9) (G_"Remove the nine of diamonds."))
+                    ((eq? value 10) (G_"Remove the ten of diamonds."))
+                    ((eq? value jack) (G_"Remove the jack of diamonds."))
+                    ((eq? value queen) (G_"Remove the queen of diamonds."))
+                    ((eq? value king) (G_"Remove the king of diamonds."))
+                    (#t (G_"Remove the unknown card."))))
+             (#t (G_"Remove the unknown card.")))))
 
 (define-public (hint-remove-top-card slot)
   (hint-click slot (get-remove-string (get-top-card slot))))
diff --git a/games/athena.scm b/games/athena.scm
index b9885647..c08aa8f4 100644
--- a/games/athena.scm
+++ b/games/athena.scm
@@ -77,7 +77,7 @@
 )
 
 (define (get-options)
-  (list (list (_"Three card deals") deal-three)))
+  (list (list (G_"Three card deals") deal-three)))
 
 (define (apply-options options)
   (set! deal-three (cadar options)))
diff --git a/games/auld-lang-syne.scm b/games/auld-lang-syne.scm
index 01d9e373..d8e698b0 100644
--- a/games/auld-lang-syne.scm
+++ b/games/auld-lang-syne.scm
@@ -50,7 +50,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " "
+  (string-append (G_"Stock left:") " "
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -119,7 +119,7 @@
 
 (define (dealable?)
   (and (not (empty-slot? 0))
-       (list 0 (_"Deal another round"))))
+       (list 0 (G_"Deal another round"))))
 
 (define (get-hint)
   (or (movable? 5 1)
diff --git a/games/backbone.scm b/games/backbone.scm
index 401463b9..65afd6cf 100644
--- a/games/backbone.scm
+++ b/games/backbone.scm
@@ -124,11 +124,11 @@
                                        (get-redeals-string))))
 
 (define (get-redeals-string)
-  (string-append (_"Redeals left:") " "
+  (string-append (G_"Redeals left:") " "
                 (number->string (- 1 FLIP-COUNTER))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards stock)))))
 
 (define (empty-slots? slots)
@@ -283,9 +283,9 @@
     (and (or (not (empty-slot? stock))
              (and (< FLIP-COUNTER 1)
                   (not (empty-slot? waste))))
-         (list 0 (_"Deal a new card from the deck")))
+         (list 0 (G_"Deal a new card from the deck")))
     (and (get-legal-move tableau tableau)
-         (list 0 (_"Try rearranging the cards")))))
+         (list 0 (G_"Try rearranging the cards")))))
 
 (define (full-piles? piles)
   (and (= 13 (length (get-cards (car piles))))
diff --git a/games/bakers-dozen.scm b/games/bakers-dozen.scm
index 7602a40c..904bf31b 100644
--- a/games/bakers-dozen.scm
+++ b/games/bakers-dozen.scm
@@ -191,7 +191,7 @@
 (define (get-hint)
   (or (foundation-possible? 4 0)
       (tableau-moves? 4 5)
-      (list 0 (_"Try rearranging the cards"))))
+      (list 0 (G_"Try rearranging the cards"))))
 
 (define (get-options) 
   #f)
diff --git a/games/bear-river.scm b/games/bear-river.scm
index 507df3c9..fedf13c3 100644
--- a/games/bear-river.scm
+++ b/games/bear-river.scm
@@ -85,15 +85,15 @@
 (define (get-base-string)
   (cond ((and (> BASE-VAL 1)
               (< BASE-VAL 11))
-         (string-append (_"Base Card: ") (number->string BASE-VAL)))
+         (string-append (G_"Base Card: ") (number->string BASE-VAL)))
         ((= BASE-VAL 1)
-         (_"Base Card: Ace"))
+         (G_"Base Card: Ace"))
         ((= BASE-VAL 11)
-         (_"Base Card: Jack"))
+         (G_"Base Card: Jack"))
         ((= BASE-VAL 12)
-         (_"Base Card: Queen"))
+         (G_"Base Card: Queen"))
         ((= BASE-VAL 13)
-         (_"Base Card: King"))
+         (G_"Base Card: King"))
         (#t "")))
 
 (define (button-pressed slot-id card-list)
@@ -204,7 +204,7 @@
       (hint-empty-hole hole tableau)
       (hint-within-tableau tableau tableau)
       (and (any-slot-empty? hole)
-           (list 0 (_"Move something onto an empty right-hand tableau slot")))
+           (list 0 (G_"Move something onto an empty right-hand tableau slot")))
       (hint-last-resort tableau tableau)))
 
 (define (get-options) 
diff --git a/games/beleaguered-castle.scm b/games/beleaguered-castle.scm
index 21efbd84..23daa0ee 100644
--- a/games/beleaguered-castle.scm
+++ b/games/beleaguered-castle.scm
@@ -166,7 +166,7 @@
 
 (define (get-hint)
   (or (check-to-foundation 0)
-      (list 0 (_"Try rearranging the cards"))))
+      (list 0 (G_"Try rearranging the cards"))))
 
 (define (get-options) 
   #f)
diff --git a/games/block-ten.scm b/games/block-ten.scm
index 73a3070d..c12333ab 100644
--- a/games/block-ten.scm
+++ b/games/block-ten.scm
@@ -51,7 +51,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " "
+  (string-append (G_"Stock left:") " "
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
diff --git a/games/bristol.scm b/games/bristol.scm
index 8520c147..59b30887 100644
--- a/games/bristol.scm
+++ b/games/bristol.scm
@@ -75,7 +75,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " "
+  (string-append (G_"Stock left:") " "
                 (number->string (length (get-cards 0)))))
 
 (define (check-for-kings slot-id)
@@ -259,7 +259,7 @@
 
 (define (check-deal)
   (and (dealable?)
-       (list 0 (_"Deal another round"))))
+       (list 0 (G_"Deal another round"))))
 
 (define (get-hint)
   (or (check-to-foundations 1)
diff --git a/games/camelot.scm b/games/camelot.scm
index 0b8c3d3e..ef6ad131 100644
--- a/games/camelot.scm
+++ b/games/camelot.scm
@@ -74,7 +74,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " "
+  (string-append (G_"Stock left:") " "
                 (number->string (length (get-cards 16)))))
 
 (define (button-pressed slot-id card-list)
@@ -165,10 +165,10 @@
        (empty-slot? 10)))
 
 (define (hint-remove-ten suit)
-  (cond ((eq? suit club) (_"Remove the ten of clubs."))
-        ((eq? suit diamond) (_"Remove the ten of diamonds."))
-        ((eq? suit heart) (_"Remove the ten of hearts."))
-        ((eq? suit spade) (_"Remove the ten of spades."))))
+  (cond ((eq? suit club) (G_"Remove the ten of clubs."))
+        ((eq? suit diamond) (G_"Remove the ten of diamonds."))
+        ((eq? suit heart) (G_"Remove the ten of hearts."))
+        ((eq? suit spade) (G_"Remove the ten of spades."))))
 
 (define (find-match slot1 slot2)
   (cond ((= slot2 16) (find-match (+ 1 slot1) 0))
@@ -206,7 +206,7 @@
          (and (not (empty-slot? 17))
               (hint-move 17 1 (placeable? (get-top-card 17))))
          (find-match 0 0))
-      (list 0 (_"Deal a new card from the deck"))))
+      (list 0 (G_"Deal a new card from the deck"))))
 
 (define (get-options) #f)
 
diff --git a/games/canfield.scm b/games/canfield.scm
index a188bdd5..b7454b05 100644
--- a/games/canfield.scm
+++ b/games/canfield.scm
@@ -66,25 +66,25 @@
                                        (get-base-string))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " "
+  (string-append (G_"Stock left:") " "
                 (number->string (length (get-cards 0)))))
 
 (define (get-reserve-no-string)
-  (string-append (_"Reserve left:") " "
+  (string-append (G_"Reserve left:") " "
                 (number->string (length (get-cards 6)))))
 
 (define (get-base-string)
   (cond ((and (> BASE-VAL 1)
              (< BASE-VAL 11))
-        (string-append (_"Base Card: ") (number->string BASE-VAL)))
+        (string-append (G_"Base Card: ") (number->string BASE-VAL)))
        ((= BASE-VAL 1)
-        (_"Base Card: Ace"))
+        (G_"Base Card: Ace"))
        ((= BASE-VAL 11)
-        (_"Base Card: Jack"))
+        (G_"Base Card: Jack"))
        ((= BASE-VAL 12)
-        (_"Base Card: Queen"))
+        (G_"Base Card: Queen"))
        ((= BASE-VAL 13)
-        (_"Base Card: King"))
+        (G_"Base Card: King"))
        (#t "")))
 
 (define (button-pressed slot-id card-list)
@@ -225,8 +225,8 @@
 
 (define (deal-possible?)
   (if (not (empty-slot? 0))
-      (list 0 (_"Deal a new card from the deck"))
-      (list 0 (_"Move waste back to stock"))))
+      (list 0 (G_"Deal a new card from the deck"))
+      (list 0 (G_"Move waste back to stock"))))
 
 (define (move-up? from-slot card slot)
   (or (if (empty-slot? slot)
@@ -300,7 +300,7 @@
       (to-tableau? '(6 1))
       (move-column? '(7 8 9 10))
       (deal-possible?)
-      (list 0 (_"Try rearranging the cards"))))
+      (list 0 (G_"Try rearranging the cards"))))
 
 (define (get-options) #f)
 
diff --git a/games/card-monkey.scm b/games/card-monkey.scm
index cc96ea33..d1161b85 100755
--- a/games/card-monkey.scm
+++ b/games/card-monkey.scm
@@ -140,8 +140,8 @@
     '())
 
 
-(define-public (_ x)
-    (assert (string? x) "_ called on a non-string")
+(define-public (G_ x)
+    (assert (string? x) "G_ called on a non-string")
     x)
 
 
diff --git a/games/carpet.scm b/games/carpet.scm
index 35197128..004a40eb 100644
--- a/games/carpet.scm
+++ b/games/carpet.scm
@@ -100,7 +100,7 @@
   (set-statusbar-message (string-append (get-stock-no-string))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -170,7 +170,7 @@
 
 (define (hint-flip-stock)
   (and (not (empty-slot? stock))
-       (list 0 (_"Deal a new card from the deck"))))
+       (list 0 (G_"Deal a new card from the deck"))))
 
 (define (get-hint)
   (or (hint-tableau-to-foundation 6)
diff --git a/games/chessboard.scm b/games/chessboard.scm
index e3c874fe..1c5e05f6 100644
--- a/games/chessboard.scm
+++ b/games/chessboard.scm
@@ -89,15 +89,15 @@
 (define (get-base-string)
   (cond ((and (> BASE-VAL 1)
              (< BASE-VAL 11))
-        (string-append (_"Base Card: ") (number->string BASE-VAL)))
+        (string-append (G_"Base Card: ") (number->string BASE-VAL)))
        ((= BASE-VAL 1)
-        (_"Base Card: Ace"))
+        (G_"Base Card: Ace"))
        ((= BASE-VAL 11)
-        (_"Base Card: Jack"))
+        (G_"Base Card: Jack"))
        ((= BASE-VAL 12)
-        (_"Base Card: Queen"))
+        (G_"Base Card: Queen"))
        ((= BASE-VAL 13)
-        (_"Base Card: King"))
+        (G_"Base Card: King"))
        (#t "")))
 
 (define (button-pressed slot-id card-list)
@@ -195,7 +195,7 @@
   (cond ((= slot 14)
         #f)
        ((not base-set?)
-        (list 0 (_"Move a card to the Foundation")))
+        (list 0 (G_"Move a card to the Foundation")))
        ((or (empty-slot? slot)
             (= slot 3)
             (= slot 6)
@@ -257,7 +257,7 @@
           (empty-slot? 10)
           (empty-slot? 11)
           (empty-slot? 13))
-       (list 0 (_"Move something into the empty Tableau slot"))))
+       (list 0 (G_"Move something into the empty Tableau slot"))))
 
 (define (get-hint)
   (or (to-foundations? 0 3)
diff --git a/games/clock.scm b/games/clock.scm
index f5a1a068..e32aaf7d 100644
--- a/games/clock.scm
+++ b/games/clock.scm
@@ -170,29 +170,29 @@
        (nth-item 
         (list
                ; Translators: This is one of the sentences that are used when the user wants to get a hint. 
Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute 
anything you like here; you don't have to translate the original sentence!
-               (_"Just because a crosswalk looks like a hopscotch board doesn't mean it is one")
+               (G_"Just because a crosswalk looks like a hopscotch board doesn't mean it is one")
                ; Translators: This is one of the sentences that are used when the user wants to get a hint. 
Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute 
anything you like here; you don't have to translate the original sentence!
-              (_"Look both ways before you cross the street")
+              (G_"Look both ways before you cross the street")
                ; Translators: This is one of the sentences that are used when the user wants to get a hint. 
Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute 
anything you like here; you don't have to translate the original sentence!
-              (_"Have you read the help file?")
+              (G_"Have you read the help file?")
                ; Translators: This is one of the sentences that are used when the user wants to get a hint. 
Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute 
anything you like here; you don't have to translate the original sentence!
-              (_"Odessa is a better game.  Really.")
+              (G_"Odessa is a better game.  Really.")
                ; Translators: This is one of the sentences that are used when the user wants to get a hint. 
Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute 
anything you like here; you don't have to translate the original sentence!
-              (_"Tourniquets are not recommended unless in the direst emergency")
+              (G_"Tourniquets are not recommended unless in the direst emergency")
                ; Translators: This is one of the sentences that are used when the user wants to get a hint. 
Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute 
anything you like here; you don't have to translate the original sentence!
-              (_"I could sure use a backrub right about now...")
+              (G_"I could sure use a backrub right about now...")
                ; Translators: This is one of the sentences that are used when the user wants to get a hint. 
Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute 
anything you like here; you don't have to translate the original sentence!
-              (_"Monitors won't give you Vitamin D -- but sunlight will...")
+              (G_"Monitors won't give you Vitamin D -- but sunlight will...")
                ; Translators: This is one of the sentences that are used when the user wants to get a hint. 
Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute 
anything you like here; you don't have to translate the original sentence!
-              (_"If you're ever lost and alone in the woods, hug a tree")
+              (G_"If you're ever lost and alone in the woods, hug a tree")
                ; Translators: This is one of the sentences that are used when the user wants to get a hint. 
Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute 
anything you like here; you don't have to translate the original sentence!
-              (_"Fishing wire makes bad dental floss")
+              (G_"Fishing wire makes bad dental floss")
                ; Translators: This is one of the sentences that are used when the user wants to get a hint. 
Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute 
anything you like here; you don't have to translate the original sentence!
-              (_"Consistency is key")
+              (G_"Consistency is key")
                ; Translators: This is one of the sentences that are used when the user wants to get a hint. 
Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute 
anything you like here; you don't have to translate the original sentence!
-              (_"When without a stapler, a staple and a ruler will work")
+              (G_"When without a stapler, a staple and a ruler will work")
                ; Translators: This is one of the sentences that are used when the user wants to get a hint. 
Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute 
anything you like here; you don't have to translate the original sentence!
-              (_"Never blow in a dog's ear"))
+              (G_"Never blow in a dog's ear"))
         (aisleriot-random 12))))
 
 (define (get-options) #f)
diff --git a/games/cover.scm b/games/cover.scm
index b8090db9..2acbc10b 100644
--- a/games/cover.scm
+++ b/games/cover.scm
@@ -39,7 +39,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " "
+  (string-append (G_"Stock left:") " "
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
diff --git a/games/cruel.scm b/games/cruel.scm
index 7a9f5bb3..9e4876d5 100644
--- a/games/cruel.scm
+++ b/games/cruel.scm
@@ -154,7 +154,7 @@
 
 (define (give-status)
   (set-statusbar-message (format #f 
-                                 (_"Cards remaining: ~a") 
+                                 (G_"Cards remaining: ~a") 
                                 (number->string (- 48 (get-score)))))
                          
 )
@@ -197,7 +197,7 @@
 
 (define (get-hint)
   (or (check-moves from-list to-list)
-      (list 0 (_"Redeal."))
+      (list 0 (G_"Redeal."))
   )
 )
 
diff --git a/games/doublets.scm b/games/doublets.scm
index 25f67230..ad1cb812 100644
--- a/games/doublets.scm
+++ b/games/doublets.scm
@@ -64,11 +64,11 @@
                                        (get-redeals-string))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " "
+  (string-append (G_"Stock left:") " "
                 (number->string (length (get-cards 0)))))
 
 (define (get-redeals-string)
-  (string-append (_"Redeals left:") " "
+  (string-append (G_"Redeals left:") " "
                 (number->string (- 2 FLIP-COUNTER))))
 
 (define (check-kings slot-list)
@@ -154,20 +154,20 @@
   (= 48 (length (get-cards 8))))
 
 (define (get-value-hint value)
-  (cond ((eq? value ace) (_"You are searching for an ace."))
-        ((eq? value 2) (_"You are searching for a two."))
-        ((eq? value 3) (_"You are searching for a three."))
-        ((eq? value 4) (_"You are searching for a four."))
-        ((eq? value 5) (_"You are searching for a five."))
-        ((eq? value 6) (_"You are searching for a six."))
-        ((eq? value 7) (_"You are searching for a seven."))
-        ((eq? value 8) (_"You are searching for an eight."))
-        ((eq? value 9) (_"You are searching for a nine."))
-        ((eq? value 10) (_"You are searching for a ten."))
-        ((eq? value jack) (_"You are searching for a jack."))
-        ((eq? value queen) (_"You are searching for a queen."))
-        ((eq? value king) (_"You are searching for a king."))
-        (#t (_"Unknown value"))))
+  (cond ((eq? value ace) (G_"You are searching for an ace."))
+        ((eq? value 2) (G_"You are searching for a two."))
+        ((eq? value 3) (G_"You are searching for a three."))
+        ((eq? value 4) (G_"You are searching for a four."))
+        ((eq? value 5) (G_"You are searching for a five."))
+        ((eq? value 6) (G_"You are searching for a six."))
+        ((eq? value 7) (G_"You are searching for a seven."))
+        ((eq? value 8) (G_"You are searching for an eight."))
+        ((eq? value 9) (G_"You are searching for a nine."))
+        ((eq? value 10) (G_"You are searching for a ten."))
+        ((eq? value jack) (G_"You are searching for a jack."))
+        ((eq? value queen) (G_"You are searching for a queen."))
+        ((eq? value king) (G_"You are searching for a king."))
+        (#t (G_"Unknown value"))))
 
 (define (get-hint)
   (let ((wanted (modulo (* 2 (get-value (get-top-card 8))) 
diff --git a/games/eagle-wing.scm b/games/eagle-wing.scm
index fc84e54b..50475ae1 100644
--- a/games/eagle-wing.scm
+++ b/games/eagle-wing.scm
@@ -89,29 +89,29 @@
                                        (get-redeals-string))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " "
+  (string-append (G_"Stock left:") " "
                 (number->string (length (get-cards 0)))))
 
 (define (get-reserve-no-string)
-  (string-append (_"Reserve left:") " "
+  (string-append (G_"Reserve left:") " "
                 (number->string (length (get-cards 10)))))
 
 (define (get-base-string)
   (cond ((and (> BASE-VAL 1)
              (< BASE-VAL 11))
-        (string-append (_"Base Card: ") (number->string BASE-VAL)))
+        (string-append (G_"Base Card: ") (number->string BASE-VAL)))
        ((= BASE-VAL 1)
-        (_"Base Card: Ace"))
+        (G_"Base Card: Ace"))
        ((= BASE-VAL 11)
-        (_"Base Card: Jack"))
+        (G_"Base Card: Jack"))
        ((= BASE-VAL 12)
-        (_"Base Card: Queen"))
+        (G_"Base Card: Queen"))
        ((= BASE-VAL 13)
-        (_"Base Card: King"))
+        (G_"Base Card: King"))
        (#t "")))
 
 (define (get-redeals-string)
-  (string-append (_"Redeals left:") " "
+  (string-append (G_"Redeals left:") " "
                 (number->string (- 2 FLIP-COUNTER))))
 
 (define (button-pressed slot-id card-list)
@@ -329,10 +329,10 @@
 
 (define (dealable?)
   (if (not (empty-slot? 0))
-      (list 0 (_"Deal a card"))
+      (list 0 (G_"Deal a card"))
       (if (and (not (empty-slot? 1))
               (< FLIP-COUNTER 2))
-         (list 0 (_"Move waste back to stock"))
+         (list 0 (G_"Move waste back to stock"))
          #f)))
 
 (define (get-hint)
diff --git a/games/easthaven.scm b/games/easthaven.scm
index cd14ef60..3b59c0e3 100644
--- a/games/easthaven.scm
+++ b/games/easthaven.scm
@@ -53,7 +53,7 @@
   (set-statusbar-message (string-append (get-stock-no-string))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " "
+  (string-append (G_"Stock left:") " "
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -224,19 +224,19 @@
         #f)
        ((and (empty-slot? slot)
              (kings-avail 5))
-        (list 0 (_"Move a king onto an empty tableau slot.")))
+        (list 0 (G_"Move a king onto an empty tableau slot.")))
        (#t (fill-empties (+ 1 slot)))))
 
 (define (dealable?)
   (and (not (empty-slot? 0))
-       (list 0 (_"Deal more cards"))))
+       (list 0 (G_"Deal more cards"))))
 
 (define (get-hint)
   (or (to-foundations? 5 1)
       (check-tableau 5 6)
       (fill-empties 5)
       (dealable?)
-      (list 0 (_"No hint available right now"))))
+      (list 0 (G_"No hint available right now"))))
 
 (define (get-options) 
   #f)
diff --git a/games/eight-off.scm b/games/eight-off.scm
index 203c1646..baa51688 100644
--- a/games/eight-off.scm
+++ b/games/eight-off.scm
@@ -245,7 +245,7 @@
 
 (define (check-for-empty-reserve)
   (and (> free-reserves 0)
-       (list 0 (_"Move something on to an empty reserve"))))
+       (list 0 (G_"Move something on to an empty reserve"))))
 
 (define (get-hint)
   (or (check-to-foundations? 4 0)
diff --git a/games/elevator.scm b/games/elevator.scm
index 38c9911b..710d521e 100644
--- a/games/elevator.scm
+++ b/games/elevator.scm
@@ -95,7 +95,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " "
+  (string-append (G_"Stock left:") " "
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -360,7 +360,7 @@
 
 (define (dealable?)
   (if (not (empty-slot? 0))
-      (list 0 (_"Deal a card"))
+      (list 0 (G_"Deal a card"))
       #f))
 
 (define (get-hint)
diff --git a/games/eliminator.scm b/games/eliminator.scm
index d503edf2..008b3468 100644
--- a/games/eliminator.scm
+++ b/games/eliminator.scm
@@ -171,9 +171,9 @@
 ; Options
 (define (get-options)
        (list 'begin-exclusive 
-               (list (_"Six Foundations")  (= found-amt 6))
-               (list (_"Five Foundations") (= found-amt 5))
-               (list (_"Four Foundations") (= found-amt 4))
+               (list (G_"Six Foundations")  (= found-amt 6))
+               (list (G_"Five Foundations") (= found-amt 5))
+               (list (G_"Four Foundations") (= found-amt 4))
        'end-exclusive)
 )
 (define (apply-options options)
@@ -191,8 +191,8 @@
                (if (list? x)
                        (hint-move (car x) 1 (cadr x))
                        (if x
-                               (list 0 (_"Play a card to foundation."))
-                               (list 0 (_"No moves."))
+                               (list 0 (G_"Play a card to foundation."))
+                               (list 0 (G_"No moves."))
                        )
                )
        )
diff --git a/games/escalator.scm b/games/escalator.scm
index 4c4779a8..59c9bd86 100644
--- a/games/escalator.scm
+++ b/games/escalator.scm
@@ -120,7 +120,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " "
+  (string-append (G_"Stock left:") " "
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -219,7 +219,7 @@
 
 (define (dealable?)
   (and (not (empty-slot? 0))
-       (list 0 (_"Deal a card"))))
+       (list 0 (G_"Deal a card"))))
 
 (define (get-hint)
   (or (playable? 2)
diff --git a/games/first-law.scm b/games/first-law.scm
index 905437e5..21dd5951 100644
--- a/games/first-law.scm
+++ b/games/first-law.scm
@@ -39,7 +39,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " "
+  (string-append (G_"Stock left:") " "
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -124,7 +124,7 @@
 
 (define (dealable?)
   (and (not (empty-slot? 0))
-       (list 0 (_"Deal another round"))))
+       (list 0 (G_"Deal another round"))))
 
 (define (removable?)
   (and (not (empty-slot? 1))
@@ -136,33 +136,33 @@
          (get-value (get-top-card 3))
          (get-value (get-top-card 4)))
        (list 0 (cond ((= (get-value (get-top-card 1)) 1)
-                      (_"Remove the aces"))
+                      (G_"Remove the aces"))
                      ((= (get-value (get-top-card 1)) 2)
-                      (_"Remove the twos"))
+                      (G_"Remove the twos"))
                      ((= (get-value (get-top-card 1)) 3)
-                      (_"Remove the threes"))
+                      (G_"Remove the threes"))
                      ((= (get-value (get-top-card 1)) 4)
-                      (_"Remove the fours"))
+                      (G_"Remove the fours"))
                      ((= (get-value (get-top-card 1)) 5)
-                      (_"Remove the fives"))
+                      (G_"Remove the fives"))
                      ((= (get-value (get-top-card 1)) 6)
-                      (_"Remove the sixes"))
+                      (G_"Remove the sixes"))
                      ((= (get-value (get-top-card 1)) 7)
-                      (_"Remove the sevens"))
+                      (G_"Remove the sevens"))
                      ((= (get-value (get-top-card 1)) 8)
-                      (_"Remove the eights"))
+                      (G_"Remove the eights"))
                      ((= (get-value (get-top-card 1)) 9)
-                      (_"Remove the nines"))
+                      (G_"Remove the nines"))
                      ((= (get-value (get-top-card 1)) 10)
-                      (_"Remove the tens"))
+                      (G_"Remove the tens"))
                      ((= (get-value (get-top-card 1)) 11)
-                      (_"Remove the jacks"))
+                      (G_"Remove the jacks"))
                      ((= (get-value (get-top-card 1)) 12)
-                      (_"Remove the queens"))
+                      (G_"Remove the queens"))
                      ((= (get-value (get-top-card 1)) 13)
-                      (_"Remove the kings"))
+                      (G_"Remove the kings"))
                      (#t
-                      (_"I'm not sure"))))))
+                      (G_"I'm not sure"))))))
 
 (define (move-leftable? slot1 slot2)
   (cond ((= slot1 4)
@@ -181,7 +181,7 @@
   (or (removable?)
       (move-leftable? 1 2)
       (dealable?)
-      (list 0 (_"Return cards to stock"))))
+      (list 0 (G_"Return cards to stock"))))
 
 (define (get-options) 
   #f)
diff --git a/games/fortress.scm b/games/fortress.scm
index 366cc8c8..c1d4d23e 100644
--- a/games/fortress.scm
+++ b/games/fortress.scm
@@ -209,7 +209,7 @@
           (empty-slot? 10)
           (empty-slot? 11)
           (empty-slot? 13))
-       (list 0 (_"Move something onto an empty tableau slot."))))
+       (list 0 (G_"Move something onto an empty tableau slot."))))
 
 (define (get-hint)
   (or (to-foundations? 0 3)
diff --git a/games/fortunes.scm b/games/fortunes.scm
index fa4eb33b..33a103e9 100644
--- a/games/fortunes.scm
+++ b/games/fortunes.scm
@@ -40,7 +40,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " "
+  (string-append (G_"Stock left:") " "
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -151,10 +151,10 @@
                        (> (length (get-cards 3)) 1))
                   (and (not (empty-slot? 4))
                        (> (length (get-cards 4)) 1))))
-         (list 0 (_"Consider moving something into an empty slot"))
+         (list 0 (G_"Consider moving something into an empty slot"))
          #f)
       (if (not (empty-slot? 0))
-         (list 0 (_"Deal another round"))
+         (list 0 (G_"Deal another round"))
          #f)))
 
 (define (get-options) #f)
diff --git a/games/forty-thieves.scm b/games/forty-thieves.scm
index 46c3668b..5a9f0228 100644
--- a/games/forty-thieves.scm
+++ b/games/forty-thieves.scm
@@ -94,7 +94,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))
   )
 )
@@ -354,7 +354,7 @@
 ;this is the last-straw hint maker
 (define (check-for-deal)
   (if (not (empty-slot? stock-pile)) 
-        (list 0 (_"Deal a card from stock"))
+        (list 0 (G_"Deal a card from stock"))
         #f
   )
 )
diff --git a/games/freecell.scm b/games/freecell.scm
index 3b15143b..614ffcf0 100644
--- a/games/freecell.scm
+++ b/games/freecell.scm
@@ -622,13 +622,13 @@
 ; move format: ((board . info) start-slot card card-count end-slot)
 (define (create-help-list board moves)
   (if (null? moves)
-    (list 0 (_"No moves are possible. Undo or start again."))
+    (list 0 (G_"No moves are possible. Undo or start again."))
     (let* ((best-move (car moves))
           (from-card (caddr best-move))
           (to-slot   (list-ref best-move 4))
           (to-stack  (vector-ref board to-slot)))
       (if (eq? (vector-ref (cdar best-move) index-outcome) outcome-lose)
-       (list 0 (_"The game has no solution. Undo or start again."))
+       (list 0 (G_"The game has no solution. Undo or start again."))
        (hint-move (find-card-slot from-card) (find-card (find-card-slot from-card) from-card)
              (cond ((freecell? to-slot) (find-empty-slot freecells))
                    ((homecell? to-slot)
diff --git a/games/gaps.scm b/games/gaps.scm
index 3141b517..109c7c81 100644
--- a/games/gaps.scm
+++ b/games/gaps.scm
@@ -103,7 +103,7 @@
 )
 
 (define (give-status-message)
-  (set-statusbar-message (string-append (_"Redeals left:") " "
+  (set-statusbar-message (string-append (G_"Redeals left:") " "
                                         (number->string (- 2 FLIP-COUNTER))
                          )
   )
@@ -277,13 +277,13 @@
 
 (define (get-hint)
   (if (redeal-needed? 0 0)
-      (list 0 (_"Double click any card to redeal."))
+      (list 0 (G_"Double click any card to redeal."))
       (or (add-to-sequence? 0)
           (playable-gap? (vector-ref rows 0))
           (playable-gap? (vector-ref rows 1))
           (playable-gap? (vector-ref rows 2))
           (playable-gap? (vector-ref rows 3))
-          (list 0 (_"No hint available."))
+          (list 0 (G_"No hint available."))
       )
   )
 )
@@ -292,11 +292,11 @@
   (if (empty-slot? (car (vector-ref rows row)))
       (if (= 0 (modulo (car (vector-ref rows row)) 13))
           (list 0 (format #f
-                          (_"Place a two in the leftmost slot of row ~a.")
+                          (G_"Place a two in the leftmost slot of row ~a.")
                          (number->string (+ row 1))))
           (if (not (= 12 (modulo (car (vector-ref rows row)) 13)))
              (list 0 (format #f
-                              (_"Add to the sequence in row ~a.")
+                              (G_"Add to the sequence in row ~a.")
                              (number->string (+ row 1))))
              (if (< row 3)
                  (add-to-sequence? (+ row 1))
@@ -308,60 +308,60 @@
 (define (hint-move-card card)
   (let ((value (get-value card)) (suit (get-suit card)))
      (cond ((eq? suit club) 
-            (cond ((eq? value ace) (_"Place the two of clubs next to the ace of clubs."))
-                  ((eq? value 2) (_"Place the three of clubs next to the two of clubs."))
-                  ((eq? value 3) (_"Place the four of clubs next to the three of clubs."))
-                  ((eq? value 4) (_"Place the five of clubs next to the four of clubs."))
-                  ((eq? value 5) (_"Place the six of clubs next to the five of clubs."))
-                  ((eq? value 6) (_"Place the seven of clubs next to the six of clubs."))
-                  ((eq? value 7) (_"Place the eight of clubs next to the seven of clubs."))
-                  ((eq? value 8) (_"Place the nine of clubs next to the eight of clubs."))
-                  ((eq? value 9) (_"Place the ten of clubs next to the nine of clubs."))
-                  ((eq? value 10) (_"Place the jack of clubs next to the ten of clubs."))
-                  ((eq? value jack) (_"Place the queen of clubs next to the jack of clubs."))
-                  ((eq? value queen) (_"Place the king of clubs next to the queen of clubs."))
+            (cond ((eq? value ace) (G_"Place the two of clubs next to the ace of clubs."))
+                  ((eq? value 2) (G_"Place the three of clubs next to the two of clubs."))
+                  ((eq? value 3) (G_"Place the four of clubs next to the three of clubs."))
+                  ((eq? value 4) (G_"Place the five of clubs next to the four of clubs."))
+                  ((eq? value 5) (G_"Place the six of clubs next to the five of clubs."))
+                  ((eq? value 6) (G_"Place the seven of clubs next to the six of clubs."))
+                  ((eq? value 7) (G_"Place the eight of clubs next to the seven of clubs."))
+                  ((eq? value 8) (G_"Place the nine of clubs next to the eight of clubs."))
+                  ((eq? value 9) (G_"Place the ten of clubs next to the nine of clubs."))
+                  ((eq? value 10) (G_"Place the jack of clubs next to the ten of clubs."))
+                  ((eq? value jack) (G_"Place the queen of clubs next to the jack of clubs."))
+                  ((eq? value queen) (G_"Place the king of clubs next to the queen of clubs."))
                   (#t "ERROR")))
            ((eq? suit spade) 
-            (cond ((eq? value ace) (_"Place the two of spades next to the ace of spades."))
-                  ((eq? value 2) (_"Place the three of spades next to the two of spades."))
-                  ((eq? value 3) (_"Place the four of spades next to the three of spades."))
-                  ((eq? value 4) (_"Place the five of spades next to the four of spades."))
-                  ((eq? value 5) (_"Place the six of spades next to the five of spades."))
-                  ((eq? value 6) (_"Place the seven of spades next to the six of spades."))
-                  ((eq? value 7) (_"Place the eight of spades next to the seven of spades."))
-                  ((eq? value 8) (_"Place the nine of spades next to the eight of spades."))
-                  ((eq? value 9) (_"Place the ten of spades next to the nine of spades."))
-                  ((eq? value 10) (_"Place the jack of spades next to the ten of spades."))
-                  ((eq? value jack) (_"Place the queen of spades next to the jack of spades."))
-                  ((eq? value queen) (_"Place the king of spades next to the queen of spades."))
+            (cond ((eq? value ace) (G_"Place the two of spades next to the ace of spades."))
+                  ((eq? value 2) (G_"Place the three of spades next to the two of spades."))
+                  ((eq? value 3) (G_"Place the four of spades next to the three of spades."))
+                  ((eq? value 4) (G_"Place the five of spades next to the four of spades."))
+                  ((eq? value 5) (G_"Place the six of spades next to the five of spades."))
+                  ((eq? value 6) (G_"Place the seven of spades next to the six of spades."))
+                  ((eq? value 7) (G_"Place the eight of spades next to the seven of spades."))
+                  ((eq? value 8) (G_"Place the nine of spades next to the eight of spades."))
+                  ((eq? value 9) (G_"Place the ten of spades next to the nine of spades."))
+                  ((eq? value 10) (G_"Place the jack of spades next to the ten of spades."))
+                  ((eq? value jack) (G_"Place the queen of spades next to the jack of spades."))
+                  ((eq? value queen) (G_"Place the king of spades next to the queen of spades."))
                   (#t "ERROR")))
            ((eq? suit heart) 
-            (cond ((eq? value ace) (_"Place the two of hearts next to the ace of hearts."))
-                  ((eq? value 2) (_"Place the three of hearts next to the two of hearts."))
-                  ((eq? value 3) (_"Place the four of hearts next to the three of hearts."))
-                  ((eq? value 4) (_"Place the five of hearts next to the four of hearts."))
-                  ((eq? value 5) (_"Place the six of hearts next to the five of hearts."))
-                  ((eq? value 6) (_"Place the seven of hearts next to the six of hearts."))
-                  ((eq? value 7) (_"Place the eight of hearts next to the seven of hearts."))
-                  ((eq? value 8) (_"Place the nine of hearts next to the eight of hearts."))
-                  ((eq? value 9) (_"Place the ten of hearts next to the nine of hearts."))
-                  ((eq? value 10) (_"Place the jack of hearts next to the ten of hearts."))
-                  ((eq? value jack) (_"Place the queen of hearts next to the jack of hearts."))
-                  ((eq? value queen) (_"Place the king of hearts next to the queen of hearts."))
+            (cond ((eq? value ace) (G_"Place the two of hearts next to the ace of hearts."))
+                  ((eq? value 2) (G_"Place the three of hearts next to the two of hearts."))
+                  ((eq? value 3) (G_"Place the four of hearts next to the three of hearts."))
+                  ((eq? value 4) (G_"Place the five of hearts next to the four of hearts."))
+                  ((eq? value 5) (G_"Place the six of hearts next to the five of hearts."))
+                  ((eq? value 6) (G_"Place the seven of hearts next to the six of hearts."))
+                  ((eq? value 7) (G_"Place the eight of hearts next to the seven of hearts."))
+                  ((eq? value 8) (G_"Place the nine of hearts next to the eight of hearts."))
+                  ((eq? value 9) (G_"Place the ten of hearts next to the nine of hearts."))
+                  ((eq? value 10) (G_"Place the jack of hearts next to the ten of hearts."))
+                  ((eq? value jack) (G_"Place the queen of hearts next to the jack of hearts."))
+                  ((eq? value queen) (G_"Place the king of hearts next to the queen of hearts."))
                   (#t "ERROR")))
            ((eq? suit diamond) 
-            (cond ((eq? value ace) (_"Place the two of diamonds next to the ace of diamonds."))
-                  ((eq? value 2) (_"Place the three of diamonds next to the two of diamonds."))
-                  ((eq? value 3) (_"Place the four of diamonds next to the three of diamonds."))
-                  ((eq? value 4) (_"Place the five of diamonds next to the four of diamonds."))
-                  ((eq? value 5) (_"Place the six of diamonds next to the five of diamonds."))
-                  ((eq? value 6) (_"Place the seven of diamonds next to the six of diamonds."))
-                  ((eq? value 7) (_"Place the eight of diamonds next to the seven of diamonds."))
-                  ((eq? value 8) (_"Place the nine of diamonds next to the eight of diamonds."))
-                  ((eq? value 9) (_"Place the ten of diamonds next to the nine of diamonds."))
-                  ((eq? value 10) (_"Place the jack of diamonds next to the ten of diamonds."))
-                  ((eq? value jack) (_"Place the queen of diamonds next to the jack of diamonds."))
-                  ((eq? value queen) (_"Place the king of diamonds next to the queen of diamonds."))
+            (cond ((eq? value ace) (G_"Place the two of diamonds next to the ace of diamonds."))
+                  ((eq? value 2) (G_"Place the three of diamonds next to the two of diamonds."))
+                  ((eq? value 3) (G_"Place the four of diamonds next to the three of diamonds."))
+                  ((eq? value 4) (G_"Place the five of diamonds next to the four of diamonds."))
+                  ((eq? value 5) (G_"Place the six of diamonds next to the five of diamonds."))
+                  ((eq? value 6) (G_"Place the seven of diamonds next to the six of diamonds."))
+                  ((eq? value 7) (G_"Place the eight of diamonds next to the seven of diamonds."))
+                  ((eq? value 8) (G_"Place the nine of diamonds next to the eight of diamonds."))
+                  ((eq? value 9) (G_"Place the ten of diamonds next to the nine of diamonds."))
+                  ((eq? value 10) (G_"Place the jack of diamonds next to the ten of diamonds."))
+                  ((eq? value jack) (G_"Place the queen of diamonds next to the jack of diamonds."))
+                  ((eq? value queen) (G_"Place the king of diamonds next to the queen of diamonds."))
                   (#t "ERROR")))
            (#t "ERROR"))))
 
@@ -380,7 +380,7 @@
 )
 
 (define (get-options)
-  (list (list (_"Randomly Placed Gaps on Redeal") random-gaps))
+  (list (list (G_"Randomly Placed Gaps on Redeal") random-gaps))
 )
 
 (define (apply-options options)
diff --git a/games/giant.scm b/games/giant.scm
index 263f4caa..b53db56c 100644
--- a/games/giant.scm
+++ b/games/giant.scm
@@ -73,7 +73,7 @@
 
 (define (get-stock-no-string)
   (format #f
-          (_"Deals left: ~a")
+          (G_"Deals left: ~a")
           (number->string (/ (length (get-cards stock-slot)) 8 ))
   )
 )
@@ -249,7 +249,7 @@
         (not (empty-slot? stock-slot ))
         (or allow-empty-slots
             (not (any-slot-empty? tableau))))
-      (list 0 (_"Deal a row"))
+      (list 0 (G_"Deal a row"))
       #f))
 
 
@@ -273,16 +273,16 @@
             (hint-move (car t-result1) 1 (cadr t-result1)))
            ( t-result2
             (hint-move (car t-result2) 1 (cadr t-result2)))
-           ( (empty-slot? reserve-slot) (list 0 (_"Try moving a card to the reserve")))
-           ( (dealable?) (list 0 (_"Try dealing a row of cards")))
+           ( (empty-slot? reserve-slot) (list 0 (G_"Try moving a card to the reserve")))
+           ( (dealable?) (list 0 (G_"Try dealing a row of cards")))
 ; this isn't great, but it will get around the premature end-of-game call
-           (else (list 0 (_"Try moving card piles around")))
+           (else (list 0 (G_"Try moving card piles around")))
      )))
 
 (define (get-options)
   (list 'begin-exclusive
-        (list (_"Same suit") same-suit)
-        (list (_"Alternating colors") (not same-suit))
+        (list (G_"Same suit") same-suit)
+        (list (G_"Alternating colors") (not same-suit))
         'end-exclusive))
 
 (define (apply-options options)
diff --git a/games/glenwood.scm b/games/glenwood.scm
index 22df145c..69c8aed6 100644
--- a/games/glenwood.scm
+++ b/games/glenwood.scm
@@ -72,25 +72,25 @@
                                        (get-base-string))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (get-redeals-string)
-  (string-append (_"Redeals left:") " "
+  (string-append (G_"Redeals left:") " "
                 (number->string (- 1 FLIP-COUNTER))))
 
 (define (get-base-string)
   (cond ((and (> BASE-VAL 1)
              (< BASE-VAL 11))
-        (string-append (_"Base Card: ") (number->string BASE-VAL)))
+        (string-append (G_"Base Card: ") (number->string BASE-VAL)))
        ((= BASE-VAL 1)
-        (_"Base Card: Ace"))
+        (G_"Base Card: Ace"))
        ((= BASE-VAL 11)
-        (_"Base Card: Jack"))
+        (G_"Base Card: Jack"))
        ((= BASE-VAL 12)
-        (_"Base Card: Queen"))
+        (G_"Base Card: Queen"))
        ((= BASE-VAL 13)
-        (_"Base Card: King"))
+        (G_"Base Card: King"))
        (#t "")))
 
 (define (button-pressed slot-id card-list)
@@ -250,15 +250,15 @@
 
 (define (dealable?)
   (if (not (empty-slot? 0))
-      (list 0 (_"Deal a new card from the deck"))
+      (list 0 (G_"Deal a new card from the deck"))
       (if (and (< FLIP-COUNTER 1)
               (not (empty-slot? 1)))
-         (list 0 (_"Move waste back to stock"))
+         (list 0 (G_"Move waste back to stock"))
          #f)))
 
 (define (base-not-set?)
   (and (empty-slot? 2)
-       (list 0 (_"Select a card from the reserve for first foundation pile"))))
+       (list 0 (G_"Select a card from the reserve for first foundation pile"))))
 
 (define (check-a-foundation slot-id foundation-id)
   (cond ((= foundation-id 6)
@@ -352,7 +352,7 @@
                 (not (empty-slot? 11))
                 (not (empty-slot? 12))
                 (not (empty-slot? 13)))
-            (list 0 (_"Move a card from the reserve onto the empty tableau slot")))
+            (list 0 (G_"Move a card from the reserve onto the empty tableau slot")))
            ((not (empty-slot? 1))
             (hint-move 1 1 (find-empty-slot tableau)))
            (#t #f))
diff --git a/games/golf.scm b/games/golf.scm
index a6c77d21..7c994cd3 100644
--- a/games/golf.scm
+++ b/games/golf.scm
@@ -64,7 +64,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (format #f (_"Stock left: ~a") (number->string (length (get-cards stock)))))
+  (format #f (G_"Stock left: ~a") (number->string (length (get-cards stock)))))
 
 (define (button-pressed slot-id card-list)
   (and (not (empty-slot? slot-id))
@@ -135,7 +135,7 @@
 
 (define (dealable?)
   (and (not (empty-slot? stock))
-       (list 0 (_"Deal another card"))))
+       (list 0 (G_"Deal another card"))))
 
 (define (get-hint)
   (or (check-slots (car tableau))
diff --git a/games/gypsy.scm b/games/gypsy.scm
index 8f5f7559..e0044ec4 100644
--- a/games/gypsy.scm
+++ b/games/gypsy.scm
@@ -62,7 +62,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -213,7 +213,7 @@
           (empty-slot? 14)
           (empty-slot? 15)
           (empty-slot? 16))
-      (list 0 (_"Move a card or build of cards on to the empty slot"))
+      (list 0 (G_"Move a card or build of cards on to the empty slot"))
       #f))
        
 
@@ -336,7 +336,7 @@
 
 (define (check-for-deal)
   (if (not (empty-slot? 0))
-      (list 0 (_"Deal another hand"))
+      (list 0 (G_"Deal another hand"))
       #f))
 
 (define (get-hint)
diff --git a/games/hamilton.scm b/games/hamilton.scm
index 6ee557c3..fd753a2c 100644
--- a/games/hamilton.scm
+++ b/games/hamilton.scm
@@ -79,29 +79,29 @@
                                         (get-start-value-string))))
 
 (define (get-value-name value)
-  (cond ((eq? value ace) (_"ace"))
-        ((eq? value 2) (_"two"))
-        ((eq? value 3) (_"three"))
-        ((eq? value 4) (_"four"))
-        ((eq? value 5) (_"five"))
-        ((eq? value 6) (_"six"))
-        ((eq? value 7) (_"seven"))
-        ((eq? value 8) (_"eight"))
-        ((eq? value 9) (_"nine"))
-        ((eq? value 10) (_"ten"))
-        ((eq? value jack) (_"jack"))
-        ((eq? value queen) (_"queen"))
-        ((eq? value king) (_"king"))
-        (#t (_"Unknown value"))))
+  (cond ((eq? value ace) (G_"ace"))
+        ((eq? value 2) (G_"two"))
+        ((eq? value 3) (G_"three"))
+        ((eq? value 4) (G_"four"))
+        ((eq? value 5) (G_"five"))
+        ((eq? value 6) (G_"six"))
+        ((eq? value 7) (G_"seven"))
+        ((eq? value 8) (G_"eight"))
+        ((eq? value 9) (G_"nine"))
+        ((eq? value 10) (G_"ten"))
+        ((eq? value jack) (G_"jack"))
+        ((eq? value queen) (G_"queen"))
+        ((eq? value king) (G_"king"))
+        (#t (G_"Unknown value"))))
 
 (define (get-start-value-string)
   (if
     (> start-value 0)
-    (string-append (_"Start card:") " " (get-value-name start-value))
-    (string-append (_"Choices left:") " " (number->string choices))))
+    (string-append (G_"Start card:") " " (get-value-name start-value))
+    (string-append (G_"Choices left:") " " (number->string choices))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " "
+  (string-append (G_"Stock left:") " "
                  (number->string (length (get-cards 0)))))
 
 ;; Interactions
@@ -274,7 +274,7 @@
   (and
     (= start-value 0)
     (if (= choices 3)
-        (hint-click chooser (_"Turn over the top card of the stock."))
+        (hint-click chooser (G_"Turn over the top card of the stock."))
         (hint-move chooser 1 (car foundation)))))
 
 (define (valid-move? start end)
@@ -321,15 +321,15 @@
     ; Empty slot?
     (and
       (or-map empty-slot? tableau)
-      (list 0 (_"Fill an empty slot.")))
+      (list 0 (G_"Fill an empty slot.")))
     ; Colour matches are the last resort...
     (or-map maybe-hint t-t-pairs)
     ; ... apart from dealing, of course.
     (and
       (not (empty-slot? stock))
-      (hint-click stock (_"Deal a new round.")))
+      (hint-click stock (G_"Deal a new round.")))
     ; If all else fails.
-    (list 0 (_"Try moving cards down from the foundations."))))
+    (list 0 (G_"Try moving cards down from the foundations."))))
 
 (define (game-won) (= (get-score) 52))
 
diff --git a/games/helsinki.scm b/games/helsinki.scm
index 159f766e..8811107f 100644
--- a/games/helsinki.scm
+++ b/games/helsinki.scm
@@ -50,7 +50,7 @@
   (set-statusbar-message (string-append (get-stock-no-string))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -106,10 +106,10 @@
        (empty-slot? 10)))
 
 (define (hint-remove-king suit)
-  (cond ((eq? suit club) (_"Remove the king of clubs."))
-        ((eq? suit diamond) (_"Remove the king of diamonds."))
-        ((eq? suit heart) (_"Remove the king of hearts."))
-        ((eq? suit spade) (_"Remove the king of spades."))))
+  (cond ((eq? suit club) (G_"Remove the king of clubs."))
+        ((eq? suit diamond) (G_"Remove the king of diamonds."))
+        ((eq? suit heart) (G_"Remove the king of hearts."))
+        ((eq? suit spade) (G_"Remove the king of spades."))))
 
 (define (check-for-moves slot1 slot2)
   (cond ((= slot1 11)
diff --git a/games/hopscotch.scm b/games/hopscotch.scm
index 31d6332d..1281b47f 100644
--- a/games/hopscotch.scm
+++ b/games/hopscotch.scm
@@ -52,7 +52,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -123,11 +123,11 @@
         #f)
        ((check-to-foundation 1 2)
         (check-to-foundation 1 2))
-       (#t (list 0 (_"Move card from waste")))))
+       (#t (list 0 (G_"Move card from waste")))))
 
 (define (dealable?)
   (and (not (empty-slot? 0))
-       (list 0 (_"Deal another card"))))
+       (list 0 (G_"Deal another card"))))
 
 (define (get-hint)
   (or (check-to-foundation 6 2)
diff --git a/games/jamestown.scm b/games/jamestown.scm
index a7321623..c0676b76 100644
--- a/games/jamestown.scm
+++ b/games/jamestown.scm
@@ -51,7 +51,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
diff --git a/games/jumbo.scm b/games/jumbo.scm
index 08b54f35..bcda4c58 100644
--- a/games/jumbo.scm
+++ b/games/jumbo.scm
@@ -65,11 +65,11 @@
                                        (get-redeals-string))))
 
 (define (get-redeals-string)
-  (string-append (_"Redeals left:") " "
+  (string-append (G_"Redeals left:") " "
                 (number->string (- 1 FLIP-COUNTER))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -295,10 +295,10 @@
 
 (define (dealable?)
   (or (and (not (empty-slot? 0))
-          (list 0 (_"Deal another card")))
+          (list 0 (G_"Deal another card")))
       (and (not (empty-slot? 1))
           (< FLIP-COUNTER 1)
-          (list 0 (_"Move waste to stock")))))
+          (list 0 (G_"Move waste to stock")))))
 
 (define (get-min-happy-foundation fslot value)
   (cond ((= fslot 10)
@@ -330,7 +330,7 @@
       (check-foundation-for-waste 2)
       (dealable?)
       (check-to-foundations 1 2)
-      (list 0 (_"Try rearranging the cards"))))
+      (list 0 (G_"Try rearranging the cards"))))
 
 (define (get-options) 
   #f)
diff --git a/games/kansas.scm b/games/kansas.scm
index 00369271..2bdbfa11 100644
--- a/games/kansas.scm
+++ b/games/kansas.scm
@@ -73,25 +73,25 @@
                                        (get-base-string))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (get-reserve-no-string)
-  (string-append (_"Reserve left:") " " 
+  (string-append (G_"Reserve left:") " " 
                 (number->string (length (get-cards 6)))))
 
 (define (get-base-string)
   (cond ((and (> BASE-VAL 1)
              (< BASE-VAL 11))
-        (string-append (_"Base Card: ") (number->string BASE-VAL)))
+        (string-append (G_"Base Card: ") (number->string BASE-VAL)))
        ((= BASE-VAL 1)
-        (_"Base Card: Ace"))
+        (G_"Base Card: Ace"))
        ((= BASE-VAL 11)
-        (_"Base Card: Jack"))
+        (G_"Base Card: Jack"))
        ((= BASE-VAL 12)
-        (_"Base Card: Queen"))
+        (G_"Base Card: Queen"))
        ((= BASE-VAL 13)
-        (_"Base Card: King"))
+        (G_"Base Card: King"))
        (#t "")))
 
 (define (button-pressed slot-id card-list)
@@ -216,7 +216,7 @@
 
 (define (dealable?)
   (and (not (empty-slot? 0))
-       (list 0 (_"Deal another card"))))
+       (list 0 (G_"Deal another card"))))
 
 (define (check-a-foundation card foundation-slot)
   (cond ((> foundation-slot 5)
diff --git a/games/king-albert.scm b/games/king-albert.scm
index 534d30c3..457c5754 100644
--- a/games/king-albert.scm
+++ b/games/king-albert.scm
@@ -283,7 +283,7 @@
       (check-empty-tslot 4)
       (check-foundation-for-uncover 4)
       (check-to-foundations 4 0)
-      (list 0 (_"Try rearranging the cards"))))
+      (list 0 (G_"Try rearranging the cards"))))
 
 (define (get-options) 
   #f)
diff --git a/games/kings-audience.scm b/games/kings-audience.scm
index aaccacb0..2ff34648 100644
--- a/games/kings-audience.scm
+++ b/games/kings-audience.scm
@@ -85,7 +85,7 @@
 
 (define (give-status)
   (set-statusbar-message (format #f
-                                 (_"Stock remaining: ~a")
+                                 (G_"Stock remaining: ~a")
                                  (number->string (length (get-cards stock)))
                          )
   )
@@ -224,7 +224,7 @@
   )
   (if move
       (hint-move (car move) 1 (cadr move))
-      (and (not (empty-slot? stock)) (list 0 (_"Deal a new card")))
+      (and (not (empty-slot? stock)) (list 0 (G_"Deal a new card")))
   )
 )
 
diff --git a/games/klondike.scm b/games/klondike.scm
index d10cff75..9f05d2a5 100644
--- a/games/klondike.scm
+++ b/games/klondike.scm
@@ -80,11 +80,11 @@
 
 (define (get-redeals-string)
   (if (< max-redeal 0) ""
-      (string-append (_"Redeals left:") " "
+      (string-append (G_"Redeals left:") " "
                     (number->string (- max-redeal FLIP-COUNTER)))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (is-tableau-build? card-list)
@@ -259,16 +259,16 @@
       (and (not kings-only)
            (any-slot-empty? tableau)
            (any-slot-nonempty? (cons waste tableau))
-           (list 0 (_"Consider moving something into an empty slot")))
+           (list 0 (G_"Consider moving something into an empty slot")))
       (and (or (and (or (= max-redeal -1)
                        (< FLIP-COUNTER max-redeal))
                    (not (empty-slot? waste)))
               (not (empty-slot? stock))) 
-          (hint-click stock (_"Deal a new card from the deck")))
+          (hint-click stock (G_"Deal a new card from the deck")))
 ; FIXME: need to give proper hints for this case too ...
       (and (not (and-map empty-slot? foundation))
-           (list 0 (_"Try moving cards down from the foundation")))
-      (list 0 (_"No hint available right now"))))
+           (list 0 (G_"Try moving cards down from the foundation")))
+      (list 0 (G_"No hint available right now"))))
 
 (define (game-won)
   (and (= 13 (length (get-cards 2)))
@@ -290,10 +290,10 @@
 
 (define (get-options)
   (list 'begin-exclusive 
-       (list (_"Three card deals") deal-three)
-       (list (_"Single card deals") deal-one)
-       (list (_"No redeals") no-redeal)
-       (list (_"Unlimited redeals") unl-redeal)
+       (list (G_"Three card deals") deal-three)
+       (list (G_"Single card deals") deal-one)
+       (list (G_"No redeals") no-redeal)
+       (list (G_"Unlimited redeals") unl-redeal)
        'end-exclusive))
 
 (define (apply-options options)
diff --git a/games/labyrinth.scm b/games/labyrinth.scm
index 5ac47158..9148f396 100644
--- a/games/labyrinth.scm
+++ b/games/labyrinth.scm
@@ -71,7 +71,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -186,7 +186,7 @@
 
 (define (dealable?)
   (and (not (empty-slot? 0))
-       (list 0 (_"Deal more cards"))))
+       (list 0 (G_"Deal more cards"))))
 
 (define (get-hint)
   (or (check-slot 5)
diff --git a/games/lady-jane.scm b/games/lady-jane.scm
index 034200a2..6597d3d5 100644
--- a/games/lady-jane.scm
+++ b/games/lady-jane.scm
@@ -106,22 +106,22 @@
 (define (get-base-string)
   (cond ((and (> BASE-VAL 1)
              (< BASE-VAL 11))
-        (string-append (_"Base Card:") " " (number->string BASE-VAL)))
+        (string-append (G_"Base Card:") " " (number->string BASE-VAL)))
        ((= BASE-VAL 1)
-        (_"Base Card: Ace"))
+        (G_"Base Card: Ace"))
        ((= BASE-VAL 11)
-        (_"Base Card: Jack"))
+        (G_"Base Card: Jack"))
        ((= BASE-VAL 12)
-        (_"Base Card: Queen"))
+        (G_"Base Card: Queen"))
        ((= BASE-VAL 13)
-        (_"Base Card: King"))
+        (G_"Base Card: King"))
        (#t "")))
 
 (define (get-stock-no-string)
   (if (> (length (get-cards 0)) 1)
-      (string-append (_"Stock left:") " " 
+      (string-append (G_"Stock left:") " " 
                     (number->string (length (get-cards 0))))
-      (string-append (_"Stock left: 0")))) 
+      (string-append (G_"Stock left: 0")))) 
 
 (define (button-pressed slot-id card-list)
   (and (not (empty-slot? slot-id))
@@ -236,7 +236,7 @@
 
 (define (dealable?)
   (and (> (length (get-cards 0)) 1)
-       (list 0 (_"Deal another round"))))
+       (list 0 (G_"Deal another round"))))
 
 (define (check-a-foundation slot1 slot2)
   (and (< slot2 6)
@@ -419,7 +419,7 @@
       (check-to-tableau? 0 6)
       (empty-tableau?)
       (dealable?)
-      (list 0 (_"Try rearranging the cards"))))    
+      (list 0 (G_"Try rearranging the cards"))))    
 
 (define (get-options) 
   #f)
diff --git a/games/maze.scm b/games/maze.scm
index 67e5cc90..fd3f8120 100644
--- a/games/maze.scm
+++ b/games/maze.scm
@@ -144,7 +144,7 @@
   (not (game-won)))
 
 (define (get-hint)
-  (list 0 (_"Aim to place the suits in the order which fits the current layout most naturally.")))
+  (list 0 (G_"Aim to place the suits in the order which fits the current layout most naturally.")))
 
 (define (get-options) 
   #f)
diff --git a/games/monte-carlo.scm b/games/monte-carlo.scm
index 86b27e3c..f8a68db4 100644
--- a/games/monte-carlo.scm
+++ b/games/monte-carlo.scm
@@ -72,7 +72,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -193,12 +193,12 @@
   (cond ((= slot 26)
         (if (and yesblank
                  (not (empty-slot? 0)))
-            (list 0 (_"Deal more cards"))
+            (list 0 (G_"Deal more cards"))
             #f))
        ((empty-slot? slot)
         (empty? (+ 1 slot) #t))
        (yesblank
-        (list 0 (_"Deal more cards")))
+        (list 0 (G_"Deal more cards")))
        (#t (empty? (+ 1 slot) yesblank))))
 
 (define (get-hint)
diff --git a/games/napoleons-tomb.scm b/games/napoleons-tomb.scm
index 156e43e2..68e36613 100644
--- a/games/napoleons-tomb.scm
+++ b/games/napoleons-tomb.scm
@@ -320,7 +320,7 @@
 ;;;;
 (define (get-hint)
   (or (get-reserve-hint (cons waste reserve-slots) (cons center-slot corner-slots))
-       (list 0 (_"Deal a new card from the deck"))))
+       (list 0 (G_"Deal a new card from the deck"))))
 
 
 ;;;;
@@ -332,11 +332,11 @@
   ;;
   (define (get-redeals-string)
     (if (not deal-three) ""
-       (string-append (_"Redeals left:") " "
+       (string-append (G_"Redeals left:") " "
                       (number->string (- max-redeals FLIP-COUNTER)))))
   ;;
   (define (get-stock-string)
-    (string-append (_"Stock left:") " " 
+    (string-append (G_"Stock left:") " " 
                   (number->string (length (get-cards stock)))))
 
   (set-statusbar-message (string-append (get-stock-string)
@@ -351,10 +351,10 @@
 ;;;;
 (define (get-options) 
   (list 'begin-exclusive 
-       (list (_"Three card deals") deal-three)
-       (list (_"Single card deals") (not deal-three))
+       (list (G_"Three card deals") deal-three)
+       (list (G_"Single card deals") (not deal-three))
        'end-exclusive
-       (list (_"Autoplay") autoplay)))
+       (list (G_"Autoplay") autoplay)))
 
 
 ;;;;
diff --git a/games/neighbor.scm b/games/neighbor.scm
index 94c6a97c..1a5017c7 100644
--- a/games/neighbor.scm
+++ b/games/neighbor.scm
@@ -72,7 +72,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -138,10 +138,10 @@
        (get-hint)))
 
 (define (hint-remove-king suit)
-  (cond ((eq? suit club) (_"Remove the king of clubs."))
-        ((eq? suit diamond) (_"Remove the king of diamonds."))
-        ((eq? suit heart) (_"Remove the king of hearts."))
-        ((eq? suit spade) (_"Remove the king of spades."))))
+  (cond ((eq? suit club) (G_"Remove the king of clubs."))
+        ((eq? suit diamond) (G_"Remove the king of diamonds."))
+        ((eq? suit heart) (G_"Remove the king of hearts."))
+        ((eq? suit spade) (G_"Remove the king of spades."))))
 
 (define (king-check slot-id)
   (cond ((= king (get-value (get-top-card slot-id)))
diff --git a/games/osmosis.scm b/games/osmosis.scm
index 29b5da63..6fd90328 100644
--- a/games/osmosis.scm
+++ b/games/osmosis.scm
@@ -65,13 +65,13 @@
                                        (get-redeals-string))))
 
 (define (get-stock-no-string)
-  (format #f (_"Stock left: ~a") (number->string (length (get-cards 8))))
+  (format #f (G_"Stock left: ~a") (number->string (length (get-cards 8))))
 )
 
 (define (get-redeals-string)
   (if deal-three
     ""
-    (format #f (_"Redeals left: ~a") (number->string (- 2 FLIP-COUNTER)))
+    (format #f (G_"Redeals left: ~a") (number->string (- 2 FLIP-COUNTER)))
   )
 )
 
@@ -211,14 +211,14 @@
 (define (get-hint)
   (or (get-valid-move '(0 2 4 6 9))
       (if deal-three
-        (list 0 (_"Deal new cards from the deck"))
-        (list 0 (_"Deal a new card from the deck"))
+        (list 0 (G_"Deal new cards from the deck"))
+        (list 0 (G_"Deal a new card from the deck"))
       )
   )
 )
 
 (define (get-options)
-  (list (list (_"Three card deals") deal-three)))
+  (list (list (G_"Three card deals") deal-three)))
 
 (define (apply-options options)
   (set! deal-three (cadar options))
diff --git a/games/pileon.scm b/games/pileon.scm
index d5f51810..c13c6714 100644
--- a/games/pileon.scm
+++ b/games/pileon.scm
@@ -155,9 +155,9 @@
       (if (= slot-id to-slot)
          (check-a-slot slot-id number-to-move (+ 1 to-slot))
          (cond ((empty-slot? slot-id)
-                (list 2 (_"something") (_"an empty slot")))
+                (list 2 (G_"something") (G_"an empty slot")))
                ((empty-slot? to-slot)
-                (list 2 (_"something") (_"an empty slot")))
+                (list 2 (G_"something") (G_"an empty slot")))
                ((= 4 (length (get-cards to-slot)))
                 (check-a-slot slot-id number-to-move (+ 1 to-slot)))
                ((= (get-value (get-top-card to-slot))
diff --git a/games/plait.scm b/games/plait.scm
index b3b11544..8e3daf40 100644
--- a/games/plait.scm
+++ b/games/plait.scm
@@ -100,10 +100,10 @@
 
 (define (deal-possible?)
   (if (not (empty-slot? deck))
-      (list 0 (_"Deal a new card from the deck"))
+      (list 0 (G_"Deal a new card from the deck"))
       (if (and (< FLIP-COUNTER 2)
               (not (empty-slot? stock)))
-         (list 0 (_"Move waste back to stock"))
+         (list 0 (G_"Move waste back to stock"))
          #f)))
 
 (define (move-upwards-possible? top-card-value new-card-value)
@@ -231,25 +231,25 @@
                                        (get-redeals-string))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " "
+  (string-append (G_"Stock left:") " "
                 (number->string (length (get-cards deck)))))
 
 (define (get-base-string)
   (cond ((and (> start-value 1)
              (< start-value 11))
-        (string-append (_"Base Card: ") (number->string start-value)))
+        (string-append (G_"Base Card: ") (number->string start-value)))
        ((= start-value 1)
-        (_"Base Card: Ace"))
+        (G_"Base Card: Ace"))
        ((= start-value 11)
-        (_"Base Card: Jack"))
+        (G_"Base Card: Jack"))
        ((= start-value 12)
-        (_"Base Card: Queen"))
+        (G_"Base Card: Queen"))
        ((= start-value 13)
-        (_"Base Card: King"))
+        (G_"Base Card: King"))
        (#t "")))
 
 (define (get-redeals-string)
-  (string-append (_"Redeals left:") " "
+  (string-append (G_"Redeals left:") " "
                 (number->string (- 2 FLIP-COUNTER))))
 
 ;; Move cards automatically from the plait to one of the edge slots
diff --git a/games/poker.scm b/games/poker.scm
index 688f1ea3..3023caf8 100644
--- a/games/poker.scm
+++ b/games/poker.scm
@@ -294,10 +294,10 @@
       (> (get-score) 74)))
 
 (define (get-hint)
-  (list 0 (_"Place cards on to the Tableau to form poker hands")))
+  (list 0 (G_"Place cards on to the Tableau to form poker hands")))
 
 (define (get-options)
-  (list (list (_"Shuffle mode") shuffle-mode)))
+  (list (list (G_"Shuffle mode") shuffle-mode)))
 
 (define (apply-options options)
   (set! shuffle-mode (cadar options)))
diff --git a/games/quatorze.scm b/games/quatorze.scm
index 6fb2e8fd..0b626616 100644
--- a/games/quatorze.scm
+++ b/games/quatorze.scm
@@ -72,7 +72,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
diff --git a/games/royal-east.scm b/games/royal-east.scm
index 7650527a..c6985ed6 100644
--- a/games/royal-east.scm
+++ b/games/royal-east.scm
@@ -74,21 +74,21 @@
                                        (get-base-string))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (get-base-string)
   (cond ((and (> BASE-VAL 1)
              (< BASE-VAL 11))
-        (string-append (_"Base Card:") " " (number->string BASE-VAL)))
+        (string-append (G_"Base Card:") " " (number->string BASE-VAL)))
        ((= BASE-VAL 1)
-        (_"Base Card: Ace"))
+        (G_"Base Card: Ace"))
        ((= BASE-VAL 11)
-        (_"Base Card: Jack"))
+        (G_"Base Card: Jack"))
        ((= BASE-VAL 12)
-        (_"Base Card: Queen"))
+        (G_"Base Card: Queen"))
        ((= BASE-VAL 13)
-        (_"Base Card: King"))
+        (G_"Base Card: King"))
        (#t "")))
 
 (define (button-pressed slot-id card-list)
@@ -190,7 +190,7 @@
 
 (define (dealable?)
   (if (not (empty-slot? 0))
-      (list 0 (_"Deal a card"))
+      (list 0 (G_"Deal a card"))
       #f))
 
 (define (check-a-foundation card f-slot)
diff --git a/games/saratoga.scm b/games/saratoga.scm
index 26a2e506..f9d68ea5 100644
--- a/games/saratoga.scm
+++ b/games/saratoga.scm
@@ -77,7 +77,7 @@
 )
 
 (define (get-options)
-  (list (list (_"Three card deals") deal-three)))
+  (list (list (G_"Three card deals") deal-three)))
 
 (define (apply-options options)
   (set! deal-three (cadar options)))
diff --git a/games/scorpion.scm b/games/scorpion.scm
index 1eb15478..4136ebdf 100644
--- a/games/scorpion.scm
+++ b/games/scorpion.scm
@@ -139,7 +139,7 @@
 
 (define (dealable?)
   (and (not (empty-slot? 0))
-       (list 0 (_"Deal the cards"))))
+       (list 0 (G_"Deal the cards"))))
 
 (define (check-slot-cards slot1 slot2 count card card-list)
   (cond ((or (= (length card-list) 0)
diff --git a/games/scuffle.scm b/games/scuffle.scm
index 1863b414..56593af0 100644
--- a/games/scuffle.scm
+++ b/games/scuffle.scm
@@ -52,11 +52,11 @@
                                        (get-redeals-string))))
 
 (define (get-redeals-string)
-  (string-append (_"Redeals left:") " "
+  (string-append (G_"Redeals left:") " "
                 (number->string (- 2 FLIP-COUNTER))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -135,9 +135,9 @@
 
 (define (dealable?)
   (or (and (not (empty-slot? 0))
-          (list 0 (_"Deal another round")))
+          (list 0 (G_"Deal another round")))
       (and (< FLIP-COUNTER 2)
-          (list 0 (_"Reshuffle cards")))))
+          (list 0 (G_"Reshuffle cards")))))
 
 (define (get-hint)
   (or (movable? 5 1)
diff --git a/games/seahaven.scm b/games/seahaven.scm
index 71eca853..fbe84898 100644
--- a/games/seahaven.scm
+++ b/games/seahaven.scm
@@ -312,7 +312,7 @@
 
 (define (check-for-empty-reserve)
   (and (> free-reserves 0)
-       (list 0 (_"Move something on to an empty reserve"))))
+       (list 0 (G_"Move something on to an empty reserve"))))
 
 (define (get-hint)
   (or (check-to-foundations? 2 0)
diff --git a/games/sir-tommy.scm b/games/sir-tommy.scm
index c4d46be6..a2de3c69 100644
--- a/games/sir-tommy.scm
+++ b/games/sir-tommy.scm
@@ -46,7 +46,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -127,11 +127,11 @@
 (define (move-waste)
   (and (not (empty-slot? 1))
        (not (empty-slot? 0))
-       (list 0 (_"Move waste on to a reserve slot"))))
+       (list 0 (G_"Move waste on to a reserve slot"))))
 
 (define (dealable?)
   (and (not (empty-slot? 0))
-       (list 0 (_"Deal another card"))))
+       (list 0 (G_"Deal another card"))))
 
 (define (get-hint)
   (or (check-to-foundation 1)
diff --git a/games/spider.scm b/games/spider.scm
index 3e3e4890..fb333b2d 100644
--- a/games/spider.scm
+++ b/games/spider.scm
@@ -85,7 +85,7 @@
 
 (define (get-stock-no-string)
   (format #f
-          (_"Stock left: ~a")
+          (G_"Stock left: ~a")
          (number->string (length (get-cards stock)))))
 
 ;internal procedures/variables
@@ -181,8 +181,8 @@
                 (any-slot-empty? tableau))
           (begin
             (if (must-undo-to-deal?)
-                (set-statusbar-message (_"Undo until there are enough cards to fill all tableau piles"))
-                (set-statusbar-message (_"Please fill in empty pile first.")))
+                (set-statusbar-message (G_"Undo until there are enough cards to fill all tableau piles"))
+                (set-statusbar-message (G_"Please fill in empty pile first.")))
              #f)
           (begin
             (deal-new-cards tableau)
@@ -282,12 +282,12 @@
   (if (eq? slots '())
       #f
       (if (empty-slot? (car slots))
-         (list 0 (_"Place something on empty slot"))
+         (list 0 (G_"Place something on empty slot"))
          (open-slots? (cdr slots)))))
 
 (define (dealable?)
   (if (not (empty-slot? stock))
-      (list 0 (_"Deal another round"))
+      (list 0 (G_"Deal another round"))
       #f))
 
 (define (count-cards slots acc)
@@ -297,7 +297,7 @@
 
 (define (hint-few-tableau-cards)
   (and (must-undo-to-deal?)
-       (list 0 (_"Undo until there are enough cards to fill all tableau piles"))))
+       (list 0 (G_"Undo until there are enough cards to fill all tableau piles"))))
 
 (define (get-hint)
   (or (hint-few-tableau-cards)
@@ -306,13 +306,13 @@
       (open-slots? tableau)
       (dealable?)
 ; this isn't great, but it will get around the premature end-of-game call
-      (list 0 (_"Try moving card piles around"))))
+      (list 0 (G_"Try moving card piles around"))))
 
 (define (get-options)
   (list 'begin-exclusive 
-       (list (_"Four Suits") suits-four)
-       (list (_"Two Suits") suits-two)
-       (list (_"One Suit") suits-one)
+       (list (G_"Four Suits") suits-four)
+       (list (G_"Two Suits") suits-two)
+       (list (G_"One Suit") suits-one)
        'end-exclusive))
 
 (define (apply-options options)
diff --git a/games/straight-up.scm b/games/straight-up.scm
index e1d5400f..34741323 100644
--- a/games/straight-up.scm
+++ b/games/straight-up.scm
@@ -61,15 +61,15 @@
                                        (get-redeals-string))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " "
+  (string-append (G_"Stock left:") " "
                  (number->string (length (get-cards 0)))))
 
 (define (get-reserve-no-string)
-  (string-append (_"Reserve left:") " "
+  (string-append (G_"Reserve left:") " "
                 (number->string (length (get-cards 6)))))
 
 (define (get-redeals-string)
-  (string-append (_"Redeals left:") " "
+  (string-append (G_"Redeals left:") " "
                 (number->string (- 2 FLIP-COUNTER))))
 
 (define (button-pressed slot-id card-list)
@@ -237,10 +237,10 @@
       (to-tableau 1)
       (empty-tableau? 7)
       (if (not (empty-slot? 0))
-          (list 0 (_"Deal a new card from the deck"))
+          (list 0 (G_"Deal a new card from the deck"))
           (if (and (< FLIP-COUNTER 2)
                    (not (empty-slot? 1)))
-              (list 0 (_"Move waste back to stock"))
+              (list 0 (G_"Move waste back to stock"))
               #f))))
 
 (define (get-options) 
diff --git a/games/streets-and-alleys.scm b/games/streets-and-alleys.scm
index f483c47d..dab44eb0 100644
--- a/games/streets-and-alleys.scm
+++ b/games/streets-and-alleys.scm
@@ -177,7 +177,7 @@
 
 (define (get-hint)
   (or (check-to-foundation 0)
-      (list 0 (_"Try rearranging the cards"))))
+      (list 0 (G_"Try rearranging the cards"))))
 
 (define (get-options) 
   #f)
diff --git a/games/ten-across.scm b/games/ten-across.scm
index a4ea7fae..bd66bd16 100644
--- a/games/ten-across.scm
+++ b/games/ten-across.scm
@@ -211,8 +211,8 @@
    (test-stack-move (append tmp-spots tableau))
    (and allow-two-spot-use
         (have-empty-slot? tmp-spots)
-        (list 0 (_"Move a card to an empty temporary slot")))
-   (list 0 (_"No hint available"))))
+        (list 0 (G_"Move a card to an empty temporary slot")))
+   (list 0 (G_"No hint available"))))
 
 (define final-stack-helper
   (lambda (the-list num suit)
@@ -248,7 +248,7 @@
   (not (game-won)))
 
 (define (get-options)
-  (list (list (_"Allow temporary spots use") allow-two-spot-use)))
+  (list (list (G_"Allow temporary spots use") allow-two-spot-use)))
 
 (define (apply-options options)
   (set! allow-two-spot-use (cadar options)))
diff --git a/games/terrace.scm b/games/terrace.scm
index cbec1478..165902bf 100644
--- a/games/terrace.scm
+++ b/games/terrace.scm
@@ -36,19 +36,19 @@
 (define variation-names
   (list
         ; 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.
-        (_"Terrace")
+        (G_"Terrace")
         ; 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.
-        (_"General's Patience")
+        (G_"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.
-        (_"Falling Stars")
+        (G_"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.
-        (_"Signora")
+        (G_"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.
-        (_"Redheads")
+        (G_"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.
-        (_"Blondes and Brunettes")
+        (G_"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.
-        (_"Wood")))
+        (G_"Wood")))
 
 (define current-variation 0)
 
@@ -136,27 +136,27 @@
 (define (get-base-string)
   (cond ((and (> BASE-VAL 1)
               (< BASE-VAL 11))
-         (format #f (_"Base Card: ~a") (number->string BASE-VAL)))
+         (format #f (G_"Base Card: ~a") (number->string BASE-VAL)))
         ((= BASE-VAL 1)
-         (_"Base Card: Ace"))
+         (G_"Base Card: Ace"))
         ((= BASE-VAL 11)
-         (_"Base Card: Jack"))
+         (G_"Base Card: Jack"))
         ((= BASE-VAL 12)
-         (_"Base Card: Queen"))
+         (G_"Base Card: Queen"))
         ((= BASE-VAL 13)
-         (_"Base Card: King"))
+         (G_"Base Card: King"))
         (#t "")))
 
 (define (get-redeals-string)
   (if (or (< max-redeal 1) (= BASE-VAL 0))
       ""
-      (string-append "   " (_"Redeals left:") " "
+      (string-append "   " (G_"Redeals left:") " "
                      (number->string (- max-redeal FLIP-COUNTER)))))
 
 (define (get-stock-no-string)
   (if (= BASE-VAL 0)
       ""
-      (string-append (_"Stock left:") " " 
+      (string-append (G_"Stock left:") " " 
                      (number->string (length (get-cards stock))))))
 
 (define (descending-values? a b)
@@ -283,7 +283,7 @@
 
 (define (hint-start-foundation)
   (and (= BASE-VAL 0)
-       (list 2 (_"something") (_"the foundation"))))
+       (list 2 (G_"something") (G_"the foundation"))))
 
 (define (hint-slot-to-foundation start-slot end-slots)
   (and (not (null? end-slots))
@@ -355,7 +355,7 @@
 
 (define (hint-deal)
   (and (dealable?)
-       (list 0 (_"Deal a new card from the deck"))))
+       (list 0 (G_"Deal a new card from the deck"))))
 
 (define (get-hint)
   (or (hint-start-foundation)
diff --git a/games/thieves.scm b/games/thieves.scm
index 8dbb9c1e..74081559 100644
--- a/games/thieves.scm
+++ b/games/thieves.scm
@@ -45,7 +45,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 7)))))
 
 (define (values-match? c1 c2)
@@ -145,7 +145,7 @@
       (hint-move-from 4)
       (hint-move-from 5)
       (hint-move-from 6)
-      (list 0 (_"Deal a card from the deck"))))
+      (list 0 (G_"Deal a card from the deck"))))
 
 (define (get-options) #f)
 (define (apply-options options) #f)
diff --git a/games/thirteen.scm b/games/thirteen.scm
index 6f1154be..0b9d6bda 100644
--- a/games/thirteen.scm
+++ b/games/thirteen.scm
@@ -102,7 +102,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -378,14 +378,14 @@
           (= (+ (get-value (get-nth-card waste-slot 1))
                 (get-value (get-nth-card waste-slot 2))) 
              magic-total))
-      (list 0 (_"Match the top two cards of the waste."))
+      (list 0 (G_"Match the top two cards of the waste."))
       #f))
 
 (define (hint-remove-king suit)
-  (cond ((eq? suit club) (_"Remove the king of clubs."))
-        ((eq? suit diamond) (_"Remove the king of diamonds."))
-        ((eq? suit heart) (_"Remove the king of hearts."))
-        ((eq? suit spade) (_"Remove the king of spades."))))
+  (cond ((eq? suit club) (G_"Remove the king of clubs."))
+        ((eq? suit diamond) (G_"Remove the king of diamonds."))
+        ((eq? suit heart) (G_"Remove the king of hearts."))
+        ((eq? suit spade) (G_"Remove the king of spades."))))
 
 (define (check-move slot1 slot2)
   (if (or (empty-slot? slot1)
@@ -416,7 +416,7 @@
   (or (check-waste-for-move) 
       (check-move waste-slot 2)
       (if (not (empty-slot? 0))
-          (list 0 (_"Deal a card"))
+          (list 0 (G_"Deal a card"))
           #f)))
 
 (define (get-options) 
diff --git a/games/thumb-and-pouch.scm b/games/thumb-and-pouch.scm
index 71bd9e5a..f38113ef 100644
--- a/games/thumb-and-pouch.scm
+++ b/games/thumb-and-pouch.scm
@@ -58,11 +58,11 @@
                                        (get-redeals-string))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (get-redeals-string)
-  (string-append (_"Redeals left:") " "
+  (string-append (G_"Redeals left:") " "
                 (number->string (- 2 FLIP-COUNTER))))
 
 (define (button-pressed slot-id card-list)
@@ -255,10 +255,10 @@
       (check-to-tableau 6)
       (check-empty?)
       (or (and (not (empty-slot? 0))
-               (list 0 (_"Deal another round")))
+               (list 0 (G_"Deal another round")))
           (and (not (empty-slot? 1))
                (< FLIP-COUNTER 2)
-               (list 0 (_"Move waste back to stock"))))))
+               (list 0 (G_"Move waste back to stock"))))))
 
 (define (get-options) 
   #f)
diff --git a/games/treize.scm b/games/treize.scm
index 92dd999f..11bbbc78 100644
--- a/games/treize.scm
+++ b/games/treize.scm
@@ -99,7 +99,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -276,10 +276,10 @@
        (empty-slot? 0)))
 
 (define (hint-remove-king suit)
-  (cond ((eq? suit club) (_"Remove the king of clubs."))
-        ((eq? suit diamond) (_"Remove the king of diamonds."))
-        ((eq? suit heart) (_"Remove the king of hearts."))
-        ((eq? suit spade) (_"Remove the king of spades."))))
+  (cond ((eq? suit club) (G_"Remove the king of clubs."))
+        ((eq? suit diamond) (G_"Remove the king of diamonds."))
+        ((eq? suit heart) (G_"Remove the king of hearts."))
+        ((eq? suit spade) (G_"Remove the king of spades."))))
 
 (define (check-move slot1 slot2)
   (if (or (empty-slot? slot1)
@@ -302,7 +302,7 @@
 
 (define (dealable?)
   (if (not (empty-slot? 0))
-      (list 0 (_"Deal a card"))
+      (list 0 (G_"Deal a card"))
       #f))
 
 (define (check-waste)
diff --git a/games/triple-peaks.scm b/games/triple-peaks.scm
index 4a84bef1..1c9eec84 100644
--- a/games/triple-peaks.scm
+++ b/games/triple-peaks.scm
@@ -101,7 +101,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -339,15 +339,15 @@
 
 (define (dealable?)
   (and (not (empty-slot? 0))
-       (list 0 (_"Deal a card"))))
+       (list 0 (G_"Deal a card"))))
 
 (define (get-hint)
   (or (check-move 3)  
       (dealable?)))
 
 (define (get-options)
-  (list (list (_"Progressive Rounds") progressive-rounds) 
-        (list (_"Multiplier Scoring") multiplier-scoring)))
+  (list (list (G_"Progressive Rounds") progressive-rounds) 
+        (list (G_"Multiplier Scoring") multiplier-scoring)))
 
 (define (apply-options options)
   (set! progressive-rounds (cadar options))
diff --git a/games/union-square.scm b/games/union-square.scm
index 9384effe..639340d5 100644
--- a/games/union-square.scm
+++ b/games/union-square.scm
@@ -93,7 +93,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 
@@ -461,7 +461,7 @@
 
 (define (dealable?)
   (if (not (empty-slot? 0))
-      (list 0 (_"Deal a card"))
+      (list 0 (G_"Deal a card"))
       #f))
 
 (define (get-hint)
@@ -469,7 +469,7 @@
       (check-tableau 20)
       (check-empty-slot)
       (dealable?)
-      (list 0 (_"No hint available right now"))))
+      (list 0 (G_"No hint available right now"))))
 
 (define (get-options) 
   #f)
diff --git a/games/valentine.scm b/games/valentine.scm
index f9794fb5..6946e1cb 100644
--- a/games/valentine.scm
+++ b/games/valentine.scm
@@ -133,7 +133,7 @@
 
 (define (get-hint)
   (or (tableau-move? 1 2)
-      (list 0 (_"Deal more cards"))))
+      (list 0 (G_"Deal more cards"))))
 
 
 
diff --git a/games/wall.scm b/games/wall.scm
index adeb9c38..2005c2df 100644
--- a/games/wall.scm
+++ b/games/wall.scm
@@ -135,7 +135,7 @@
   (set-statusbar-message (get-attacks-left-string)))
 
 (define (get-attacks-left-string)
-  (string-append (_"Deals left: ")
+  (string-append (G_"Deals left: ")
                  (number->string (/ (length (get-cards stock)) 3))))
 
 (define (in-wall? slot-id)
@@ -434,7 +434,7 @@
 
 (define (dealable?)
   (if (not (empty-slot? stock))
-      (list 0 (_"Deal cards."))
+      (list 0 (G_"Deal cards."))
       #f))
 
 (define (get-hint)
@@ -444,7 +444,7 @@
     (if (and (hidden-exposed-low-guard?)
              (or (not winnable-slot)
                  (in-wall? winnable-slot)))
-        (list 0 (_"Attack a face-down pile."))
+        (list 0 (G_"Attack a face-down pile."))
         (if winnable-slot
             (hint-remove-top-card winnable-slot)
             (dealable?)))))
diff --git a/games/westhaven.scm b/games/westhaven.scm
index 47115f94..3cdc3208 100644
--- a/games/westhaven.scm
+++ b/games/westhaven.scm
@@ -63,7 +63,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (next-card card-list number)
@@ -193,7 +193,7 @@
 
 (define (dealable?)
   (if (not (empty-slot? 0))
-      (list 0 (_"Deal a card"))
+      (list 0 (G_"Deal a card"))
       #f))
 
 (define (to-foundations? slot-id)
diff --git a/games/whitehead.scm b/games/whitehead.scm
index 8a2873cc..527c1cf2 100644
--- a/games/whitehead.scm
+++ b/games/whitehead.scm
@@ -55,7 +55,7 @@
   (set-statusbar-message (string-append (get-stock-no-string))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -240,7 +240,7 @@
                  (and (not (empty-slot? 12))
                       (or (not (check-same-suit-list (get-cards 12)))
                           (not (check-straight-descending-list (get-cards 12))))))
-             (list 0 (_"Move a build of cards on to the empty Tableau slot"))))
+             (list 0 (G_"Move a build of cards on to the empty Tableau slot"))))
        (#t (empty-tab? (+ 1 slot)))))
 
 (define (get-hint)
@@ -249,7 +249,7 @@
       (check-same-color-builds 1 6)
       (empty-tab? 6)
       (and (not (empty-slot? 0))
-          (list 0 (_"Deal another card")))))
+          (list 0 (G_"Deal another card")))))
 
 (define (get-options) 
   #f)
diff --git a/games/yield.scm b/games/yield.scm
index 08fa9ed5..7eed7b73 100644
--- a/games/yield.scm
+++ b/games/yield.scm
@@ -105,7 +105,7 @@
   (set-statusbar-message (get-stock-no-string)))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (button-pressed slot-id card-list)
@@ -292,10 +292,10 @@
        (empty-slot? 9)))
 
 (define (hint-remove-king suit)
-  (cond ((eq? suit club) (_"Remove the king of clubs."))
-        ((eq? suit diamond) (_"Remove the king of diamonds."))
-        ((eq? suit heart) (_"Remove the king of hearts."))
-        ((eq? suit spade) (_"Remove the king of spades."))))
+  (cond ((eq? suit club) (G_"Remove the king of clubs."))
+        ((eq? suit diamond) (G_"Remove the king of diamonds."))
+        ((eq? suit heart) (G_"Remove the king of hearts."))
+        ((eq? suit spade) (G_"Remove the king of spades."))))
 
 (define (check-move slot1 slot2)
   (if (or (empty-slot? slot1)
@@ -318,7 +318,7 @@
 
 (define (dealable?)
   (if (not (empty-slot? 0))
-      (list 0 (_"Deal a card"))
+      (list 0 (G_"Deal a card"))
       #f))
 
 (define (check-waste)
diff --git a/games/zebra.scm b/games/zebra.scm
index 8849406d..4c30e2d3 100644
--- a/games/zebra.scm
+++ b/games/zebra.scm
@@ -68,11 +68,11 @@
                                        (get-redeals-string))))
 
 (define (get-stock-no-string)
-  (string-append (_"Stock left:") " " 
+  (string-append (G_"Stock left:") " " 
                 (number->string (length (get-cards 0)))))
 
 (define (get-redeals-string)
-  (string-append (_"Redeals left:") " "
+  (string-append (G_"Redeals left:") " "
                 (number->string (- 1 FLIP-COUNTER))))
 
 (define (button-pressed slot-id card-list)
@@ -209,10 +209,10 @@
   (or (check-to-foundations 1)
       (check-to-tableaus 1)
       (or (and (not (empty-slot? 0))
-              (list 0 (_"Deal another round")))
+              (list 0 (G_"Deal another round")))
           (and (not (empty-slot? 1))
               (< FLIP-COUNTER 1)
-              (list 0 (_"Move waste back to stock"))))))
+              (list 0 (G_"Move waste back to stock"))))))
 
 (define (get-options) 
   #f)


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