OK. How about the attached patch. It adds an option to ./configure called --enable-anachronistic-dependencies which relaxes the gtk+ version.
This can't address the gettext issue, because that's determined at
the automake level. I suggest that Ed just changes the [0.17] to
[0.16] in hist local copy until lenny has become stable.
J'
On Wed, May 28, 2008 at 12:20:28AM +0100, Ed wrote:
Works for me.
Ed
2008/5/28 Ben Pfaff <[EMAIL PROTECTED]>:
> John Darrington <[EMAIL PROTECTED]> writes:
>
>> How about we do this:
>>
>> By default, the dependency requirements stay as they are. But we add
>> a switch to ./configure; let's call it --allow-old-deps which turns
>> off, or relaxes the dependency checking. And we add a Caveat Emptor
>> entry to the release notes.
>>
>> This way, I think the necessary changes to configure.ac etc will be
>> minimal, and a lot easier to maintain.
>
> This sounds reasonable to me.
>
> Ed, would this be enough to make you feel happy doing development
> on Debian stable?
--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3
See http://pgp.mit.edu or any PGP keyserver for public key.
? etch.patch
? etch3.patch
? libtool
? pspp.jnl
? po/remove-potcdate.sed
? src/language/stats/glm.c
? src/language/tests/check-model.c
? src/ui/gui/.libs
? src/ui/gui/libpsppire.la
? src/ui/gui/libpsppwidgets.la
? src/ui/gui/src_ui_gui_libpsppire_la-glade-register.lo
? src/ui/gui/src_ui_gui_libpsppwidgets_la-psppire-acr.lo
? src/ui/gui/src_ui_gui_libpsppwidgets_la-psppire-buttonbox.lo
? src/ui/gui/src_ui_gui_libpsppwidgets_la-psppire-dialog.lo
? src/ui/gui/src_ui_gui_libpsppwidgets_la-psppire-hbuttonbox.lo
? src/ui/gui/src_ui_gui_libpsppwidgets_la-psppire-keypad.lo
? src/ui/gui/src_ui_gui_libpsppwidgets_la-psppire-selector.lo
? src/ui/gui/src_ui_gui_libpsppwidgets_la-psppire-vbuttonbox.lo
? tests/.libs
? tests/dissect-sysfile
? tests/libpspp/abt-test
? tests/libpspp/bt-test
? tests/libpspp/heap-test
? tests/libpspp/range-map-test
? tests/libpspp/range-set-test
? tests/libpspp/sparse-array-test
? tests/libpspp/str-test
? tests/libpspp/tower-test
Index: INSTALL
===================================================================
RCS file: /sources/pspp/pspp/INSTALL,v
retrieving revision 1.22
diff -b -w -U 3 -r1.22 INSTALL
--- INSTALL 9 May 2008 06:35:33 -0000 1.22
+++ INSTALL 28 May 2008 03:02:57 -0000
@@ -209,6 +209,14 @@
In these cases you can use --without-lib{xx} to force configure
to disregard it.
+`--enable-anachronistic-dependencies'
+ If you use this option, some of the checks for dependent libraries
+ will be relaxed, permitting configure to succeed when older versions
+ of libraries are detected. Use of this option is not recommended.
+ If you use it, some features may be missing and the build may fail
+ with obscure error messages.
+
+
Defining Variables
==================
Index: configure.ac
===================================================================
RCS file: /sources/pspp/pspp/configure.ac,v
retrieving revision 1.85
diff -b -w -U 3 -r1.85 configure.ac
--- configure.ac 20 May 2008 14:01:09 -0000 1.85
+++ configure.ac 28 May 2008 03:02:57 -0000
@@ -16,6 +16,11 @@
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
+AC_ARG_ENABLE(
+ anachronistic-dependencies,
+ [AS_HELP_STRING([--enable-anachronistic-dependencies],
+ [Attempt to allow building against older versions of dependent libraries])])
+
PSPP_ENABLE_OPTION(-Wdeclaration-after-statement)
AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
@@ -39,9 +44,14 @@
gui,
[AS_HELP_STRING([--without-gui], [don't build the PSPPIRE gui])])
+required_gtk_version=2.12
+if test x"$enable_anachronistic_dependencies" = x"yes" ; then
+ required_gtk_version=2.8.20
+fi
+
if test x"$with_gui" != x"no" ; then
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12.0,,
- [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v2.12.0 or later (or use --without-gui)])])
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $required_gtk_version,,
+ [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v$required_gtk_version or later (or use --without-gui)])])
PKG_CHECK_MODULES(GLADE, libglade-2.0 >= 2.6.0,,
[PSPP_REQUIRED_PREREQ([libglade 2.0 v2.6.0 or later (or use --without-gui)])])
fi
Index: po/de.po
===================================================================
RCS file: /sources/pspp/pspp/po/de.po,v
retrieving revision 1.114
diff -b -w -U 3 -r1.114 de.po
--- po/de.po 20 May 2008 01:03:21 -0000 1.114
+++ po/de.po 28 May 2008 03:03:00 -0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.3\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2008-05-20 08:52+0800\n"
+"POT-Creation-Date: 2008-05-28 08:43+0800\n"
"PO-Revision-Date: 2006-07-28 19:32+0800\n"
"Last-Translator: John Darrington <[EMAIL PROTECTED]>\n"
"Language-Team: German <[email protected]>\n"
@@ -47,37 +47,32 @@
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"
msgstr ""
#: src/data/case-tmpfile.c:131
-#, c-format
msgid "seeking in temporary file"
msgstr ""
#: src/data/case-tmpfile.c:153
-#, c-format
msgid "reading temporary file"
msgstr ""
#: src/data/case-tmpfile.c:155
-#, c-format
msgid "unexpected end of file reading temporary file"
msgstr "plotzlich ist der Datei beendet"
#: src/data/case-tmpfile.c:175
-#, c-format
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 ""
@@ -325,14 +320,14 @@
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
-#: 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"
@@ -1432,6 +1427,67 @@
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 ""
@@ -1521,67 +1577,6 @@
"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 ""
@@ -1671,6 +1666,20 @@
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."
@@ -1690,20 +1699,6 @@
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."
@@ -1889,7 +1884,7 @@
#: 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"
@@ -2863,8 +2858,8 @@
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"
@@ -3395,6 +3390,22 @@
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 ""
@@ -3419,22 +3430,6 @@
"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 ""
@@ -4234,7 +4229,6 @@
msgstr ""
#: src/output/ascii.c:360
-#, c-format
msgid "ascii: only screen devices may have `auto' length or width"
msgstr ""
@@ -4244,7 +4238,6 @@
msgstr ""
#: src/output/ascii.c:402
-#, c-format
msgid "ascii: `emphasis' value must be `bold', `underline', or `none'"
msgstr ""
@@ -4259,7 +4252,6 @@
msgstr ""
#: src/output/ascii.c:478 src/output/html.c:187
-#, c-format
msgid "`chart-files' value must contain `#'"
msgstr ""
@@ -4327,12 +4319,10 @@
msgstr ""
#: src/output/output.c:261
-#, c-format
msgid "using default output driver configuration"
msgstr ""
#: src/output/output.c:290
-#, c-format
msgid "cannot find output initialization file (use `-vv' to view search path)"
msgstr ""
@@ -4347,7 +4337,6 @@
msgstr ""
#: src/output/output.c:332 src/ui/gui/message-dialog.c:97
-#, c-format
msgid "syntax error"
msgstr ""
@@ -4357,12 +4346,10 @@
msgstr ""
#: src/output/output.c:349
-#, c-format
msgid "no active output drivers"
msgstr ""
#: src/output/output.c:352
-#, c-format
msgid "error reading device definition file"
msgstr ""
@@ -4410,7 +4397,6 @@
msgstr ""
#: src/output/output.c:765
-#, c-format
msgid "driver definition line missing driver name or class name"
msgstr ""
@@ -4524,7 +4510,6 @@
msgstr ""
#: src/output/postscript.c:1399
-#, c-format
msgid "invalid numeric format"
msgstr ""
@@ -5654,15 +5639,6 @@
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"
@@ -5680,6 +5656,53 @@
msgid "%ld"
msgstr ""
+#: 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
+msgid "_Select"
+msgstr "Schriftwahlung"
+
#: src/ui/gui/psppire.glade:11
#, fuzzy
msgid "This is pre-alpha software. Use at your own risk."
@@ -5876,10 +5899,6 @@
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 ""
@@ -5915,40 +5934,6 @@
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 ""
@@ -6264,6 +6249,58 @@
msgid "To End"
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/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:460
#, c-format
msgid "Could not open \"%s\": %s"
@@ -6484,58 +6521,6 @@
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"
Index: po/en_GB.po
===================================================================
RCS file: /sources/pspp/pspp/po/en_GB.po,v
retrieving revision 1.130
diff -b -w -U 3 -r1.130 en_GB.po
--- po/en_GB.po 20 May 2008 01:03:21 -0000 1.130
+++ po/en_GB.po 28 May 2008 03:03:01 -0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.3\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2008-05-20 08:52+0800\n"
+"POT-Creation-Date: 2008-05-28 08:43+0800\n"
"PO-Revision-Date: 2007-09-15 08:29+0800\n"
"Last-Translator: John Darrington <[EMAIL PROTECTED]>\n"
"Language-Team: John Darrington <[EMAIL PROTECTED]>\n"
@@ -44,37 +44,32 @@
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"
msgstr ""
#: src/data/case-tmpfile.c:131
-#, c-format
msgid "seeking in temporary file"
msgstr ""
#: src/data/case-tmpfile.c:153
-#, c-format
msgid "reading temporary file"
msgstr ""
#: src/data/case-tmpfile.c:155
-#, c-format
msgid "unexpected end of file reading temporary file"
msgstr ""
#: src/data/case-tmpfile.c:175
-#, c-format
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 ""
@@ -320,14 +315,14 @@
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
-#: 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 ""
@@ -1423,6 +1418,67 @@
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 ""
@@ -1512,67 +1568,6 @@
"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 ""
@@ -1662,6 +1657,20 @@
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."
@@ -1681,20 +1690,6 @@
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."
@@ -1880,7 +1875,7 @@
#: 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 ""
@@ -2854,8 +2849,8 @@
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 ""
@@ -3386,6 +3381,22 @@
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 ""
@@ -3410,22 +3421,6 @@
"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 ""
@@ -4225,7 +4220,6 @@
msgstr ""
#: src/output/ascii.c:360
-#, c-format
msgid "ascii: only screen devices may have `auto' length or width"
msgstr ""
@@ -4235,7 +4229,6 @@
msgstr ""
#: src/output/ascii.c:402
-#, c-format
msgid "ascii: `emphasis' value must be `bold', `underline', or `none'"
msgstr ""
@@ -4250,7 +4243,6 @@
msgstr ""
#: src/output/ascii.c:478 src/output/html.c:187
-#, c-format
msgid "`chart-files' value must contain `#'"
msgstr ""
@@ -4318,12 +4310,10 @@
msgstr ""
#: src/output/output.c:261
-#, c-format
msgid "using default output driver configuration"
msgstr ""
#: src/output/output.c:290
-#, c-format
msgid "cannot find output initialization file (use `-vv' to view search path)"
msgstr ""
@@ -4338,7 +4328,6 @@
msgstr ""
#: src/output/output.c:332 src/ui/gui/message-dialog.c:97
-#, c-format
msgid "syntax error"
msgstr ""
@@ -4348,12 +4337,10 @@
msgstr ""
#: src/output/output.c:349
-#, c-format
msgid "no active output drivers"
msgstr ""
#: src/output/output.c:352
-#, c-format
msgid "error reading device definition file"
msgstr ""
@@ -4401,7 +4388,6 @@
msgstr ""
#: src/output/output.c:765
-#, c-format
msgid "driver definition line missing driver name or class name"
msgstr ""
@@ -4515,7 +4501,6 @@
msgstr ""
#: src/output/postscript.c:1399
-#, c-format
msgid "invalid numeric format"
msgstr ""
@@ -5578,14 +5563,6 @@
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 ""
@@ -5603,6 +5580,52 @@
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
msgid "This is pre-alpha software. Use at your own risk."
msgstr ""
@@ -5787,10 +5810,6 @@
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 ""
@@ -5823,40 +5842,6 @@
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 ""
@@ -6145,6 +6130,56 @@
msgid "To End"
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/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:460
#, c-format
msgid "Could not open \"%s\": %s"
@@ -6358,56 +6393,6 @@
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"
Index: src/ui/gui/dict-display.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/dict-display.c,v
retrieving revision 1.7
diff -b -w -U 3 -r1.7 dict-display.c
--- src/ui/gui/dict-display.c 14 Mar 2008 10:42:55 -0000 1.7
+++ src/ui/gui/dict-display.c 28 May 2008 03:03:02 -0000
@@ -154,6 +154,7 @@
}
+#if GTK_CHECK_VERSION (2, 12, 0)
/* Sets the tooltip to be the name of the variable under the cursor */
static gboolean
set_tooltip_for_variable (GtkTreeView *treeview,
@@ -171,6 +172,7 @@
struct variable *var = NULL;
gboolean ok;
+
gtk_tree_view_convert_widget_to_bin_window_coords (treeview,
x, y, &bx, &by);
@@ -199,6 +201,7 @@
return TRUE;
}
+#endif
/* Sets up TREEVIEW to display the variables of DICT.
MODE is the selection mode for TREEVIEW.
@@ -269,7 +272,9 @@
g_object_set (treeview, "has-tooltip", TRUE, NULL);
+#if GTK_CHECK_VERSION (2, 12, 0)
g_signal_connect (treeview, "query-tooltip", G_CALLBACK (set_tooltip_for_variable), NULL);
+#endif
}
Index: src/ui/gui/text-data-import-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/text-data-import-dialog.c,v
retrieving revision 1.5
diff -b -w -U 3 -r1.5 text-data-import-dialog.c
--- src/ui/gui/text-data-import-dialog.c 8 May 2008 23:58:56 -0000 1.5
+++ src/ui/gui/text-data-import-dialog.c 28 May 2008 03:03:03 -0000
@@ -16,11 +16,15 @@
#include <config.h>
+#include <gtk/gtk.h>
+
+
+
#include "checkbox-treeview.h"
#include "descriptives-dialog.h"
#include <errno.h>
-#include <gtk/gtk.h>
+
#include <gtksheet/gtksheet.h>
#include <limits.h>
#include <stdlib.h>
@@ -50,6 +54,9 @@
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
+
+#if GTK_CHECK_VERSION (2, 10, 0)
+
/* TextImportModel, a GtkTreeModel used by the text data import
dialog. */
enum
@@ -2282,3 +2289,22 @@
gdk_window_set_cursor (widget->window, NULL);
}
}
+
+#else
+void
+text_data_import_assistant (GObject *o, gpointer de_)
+{
+ struct data_editor *de = de_;
+
+ GtkWidget *dialog = gtk_message_dialog_new (de->parent.window,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ _("The text import assistant has not been compiled into this build of PSPPIRE"));
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+
+ gtk_widget_destroy (dialog);
+}
+
+#endif
signature.asc
Description: Digital signature
_______________________________________________ pspp-dev mailing list [email protected] http://lists.gnu.org/mailman/listinfo/pspp-dev
