Read version header from source

diff --git a/perl-module/MANIFEST b/perl-module/MANIFEST
index 254690556deecc723f83b7ee4f4f255f7b8f75f2..ce868d5dc11a99fb2e2f1dbd338d7f226218a078 100644 (file)
--- a/perl-module/MANIFEST
+++ b/perl-module/MANIFEST
@@ -4,6 +4,7 @@ const-xs.inc
 COPYING
 Examples.pod
 lib/PSPP.pm
 COPYING
 Examples.pod
 lib/PSPP.pm

+lib/pspp-vers.pl

 Makefile.PL
 MANIFEST
 ppport.h
 Makefile.PL
 MANIFEST
 ppport.h

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index f3eb19d77a79a1d3ad7a9ce2250925a44380f308..c502cbe8b88d763b87e393a7dd61150d4e15e4c2 100644 (file)
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -2,7 +2,6 @@
 
 # PSPP
 
 
 # PSPP
 

-

 module_sources = \
  perl-module/Changes \
  perl-module/COPYING \
 module_sources = \
  perl-module/Changes \
  perl-module/COPYING \


@@ -16,7 +15,6 @@ module_sources = \
  perl-module/lib/PSPP.pm \
  perl-module/t/Pspp.t
 
  perl-module/lib/PSPP.pm \
  perl-module/t/Pspp.t
 

-

 perl-module/pspp-module-config: Makefile
        target=`mktemp`;\
        echo '%Locations = (' > $$target ;\
 perl-module/pspp-module-config: Makefile
        target=`mktemp`;\
        echo '%Locations = (' > $$target ;\


@@ -35,7 +33,11 @@ perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config
 module-make: perl-module/Makefile
        cd perl-module && $(MAKE) $(AM_MAKEFLAGS)
 
 module-make: perl-module/Makefile
        cd perl-module && $(MAKE) $(AM_MAKEFLAGS)
 

-all-local:
+perl-module/lib/pspp-vers.pl: src/libpspp/version.c
+       mkdir -p perl-module/lib
+       $(GREP) '^\$$VERSION' $(top_builddir)/src/libpspp/version.c | $(SED) -e 's/VERSION/PSPP::VERSION/' > $@
+
+all-local: perl-module/lib/pspp-vers.pl

        if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
         for f in $(module_sources); do \
          destdir=`dirname $$f` ;\
        if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
         for f in $(module_sources); do \
          destdir=`dirname $$f` ;\


@@ -58,22 +60,11 @@ clean-local:
        fi
        $(RM) perl-module/Makefile.old
 
        fi
        $(RM) perl-module/Makefile.old
 

-#install-data-local:
-#      cd perl-module && $(MAKE) $(AM_MAKEFLAGS) doc_install
-#
-#install-exec-local:
-#      cd perl-module && $(MAKE) $(AM_MAKEFLAGS) pure_install
-#
-#uninstall-local:
-#      cd perl-module && $(MAKE) $(AM_MAKEFLAGS) uninstall
-#
-

 
 CLEANFILES += \
        perl-module/pspp-module-config \
 
 CLEANFILES += \
        perl-module/pspp-module-config \

+       perl-module/lib/pspp-vers.pl \

        perl-module/const-c.inc \
        perl-module/const-xs.inc 
 
        perl-module/const-c.inc \
        perl-module/const-xs.inc 
 

-
-

 EXTRA_DIST +=  $(module_sources)
 EXTRA_DIST +=  $(module_sources)

diff --git a/perl-module/lib/PSPP.pm b/perl-module/lib/PSPP.pm
index 783ae25669982a695f1318d3e13b1eac533e8d1a..8a54094ea2f76d8c489f48d4725ee988a8164962 100644 (file)
--- a/perl-module/lib/PSPP.pm
+++ b/perl-module/lib/PSPP.pm
@@ -2,7 +2,7 @@ use 5.008008;
 use strict;
 use warnings;
 
 use strict;
 use warnings;
 

-our $VERSION = '0.7.0';
+do 'pspp-vers.pl' || die "No version set";

 
 =head1 NAME
 
 
 =head1 NAME
 


@@ -24,7 +24,7 @@ None by default.
 =cut
 
 require XSLoader;
 =cut
 
 require XSLoader;

-XSLoader::load('PSPP', $VERSION);
+XSLoader::load('PSPP', $PSPP::VERSION);

 
 =pod
 
 
 =pod
 

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

