Created a new stock item for Reset buttons.

Added some #include <config.h> lines where they were missing.
Read GPL text from src/libpspp/copyleft.c instead of from psppire.glade

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

-"POT-Creation-Date: 2007-09-28 12:24+0800\n"
+"POT-Creation-Date: 2007-10-04 10:39+0800\n"

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


@@ -66,7 +66,6 @@ msgid "reading temporary file"
 msgstr ""
 
 #: src/data/case-tmpfile.c:155
 msgstr ""
 
 #: src/data/case-tmpfile.c:155

-#, fuzzy

 msgid "unexpected end of file reading temporary file"
 msgstr "plotzlich ist der Datei beendet"
 
 msgid "unexpected end of file reading temporary file"
 msgstr "plotzlich ist der Datei beendet"
 


@@ -174,14 +173,14 @@ msgid ""
 msgstr ""
 
 #: src/data/data-in.c:1130
 msgstr ""
 
 #: src/data/data-in.c:1130

-#, fuzzy, c-format
+#, c-format

 msgid "`%c' expected in date field."
 msgid "`%c' expected in date field."

-msgstr "plotzlich ist der Datei beendet"
+msgstr ""

 
 #: src/data/data-in.c:1171
 
 #: src/data/data-in.c:1171

-#, fuzzy, c-format
+#, c-format

 msgid "column %d"
 msgid "column %d"

-msgstr "Spalten"
+msgstr "Spalten %d"

 
 #: src/data/data-in.c:1173
 #, fuzzy, c-format
 
 #: src/data/data-in.c:1173
 #, fuzzy, c-format


@@ -307,13 +306,13 @@ msgid "%s variables are not compatible with %s format %s."
 msgstr ""
 
 #: src/data/format.c:318 src/data/sys-file-reader.c:631
 msgstr ""
 
 #: src/data/format.c:318 src/data/sys-file-reader.c:631

-#: src/ui/gui/data-editor.glade:1285 src/ui/gui/psppire.glade:2189
+#: src/ui/gui/data-editor.glade:1285 src/ui/gui/psppire.glade:2176

 #: src/ui/gui/psppire-var-store.c:493
 msgid "String"
 msgstr "Zeichenkette"
 
 #: src/data/format.c:318 src/data/sys-file-reader.c:631
 #: src/ui/gui/psppire-var-store.c:493
 msgid "String"
 msgstr "Zeichenkette"
 
 #: src/data/format.c:318 src/data/sys-file-reader.c:631

-#: src/ui/gui/data-editor.glade:1174 src/ui/gui/psppire.glade:2144
+#: src/ui/gui/data-editor.glade:1174 src/ui/gui/psppire.glade:2131

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


@@ -608,14 +607,12 @@ msgid "%s variable %s has invalid %s format %s."
 msgstr ""
 
 #: src/data/sys-file-reader.c:633
 msgstr ""
 
 #: src/data/sys-file-reader.c:633

-#, fuzzy

 msgid "print"
 msgid "print"

-msgstr "Drucken"
+msgstr "drucken"

 
 #: src/data/sys-file-reader.c:633
 
 #: src/data/sys-file-reader.c:633

-#, fuzzy

 msgid "write"
 msgid "write"

-msgstr "Drucken"
+msgstr "schreiben"

 
 #: src/data/sys-file-reader.c:637
 msgid "Suppressing further invalid format warnings."
 
 #: src/data/sys-file-reader.c:637
 msgid "Suppressing further invalid format warnings."


@@ -810,7 +807,6 @@ msgid "System error: %s."
 msgstr ""
 
 #: src/data/sys-file-reader.c:1626
 msgstr ""
 
 #: src/data/sys-file-reader.c:1626

-#, fuzzy

 msgid "Unexpected end of file."
 msgstr "plotzlich ist der Datei beendet"
 
 msgid "Unexpected end of file."
 msgstr "plotzlich ist der Datei beendet"
 


@@ -1612,7 +1608,7 @@ msgstr ""
 
 #: src/language/dictionary/split-file.c:85
 #: src/language/dictionary/sys-file-info.c:395
 
 #: src/language/dictionary/split-file.c:85
 #: src/language/dictionary/sys-file-info.c:395

-#: src/language/dictionary/sys-file-info.c:562 src/ui/gui/psppire.glade:2112
+#: src/language/dictionary/sys-file-info.c:562 src/ui/gui/psppire.glade:2099

 #: src/ui/gui/var-sheet.c:69
 msgid "Label"
 msgstr "Kennsatz"
 #: src/ui/gui/var-sheet.c:69
 msgid "Label"
 msgstr "Kennsatz"


@@ -1621,7 +1617,7 @@ msgstr "Kennsatz"
 msgid "File:"
 msgstr "Datei:"
 
 msgid "File:"
 msgstr "Datei:"
 

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

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


@@ -1796,7 +1792,6 @@ msgid "Left"
 msgstr "Links"
 
 #: src/language/dictionary/sys-file-info.c:500 src/ui/gui/var-sheet.c:82
 msgstr "Links"
 
 #: src/language/dictionary/sys-file-info.c:500 src/ui/gui/var-sheet.c:82

-#, fuzzy

 msgid "Center"
 msgstr "Mittel"
 
 msgid "Center"
 msgstr "Mittel"
 


@@ -2576,7 +2571,7 @@ msgstr ""
 msgid "Directional measures."
 msgstr ""
 
 msgid "Directional measures."
 msgstr ""
 

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

 #: src/ui/gui/var-sheet.c:66
 msgid "Type"
 msgstr "Typ"
 #: src/ui/gui/var-sheet.c:66
 msgid "Type"
 msgstr "Typ"


