Index: dialog.cpp
===================================================================
RCS file: /cvs/gnome/gnome-games/blackjack/src/dialog.cpp,v
retrieving revision 1.22
diff -u -p -r1.22 dialog.cpp
--- dialog.cpp	12 Nov 2004 20:00:40 -0000	1.22
+++ dialog.cpp	20 Mar 2005 23:01:27 -0000
@@ -227,9 +227,11 @@ show_preferences_dialog (void) 
                                                            GTK_RESPONSE_CLOSE,
                                                            NULL);
                 gtk_dialog_set_has_separator (GTK_DIALOG (pref_dialog), FALSE);
-                gtk_container_set_border_width (GTK_CONTAINER (pref_dialog), 6);
+                gtk_container_set_border_width (GTK_CONTAINER (pref_dialog), 5);
+                gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (pref_dialog)->vbox), 2);
                 
-                top_vbox = gtk_vbox_new (FALSE, 6);
+                top_vbox = gtk_vbox_new (FALSE, 18);
+                gtk_container_set_border_width (GTK_CONTAINER (top_vbox), 5);
                 gtk_container_add (GTK_CONTAINER (GTK_DIALOG (pref_dialog)->vbox),
                                    top_vbox);
                 
@@ -237,11 +239,11 @@ show_preferences_dialog (void) 
                 frame = games_frame_new (_("Game"));
                 vbox = gtk_vbox_new (FALSE, 6);
                 gtk_container_add (GTK_CONTAINER (frame), vbox);
-                gtk_box_pack_start_defaults (GTK_BOX (top_vbox), frame);
+                gtk_box_pack_start (GTK_BOX (top_vbox), frame, FALSE, FALSE, 0);
                 
                 // Show probabilities
                 show_probabilities = bj_get_show_probabilities ();
-                toggle = gtk_check_button_new_with_label (_("Display hand probabilities"));
+                toggle = gtk_check_button_new_with_mnemonic (_("_Display hand probabilities"));
                 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
                                               show_probabilities);
 
@@ -251,14 +253,14 @@ show_preferences_dialog (void) 
                 
                 // Quick deal
                 quick_deal = bj_get_quick_deal ();
-                toggle = gtk_check_button_new_with_label (_("Quick deals (no delay between each card)"));
+                toggle = gtk_check_button_new_with_mnemonic (_("_Quick deals (no delay between each card)"));
                 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
                                               quick_deal);
                 gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
                 g_signal_connect (toggle, "toggled",
                                   G_CALLBACK (quick_deal_toggle_cb), NULL);
                 
-                button = gtk_button_new_with_label (_("Reset balance"));
+                button = gtk_button_new_with_mnemonic (_("_Reset Balance"));
                 gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
                 g_signal_connect (button, "clicked",
                                   G_CALLBACK (reset_button_cb), NULL);
@@ -268,7 +270,7 @@ show_preferences_dialog (void) 
                 frame = games_frame_new (_("Rules"));
                 vbox = gtk_vbox_new (FALSE, 6);
                 gtk_container_add (GTK_CONTAINER (frame), vbox);
-                gtk_box_pack_start_defaults (GTK_BOX (top_vbox), frame);
+                gtk_box_pack_start (GTK_BOX (top_vbox), frame, TRUE, TRUE, 0);
 
                 list = gtk_list_store_new (13, 
                                            G_TYPE_STRING,  // Name
@@ -361,7 +363,7 @@ show_preferences_dialog (void) 
                                                 GTK_POLICY_AUTOMATIC,
                                                 GTK_POLICY_AUTOMATIC);
                 
