Commit 2daab601 authored by Callum McKenzie's avatar Callum McKenzie

i18n fixes of various sorts

parent 6670512d
2003-06-22 Callum McKenzie <callum@physics.otago.ac.nz>
* ten_across.scm (less-than-same-cards): Removed some diagnostic
code that shouldn't be there.
* *.scm: Changes to remove trailing spaces in translatable
strings.
* aisleriot.schemas.in: Remove periods from the end of short
descriptions.
2003-06-21 Callum McKenzie <callum@physics.otago.ac.nz>
* menu.c: Remove the dirent.h include since we don't need it
......
......@@ -79,7 +79,7 @@
(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"))))
......
......@@ -8,7 +8,7 @@
<type>bool</type>
<default>TRUE</default>
<locale name="C">
<short>Whether or not to show the toolbar.</short>
<short>Whether or not to show the toolbar</short>
<long>Whether or not to show the toolbar.</long>
</locale>
</schema>
......@@ -20,7 +20,7 @@
<type>string</type>
<default>klondike.scm</default>
<locale name="C">
<short>The game file to use.</short>
<short>The game file to use</short>
<long>The name of the scheme file containing the solitaire game to play.</long>
</locale>
</schema>
......@@ -33,7 +33,7 @@
<default>beige.png bonded.png gnome.png bold-09x14.png knuth-09x10.png
knuth-18x21.png knuth-21x25.png</default>
<locale name="C">
<short>What card style to use.</short>
<short>What card style to use</short>
<long>A string containing a list of files to use to describe the cards. The format is obscure and defined by the gdk-card-image library</long>
</locale>
</schema>
......
......@@ -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)
......
......@@ -68,11 +68,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-reserve-no-string)
(string-append (_"Reserve left: ")
(string-append (_"Reserve left:") " "
(number->string (length (get-cards 6)))))
(define (get-base-string)
......@@ -90,7 +90,7 @@
(#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)
......
......@@ -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)
......
......@@ -278,7 +278,7 @@ void show_hint_dialog()
gmessage = g_strdup_printf (_("Move %s %s."), str1, str2);
free (str1);
free (str2);
g_warning(_("This game uses a deprecated hint method (case 3).\n Please file a bug at http://bugzilla.gnome.org including this message and\n the name of the game you where playing (look in the title bar if you \naren't sure)."));
g_warning(_("This game uses a deprecated hint method (case 3).\nPlease file a bug at http://bugzilla.gnome.org including this message and\nthe name of the game you where playing (look in the title bar if you \naren't sure)."));
break;
case 4:
......
......@@ -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,11 +83,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-reserve-no-string)
(string-append (_"Reserve left: ")
(string-append (_"Reserve left:") " "
(number->string (length (get-cards 10)))))
(define (get-base-string)
......@@ -105,7 +105,7 @@
(#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,11 +74,11 @@
(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)
......
......@@ -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,11 +69,11 @@
(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)
......
......@@ -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)
......
......@@ -130,7 +130,7 @@
(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"))))
......
......@@ -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,13 +69,13 @@
(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-VAL 11)
......@@ -84,7 +84,7 @@
(_"Base Card: Queen"))
((= BASE-VAL 13)
(_"Base Card: King"))
(#t (_"melborp"))))
(#t #f)))
(define (button-pressed slot-id card-list)
(and (not (empty-slot? slot-id))
......
......@@ -79,7 +79,7 @@
(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"))))
......
......@@ -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)
......
......@@ -68,11 +68,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-reserve-no-string)
(string-append (_"Reserve left: ")
(string-append (_"Reserve left:") " "
(number->string (length (get-cards 6)))))
(define (get-base-string)
......@@ -90,7 +90,7 @@
(#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)
......
......@@ -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,11 +83,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-reserve-no-string)
(string-append (_"Reserve left: ")
(string-append (_"Reserve left:") " "
(number->string (length (get-cards 10)))))
(define (get-base-string)
......@@ -105,7 +105,7 @@
(#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,11 +74,11 @@
(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)
......
......@@ -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,11 +69,11 @@
(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)
......
......@@ -67,11 +67,11 @@
(get-redeals-string))))