@@ -2966,7 +2961,6 @@ msgid "Error reading FLIP file: %s."
 msgstr ""
 
 #: src/language/stats/flip.c:418
 msgstr ""
 
 #: src/language/stats/flip.c:418

-#, fuzzy

 msgid "Unexpected end of file reading FLIP file."
 msgstr "plotzlich ist der Datei beendet"
 
 msgid "Unexpected end of file reading FLIP file."
 msgstr "plotzlich ist der Datei beendet"
 


@@ -4811,7 +4805,7 @@ msgstr "Dezimalstellen:"
 msgid "Width:"
 msgstr "Große:"
 
 msgid "Width:"
 msgstr "Große:"
 

-#: src/ui/gui/data-editor.glade:1634 src/ui/gui/psppire.glade:2557
+#: src/ui/gui/data-editor.glade:1634 src/ui/gui/psppire.glade:2544

 msgid "Value:"
 msgstr "Werte:"
 
 msgid "Value:"
 msgstr "Werte:"
 


@@ -4949,11 +4943,6 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
 msgid "Continue"
 msgstr ""
 

-#: src/ui/gui/psppire-buttonbox.c:260
-#, fuzzy
-msgid "_Paste"
-msgstr "Datum"
-

 #: src/ui/gui/psppire-buttonbox.c:400
 msgid "OK"
 msgstr ""
 #: src/ui/gui/psppire-buttonbox.c:400
 msgid "OK"
 msgstr ""


@@ -4973,13 +4962,17 @@ msgstr "_Hilfe"
 
 #: src/ui/gui/psppire-buttonbox.c:405
 msgid "Reset"
 
 #: src/ui/gui/psppire-buttonbox.c:405
 msgid "Reset"

-msgstr ""
+msgstr "xyzzy"

 
 #: src/ui/gui/psppire-buttonbox.c:406
 #, fuzzy
 msgid "Paste"
 msgstr "Datum"
 
 
 #: src/ui/gui/psppire-buttonbox.c:406
 #, fuzzy
 msgid "Paste"
 msgstr "Datum"
 

+#: src/ui/gui/psppire.c:197
+msgid "_Reset"
+msgstr "_Zurücksetzen"
+

 #: src/ui/gui/psppire-data-store.c:816
 msgid "var"
 msgstr ""
 #: src/ui/gui/psppire-data-store.c:816
 msgid "var"
 msgstr ""


@@ -4994,191 +4987,175 @@ msgstr ""
 msgid "This is pre-alpha software.  Use at your own risk."
 msgstr "Diese Software ist vor-Alpha.  Wahrscheinlich Funktioniert es nicht."
 
 msgid "This is pre-alpha software.  Use at your own risk."
 msgstr "Diese Software ist vor-Alpha.  Wahrscheinlich Funktioniert es nicht."
 

-#: src/ui/gui/psppire.glade:12
-msgid ""
-"   This program is free software: you can redistribute it and/or modify\n"
-"   it under the terms of the GNU General Public License as published by\n"
-"   the Free Software Foundation, either version 3 of the License, or\n"
-"   (at your option) any later version.\n"
-"\n"
-"   This program is distributed in the hope that it will be useful,\n"
-"   but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"   GNU General Public License for more details.\n"
-"\n"
-"   You should have received a copy of the GNU General Public License\n"
-"   along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
-msgstr ""
-
-#: src/ui/gui/psppire.glade:86 src/ui/gui/psppire.glade:167
+#: src/ui/gui/psppire.glade:73 src/ui/gui/psppire.glade:154

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

-#: src/ui/gui/psppire.glade:96
+#: src/ui/gui/psppire.glade:83

 msgid "Weight cases by"
 msgstr ""
 
 msgid "Weight cases by"
 msgstr ""
 

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

 #, fuzzy
 msgid "Frequency Variable"
 msgstr "Variableansicht"
 
 #, fuzzy
 msgid "Frequency Variable"
 msgstr "Variableansicht"
 

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

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

-#: src/ui/gui/psppire.glade:278
+#: src/ui/gui/psppire.glade:265

 #, fuzzy
 msgid "Variable(s):"
 msgstr "Variableansicht"
 
 #, fuzzy
 msgid "Variable(s):"
 msgstr "Variableansicht"
 

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

 #, fuzzy
 msgid "Name Variable:"
 msgstr "Variableansicht"
 
 #, fuzzy
 msgid "Name Variable:"
 msgstr "Variableansicht"
 

-#: src/ui/gui/psppire.glade:442
+#: src/ui/gui/psppire.glade:429

 msgid "Analyze all cases.  Do not create groups."
 msgstr ""
 
 msgid "Analyze all cases.  Do not create groups."
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: src/ui/gui/psppire.glade:791
+#: src/ui/gui/psppire.glade:778

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

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

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

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

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

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

 #, fuzzy
 msgid "Target Variable:"
 msgstr "Variableansicht"
 
 #, fuzzy
 msgid "Target Variable:"
 msgstr "Variableansicht"
 

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

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

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

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

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

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

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

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

-#: src/ui/gui/psppire.glade:1120 src/ui/gui/psppire.glade:1266
+#: src/ui/gui/psppire.glade:1107 src/ui/gui/psppire.glade:1253

 msgid "If..."
 msgstr ""
 
 msgid "If..."
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1236
+#: src/ui/gui/psppire.glade:1223

 #, fuzzy
 msgid "All Cases"
 msgstr "Alle Datei"
 
 #, fuzzy
 msgid "All Cases"
 msgstr "Alle Datei"
 