-"POT-Creation-Date: 2008-12-14 11:19+0900\n"
+"POT-Creation-Date: 2008-12-21 21:02+0900\n"

 "PO-Revision-Date: 2008-11-05 08:17+0900\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: John Darrington <john@darrington.wattle.id.au>\n"
 "PO-Revision-Date: 2008-11-05 08:17+0900\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: John Darrington <john@darrington.wattle.id.au>\n"


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

-#: src/ui/gui/data-editor.glade:1197 src/ui/gui/psppire.glade:2176
+#: src/ui/gui/data-editor.glade:1197 src/ui/gui/psppire.glade:2147

 #: src/ui/gui/psppire-var-store.c:557
 msgid "String"
 msgstr ""
 
 #: src/data/format.c:327 src/data/sys-file-reader.c:655
 #: src/ui/gui/psppire-var-store.c:557
 msgid "String"
 msgstr ""
 
 #: src/data/format.c:327 src/data/sys-file-reader.c:655

-#: src/ui/gui/data-editor.glade:1086 src/ui/gui/psppire.glade:2131
+#: src/ui/gui/data-editor.glade:1086 src/ui/gui/psppire.glade:2222

 #: src/ui/gui/psppire-var-store.c:550
 msgid "Numeric"
 msgstr ""
 #: src/ui/gui/psppire-var-store.c:550
 msgid "Numeric"
 msgstr ""


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

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

 #: src/ui/gui/psppire-var-store.c:767
 msgid "Label"
 msgstr ""
 #: src/ui/gui/psppire-var-store.c:767
 msgid "Label"
 msgstr ""


@@ -1947,7 +1947,7 @@ msgstr ""
 msgid "File:"
 msgstr ""
 
 msgid "File:"
 msgstr ""
 

-#: src/language/dictionary/sys-file-info.c:115 src/ui/gui/psppire.glade:2052
+#: src/language/dictionary/sys-file-info.c:115 src/ui/gui/psppire.glade:2051

 #: src/ui/gui/recode.glade:841
 msgid "Label:"
 msgstr ""
 #: src/ui/gui/recode.glade:841
 msgid "Label:"
 msgstr ""


@@ -2919,7 +2919,7 @@ msgstr ""
 msgid "Directional measures."
 msgstr ""
 
 msgid "Directional measures."
 msgstr ""
 

-#: src/language/stats/crosstabs.q:1223 src/ui/gui/psppire.glade:2223
+#: src/language/stats/crosstabs.q:1223 src/ui/gui/psppire.glade:2237

 #: src/ui/gui/psppire-var-sheet.c:511 src/ui/gui/psppire-var-store.c:764
 msgid "Type"
 msgstr ""
 #: src/ui/gui/psppire-var-sheet.c:511 src/ui/gui/psppire-var-store.c:764
 msgid "Type"
 msgstr ""


@@ -3248,7 +3248,7 @@ msgid "Interquartile Range"
 msgstr ""
 
 #: src/language/stats/examine.q:1733 src/language/stats/oneway.q:404
 msgstr ""
 
 #: src/language/stats/examine.q:1733 src/language/stats/oneway.q:404

-#: src/ui/gui/examine.glade:307
+#: src/ui/gui/examine.glade:310

 msgid "Descriptives"
 msgstr ""
 
 msgid "Descriptives"
 msgstr ""
 


@@ -3287,7 +3287,7 @@ msgstr ""
 
 #: src/language/stats/examine.q:2097 src/language/stats/examine.q:2115
 #: src/language/stats/frequencies.q:1412 src/language/stats/npar-summary.c:141
 
 #: src/language/stats/examine.q:2097 src/language/stats/examine.q:2115
 #: src/language/stats/frequencies.q:1412 src/language/stats/npar-summary.c:141

-#: src/ui/gui/examine.glade:328
+#: src/ui/gui/examine.glade:333

 msgid "Percentiles"
 msgstr ""
 
 msgid "Percentiles"
 msgstr ""
 


@@ -4820,7 +4820,7 @@ msgstr ""
 msgid "Format..."
 msgstr ""
 
 msgid "Format..."
 msgstr ""
 

-#: src/ui/gui/crosstabs.glade:138 src/ui/gui/examine.glade:246
+#: src/ui/gui/crosstabs.glade:138 src/ui/gui/examine.glade:247

 #: src/ui/gui/regression.glade:31
 msgid "Statistics..."
 msgstr ""
 #: src/ui/gui/regression.glade:31
 msgid "Statistics..."
 msgstr ""


