Final changes for 0.6.0 release.

diff --git a/ChangeLog b/ChangeLog
index 98f227c6a257105977f4f7c8161e19585f9601cc..a56be93ae1d34588e1a5f22a71cbe37c9ebae680 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-04  Ben Pfaff  <blp@gnu.org>
+
+       * configure.ac: Update version number to 0.6.0 in preparation for
+       release.
+

 2008-05-15  Ben Pfaff  <blp@gnu.org>
 
        * Smake (GNULIB_MODULES): Don't depend on memmem module, because
 2008-05-15  Ben Pfaff  <blp@gnu.org>
 
        * Smake (GNULIB_MODULES): Don't depend on memmem module, because

diff --git a/INSTALL b/INSTALL
index c1a48ef8f5e8606508f0b30a931b7e7fb8b61944..c07faa27841a284c8231fded9edd970e8755c0bd 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -60,6 +60,10 @@ Gnumeric files.
       0.18 and 0.19 have a bug that will prevent library detection,
       but other versions should be fine.
 
       0.18 and 0.19 have a bug that will prevent library detection,
       but other versions should be fine.
 

+      To cross-compile PSPP, you will likely need to set the
+      PKG_CONFIG_LIBDIR environment variable to point to an
+      appropriate pkg-config for the cross-compilation environment.
+

     * zlib (http://www.zlib.net/).
 
     * libxml2 (http://xmlsoft.org/).  
     * zlib (http://www.zlib.net/).
 
     * libxml2 (http://xmlsoft.org/).  

diff --git a/NEWS b/NEWS
index 4b2032612854fbb367e963c162c94fbabf6d4978..874106d6cf5d8517ddc505ec6d37867f6115fe17 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,11 @@
 PSPP NEWS -- history of user-visible changes.
 PSPP NEWS -- history of user-visible changes.

-Time-stamp: <2007-12-04 22:44:10 blp>
+Time-stamp: <2008-06-04 21:27:06 blp>

 Copyright (C) 1996-9, 2000 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 Please send PSPP bug reports to bug-gnu-pspp@gnu.org.
 
 Copyright (C) 1996-9, 2000 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 Please send PSPP bug reports to bug-gnu-pspp@gnu.org.
 

-Changes from 0.4.0 to 0.4.3:
+Changes from 0.4.0 to 0.6.0:

 
   * The PSPP license is now version 3 or later of the GNU General
     Public License.  Previously, it was version 2 or later.
 
   * The PSPP license is now version 3 or later of the GNU General
     Public License.  Previously, it was version 2 or later.

diff --git a/README b/README
index 66df02b16a7bd83a94e1cf6e6ff9a1f90b0a8d74..07aae20ac94ee36dd7992d094043419af862dc19 100644 (file)
--- a/README
+++ b/README
@@ -16,9 +16,22 @@ NEWS.
           
 Source code for the latest release of PSPP is available at
 ftp://ftp.gnu.org/pub/gnu/pspp/.  Older versions may be obtained from
           
 Source code for the latest release of PSPP is available at
 ftp://ftp.gnu.org/pub/gnu/pspp/.  Older versions may be obtained from

-ftp://alpha.gnu.org/gnu/pspp/.  Development sources are available from
-CVS at http://savannah.gnu.org/projects/pspp
-   
+ftp://alpha.gnu.org/gnu/pspp/.  Development sources are available
+at http://savannah.gnu.org/projects/pspp
+
+The following miscellaneous notes apply to this release:
+
+       * If you use GCC 4.3 or later to compile PSPP, along with any
+         version of the GNU Scientific Library (GSL) released as of
+         this writing (June 2008), then you will need to specify the
+         -fgnu89-inline flag to the compiler on the "configure"
+         command line: "./configure CFLAGS=-fgnu89-inline".
+
+       * On a few operating systems, such as OpenBSD, some of the
+          tests may fail with messages similar to: 'Warning: cannot
+          create a convertor for "646" to "UTF-8"'.  These test
+          failures may safely be ignored.
+

 Questions and comments about using PSPP may be sent to pspp-users@gnu.org.
 Bug reports may be filed at http://savannah.gnu.org/bugs/?group=pspp
 or emailed to bug-gnu-pspp@gnu.org.  We prefer the web-based system
 Questions and comments about using PSPP may be sent to pspp-users@gnu.org.
 Bug reports may be filed at http://savannah.gnu.org/bugs/?group=pspp
 or emailed to bug-gnu-pspp@gnu.org.  We prefer the web-based system

diff --git a/configure.ac b/configure.ac
index fdfc16627c66be11ceea07482ce80ae410131d17..22ef133134cf7b91aa31bfa6c3389680e296b221 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
 AX_PREREQ(2.60)
 
 dnl Initialize.
 AX_PREREQ(2.60)

-AC_INIT([pspp],[0.4.3],[bug-gnu-pspp@gnu.org])
+AC_INIT([pspp],[0.6.0],[bug-gnu-pspp@gnu.org])

 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE
 
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE
 

diff --git a/po/de.po b/po/de.po
index 2aca1e93df9397082fa6a794654bf04eac291667..1349c45141e4c013031f68e597bab68989f0d8ff 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"

-"POT-Creation-Date: 2008-05-20 08:52+0800\n"
+"POT-Creation-Date: 2008-06-07 23:34-0700\n"

 "PO-Revision-Date: 2006-07-28 19:32+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: German <pspp-dev@gnu.org>\n"
 "PO-Revision-Date: 2006-07-28 19:32+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: German <pspp-dev@gnu.org>\n"


@@ -47,12 +47,6 @@ msgstr "Tag %d muß zwischen 0 bit 31 sein."
 msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15."
 msgstr ""
 
 msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15."
 msgstr ""
 

-#: src/data/casereader-filter.c:221
-msgid ""
-"At least one case in the data read had a weight value that was user-missing, "
-"system-missing, zero, or negative.  These case(s) were ignored."
-msgstr ""
-

 #: src/data/case-tmpfile.c:57
 #, c-format
 msgid "failed to create temporary file"
 #: src/data/case-tmpfile.c:57
 #, c-format
 msgid "failed to create temporary file"


@@ -78,6 +72,12 @@ msgstr "plotzlich ist der Datei beendet"
 msgid "writing to temporary file"
 msgstr ""
 
 msgid "writing to temporary file"
 msgstr ""
 

+#: src/data/casereader-filter.c:221
+msgid ""
+"At least one case in the data read had a weight value that was user-missing, "
+"system-missing, zero, or negative.  These case(s) were ignored."
+msgstr ""
+

 #: src/data/data-in.c:262 src/data/data-in.c:452
 msgid "Field contents are not numeric."
 msgstr ""
 #: src/data/data-in.c:262 src/data/data-in.c:452
 msgid "Field contents are not numeric."
 msgstr ""


@@ -325,14 +325,14 @@ msgid "%s variables are not compatible with %s format %s."
 msgstr ""
 
 #: src/data/format.c:327 src/data/sys-file-reader.c:639
 msgstr ""
 
 #: src/data/format.c:327 src/data/sys-file-reader.c:639

-#: src/ui/gui/data-editor.glade:1190 src/ui/gui/psppire.glade:2176
-#: src/ui/gui/psppire-var-store.c:605
+#: src/ui/gui/data-editor.glade:1190 src/ui/gui/psppire-var-store.c:605
+#: src/ui/gui/psppire.glade:2176

 msgid "String"
 msgstr "Zeichenkette"
 
 #: src/data/format.c:327 src/data/sys-file-reader.c:639
 msgid "String"
 msgstr "Zeichenkette"
 
 #: src/data/format.c:327 src/data/sys-file-reader.c:639

-#: src/ui/gui/data-editor.glade:1079 src/ui/gui/psppire.glade:2131
-#: src/ui/gui/psppire-var-store.c:598
+#: src/ui/gui/data-editor.glade:1079 src/ui/gui/psppire-var-store.c:598
+#: src/ui/gui/psppire.glade:2131

 msgid "Numeric"
 msgstr "Nummer"
 
 msgid "Numeric"
 msgstr "Nummer"
 


@@ -1283,7 +1283,7 @@ msgstr ""
 #: src/language/dictionary/sys-file-info.c:161
 #: src/language/dictionary/sys-file-info.c:390
 #: src/language/dictionary/sys-file-info.c:634
 #: src/language/dictionary/sys-file-info.c:161
 #: src/language/dictionary/sys-file-info.c:390
 #: src/language/dictionary/sys-file-info.c:634

-#: src/language/stats/descriptives.c:883 src/ui/gui/dict-display.c:242
+#: src/language/stats/descriptives.c:883 src/ui/gui/dict-display.c:245

 msgid "Variable"
 msgstr ""
 
 msgid "Variable"
 msgstr ""
 


@@ -1432,6 +1432,67 @@ msgstr ""
 msgid "Handle for %s not allowed here."
 msgstr ""
 
 msgid "Handle for %s not allowed here."
 msgstr ""
 

+#: src/language/data-io/get-data.c:62
+#, c-format
+msgid "Unsupported TYPE %s"
+msgstr ""
+
+#: src/language/data-io/get-data.c:258
+#, c-format
+msgid ""
+"%s is allowed only with %s arrangement, but %s arrangement was stated or "
+"implied earlier in this command."
+msgstr ""
+
+#: src/language/data-io/get-data.c:313
+msgid "expecting FIXED or DELIMITED"
+msgstr ""
+
+#: src/language/data-io/get-data.c:326
+msgid "Value of FIRSTCASE must be 1 or greater."
+msgstr ""
+
+#: src/language/data-io/get-data.c:351
+msgid "expecting LINE or VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:364
+msgid "Value of FIXCASE must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:384
+msgid "Value of FIRST must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:396
+msgid "Value of PERCENT must be between 1 and 100."
+msgstr ""
+
+#: src/language/data-io/get-data.c:445
+msgid ""
+"In compatible syntax mode, the QUALIFIER string must contain exactly one "
+"character."
+msgstr ""
+
+#: src/language/data-io/get-data.c:460
+msgid "expecting VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:482
+#: src/language/data-io/placement-parser.c:378
+#, c-format
+msgid ""
+"The record number specified, %ld, is at or before the previous record, %d.  "
+"Data fields must be listed in order of increasing record number."
+msgstr ""
+
+#: src/language/data-io/get-data.c:491
+#, c-format
+msgid ""
+"The record number specified, %ld, exceeds the number of records per case "
+"specified on FIXCASE, %d."
+msgstr ""
+

 #: src/language/data-io/get.c:99
 msgid "expecting COMM or TAPE"
 msgstr ""
 #: src/language/data-io/get.c:99
 msgid "expecting COMM or TAPE"
 msgstr ""


@@ -1521,67 +1582,6 @@ msgid ""
 "variable in earlier file (%s)."
 msgstr ""
 
 "variable in earlier file (%s)."
 msgstr ""
 

-#: src/language/data-io/get-data.c:62
-#, c-format
-msgid "Unsupported TYPE %s"
-msgstr ""
-
-#: src/language/data-io/get-data.c:258
-#, c-format
-msgid ""
-"%s is allowed only with %s arrangement, but %s arrangement was stated or "
-"implied earlier in this command."
-msgstr ""
-
-#: src/language/data-io/get-data.c:313
-msgid "expecting FIXED or DELIMITED"
-msgstr ""
-
-#: src/language/data-io/get-data.c:326
-msgid "Value of FIRSTCASE must be 1 or greater."
-msgstr ""
-
-#: src/language/data-io/get-data.c:351
-msgid "expecting LINE or VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:364
-msgid "Value of FIXCASE must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:384
-msgid "Value of FIRST must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:396
-msgid "Value of PERCENT must be between 1 and 100."
-msgstr ""
-
-#: src/language/data-io/get-data.c:445
-msgid ""
-"In compatible syntax mode, the QUALIFIER string must contain exactly one "
-"character."
-msgstr ""
-
-#: src/language/data-io/get-data.c:460
-msgid "expecting VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:482
-#: src/language/data-io/placement-parser.c:378
-#, c-format
-msgid ""
-"The record number specified, %ld, is at or before the previous record, %d.  "
-"Data fields must be listed in order of increasing record number."
-msgstr ""
-
-#: src/language/data-io/get-data.c:491
-#, c-format
-msgid ""
-"The record number specified, %ld, exceeds the number of records per case "
-"specified on FIXCASE, %d."
-msgstr ""
-

 #: src/language/data-io/inpt-pgm.c:130
 msgid "Unexpected end-of-file within INPUT PROGRAM."
 msgstr ""
 #: src/language/data-io/inpt-pgm.c:130
 msgid "Unexpected end-of-file within INPUT PROGRAM."
 msgstr ""


@@ -1671,6 +1671,20 @@ msgstr ""
 msgid "The ending column for a field must be greater than the starting column."
 msgstr ""
 
 msgid "The ending column for a field must be greater than the starting column."
 msgstr ""
 

+#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
+#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+

 #: src/language/data-io/print.c:266
 #, c-format
 msgid "Output calls for %d records but %zu specified on RECORDS subcommand."
 #: src/language/data-io/print.c:266
 #, c-format
 msgid "Output calls for %d records but %zu specified on RECORDS subcommand."


@@ -1690,20 +1704,6 @@ msgid_plural "Writing %d records."
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
-#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-

 #: src/language/dictionary/apply-dictionary.c:75
 #, c-format
 msgid "Variable %s is %s in target file, but %s in source file."
 #: src/language/dictionary/apply-dictionary.c:75
 #, c-format
 msgid "Variable %s is %s in target file, but %s in source file."


@@ -1889,7 +1889,7 @@ msgstr ""
 #: src/language/dictionary/split-file.c:86
 #: src/language/dictionary/sys-file-info.c:397
 #: src/language/dictionary/sys-file-info.c:564 src/ui/gui/crosstabs.glade:275
 #: src/language/dictionary/split-file.c:86
 #: src/language/dictionary/sys-file-info.c:397
 #: src/language/dictionary/sys-file-info.c:564 src/ui/gui/crosstabs.glade:275

-#: src/ui/gui/psppire.glade:2099 src/ui/gui/psppire-var-sheet.c:104
+#: src/ui/gui/psppire-var-sheet.c:104 src/ui/gui/psppire.glade:2099

 msgid "Label"
 msgstr "Kennsatz"
 
 msgid "Label"
 msgstr "Kennsatz"
 


@@ -2863,8 +2863,8 @@ msgstr ""
 msgid "Directional measures."
 msgstr ""
 
 msgid "Directional measures."
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1223 src/ui/gui/psppire.glade:2223
-#: src/ui/gui/psppire-var-sheet.c:101
+#: src/language/stats/crosstabs.q:1223 src/ui/gui/psppire-var-sheet.c:101
+#: src/ui/gui/psppire.glade:2223

 msgid "Type"
 msgstr "Typ"
 
 msgid "Type"
 msgstr "Typ"
 


@@ -3395,6 +3395,22 @@ msgstr ""
 msgid "TABLES subcommand may not appear more than once."
 msgstr ""
 
 msgid "TABLES subcommand may not appear more than once."
 msgstr ""
 

+#: src/language/stats/npar-summary.c:108
+msgid "Descriptive Statistics"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:145
+msgid "25th"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:148
+msgid "50th (Median)"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:151
+msgid "75th"
+msgstr ""
+

 #: src/language/stats/npar.q:98
 msgid "NPAR subcommand not currently implemented."
 msgstr ""
 #: src/language/stats/npar.q:98
 msgid "NPAR subcommand not currently implemented."
 msgstr ""


@@ -3419,22 +3435,6 @@ msgid ""
 "not match the number following (%zu)."
 msgstr ""
 
 "not match the number following (%zu)."
 msgstr ""
 

-#: src/language/stats/npar-summary.c:108
-msgid "Descriptive Statistics"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:145
-msgid "25th"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:148
-msgid "50th (Median)"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:151
-msgid "75th"
-msgstr ""
-

 #: src/language/stats/oneway.q:169
 msgid "Number of contrast coefficients must equal the number of groups"
 msgstr ""
 #: src/language/stats/oneway.q:169
 msgid "Number of contrast coefficients must equal the number of groups"
 msgstr ""


@@ -5654,15 +5654,6 @@ msgstr "xyzzy"
 msgid "Paste"
 msgstr "Datum"
 
 msgid "Paste"
 msgstr "Datum"
 

-#: src/ui/gui/psppire.c:194
-msgid "_Reset"
-msgstr "_Zurücksetzen"
-
-#: src/ui/gui/psppire.c:195
-#, fuzzy
-msgid "_Select"
-msgstr "Schriftwahlung"
-

 #: src/ui/gui/psppire-data-editor.c:604
 msgid "Data View"
 msgstr "Datenansicht"
 #: src/ui/gui/psppire-data-editor.c:604
 msgid "Data View"
 msgstr "Datenansicht"


@@ -5680,10 +5671,57 @@ msgstr ""
 msgid "%ld"
 msgstr ""
 
 msgid "%ld"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:11
+#: src/ui/gui/psppire-var-sheet.c:100
+msgid "Name"
+msgstr "Name"
+
+#: src/ui/gui/psppire-var-sheet.c:102 src/ui/gui/psppire.glade:2187
+msgid "Width"
+msgstr "Große"
+
+#: src/ui/gui/psppire-var-sheet.c:103
+msgid "Decimals"
+msgstr "Dezimalstellen"
+
+#: src/ui/gui/psppire-var-sheet.c:105
+msgid "Values"
+msgstr "Werten"
+
+#: src/ui/gui/psppire-var-sheet.c:108
+msgid "Align"
+msgstr "Einstellung"
+
+#: src/ui/gui/psppire-var-sheet.c:109
+msgid "Measure"
+msgstr "Messe"
+
+#: src/ui/gui/psppire-var-store.c:601
+msgid "Scientific"
+msgstr "Wissenschäflich"
+
+#: src/ui/gui/psppire-var-store.c:604
+msgid "Custom"
+msgstr "Spezial"
+
+#: src/ui/gui/psppire-var-store.c:675 src/ui/gui/psppire-var-store.c:685
+#: src/ui/gui/psppire-var-store.c:695
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: src/ui/gui/psppire.c:194
+msgid "_Reset"
+msgstr "_Zurücksetzen"
+
+#: src/ui/gui/psppire.c:195

 #, fuzzy
 #, fuzzy

-msgid "This is pre-alpha software.  Use at your own risk."
-msgstr "Diese Software ist vor-Alpha.  Wahrscheinlich Funktioniert es nicht."
+msgid "_Select"
+msgstr "Schriftwahlung"
+
+#: src/ui/gui/psppire.glade:11
+msgid ""
+"This is beta status software.  Please report bugs to bug-gnu-pspp@gnu.org"
+msgstr ""

 
 #: src/ui/gui/psppire.glade:73 src/ui/gui/psppire.glade:154
 #: src/ui/gui/weight-cases-dialog.c:80
 
 #: src/ui/gui/psppire.glade:73 src/ui/gui/psppire.glade:154
 #: src/ui/gui/weight-cases-dialog.c:80


@@ -5876,10 +5914,6 @@ msgstr ""
 msgid "Use expression as label"
 msgstr ""
 
 msgid "Use expression as label"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:2187 src/ui/gui/psppire-var-sheet.c:102
-msgid "Width"
-msgstr "Große"
-

 #: src/ui/gui/psppire.glade:2274
 msgid "Goto Case Number:"
 msgstr ""
 #: src/ui/gui/psppire.glade:2274
 msgid "Goto Case Number:"
 msgstr ""


@@ -5915,40 +5949,6 @@ msgstr ""
 msgid "Search backward"
 msgstr ""
 
 msgid "Search backward"
 msgstr ""
 

-#: src/ui/gui/psppire-var-sheet.c:100
-msgid "Name"
-msgstr "Name"
-
-#: src/ui/gui/psppire-var-sheet.c:103
-msgid "Decimals"
-msgstr "Dezimalstellen"
-
-#: src/ui/gui/psppire-var-sheet.c:105
-msgid "Values"
-msgstr "Werten"
-
-#: src/ui/gui/psppire-var-sheet.c:108
-msgid "Align"
-msgstr "Einstellung"
-
-#: src/ui/gui/psppire-var-sheet.c:109
-msgid "Measure"
-msgstr "Messe"
-
-#: src/ui/gui/psppire-var-store.c:601
-msgid "Scientific"
-msgstr "Wissenschäflich"
-
-#: src/ui/gui/psppire-var-store.c:604
-msgid "Custom"
-msgstr "Spezial"
-
-#: src/ui/gui/psppire-var-store.c:675 src/ui/gui/psppire-var-store.c:685
-#: src/ui/gui/psppire-var-store.c:695
-#, c-format
-msgid "%d"
-msgstr ""
-

 #: src/ui/gui/rank.glade:111
 msgid "By:"
 msgstr ""
 #: src/ui/gui/rank.glade:111
 msgid "By:"
 msgstr ""


@@ -6264,37 +6264,95 @@ msgstr ""
 msgid "To End"
 msgstr ""
 
 msgid "To End"
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:460
+#: src/ui/gui/t-test-options.c:60
+#, c-format
+msgid "Confidence Interval: %2d %%"
+msgstr ""
+
+#: src/ui/gui/t-test-paired-samples.c:228
+msgid "Var 1"
+msgstr ""
+
+#: src/ui/gui/t-test-paired-samples.c:229
+msgid "Var 2"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:56 src/ui/gui/t-test.glade:165
+msgid "Define Groups"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:123 src/ui/gui/t-test.glade:549
+#: src/ui/gui/t-test.glade:761
+#, fuzzy
+msgid "Test Variable(s):"
+msgstr "Variableansicht"
+
+#: src/ui/gui/t-test.glade:258
+msgid "Group_2 value:"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:271
+msgid "Group_1 value:"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:320
+msgid "_Cut point:"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:349
+msgid "_Use specified values:"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:431
+msgid "Exclude cases _analysis by analysis"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:442
+msgid "Exclude cases _listwise"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:594
+#, fuzzy
+msgid "Test Value: "
+msgstr "Werte:"
+
+#: src/ui/gui/text-data-import-dialog.c:70
+msgid ""
+"The text import assistant has not been compiled into this build of PSPPIRE, "
+"because GTK+ version 2.10.0 or later was not available."
+msgstr ""
+
+#: src/ui/gui/text-data-import-dialog.c:488

 #, c-format
 msgid "Could not open \"%s\": %s"
 msgstr ""
 
 #, c-format
 msgid "Could not open \"%s\": %s"
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:476
+#: src/ui/gui/text-data-import-dialog.c:504

 #, fuzzy, c-format
 msgid "Error reading \"%s\": %s"
 msgstr "Ein Fehler ist passiert als \\\"%s\\\" geoffnet war: %s"
 
 #, fuzzy, c-format
 msgid "Error reading \"%s\": %s"
 msgstr "Ein Fehler ist passiert als \\\"%s\\\" geoffnet war: %s"
 

-#: src/ui/gui/text-data-import-dialog.c:479
+#: src/ui/gui/text-data-import-dialog.c:507

 #, c-format
 msgid ""
 "Failed to read \"%s\", because it contains a line over %d bytes long and "
 "therefore appears not to be a text file."
 msgstr ""
 
 #, c-format
 msgid ""
 "Failed to read \"%s\", because it contains a line over %d bytes long and "
 "therefore appears not to be a text file."
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:493
+#: src/ui/gui/text-data-import-dialog.c:521

 #, c-format
 msgid "\"%s\" is empty."
 msgstr ""
 
 #, c-format
 msgid "\"%s\" is empty."
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:538
+#: src/ui/gui/text-data-import-dialog.c:566

 msgid "Import Delimited Text Data"
 msgstr ""
 
 msgid "Import Delimited Text Data"
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:589
+#: src/ui/gui/text-data-import-dialog.c:617

 msgid "Importing Delimited Text Data"
 msgstr ""
 
 msgid "Importing Delimited Text Data"
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:740
+#: src/ui/gui/text-data-import-dialog.c:768

 msgid ""
 "This assistant will guide you through the process of importing data into "
 "PSPP from a text file with one line per case,  in which fields are separated "
 msgid ""
 "This assistant will guide you through the process of importing data into "
 "PSPP from a text file with one line per case,  in which fields are separated "


@@ -6302,21 +6360,21 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:746
+#: src/ui/gui/text-data-import-dialog.c:774

 #, c-format
 msgid "The selected file contains %zu line of text.  "
 msgid_plural "The selected file contains %zu lines of text.  "
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "The selected file contains %zu line of text.  "
 msgid_plural "The selected file contains %zu lines of text.  "
 msgstr[0] ""
 msgstr[1] ""
 

-#: src/ui/gui/text-data-import-dialog.c:754
+#: src/ui/gui/text-data-import-dialog.c:782

 #, c-format
 msgid "The selected file contains approximately %lu line of text.  "
 msgid_plural "The selected file contains approximately %lu lines of text.  "
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "The selected file contains approximately %lu line of text.  "
 msgid_plural "The selected file contains approximately %lu lines of text.  "
 msgstr[0] ""
 msgstr[1] ""
 

-#: src/ui/gui/text-data-import-dialog.c:760
+#: src/ui/gui/text-data-import-dialog.c:788

 #, c-format
 msgid ""
 "Only the first %zu line of the file will be shown for preview purposes in "
 #, c-format
 msgid ""
 "Only the first %zu line of the file will be shown for preview purposes in "


@@ -6327,16 +6385,16 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: src/ui/gui/text-data-import-dialog.c:767
+#: src/ui/gui/text-data-import-dialog.c:795

 msgid "You may choose below how much of the file should actually be imported."
 msgstr ""
 
 msgid "You may choose below how much of the file should actually be imported."
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:1487
-#: src/ui/gui/text-data-import-dialog.c:1731
+#: src/ui/gui/text-data-import-dialog.c:1515
+#: src/ui/gui/text-data-import-dialog.c:1759

 msgid "This input line has too few separators to fill in this field."
 msgstr ""
 
 msgid "This input line has too few separators to fill in this field."
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:1722
+#: src/ui/gui/text-data-import-dialog.c:1750

 #, c-format
 msgid "Field content \"%.*s\" cannot be parsed in format %s."
 msgstr ""
 #, c-format
 msgid "Field content \"%.*s\" cannot be parsed in format %s."
 msgstr ""


@@ -6484,58 +6542,6 @@ msgstr "Variableansicht"
 msgid "<b>Data Preview</b>"
 msgstr ""
 
 msgid "<b>Data Preview</b>"
 msgstr ""
 

-#: src/ui/gui/t-test.glade:56 src/ui/gui/t-test.glade:165
-msgid "Define Groups"
-msgstr ""
-
-#: src/ui/gui/t-test.glade:123 src/ui/gui/t-test.glade:549
-#: src/ui/gui/t-test.glade:761
-#, fuzzy
-msgid "Test Variable(s):"
-msgstr "Variableansicht"
-
-#: src/ui/gui/t-test.glade:258
-msgid "Group_2 value:"
-msgstr ""
-
-#: src/ui/gui/t-test.glade:271
-msgid "Group_1 value:"
-msgstr ""
-
-#: src/ui/gui/t-test.glade:320
-msgid "_Cut point:"
-msgstr ""
-
-#: src/ui/gui/t-test.glade:349
-msgid "_Use specified values:"
-msgstr ""
-
-#: src/ui/gui/t-test.glade:431
-msgid "Exclude cases _analysis by analysis"
-msgstr ""
-
-#: src/ui/gui/t-test.glade:442
-msgid "Exclude cases _listwise"
-msgstr ""
-
-#: src/ui/gui/t-test.glade:594
-#, fuzzy
-msgid "Test Value: "
-msgstr "Werte:"
-
-#: src/ui/gui/t-test-options.c:60
-#, c-format
-msgid "Confidence Interval: %2d %%"
-msgstr ""
-
-#: src/ui/gui/t-test-paired-samples.c:228
-msgid "Var 1"
-msgstr ""
-
-#: src/ui/gui/t-test-paired-samples.c:229
-msgid "Var 2"
-msgstr ""
-

 #: src/ui/gui/variable-info-dialog.c:89
 #, fuzzy, c-format
 msgid "Label: %s\n"
 #: src/ui/gui/variable-info-dialog.c:89
 #, fuzzy, c-format
 msgid "Label: %s\n"


@@ -6692,6 +6698,11 @@ msgstr "Warnung"
 msgid "could not access definition for terminal `%s'"
 msgstr ""
 
 msgid "could not access definition for terminal `%s'"
 msgstr ""
 

+#, fuzzy
+#~ msgid "This is pre-alpha software.  Use at your own risk."
+#~ msgstr ""
+#~ "Diese Software ist vor-Alpha.  Wahrscheinlich Funktioniert es nicht."
+

 #, fuzzy
 #~ msgid "Data File Comments"
 #~ msgstr "Datei Fehler"
 #, fuzzy
 #~ msgid "Data File Comments"
 #~ msgstr "Datei Fehler"

diff --git a/po/en_GB.po b/po/en_GB.po
index e3eff412e641f906bcb303f1da8d98b00639dfba..bf0739269395b944d4a6f7c925b77aff05c83f4b 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"

-"POT-Creation-Date: 2008-05-20 08:52+0800\n"
+"POT-Creation-Date: 2008-06-07 23:34-0700\n"

 "PO-Revision-Date: 2007-09-15 08:29+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: John Darrington <john@darrington.wattle.id.au>\n"
 "PO-Revision-Date: 2007-09-15 08:29+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: John Darrington <john@darrington.wattle.id.au>\n"


@@ -44,12 +44,6 @@ msgstr ""
 msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15."
 msgstr ""
 
 msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15."
 msgstr ""
 

-#: src/data/casereader-filter.c:221
-msgid ""
-"At least one case in the data read had a weight value that was user-missing, "
-"system-missing, zero, or negative.  These case(s) were ignored."
-msgstr ""
-

 #: src/data/case-tmpfile.c:57
 #, c-format
 msgid "failed to create temporary file"
 #: src/data/case-tmpfile.c:57
 #, c-format
 msgid "failed to create temporary file"


@@ -75,6 +69,12 @@ msgstr ""
 msgid "writing to temporary file"
 msgstr ""
 
 msgid "writing to temporary file"
 msgstr ""
 

+#: src/data/casereader-filter.c:221
+msgid ""
+"At least one case in the data read had a weight value that was user-missing, "
+"system-missing, zero, or negative.  These case(s) were ignored."
+msgstr ""
+

 #: src/data/data-in.c:262 src/data/data-in.c:452
 msgid "Field contents are not numeric."
 msgstr ""
 #: src/data/data-in.c:262 src/data/data-in.c:452
 msgid "Field contents are not numeric."
 msgstr ""


@@ -320,14 +320,14 @@ msgid "%s variables are not compatible with %s format %s."
 msgstr ""
 
 #: src/data/format.c:327 src/data/sys-file-reader.c:639
 msgstr ""
 
 #: src/data/format.c:327 src/data/sys-file-reader.c:639

-#: src/ui/gui/data-editor.glade:1190 src/ui/gui/psppire.glade:2176
-#: src/ui/gui/psppire-var-store.c:605
+#: src/ui/gui/data-editor.glade:1190 src/ui/gui/psppire-var-store.c:605
+#: src/ui/gui/psppire.glade:2176

 msgid "String"
 msgstr ""
 
 #: src/data/format.c:327 src/data/sys-file-reader.c:639
 msgid "String"
 msgstr ""
 
 #: src/data/format.c:327 src/data/sys-file-reader.c:639

-#: src/ui/gui/data-editor.glade:1079 src/ui/gui/psppire.glade:2131
-#: src/ui/gui/psppire-var-store.c:598
+#: src/ui/gui/data-editor.glade:1079 src/ui/gui/psppire-var-store.c:598
+#: src/ui/gui/psppire.glade:2131

 msgid "Numeric"
 msgstr ""
 
 msgid "Numeric"
 msgstr ""
 


@@ -1275,7 +1275,7 @@ msgstr ""
 #: src/language/dictionary/sys-file-info.c:161
 #: src/language/dictionary/sys-file-info.c:390
 #: src/language/dictionary/sys-file-info.c:634
 #: src/language/dictionary/sys-file-info.c:161
 #: src/language/dictionary/sys-file-info.c:390
 #: src/language/dictionary/sys-file-info.c:634

-#: src/language/stats/descriptives.c:883 src/ui/gui/dict-display.c:242
+#: src/language/stats/descriptives.c:883 src/ui/gui/dict-display.c:245

 msgid "Variable"
 msgstr ""
 
 msgid "Variable"
 msgstr ""
 


@@ -1423,6 +1423,67 @@ msgstr ""
 msgid "Handle for %s not allowed here."
 msgstr ""
 
 msgid "Handle for %s not allowed here."
 msgstr ""
 

+#: src/language/data-io/get-data.c:62
+#, c-format
+msgid "Unsupported TYPE %s"
+msgstr ""
+
+#: src/language/data-io/get-data.c:258
+#, c-format
+msgid ""
+"%s is allowed only with %s arrangement, but %s arrangement was stated or "
+"implied earlier in this command."
+msgstr ""
+
+#: src/language/data-io/get-data.c:313
+msgid "expecting FIXED or DELIMITED"
+msgstr ""
+
+#: src/language/data-io/get-data.c:326
+msgid "Value of FIRSTCASE must be 1 or greater."
+msgstr ""
+
+#: src/language/data-io/get-data.c:351
+msgid "expecting LINE or VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:364
+msgid "Value of FIXCASE must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:384
+msgid "Value of FIRST must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:396
+msgid "Value of PERCENT must be between 1 and 100."
+msgstr ""
+
+#: src/language/data-io/get-data.c:445
+msgid ""
+"In compatible syntax mode, the QUALIFIER string must contain exactly one "
+"character."
+msgstr ""
+
+#: src/language/data-io/get-data.c:460
+msgid "expecting VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:482
+#: src/language/data-io/placement-parser.c:378
+#, c-format
+msgid ""
+"The record number specified, %ld, is at or before the previous record, %d.  "
+"Data fields must be listed in order of increasing record number."
+msgstr ""
+
+#: src/language/data-io/get-data.c:491
+#, c-format
+msgid ""
+"The record number specified, %ld, exceeds the number of records per case "
+"specified on FIXCASE, %d."
+msgstr ""
+

 #: src/language/data-io/get.c:99
 msgid "expecting COMM or TAPE"
 msgstr ""
 #: src/language/data-io/get.c:99
 msgid "expecting COMM or TAPE"
 msgstr ""


@@ -1512,67 +1573,6 @@ msgid ""
 "variable in earlier file (%s)."
 msgstr ""
 
 "variable in earlier file (%s)."
 msgstr ""
 

-#: src/language/data-io/get-data.c:62
-#, c-format
-msgid "Unsupported TYPE %s"
-msgstr ""
-
-#: src/language/data-io/get-data.c:258
-#, c-format
-msgid ""
-"%s is allowed only with %s arrangement, but %s arrangement was stated or "
-"implied earlier in this command."
-msgstr ""
-
-#: src/language/data-io/get-data.c:313
-msgid "expecting FIXED or DELIMITED"
-msgstr ""
-
-#: src/language/data-io/get-data.c:326
-msgid "Value of FIRSTCASE must be 1 or greater."
-msgstr ""
-
-#: src/language/data-io/get-data.c:351
-msgid "expecting LINE or VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:364
-msgid "Value of FIXCASE must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:384
-msgid "Value of FIRST must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:396
-msgid "Value of PERCENT must be between 1 and 100."
-msgstr ""
-
-#: src/language/data-io/get-data.c:445
-msgid ""
-"In compatible syntax mode, the QUALIFIER string must contain exactly one "
-"character."
-msgstr ""
-
-#: src/language/data-io/get-data.c:460
-msgid "expecting VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:482
-#: src/language/data-io/placement-parser.c:378
-#, c-format
-msgid ""
-"The record number specified, %ld, is at or before the previous record, %d.  "
-"Data fields must be listed in order of increasing record number."
-msgstr ""
-
-#: src/language/data-io/get-data.c:491
-#, c-format
-msgid ""
-"The record number specified, %ld, exceeds the number of records per case "
-"specified on FIXCASE, %d."
-msgstr ""
-

 #: src/language/data-io/inpt-pgm.c:130
 msgid "Unexpected end-of-file within INPUT PROGRAM."
 msgstr ""
 #: src/language/data-io/inpt-pgm.c:130
 msgid "Unexpected end-of-file within INPUT PROGRAM."
 msgstr ""


@@ -1662,6 +1662,20 @@ msgstr ""
 msgid "The ending column for a field must be greater than the starting column."
 msgstr ""
 
 msgid "The ending column for a field must be greater than the starting column."
 msgstr ""
 

+#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
+#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+

 #: src/language/data-io/print.c:266
 #, c-format
 msgid "Output calls for %d records but %zu specified on RECORDS subcommand."
 #: src/language/data-io/print.c:266
 #, c-format
 msgid "Output calls for %d records but %zu specified on RECORDS subcommand."


@@ -1681,20 +1695,6 @@ msgid_plural "Writing %d records."
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
-#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-

 #: src/language/dictionary/apply-dictionary.c:75
 #, c-format
 msgid "Variable %s is %s in target file, but %s in source file."
 #: src/language/dictionary/apply-dictionary.c:75
 #, c-format
 msgid "Variable %s is %s in target file, but %s in source file."


@@ -1880,7 +1880,7 @@ msgstr ""
 #: src/language/dictionary/split-file.c:86
 #: src/language/dictionary/sys-file-info.c:397
 #: src/language/dictionary/sys-file-info.c:564 src/ui/gui/crosstabs.glade:275
 #: src/language/dictionary/split-file.c:86
 #: src/language/dictionary/sys-file-info.c:397
 #: src/language/dictionary/sys-file-info.c:564 src/ui/gui/crosstabs.glade:275

-#: src/ui/gui/psppire.glade:2099 src/ui/gui/psppire-var-sheet.c:104
+#: src/ui/gui/psppire-var-sheet.c:104 src/ui/gui/psppire.glade:2099

 msgid "Label"
 msgstr ""
 
 msgid "Label"
 msgstr ""
 


@@ -2854,8 +2854,8 @@ msgstr ""
 msgid "Directional measures."
 msgstr ""
 
 msgid "Directional measures."
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1223 src/ui/gui/psppire.glade:2223
-#: src/ui/gui/psppire-var-sheet.c:101
+#: src/language/stats/crosstabs.q:1223 src/ui/gui/psppire-var-sheet.c:101
+#: src/ui/gui/psppire.glade:2223

 msgid "Type"
 msgstr ""
 
 msgid "Type"
 msgstr ""
 


@@ -3386,6 +3386,22 @@ msgstr ""
 msgid "TABLES subcommand may not appear more than once."
 msgstr ""
 
 msgid "TABLES subcommand may not appear more than once."
 msgstr ""
 

+#: src/language/stats/npar-summary.c:108
+msgid "Descriptive Statistics"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:145
+msgid "25th"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:148
+msgid "50th (Median)"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:151
+msgid "75th"
+msgstr ""
+

 #: src/language/stats/npar.q:98
 msgid "NPAR subcommand not currently implemented."
 msgstr ""
 #: src/language/stats/npar.q:98
 msgid "NPAR subcommand not currently implemented."
 msgstr ""


@@ -3410,22 +3426,6 @@ msgid ""
 "not match the number following (%zu)."
 msgstr ""
 
 "not match the number following (%zu)."
 msgstr ""
 

-#: src/language/stats/npar-summary.c:108
-msgid "Descriptive Statistics"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:145
-msgid "25th"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:148
-msgid "50th (Median)"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:151
-msgid "75th"
-msgstr ""
-

 #: src/language/stats/oneway.q:169
 msgid "Number of contrast coefficients must equal the number of groups"
 msgstr ""
 #: src/language/stats/oneway.q:169
 msgid "Number of contrast coefficients must equal the number of groups"
 msgstr ""


@@ -5578,14 +5578,6 @@ msgstr ""
 msgid "Paste"
 msgstr ""
 
 msgid "Paste"
 msgstr ""
 

-#: src/ui/gui/psppire.c:194
-msgid "_Reset"
-msgstr ""
-
-#: src/ui/gui/psppire.c:195
-msgid "_Select"
-msgstr ""
-

 #: src/ui/gui/psppire-data-editor.c:604
 msgid "Data View"
 msgstr ""
 #: src/ui/gui/psppire-data-editor.c:604
 msgid "Data View"
 msgstr ""


@@ -5603,8 +5595,55 @@ msgstr ""
 msgid "%ld"
 msgstr ""
 
 msgid "%ld"
 msgstr ""
 

+#: src/ui/gui/psppire-var-sheet.c:100
+msgid "Name"
+msgstr ""
+
+#: src/ui/gui/psppire-var-sheet.c:102 src/ui/gui/psppire.glade:2187
+msgid "Width"
+msgstr ""
+
+#: src/ui/gui/psppire-var-sheet.c:103
+msgid "Decimals"
+msgstr ""
+
+#: src/ui/gui/psppire-var-sheet.c:105
+msgid "Values"
+msgstr ""
+
+#: src/ui/gui/psppire-var-sheet.c:108
+msgid "Align"
+msgstr ""
+
+#: src/ui/gui/psppire-var-sheet.c:109
+msgid "Measure"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:601
+msgid "Scientific"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:604
+msgid "Custom"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:675 src/ui/gui/psppire-var-store.c:685
+#: src/ui/gui/psppire-var-store.c:695
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: src/ui/gui/psppire.c:194
+msgid "_Reset"
+msgstr ""
+
+#: src/ui/gui/psppire.c:195
+msgid "_Select"
+msgstr ""
+

 #: src/ui/gui/psppire.glade:11
 #: src/ui/gui/psppire.glade:11

-msgid "This is pre-alpha software.  Use at your own risk."
+msgid ""
+"This is beta status software.  Please report bugs to bug-gnu-pspp@gnu.org"

 msgstr ""
 
 #: src/ui/gui/psppire.glade:73 src/ui/gui/psppire.glade:154
 msgstr ""
 
 #: src/ui/gui/psppire.glade:73 src/ui/gui/psppire.glade:154


@@ -5787,10 +5826,6 @@ msgstr ""
 msgid "Use expression as label"
 msgstr ""
 
 msgid "Use expression as label"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:2187 src/ui/gui/psppire-var-sheet.c:102
-msgid "Width"
-msgstr ""
-

 #: src/ui/gui/psppire.glade:2274
 msgid "Goto Case Number:"
 msgstr ""
 #: src/ui/gui/psppire.glade:2274
 msgid "Goto Case Number:"
 msgstr ""


@@ -5823,40 +5858,6 @@ msgstr ""
 msgid "Search backward"
 msgstr ""
 
 msgid "Search backward"
 msgstr ""
 

-#: src/ui/gui/psppire-var-sheet.c:100
-msgid "Name"
-msgstr ""
-
-#: src/ui/gui/psppire-var-sheet.c:103
-msgid "Decimals"
-msgstr ""
-
-#: src/ui/gui/psppire-var-sheet.c:105
-msgid "Values"
-msgstr ""
-
-#: src/ui/gui/psppire-var-sheet.c:108
-msgid "Align"
-msgstr ""
-
-#: src/ui/gui/psppire-var-sheet.c:109
-msgid "Measure"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:601
-msgid "Scientific"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:604
-msgid "Custom"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:675 src/ui/gui/psppire-var-store.c:685
-#: src/ui/gui/psppire-var-store.c:695
-#, c-format
-msgid "%d"
-msgstr ""
-

 #: src/ui/gui/rank.glade:111
 msgid "By:"
 msgstr ""
 #: src/ui/gui/rank.glade:111
 msgid "By:"
 msgstr ""


@@ -6145,37 +6146,93 @@ msgstr ""
 msgid "To End"
 msgstr ""
 
 msgid "To End"
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:460
+#: src/ui/gui/t-test-options.c:60
+#, c-format
+msgid "Confidence Interval: %2d %%"
+msgstr ""
+
+#: src/ui/gui/t-test-paired-samples.c:228
+msgid "Var 1"
+msgstr ""
+
+#: src/ui/gui/t-test-paired-samples.c:229
+msgid "Var 2"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:56 src/ui/gui/t-test.glade:165
+msgid "Define Groups"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:123 src/ui/gui/t-test.glade:549
+#: src/ui/gui/t-test.glade:761
+msgid "Test Variable(s):"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:258
+msgid "Group_2 value:"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:271
+msgid "Group_1 value:"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:320
+msgid "_Cut point:"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:349
+msgid "_Use specified values:"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:431
+msgid "Exclude cases _analysis by analysis"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:442
+msgid "Exclude cases _listwise"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:594
+msgid "Test Value: "
+msgstr ""
+
+#: src/ui/gui/text-data-import-dialog.c:70
+msgid ""
+"The text import assistant has not been compiled into this build of PSPPIRE, "
+"because GTK+ version 2.10.0 or later was not available."
+msgstr ""
+
+#: src/ui/gui/text-data-import-dialog.c:488

 #, c-format
 msgid "Could not open \"%s\": %s"
 msgstr ""
 
 #, c-format
 msgid "Could not open \"%s\": %s"
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:476
+#: src/ui/gui/text-data-import-dialog.c:504

 #, c-format
 msgid "Error reading \"%s\": %s"
 msgstr ""
 
 #, c-format
 msgid "Error reading \"%s\": %s"
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:479
+#: src/ui/gui/text-data-import-dialog.c:507

 #, c-format
 msgid ""
 "Failed to read \"%s\", because it contains a line over %d bytes long and "
 "therefore appears not to be a text file."
 msgstr ""
 
 #, c-format
 msgid ""
 "Failed to read \"%s\", because it contains a line over %d bytes long and "
 "therefore appears not to be a text file."
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:493
+#: src/ui/gui/text-data-import-dialog.c:521

 #, c-format
 msgid "\"%s\" is empty."
 msgstr ""
 
 #, c-format
 msgid "\"%s\" is empty."
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:538
+#: src/ui/gui/text-data-import-dialog.c:566

 msgid "Import Delimited Text Data"
 msgstr ""
 
 msgid "Import Delimited Text Data"
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:589
+#: src/ui/gui/text-data-import-dialog.c:617

 msgid "Importing Delimited Text Data"
 msgstr ""
 
 msgid "Importing Delimited Text Data"
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:740
+#: src/ui/gui/text-data-import-dialog.c:768

 msgid ""
 "This assistant will guide you through the process of importing data into "
 "PSPP from a text file with one line per case,  in which fields are separated "
 msgid ""
 "This assistant will guide you through the process of importing data into "
 "PSPP from a text file with one line per case,  in which fields are separated "


@@ -6183,21 +6240,21 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:746
+#: src/ui/gui/text-data-import-dialog.c:774

 #, c-format
 msgid "The selected file contains %zu line of text.  "
 msgid_plural "The selected file contains %zu lines of text.  "
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "The selected file contains %zu line of text.  "
 msgid_plural "The selected file contains %zu lines of text.  "
 msgstr[0] ""
 msgstr[1] ""
 

-#: src/ui/gui/text-data-import-dialog.c:754
+#: src/ui/gui/text-data-import-dialog.c:782

 #, c-format
 msgid "The selected file contains approximately %lu line of text.  "
 msgid_plural "The selected file contains approximately %lu lines of text.  "
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "The selected file contains approximately %lu line of text.  "
 msgid_plural "The selected file contains approximately %lu lines of text.  "
 msgstr[0] ""
 msgstr[1] ""
 

-#: src/ui/gui/text-data-import-dialog.c:760
+#: src/ui/gui/text-data-import-dialog.c:788

 #, c-format
 msgid ""
 "Only the first %zu line of the file will be shown for preview purposes in "
 #, c-format
 msgid ""
 "Only the first %zu line of the file will be shown for preview purposes in "


@@ -6208,16 +6265,16 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: src/ui/gui/text-data-import-dialog.c:767
+#: src/ui/gui/text-data-import-dialog.c:795

 msgid "You may choose below how much of the file should actually be imported."
 msgstr ""
 
 msgid "You may choose below how much of the file should actually be imported."
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:1487
-#: src/ui/gui/text-data-import-dialog.c:1731
+#: src/ui/gui/text-data-import-dialog.c:1515
+#: src/ui/gui/text-data-import-dialog.c:1759

 msgid "This input line has too few separators to fill in this field."
 msgstr ""
 
 msgid "This input line has too few separators to fill in this field."
 msgstr ""
 

-#: src/ui/gui/text-data-import-dialog.c:1722
+#: src/ui/gui/text-data-import-dialog.c:1750

 #, c-format
 msgid "Field content \"%.*s\" cannot be parsed in format %s."
 msgstr ""
 #, c-format
 msgid "Field content \"%.*s\" cannot be parsed in format %s."
 msgstr ""


@@ -6358,56 +6415,6 @@ msgstr ""
 msgid "<b>Data Preview</b>"
 msgstr ""
 
 msgid "<b>Data Preview</b>"
 msgstr ""
 

-#: src/ui/gui/t-test.glade:56 src/ui/gui/t-test.glade:165
-msgid "Define Groups"
-msgstr ""
-
-#: src/ui/gui/t-test.glade:123 src/ui/gui/t-test.glade:549
-#: src/ui/gui/t-test.glade:761
-msgid "Test Variable(s):"
-msgstr ""
-
-#: src/ui/gui/t-test.glade:258
-msgid "Group_2 value:"
-msgstr ""
-
-#: src/ui/gui/t-test.glade:271
-msgid "Group_1 value:"
-msgstr ""
-
-#: src/ui/gui/t-test.glade:320
-msgid "_Cut point:"
-msgstr ""
-
-#: src/ui/gui/t-test.glade:349
-msgid "_Use specified values:"
-msgstr ""
-
-#: src/ui/gui/t-test.glade:431
-msgid "Exclude cases _analysis by analysis"
-msgstr ""
-
-#: src/ui/gui/t-test.glade:442
-msgid "Exclude cases _listwise"
-msgstr ""
-
-#: src/ui/gui/t-test.glade:594
-msgid "Test Value: "
-msgstr ""
-
-#: src/ui/gui/t-test-options.c:60
-#, c-format
-msgid "Confidence Interval: %2d %%"
-msgstr ""
-
-#: src/ui/gui/t-test-paired-samples.c:228
-msgid "Var 1"
-msgstr ""
-
-#: src/ui/gui/t-test-paired-samples.c:229
-msgid "Var 2"
-msgstr ""
-

 #: src/ui/gui/variable-info-dialog.c:89
 #, c-format
 msgid "Label: %s\n"
 #: src/ui/gui/variable-info-dialog.c:89
 #, c-format
 msgid "Label: %s\n"