-#: src/ui/gui/psppire.glade:1252
+#: src/ui/gui/psppire.glade:1239

 msgid "If condition is satisfied"
 msgstr ""
 
 msgid "If condition is satisfied"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1304
+#: src/ui/gui/psppire.glade:1291

 msgid "Random sample of cases"
 msgstr ""
 
 msgid "Random sample of cases"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1318
+#: src/ui/gui/psppire.glade:1305

 #, fuzzy
 msgid "Sample..."
 msgstr "Muster"
 
 #, fuzzy
 msgid "Sample..."
 msgstr "Muster"
 

-#: src/ui/gui/psppire.glade:1356
+#: src/ui/gui/psppire.glade:1343

 msgid "Based on time or case range"
 msgstr ""
 
 msgid "Based on time or case range"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1369
+#: src/ui/gui/psppire.glade:1356

 msgid "Range..."
 msgstr ""
 
 msgid "Range..."
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1407
+#: src/ui/gui/psppire.glade:1394

 #, fuzzy
 msgid "Use filter variable"
 msgstr "Variableansicht"
 
 #, fuzzy
 msgid "Use filter variable"
 msgstr "Variableansicht"
 

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

 #, fuzzy
 msgid "Select"
 msgstr "Schriftwahlung"
 
 #, fuzzy
 msgid "Select"
 msgstr "Schriftwahlung"
 

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

 #, fuzzy
 msgid "Filtered"
 msgstr "Datei:"
 
 #, fuzzy
 msgid "Filtered"
 msgstr "Datei:"
 

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

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

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

 #, fuzzy
 msgid "Unselected Cases Are"
 msgstr "_Stecken"
 
 #, fuzzy
 msgid "Unselected Cases Are"
 msgstr "_Stecken"
 

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

 #, fuzzy
 msgid "Comments:"
 msgstr "Spalten"
 
 #, fuzzy
 msgid "Comments:"
 msgstr "Spalten"
 

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

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

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

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

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

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

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

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


@@ -5192,59 +5169,59 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1913
+#: src/ui/gui/psppire.glade:1900

 msgid "Observation"
 msgstr ""
 
 msgid "Observation"
 msgstr ""
 

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

 #, fuzzy
 msgid "Last case"
 msgstr "_Stecken"
 
 #, fuzzy
 msgid "Last case"
 msgstr "_Stecken"
 

-#: src/ui/gui/psppire.glade:1936
+#: src/ui/gui/psppire.glade:1923

 msgid "First case"
 msgstr ""
 
 msgid "First case"
 msgstr ""
 

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

 msgid "Use expression as label"
 msgstr ""
 
 msgid "Use expression as label"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:2200 src/ui/gui/var-sheet.c:67
+#: src/ui/gui/psppire.glade:2187 src/ui/gui/var-sheet.c:67

 msgid "Width"
 msgstr "Große"
 
 msgid "Width"
 msgstr "Große"
 

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

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

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

 #, fuzzy
 msgid "Sample Size"
 msgstr "Muster"
 
 #, fuzzy
 msgid "Sample Size"
 msgstr "Muster"
 

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

 #, fuzzy
 msgid "Variable:"
 msgstr "Variableansicht"
 
 #, fuzzy
 msgid "Variable:"
 msgstr "Variableansicht"
 

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

 #, fuzzy
 msgid "Search value labels"
 msgstr "Werten"
 
 #, fuzzy
 msgid "Search value labels"
 msgstr "Werten"
 

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

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

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

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

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

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

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

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


@@ -5500,16 +5477,3 @@ msgstr "Warnung"
 #, c-format
 msgid "could not access definition for terminal `%s'"
 msgstr ""
 #, c-format
 msgid "could not access definition for terminal `%s'"
 msgstr ""

-
-#, fuzzy
-#~ msgid "Paste _Variables"
-#~ msgstr "Variableansicht"
-
-#~ msgid "Untitled"
-#~ msgstr "Unbetitelt"
-
-#~ msgid "PSPP Data Editor"
-#~ msgstr "PSPP Dateiaufbereiter"
-
-#~ msgid "_Insert"
-#~ msgstr "_Stecken"

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

-"POT-Creation-Date: 2007-09-28 12:24+0800\n"
+"POT-Creation-Date: 2007-10-04 10:39+0800\n"

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

+"Language-Team: John Darrington <john@darrington.wattle.id.au>\n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"


@@ -302,13 +303,13 @@ msgid "%s variables are not compatible with %s format %s."
 msgstr ""
 
 #: src/data/format.c:318 src/data/sys-file-reader.c:631
 msgstr ""
 
 #: src/data/format.c:318 src/data/sys-file-reader.c:631

-#: src/ui/gui/data-editor.glade:1285 src/ui/gui/psppire.glade:2189
+#: src/ui/gui/data-editor.glade:1285 src/ui/gui/psppire.glade:2176

 #: src/ui/gui/psppire-var-store.c:493
 msgid "String"
 msgstr ""
 
 #: src/data/format.c:318 src/data/sys-file-reader.c:631
 #: src/ui/gui/psppire-var-store.c:493
 msgid "String"
 msgstr ""
 
 #: src/data/format.c:318 src/data/sys-file-reader.c:631

-#: src/ui/gui/data-editor.glade:1174 src/ui/gui/psppire.glade:2144
+#: src/ui/gui/data-editor.glade:1174 src/ui/gui/psppire.glade:2131

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