@@ -4837,7 +4837,7 @@ msgstr ""
 msgid "Pivot"
 msgstr ""
 
 msgid "Pivot"
 msgstr ""
 

-#: src/ui/gui/crosstabs.glade:253 src/ui/gui/psppire.glade:778
+#: src/ui/gui/crosstabs.glade:253 src/ui/gui/psppire.glade:781

 msgid "Ascending"
 msgstr ""
 
 msgid "Ascending"
 msgstr ""
 


@@ -5480,12 +5480,12 @@ msgstr ""
 msgid "Value Label:"
 msgstr ""
 
 msgid "Value Label:"
 msgstr ""
 

-#: src/ui/gui/data-editor.glade:1570 src/ui/gui/psppire.glade:2544
+#: src/ui/gui/data-editor.glade:1570 src/ui/gui/psppire.glade:2559

 #: src/ui/gui/recode.glade:185
 msgid "Value:"
 msgstr ""
 
 #: src/ui/gui/recode.glade:185
 msgid "Value:"
 msgstr ""
 

-#: src/ui/gui/data-editor.glade:1707 src/ui/gui/examine.glade:423
+#: src/ui/gui/data-editor.glade:1707 src/ui/gui/examine.glade:432

 #: src/ui/gui/t-test.glade:460
 msgid "Missing Values"
 msgstr ""
 #: src/ui/gui/t-test.glade:460
 msgid "Missing Values"
 msgstr ""


@@ -5542,36 +5542,36 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
 msgid "Options:"
 msgstr ""
 

-#: src/ui/gui/examine.glade:132
-msgid "Dependent List:"
+#: src/ui/gui/examine.glade:49
+msgid "Label Cases by:"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/examine.glade:180
+#: src/ui/gui/examine.glade:100

 msgid "Factor List:"
 msgstr ""
 
 msgid "Factor List:"
 msgstr ""
 

-#: src/ui/gui/examine.glade:218
-msgid "Label Cases by:"
+#: src/ui/gui/examine.glade:150
+msgid "Dependent List:"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/examine.glade:255 src/ui/gui/t-test.glade:69
+#: src/ui/gui/examine.glade:257 src/ui/gui/t-test.glade:69

 #: src/ui/gui/t-test.glade:629 src/ui/gui/t-test.glade:780
 msgid "Options..."
 msgstr ""
 
 #: src/ui/gui/t-test.glade:629 src/ui/gui/t-test.glade:780
 msgid "Options..."
 msgstr ""
 

-#: src/ui/gui/examine.glade:316
+#: src/ui/gui/examine.glade:320

 msgid "Extremes"
 msgstr ""
 
 msgid "Extremes"
 msgstr ""
 

-#: src/ui/gui/examine.glade:382
+#: src/ui/gui/examine.glade:388

 msgid "Exclude cases listwise"
 msgstr ""
 
 msgid "Exclude cases listwise"
 msgstr ""
 

-#: src/ui/gui/examine.glade:392
+#: src/ui/gui/examine.glade:399

 msgid "Exclude cases pairwise"
 msgstr ""
 
 msgid "Exclude cases pairwise"
 msgstr ""
 

-#: src/ui/gui/examine.glade:406
+#: src/ui/gui/examine.glade:414

 msgid "Repeat values"
 msgstr ""
 
 msgid "Repeat values"
 msgstr ""
 


@@ -5592,8 +5592,8 @@ msgstr ""
 msgid "Standard error of the kurtosis"
 msgstr ""
 
 msgid "Standard error of the kurtosis"
 msgstr ""
 

-#: src/ui/gui/frequencies.glade:98 src/ui/gui/psppire.glade:265
-#: src/ui/gui/rank.glade:67
+#: src/ui/gui/frequencies.glade:98 src/ui/gui/psppire.glade:277
+#: src/ui/gui/rank.glade:103

 msgid "Variable(s):"
 msgstr ""
 
 msgid "Variable(s):"
 msgstr ""
 


@@ -5847,12 +5847,12 @@ msgstr ""
 msgid "var"
 msgstr ""
 
 msgid "var"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:11
+#: src/ui/gui/psppire.glade:10

 msgid ""
 "This is beta status software.  Please report bugs to bug-gnu-pspp@gnu.org"
 msgstr ""
 
 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/psppire.glade:72 src/ui/gui/psppire.glade:155

 #: src/ui/gui/weight-cases-dialog.c:80
 msgid "Do not weight cases"
 msgstr ""
 #: src/ui/gui/weight-cases-dialog.c:80
 msgid "Do not weight cases"
 msgstr ""


