[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp po/de.po po/en_GB.po po/pspp.pot src/math/...
From: |
John Darrington |
Subject: |
[Pspp-cvs] pspp po/de.po po/en_GB.po po/pspp.pot src/math/... |
Date: |
Thu, 04 Oct 2007 02:41:54 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 07/10/04 02:41:54
Modified files:
po : de.po en_GB.po pspp.pot
src/math : interaction.c
src/ui/gui : ChangeLog about.c compute-dialog.c
goto-case-dialog.c main.c psppire-buttonbox.c
psppire-keypad.c psppire.c psppire.glade
Log message:
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
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/pspp/po/en_GB.po?cvsroot=pspp&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/pspp/po/pspp.pot?cvsroot=pspp&r1=1.154&r2=1.155
http://cvs.savannah.gnu.org/viewcvs/pspp/src/math/interaction.c?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/about.c?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/compute-dialog.c?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/goto-case-dialog.c?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/main.c?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-buttonbox.c?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-keypad.c?cvsroot=pspp&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire.c?cvsroot=pspp&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire.glade?cvsroot=pspp&r1=1.28&r2=1.29
Patches:
Index: po/de.po
===================================================================
RCS file: /sources/pspp/pspp/po/de.po,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- po/de.po 28 Sep 2007 04:25:14 -0000 1.69
+++ po/de.po 4 Oct 2007 02:41:53 -0000 1.70
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.3\n"
"Report-Msgid-Bugs-To: address@hidden"
-"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 <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -66,7 +66,6 @@
msgstr ""
#: src/data/case-tmpfile.c:155
-#, fuzzy
msgid "unexpected end of file reading temporary file"
msgstr "plotzlich ist der Datei beendet"
@@ -174,14 +173,14 @@
msgstr ""
#: src/data/data-in.c:1130
-#, fuzzy, c-format
+#, c-format
msgid "`%c' expected in date field."
-msgstr "plotzlich ist der Datei beendet"
+msgstr ""
#: src/data/data-in.c:1171
-#, fuzzy, c-format
+#, c-format
msgid "column %d"
-msgstr "Spalten"
+msgstr "Spalten %d"
#: src/data/data-in.c:1173
#, fuzzy, c-format
@@ -307,13 +306,13 @@
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/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"
@@ -608,14 +607,12 @@
msgstr ""
#: src/data/sys-file-reader.c:633
-#, fuzzy
msgid "print"
-msgstr "Drucken"
+msgstr "drucken"
#: src/data/sys-file-reader.c:633
-#, fuzzy
msgid "write"
-msgstr "Drucken"
+msgstr "schreiben"
#: src/data/sys-file-reader.c:637
msgid "Suppressing further invalid format warnings."
@@ -810,7 +807,6 @@
msgstr ""
#: src/data/sys-file-reader.c:1626
-#, fuzzy
msgid "Unexpected end of file."
msgstr "plotzlich ist der Datei beendet"
@@ -1612,7 +1608,7 @@
#: 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"
@@ -1621,7 +1617,7 @@
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:"
@@ -1796,7 +1792,6 @@
msgstr "Links"
#: src/language/dictionary/sys-file-info.c:500 src/ui/gui/var-sheet.c:82
-#, fuzzy
msgid "Center"
msgstr "Mittel"
@@ -2576,7 +2571,7 @@
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"
@@ -2966,7 +2961,6 @@
msgstr ""
#: src/language/stats/flip.c:418
-#, fuzzy
msgid "Unexpected end of file reading FLIP file."
msgstr "plotzlich ist der Datei beendet"
@@ -4811,7 +4805,7 @@
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:"
@@ -4949,11 +4943,6 @@
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 ""
@@ -4973,13 +4962,17 @@
#: 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.c:197
+msgid "_Reset"
+msgstr "_Zurücksetzen"
+
#: src/ui/gui/psppire-data-store.c:816
msgid "var"
msgstr ""
@@ -4994,191 +4987,175 @@
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/psppire.glade:96
+#: src/ui/gui/psppire.glade:83
msgid "Weight cases by"
msgstr ""
-#: src/ui/gui/psppire.glade:120
+#: src/ui/gui/psppire.glade:107
#, fuzzy
msgid "Frequency Variable"
msgstr "Variableansicht"
-#: src/ui/gui/psppire.glade:160
+#: src/ui/gui/psppire.glade:147
msgid "Current Status: "
msgstr ""
-#: src/ui/gui/psppire.glade:278
+#: src/ui/gui/psppire.glade:265
#, fuzzy
msgid "Variable(s):"
msgstr "Variableansicht"
-#: src/ui/gui/psppire.glade:327
+#: src/ui/gui/psppire.glade:314
#, 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 ""
-#: src/ui/gui/psppire.glade:452
+#: src/ui/gui/psppire.glade:439
msgid "Compare groups."
msgstr ""
-#: src/ui/gui/psppire.glade:465
+#: src/ui/gui/psppire.glade:452
msgid "Organize output by groups."
msgstr ""
-#: src/ui/gui/psppire.glade:512
+#: src/ui/gui/psppire.glade:499
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 ""
-#: src/ui/gui/psppire.glade:587
+#: src/ui/gui/psppire.glade:574
msgid "File is already sorted."
msgstr ""
-#: src/ui/gui/psppire.glade:631
+#: src/ui/gui/psppire.glade:618
msgid "Current Status : "
msgstr ""
-#: src/ui/gui/psppire.glade:639
+#: src/ui/gui/psppire.glade:626
msgid "Analysis by groups is off"
msgstr ""
-#: src/ui/gui/psppire.glade:738
+#: src/ui/gui/psppire.glade:725
msgid "Sort by:"
msgstr ""
-#: src/ui/gui/psppire.glade:791
+#: src/ui/gui/psppire.glade:778
msgid "Ascending"
msgstr ""
-#: src/ui/gui/psppire.glade:801
+#: src/ui/gui/psppire.glade:788
msgid "Descending"
msgstr ""
-#: src/ui/gui/psppire.glade:817
+#: src/ui/gui/psppire.glade:804
msgid "Sort Order"
msgstr ""
-#: src/ui/gui/psppire.glade:886
+#: src/ui/gui/psppire.glade:873
#, fuzzy
msgid "Target Variable:"
msgstr "Variableansicht"
-#: src/ui/gui/psppire.glade:917
+#: src/ui/gui/psppire.glade:904
msgid "Type & Label"
msgstr ""
-#: src/ui/gui/psppire.glade:956
+#: src/ui/gui/psppire.glade:943
msgid "="
msgstr ""
-#: src/ui/gui/psppire.glade:1002
+#: src/ui/gui/psppire.glade:989
msgid "Numeric Expressions:"
msgstr ""
-#: src/ui/gui/psppire.glade:1056
+#: src/ui/gui/psppire.glade:1043
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 ""
-#: src/ui/gui/psppire.glade:1236
+#: src/ui/gui/psppire.glade:1223
#, 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 ""
-#: src/ui/gui/psppire.glade:1304
+#: src/ui/gui/psppire.glade:1291
msgid "Random sample of cases"
msgstr ""
-#: src/ui/gui/psppire.glade:1318
+#: src/ui/gui/psppire.glade:1305
#, 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 ""
-#: src/ui/gui/psppire.glade:1369
+#: src/ui/gui/psppire.glade:1356
msgid "Range..."
msgstr ""
-#: src/ui/gui/psppire.glade:1407
+#: src/ui/gui/psppire.glade:1394
#, fuzzy
msgid "Use filter variable"
msgstr "Variableansicht"
-#: src/ui/gui/psppire.glade:1569
+#: src/ui/gui/psppire.glade:1556
#, fuzzy
msgid "Select"
msgstr "Schriftwahlung"
-#: src/ui/gui/psppire.glade:1599
+#: src/ui/gui/psppire.glade:1586
#, fuzzy
msgid "Filtered"
msgstr "Datei:"
-#: src/ui/gui/psppire.glade:1609
+#: src/ui/gui/psppire.glade:1596
msgid "Deleted"
msgstr ""
-#: src/ui/gui/psppire.glade:1626
+#: src/ui/gui/psppire.glade:1613
#, fuzzy
msgid "Unselected Cases Are"
msgstr "_Stecken"
-#: src/ui/gui/psppire.glade:1691
+#: src/ui/gui/psppire.glade:1678
#, fuzzy
msgid "Comments:"
msgstr "Spalten"
-#: src/ui/gui/psppire.glade:1733
+#: src/ui/gui/psppire.glade:1720
msgid "Display comments in output"
msgstr ""
-#: src/ui/gui/psppire.glade:1747
+#: src/ui/gui/psppire.glade:1734
msgid "Column Number: 0"
msgstr ""
-#: src/ui/gui/psppire.glade:1823
+#: src/ui/gui/psppire.glade:1810
msgid "Variable Information:"
msgstr ""
-#: src/ui/gui/psppire.glade:1849
+#: src/ui/gui/psppire.glade:1836
msgid ""
"\n"
"\n"
@@ -5192,59 +5169,59 @@
"\n"
msgstr ""
-#: src/ui/gui/psppire.glade:1913
+#: src/ui/gui/psppire.glade:1900
msgid "Observation"
msgstr ""
-#: src/ui/gui/psppire.glade:1923
+#: src/ui/gui/psppire.glade:1910
#, fuzzy
msgid "Last case"
msgstr "_Stecken"
-#: src/ui/gui/psppire.glade:1936
+#: src/ui/gui/psppire.glade:1923
msgid "First case"
msgstr ""
-#: src/ui/gui/psppire.glade:2094
+#: src/ui/gui/psppire.glade:2081
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"
-#: src/ui/gui/psppire.glade:2287
+#: src/ui/gui/psppire.glade:2274
msgid "Goto Case Number:"
msgstr ""
-#: src/ui/gui/psppire.glade:2423
+#: src/ui/gui/psppire.glade:2410
#, fuzzy
msgid "Sample Size"
msgstr "Muster"
-#: src/ui/gui/psppire.glade:2526
+#: src/ui/gui/psppire.glade:2513
#, fuzzy
msgid "Variable:"
msgstr "Variableansicht"
-#: src/ui/gui/psppire.glade:2583
+#: src/ui/gui/psppire.glade:2570
#, fuzzy
msgid "Search value labels"
msgstr "Werten"
-#: src/ui/gui/psppire.glade:2606
+#: src/ui/gui/psppire.glade:2593
msgid "Regular expression Match"
msgstr ""
-#: src/ui/gui/psppire.glade:2616
+#: src/ui/gui/psppire.glade:2603
msgid "Search substrings"
msgstr ""
-#: src/ui/gui/psppire.glade:2628
+#: src/ui/gui/psppire.glade:2615
msgid "Wrap around"
msgstr ""
-#: src/ui/gui/psppire.glade:2640
+#: src/ui/gui/psppire.glade:2627
msgid "Search backward"
msgstr ""
@@ -5500,16 +5477,3 @@
#, 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"
Index: po/en_GB.po
===================================================================
RCS file: /sources/pspp/pspp/po/en_GB.po,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- po/en_GB.po 28 Sep 2007 04:25:14 -0000 1.85
+++ po/en_GB.po 4 Oct 2007 02:41:53 -0000 1.86
@@ -7,9 +7,10 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.3\n"
"Report-Msgid-Bugs-To: address@hidden"
-"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 <address@hidden>\n"
+"Language-Team: John Darrington <address@hidden>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -302,13 +303,13 @@
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/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 ""
@@ -1603,7 +1604,7 @@
#: 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 ""
@@ -1612,7 +1613,7 @@
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 ""
@@ -2566,7 +2567,7 @@
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 ""
@@ -4771,7 +4772,7 @@
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 ""
@@ -4904,10 +4905,6 @@
msgid "Continue"
msgstr ""
-#: src/ui/gui/psppire-buttonbox.c:260
-msgid "_Paste"
-msgstr ""
-
#: src/ui/gui/psppire-buttonbox.c:400
msgid "OK"
msgstr ""
@@ -4932,6 +4929,10 @@
msgid "Paste"
msgstr ""
+#: src/ui/gui/psppire.c:197
+msgid "_Reset"
+msgstr ""
+
#: src/ui/gui/psppire-data-store.c:816
msgid "var"
msgstr ""
@@ -4945,195 +4946,164 @@
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/psppire.glade:96
+#: src/ui/gui/psppire.glade:83
msgid "Weight cases by"
msgstr ""
-#: src/ui/gui/psppire.glade:120
+#: src/ui/gui/psppire.glade:107
msgid "Frequency Variable"
msgstr ""
-#: src/ui/gui/psppire.glade:160
+#: src/ui/gui/psppire.glade:147
msgid "Current Status: "
msgstr ""
-#: src/ui/gui/psppire.glade:278
+#: src/ui/gui/psppire.glade:265
msgid "Variable(s):"
msgstr ""
-#: src/ui/gui/psppire.glade:327
+#: src/ui/gui/psppire.glade:314
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."
-#: src/ui/gui/psppire.glade:452
+#: src/ui/gui/psppire.glade:439
msgid "Compare groups."
msgstr ""
-#: src/ui/gui/psppire.glade:465
+#: src/ui/gui/psppire.glade:452
msgid "Organize output by groups."
msgstr ""
-#: src/ui/gui/psppire.glade:512
+#: src/ui/gui/psppire.glade:499
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 ""
-#: src/ui/gui/psppire.glade:587
+#: src/ui/gui/psppire.glade:574
msgid "File is already sorted."
msgstr ""
-#: src/ui/gui/psppire.glade:631
+#: src/ui/gui/psppire.glade:618
msgid "Current Status : "
msgstr ""
-#: src/ui/gui/psppire.glade:639
+#: src/ui/gui/psppire.glade:626
msgid "Analysis by groups is off"
msgstr ""
-#: src/ui/gui/psppire.glade:738
+#: src/ui/gui/psppire.glade:725
msgid "Sort by:"
msgstr ""
-#: src/ui/gui/psppire.glade:791
+#: src/ui/gui/psppire.glade:778
msgid "Ascending"
msgstr ""
-#: src/ui/gui/psppire.glade:801
+#: src/ui/gui/psppire.glade:788
msgid "Descending"
msgstr ""
-#: src/ui/gui/psppire.glade:817
+#: src/ui/gui/psppire.glade:804
msgid "Sort Order"
msgstr ""
-#: src/ui/gui/psppire.glade:886
+#: src/ui/gui/psppire.glade:873
msgid "Target Variable:"
msgstr ""
-#: src/ui/gui/psppire.glade:917
+#: src/ui/gui/psppire.glade:904
msgid "Type & Label"
msgstr ""
-#: src/ui/gui/psppire.glade:956
+#: src/ui/gui/psppire.glade:943
msgid "="
msgstr ""
-#: src/ui/gui/psppire.glade:1002
+#: src/ui/gui/psppire.glade:989
msgid "Numeric Expressions:"
msgstr ""
-#: src/ui/gui/psppire.glade:1056
+#: src/ui/gui/psppire.glade:1043
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 ""
-#: src/ui/gui/psppire.glade:1236
+#: src/ui/gui/psppire.glade:1223
msgid "All Cases"
msgstr ""
-#: src/ui/gui/psppire.glade:1252
+#: src/ui/gui/psppire.glade:1239
msgid "If condition is satisfied"
msgstr ""
-#: src/ui/gui/psppire.glade:1304
+#: src/ui/gui/psppire.glade:1291
msgid "Random sample of cases"
msgstr ""
-#: src/ui/gui/psppire.glade:1318
+#: src/ui/gui/psppire.glade:1305
msgid "Sample..."
msgstr ""
-#: src/ui/gui/psppire.glade:1356
+#: src/ui/gui/psppire.glade:1343
msgid "Based on time or case range"
msgstr ""
-#: src/ui/gui/psppire.glade:1369
+#: src/ui/gui/psppire.glade:1356
msgid "Range..."
msgstr ""
-#: src/ui/gui/psppire.glade:1407
+#: src/ui/gui/psppire.glade:1394
msgid "Use filter variable"
msgstr ""
-#: src/ui/gui/psppire.glade:1569
+#: src/ui/gui/psppire.glade:1556
msgid "Select"
msgstr ""
-#: src/ui/gui/psppire.glade:1599
+#: src/ui/gui/psppire.glade:1586
msgid "Filtered"
msgstr ""
-#: src/ui/gui/psppire.glade:1609
+#: src/ui/gui/psppire.glade:1596
msgid "Deleted"
msgstr ""
-#: src/ui/gui/psppire.glade:1626
+#: src/ui/gui/psppire.glade:1613
msgid "Unselected Cases Are"
msgstr ""
-#: src/ui/gui/psppire.glade:1691
+#: src/ui/gui/psppire.glade:1678
msgid "Comments:"
msgstr ""
-#: src/ui/gui/psppire.glade:1733
+#: src/ui/gui/psppire.glade:1720
msgid "Display comments in output"
msgstr ""
-#: src/ui/gui/psppire.glade:1747
+#: src/ui/gui/psppire.glade:1734
msgid "Column Number: 0"
msgstr ""
-#: src/ui/gui/psppire.glade:1823
+#: src/ui/gui/psppire.glade:1810
msgid "Variable Information:"
msgstr ""
-#: src/ui/gui/psppire.glade:1849
+#: src/ui/gui/psppire.glade:1836
msgid ""
"\n"
"\n"
@@ -5147,55 +5117,55 @@
"\n"
msgstr ""
-#: src/ui/gui/psppire.glade:1913
+#: src/ui/gui/psppire.glade:1900
msgid "Observation"
msgstr ""
-#: src/ui/gui/psppire.glade:1923
+#: src/ui/gui/psppire.glade:1910
msgid "Last case"
msgstr ""
-#: src/ui/gui/psppire.glade:1936
+#: src/ui/gui/psppire.glade:1923
msgid "First case"
msgstr ""
-#: src/ui/gui/psppire.glade:2094
+#: src/ui/gui/psppire.glade:2081
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 ""
-#: src/ui/gui/psppire.glade:2287
+#: src/ui/gui/psppire.glade:2274
msgid "Goto Case Number:"
msgstr ""
-#: src/ui/gui/psppire.glade:2423
+#: src/ui/gui/psppire.glade:2410
msgid "Sample Size"
msgstr ""
-#: src/ui/gui/psppire.glade:2526
+#: src/ui/gui/psppire.glade:2513
msgid "Variable:"
msgstr ""
-#: src/ui/gui/psppire.glade:2583
+#: src/ui/gui/psppire.glade:2570
msgid "Search value labels"
msgstr ""
-#: src/ui/gui/psppire.glade:2606
+#: src/ui/gui/psppire.glade:2593
msgid "Regular expression Match"
msgstr ""
-#: src/ui/gui/psppire.glade:2616
+#: src/ui/gui/psppire.glade:2603
msgid "Search substrings"
msgstr ""
-#: src/ui/gui/psppire.glade:2628
+#: src/ui/gui/psppire.glade:2615
msgid "Wrap around"
msgstr ""
-#: src/ui/gui/psppire.glade:2640
+#: src/ui/gui/psppire.glade:2627
msgid "Search backward"
msgstr ""
@@ -5447,3 +5417,36 @@
#, 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"
Index: po/pspp.pot
===================================================================
RCS file: /sources/pspp/pspp/po/pspp.pot,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- po/pspp.pot 28 Sep 2007 04:25:14 -0000 1.154
+++ po/pspp.pot 4 Oct 2007 02:41:53 -0000 1.155
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"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 <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -305,13 +305,13 @@
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/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 ""
@@ -1606,7 +1606,7 @@
#: 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 ""
@@ -1615,7 +1615,7 @@
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 ""
@@ -2569,7 +2569,7 @@
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 ""
@@ -4774,7 +4774,7 @@
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 ""
@@ -4907,10 +4907,6 @@
msgid "Continue"
msgstr ""
-#: src/ui/gui/psppire-buttonbox.c:260
-msgid "_Paste"
-msgstr ""
-
#: src/ui/gui/psppire-buttonbox.c:400
msgid "OK"
msgstr ""
@@ -4935,6 +4931,10 @@
msgid "Paste"
msgstr ""
+#: src/ui/gui/psppire.c:197
+msgid "_Reset"
+msgstr ""
+
#: src/ui/gui/psppire-data-store.c:816
msgid "var"
msgstr ""
@@ -4948,180 +4948,164 @@
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/psppire.glade:96
+#: src/ui/gui/psppire.glade:83
msgid "Weight cases by"
msgstr ""
-#: src/ui/gui/psppire.glade:120
+#: src/ui/gui/psppire.glade:107
msgid "Frequency Variable"
msgstr ""
-#: src/ui/gui/psppire.glade:160
+#: src/ui/gui/psppire.glade:147
msgid "Current Status: "
msgstr ""
-#: src/ui/gui/psppire.glade:278
+#: src/ui/gui/psppire.glade:265
msgid "Variable(s):"
msgstr ""
-#: src/ui/gui/psppire.glade:327
+#: src/ui/gui/psppire.glade:314
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 ""
-#: src/ui/gui/psppire.glade:452
+#: src/ui/gui/psppire.glade:439
msgid "Compare groups."
msgstr ""
-#: src/ui/gui/psppire.glade:465
+#: src/ui/gui/psppire.glade:452
msgid "Organize output by groups."
msgstr ""
-#: src/ui/gui/psppire.glade:512
+#: src/ui/gui/psppire.glade:499
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 ""
-#: src/ui/gui/psppire.glade:587
+#: src/ui/gui/psppire.glade:574
msgid "File is already sorted."
msgstr ""
-#: src/ui/gui/psppire.glade:631
+#: src/ui/gui/psppire.glade:618
msgid "Current Status : "
msgstr ""
-#: src/ui/gui/psppire.glade:639
+#: src/ui/gui/psppire.glade:626
msgid "Analysis by groups is off"
msgstr ""
-#: src/ui/gui/psppire.glade:738
+#: src/ui/gui/psppire.glade:725
msgid "Sort by:"
msgstr ""
-#: src/ui/gui/psppire.glade:791
+#: src/ui/gui/psppire.glade:778
msgid "Ascending"
msgstr ""
-#: src/ui/gui/psppire.glade:801
+#: src/ui/gui/psppire.glade:788
msgid "Descending"
msgstr ""
-#: src/ui/gui/psppire.glade:817
+#: src/ui/gui/psppire.glade:804
msgid "Sort Order"
msgstr ""
-#: src/ui/gui/psppire.glade:886
+#: src/ui/gui/psppire.glade:873
msgid "Target Variable:"
msgstr ""
-#: src/ui/gui/psppire.glade:917
+#: src/ui/gui/psppire.glade:904
msgid "Type & Label"
msgstr ""
-#: src/ui/gui/psppire.glade:956
+#: src/ui/gui/psppire.glade:943
msgid "="
msgstr ""
-#: src/ui/gui/psppire.glade:1002
+#: src/ui/gui/psppire.glade:989
msgid "Numeric Expressions:"
msgstr ""
-#: src/ui/gui/psppire.glade:1056
+#: src/ui/gui/psppire.glade:1043
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 ""
-#: src/ui/gui/psppire.glade:1236
+#: src/ui/gui/psppire.glade:1223
msgid "All Cases"
msgstr ""
-#: src/ui/gui/psppire.glade:1252
+#: src/ui/gui/psppire.glade:1239
msgid "If condition is satisfied"
msgstr ""
-#: src/ui/gui/psppire.glade:1304
+#: src/ui/gui/psppire.glade:1291
msgid "Random sample of cases"
msgstr ""
-#: src/ui/gui/psppire.glade:1318
+#: src/ui/gui/psppire.glade:1305
msgid "Sample..."
msgstr ""
-#: src/ui/gui/psppire.glade:1356
+#: src/ui/gui/psppire.glade:1343
msgid "Based on time or case range"
msgstr ""
-#: src/ui/gui/psppire.glade:1369
+#: src/ui/gui/psppire.glade:1356
msgid "Range..."
msgstr ""
-#: src/ui/gui/psppire.glade:1407
+#: src/ui/gui/psppire.glade:1394
msgid "Use filter variable"
msgstr ""
-#: src/ui/gui/psppire.glade:1569
+#: src/ui/gui/psppire.glade:1556
msgid "Select"
msgstr ""
-#: src/ui/gui/psppire.glade:1599
+#: src/ui/gui/psppire.glade:1586
msgid "Filtered"
msgstr ""
-#: src/ui/gui/psppire.glade:1609
+#: src/ui/gui/psppire.glade:1596
msgid "Deleted"
msgstr ""
-#: src/ui/gui/psppire.glade:1626
+#: src/ui/gui/psppire.glade:1613
msgid "Unselected Cases Are"
msgstr ""
-#: src/ui/gui/psppire.glade:1691
+#: src/ui/gui/psppire.glade:1678
msgid "Comments:"
msgstr ""
-#: src/ui/gui/psppire.glade:1733
+#: src/ui/gui/psppire.glade:1720
msgid "Display comments in output"
msgstr ""
-#: src/ui/gui/psppire.glade:1747
+#: src/ui/gui/psppire.glade:1734
msgid "Column Number: 0"
msgstr ""
-#: src/ui/gui/psppire.glade:1823
+#: src/ui/gui/psppire.glade:1810
msgid "Variable Information:"
msgstr ""
-#: src/ui/gui/psppire.glade:1849
+#: src/ui/gui/psppire.glade:1836
msgid ""
"\n"
"\n"
@@ -5135,55 +5119,55 @@
"\n"
msgstr ""
-#: src/ui/gui/psppire.glade:1913
+#: src/ui/gui/psppire.glade:1900
msgid "Observation"
msgstr ""
-#: src/ui/gui/psppire.glade:1923
+#: src/ui/gui/psppire.glade:1910
msgid "Last case"
msgstr ""
-#: src/ui/gui/psppire.glade:1936
+#: src/ui/gui/psppire.glade:1923
msgid "First case"
msgstr ""
-#: src/ui/gui/psppire.glade:2094
+#: src/ui/gui/psppire.glade:2081
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 ""
-#: src/ui/gui/psppire.glade:2287
+#: src/ui/gui/psppire.glade:2274
msgid "Goto Case Number:"
msgstr ""
-#: src/ui/gui/psppire.glade:2423
+#: src/ui/gui/psppire.glade:2410
msgid "Sample Size"
msgstr ""
-#: src/ui/gui/psppire.glade:2526
+#: src/ui/gui/psppire.glade:2513
msgid "Variable:"
msgstr ""
-#: src/ui/gui/psppire.glade:2583
+#: src/ui/gui/psppire.glade:2570
msgid "Search value labels"
msgstr ""
-#: src/ui/gui/psppire.glade:2606
+#: src/ui/gui/psppire.glade:2593
msgid "Regular expression Match"
msgstr ""
-#: src/ui/gui/psppire.glade:2616
+#: src/ui/gui/psppire.glade:2603
msgid "Search substrings"
msgstr ""
-#: src/ui/gui/psppire.glade:2628
+#: src/ui/gui/psppire.glade:2615
msgid "Wrap around"
msgstr ""
-#: src/ui/gui/psppire.glade:2640
+#: src/ui/gui/psppire.glade:2627
msgid "Search backward"
msgstr ""
Index: src/math/interaction.c
===================================================================
RCS file: /sources/pspp/pspp/src/math/interaction.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/math/interaction.c 7 Jul 2007 06:14:23 -0000 1.4
+++ src/math/interaction.c 4 Oct 2007 02:41:53 -0000 1.5
@@ -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.
*/
+
+#include <config.h>
#include <assert.h>
#include <libpspp/alloc.h>
#include <gsl/gsl_math.h>
Index: src/ui/gui/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- src/ui/gui/ChangeLog 25 Sep 2007 23:59:40 -0000 1.91
+++ src/ui/gui/ChangeLog 4 Oct 2007 02:41:53 -0000 1.92
@@ -1,3 +1,14 @@
+2007-10-04 John Darrington <address@hidden>
+
+ * 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 <address@hidden>
* output-viewer.c output-viewer.h psppire.c: (closes patch #6210)
Index: src/ui/gui/about.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/about.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/ui/gui/about.c 7 Jul 2007 06:14:26 -0000 1.9
+++ src/ui/gui/about.c 4 Oct 2007 02:41:54 -0000 1.10
@@ -20,10 +20,12 @@
#include <gtk/gtk.h>
#include <glade/glade.h>
+#include <libpspp/copyleft.h>
#include <libpspp/version.h>
#include "about.h"
#include "helper.h"
+
const static gchar *artists[] = { "Patrick Brunier", "Dondi Bogusky", NULL};
void
@@ -55,6 +57,10 @@
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);
Index: src/ui/gui/compute-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/compute-dialog.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/ui/gui/compute-dialog.c 29 Jul 2007 07:56:53 -0000 1.9
+++ src/ui/gui/compute-dialog.c 4 Oct 2007 02:41:54 -0000 1.10
@@ -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/>. */
-
+#include <config.h>
#include <gtk/gtk.h>
#include "compute-dialog.h"
#include "helper.h"
Index: src/ui/gui/goto-case-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/goto-case-dialog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/ui/gui/goto-case-dialog.c 8 Jul 2007 02:39:10 -0000 1.1
+++ src/ui/gui/goto-case-dialog.c 4 Oct 2007 02:41:54 -0000 1.2
@@ -15,6 +15,7 @@
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"
Index: src/ui/gui/main.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/ui/gui/main.c 12 Jul 2007 06:33:51 -0000 1.4
+++ src/ui/gui/main.c 4 Oct 2007 02:41:54 -0000 1.5
@@ -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/>. */
+#include <config.h>
#include <gtk/gtk.h>
#include "psppire.h"
#include "progname.h"
Index: src/ui/gui/psppire-buttonbox.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-buttonbox.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/ui/gui/psppire-buttonbox.c 7 Jul 2007 09:23:53 -0000 1.8
+++ src/ui/gui/psppire-buttonbox.c 4 Oct 2007 02:41:54 -0000 1.9
@@ -257,7 +257,7 @@
- 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]);
@@ -270,7 +270,7 @@
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]);
Index: src/ui/gui/psppire-keypad.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-keypad.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/ui/gui/psppire-keypad.c 7 Jul 2007 06:14:29 -0000 1.3
+++ src/ui/gui/psppire-keypad.c 4 Oct 2007 02:41:54 -0000 1.4
@@ -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/>. */
+#include <config.h>
#include <gtk/gtksignal.h>
#include <gtk/gtktable.h>
#include <gtk/gtkbutton.h>
Index: src/ui/gui/psppire.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- src/ui/gui/psppire.c 28 Sep 2007 04:25:15 -0000 1.53
+++ src/ui/gui/psppire.c 4 Oct 2007 02:41:54 -0000 1.54
@@ -68,6 +68,10 @@
psppire_data_store_set_case_file (the_data_store, pcf);
}
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+
void
initialize (void)
{
@@ -79,7 +83,6 @@
bindtextdomain (PACKAGE, locale_dir);
- textdomain (PACKAGE);
glade_init ();
@@ -120,6 +123,7 @@
unlink (OUTPUT_FILE_NAME);
journal_enable ();
+ textdomain (PACKAGE);
new_data_window (NULL, NULL);
}
@@ -135,6 +139,7 @@
}
+
struct icon_info
{
const char *file_name;
@@ -184,6 +189,19 @@
}
}
+
+ {
+ /* 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);
}
Index: src/ui/gui/psppire.glade
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire.glade,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/ui/gui/psppire.glade 15 Sep 2007 02:48:03 -0000 1.28
+++ src/ui/gui/psppire.glade 4 Oct 2007 02:41:54 -0000 1.29
@@ -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="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 <http://www.gnu.org/licenses/>.
-</property>
<property name="authors"></property>
<property name="logo">pspplogo.png</property>
<child internal-child="vbox">
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp po/de.po po/en_GB.po po/pspp.pot src/math/...,
John Darrington <=