@@ -1603,7 +1604,7 @@ msgstr ""
 
 #: src/language/dictionary/split-file.c:85
 #: src/language/dictionary/sys-file-info.c:395
 
 #: src/language/dictionary/split-file.c:85
 #: src/language/dictionary/sys-file-info.c:395

-#: src/language/dictionary/sys-file-info.c:562 src/ui/gui/psppire.glade:2112
+#: src/language/dictionary/sys-file-info.c:562 src/ui/gui/psppire.glade:2099

 #: src/ui/gui/var-sheet.c:69
 msgid "Label"
 msgstr ""
 #: src/ui/gui/var-sheet.c:69
 msgid "Label"
 msgstr ""


@@ -1612,7 +1613,7 @@ msgstr ""
 msgid "File:"
 msgstr ""
 
 msgid "File:"
 msgstr ""
 

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

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


@@ -2566,7 +2567,7 @@ msgstr ""
 msgid "Directional measures."
 msgstr ""
 
 msgid "Directional measures."
 msgstr ""
 

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

 #: src/ui/gui/var-sheet.c:66
 msgid "Type"
 msgstr ""
 #: src/ui/gui/var-sheet.c:66
 msgid "Type"
 msgstr ""


@@ -4771,7 +4772,7 @@ msgstr ""
 msgid "Width:"
 msgstr ""
 
 msgid "Width:"
 msgstr ""
 

-#: src/ui/gui/data-editor.glade:1634 src/ui/gui/psppire.glade:2557
+#: src/ui/gui/data-editor.glade:1634 src/ui/gui/psppire.glade:2544

 msgid "Value:"
 msgstr ""
 
 msgid "Value:"
 msgstr ""
 


@@ -4904,10 +4905,6 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
 msgid "Continue"
 msgstr ""
 

-#: src/ui/gui/psppire-buttonbox.c:260
-msgid "_Paste"
-msgstr ""
-

 #: src/ui/gui/psppire-buttonbox.c:400
 msgid "OK"
 msgstr ""
 #: src/ui/gui/psppire-buttonbox.c:400
 msgid "OK"
 msgstr ""


@@ -4932,6 +4929,10 @@ msgstr ""
 msgid "Paste"
 msgstr ""
 
 msgid "Paste"
 msgstr ""
 

+#: src/ui/gui/psppire.c:197
+msgid "_Reset"
+msgstr ""
+

 #: src/ui/gui/psppire-data-store.c:816
 msgid "var"
 msgstr ""
 #: src/ui/gui/psppire-data-store.c:816
 msgid "var"
 msgstr ""


@@ -4945,195 +4946,164 @@ msgstr ""
 msgid "This is pre-alpha software.  Use at your own risk."
 msgstr ""
 
 msgid "This is pre-alpha software.  Use at your own risk."
 msgstr ""
 

-#: src/ui/gui/psppire.glade:12
-msgid ""
-"   This program is free software: you can redistribute it and/or modify\n"
-"   it under the terms of the GNU General Public License as published by\n"
-"   the Free Software Foundation, either version 3 of the License, or\n"
-"   (at your option) any later version.\n"
-"\n"
-"   This program is distributed in the hope that it will be useful,\n"
-"   but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"   GNU General Public License for more details.\n"
-"\n"
-"   You should have received a copy of the GNU General Public License\n"
-"   along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
-msgstr ""
-"\"   This program is free software: you can redistribute it and/or modify\\n"
-"\"\n"
-"\"   it under the terms of the GNU General Public License as published by\\n"
-"\"\n"
-"\"   the Free Software Foundation, either version 3 of the Licence, or\\n\"\n"
-"\"   (at your option) any later version.\\n\"\n"
-"\"\\n\"\n"
-"\"   This program is distributed in the hope that it will be useful,\\n\"\n"
-"\"   but WITHOUT ANY WARRANTY; without even the implied warranty of\\n\"\n"
-"\"   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\\n\"\n"
-"\"   GNU General Public License for more details.\\n\"\n"
-"\"\\n\"\n"
-"\"   You should have received a copy of the GNU General Public License\\n\"\n"
-"\"   along with this program.  If not, see <http://www.gnu.org/licenses/>.\\n"
-"\"\n"
-
-#: src/ui/gui/psppire.glade:86 src/ui/gui/psppire.glade:167
+#: src/ui/gui/psppire.glade:73 src/ui/gui/psppire.glade:154

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

-#: src/ui/gui/psppire.glade:96
+#: src/ui/gui/psppire.glade:83

 msgid "Weight cases by"
 msgstr ""
 
 msgid "Weight cases by"
 msgstr ""
 

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

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

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

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

-#: src/ui/gui/psppire.glade:278
+#: src/ui/gui/psppire.glade:265

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

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

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

-#: src/ui/gui/psppire.glade:442
+#: src/ui/gui/psppire.glade:429

 msgid "Analyze all cases.  Do not create groups."
 msgstr "Analyse all cases.  Do not create groups."
 
 msgid "Analyze all cases.  Do not create groups."
 msgstr "Analyse all cases.  Do not create groups."
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: src/ui/gui/psppire.glade:791
+#: src/ui/gui/psppire.glade:778

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: src/ui/gui/psppire.glade:1120 src/ui/gui/psppire.glade:1266
+#: src/ui/gui/psppire.glade:1107 src/ui/gui/psppire.glade:1253

 msgid "If..."
 msgstr ""
 
 msgid "If..."
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1236
+#: src/ui/gui/psppire.glade:1223

 msgid "All Cases"
 msgstr ""
 
 msgid "All Cases"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1252