@@ -5861,15 +5861,15 @@ msgstr ""
 msgid "Weight cases by"
 msgstr ""
 
 msgid "Weight cases by"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:107
+#: src/ui/gui/psppire.glade:108

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

-#: src/ui/gui/psppire.glade:147
+#: src/ui/gui/psppire.glade:148

 msgid "Current Status: "
 msgstr ""
 
 msgid "Current Status: "
 msgstr ""
 

-#: src/ui/gui/psppire.glade:314
+#: src/ui/gui/psppire.glade:244

 msgid "Name Variable:"
 msgstr ""
 
 msgid "Name Variable:"
 msgstr ""
 


@@ -5877,132 +5877,132 @@ msgstr ""
 msgid "Analyze all cases.  Do not create groups."
 msgstr "Analyse all cases.  Do not create groups."
 
 msgid "Analyze all cases.  Do not create groups."
 msgstr "Analyse all cases.  Do not create groups."
 

-#: src/ui/gui/psppire.glade:439
+#: src/ui/gui/psppire.glade:440

 msgid "Compare groups."
 msgstr ""
 
 msgid "Compare groups."
 msgstr ""
 

-#: src/ui/gui/psppire.glade:452
+#: src/ui/gui/psppire.glade:454

 msgid "Organize output by groups."
 msgstr "Organise output by groups."
 
 msgid "Organize output by groups."
 msgstr "Organise output by groups."
 

-#: src/ui/gui/psppire.glade:499
+#: src/ui/gui/psppire.glade:502

 msgid "Groups based on:"
 msgstr ""
 
 msgid "Groups based on:"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:563
+#: src/ui/gui/psppire.glade:565

 msgid "Sort the file by grouping variables."
 msgstr ""
 
 msgid "Sort the file by grouping variables."
 msgstr ""
 

-#: src/ui/gui/psppire.glade:574
+#: src/ui/gui/psppire.glade:577

 msgid "File is already sorted."
 msgstr ""
 
 msgid "File is already sorted."
 msgstr ""
 

-#: src/ui/gui/psppire.glade:618
+#: src/ui/gui/psppire.glade:622

 msgid "Current Status : "
 msgstr ""
 
 msgid "Current Status : "
 msgstr ""
 

-#: src/ui/gui/psppire.glade:626
+#: src/ui/gui/psppire.glade:630

 msgid "Analysis by groups is off"
 msgstr ""
 
 msgid "Analysis by groups is off"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:725
+#: src/ui/gui/psppire.glade:729

 msgid "Sort by:"
 msgstr ""
 
 msgid "Sort by:"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:788
+#: src/ui/gui/psppire.glade:792

 msgid "Descending"
 msgstr ""
 
 msgid "Descending"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:804
+#: src/ui/gui/psppire.glade:809

 msgid "Sort Order"
 msgstr ""
 
 msgid "Sort Order"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:873
+#: src/ui/gui/psppire.glade:878

 msgid "Target Variable:"
 msgstr ""
 
 msgid "Target Variable:"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:904
+#: src/ui/gui/psppire.glade:909

 msgid "Type & Label"
 msgstr ""
 
 msgid "Type & Label"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:943
+#: src/ui/gui/psppire.glade:949

 msgid "="
 msgstr ""
 
 msgid "="
 msgstr ""
 

-#: src/ui/gui/psppire.glade:989
+#: src/ui/gui/psppire.glade:995

 msgid "Numeric Expressions:"
 msgstr ""
 
 msgid "Numeric Expressions:"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1043
+#: src/ui/gui/psppire.glade:1049

 msgid "Functions:"
 msgstr ""
 
 msgid "Functions:"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1107 src/ui/gui/psppire.glade:1253
