X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpage-file.c;h=9280446b0f5ef103669175a7dda8341c8f7e8938;hb=68e18e2114130cf16e1e3813580a0dd1a2633f44;hp=fdbda325f8ffdc0771cfb647a108a6124865874d;hpb=09691dc4d67102153f02f9606b8710ac43d7964d;p=pspp diff --git a/src/ui/gui/page-file.c b/src/ui/gui/page-file.c index fdbda325f8..9280446b0f 100644 --- a/src/ui/gui/page-file.c +++ b/src/ui/gui/page-file.c @@ -39,7 +39,6 @@ #include "libpspp/i18n.h" #include "libpspp/line-reader.h" #include "libpspp/message.h" -#include "ui/gui/checkbox-treeview.h" #include "ui/gui/dialog-common.h" #include "ui/gui/executor.h" #include "ui/gui/helper.h" @@ -52,7 +51,6 @@ #include "ui/gui/psppire-scanf.h" #include "ui/syntax-gen.h" -#include "gl/error.h" #include "gl/intprops.h" #include "gl/xalloc.h" @@ -97,8 +95,8 @@ init_file (struct import_assistant *ia, GtkWindow *parent_window) struct line_reader *reader = line_reader_for_file (file->encoding, file->file_name, O_RDONLY); if (reader == NULL) { - msg (ME, _("Could not open `%s': %s"), - file->file_name, strerror (errno)); + msg_error (errno, _("Could not open `%s'"), + file->file_name); return false; } @@ -194,8 +192,8 @@ choose_file (GtkWindow *parent_window, gchar **encodingp) GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Import Delimited Text Data"), parent_window, GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("Open"), GTK_RESPONSE_ACCEPT, NULL); g_object_set (dialog, "local-only", FALSE, NULL);