+#: src/ui/gui/psppire.glade:1239

 msgid "If condition is satisfied"
 msgstr ""
 
 msgid "If condition is satisfied"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1304
+#: src/ui/gui/psppire.glade:1291

 msgid "Random sample of cases"
 msgstr ""
 
 msgid "Random sample of cases"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1318
+#: src/ui/gui/psppire.glade:1305

 msgid "Sample..."
 msgstr ""
 
 msgid "Sample..."
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1356
+#: src/ui/gui/psppire.glade:1343

 msgid "Based on time or case range"
 msgstr ""
 
 msgid "Based on time or case range"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1369
+#: src/ui/gui/psppire.glade:1356

 msgid "Range..."
 msgstr ""
 
 msgid "Range..."
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1407
+#: src/ui/gui/psppire.glade:1394

 msgid "Use filter variable"
 msgstr ""
 
 msgid "Use filter variable"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


@@ -5147,55 +5117,55 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1913
+#: src/ui/gui/psppire.glade:1900

 msgid "Observation"
 msgstr ""
 
 msgid "Observation"
 msgstr ""
 

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

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

-#: src/ui/gui/psppire.glade:1936
+#: src/ui/gui/psppire.glade:1923

 msgid "First case"
 msgstr ""
 
 msgid "First case"
 msgstr ""
 

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

 msgid "Use expression as label"
 msgstr ""
 
 msgid "Use expression as label"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:2200 src/ui/gui/var-sheet.c:67
+#: src/ui/gui/psppire.glade:2187 src/ui/gui/var-sheet.c:67

 msgid "Width"
 msgstr ""
 
 msgid "Width"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


@@ -5447,3 +5417,36 @@ msgstr ""
 #, c-format
 msgid "could not access definition for terminal `%s'"
 msgstr ""
 #, c-format
 msgid "could not access definition for terminal `%s'"
 msgstr ""

+
+#~ msgid ""
+#~ "   This program is free software: you can redistribute it and/or modify\n"
+#~ "   it under the terms of the GNU General Public License as published by\n"
+#~ "   the Free Software Foundation, either version 3 of the License, or\n"
+#~ "   (at your option) any later version.\n"
+#~ "\n"
+#~ "   This program is distributed in the hope that it will be useful,\n"
+#~ "   but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "   GNU General Public License for more details.\n"
+#~ "\n"
+#~ "   You should have received a copy of the GNU General Public License\n"
+#~ "   along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
+#~ msgstr ""
+#~ "\"   This program is free software: you can redistribute it and/or modify"
+#~ "\\n\"\n"
+#~ "\"   it under the terms of the GNU General Public License as published by"
+#~ "\\n\"\n"
+#~ "\"   the Free Software Foundation, either version 3 of the Licence, or\\n"
+#~ "\"\n"
+#~ "\"   (at your option) any later version.\\n\"\n"
+#~ "\"\\n\"\n"
+#~ "\"   This program is distributed in the hope that it will be useful,\\n"
+#~ "\"\n"
+#~ "\"   but WITHOUT ANY WARRANTY; without even the implied warranty of\\n\"\n"
+#~ "\"   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\\n\"\n"
+#~ "\"   GNU General Public License for more details.\\n\"\n"
+#~ "\"\\n\"\n"
+#~ "\"   You should have received a copy of the GNU General Public License\\n"
+#~ "\"\n"
+#~ "\"   along with this program.  If not, see <http://www.gnu.org/licenses/>."
+#~ "\\n\"\n"

diff --git a/po/pspp.pot b/po/pspp.pot
index 8afe306e040f41e08b3431fd4dc5b9497737314c..72ec4476e058e47cc54c45414073b1313a800fa9 100644 (file)
--- a/po/pspp.pot
+++ b/po/pspp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"

-"POT-Creation-Date: 2007-09-28 12:24+0800\n"
+"POT-Creation-Date: 2007-10-04 10:39+0800\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


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

-#: src/ui/gui/data-editor.glade:1285 src/ui/gui/psppire.glade:2189
+#: src/ui/gui/data-editor.glade:1285 src/ui/gui/psppire.glade:2176

 #: src/ui/gui/psppire-var-store.c:493
 msgid "String"
 msgstr ""
 
 #: src/data/format.c:318 src/data/sys-file-reader.c:631
 #: src/ui/gui/psppire-var-store.c:493
 msgid "String"
 msgstr ""
 
 #: src/data/format.c:318 src/data/sys-file-reader.c:631

-#: src/ui/gui/data-editor.glade:1174 src/ui/gui/psppire.glade:2144
+#: src/ui/gui/data-editor.glade:1174 src/ui/gui/psppire.glade:2131

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


@@ -1606,7 +1606,7 @@ msgstr ""
 
 #: src/language/dictionary/split-file.c:85
 #: src/language/dictionary/sys-file-info.c:395
 
 #: src/language/dictionary/split-file.c:85
 #: src/language/dictionary/sys-file-info.c:395

-#: src/language/dictionary/sys-file-info.c:562 src/ui/gui/psppire.glade:2112
+#: src/language/dictionary/sys-file-info.c:562 src/ui/gui/psppire.glade:2099

 #: src/ui/gui/var-sheet.c:69
 msgid "Label"
 msgstr ""
 #: src/ui/gui/var-sheet.c:69
 msgid "Label"
 msgstr ""


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

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

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


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

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

 #: src/ui/gui/var-sheet.c:66
 msgid "Type"
 msgstr ""
 #: src/ui/gui/var-sheet.c:66
 msgid "Type"
 msgstr ""