+#: src/ui/gui/psppire.glade:1112 src/ui/gui/psppire.glade:1516

 #: src/ui/gui/recode.glade:731
 msgid "If..."
 msgstr ""
 
 #: src/ui/gui/recode.glade:731
 msgid "If..."
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1223
-msgid "All Cases"
+#: src/ui/gui/psppire.glade:1345
+msgid "Use filter variable"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1239
-msgid "If condition is satisfied"
+#: src/ui/gui/psppire.glade:1398
+msgid "Based on time or case range"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1291
-msgid "Random sample of cases"
+#: src/ui/gui/psppire.glade:1411
+msgid "Range..."

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1305
-msgid "Sample..."
+#: src/ui/gui/psppire.glade:1450
+msgid "Random sample of cases"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1343
-msgid "Based on time or case range"
+#: src/ui/gui/psppire.glade:1464
+msgid "Sample..."

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1356
-msgid "Range..."
+#: src/ui/gui/psppire.glade:1502
+msgid "If condition is satisfied"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1394
-msgid "Use filter variable"
+#: src/ui/gui/psppire.glade:1551
+msgid "All Cases"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1556
+#: src/ui/gui/psppire.glade:1566

 msgid "Select"
 msgstr ""
 
 msgid "Select"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1586
+#: src/ui/gui/psppire.glade:1595

 msgid "Filtered"
 msgstr ""
 
 msgid "Filtered"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1596
+#: src/ui/gui/psppire.glade:1606

 msgid "Deleted"
 msgstr ""
 
 msgid "Deleted"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1613
+#: src/ui/gui/psppire.glade:1624

 msgid "Unselected Cases Are"
 msgstr ""
 
 msgid "Unselected Cases Are"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1678
+#: src/ui/gui/psppire.glade:1689

 msgid "Comments:"
 msgstr ""
 
 msgid "Comments:"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1720
+#: src/ui/gui/psppire.glade:1731

 msgid "Display comments in output"
 msgstr ""
 
 msgid "Display comments in output"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1734
+#: src/ui/gui/psppire.glade:1746

 msgid "Column Number: 0"
 msgstr ""
 
 msgid "Column Number: 0"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1810
+#: src/ui/gui/psppire.glade:1822

 msgid "Variable Information:"
 msgstr ""
 
 msgid "Variable Information:"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1836
+#: src/ui/gui/psppire.glade:1848

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -6016,56 +6016,56 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1900
-msgid "Observation"
+#: src/ui/gui/psppire.glade:1942
+msgid "First case"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1910
+#: src/ui/gui/psppire.glade:1955

 msgid "Last case"
 msgstr ""
 
 msgid "Last case"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1923
-msgid "First case"
+#: src/ui/gui/psppire.glade:1968
+msgid "Observation"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/psppire.glade:2081
+#: src/ui/gui/psppire.glade:2032

 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:512
+#: src/ui/gui/psppire.glade:2158 src/ui/gui/psppire-var-sheet.c:512

 #: src/ui/gui/psppire-var-store.c:765
 msgid "Width"
 msgstr ""
 
 #: src/ui/gui/psppire-var-store.c:765
 msgid "Width"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:2274
+#: src/ui/gui/psppire.glade:2288

 msgid "Goto Case Number:"
 msgstr ""
 
 msgid "Goto Case Number:"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:2410
+#: src/ui/gui/psppire.glade:2425

 msgid "Sample Size"
 msgstr ""
 
 msgid "Sample Size"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:2513
+#: src/ui/gui/psppire.glade:2528

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

-#: src/ui/gui/psppire.glade:2570
+#: src/ui/gui/psppire.glade:2585

 msgid "Search value labels"
 msgstr ""
 
 msgid "Search value labels"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:2593
+#: src/ui/gui/psppire.glade:2609

 msgid "Regular expression Match"
 msgstr ""
 
 msgid "Regular expression Match"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:2603
+#: src/ui/gui/psppire.glade:2620

 msgid "Search substrings"
 msgstr ""
 
 msgid "Search substrings"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:2615
+#: src/ui/gui/psppire.glade:2633

 msgid "Wrap around"
 msgstr ""
 
 msgid "Wrap around"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:2627
+#: src/ui/gui/psppire.glade:2646

 msgid "Search backward"
 msgstr ""
 
 msgid "Search backward"
 msgstr ""
 


@@ -6097,56 +6097,56 @@ msgstr ""
 msgid "Custom"
 msgstr ""
 
 msgid "Custom"
 msgstr ""
 

-#: src/ui/gui/rank.glade:111
+#: src/ui/gui/rank.glade:57

 msgid "By:"
 msgstr ""
 
 msgid "By:"
 msgstr ""
 

-#: src/ui/gui/rank.glade:197
+#: src/ui/gui/rank.glade:196

 msgid "_Smallest Value"
 msgstr ""
 
 msgid "_Smallest Value"
 msgstr ""
 

