[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp README po/de.po po/pspp.pot src/libpspp/Ch...
|
From: |
John Darrington |
|
Subject: |
[Pspp-cvs] pspp README po/de.po po/pspp.pot src/libpspp/Ch... |
|
Date: |
Wed, 25 Apr 2007 00:09:36 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 07/04/25 00:09:36
Modified files:
. : README
po : de.po pspp.pot
src/libpspp : ChangeLog i18n.c
src/ui/gui : ChangeLog automake.mk dict-display.c psppire.c
psppire.glade
Added files:
src/ui/gui/icons/16x16: date-scale.png nominal.png ordinal.png
scale.png string.png
src/ui/gui/icons/scalable: date-scale.svg nominal.svg
ordinal.svg scale.svg string.svg
Log message:
Fixed bug in internationalization.
Enhanced the dictionary view in dialog box GtkTreeView widgets.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/README?cvsroot=pspp&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/pspp/po/pspp.pot?cvsroot=pspp&r1=1.131&r2=1.132
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/ChangeLog?cvsroot=pspp&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/i18n.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/automake.mk?cvsroot=pspp&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/dict-display.c?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire.c?cvsroot=pspp&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire.glade?cvsroot=pspp&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/icons/16x16/date-scale.png?cvsroot=pspp&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/icons/16x16/nominal.png?cvsroot=pspp&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/icons/16x16/ordinal.png?cvsroot=pspp&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/icons/16x16/scale.png?cvsroot=pspp&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/icons/16x16/string.png?cvsroot=pspp&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/icons/scalable/date-scale.svg?cvsroot=pspp&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/icons/scalable/nominal.svg?cvsroot=pspp&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/icons/scalable/ordinal.svg?cvsroot=pspp&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/icons/scalable/scale.svg?cvsroot=pspp&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/icons/scalable/string.svg?cvsroot=pspp&rev=1.1
Patches:
Index: README
===================================================================
RCS file: /sources/pspp/pspp/README,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- README 13 Feb 2007 00:39:49 -0000 1.14
+++ README 25 Apr 2007 00:09:35 -0000 1.15
@@ -34,10 +34,10 @@
graphing features will not work. If you do not have it
installed, you must run `configure' with --without-libplot.
- * Optional: GTK+ version 2.6.0 or later, plus libglade 2.0 or
- later. Without them, the GUI will not be built. If you do not
- have these installed, you must run `configure' with
- --without-gui.
+ * Optional: GTK+ version 2.6.0 or later (2.10.2 or later is
+ recommended), plus libglade 2.0 or later. Without them, the
+ GUI will not be built. If you do not have these installed, you
+ must run `configure' with --without-gui.
* Optional: Texinfo 4.7 or later, if you want to build the
documentation in PostScript or PDF format.
Index: po/de.po
===================================================================
RCS file: /sources/pspp/pspp/po/de.po,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- po/de.po 16 Apr 2007 10:49:31 -0000 1.46
+++ po/de.po 25 Apr 2007 00:09:36 -0000 1.47
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.2\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-04-16 18:39+0800\n"
+"POT-Creation-Date: 2007-04-25 07:29+0800\n"
"PO-Revision-Date: 2006-05-26 17:49+0800\n"
"Last-Translator: John Darrington <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -309,32 +309,32 @@
msgstr ""
#: src/data/format.c:310 src/data/por-file-reader.c:489
-#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:1127
+#: src/data/sys-file-reader.c:629 src/ui/gui/data-editor.glade:1127
#: src/ui/gui/psppire-var-store.c:481
msgid "String"
msgstr "Zeichenkette"
#: src/data/format.c:310 src/data/por-file-reader.c:489
-#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:1023
+#: src/data/sys-file-reader.c:629 src/ui/gui/data-editor.glade:1023
#: src/ui/gui/psppire-var-store.c:474
msgid "Numeric"
msgstr "Nummer"
-#: src/data/format.c:311 src/data/sys-file-reader.c:1029
-#: src/data/sys-file-reader.c:1031
+#: src/data/format.c:311 src/data/sys-file-reader.c:1057
+#: src/data/sys-file-reader.c:1059
#: src/language/dictionary/apply-dictionary.c:77
#: src/language/dictionary/apply-dictionary.c:78
-#: src/language/xforms/recode.c:468 src/language/xforms/recode.c:469
-#: src/language/xforms/recode.c:481 src/language/xforms/recode.c:482
+#: src/language/xforms/recode.c:474 src/language/xforms/recode.c:475
+#: src/language/xforms/recode.c:487 src/language/xforms/recode.c:488
msgid "numeric"
msgstr "numerisch"
-#: src/data/format.c:311 src/data/sys-file-reader.c:1029
-#: src/data/sys-file-reader.c:1031
+#: src/data/format.c:311 src/data/sys-file-reader.c:1057
+#: src/data/sys-file-reader.c:1059
#: src/language/dictionary/apply-dictionary.c:77
#: src/language/dictionary/apply-dictionary.c:78
-#: src/language/xforms/recode.c:468 src/language/xforms/recode.c:469
-#: src/language/xforms/recode.c:481 src/language/xforms/recode.c:482
+#: src/language/xforms/recode.c:474 src/language/xforms/recode.c:475
+#: src/language/xforms/recode.c:487 src/language/xforms/recode.c:488
msgid "string"
msgstr "kette"
@@ -512,275 +512,275 @@
msgid "Could not access definition for terminal `%s'."
msgstr ""
-#: src/data/sys-file-reader.c:207
+#: src/data/sys-file-reader.c:209
#, c-format
msgid "Error opening \"%s\" for reading as a system file: %s."
msgstr ""
-#: src/data/sys-file-reader.c:237
+#: src/data/sys-file-reader.c:239
msgid "Misplaced type 4 record."
msgstr ""
-#: src/data/sys-file-reader.c:248
+#: src/data/sys-file-reader.c:250
#, c-format
msgid "Unrecognized record type %d."
msgstr ""
-#: src/data/sys-file-reader.c:257
+#: src/data/sys-file-reader.c:284
#, c-format
msgid "File header claims %d variable positions but %d were read from file."
msgstr ""
-#: src/data/sys-file-reader.c:289
+#: src/data/sys-file-reader.c:316
#, c-format
msgid "Error closing system file \"%s\": %s."
msgstr ""
-#: src/data/sys-file-reader.c:349 src/data/sys-file-reader.c:359
+#: src/data/sys-file-reader.c:376 src/data/sys-file-reader.c:386
#, fuzzy
msgid "This is not an SPSS system file."
msgstr "\"%s\" ist kein Systemdatei und kein Tragbardatei."
-#: src/data/sys-file-reader.c:377
+#: src/data/sys-file-reader.c:404
#, c-format
msgid ""
"Compression bias (%g) is not the usual value of 100, or system file uses "
"unrecognized floating-point format."
msgstr ""
-#: src/data/sys-file-reader.c:451
+#: src/data/sys-file-reader.c:478
#, c-format
msgid "Invalid variable name `%s'."
msgstr ""
-#: src/data/sys-file-reader.c:455
+#: src/data/sys-file-reader.c:482
#, c-format
msgid "Bad variable width %d."
msgstr ""
-#: src/data/sys-file-reader.c:459
+#: src/data/sys-file-reader.c:486
#, c-format
msgid "Duplicate variable name `%s' within system file."
msgstr ""
-#: src/data/sys-file-reader.c:467
+#: src/data/sys-file-reader.c:494
msgid "Variable label indicator field is not 0 or 1."
msgstr ""
-#: src/data/sys-file-reader.c:475
+#: src/data/sys-file-reader.c:502
#, c-format
msgid "Variable %s has label of invalid length %u."
msgstr ""
-#: src/data/sys-file-reader.c:486
+#: src/data/sys-file-reader.c:513
msgid "Missing value indicator field is not -3, -2, 0, 1, 2, or 3."
msgstr ""
-#: src/data/sys-file-reader.c:522
+#: src/data/sys-file-reader.c:549
#, c-format
msgid "String variable %s may not have missing values specified as a range."
msgstr ""
-#: src/data/sys-file-reader.c:527
+#: src/data/sys-file-reader.c:554
#, c-format
msgid "Long string variable %s may not have missing values."
msgstr ""
-#: src/data/sys-file-reader.c:549
+#: src/data/sys-file-reader.c:576
msgid "Missing string continuation record."
msgstr ""
-#: src/data/sys-file-reader.c:583
+#: src/data/sys-file-reader.c:610
#, c-format
msgid "Unknown variable format %d."
msgstr ""
-#: src/data/sys-file-reader.c:601
+#: src/data/sys-file-reader.c:628
#, c-format
msgid "%s variable %s has invalid %s format %s."
msgstr ""
-#: src/data/sys-file-reader.c:604
+#: src/data/sys-file-reader.c:631
#, fuzzy
msgid "print"
msgstr "Drucken"
-#: src/data/sys-file-reader.c:604
+#: src/data/sys-file-reader.c:631
#, fuzzy
msgid "write"
msgstr "Drucken"
-#: src/data/sys-file-reader.c:608
+#: src/data/sys-file-reader.c:635
msgid "Suppressing further invalid format warnings."
msgstr ""
-#: src/data/sys-file-reader.c:626
+#: src/data/sys-file-reader.c:653
msgid "Weighting variable must be numeric."
msgstr ""
-#: src/data/sys-file-reader.c:640
+#: src/data/sys-file-reader.c:667
msgid "Multiple type 6 (document) records."
msgstr ""
-#: src/data/sys-file-reader.c:644
+#: src/data/sys-file-reader.c:671
#, c-format
msgid "Number of document lines (%d) must be greater than 0."
msgstr ""
-#: src/data/sys-file-reader.c:715
+#: src/data/sys-file-reader.c:742
#, c-format
msgid "Unrecognized record type 7, subtype %d."
msgstr ""
-#: src/data/sys-file-reader.c:739
+#: src/data/sys-file-reader.c:766
#, c-format
msgid "Bad size (%u) or count (%u) field on record type 7, subtype 3."
msgstr ""
-#: src/data/sys-file-reader.c:754
+#: src/data/sys-file-reader.c:781
#, c-format
msgid ""
"Floating-point representation indicated by system file (%d) differs from "
"expected (%d)."
msgstr ""
-#: src/data/sys-file-reader.c:767
+#: src/data/sys-file-reader.c:794
msgid "little-endian"
msgstr ""
-#: src/data/sys-file-reader.c:767
+#: src/data/sys-file-reader.c:794
msgid "big-endian"
msgstr ""
-#: src/data/sys-file-reader.c:768
+#: src/data/sys-file-reader.c:795
#, c-format
msgid ""
"Integer format indicated by system file (%s) differs from expected (%s)."
msgstr ""
-#: src/data/sys-file-reader.c:784
+#: src/data/sys-file-reader.c:811
#, c-format
msgid "Bad size (%u) or count (%u) on extension 4."
msgstr ""
-#: src/data/sys-file-reader.c:788
+#: src/data/sys-file-reader.c:815
#, c-format
msgid "File specifies unexpected value %g as SYSMIS."
msgstr ""
-#: src/data/sys-file-reader.c:790
+#: src/data/sys-file-reader.c:817
#, c-format
msgid "File specifies unexpected value %g as HIGHEST."
msgstr ""
-#: src/data/sys-file-reader.c:792
+#: src/data/sys-file-reader.c:819
#, c-format
msgid "File specifies unexpected value %g as LOWEST."
msgstr ""
-#: src/data/sys-file-reader.c:806
+#: src/data/sys-file-reader.c:833
#, c-format
msgid "Bad size (%u) or count (%u) on extension 11."
msgstr ""
-#: src/data/sys-file-reader.c:823
+#: src/data/sys-file-reader.c:850
msgid "Invalid variable display parameters. Default parameters substituted."
msgstr ""
-#: src/data/sys-file-reader.c:861
+#: src/data/sys-file-reader.c:888
#, c-format
msgid "Long variable mapping from %s to invalid variable name `%s'."
msgstr ""
-#: src/data/sys-file-reader.c:871
+#: src/data/sys-file-reader.c:898
#, c-format
msgid "Duplicate long variable name `%s' within system file."
msgstr ""
-#: src/data/sys-file-reader.c:909
+#: src/data/sys-file-reader.c:937
#, c-format
msgid "%s listed as string of length %s in length table."
msgstr ""
-#: src/data/sys-file-reader.c:923
+#: src/data/sys-file-reader.c:951
#, c-format
msgid "Very long string %s overflows dictionary."
msgstr ""
-#: src/data/sys-file-reader.c:970
+#: src/data/sys-file-reader.c:998
#, c-format
msgid "Invalid number of labels: %d. Ignoring labels."
msgstr ""
-#: src/data/sys-file-reader.c:1001
+#: src/data/sys-file-reader.c:1029
msgid ""
"Variable index record (type 4) does not immediately follow value label "
"record (type 3) as it should."
msgstr ""
-#: src/data/sys-file-reader.c:1008
+#: src/data/sys-file-reader.c:1036
#, c-format
msgid ""
"Number of variables associated with a value label (%d) is not between 1 and "
"the number of variables (%u)."
msgstr ""
-#: src/data/sys-file-reader.c:1018
+#: src/data/sys-file-reader.c:1046
#, c-format
msgid "Value labels are not allowed on long string variables (%s)."
msgstr ""
-#: src/data/sys-file-reader.c:1025
+#: src/data/sys-file-reader.c:1053
#, c-format
msgid ""
"Variables associated with value label are not all of identical type. "
"Variable %s is %s, but variable %s is %s."
msgstr ""
-#: src/data/sys-file-reader.c:1058
+#: src/data/sys-file-reader.c:1086
#, c-format
msgid "Duplicate value label for %g on %s."
msgstr ""
-#: src/data/sys-file-reader.c:1061
+#: src/data/sys-file-reader.c:1089
#, c-format
msgid "Duplicate value label for \"%.*s\" on %s."
msgstr ""
-#: src/data/sys-file-reader.c:1179
+#: src/data/sys-file-reader.c:1207
msgid "File ends in partial case."
msgstr ""
-#: src/data/sys-file-reader.c:1275 src/data/sys-file-reader.c:1311
+#: src/data/sys-file-reader.c:1303 src/data/sys-file-reader.c:1339
msgid "Compressed data is corrupt."
msgstr ""
-#: src/data/sys-file-reader.c:1384
+#: src/data/sys-file-reader.c:1412
#, c-format
msgid "Variable index %d not in valid range 1...%d."
msgstr ""
-#: src/data/sys-file-reader.c:1389
+#: src/data/sys-file-reader.c:1417
#, c-format
msgid "Variable index %d refers to long string continuation."
msgstr ""
-#: src/data/sys-file-reader.c:1475
+#: src/data/sys-file-reader.c:1503
#, c-format
msgid "Suppressed %d additional variable map warnings."
msgstr ""
-#: src/data/sys-file-reader.c:1488
+#: src/data/sys-file-reader.c:1516
#, c-format
msgid "Variable map refers to unknown variable %s."
msgstr ""
-#: src/data/sys-file-reader.c:1564
+#: src/data/sys-file-reader.c:1592
#, c-format
msgid "System error: %s."
msgstr ""
-#: src/data/sys-file-reader.c:1566
+#: src/data/sys-file-reader.c:1594
#, fuzzy
msgid "Unexpected end of file."
msgstr "plotzlich ist der Datei beendet"
@@ -800,41 +800,41 @@
msgid "An I/O error occurred writing system file \"%s\"."
msgstr ""
-#: src/data/variable.c:231
+#: src/data/variable.c:232
#, c-format
msgid ""
"Character `%c' (in %s) may not appear as the first character in a variable "
"name."
msgstr ""
-#: src/data/variable.c:243
+#: src/data/variable.c:244
#, c-format
msgid "Character `%c' (in %s) may not appear in a variable name."
msgstr ""
-#: src/data/variable.c:271
+#: src/data/variable.c:272
msgid "Variable name cannot be empty string."
msgstr "Ein Variablename darf nicht eines leeres Kette sein."
-#: src/data/variable.c:277
+#: src/data/variable.c:278
#, c-format
msgid "Variable name %s exceeds %d-character limit."
msgstr "Der Variabelname %s ist groÃe als %d Buchstaben."
-#: src/data/variable.c:285
+#: src/data/variable.c:286
#, c-format
msgid "`%s' may not be used as a variable name because it is a reserved word."
msgstr ""
-#: src/data/variable.c:966
+#: src/data/variable.c:967
msgid "ordinary"
msgstr ""
-#: src/data/variable.c:968
+#: src/data/variable.c:969
msgid "system"
msgstr ""
-#: src/data/variable.c:970
+#: src/data/variable.c:971
msgid "scratch"
msgstr ""
@@ -1036,7 +1036,7 @@
#: src/language/dictionary/sys-file-info.c:160
#: src/language/dictionary/sys-file-info.c:395
#: src/language/dictionary/sys-file-info.c:620
-#: src/language/stats/descriptives.c:880
+#: src/language/stats/descriptives.c:880 src/ui/gui/dict-display.c:198
msgid "Variable"
msgstr ""
@@ -2285,7 +2285,7 @@
#: src/language/stats/crosstabs.q:1026 src/language/stats/crosstabs.q:1749
#: src/language/stats/examine.q:909 src/language/stats/frequencies.q:1222
#: src/language/stats/oneway.q:307 src/language/stats/oneway.q:471
-#: src/language/stats/regression.q:326
+#: src/language/stats/regression.q:325
msgid "Total"
msgstr ""
@@ -2331,7 +2331,7 @@
msgstr ""
#: src/language/stats/chisquare.c:223 src/language/stats/chisquare.c:263
-#: src/language/stats/regression.q:325
+#: src/language/stats/regression.q:324
msgid "Residual"
msgstr ""
@@ -2349,7 +2349,7 @@
#: src/language/stats/chisquare.c:325 src/language/stats/crosstabs.q:1120
#: src/language/stats/oneway.q:280 src/language/stats/oneway.q:681
-#: src/language/stats/regression.q:319 src/language/stats/t-test.q:980
+#: src/language/stats/regression.q:318 src/language/stats/t-test.q:980
#: src/language/stats/t-test.q:1172 src/language/stats/t-test.q:1265
msgid "df"
msgstr ""
@@ -2772,7 +2772,7 @@
msgstr ""
#: src/language/stats/examine.q:1421 src/language/stats/oneway.q:395
-#: src/language/stats/oneway.q:679 src/language/stats/regression.q:221
+#: src/language/stats/oneway.q:679 src/language/stats/regression.q:220
msgid "Std. Error"
msgstr ""
@@ -3072,21 +3072,21 @@
msgid "`%s' is not a variable name"
msgstr ""
-#: src/language/stats/oneway.q:279 src/language/stats/regression.q:318
+#: src/language/stats/oneway.q:279 src/language/stats/regression.q:317
msgid "Sum of Squares"
msgstr ""
-#: src/language/stats/oneway.q:281 src/language/stats/regression.q:320
+#: src/language/stats/oneway.q:281 src/language/stats/regression.q:319
msgid "Mean Square"
msgstr ""
-#: src/language/stats/oneway.q:282 src/language/stats/regression.q:321
+#: src/language/stats/oneway.q:282 src/language/stats/regression.q:320
#: src/language/stats/t-test.q:977
msgid "F"
msgstr ""
#: src/language/stats/oneway.q:283 src/language/stats/oneway.q:537
-#: src/language/stats/regression.q:224 src/language/stats/regression.q:322
+#: src/language/stats/regression.q:223 src/language/stats/regression.q:321
msgid "Significance"
msgstr ""
@@ -3098,7 +3098,7 @@
msgid "Within Groups"
msgstr ""
-#: src/language/stats/oneway.q:353 src/language/stats/regression.q:348
+#: src/language/stats/oneway.q:353 src/language/stats/regression.q:347
msgid "ANOVA"
msgstr ""
@@ -3134,7 +3134,7 @@
msgid "Value of Contrast"
msgstr ""
-#: src/language/stats/oneway.q:680 src/language/stats/regression.q:223
+#: src/language/stats/oneway.q:680 src/language/stats/regression.q:222
#: src/language/stats/t-test.q:979 src/language/stats/t-test.q:1171
#: src/language/stats/t-test.q:1264
msgid "t"
@@ -3206,59 +3206,59 @@
msgid "Too many variables in INTO clause."
msgstr ""
-#: src/language/stats/regression.q:175
+#: src/language/stats/regression.q:174
msgid "R"
msgstr ""
-#: src/language/stats/regression.q:176
+#: src/language/stats/regression.q:175
msgid "R Square"
msgstr ""
-#: src/language/stats/regression.q:177
+#: src/language/stats/regression.q:176
msgid "Adjusted R Square"
msgstr ""
-#: src/language/stats/regression.q:178
+#: src/language/stats/regression.q:177
msgid "Std. Error of the Estimate"
msgstr ""
-#: src/language/stats/regression.q:183
+#: src/language/stats/regression.q:182
msgid "Model Summary"
msgstr ""
-#: src/language/stats/regression.q:220
+#: src/language/stats/regression.q:219
msgid "B"
msgstr ""
-#: src/language/stats/regression.q:222
+#: src/language/stats/regression.q:221
msgid "Beta"
msgstr ""
-#: src/language/stats/regression.q:225
+#: src/language/stats/regression.q:224
msgid "(Constant)"
msgstr ""
-#: src/language/stats/regression.q:287
+#: src/language/stats/regression.q:286
msgid "Coefficients"
msgstr ""
-#: src/language/stats/regression.q:324
+#: src/language/stats/regression.q:323
msgid "Regression"
msgstr ""
-#: src/language/stats/regression.q:403
+#: src/language/stats/regression.q:402
msgid "Model"
msgstr ""
-#: src/language/stats/regression.q:404
+#: src/language/stats/regression.q:403
msgid "Covariances"
msgstr ""
-#: src/language/stats/regression.q:419
+#: src/language/stats/regression.q:418
msgid "Coefficient Correlations"
msgstr ""
-#: src/language/stats/regression.q:1196
+#: src/language/stats/regression.q:1195
msgid "Dependent variable must be numeric."
msgstr ""
@@ -3646,30 +3646,34 @@
msgid "CONVERT requires string input values and numeric output values."
msgstr ""
-#: src/language/xforms/recode.c:387
+#: src/language/xforms/recode.c:319
+msgid "THRU is not allowed with string variables."
+msgstr ""
+
+#: src/language/xforms/recode.c:393
msgid "expecting output value"
msgstr ""
-#: src/language/xforms/recode.c:436
+#: src/language/xforms/recode.c:442
#, c-format
msgid ""
"%u variable(s) cannot be recoded into %u variable(s). Specify the same "
"number of variables as source and target variables."
msgstr ""
-#: src/language/xforms/recode.c:451
+#: src/language/xforms/recode.c:457
#, c-format
msgid ""
"There is no variable named %s. (All string variables specified on INTO must "
"already exist. Use the STRING command to create a string variable.)"
msgstr ""
-#: src/language/xforms/recode.c:466
+#: src/language/xforms/recode.c:472
#, c-format
msgid "INTO is required with %s input values and %s output values."
msgstr ""
-#: src/language/xforms/recode.c:479
+#: src/language/xforms/recode.c:485
#, c-format
msgid "Type mismatch. Cannot store %s data in %s variable %s."
msgstr ""
@@ -4571,26 +4575,22 @@
msgid "Case Number:"
msgstr ""
-#: src/ui/gui/data-editor.glade:2055 src/ui/gui/psppire.glade:1169
+#: src/ui/gui/data-editor.glade:2055 src/ui/gui/psppire.glade:1171
msgid "Sort by:"
msgstr ""
-#: src/ui/gui/data-editor.glade:2104 src/ui/gui/psppire.glade:1222
+#: src/ui/gui/data-editor.glade:2104 src/ui/gui/psppire.glade:1224
msgid "Ascending"
msgstr ""
-#: src/ui/gui/data-editor.glade:2117 src/ui/gui/psppire.glade:1232
+#: src/ui/gui/data-editor.glade:2117 src/ui/gui/psppire.glade:1234
msgid "Descending"
msgstr ""
-#: src/ui/gui/data-editor.glade:2133 src/ui/gui/psppire.glade:1248
+#: src/ui/gui/data-editor.glade:2133 src/ui/gui/psppire.glade:1250
msgid "Sort Order"
msgstr ""
-#: src/ui/gui/dict-display.c:92
-msgid "Var"
-msgstr ""
-
#: src/ui/gui/helper.c:136
msgid "Sorry. The help system hasn't yet been implemented."
msgstr "Es gibt noch nicht kein Helpsysteme. Schade!"
@@ -4692,14 +4692,14 @@
msgid "Current Status: "
msgstr ""
-#: src/ui/gui/psppire.glade:259
+#: src/ui/gui/psppire.glade:281
#, fuzzy
-msgid "Name Variable:"
+msgid "Variable(s):"
msgstr "Variableansicht"
-#: src/ui/gui/psppire.glade:292
+#: src/ui/gui/psppire.glade:330
#, fuzzy
-msgid "Variable(s):"
+msgid "Name Variable:"
msgstr "Variableansicht"
#: src/ui/gui/psppire.glade:446
@@ -4743,7 +4743,7 @@
msgid "If condition is satisfied"
msgstr ""
-#: src/ui/gui/psppire.glade:773 src/ui/gui/psppire.glade:1551
+#: src/ui/gui/psppire.glade:773 src/ui/gui/psppire.glade:1553
msgid "If..."
msgstr ""
@@ -4804,24 +4804,24 @@
msgid "Do not filter cases"
msgstr ""
-#: src/ui/gui/psppire.glade:1317
+#: src/ui/gui/psppire.glade:1319
#, fuzzy
msgid "Target Variable:"
msgstr "Variableansicht"
-#: src/ui/gui/psppire.glade:1348
+#: src/ui/gui/psppire.glade:1350
msgid "Type & Label"
msgstr ""
-#: src/ui/gui/psppire.glade:1387
+#: src/ui/gui/psppire.glade:1389
msgid "="
msgstr ""
-#: src/ui/gui/psppire.glade:1433
+#: src/ui/gui/psppire.glade:1435
msgid "Numeric Expressions:"
msgstr ""
-#: src/ui/gui/psppire.glade:1487
+#: src/ui/gui/psppire.glade:1489
msgid "Functions:"
msgstr ""
Index: po/pspp.pot
===================================================================
RCS file: /sources/pspp/pspp/po/pspp.pot,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- po/pspp.pot 16 Apr 2007 10:49:31 -0000 1.131
+++ po/pspp.pot 25 Apr 2007 00:09:36 -0000 1.132
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-04-16 18:39+0800\n"
+"POT-Creation-Date: 2007-04-25 07:29+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -308,32 +308,32 @@
msgstr ""
#: src/data/format.c:310 src/data/por-file-reader.c:489
-#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:1127
+#: src/data/sys-file-reader.c:629 src/ui/gui/data-editor.glade:1127
#: src/ui/gui/psppire-var-store.c:481
msgid "String"
msgstr ""
#: src/data/format.c:310 src/data/por-file-reader.c:489
-#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:1023
+#: src/data/sys-file-reader.c:629 src/ui/gui/data-editor.glade:1023
#: src/ui/gui/psppire-var-store.c:474
msgid "Numeric"
msgstr ""
-#: src/data/format.c:311 src/data/sys-file-reader.c:1029
-#: src/data/sys-file-reader.c:1031
+#: src/data/format.c:311 src/data/sys-file-reader.c:1057
+#: src/data/sys-file-reader.c:1059
#: src/language/dictionary/apply-dictionary.c:77
#: src/language/dictionary/apply-dictionary.c:78
-#: src/language/xforms/recode.c:468 src/language/xforms/recode.c:469
-#: src/language/xforms/recode.c:481 src/language/xforms/recode.c:482
+#: src/language/xforms/recode.c:474 src/language/xforms/recode.c:475
+#: src/language/xforms/recode.c:487 src/language/xforms/recode.c:488
msgid "numeric"
msgstr ""
-#: src/data/format.c:311 src/data/sys-file-reader.c:1029
-#: src/data/sys-file-reader.c:1031
+#: src/data/format.c:311 src/data/sys-file-reader.c:1057
+#: src/data/sys-file-reader.c:1059
#: src/language/dictionary/apply-dictionary.c:77
#: src/language/dictionary/apply-dictionary.c:78
-#: src/language/xforms/recode.c:468 src/language/xforms/recode.c:469
-#: src/language/xforms/recode.c:481 src/language/xforms/recode.c:482
+#: src/language/xforms/recode.c:474 src/language/xforms/recode.c:475
+#: src/language/xforms/recode.c:487 src/language/xforms/recode.c:488
msgid "string"
msgstr ""
@@ -511,272 +511,272 @@
msgid "Could not access definition for terminal `%s'."
msgstr ""
-#: src/data/sys-file-reader.c:207
+#: src/data/sys-file-reader.c:209
#, c-format
msgid "Error opening \"%s\" for reading as a system file: %s."
msgstr ""
-#: src/data/sys-file-reader.c:237
+#: src/data/sys-file-reader.c:239
msgid "Misplaced type 4 record."
msgstr ""
-#: src/data/sys-file-reader.c:248
+#: src/data/sys-file-reader.c:250
#, c-format
msgid "Unrecognized record type %d."
msgstr ""
-#: src/data/sys-file-reader.c:257
+#: src/data/sys-file-reader.c:284
#, c-format
msgid "File header claims %d variable positions but %d were read from file."
msgstr ""
-#: src/data/sys-file-reader.c:289
+#: src/data/sys-file-reader.c:316
#, c-format
msgid "Error closing system file \"%s\": %s."
msgstr ""
-#: src/data/sys-file-reader.c:349 src/data/sys-file-reader.c:359
+#: src/data/sys-file-reader.c:376 src/data/sys-file-reader.c:386
msgid "This is not an SPSS system file."
msgstr ""
-#: src/data/sys-file-reader.c:377
+#: src/data/sys-file-reader.c:404
#, c-format
msgid ""
"Compression bias (%g) is not the usual value of 100, or system file uses "
"unrecognized floating-point format."
msgstr ""
-#: src/data/sys-file-reader.c:451
+#: src/data/sys-file-reader.c:478
#, c-format
msgid "Invalid variable name `%s'."
msgstr ""
-#: src/data/sys-file-reader.c:455
+#: src/data/sys-file-reader.c:482
#, c-format
msgid "Bad variable width %d."
msgstr ""
-#: src/data/sys-file-reader.c:459
+#: src/data/sys-file-reader.c:486
#, c-format
msgid "Duplicate variable name `%s' within system file."
msgstr ""
-#: src/data/sys-file-reader.c:467
+#: src/data/sys-file-reader.c:494
msgid "Variable label indicator field is not 0 or 1."
msgstr ""
-#: src/data/sys-file-reader.c:475
+#: src/data/sys-file-reader.c:502
#, c-format
msgid "Variable %s has label of invalid length %u."
msgstr ""
-#: src/data/sys-file-reader.c:486
+#: src/data/sys-file-reader.c:513
msgid "Missing value indicator field is not -3, -2, 0, 1, 2, or 3."
msgstr ""
-#: src/data/sys-file-reader.c:522
+#: src/data/sys-file-reader.c:549
#, c-format
msgid "String variable %s may not have missing values specified as a range."
msgstr ""
-#: src/data/sys-file-reader.c:527
+#: src/data/sys-file-reader.c:554
#, c-format
msgid "Long string variable %s may not have missing values."
msgstr ""
-#: src/data/sys-file-reader.c:549
+#: src/data/sys-file-reader.c:576
msgid "Missing string continuation record."
msgstr ""
-#: src/data/sys-file-reader.c:583
+#: src/data/sys-file-reader.c:610
#, c-format
msgid "Unknown variable format %d."
msgstr ""
-#: src/data/sys-file-reader.c:601
+#: src/data/sys-file-reader.c:628
#, c-format
msgid "%s variable %s has invalid %s format %s."
msgstr ""
-#: src/data/sys-file-reader.c:604
+#: src/data/sys-file-reader.c:631
msgid "print"
msgstr ""
-#: src/data/sys-file-reader.c:604
+#: src/data/sys-file-reader.c:631
msgid "write"
msgstr ""
-#: src/data/sys-file-reader.c:608
+#: src/data/sys-file-reader.c:635
msgid "Suppressing further invalid format warnings."
msgstr ""
-#: src/data/sys-file-reader.c:626
+#: src/data/sys-file-reader.c:653
msgid "Weighting variable must be numeric."
msgstr ""
-#: src/data/sys-file-reader.c:640
+#: src/data/sys-file-reader.c:667
msgid "Multiple type 6 (document) records."
msgstr ""
-#: src/data/sys-file-reader.c:644
+#: src/data/sys-file-reader.c:671
#, c-format
msgid "Number of document lines (%d) must be greater than 0."
msgstr ""
-#: src/data/sys-file-reader.c:715
+#: src/data/sys-file-reader.c:742
#, c-format
msgid "Unrecognized record type 7, subtype %d."
msgstr ""
-#: src/data/sys-file-reader.c:739
+#: src/data/sys-file-reader.c:766
#, c-format
msgid "Bad size (%u) or count (%u) field on record type 7, subtype 3."
msgstr ""
-#: src/data/sys-file-reader.c:754
+#: src/data/sys-file-reader.c:781
#, c-format
msgid ""
"Floating-point representation indicated by system file (%d) differs from "
"expected (%d)."
msgstr ""
-#: src/data/sys-file-reader.c:767
+#: src/data/sys-file-reader.c:794
msgid "little-endian"
msgstr ""
-#: src/data/sys-file-reader.c:767
+#: src/data/sys-file-reader.c:794
msgid "big-endian"
msgstr ""
-#: src/data/sys-file-reader.c:768
+#: src/data/sys-file-reader.c:795
#, c-format
msgid ""
"Integer format indicated by system file (%s) differs from expected (%s)."
msgstr ""
-#: src/data/sys-file-reader.c:784
+#: src/data/sys-file-reader.c:811
#, c-format
msgid "Bad size (%u) or count (%u) on extension 4."
msgstr ""
-#: src/data/sys-file-reader.c:788
+#: src/data/sys-file-reader.c:815
#, c-format
msgid "File specifies unexpected value %g as SYSMIS."
msgstr ""
-#: src/data/sys-file-reader.c:790
+#: src/data/sys-file-reader.c:817
#, c-format
msgid "File specifies unexpected value %g as HIGHEST."
msgstr ""
-#: src/data/sys-file-reader.c:792
+#: src/data/sys-file-reader.c:819
#, c-format
msgid "File specifies unexpected value %g as LOWEST."
msgstr ""
-#: src/data/sys-file-reader.c:806
+#: src/data/sys-file-reader.c:833
#, c-format
msgid "Bad size (%u) or count (%u) on extension 11."
msgstr ""
-#: src/data/sys-file-reader.c:823
+#: src/data/sys-file-reader.c:850
msgid "Invalid variable display parameters. Default parameters substituted."
msgstr ""
-#: src/data/sys-file-reader.c:861
+#: src/data/sys-file-reader.c:888
#, c-format
msgid "Long variable mapping from %s to invalid variable name `%s'."
msgstr ""
-#: src/data/sys-file-reader.c:871
+#: src/data/sys-file-reader.c:898
#, c-format
msgid "Duplicate long variable name `%s' within system file."
msgstr ""
-#: src/data/sys-file-reader.c:909
+#: src/data/sys-file-reader.c:937
#, c-format
msgid "%s listed as string of length %s in length table."
msgstr ""
-#: src/data/sys-file-reader.c:923
+#: src/data/sys-file-reader.c:951
#, c-format
msgid "Very long string %s overflows dictionary."
msgstr ""
-#: src/data/sys-file-reader.c:970
+#: src/data/sys-file-reader.c:998
#, c-format
msgid "Invalid number of labels: %d. Ignoring labels."
msgstr ""
-#: src/data/sys-file-reader.c:1001
+#: src/data/sys-file-reader.c:1029
msgid ""
"Variable index record (type 4) does not immediately follow value label "
"record (type 3) as it should."
msgstr ""
-#: src/data/sys-file-reader.c:1008
+#: src/data/sys-file-reader.c:1036
#, c-format
msgid ""
"Number of variables associated with a value label (%d) is not between 1 and "
"the number of variables (%u)."
msgstr ""
-#: src/data/sys-file-reader.c:1018
+#: src/data/sys-file-reader.c:1046
#, c-format
msgid "Value labels are not allowed on long string variables (%s)."
msgstr ""
-#: src/data/sys-file-reader.c:1025
+#: src/data/sys-file-reader.c:1053
#, c-format
msgid ""
"Variables associated with value label are not all of identical type. "
"Variable %s is %s, but variable %s is %s."
msgstr ""
-#: src/data/sys-file-reader.c:1058
+#: src/data/sys-file-reader.c:1086
#, c-format
msgid "Duplicate value label for %g on %s."
msgstr ""
-#: src/data/sys-file-reader.c:1061
+#: src/data/sys-file-reader.c:1089
#, c-format
msgid "Duplicate value label for \"%.*s\" on %s."
msgstr ""
-#: src/data/sys-file-reader.c:1179
+#: src/data/sys-file-reader.c:1207
msgid "File ends in partial case."
msgstr ""
-#: src/data/sys-file-reader.c:1275 src/data/sys-file-reader.c:1311
+#: src/data/sys-file-reader.c:1303 src/data/sys-file-reader.c:1339
msgid "Compressed data is corrupt."
msgstr ""
-#: src/data/sys-file-reader.c:1384
+#: src/data/sys-file-reader.c:1412
#, c-format
msgid "Variable index %d not in valid range 1...%d."
msgstr ""
-#: src/data/sys-file-reader.c:1389
+#: src/data/sys-file-reader.c:1417
#, c-format
msgid "Variable index %d refers to long string continuation."
msgstr ""
-#: src/data/sys-file-reader.c:1475
+#: src/data/sys-file-reader.c:1503
#, c-format
msgid "Suppressed %d additional variable map warnings."
msgstr ""
-#: src/data/sys-file-reader.c:1488
+#: src/data/sys-file-reader.c:1516
#, c-format
msgid "Variable map refers to unknown variable %s."
msgstr ""
-#: src/data/sys-file-reader.c:1564
+#: src/data/sys-file-reader.c:1592
#, c-format
msgid "System error: %s."
msgstr ""
-#: src/data/sys-file-reader.c:1566
+#: src/data/sys-file-reader.c:1594
msgid "Unexpected end of file."
msgstr ""
@@ -795,41 +795,41 @@
msgid "An I/O error occurred writing system file \"%s\"."
msgstr ""
-#: src/data/variable.c:231
+#: src/data/variable.c:232
#, c-format
msgid ""
"Character `%c' (in %s) may not appear as the first character in a variable "
"name."
msgstr ""
-#: src/data/variable.c:243
+#: src/data/variable.c:244
#, c-format
msgid "Character `%c' (in %s) may not appear in a variable name."
msgstr ""
-#: src/data/variable.c:271
+#: src/data/variable.c:272
msgid "Variable name cannot be empty string."
msgstr ""
-#: src/data/variable.c:277
+#: src/data/variable.c:278
#, c-format
msgid "Variable name %s exceeds %d-character limit."
msgstr ""
-#: src/data/variable.c:285
+#: src/data/variable.c:286
#, c-format
msgid "`%s' may not be used as a variable name because it is a reserved word."
msgstr ""
-#: src/data/variable.c:966
+#: src/data/variable.c:967
msgid "ordinary"
msgstr ""
-#: src/data/variable.c:968
+#: src/data/variable.c:969
msgid "system"
msgstr ""
-#: src/data/variable.c:970
+#: src/data/variable.c:971
msgid "scratch"
msgstr ""
@@ -1031,7 +1031,7 @@
#: src/language/dictionary/sys-file-info.c:160
#: src/language/dictionary/sys-file-info.c:395
#: src/language/dictionary/sys-file-info.c:620
-#: src/language/stats/descriptives.c:880
+#: src/language/stats/descriptives.c:880 src/ui/gui/dict-display.c:198
msgid "Variable"
msgstr ""
@@ -2280,7 +2280,7 @@
#: src/language/stats/crosstabs.q:1026 src/language/stats/crosstabs.q:1749
#: src/language/stats/examine.q:909 src/language/stats/frequencies.q:1222
#: src/language/stats/oneway.q:307 src/language/stats/oneway.q:471
-#: src/language/stats/regression.q:326
+#: src/language/stats/regression.q:325
msgid "Total"
msgstr ""
@@ -2326,7 +2326,7 @@
msgstr ""
#: src/language/stats/chisquare.c:223 src/language/stats/chisquare.c:263
-#: src/language/stats/regression.q:325
+#: src/language/stats/regression.q:324
msgid "Residual"
msgstr ""
@@ -2344,7 +2344,7 @@
#: src/language/stats/chisquare.c:325 src/language/stats/crosstabs.q:1120
#: src/language/stats/oneway.q:280 src/language/stats/oneway.q:681
-#: src/language/stats/regression.q:319 src/language/stats/t-test.q:980
+#: src/language/stats/regression.q:318 src/language/stats/t-test.q:980
#: src/language/stats/t-test.q:1172 src/language/stats/t-test.q:1265
msgid "df"
msgstr ""
@@ -2767,7 +2767,7 @@
msgstr ""
#: src/language/stats/examine.q:1421 src/language/stats/oneway.q:395
-#: src/language/stats/oneway.q:679 src/language/stats/regression.q:221
+#: src/language/stats/oneway.q:679 src/language/stats/regression.q:220
msgid "Std. Error"
msgstr ""
@@ -3066,21 +3066,21 @@
msgid "`%s' is not a variable name"
msgstr ""
-#: src/language/stats/oneway.q:279 src/language/stats/regression.q:318
+#: src/language/stats/oneway.q:279 src/language/stats/regression.q:317
msgid "Sum of Squares"
msgstr ""
-#: src/language/stats/oneway.q:281 src/language/stats/regression.q:320
+#: src/language/stats/oneway.q:281 src/language/stats/regression.q:319
msgid "Mean Square"
msgstr ""
-#: src/language/stats/oneway.q:282 src/language/stats/regression.q:321
+#: src/language/stats/oneway.q:282 src/language/stats/regression.q:320
#: src/language/stats/t-test.q:977
msgid "F"
msgstr ""
#: src/language/stats/oneway.q:283 src/language/stats/oneway.q:537
-#: src/language/stats/regression.q:224 src/language/stats/regression.q:322
+#: src/language/stats/regression.q:223 src/language/stats/regression.q:321
msgid "Significance"
msgstr ""
@@ -3092,7 +3092,7 @@
msgid "Within Groups"
msgstr ""
-#: src/language/stats/oneway.q:353 src/language/stats/regression.q:348
+#: src/language/stats/oneway.q:353 src/language/stats/regression.q:347
msgid "ANOVA"
msgstr ""
@@ -3128,7 +3128,7 @@
msgid "Value of Contrast"
msgstr ""
-#: src/language/stats/oneway.q:680 src/language/stats/regression.q:223
+#: src/language/stats/oneway.q:680 src/language/stats/regression.q:222
#: src/language/stats/t-test.q:979 src/language/stats/t-test.q:1171
#: src/language/stats/t-test.q:1264
msgid "t"
@@ -3200,59 +3200,59 @@
msgid "Too many variables in INTO clause."
msgstr ""
-#: src/language/stats/regression.q:175
+#: src/language/stats/regression.q:174
msgid "R"
msgstr ""
-#: src/language/stats/regression.q:176
+#: src/language/stats/regression.q:175
msgid "R Square"
msgstr ""
-#: src/language/stats/regression.q:177
+#: src/language/stats/regression.q:176
msgid "Adjusted R Square"
msgstr ""
-#: src/language/stats/regression.q:178
+#: src/language/stats/regression.q:177
msgid "Std. Error of the Estimate"
msgstr ""
-#: src/language/stats/regression.q:183
+#: src/language/stats/regression.q:182
msgid "Model Summary"
msgstr ""
-#: src/language/stats/regression.q:220
+#: src/language/stats/regression.q:219
msgid "B"
msgstr ""
-#: src/language/stats/regression.q:222
+#: src/language/stats/regression.q:221
msgid "Beta"
msgstr ""
-#: src/language/stats/regression.q:225
+#: src/language/stats/regression.q:224
msgid "(Constant)"
msgstr ""
-#: src/language/stats/regression.q:287
+#: src/language/stats/regression.q:286
msgid "Coefficients"
msgstr ""
-#: src/language/stats/regression.q:324
+#: src/language/stats/regression.q:323
msgid "Regression"
msgstr ""
-#: src/language/stats/regression.q:403
+#: src/language/stats/regression.q:402
msgid "Model"
msgstr ""
-#: src/language/stats/regression.q:404
+#: src/language/stats/regression.q:403
msgid "Covariances"
msgstr ""
-#: src/language/stats/regression.q:419
+#: src/language/stats/regression.q:418
msgid "Coefficient Correlations"
msgstr ""
-#: src/language/stats/regression.q:1196
+#: src/language/stats/regression.q:1195
msgid "Dependent variable must be numeric."
msgstr ""
@@ -3640,30 +3640,34 @@
msgid "CONVERT requires string input values and numeric output values."
msgstr ""
-#: src/language/xforms/recode.c:387
+#: src/language/xforms/recode.c:319
+msgid "THRU is not allowed with string variables."
+msgstr ""
+
+#: src/language/xforms/recode.c:393
msgid "expecting output value"
msgstr ""
-#: src/language/xforms/recode.c:436
+#: src/language/xforms/recode.c:442
#, c-format
msgid ""
"%u variable(s) cannot be recoded into %u variable(s). Specify the same "
"number of variables as source and target variables."
msgstr ""
-#: src/language/xforms/recode.c:451
+#: src/language/xforms/recode.c:457
#, c-format
msgid ""
"There is no variable named %s. (All string variables specified on INTO must "
"already exist. Use the STRING command to create a string variable.)"
msgstr ""
-#: src/language/xforms/recode.c:466
+#: src/language/xforms/recode.c:472
#, c-format
msgid "INTO is required with %s input values and %s output values."
msgstr ""
-#: src/language/xforms/recode.c:479
+#: src/language/xforms/recode.c:485
#, c-format
msgid "Type mismatch. Cannot store %s data in %s variable %s."
msgstr ""
@@ -4546,26 +4550,22 @@
msgid "Case Number:"
msgstr ""
-#: src/ui/gui/data-editor.glade:2055 src/ui/gui/psppire.glade:1169
+#: src/ui/gui/data-editor.glade:2055 src/ui/gui/psppire.glade:1171
msgid "Sort by:"
msgstr ""
-#: src/ui/gui/data-editor.glade:2104 src/ui/gui/psppire.glade:1222
+#: src/ui/gui/data-editor.glade:2104 src/ui/gui/psppire.glade:1224
msgid "Ascending"
msgstr ""
-#: src/ui/gui/data-editor.glade:2117 src/ui/gui/psppire.glade:1232
+#: src/ui/gui/data-editor.glade:2117 src/ui/gui/psppire.glade:1234
msgid "Descending"
msgstr ""
-#: src/ui/gui/data-editor.glade:2133 src/ui/gui/psppire.glade:1248
+#: src/ui/gui/data-editor.glade:2133 src/ui/gui/psppire.glade:1250
msgid "Sort Order"
msgstr ""
-#: src/ui/gui/dict-display.c:92
-msgid "Var"
-msgstr ""
-
#: src/ui/gui/helper.c:136
msgid "Sorry. The help system hasn't yet been implemented."
msgstr ""
@@ -4664,12 +4664,12 @@
msgid "Current Status: "
msgstr ""
-#: src/ui/gui/psppire.glade:259
-msgid "Name Variable:"
+#: src/ui/gui/psppire.glade:281
+msgid "Variable(s):"
msgstr ""
-#: src/ui/gui/psppire.glade:292
-msgid "Variable(s):"
+#: src/ui/gui/psppire.glade:330
+msgid "Name Variable:"
msgstr ""
#: src/ui/gui/psppire.glade:446
@@ -4712,7 +4712,7 @@
msgid "If condition is satisfied"
msgstr ""
-#: src/ui/gui/psppire.glade:773 src/ui/gui/psppire.glade:1551
+#: src/ui/gui/psppire.glade:773 src/ui/gui/psppire.glade:1553
msgid "If..."
msgstr ""
@@ -4768,23 +4768,23 @@
msgid "Do not filter cases"
msgstr ""
-#: src/ui/gui/psppire.glade:1317
+#: src/ui/gui/psppire.glade:1319
msgid "Target Variable:"
msgstr ""
-#: src/ui/gui/psppire.glade:1348
+#: src/ui/gui/psppire.glade:1350
msgid "Type & Label"
msgstr ""
-#: src/ui/gui/psppire.glade:1387
+#: src/ui/gui/psppire.glade:1389
msgid "="
msgstr ""
-#: src/ui/gui/psppire.glade:1433
+#: src/ui/gui/psppire.glade:1435
msgid "Numeric Expressions:"
msgstr ""
-#: src/ui/gui/psppire.glade:1487
+#: src/ui/gui/psppire.glade:1489
msgid "Functions:"
msgstr ""
Index: src/libpspp/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/libpspp/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- src/libpspp/ChangeLog 23 Apr 2007 01:35:34 -0000 1.63
+++ src/libpspp/ChangeLog 25 Apr 2007 00:09:36 -0000 1.64
@@ -1,3 +1,7 @@
+2007-04-25 John Darrington <address@hidden>
+
+ * i18n.c: Fixed bug converting long strings
+
2007-04-22 Ben Pfaff <address@hidden>
Patch #5884.
Index: src/libpspp/i18n.c
===================================================================
RCS file: /sources/pspp/pspp/src/libpspp/i18n.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/libpspp/i18n.c 6 Mar 2007 10:36:46 -0000 1.6
+++ src/libpspp/i18n.c 25 Apr 2007 00:09:36 -0000 1.7
@@ -24,6 +24,7 @@
#include <string.h>
#include <iconv.h>
#include <errno.h>
+#include "assertion.h"
#include "i18n.h"
@@ -96,6 +97,7 @@
inbytes = length;
do {
+ char *ip = text;
result = iconv (convertor[how], (ICONV_CONST char **) &text, &inbytes,
&op, &outbytes);
@@ -123,9 +125,11 @@
op = outbuf;
outbytes = outbufferlength;
inbytes = length;
+ text = ip;
break;
default:
/* should never happen */
+ NOT_REACHED ();
break;
}
}
Index: src/ui/gui/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- src/ui/gui/ChangeLog 16 Apr 2007 03:06:50 -0000 1.53
+++ src/ui/gui/ChangeLog 25 Apr 2007 00:09:36 -0000 1.54
@@ -1,3 +1,13 @@
+2007-04-25 John Darrington <address@hidden>
+
+ * icons/scalable icons/16x16: new directories.
+ * psppire.c : Add new icons to factory.
+
+ * dict-display.c: Refactor code get model from modelfilter.
+ Added cellrenderer to display icon indicating variables' types.
+ Displayed the label of variables, if there is one.
+
+
2007-04-15 Ben Pfaff <address@hidden>
* compute-dialog.c (function_list_populate): Use new accessor
Index: src/ui/gui/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/automake.mk,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- src/ui/gui/automake.mk 4 Apr 2007 11:02:31 -0000 1.25
+++ src/ui/gui/automake.mk 25 Apr 2007 00:09:36 -0000 1.26
@@ -59,7 +59,12 @@
$(top_srcdir)/src/ui/gui/icons/recent-dialogs.png \
$(top_srcdir)/src/ui/gui/icons/split-file.png \
$(top_srcdir)/src/ui/gui/icons/select-cases.png \
- $(top_srcdir)/src/ui/gui/icons/weight-cases.png
+ $(top_srcdir)/src/ui/gui/icons/weight-cases.png \
+ $(top_srcdir)/src/ui/gui/icons/16x16/nominal.png \
+ $(top_srcdir)/src/ui/gui/icons/16x16/ordinal.png \
+ $(top_srcdir)/src/ui/gui/icons/16x16/scale.png \
+ $(top_srcdir)/src/ui/gui/icons/16x16/string.png \
+ $(top_srcdir)/src/ui/gui/icons/16x16/date-scale.png
src_ui_gui_psppire_SOURCES = \
Index: src/ui/gui/dict-display.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/dict-display.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/ui/gui/dict-display.c 26 Jan 2007 07:35:04 -0000 1.1
+++ src/ui/gui/dict-display.c 25 Apr 2007 00:09:36 -0000 1.2
@@ -51,7 +51,112 @@
return predicate (var);
}
-/* Sets up TREEVIEW to display the variables of DICT.
+/* A GtkTreeCellDataFunc which sets the icon appropriate to the type
+ of variable */
+static void
+var_icon_cell_data_func (GtkTreeViewColumn *col,
+ GtkCellRenderer *cell,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer data)
+{
+ struct variable *var;
+ gtk_tree_model_get (model, iter, DICT_TVM_COL_VAR, &var, -1);
+
+ if ( var_is_alpha (var))
+ {
+ g_object_set (cell, "stock-id", "var-string", NULL);
+ }
+ else
+ {
+ const struct fmt_spec *fs = var_get_write_format (var);
+ int cat = fmt_get_category (fs->type);
+ switch ( var_get_measure (var))
+ {
+ case MEASURE_NOMINAL:
+ g_object_set (cell, "stock-id", "var-nominal", NULL);
+ break;
+ case MEASURE_ORDINAL:
+ g_object_set (cell, "stock-id", "var-ordinal", NULL);
+ break;
+ case MEASURE_SCALE:
+ if ( ( FMT_CAT_DATE | FMT_CAT_TIME ) & cat )
+ g_object_set (cell, "stock-id", "var-date-scale", NULL);
+ else
+ g_object_set (cell, "stock-id", "var-scale", NULL);
+ break;
+ default:
+ g_assert_not_reached ();
+ };
+ }
+}
+
+
+static void
+get_base_model (GtkTreeModel *top_model, GtkTreeIter *top_iter,
+ GtkTreeModel **model, GtkTreeIter *iter
+ )
+{
+ *model = top_model;
+ *iter = *top_iter;
+ while (GTK_IS_TREE_MODEL_FILTER (*model))
+ {
+ GtkTreeIter parent_iter = *iter;
+ GtkTreeModelFilter *parent_model = GTK_TREE_MODEL_FILTER (*model);
+
+ *model = gtk_tree_model_filter_get_model (parent_model);
+
+ gtk_tree_model_filter_convert_iter_to_child_iter (parent_model,
+ iter,
+ &parent_iter);
+ }
+
+ g_assert (PSPPIRE_IS_DICT (*model));
+}
+
+/* A GtkTreeCellDataFunc which renders the name and/or label of the
+ variable */
+static void
+var_description_cell_data_func (GtkTreeViewColumn *col,
+ GtkCellRenderer *cell,
+ GtkTreeModel *top_model,
+ GtkTreeIter *top_iter,
+ gpointer data)
+{
+ struct variable *var;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+
+
+ get_base_model (top_model, top_iter, &model, &iter);
+
+ g_assert (PSPPIRE_IS_DICT (model));
+
+
+ gtk_tree_model_get (model,
+ &iter, DICT_TVM_COL_VAR, &var, -1);
+
+ if ( var_has_label (var))
+ {
+ gchar *text = g_strdup_printf (
+ "<span stretch=\"condensed\">%s</span>"
+ " (<span weight=\"bold\">%s</span>)",
+ var_get_label (var),
+ var_get_name (var));
+
+ char *utf8 = pspp_locale_to_utf8 (text, -1, NULL);
+
+ g_free (text);
+ g_object_set (cell, "markup", utf8, NULL);
+ g_free (utf8);
+ }
+ else
+ {
+ g_object_set (cell, "text", var_get_name (var), NULL);
+ }
+}
+
+ /* Sets up TREEVIEW to display the variables of DICT.
MODE is the selection mode for TREEVIEW.
PREDICATE determines which variables should be visible, or NULL if
all are to be visible.
@@ -67,7 +172,8 @@
GtkTreeSelection *selection =
gtk_tree_view_get_selection (treeview);
- GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
+ GtkCellRenderer *renderer;
+
GtkTreeModel *model ;
if ( predicate )
@@ -88,18 +194,31 @@
gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), model);
+ col = gtk_tree_view_column_new ();
+ gtk_tree_view_column_set_title (col, _("Variable"));
- col = gtk_tree_view_column_new_with_attributes (_("Var"),
- renderer,
- "text",
- 0,
- NULL);
+ renderer = gtk_cell_renderer_pixbuf_new ();
+ gtk_tree_view_column_pack_start (col, renderer, FALSE);
+
+ gtk_tree_view_column_set_cell_data_func (col, renderer,
+ var_icon_cell_data_func,
+ NULL, NULL);
- /* FIXME: make this a value in terms of character widths */
- g_object_set (col, "min-width", 100, NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_column_pack_start (col, renderer, TRUE);
+ gtk_tree_view_column_set_cell_data_func (col, renderer,
+ var_description_cell_data_func,
+ NULL, NULL);
+
+ g_object_set (renderer, "ellipsize-set", TRUE, NULL);
+ g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL);
gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_FIXED);
+ /* FIXME: make this a value in terms of character widths */
+ gtk_tree_view_column_set_min_width (col, 150);
+
gtk_tree_view_append_column (treeview, col);
gtk_tree_selection_set_mode (selection, mode);
@@ -113,7 +232,7 @@
)
{
GtkTreePath *path;
- PsppireDict *dict;
+ GtkTreeModel *dict;
gint *idx;
struct variable *var;
GtkTreeIter dict_iter;
@@ -121,27 +240,13 @@
g_return_if_fail (GTK_IS_ENTRY(dest));
-
- if ( GTK_IS_TREE_MODEL_FILTER (model))
- {
- dict = PSPPIRE_DICT (gtk_tree_model_filter_get_model
- (GTK_TREE_MODEL_FILTER(model)));
- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER
- (model),
- &dict_iter, &iter);
- }
- else
- {
- dict = PSPPIRE_DICT (model);
- dict_iter = iter;
- }
-
+ get_base_model (model, &iter, &dict, &dict_iter);
path = gtk_tree_model_get_path (GTK_TREE_MODEL (dict), &dict_iter);
idx = gtk_tree_path_get_indices (path);
- var = psppire_dict_get_variable (dict, *idx);
+ var = psppire_dict_get_variable (PSPPIRE_DICT (dict), *idx);
gtk_tree_path_free (path);
@@ -164,24 +269,12 @@
gint *row ;
GtkTreeModel *destmodel = gtk_tree_view_get_model ( GTK_TREE_VIEW (dest));
- PsppireDict *dict;
+ GtkTreeModel *dict;
- if ( GTK_IS_TREE_MODEL_FILTER (model))
- {
- dict = PSPPIRE_DICT (gtk_tree_model_filter_get_model
- (GTK_TREE_MODEL_FILTER(model)));
- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER
- (model),
- &dict_iter, &iter);
- }
- else
- {
- dict = PSPPIRE_DICT (model);
- dict_iter = iter;
- }
+ get_base_model (model, &iter, &dict, &dict_iter);
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (dict), &dict_iter);
+ path = gtk_tree_model_get_path (dict, &dict_iter);
row = gtk_tree_path_get_indices (path);
@@ -199,37 +292,22 @@
gboolean result;
gchar *name;
GtkTreeIter dict_iter;
- PsppireDict *dict;
+ GtkTreeModel *dict;
struct variable *var;
gint dict_index;
gint *indeces;
GtkTreePath *path;
const gchar *text = gtk_entry_get_text (GTK_ENTRY (selector->dest));
+ get_base_model (model, iter, &dict, &dict_iter);
- if ( GTK_IS_TREE_MODEL_FILTER (model))
- {
- dict = PSPPIRE_DICT (gtk_tree_model_filter_get_model
- (GTK_TREE_MODEL_FILTER(model)));
- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER
- (model),
- &dict_iter, iter);
- }
- else
- {
- dict = PSPPIRE_DICT (model);
- dict_iter = *iter;
- }
-
-
- path = gtk_tree_model_get_path (GTK_TREE_MODEL(dict),
- &dict_iter);
+ path = gtk_tree_model_get_path (dict, &dict_iter);
indeces = gtk_tree_path_get_indices (path);
dict_index = indeces [0];
- var = psppire_dict_get_variable (dict, dict_index);
+ var = psppire_dict_get_variable (PSPPIRE_DICT (dict), dict_index);
gtk_tree_path_free (path);
Index: src/ui/gui/psppire.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- src/ui/gui/psppire.c 31 Mar 2007 11:44:45 -0000 1.38
+++ src/ui/gui/psppire.c 25 Apr 2007 00:09:36 -0000 1.39
@@ -280,6 +280,31 @@
g_object_unref (pixbuf);
gtk_icon_factory_add ( factory, "pspp-recent-dialogs", icon_set);
+ pixbuf = PIXBUF_NEW_FROM_FILE ("nominal.png");
+ icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+ g_object_unref (pixbuf);
+ gtk_icon_factory_add ( factory, "var-nominal", icon_set);
+
+ pixbuf = PIXBUF_NEW_FROM_FILE ("ordinal.png");
+ icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+ g_object_unref (pixbuf);
+ gtk_icon_factory_add ( factory, "var-ordinal", icon_set);
+
+ pixbuf = PIXBUF_NEW_FROM_FILE ("scale.png");
+ icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+ g_object_unref (pixbuf);
+ gtk_icon_factory_add ( factory, "var-scale", icon_set);
+
+ pixbuf = PIXBUF_NEW_FROM_FILE ("string.png");
+ icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+ g_object_unref (pixbuf);
+ gtk_icon_factory_add ( factory, "var-string", icon_set);
+
+ pixbuf = PIXBUF_NEW_FROM_FILE ("date-scale.png");
+ icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+ g_object_unref (pixbuf);
+ gtk_icon_factory_add ( factory, "var-date-scale", icon_set);
+
gtk_icon_factory_add_default (factory);
Index: src/ui/gui/psppire.glade
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire.glade,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- src/ui/gui/psppire.glade 4 Apr 2007 11:02:31 -0000 1.17
+++ src/ui/gui/psppire.glade 25 Apr 2007 00:09:36 -0000 1.18
@@ -250,36 +250,25 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkVBox" id="vbox5">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label4">
+ <widget class="PsppireSelector" id="psppire-selector2">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Name
Variable:</property>
+ <property name="border_width">5</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="new-name-entry">
+ <widget class="PsppireSelector" id="psppire-selector3">
<property name="visible">True</property>
+ <property name="border_width">5</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="x_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -332,24 +321,35 @@
</packing>
</child>
<child>
- <widget class="PsppireSelector" id="psppire-selector3">
+ <widget class="GtkVBox" id="vbox5">
<property name="visible">True</property>
- <property name="border_width">5</property>
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Name
Variable:</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="PsppireSelector" id="psppire-selector2">
+ <widget class="GtkEntry" id="new-name-entry">
<property name="visible">True</property>
- <property name="border_width">5</property>
</widget>
<packing>
- <property name="x_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1150,6 +1150,8 @@
</child>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
Index: src/ui/gui/icons/16x16/date-scale.png
===================================================================
RCS file: src/ui/gui/icons/16x16/date-scale.png
diff -N src/ui/gui/icons/16x16/date-scale.png
Binary files /dev/null and /tmp/cvsKZtowB differ
Index: src/ui/gui/icons/16x16/nominal.png
===================================================================
RCS file: src/ui/gui/icons/16x16/nominal.png
diff -N src/ui/gui/icons/16x16/nominal.png
Binary files /dev/null and /tmp/cvshMnvnE differ
Index: src/ui/gui/icons/16x16/ordinal.png
===================================================================
RCS file: src/ui/gui/icons/16x16/ordinal.png
diff -N src/ui/gui/icons/16x16/ordinal.png
Binary files /dev/null and /tmp/cvsSGMOOE differ
Index: src/ui/gui/icons/16x16/scale.png
===================================================================
RCS file: src/ui/gui/icons/16x16/scale.png
diff -N src/ui/gui/icons/16x16/scale.png
Binary files /dev/null and /tmp/cvs1ylnkF differ
Index: src/ui/gui/icons/16x16/string.png
===================================================================
RCS file: src/ui/gui/icons/16x16/string.png
diff -N src/ui/gui/icons/16x16/string.png
Binary files /dev/null and /tmp/cvsiR4EqD differ
Index: src/ui/gui/icons/scalable/date-scale.svg
===================================================================
RCS file: src/ui/gui/icons/scalable/date-scale.svg
diff -N src/ui/gui/icons/scalable/date-scale.svg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/ui/gui/icons/scalable/date-scale.svg 25 Apr 2007 00:09:36 -0000
1.1
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://web.resource.org/cc/";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="16px"
+ height="16px"
+ id="svg7350"
+ sodipodi:version="0.32"
+ inkscape:version="0.44.1"
+ sodipodi:docbase="/Scratch/john/pspp/src/ui/gui/icons/scalable"
+ sodipodi:docname="date-scale.svg"
+
inkscape:export-filename="/Scratch/john/pspp/src/ui/gui/icons/scalable/scale.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs7352">
+ <linearGradient
+ id="linearGradient8245">
+ <stop
+ style="stop-color:#00b000;stop-opacity:1;"
+ offset="0"
+ id="stop8247" />
+ <stop
+ id="stop8275"
+ offset="0.39285713"
+ style="stop-color:#86fe00;stop-opacity:1;" />
+ <stop
+ id="stop8253"
+ offset="1"
+ style="stop-color:#ffff01;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8245"
+ id="linearGradient8251"
+ x1="-0.102"
+ y1="7.5086632"
+ x2="19.067841"
+ y2="7.5086632"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8245"
+ id="linearGradient8273"
+ gradientUnits="userSpaceOnUse"
+ x1="-0.102"
+ y1="7.5086632"
+ x2="19.067841"
+ y2="7.5086632" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="22.197802"
+ inkscape:cx="8"
+ inkscape:cy="8"
+ inkscape:current-layer="g8265"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="900"
+ inkscape:window-height="583"
+ inkscape:window-x="5"
+ inkscape:window-y="75" />
+ <metadata
+ id="metadata7355">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <g
+ id="g8265"
+
transform="matrix(0.617307,-0.617307,0.617307,0.617307,-2.363247,9.092948)">
+ <g
+ id="g1918">
+ <rect
+
style="opacity:1;fill:url(#linearGradient8273);fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.204;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect7358"
+ width="18.965841"
+ height="3.0173266"
+ x="0"
+ y="6" />
+ <path
+
style="opacity:1;fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.31500431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 5.9,6.1 L 5.9,9.1"
+ id="path8255" />
+ <path
+
style="opacity:1;fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.31500431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 9.1,5.9 L 9.1,8.9"
+ id="path8257" />
+ <path
+
style="opacity:1;fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.31500431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 14.9,6.1 L 14.9,9.1"
+ id="path8259" />
+ <path
+
style="opacity:1;fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.31500431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 2.9,6.1 L 2.9,9.1"
+ id="path8261" />
+ <path
+
style="opacity:1;fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.31500431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 11.9,6.1 L 11.9,9.1"
+ id="path8263" />
+ </g>
+ <g
+ id="g4615">
+ <rect
+ transform="matrix(0.707107,0.707107,-0.707107,0.707107,0,0)"
+ y="-1.153389"
+ x="10.823872"
+ height="7.2578158"
+ width="8.9666653"
+ id="rect1926"
+
style="opacity:1;fill:#aff1de;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.19710156;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <path
+ id="path3708"
+ d="M 9.987895,8.3186316 L 4.7852414,13.521285"
+
style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.11454702;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <path
+
style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.11454702;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 11.607835,9.9385711 L 6.4051807,15.141225"
+ id="path3712" />
+ <path
+
style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.11454702;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 13.227774,11.558511 L 8.02512,16.761164"
+ id="path3716" />
+ <path
+
transform="matrix(0.80997,0.80997,-0.80997,0.80997,9.279171,-5.450854)"
+ id="path3722"
+ d="M 7,10 C 9.1566007,10 11.313201,10 13.469802,10 C 13.979868,10
14.489934,10 15,10"
+
style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.09999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
/>
+ <path
+ id="path4613"
+ d="M 5.1280744,9.938569 C 6.8748562,11.685351 8.6216378,13.432133
10.36842,15.178915 C 10.781558,15.592053 11.194696,16.005191
11.607834,16.418329"
+
style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.11454702;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ </g>
+ </g>
+ </g>
+</svg>
Index: src/ui/gui/icons/scalable/nominal.svg
===================================================================
RCS file: src/ui/gui/icons/scalable/nominal.svg
diff -N src/ui/gui/icons/scalable/nominal.svg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/ui/gui/icons/scalable/nominal.svg 25 Apr 2007 00:09:36 -0000
1.1
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://web.resource.org/cc/";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="64px"
+ height="64px"
+ id="svg1872"
+ sodipodi:version="0.32"
+ inkscape:version="0.44.1"
+ sodipodi:docbase="/Scratch/john/pspp/src/ui/gui/icons/scalable"
+ sodipodi:docname="nominal.svg"
+
inkscape:export-filename="/Scratch/john/pspp/src/ui/gui/icons/scalable/nominal.png"
+ inkscape:export-xdpi="27.31329"
+ inkscape:export-ydpi="27.31329">
+ <defs
+ id="defs1874">
+ <linearGradient
+ id="linearGradient4625">
+ <stop
+ id="stop4627"
+ offset="0"
+ style="stop-color:#2400d8;stop-opacity:1;" />
+ <stop
+ style="stop-color:#7e00c0;stop-opacity:0.78431374;"
+ offset="1"
+ id="stop4629" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4615">
+ <stop
+ style="stop-color:#24bbd8;stop-opacity:1;"
+ offset="0"
+ id="stop4617" />
+ <stop
+ id="stop4619"
+ offset="1"
+ style="stop-color:#7e00c0;stop-opacity:0.78431374;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3663">
+ <stop
+ id="stop3665"
+ offset="0"
+ style="stop-color:#f482d0;stop-opacity:1;" />
+ <stop
+ style="stop-color:#ed0040;stop-opacity:0.875;"
+ offset="1"
+ id="stop4605" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2778">
+ <stop
+ id="stop3675"
+ offset="0"
+ style="stop-color:#f0ed05;stop-opacity:1;" />
+ <stop
+ style="stop-color:#3c7f06;stop-opacity:0.96907216;"
+ offset="1"
+ id="stop3679" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2778"
+ id="radialGradient4599"
+ gradientUnits="userSpaceOnUse"
+ cx="20"
+ cy="44.18182"
+ fx="20"
+ fy="44.18182"
+ r="14.909091"
+ gradientTransform="translate(3.1875,-4.545455)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4615"
+ id="radialGradient4644"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(17.00285,-25.45455)"
+ cx="20"
+ cy="44.18182"
+ fx="20"
+ fy="44.18182"
+ r="14.909091" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3663"
+ id="radialGradient4667"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-22.08805,-33.54262)"
+ cx="20"
+ cy="44.18182"
+ fx="20"
+ fy="44.18182"
+ r="14.909091" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.5"
+ inkscape:cx="32"
+ inkscape:cy="28.761632"
+ inkscape:current-layer="g4663"
+ showgrid="true"
+ inkscape:document-units="px"
+ inkscape:grid-bbox="true"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="900"
+ inkscape:window-height="615"
+ inkscape:window-x="23"
+ inkscape:window-y="38">
+ <sodipodi:guide
+ orientation="horizontal"
+ position="4.1818182"
+ id="guide4607" />
+ <sodipodi:guide
+ orientation="vertical"
+ position="32.545455"
+ id="guide4609" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata1877">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+
style="opacity:1;fill:url(#radialGradient4599);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.204;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 19.90625,28.548295 C 11.676432,28.548295 5,35.224725 5,43.454545 C
5,51.684363 11.676432,58.360796 19.90625,58.360795 C 28.136068,58.360795
34.812501,51.684361 34.8125,43.454545 C 34.8125,35.224727 28.136068,28.548294
19.90625,28.548295 z "
+ id="path1882" />
+ <g
+ id="g4640"
+ transform="translate(0,-2.909091)">
+ <path
+ id="path4621"
+ d="M 32.633523,8.5482956 C 24.403705,8.5482956 17.727273,15.224726
17.727273,23.454545 C 17.727273,31.684363 24.403705,38.360797
32.633523,38.360796 C 40.863341,38.360796 47.539774,31.684361
47.539773,23.454545 C 47.539773,15.224728 40.863341,8.5482946
32.633523,8.5482956 z "
+
style="opacity:1;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.204;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <path
+ id="path4611"
+ d="M 32.727272,8.5482952 C 24.497455,8.5482952 17.821023,15.224725
17.821023,23.454545 C 17.821023,31.684363 24.497455,38.360796
32.727272,38.360795 C 40.95709,38.360795 47.633524,31.684361
47.633523,23.454545 C 47.633523,15.224727 40.95709,8.5482942
32.727272,8.5482952 z "
+
style="opacity:1;fill:url(#radialGradient4644);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.204;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ </g>
+ <g
+ id="g4663"
+ transform="translate(51.26989,27.99432)">
+ <path
+ id="path4659"
+ d="M -6.3636365,0.54829545 C -14.593454,0.54829545
-21.269886,7.2247255 -21.269886,15.454545 C -21.269886,23.684363
-14.593454,30.360796 -6.3636365,30.360795 C 1.8661815,30.360795
8.5426145,23.684361 8.5426135,15.454545 C 8.5426135,7.2247275
1.8661815,0.54829445 -6.3636365,0.54829545 z "
+
style="opacity:1;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.204;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <path
+ id="path4601"
+ d="M -6.3636375,0.46022709 C -14.593456,0.46022709
-21.269888,7.1366571 -21.269888,15.366477 C -21.269888,23.596295
-14.593456,30.272728 -6.3636375,30.272727 C 1.8661805,30.272727
8.5426141,23.596293 8.5426131,15.366477 C 8.5426131,7.1366591
1.8661805,0.46022609 -6.3636375,0.46022709 z "
+
style="opacity:1;fill:url(#radialGradient4667);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.204;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ </g>
+ </g>
+</svg>
Index: src/ui/gui/icons/scalable/ordinal.svg
===================================================================
RCS file: src/ui/gui/icons/scalable/ordinal.svg
diff -N src/ui/gui/icons/scalable/ordinal.svg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/ui/gui/icons/scalable/ordinal.svg 25 Apr 2007 00:09:36 -0000
1.1
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://web.resource.org/cc/";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="16px"
+ height="16px"
+ id="svg8277"
+ sodipodi:version="0.32"
+ inkscape:version="0.44.1"
+ sodipodi:docbase="/Scratch/john/pspp/src/ui/gui/icons/scalable"
+ sodipodi:docname="ordinal.svg"
+
inkscape:export-filename="/Scratch/john/pspp/src/ui/gui/icons/scalable/ordinal.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs8279" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="22.197802"
+ inkscape:cx="8"
+ inkscape:cy="8"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="900"
+ inkscape:window-height="583"
+ inkscape:window-x="0"
+ inkscape:window-y="27" />
+ <metadata
+ id="metadata8282">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <rect
+
style="opacity:1;fill:red;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.23522811;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect8285"
+ width="4.0764055"
+ height="5.0397716"
+ x="1.8059804"
+ y="9.1176138" />
+ <rect
+
style="opacity:1;fill:yellow;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.26004136;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect8287"
+ width="4.0609984"
+ height="8.0416908"
+ x="5.8089814"
+ y="6.1300206" />
+ <rect
+
style="opacity:1;fill:lime;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.27500001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect8289"
+ width="4.1905942"
+ height="11.026732"
+ x="9.6719055"
+ y="3.1375" />
+ </g>
+</svg>
Index: src/ui/gui/icons/scalable/scale.svg
===================================================================
RCS file: src/ui/gui/icons/scalable/scale.svg
diff -N src/ui/gui/icons/scalable/scale.svg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/ui/gui/icons/scalable/scale.svg 25 Apr 2007 00:09:36 -0000 1.1
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://web.resource.org/cc/";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="16px"
+ height="16px"
+ id="svg7350"
+ sodipodi:version="0.32"
+ inkscape:version="0.44.1"
+ sodipodi:docbase="/Scratch/john/pspp/src/ui/gui/icons/scalable"
+ sodipodi:docname="scale.svg"
+
inkscape:export-filename="/Scratch/john/pspp/src/ui/gui/icons/scalable/scale.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs7352">
+ <linearGradient
+ id="linearGradient8245">
+ <stop
+ style="stop-color:#00b000;stop-opacity:1;"
+ offset="0"
+ id="stop8247" />
+ <stop
+ id="stop8275"
+ offset="0.39285713"
+ style="stop-color:#86fe00;stop-opacity:1;" />
+ <stop
+ id="stop8253"
+ offset="1"
+ style="stop-color:#ffff01;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8245"
+ id="linearGradient8251"
+ x1="-0.102"
+ y1="7.5086632"
+ x2="19.067841"
+ y2="7.5086632"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8245"
+ id="linearGradient8273"
+ gradientUnits="userSpaceOnUse"
+ x1="-0.102"
+ y1="7.5086632"
+ x2="19.067841"
+ y2="7.5086632" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="22.197802"
+ inkscape:cx="8"
+ inkscape:cy="8"
+ inkscape:current-layer="g8265"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="900"
+ inkscape:window-height="583"
+ inkscape:window-x="5"
+ inkscape:window-y="75" />
+ <metadata
+ id="metadata7355">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <g
+ id="g8265"
+
transform="matrix(0.617307,-0.617307,0.617307,0.617307,-2.363247,9.092948)">
+ <rect
+ y="6"
+ x="0"
+ height="3.0173266"
+ width="18.965841"
+ id="rect7358"
+
style="opacity:1;fill:url(#linearGradient8273);fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.204;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <path
+ id="path8255"
+ d="M 5.9,6.1 L 5.9,9.1"
+
style="opacity:1;fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.31500431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <path
+ id="path8257"
+ d="M 9.1,5.9 L 9.1,8.9"
+
style="opacity:1;fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.31500431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <path
+ id="path8259"
+ d="M 14.9,6.1 L 14.9,9.1"
+
style="opacity:1;fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.31500431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <path
+ id="path8261"
+ d="M 2.9,6.1 L 2.9,9.1"
+
style="opacity:1;fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.31500431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <path
+ id="path8263"
+ d="M 11.9,6.1 L 11.9,9.1"
+
style="opacity:1;fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.31500431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ </g>
+ </g>
+</svg>
Index: src/ui/gui/icons/scalable/string.svg
===================================================================
RCS file: src/ui/gui/icons/scalable/string.svg
diff -N src/ui/gui/icons/scalable/string.svg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/ui/gui/icons/scalable/string.svg 25 Apr 2007 00:09:36 -0000
1.1
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://web.resource.org/cc/";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="64px"
+ height="64px"
+ id="svg1872"
+ sodipodi:version="0.32"
+ inkscape:version="0.44.1"
+ sodipodi:docbase="/Scratch/john/pspp/src/ui/gui/icons/scalable"
+ sodipodi:docname="string.svg"
+
inkscape:export-filename="/Scratch/john/pspp/src/ui/gui/icons/scalable/nominal.png"
+ inkscape:export-xdpi="27.31329"
+ inkscape:export-ydpi="27.31329">
+ <defs
+ id="defs1874">
+ <linearGradient
+ id="linearGradient4625">
+ <stop
+ id="stop4627"
+ offset="0"
+ style="stop-color:#2400d8;stop-opacity:1;" />
+ <stop
+ style="stop-color:#7e00c0;stop-opacity:0.78431374;"
+ offset="1"
+ id="stop4629" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4615">
+ <stop
+ style="stop-color:#24bbd8;stop-opacity:1;"
+ offset="0"
+ id="stop4617" />
+ <stop
+ id="stop4619"
+ offset="1"
+ style="stop-color:#7e00c0;stop-opacity:0.78431374;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3663">
+ <stop
+ id="stop3665"
+ offset="0"
+ style="stop-color:#f482d0;stop-opacity:1;" />
+ <stop
+ style="stop-color:#ed0040;stop-opacity:0.875;"
+ offset="1"
+ id="stop4605" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2778">
+ <stop
+ id="stop3675"
+ offset="0"
+ style="stop-color:#f0ed05;stop-opacity:1;" />
+ <stop
+ style="stop-color:#3c7f06;stop-opacity:0.96907216;"
+ offset="1"
+ id="stop3679" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2778"
+ id="radialGradient4599"
+ gradientUnits="userSpaceOnUse"
+ cx="20"
+ cy="44.18182"
+ fx="20"
+ fy="44.18182"
+ r="14.909091"
+ gradientTransform="translate(3.1875,-4.545455)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4615"
+ id="radialGradient4644"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(17.00285,-25.45455)"
+ cx="20"
+ cy="44.18182"
+ fx="20"
+ fy="44.18182"
+ r="14.909091" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3663"
+ id="radialGradient4667"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-22.08805,-33.54262)"
+ cx="20"
+ cy="44.18182"
+ fx="20"
+ fy="44.18182"
+ r="14.909091" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.5"
+ inkscape:cx="32"
+ inkscape:cy="28.761632"
+ inkscape:current-layer="g4663"
+ showgrid="true"
+ inkscape:document-units="px"
+ inkscape:grid-bbox="true"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="900"
+ inkscape:window-height="615"
+ inkscape:window-x="23"
+ inkscape:window-y="38">
+ <sodipodi:guide
+ orientation="horizontal"
+ position="4.1818182"
+ id="guide4607" />
+ <sodipodi:guide
+ orientation="vertical"
+ position="32.545455"
+ id="guide4609" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata1877">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+
style="opacity:1;fill:url(#radialGradient4599);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.204;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 19.90625,28.548295 C 11.676432,28.548295 5,35.224725 5,43.454545 C
5,51.684363 11.676432,58.360796 19.90625,58.360795 C 28.136068,58.360795
34.812501,51.684361 34.8125,43.454545 C 34.8125,35.224727 28.136068,28.548294
19.90625,28.548295 z "
+ id="path1882" />
+ <g
+ id="g4640"
+ transform="translate(0,-2.909091)">
+ <path
+ id="path4621"
+ d="M 32.633523,8.5482956 C 24.403705,8.5482956 17.727273,15.224726
17.727273,23.454545 C 17.727273,31.684363 24.403705,38.360797
32.633523,38.360796 C 40.863341,38.360796 47.539774,31.684361
47.539773,23.454545 C 47.539773,15.224728 40.863341,8.5482946
32.633523,8.5482956 z "
+
style="opacity:1;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.204;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <path
+ id="path4611"
+ d="M 32.727272,8.5482952 C 24.497455,8.5482952 17.821023,15.224725
17.821023,23.454545 C 17.821023,31.684363 24.497455,38.360796
32.727272,38.360795 C 40.95709,38.360795 47.633524,31.684361
47.633523,23.454545 C 47.633523,15.224727 40.95709,8.5482942
32.727272,8.5482952 z "
+
style="opacity:1;fill:url(#radialGradient4644);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.204;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ </g>
+ <g
+ id="g4663"
+ transform="translate(51.26989,27.99432)">
+ <text
+ xml:space="preserve"
+
style="font-size:56px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Nimbus
Sans L"
+ x="-22.542616"
+ y="28.805679"
+ id="text1893"
+ sodipodi:linespacing="100%"><tspan
+ sodipodi:role="line"
+ id="tspan1895"
+ x="-22.542616"
+ y="28.805679">a</tspan></text>
+ </g>
+ </g>
+</svg>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp README po/de.po po/pspp.pot src/libpspp/Ch...,
John Darrington <=