@@ -4774,7 +4774,7 @@ msgstr ""
 msgid "Width:"
 msgstr ""
 
 msgid "Width:"
 msgstr ""
 

-#: src/ui/gui/data-editor.glade:1634 src/ui/gui/psppire.glade:2557
+#: src/ui/gui/data-editor.glade:1634 src/ui/gui/psppire.glade:2544

 msgid "Value:"
 msgstr ""
 
 msgid "Value:"
 msgstr ""
 


@@ -4907,10 +4907,6 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
 msgid "Continue"
 msgstr ""
 

-#: src/ui/gui/psppire-buttonbox.c:260
-msgid "_Paste"
-msgstr ""
-

 #: src/ui/gui/psppire-buttonbox.c:400
 msgid "OK"
 msgstr ""
 #: src/ui/gui/psppire-buttonbox.c:400
 msgid "OK"
 msgstr ""


@@ -4935,6 +4931,10 @@ msgstr ""
 msgid "Paste"
 msgstr ""
 
 msgid "Paste"
 msgstr ""
 

+#: src/ui/gui/psppire.c:197
+msgid "_Reset"
+msgstr ""
+

 #: src/ui/gui/psppire-data-store.c:816
 msgid "var"
 msgstr ""
 #: src/ui/gui/psppire-data-store.c:816
 msgid "var"
 msgstr ""


@@ -4948,180 +4948,164 @@ msgstr ""
 msgid "This is pre-alpha software.  Use at your own risk."
 msgstr ""
 
 msgid "This is pre-alpha software.  Use at your own risk."
 msgstr ""
 

-#: src/ui/gui/psppire.glade:12
-msgid ""
-"   This program is free software: you can redistribute it and/or modify\n"
-"   it under the terms of the GNU General Public License as published by\n"
-"   the Free Software Foundation, either version 3 of the License, or\n"
-"   (at your option) any later version.\n"
-"\n"
-"   This program is distributed in the hope that it will be useful,\n"
-"   but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"   GNU General Public License for more details.\n"
-"\n"
-"   You should have received a copy of the GNU General Public License\n"
-"   along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
-msgstr ""
-
-#: src/ui/gui/psppire.glade:86 src/ui/gui/psppire.glade:167
+#: src/ui/gui/psppire.glade:73 src/ui/gui/psppire.glade:154

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

-#: src/ui/gui/psppire.glade:96
+#: src/ui/gui/psppire.glade:83

 msgid "Weight cases by"
 msgstr ""
 
 msgid "Weight cases by"
 msgstr ""
 

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

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

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

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

-#: src/ui/gui/psppire.glade:278
+#: src/ui/gui/psppire.glade:265

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

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

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

-#: src/ui/gui/psppire.glade:442
+#: src/ui/gui/psppire.glade:429

 msgid "Analyze all cases.  Do not create groups."
 msgstr ""
 
 msgid "Analyze all cases.  Do not create groups."
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: src/ui/gui/psppire.glade:791
+#: src/ui/gui/psppire.glade:778

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: src/ui/gui/psppire.glade:1120 src/ui/gui/psppire.glade:1266
+#: src/ui/gui/psppire.glade:1107 src/ui/gui/psppire.glade:1253

 msgid "If..."
 msgstr ""
 
 msgid "If..."
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1236
+#: src/ui/gui/psppire.glade:1223

 msgid "All Cases"
 msgstr ""
 
 msgid "All Cases"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1252
+#: src/ui/gui/psppire.glade:1239

 msgid "If condition is satisfied"
 msgstr ""
 
 msgid "If condition is satisfied"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1304
+#: src/ui/gui/psppire.glade:1291

 msgid "Random sample of cases"
 msgstr ""
 
 msgid "Random sample of cases"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1318
+#: src/ui/gui/psppire.glade:1305

 msgid "Sample..."
 msgstr ""
 
 msgid "Sample..."
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1356
+#: src/ui/gui/psppire.glade:1343

 msgid "Based on time or case range"
 msgstr ""
 
 msgid "Based on time or case range"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1369
+#: src/ui/gui/psppire.glade:1356

 msgid "Range..."
 msgstr ""
 
 msgid "Range..."
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1407
+#: src/ui/gui/psppire.glade:1394

 msgid "Use filter variable"
 msgstr ""
 
 msgid "Use filter variable"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


@@ -5135,55 +5119,55 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:1913
+#: src/ui/gui/psppire.glade:1900

 msgid "Observation"
 msgstr ""
 
 msgid "Observation"
 msgstr ""
 

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

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

-#: src/ui/gui/psppire.glade:1936
+#: src/ui/gui/psppire.glade:1923

 msgid "First case"
 msgstr ""
 
 msgid "First case"
 msgstr ""
 

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

 msgid "Use expression as label"
 msgstr ""
 
 msgid "Use expression as label"
 msgstr ""
 

-#: src/ui/gui/psppire.glade:2200 src/ui/gui/var-sheet.c:67
+#: src/ui/gui/psppire.glade:2187 src/ui/gui/var-sheet.c:67

 msgid "Width"
 msgstr ""
 
 msgid "Width"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/src/math/interaction.c b/src/math/interaction.c
index 5a736f080a7d6219e8f600c243587912c12cce2b..2d670b2dc726ff98656dd9fbd967a9bfd96d04d3 100644 (file)
--- a/src/math/interaction.c
+++ b/src/math/interaction.c
@@ -25,6 +25,8 @@
   N_1, N_2, ..., N_K categories, then the interaction will have
   N_1 * N_2 * N_3 *...* N_K - 1 entries.
  */
   N_1, N_2, ..., N_K categories, then the interaction will have
   N_1 * N_2 * N_3 *...* N_K - 1 entries.
  */