-#: src/ui/gui/rank.glade:209
+#: src/ui/gui/rank.glade:208

 msgid "_Largest Value"
 msgstr ""
 
 msgid "_Largest Value"
 msgstr ""
 

-#: src/ui/gui/rank.glade:228
+#: src/ui/gui/rank.glade:227

 msgid "Assign rank 1 to:"
 msgstr ""
 
 msgid "Assign rank 1 to:"
 msgstr ""
 

-#: src/ui/gui/rank.glade:246
+#: src/ui/gui/rank.glade:245

 msgid "_Display summary tables"
 msgstr ""
 
 msgid "_Display summary tables"
 msgstr ""
 

-#: src/ui/gui/rank.glade:262
+#: src/ui/gui/rank.glade:261

 msgid "Rank T_ypes"
 msgstr ""
 
 msgid "Rank T_ypes"
 msgstr ""
 

-#: src/ui/gui/rank.glade:273
+#: src/ui/gui/rank.glade:272

 msgid "_Ties..."
 msgstr ""
 
 msgid "_Ties..."
 msgstr ""
 

-#: src/ui/gui/rank.glade:343
-msgid "Ntiles"
+#: src/ui/gui/rank.glade:339
+msgid "Sum of case weights"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/rank.glade:376
-msgid "Rank"
+#: src/ui/gui/rank.glade:355
+msgid "Fractional rank as %"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/rank.glade:386
-msgid "Savage score"
+#: src/ui/gui/rank.glade:369
+msgid "Fractional rank"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/rank.glade:400
-msgid "Fractional rank"
+#: src/ui/gui/rank.glade:383
+msgid "Savage score"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/rank.glade:414
-msgid "Fractional rank as %"
+#: src/ui/gui/rank.glade:397
+msgid "Rank"

 msgstr ""
 
 msgstr ""
 

-#: src/ui/gui/rank.glade:428
-msgid "Sum of case weights"
+#: src/ui/gui/rank.glade:411
+msgid "Ntiles"

 msgstr ""
 
 #: src/ui/gui/rank.glade:450
 msgstr ""
 
 #: src/ui/gui/rank.glade:450


@@ -6157,43 +6157,43 @@ msgstr ""
 msgid "Normal Scores"
 msgstr ""
 
 msgid "Normal Scores"
 msgstr ""
 

-#: src/ui/gui/rank.glade:495
+#: src/ui/gui/rank.glade:494

 msgid "Blom"
 msgstr ""
 
 msgid "Blom"
 msgstr ""
 

-#: src/ui/gui/rank.glade:506
+#: src/ui/gui/rank.glade:505

 msgid "Tukey"
 msgstr ""
 
 msgid "Tukey"
 msgstr ""
 

-#: src/ui/gui/rank.glade:520
+#: src/ui/gui/rank.glade:519

 msgid "Rankit"
 msgstr ""
 
 msgid "Rankit"
 msgstr ""
 

-#: src/ui/gui/rank.glade:534
+#: src/ui/gui/rank.glade:533

 msgid "Van der Wärden"
 msgstr ""
 
 msgid "Van der Wärden"
 msgstr ""
 

-#: src/ui/gui/rank.glade:551
+#: src/ui/gui/rank.glade:550

 msgid "Proportion Estimation Formula"
 msgstr ""
 
 msgid "Proportion Estimation Formula"
 msgstr ""
 

-#: src/ui/gui/rank.glade:614
+#: src/ui/gui/rank.glade:612

 msgid "_Mean"
 msgstr ""
 
 msgid "_Mean"
 msgstr ""
 

-#: src/ui/gui/rank.glade:626
+#: src/ui/gui/rank.glade:624

 msgid "_Low"
 msgstr ""
 
 msgid "_Low"
 msgstr ""
 

-#: src/ui/gui/rank.glade:642
+#: src/ui/gui/rank.glade:640

 msgid "_High"
 msgstr ""
 
 msgid "_High"
 msgstr ""
 

-#: src/ui/gui/rank.glade:660
+#: src/ui/gui/rank.glade:658

 msgid "_Sequential ranks to unique values"
 msgstr ""
 
 msgid "_Sequential ranks to unique values"
 msgstr ""
 

-#: src/ui/gui/rank.glade:680
+#: src/ui/gui/rank.glade:678

 msgid "Rank Assigned to Ties"
 msgstr ""
 
 msgid "Rank Assigned to Ties"
 msgstr ""