-                gtk_box_pack_end (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 6);
+		gtk_box_pack_end (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
                 
                 g_signal_connect (select, "changed", 
                                   G_CALLBACK (select_rule_cb), (gpointer) pref_dialog);
@@ -403,7 +405,7 @@ show_preferences_dialog (void) 
                 
                 // Cards Tab
                 deck_edit = games_card_selector_new (bj_get_card_style ());
-                gtk_box_pack_start_defaults (GTK_BOX (top_vbox), deck_edit);
+                gtk_box_pack_start (GTK_BOX (top_vbox), deck_edit, FALSE, FALSE, 0);
 
                 g_signal_connect (deck_edit, "changed",
                                   G_CALLBACK (card_deck_options_changed), NULL);
Index: blackjack.cpp
===================================================================
RCS file: /cvs/gnome/gnome-games/blackjack/src/blackjack.cpp,v
retrieving revision 1.29
diff -u -p -r1.29 blackjack.cpp
--- blackjack.cpp	1 Mar 2005 07:10:47 -0000	1.29
+++ blackjack.cpp	20 Mar 2005 23:01:28 -0000
@@ -98,7 +98,7 @@ bj_make_window_title (gchar *game_name) 
 {
         char *title;
 
-        title = g_strdup_printf (_("Blackjack: %s"), game_name);
+        title = g_strdup_printf (_("Blackjack - %s"), game_name);
 
         gtk_window_set_title (GTK_WINDOW (toplevel_window), title); 
 
@@ -304,19 +304,19 @@ create_main_window (void)
 
         static GtkActionEntry entries [] = {
                 { "game-menu", NULL, N_("_Game") },
-                { "new-game", GTK_STOCK_NEW, N_("_New game"), "<Control>N", N_("Start a new game"), G_CALLBACK (on_game_new_activate) },
-                { "restart-game", GTK_STOCK_REFRESH, N_("_Restart game"), "<Control>R", N_("Restart the current game"), G_CALLBACK (on_game_restart_activate) },
+                { "new-game", GTK_STOCK_NEW, N_("_New Game"), "<Control>N", N_("Start a new game"), G_CALLBACK (on_game_new_activate) },
+                { "restart-game", GTK_STOCK_REFRESH, N_("_Restart Game"), "<Control>R", N_("Restart the current game"), G_CALLBACK (on_game_restart_activate) },
                 { "show-hint", GTK_STOCK_HELP, N_("_Hint"), NULL, N_("Get a hint for the next action"), G_CALLBACK (on_game_hint_activate) },
                 { "quit-game", GTK_STOCK_QUIT, NULL, "<Control>Q", N_("Quit application"), G_CALLBACK (on_game_quit_activate) },
                 { "settings-menu", NULL, N_("_Settings") },
                 { "show-preferences", GTK_STOCK_PREFERENCES, NULL, NULL, N_("Show game preferences"), G_CALLBACK (on_preferences_activate) },
                 { "control-menu", NULL, N_("_Control") },
-                { "hand-deal", NULL, N_("Deal"), NULL, N_("Deal a new hand"), G_CALLBACK (on_control_deal_activate) },
+                { "hand-deal", NULL, N_("D_eal"), NULL, N_("Deal a new hand"), G_CALLBACK (on_control_deal_activate) },
                 { "hand-hit", NULL, N_("_Hit"), "H", N_("Add a card to the hand"), G_CALLBACK (on_control_hit_activate) },
                 { "hand-stand", NULL, N_("_Stand"), "S", N_("Stop adding cards to the hand"), G_CALLBACK (on_control_stand_activate) },
-                { "hand-surrender", NULL, N_("Surrender"), "R", N_("Surrender the hand"), G_CALLBACK (on_control_surrender_activate) },
+                { "hand-surrender", NULL, N_("S_urrender"), "R", N_("Surrender the hand"), G_CALLBACK (on_control_surrender_activate) },
                 { "hand-double-down", NULL, N_("_Double down"), "D", N_("Double down"), G_CALLBACK (on_control_double_activate) },
-                { "hand-split", NULL, N_("Split the hand"), "P", N_("Split the hand"), G_CALLBACK (on_control_split_activate) },
+                { "hand-split", NULL, N_("S_plit the hand"), "P", N_("Split the hand"), G_CALLBACK (on_control_split_activate) },
                 { "help-menu", NULL, N_("_Help")},
                 { "show-help-contents", GTK_STOCK_HELP, N_("_Contents"), "F1", N_("Display help for this game"), G_CALLBACK (on_help_contents_activate) },
                 { "show-about", GTK_STOCK_ABOUT, NULL, NULL, N_("About this game"), G_CALLBACK (on_help_about_activate) },
@@ -679,7 +679,7 @@ main (int argc, char *argv [])
                               GCONF_CLIENT_PRELOAD_NONE, NULL);
 
 #ifdef HAVE_GNOME
-        gnome_program_init ("blackjack", VERSION,
+        gnome_program_init ("Blackjack", VERSION,
                             LIBGNOMEUI_MODULE,
                             argc, argv,
                             GNOME_PARAM_APP_DATADIR, DATADIR, NULL);