+
+#include <config.h>

 #include <assert.h>
 #include <libpspp/alloc.h>
 #include <gsl/gsl_math.h>
 #include <assert.h>
 #include <libpspp/alloc.h>
 #include <gsl/gsl_math.h>

diff --git a/src/ui/gui/ChangeLog b/src/ui/gui/ChangeLog
index eab0f7af9771ef480ff946dd1c51b3d6ac965d94..74fc10fea5a90f9437f94a0ee6f17411ca41b51a 100644 (file)
--- a/src/ui/gui/ChangeLog
+++ b/src/ui/gui/ChangeLog
@@ -1,4 +1,15 @@
-2007-09-26  John Darrington <john@darrington.wattle.id.au>
+2007-10-04  John Darrington <john@darrington.wattle.id.au>
+
+       * compute-dialog.c goto-case-dialog.c main.c psppire-keypad.c: Added 
+       #include <config.h>
+
+       * psppire.glade about.c: Read GPL text from src/libpspp/copyleft.c 
+       instead of makeing another copy in psppire.glade.
+
+       * psppirebuttonbox.c psppire.c: Create a new stock item for 
+       RESET buttons.
+       
+2007-09-26  John Darrington <john@darrington.wattle.id.au>     

        
        * output-viewer.c output-viewer.h psppire.c: (closes patch #6210) 
        Changed width and length parameters of output driver to
        
        * output-viewer.c output-viewer.h psppire.c: (closes patch #6210) 
        Changed width and length parameters of output driver to

diff --git a/src/ui/gui/about.c b/src/ui/gui/about.c
index 949fdcdf4c2fb6222d65e03e6dd44108e2c644ab..e743fcf61dbfa7b8128c277b7c59e32dd4c49e9c 100644 (file)
--- a/src/ui/gui/about.c
+++ b/src/ui/gui/about.c
@@ -20,10 +20,12 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 

+#include <libpspp/copyleft.h>

 #include <libpspp/version.h>
 #include "about.h"
 #include "helper.h"
 
 #include <libpspp/version.h>
 #include "about.h"
 #include "helper.h"
 

+

 const static gchar *artists[] = { "Patrick Brunier", "Dondi Bogusky", NULL};
 
 void
 const static gchar *artists[] = { "Patrick Brunier", "Dondi Bogusky", NULL};
 
 void


@@ -55,6 +57,10 @@ about_new (GtkMenuItem *m, GtkWindow *parent)
   gtk_about_dialog_set_artists (GTK_ABOUT_DIALOG (about),
                                artists);
 
   gtk_about_dialog_set_artists (GTK_ABOUT_DIALOG (about),
                                artists);
 

+  gtk_about_dialog_set_license (GTK_ABOUT_DIALOG (about),
+                               copyleft);
+
+

   gtk_window_set_transient_for (GTK_WINDOW (about), parent);
 
   gtk_window_set_modal (GTK_WINDOW (about), TRUE);
   gtk_window_set_transient_for (GTK_WINDOW (about), parent);
 
   gtk_window_set_modal (GTK_WINDOW (about), TRUE);

diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c
index 6a3b0aaa75cdccb1d380539b86a3893c36db7147..9d3e0b4671b35dc08f7c02d7a0838f17a99169c8 100644 (file)
--- a/src/ui/gui/compute-dialog.c
+++ b/src/ui/gui/compute-dialog.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 

-
+#include <config.h>

 #include <gtk/gtk.h>
 #include "compute-dialog.h"
 #include "helper.h"
 #include <gtk/gtk.h>
 #include "compute-dialog.h"
 #include "helper.h"

diff --git a/src/ui/gui/goto-case-dialog.c b/src/ui/gui/goto-case-dialog.c
index 32e93dbd4ca37afe07f9bd14ebcf01953199ec27..a56af78cb307cb1a5a949e8123e13274abed5008 100644 (file)
--- a/src/ui/gui/goto-case-dialog.c
+++ b/src/ui/gui/goto-case-dialog.c
@@ -15,6 +15,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 

+#include <config.h>

 #include "goto-case-dialog.h"
 #include "helper.h"
 #include "psppire-dialog.h"
 #include "goto-case-dialog.h"
 #include "helper.h"
 #include "psppire-dialog.h"

diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c
index bab489a5aad88b13072822e4b113df887b8094a4..1d7264f83985674073a5210e82e43c88e5cd9f30 100644 (file)
--- a/src/ui/gui/main.c
+++ b/src/ui/gui/main.c
@@ -14,6 +14,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 

+#include <config.h>

 #include <gtk/gtk.h>
 #include "psppire.h"
 #include "progname.h"
 #include <gtk/gtk.h>
 #include "psppire.h"
 #include "progname.h"

diff --git a/src/ui/gui/psppire-buttonbox.c b/src/ui/gui/psppire-buttonbox.c
index e4ee788566320f30117b647254f31521590fcd5f..da39e0867d3968fbf927fb6c47cafdaf634aad20 100644 (file)
--- a/src/ui/gui/psppire-buttonbox.c
+++ b/src/ui/gui/psppire-buttonbox.c
@@ -257,7 +257,7 @@ psppire_button_box_init (PsppireButtonBox *bb)
 
 
 
 
 
 

-  bb->button[PSPPIRE_BUTTON_PASTE] = gtk_button_new_with_mnemonic (_("_Paste"));
+  bb->button[PSPPIRE_BUTTON_PASTE] = gtk_button_new_from_stock (GTK_STOCK_PASTE);

   g_signal_connect (bb->button[PSPPIRE_BUTTON_PASTE], "clicked",
                    G_CALLBACK (paste_button_clicked), NULL);
   gtk_box_pack_start_defaults (GTK_BOX (bb), bb->button[PSPPIRE_BUTTON_PASTE]);
   g_signal_connect (bb->button[PSPPIRE_BUTTON_PASTE], "clicked",
                    G_CALLBACK (paste_button_clicked), NULL);
   gtk_box_pack_start_defaults (GTK_BOX (bb), bb->button[PSPPIRE_BUTTON_PASTE]);


@@ -270,7 +270,7 @@ psppire_button_box_init (PsppireButtonBox *bb)
   g_object_set (bb->button[PSPPIRE_BUTTON_CANCEL], "no-show-all", TRUE, NULL);
 
 
   g_object_set (bb->button[PSPPIRE_BUTTON_CANCEL], "no-show-all", TRUE, NULL);
 
 

-  bb->button[PSPPIRE_BUTTON_RESET] = gtk_button_new_from_stock (GTK_STOCK_REFRESH);
+  bb->button[PSPPIRE_BUTTON_RESET] = gtk_button_new_from_stock ("pspp-stock-reset");

   g_signal_connect (bb->button[PSPPIRE_BUTTON_RESET], "clicked",
                    G_CALLBACK (refresh_clicked), NULL);
   gtk_box_pack_start_defaults (GTK_BOX (bb), bb->button[PSPPIRE_BUTTON_RESET]);
   g_signal_connect (bb->button[PSPPIRE_BUTTON_RESET], "clicked",
                    G_CALLBACK (refresh_clicked), NULL);
   gtk_box_pack_start_defaults (GTK_BOX (bb), bb->button[PSPPIRE_BUTTON_RESET]);

diff --git a/src/ui/gui/psppire-keypad.c b/src/ui/gui/psppire-keypad.c
index 2c4f4b0ba833564dae505cba0ff917c5f6f18ee9..54e6d4314fd2f2ba324ae9cfd419ad1e6c5af38c 100644 (file)
--- a/src/ui/gui/psppire-keypad.c
+++ b/src/ui/gui/psppire-keypad.c
@@ -14,6 +14,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 

+#include <config.h>

 #include <gtk/gtksignal.h>
 #include <gtk/gtktable.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtktable.h>
 #include <gtk/gtkbutton.h>

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 2f209a08953539f25a38ac74a3aa0d07e491bcab..6910ddd1f403e46cae869b93cc08d12af2f9e36c 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -68,6 +68,10 @@ replace_casereader (struct casereader *s)
   psppire_data_store_set_case_file (the_data_store, pcf);
 }
 
   psppire_data_store_set_case_file (the_data_store, pcf);
 }
 

