X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpage-intro.c;h=5005a448b1cd4c6ba1ec60d63d98492d2621f6d9;hb=3e98eec9f2c774a7c695944c15de651ecd120430;hp=e0d51f537c5066c902ee2d9c89dd5ef6993dc1b8;hpb=6e29a48cd6e626fb2542d5babcbdcc7f67c071d3;p=pspp diff --git a/src/ui/gui/page-intro.c b/src/ui/gui/page-intro.c index e0d51f537c..5005a448b1 100644 --- a/src/ui/gui/page-intro.c +++ b/src/ui/gui/page-intro.c @@ -22,7 +22,6 @@ #include #include -#include #include #include #include @@ -38,7 +37,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" @@ -48,11 +46,9 @@ #include "ui/gui/psppire-encoding-selector.h" #include "ui/gui/psppire-empty-list-store.h" #include "ui/gui/psppire-var-sheet.h" -#include "ui/gui/psppire-var-store.h" #include "ui/gui/psppire-scanf.h" #include "ui/syntax-gen.h" -#include "gl/error.h" #include "gl/intprops.h" #include "gl/xalloc.h" @@ -134,16 +130,16 @@ intro_page_create (struct import_assistant *ia) "commas, or other delimiters.\n\n")); if (ia->file.total_is_exact) ds_put_format ( - &s, ngettext ("The selected file contains %zu line of text. ", - "The selected file contains %zu lines of text. ", + &s, ngettext ("The selected file contains %'zu line of text. ", + "The selected file contains %'zu lines of text. ", ia->file.line_cnt), ia->file.line_cnt); else if (ia->file.total_lines > 0) { ds_put_format ( &s, ngettext ( - "The selected file contains approximately %lu line of text. ", - "The selected file contains approximately %lu lines of text. ", + "The selected file contains approximately %'lu line of text. ", + "The selected file contains approximately %'lu lines of text. ", ia->file.total_lines), ia->file.total_lines); ds_put_format (