Commit 07354bc6 authored by Christian Neumair's avatar Christian Neumair Committed by Christian Neumair

Replace ": " by ": ". There is no reason to lengthen the status bar

2003-06-10  Christian Neumair  <chris@gnome-de.org>

	* *.scm: Replace ":  " by ": ". There is no reason to lengthen the
	status bar messages by one space.
parent dadc6b97
2003-06-10 Christian Neumair <chris@gnome-de.org>
* *.scm: Replace ": " by ": ". There is no reason to lengthen the
status bar messages by one space.
2003-06-09 William Jon McCann <mccann@jhu.edu>
* dialog.c:
......
......@@ -66,22 +66,22 @@
(define (get-base-string)
(cond ((and (> BASE-VAL 1)
(< BASE-VAL 11))
(string-append (_"Base Card: ") (number->string BASE-VAL)))
(string-append (_"Base Card: ") (number->string BASE-VAL)))
((= BASE-VAL 1)
(_"Base Card: Ace"))
(_"Base Card: Ace"))
((= BASE-VAL 11)
(_"Base Card: Jack"))
(_"Base Card: Jack"))
((= BASE-VAL 12)
(_"Base Card: Queen"))
(_"Base Card: Queen"))
((= BASE-VAL 13)
(_"Base Card: King"))
(_"Base Card: King"))
(#t #f)))
(define (get-stock-no-string)
(if (> (length (get-cards 0)) 1)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0))))
(string-append (_"Stock left: 0"))))
(string-append (_"Stock left: 0"))))
(define (check-straight-descending-list card-list)
(or (< (length card-list) 2)
......
......@@ -50,7 +50,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -51,7 +51,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -83,7 +83,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (check-for-kings slot-id)
......
......@@ -74,7 +74,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 16)))))
(define (button-pressed slot-id card-list)
......
; AisleRiot - canfield.scm
; AisleRiot - canfield.scm
; Copyright (C) 1998, 2003 Rosanna Yuen <rwsy@mit.edu>
;
; This game is free software; you can redistribute it and/or modify
......@@ -68,29 +68,29 @@
(get-redeals-string))))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (get-reserve-no-string)
(string-append (_"Reserve left: ")
(string-append (_"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 (_"Base Card: ") (number->string BASE-VAL)))
((= BASE-VAL 1)
(_"Base Card: Ace"))
(_"Base Card: Ace"))
((= BASE-VAL 11)
(_"Base Card: Jack"))
(_"Base Card: Jack"))
((= BASE-VAL 12)
(_"Base Card: Queen"))
(_"Base Card: Queen"))
((= BASE-VAL 13)
(_"Base Card: King"))
(_"Base Card: King"))
(#t #f)))
(define (get-redeals-string)
(string-append (_"Redeals left: ")
(string-append (_"Redeals left: ")
(number->string (- 2 FLIP-COUNTER))))
(define (button-pressed slot-id card-list)
......
......@@ -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 (_"Base Card: ") (number->string BASE-VAL)))
((= BASE-VAL 1)
(_"Base Card: Ace"))
(_"Base Card: Ace"))
((= BASE-VAL 11)
(_"Base Card: Jack"))
(_"Base Card: Jack"))
((= BASE-VAL 12)
(_"Base Card: Queen"))
(_"Base Card: Queen"))
((= BASE-VAL 13)
(_"Base Card: King"))
(_"Base Card: King"))
(#t #f)))
(define (button-pressed slot-id card-list)
......
......@@ -39,7 +39,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -64,11 +64,11 @@
(get-redeals-string))))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (get-redeals-string)
(string-append (_"Redeals left: ")
(string-append (_"Redeals left: ")
(number->string (- 2 FLIP-COUNTER))))
(define (check-kings slot-list)
......
......@@ -83,29 +83,29 @@
(get-redeals-string))))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (get-reserve-no-string)
(string-append (_"Reserve left: ")
(string-append (_"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 (_"Base Card: ") (number->string BASE-VAL)))
((= BASE-VAL 1)
(_"Base Card: Ace"))
(_"Base Card: Ace"))
((= BASE-VAL 11)
(_"Base Card: Jack"))
(_"Base Card: Jack"))
((= BASE-VAL 12)
(_"Base Card: Queen"))
(_"Base Card: Queen"))
((= BASE-VAL 13)
(_"Base Card: King"))
(_"Base Card: King"))
(#t #f)))
(define (get-redeals-string)
(string-append (_"Redeals left: ")
(string-append (_"Redeals left: ")
(number->string (- 2 FLIP-COUNTER))))
(define (button-pressed slot-id card-list)
......
......@@ -53,7 +53,7 @@
(set-statusbar-message (string-append (get-stock-no-string))))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -95,7 +95,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -93,7 +93,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -39,7 +39,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -40,7 +40,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -74,25 +74,25 @@
(get-base-string))))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (get-redeals-string)
(string-append (_"Redeals left: ")
(string-append (_"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 (_"Base Card: ") (number->string BASE-VAL)))
((= BASE-VAL 1)
(_"Base Card: Ace"))
(_"Base Card: Ace"))
((= BASE-VAL 11)
(_"Base Card: Jack"))
(_"Base Card: Jack"))
((= BASE-VAL 12)
(_"Base Card: Queen"))
(_"Base Card: Queen"))
((= BASE-VAL 13)
(_"Base Card: King"))
(_"Base Card: King"))
(#t #f)))
(define (button-pressed slot-id card-list)
......
......@@ -46,7 +46,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -60,7 +60,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -50,7 +50,7 @@
(set-statusbar-message (string-append (get-stock-no-string))))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -52,7 +52,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -51,7 +51,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -65,11 +65,11 @@
(get-redeals-string))))
(define (get-redeals-string)
(string-append (_"Redeals left: ")
(string-append (_"Redeals left: ")
(number->string (- 1 FLIP-COUNTER))))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -69,25 +69,25 @@
(get-base-string))))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (get-reserve-no-string)
(string-append (_"Reserve left: ")
(string-append (_"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 (_"Base Card: ") (number->string BASE-VAL)))
((= BASE-VAL 1)
(_"Base Card: Ace"))
(_"Base Card: Ace"))
((= BASE-VAL 11)
(_"Base Card: Jack"))
(_"Base Card: Jack"))
((= BASE-VAL 12)
(_"Base Card: Queen"))
(_"Base Card: Queen"))
((= BASE-VAL 13)
(_"Base Card: King"))
(_"Base Card: King"))
(#t #f)))
(define (button-pressed slot-id card-list)
......
......@@ -67,11 +67,11 @@
(get-redeals-string))))
(define (get-redeals-string)
(string-append (_"Redeals left: ")
(string-append (_"Redeals left: ")
(number->string (- 2 FLIP-COUNTER))))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -71,7 +71,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -117,22 +117,22 @@
(define (get-base-string)
(cond ((and (> BASE-VAL 1)
(< BASE-VAL 11))
(string-append (_"Base Card: ") (number->string BASE-VAL)))
(string-append (_"Base Card: ") (number->string BASE-VAL)))
((= BASE-VAL 1)
(_"Base Card: Ace"))
(_"Base Card: Ace"))
((= BASE-VAL 11)
(_"Base Card: Jack"))
(_"Base Card: Jack"))
((= BASE-VAL 12)
(_"Base Card: Queen"))
(_"Base Card: Queen"))
((= BASE-VAL 13)
(_"Base Card: King"))
(_"Base Card: King"))
(#t #f)))
(define (get-stock-no-string)
(if (> (length (get-cards 0)) 1)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0))))
(string-append (_"Stock left: 0"))))
(string-append (_"Stock left: 0"))))
(define (button-pressed slot-id card-list)
(and (not (empty-slot? slot-id))
......
......@@ -72,7 +72,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -72,7 +72,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -56,11 +56,11 @@
(get-redeals-string))))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 8)))))
(define (get-redeals-string)
(string-append (_"Redeals left: ")
(string-append (_"Redeals left: ")
(number->string (- 2 FLIP-COUNTER))))
(define (button-pressed slot-id card-list)
......
......@@ -61,11 +61,11 @@
(get-redeals-string))))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 8)))))
(define (get-redeals-string)
(string-append (_"Redeals left: ")
(string-append (_"Redeals left: ")
(number->string (- 2 FLIP-COUNTER))))
(define (button-pressed slot-id card-list)
......
......@@ -72,7 +72,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -69,21 +69,21 @@
(get-base-string))))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"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 (_"Base Card: ") (number->string BASE-VAL)))
((= BASE-VAL 1)
(_"Base Card: Ace"))
(_"Base Card: Ace"))
((= BASE-VAL 11)
(_"Base Card: Jack"))
(_"Base Card: Jack"))
((= BASE-VAL 12)
(_"Base Card: Queen"))
(_"Base Card: Queen"))
((= BASE-VAL 13)
(_"Base Card: King"))
(_"Base Card: King"))
(#t (_"melborp"))))
(define (button-pressed slot-id card-list)
......
......@@ -66,22 +66,22 @@
(define (get-base-string)
(cond ((and (> BASE-VAL 1)
(< BASE-VAL 11))
(string-append (_"Base Card: ") (number->string BASE-VAL)))
(string-append (_"Base Card: ") (number->string BASE-VAL)))
((= BASE-VAL 1)
(_"Base Card: Ace"))
(_"Base Card: Ace"))
((= BASE-VAL 11)
(_"Base Card: Jack"))
(_"Base Card: Jack"))
((= BASE-VAL 12)
(_"Base Card: Queen"))
(_"Base Card: Queen"))
((= BASE-VAL 13)
(_"Base Card: King"))
(_"Base Card: King"))
(#t #f)))
(define (get-stock-no-string)
(if (> (length (get-cards 0)) 1)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0))))
(string-append (_"Stock left: 0"))))
(string-append (_"Stock left: 0"))))
(define (check-straight-descending-list card-list)
(or (< (length card-list) 2)
......
......@@ -50,7 +50,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -51,7 +51,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -83,7 +83,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (check-for-kings slot-id)
......
......@@ -74,7 +74,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 16)))))
(define (button-pressed slot-id card-list)
......
; AisleRiot - canfield.scm
; AisleRiot - canfield.scm
; Copyright (C) 1998, 2003 Rosanna Yuen <rwsy@mit.edu>
;
; This game is free software; you can redistribute it and/or modify
......@@ -68,29 +68,29 @@
(get-redeals-string))))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (get-reserve-no-string)
(string-append (_"Reserve left: ")
(string-append (_"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 (_"Base Card: ") (number->string BASE-VAL)))
((= BASE-VAL 1)
(_"Base Card: Ace"))
(_"Base Card: Ace"))
((= BASE-VAL 11)
(_"Base Card: Jack"))
(_"Base Card: Jack"))
((= BASE-VAL 12)
(_"Base Card: Queen"))
(_"Base Card: Queen"))
((= BASE-VAL 13)
(_"Base Card: King"))
(_"Base Card: King"))
(#t #f)))
(define (get-redeals-string)
(string-append (_"Redeals left: ")
(string-append (_"Redeals left: ")
(number->string (- 2 FLIP-COUNTER))))
(define (button-pressed slot-id card-list)
......
......@@ -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 (_"Base Card: ") (number->string BASE-VAL)))
((= BASE-VAL 1)
(_"Base Card: Ace"))
(_"Base Card: Ace"))
((= BASE-VAL 11)
(_"Base Card: Jack"))
(_"Base Card: Jack"))
((= BASE-VAL 12)
(_"Base Card: Queen"))
(_"Base Card: Queen"))
((= BASE-VAL 13)
(_"Base Card: King"))
(_"Base Card: King"))
(#t #f)))
(define (button-pressed slot-id card-list)
......
......@@ -39,7 +39,7 @@
(set-statusbar-message (get-stock-no-string)))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (button-pressed slot-id card-list)
......
......@@ -64,11 +64,11 @@
(get-redeals-string))))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))
(define (get-redeals-string)
(string-append (_"Redeals left: ")
(string-append (_"Redeals left: ")
(number->string (- 2 FLIP-COUNTER))))
(define (check-kings slot-list)
......
......@@ -83,29 +83,29 @@
(get-redeals-string))))
(define (get-stock-no-string)
(string-append (_"Stock left: ")
(string-append (_"Stock left: ")
(number->string (length (get-cards 0)))))