+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+

 void
 initialize (void)
 {
 void
 initialize (void)
 {


@@ -79,7 +83,6 @@ initialize (void)
 
   bindtextdomain (PACKAGE, locale_dir);
 
 
   bindtextdomain (PACKAGE, locale_dir);
 

-  textdomain (PACKAGE);

 
   glade_init ();
 
 
   glade_init ();
 


@@ -120,6 +123,7 @@ initialize (void)
   unlink (OUTPUT_FILE_NAME);
 
   journal_enable ();
   unlink (OUTPUT_FILE_NAME);
 
   journal_enable ();

+  textdomain (PACKAGE);

 
   new_data_window (NULL, NULL);
 }
 
   new_data_window (NULL, NULL);
 }


@@ -135,6 +139,7 @@ de_initialize (void)
 }
 
 
 }
 
 

+

 struct icon_info
 {
   const char *file_name;
 struct icon_info
 {
   const char *file_name;


@@ -184,6 +189,19 @@ create_icon_factory (void)
        }
     }
 
        }
     }
 

+
+  {
+    /* Create our own "pspp-stock-reset" item, using the
+       GTK_STOCK_REFRESH icon set */
+
+    GtkStockItem item = {"pspp-stock-reset", N_("_Reset"), 0, 0, PACKAGE};
+    GtkIconSet *icon_set =
+      gtk_icon_factory_lookup_default (GTK_STOCK_REFRESH);
+
+    gtk_stock_add (&item, 1);
+    gtk_icon_factory_add (factory, "pspp-stock-reset", icon_set);
+  }
+

   gtk_icon_factory_add_default (factory);
 }
 
   gtk_icon_factory_add_default (factory);
 }
 

diff --git a/src/ui/gui/psppire.glade b/src/ui/gui/psppire.glade
index 7c4dda7cd0144b20a2babf962fea54b94c887a76..115f935efb7e9f2b3ca208dfae1e2178e50c5efa 100644 (file)
--- a/src/ui/gui/psppire.glade
+++ b/src/ui/gui/psppire.glade
@@ -9,19 +9,6 @@
     <property name="name">PSPPire</property>
     <property name="copyright">Free Software Foundation</property>
     <property name="comments" translatable="yes">This is pre-alpha software.  Use at your own risk.</property>
     <property name="name">PSPPire</property>
     <property name="copyright">Free Software Foundation</property>
     <property name="comments" translatable="yes">This is pre-alpha software.  Use at your own risk.</property>

-    <property name="license" translatable="yes">   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.
-</property>

     <property name="authors"></property>
     <property name="logo">pspplogo.png</property>
     <child internal-child="vbox">
     <property name="authors"></property>
     <property name="logo">pspplogo.png</property>
     <child internal-child="vbox">