diff --git a/ChangeLog b/ChangeLog
index 570b4b3728..3f458e4bae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-04  Sven Neumann  <sven@gimp.org>
+
+	* app/dialogs/file-save-dialog.c (file_save_dialog_use_extension):
+	use descriptive verbs in action buttons instead of Yes and No.
+
 2006-03-04  Sven Neumann  <sven@gimp.org>
 
 	* app/widgets/gimpcolordisplayeditor.c
diff --git a/app/dialogs/file-save-dialog.c b/app/dialogs/file-save-dialog.c
index eedd5627bf..ab2cf21708 100644
--- a/app/dialogs/file-save-dialog.c
+++ b/app/dialogs/file-save-dialog.c
@@ -391,8 +391,8 @@ file_save_dialog_use_extension (GtkWidget   *save_dialog,
                                     save_dialog, GTK_DIALOG_DESTROY_WITH_PARENT,
                                     gimp_standard_help_func, NULL,
 
-                                    GTK_STOCK_NO,  GTK_RESPONSE_CANCEL,
-                                    GTK_STOCK_YES, GTK_RESPONSE_OK,
+                                    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                    GTK_STOCK_SAVE,   GTK_RESPONSE_OK,
 
                                     NULL);
 
@@ -406,7 +406,8 @@ file_save_dialog_use_extension (GtkWidget   *save_dialog,
                                        "not match the chosen file type."));
 
   gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
-                             _("Do you want to use this name anyway?"));
+                             _("Do you want to save the image using this "
+                               "name anyway?"));
 
   gtk_dialog_set_response_sensitive (GTK_DIALOG (save_dialog),
                                      GTK_RESPONSE_CANCEL, FALSE);