Remove unnecessary gpointer variable from gsheet-row-iface

diff --git a/lib/gtksheet/ChangeLog b/lib/gtksheet/ChangeLog
index 38141b97ea3a2428fb3ceb842cc03593bcd2f9be..8e92297996b1891671b8bad65be2985d9a0e9af6 100644 (file)
--- a/lib/gtksheet/ChangeLog
+++ b/lib/gtksheet/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-06 John Darrington <john@darrington.wattle.id.au>
+
+       * gsheet-row-iface.c gsheet-row-iface.h: Delete unused, unneccesary
+       gpointer variable from the interface.
+
+       * gtksheet.c: Update to match new gsheet-row-iface
+
 2008-02-27 John Darrington <john@darrington.wattle.id.au>
        * gtksheet.c gtksheet.h: Corrected some leaks and other problems
        related to de-allocating the sheet.

diff --git a/lib/gtksheet/gsheet-row-iface.c b/lib/gtksheet/gsheet-row-iface.c
index 44afc0aaec9541a284e7c8332374d63a1aca48f9..b56bfddef9f34401d72327f61691f81d1f58d2fb 100644 (file)
--- a/lib/gtksheet/gsheet-row-iface.c
+++ b/lib/gtksheet/gsheet-row-iface.c
@@ -105,60 +105,59 @@ g_sheet_row_base_init (gpointer g_class)
 
 void
 g_sheet_row_set_height (GSheetRow *row_geo,
-                               glong row, gint size, gpointer data)
+                       glong row, gint size)
 {
   g_return_if_fail (G_IS_SHEET_ROW (row_geo));
 
   if ((G_SHEET_ROW_GET_IFACE (row_geo)->set_height) )
     (G_SHEET_ROW_GET_IFACE (row_geo)->set_height) (row_geo, row,
-                                                       size, data);
+                                                       size);
 }
 
 
 gint
 g_sheet_row_get_height     (const GSheetRow *row_geo,
-                                   glong row, gpointer data)
+                           glong row)
 {
   g_return_val_if_fail (G_IS_SHEET_ROW (row_geo), -1);
 
   g_assert (G_SHEET_ROW_GET_IFACE (row_geo)->get_height);
 
-  return (G_SHEET_ROW_GET_IFACE (row_geo)->get_height) (row_geo, row,
-                                                            data);
+  return (G_SHEET_ROW_GET_IFACE (row_geo)->get_height) (row_geo, row);
 }
 
 
 
 gboolean
 g_sheet_row_get_visibility(const GSheetRow *row_geo,
-                                           glong row, gpointer data)
+                          glong row)
 {
   g_return_val_if_fail (G_IS_SHEET_ROW (row_geo), FALSE);
 
   g_assert (G_SHEET_ROW_GET_IFACE (row_geo)->get_visibility);
 
   return (G_SHEET_ROW_GET_IFACE (row_geo)->get_visibility) (row_geo,
-                                                                 row, data);
+                                                                 row);
 
 }
 
 gboolean
 g_sheet_row_get_sensitivity(const GSheetRow *row_geo,
-                                            glong row, gpointer data)
+                           glong row)
 {
   g_return_val_if_fail (G_IS_SHEET_ROW (row_geo), FALSE);
 
   g_assert (G_SHEET_ROW_GET_IFACE (row_geo)->get_sensitivity);
 
   return (G_SHEET_ROW_GET_IFACE (row_geo)->get_sensitivity) (row_geo,
-                                                                  row, data);
+                                                            row);
 
 }
 
 
 GtkSheetButton *
 g_sheet_row_get_button(const GSheetRow *row_geo,
-                             glong row, gpointer data)
+                      glong row)
 {
   GtkSheetButton *button  = gtk_sheet_button_new();
 
@@ -167,7 +166,7 @@ g_sheet_row_get_button(const GSheetRow *row_geo,
   g_return_val_if_fail (G_IS_SHEET_ROW (row_geo), FALSE);
 
   if ( iface->get_button_label)
-    button->label = iface->get_button_label(row_geo, row, data);
+    button->label = iface->get_button_label(row_geo, row);
 
   return button;
 }
@@ -187,13 +186,13 @@ g_sheet_row_get_subtitle (const GSheetRow *row_geo, glong row)
 
 
 glong
-g_sheet_row_get_row_count (const GSheetRow *geo, gpointer data)
+g_sheet_row_get_row_count (const GSheetRow *geo)
 {
   g_return_val_if_fail (G_IS_SHEET_ROW (geo), -1);
 
   g_assert  ( G_SHEET_ROW_GET_IFACE (geo)->get_row_count);
 
-  return (G_SHEET_ROW_GET_IFACE (geo)->get_row_count) (geo, data);
+  return (G_SHEET_ROW_GET_IFACE (geo)->get_row_count) (geo);
 }
 
 /**
@@ -210,7 +209,7 @@ g_sheet_row_get_row_count (const GSheetRow *geo, gpointer data)
  */
 
 gint
-g_sheet_row_start_pixel(const GSheetRow *geo, glong row, gpointer data)
+g_sheet_row_start_pixel(const GSheetRow *geo, glong row)
 {
   gint i;
   gint start_pixel = 0;
@@ -218,15 +217,15 @@ g_sheet_row_start_pixel(const GSheetRow *geo, glong row, gpointer data)
   g_return_val_if_fail (G_IS_SHEET_ROW (geo), -1);
   g_return_val_if_fail (row >= 0, -1);
   g_return_val_if_fail (row <
-                       g_sheet_row_get_row_count(geo, data),-1);
+                       g_sheet_row_get_row_count(geo),-1);
 
   if ( G_SHEET_ROW_GET_IFACE(geo)->top_ypixel)
-    return (G_SHEET_ROW_GET_IFACE(geo)->top_ypixel)(geo, row, data);
+    return (G_SHEET_ROW_GET_IFACE(geo)->top_ypixel)(geo, row);
 
   for ( i = 0 ; i < row ; ++i )
     {
-      if ( g_sheet_row_get_visibility(geo, i, data))
-       start_pixel += g_sheet_row_get_height(geo, i, data);
+      if ( g_sheet_row_get_visibility(geo, i))
+       start_pixel += g_sheet_row_get_height(geo, i);
     }
 
   return start_pixel;
@@ -234,30 +233,29 @@ g_sheet_row_start_pixel(const GSheetRow *geo, glong row, gpointer data)
 
 
 glong
-g_sheet_row_pixel_to_row (const GSheetRow *geo, gint pixel,
-                        gpointer data)
+g_sheet_row_pixel_to_row (const GSheetRow *geo, gint pixel)
 {
   gint i, cy;
   g_return_val_if_fail (G_IS_SHEET_ROW (geo), -1);
   g_return_val_if_fail (pixel >= 0, -1) ;
 
   if ( G_SHEET_ROW_GET_IFACE(geo)->pixel_to_row)
-    return (G_SHEET_ROW_GET_IFACE(geo)->pixel_to_row)(geo, pixel, data);
+    return (G_SHEET_ROW_GET_IFACE(geo)->pixel_to_row)(geo, pixel);
 
   cy = 0;
-  for (i = 0; i < g_sheet_row_get_row_count(geo, data); ++i )
+  for (i = 0; i < g_sheet_row_get_row_count (geo); ++i )
     {
       if (pixel >= cy  &&
-         pixel <= (cy + g_sheet_row_get_height(geo, i, data)) &&
-         g_sheet_row_get_visibility(geo, i, data))
+         pixel <= (cy + g_sheet_row_get_height (geo, i)) &&
+         g_sheet_row_get_visibility (geo, i))
        return i;
 
-      if(g_sheet_row_get_visibility(geo, i, data))
-       cy += g_sheet_row_get_height(geo, i, data);
+      if(g_sheet_row_get_visibility (geo, i))
+       cy += g_sheet_row_get_height (geo, i);
     }
 
   /* no match */
-  return g_sheet_row_get_row_count(geo, data) - 1;
+  return g_sheet_row_get_row_count (geo) - 1;
 }
 
 

diff --git a/lib/gtksheet/gsheet-row-iface.h b/lib/gtksheet/gsheet-row-iface.h
index ea08d540f404d6e6e961cfb4e992ea7eba564a8a..921f3699782e02c4663a8890fce51a38cff896dd 100644 (file)
--- a/lib/gtksheet/gsheet-row-iface.h
+++ b/lib/gtksheet/gsheet-row-iface.h
@@ -50,38 +50,31 @@ struct _GSheetRowIface
                                      glong row, glong n_rows);
 
   /* Virtual Table */
-  gint (* get_height) (const GSheetRow *grow, glong row, gpointer);
-  void (* set_height) (GSheetRow *grow, glong row, gint height,
-                      gpointer);
+  gint (* get_height) (const GSheetRow *grow, glong row);
+  void (* set_height) (GSheetRow *grow, glong row, gint height);
 
-  gboolean (* get_visibility) (const GSheetRow *grow, glong row,
-                              gpointer);
+  gboolean (* get_visibility) (const GSheetRow *grow, glong row);
 
-  gboolean (* get_sensitivity) (const GSheetRow *grow, glong row,
-                               gpointer);
+  gboolean (* get_sensitivity) (const GSheetRow *grow, glong row);
 
-  const GtkSheetButton * (* get_button) (const GSheetRow *grow, glong row,
-                                        gpointer);
+  const GtkSheetButton * (* get_button) (const GSheetRow *grow, glong row);
 
-  glong  (* get_row_count) (const GSheetRow *geo, gpointer);
+  glong  (* get_row_count) (const GSheetRow *geo);
 
+  GtkStateType  (*get_button_state) (const GSheetRow *geo, glong row);
 
-  GtkStateType  (*get_button_state) (const GSheetRow *geo, glong row,
-                                   gpointer);
-
-  gchar * (*get_button_label) (const GSheetRow *geo, glong row,
-                             gpointer);
+  gchar * (*get_button_label) (const GSheetRow *geo, glong row);
 
   gchar * (*get_subtitle) (const GSheetRow *geo, glong row);
 
-  gboolean      (*get_button_visibility) (const GSheetRow *geo,
-                                       glong row, gpointer);
+  gboolean  (*get_button_visibility) (const GSheetRow *geo,
+                                         glong row);
 
   const GtkSheetChild * (*get_button_child) (const GSheetRow *geo,
-                                          glong row, gpointer);
+                                            glong row);
 
-  guint (*top_ypixel) (const GSheetRow *geo, glong row, gpointer);
-  glong (*pixel_to_row) (const GSheetRow *geo, guint pixel, gpointer);
+  guint (*top_ypixel) (const GSheetRow *geo, glong row);
+  glong (*pixel_to_row) (const GSheetRow *geo, guint pixel);
 };
 
 
@@ -89,33 +82,32 @@ GType g_sheet_row_get_type   (void) G_GNUC_CONST;
 
 
 gint  g_sheet_row_get_height (const GSheetRow *grow,
-                                       glong row, gpointer);
+                             glong row);
 
 
 void  g_sheet_row_set_height (GSheetRow *grow,
-                                       glong row, gint size, gpointer);
+                             glong row, gint size);
 
 
 gboolean  g_sheet_row_get_visibility (const GSheetRow *grow,
-                                           glong row, gpointer);
+                                     glong row);
 
 gboolean  g_sheet_row_get_sensitivity (const GSheetRow *grow,
-                                            glong row, gpointer);
+                                      glong row);
 
 
 GtkSheetButton *g_sheet_row_get_button (const GSheetRow *grow,
-                                            glong row, gpointer);
+                                       glong row);
 
 
-glong  g_sheet_row_get_row_count (const GSheetRow *geo, gpointer);
+glong  g_sheet_row_get_row_count (const GSheetRow *geo);
 
 /* Return the top pixel of row ROW */
-gint  g_sheet_row_start_pixel (const GSheetRow *geo, glong row,
-                             gpointer);
+gint  g_sheet_row_start_pixel (const GSheetRow *geo, glong row);
+
 
 /* Return the row contained by pixel PIXEL */
-glong  g_sheet_row_pixel_to_row (const GSheetRow *geo, gint pixel,
-                              gpointer);
+glong  g_sheet_row_pixel_to_row (const GSheetRow *geo, gint pixel);
 
 
 void g_sheet_row_rows_deleted (GSheetRow *geo,

diff --git a/lib/gtksheet/gtksheet.c b/lib/gtksheet/gtksheet.c
index 3a6da7ecb3af10fbd63c62787fa12d4dc6c921a8..1118555df32e10b5acf3c5d9bd845a1b7753d4fb 100644 (file)
--- a/lib/gtksheet/gtksheet.c
+++ b/lib/gtksheet/gtksheet.c
@@ -202,7 +202,7 @@ yyy_row_is_visible (const GtkSheet *sheet, gint row)
 {
   GSheetRow *row_geo = sheet->row_geometry;
 
-  return g_sheet_row_get_visibility (row_geo, row, 0);
+  return g_sheet_row_get_visibility (row_geo, row);
 }
 
 
@@ -211,7 +211,7 @@ yyy_row_is_sensitive (const GtkSheet *sheet, gint row)
 {
   GSheetRow *row_geo = sheet->row_geometry;
 
-  return g_sheet_row_get_sensitivity (row_geo, row, 0);
+  return g_sheet_row_get_sensitivity (row_geo, row);
 }
 
 
@@ -221,7 +221,7 @@ yyy_row_count (const GtkSheet *sheet)
 {
   GSheetRow *row_geo = sheet->row_geometry;
 
-  return g_sheet_row_get_row_count (row_geo, 0);
+  return g_sheet_row_get_row_count (row_geo);
 }
 
 static inline gint
@@ -229,7 +229,7 @@ yyy_row_height (const GtkSheet *sheet, gint row)
 {
   GSheetRow *row_geo = sheet->row_geometry;
 
-  return g_sheet_row_get_height (row_geo, row, 0);
+  return g_sheet_row_get_height (row_geo, row);
 }
 
 static gint
@@ -237,7 +237,7 @@ yyy_row_top_ypixel (const GtkSheet *sheet, gint row)
 {
   GSheetRow *geo = sheet->row_geometry;
 
-  gint y = g_sheet_row_start_pixel (geo, row, 0);
+  gint y = g_sheet_row_start_pixel (geo, row);
 
   if ( sheet->column_titles_visible )
     y += sheet->column_title_area.height;
@@ -259,7 +259,7 @@ yyy_row_ypixel_to_row (const GtkSheet *sheet, gint y)
 
   if (y < cy) return 0;
 
-  return g_sheet_row_pixel_to_row (geo, y - cy, 0);
+  return g_sheet_row_pixel_to_row (geo, y - cy);
 }
 
 
@@ -434,7 +434,7 @@ yyy_row_button (GtkSheet *sheet, gint row)
 {
   GSheetRow *row_geo = sheet->row_geometry;
 
-  return g_sheet_row_get_button (row_geo, row, sheet);
+  return g_sheet_row_get_button (row_geo, row);
 }
 
 
@@ -444,7 +444,7 @@ static inline void
 yyy_set_row_height (GtkSheet *sheet, gint row, gint height)
 {
   if ( sheet->row_geometry )
-    g_sheet_row_set_height (sheet->row_geometry, row, height, sheet);
+    g_sheet_row_set_height (sheet->row_geometry, row, height);
 }
 
 
@@ -6693,9 +6693,9 @@ vadjustment_value_changed (GtkAdjustment * adjustment,
   old_value = - sheet->voffset;
 
   new_row = g_sheet_row_pixel_to_row (sheet->row_geometry,
-                                     adjustment->value, sheet);
+                                     adjustment->value);
 
-  y = g_sheet_row_start_pixel (sheet->row_geometry, new_row, sheet);
+  y = g_sheet_row_start_pixel (sheet->row_geometry, new_row);
 
   if (adjustment->value > sheet->old_vadjustment && sheet->old_vadjustment > 0. &&
       yyy_row_height (sheet, row) > sheet->vadjustment->step_increment)

diff --git a/po/de.po b/po/de.po
index 6846cb2f367c57cbb95a5948c630b5ac92c156c2..dc690cd0e4d70d4ba3c7210a395a360935e03444 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"
-"POT-Creation-Date: 2008-03-02 13:03+0900\n"
+"POT-Creation-Date: 2008-03-06 18:35+0900\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"
@@ -47,6 +47,12 @@ msgstr "Tag %d muß zwischen 0 bit 31 sein."
 msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15."
 msgstr ""
 
+#: src/data/casereader-filter.c:221
+msgid ""
+"At least one case in the data read had a weight value that was user-missing, "
+"system-missing, zero, or negative.  These case(s) were ignored."
+msgstr ""
+
 #: src/data/case-tmpfile.c:57
 msgid "failed to create temporary file"
 msgstr ""
@@ -67,12 +73,6 @@ msgstr "plotzlich ist der Datei beendet"
 msgid "writing to temporary file"
 msgstr ""
 
-#: src/data/casereader-filter.c:221
-msgid ""
-"At least one case in the data read had a weight value that was user-missing, "
-"system-missing, zero, or negative.  These case(s) were ignored."
-msgstr ""
-
 #: src/data/data-in.c:257 src/data/data-in.c:447
 msgid "Field contents are not numeric."
 msgstr ""
@@ -320,14 +320,14 @@ msgid "%s variables are not compatible with %s format %s."
 msgstr ""
 
 #: src/data/format.c:327 src/data/sys-file-reader.c:639
-#: src/ui/gui/data-editor.glade:1197 src/ui/gui/psppire-var-store.c:604
-#: src/ui/gui/psppire.glade:2176
+#: src/ui/gui/data-editor.glade:1197 src/ui/gui/psppire.glade:2176
+#: src/ui/gui/psppire-var-store.c:604
 msgid "String"
 msgstr "Zeichenkette"
 
 #: src/data/format.c:327 src/data/sys-file-reader.c:639
-#: src/ui/gui/data-editor.glade:1086 src/ui/gui/psppire-var-store.c:597
-#: src/ui/gui/psppire.glade:2131
+#: src/ui/gui/data-editor.glade:1086 src/ui/gui/psppire.glade:2131
+#: src/ui/gui/psppire-var-store.c:597
 msgid "Numeric"
 msgstr "Nummer"
 
@@ -1427,67 +1427,6 @@ msgstr ""
 msgid "Handle for %s not allowed here."
 msgstr ""
 
-#: src/language/data-io/get-data.c:62
-#, c-format
-msgid "Unsupported TYPE %s"
-msgstr ""
-
-#: src/language/data-io/get-data.c:258
-#, c-format
-msgid ""
-"%s is allowed only with %s arrangement, but %s arrangement was stated or "
-"implied earlier in this command."
-msgstr ""
-
-#: src/language/data-io/get-data.c:313
-msgid "expecting FIXED or DELIMITED"
-msgstr ""
-
-#: src/language/data-io/get-data.c:326
-msgid "Value of FIRSTCASE must be 1 or greater."
-msgstr ""
-
-#: src/language/data-io/get-data.c:351
-msgid "expecting LINE or VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:364
-msgid "Value of FIXCASE must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:384
-msgid "Value of FIRST must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:396
-msgid "Value of PERCENT must be between 1 and 100."
-msgstr ""
-
-#: src/language/data-io/get-data.c:445
-msgid ""
-"In compatible syntax mode, the QUALIFIER string must contain exactly one "
-"character."
-msgstr ""
-
-#: src/language/data-io/get-data.c:460
-msgid "expecting VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:482
-#: src/language/data-io/placement-parser.c:376
-#, c-format
-msgid ""
-"The record number specified, %ld, is at or before the previous record, %d.  "
-"Data fields must be listed in order of increasing record number."
-msgstr ""
-
-#: src/language/data-io/get-data.c:491
-#, c-format
-msgid ""
-"The record number specified, %ld, exceeds the number of records per case "
-"specified on FIXCASE, %d."
-msgstr ""
-
 #: src/language/data-io/get.c:99
 msgid "expecting COMM or TAPE"
 msgstr ""
@@ -1577,6 +1516,67 @@ msgid ""
 "variable in earlier file (%s)."
 msgstr ""
 
+#: src/language/data-io/get-data.c:62
+#, c-format
+msgid "Unsupported TYPE %s"
+msgstr ""
+
+#: src/language/data-io/get-data.c:258
+#, c-format
+msgid ""
+"%s is allowed only with %s arrangement, but %s arrangement was stated or "
+"implied earlier in this command."
+msgstr ""
+
+#: src/language/data-io/get-data.c:313
+msgid "expecting FIXED or DELIMITED"
+msgstr ""
+
+#: src/language/data-io/get-data.c:326
+msgid "Value of FIRSTCASE must be 1 or greater."
+msgstr ""
+
+#: src/language/data-io/get-data.c:351
+msgid "expecting LINE or VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:364
+msgid "Value of FIXCASE must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:384
+msgid "Value of FIRST must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:396
+msgid "Value of PERCENT must be between 1 and 100."
+msgstr ""
+
+#: src/language/data-io/get-data.c:445
+msgid ""
+"In compatible syntax mode, the QUALIFIER string must contain exactly one "
+"character."
+msgstr ""
+
+#: src/language/data-io/get-data.c:460
+msgid "expecting VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:482
+#: src/language/data-io/placement-parser.c:376
+#, c-format
+msgid ""
+"The record number specified, %ld, is at or before the previous record, %d.  "
+"Data fields must be listed in order of increasing record number."
+msgstr ""
+
+#: src/language/data-io/get-data.c:491
+#, c-format
+msgid ""
+"The record number specified, %ld, exceeds the number of records per case "
+"specified on FIXCASE, %d."
+msgstr ""
+
 #: src/language/data-io/inpt-pgm.c:129
 msgid "Unexpected end-of-file within INPUT PROGRAM."
 msgstr ""
@@ -1666,20 +1666,6 @@ msgstr ""
 msgid "The ending column for a field must be greater than the starting column."
 msgstr ""
 
-#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
-#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-
 #: src/language/data-io/print.c:265
 #, c-format
 msgid "Output calls for %d records but %zu specified on RECORDS subcommand."
@@ -1699,6 +1685,20 @@ msgid_plural "Writing %d records."
 msgstr[0] ""
 msgstr[1] ""
 
+#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
+#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+
 #: src/language/dictionary/apply-dictionary.c:75
 #, c-format
 msgid "Variable %s is %s in target file, but %s in source file."
@@ -1884,7 +1884,7 @@ msgstr ""
 #: src/language/dictionary/split-file.c:86
 #: src/language/dictionary/sys-file-info.c:397
 #: src/language/dictionary/sys-file-info.c:564 src/ui/gui/crosstabs.glade:275
-#: src/ui/gui/psppire-var-sheet.c:100 src/ui/gui/psppire.glade:2099
+#: src/ui/gui/psppire.glade:2099 src/ui/gui/psppire-var-sheet.c:100
 msgid "Label"
 msgstr "Kennsatz"
 
@@ -2637,7 +2637,7 @@ msgstr ""
 #: src/language/stats/crosstabs.q:1060 src/language/stats/crosstabs.q:1783
 #: src/language/stats/examine.q:918 src/language/stats/frequencies.q:1137
 #: src/language/stats/oneway.q:306 src/language/stats/oneway.q:476
-#: src/language/stats/regression.q:319 src/ui/gui/crosstabs-dialog.c:60
+#: src/language/stats/regression.q:319 src/ui/gui/crosstabs-dialog.c:59
 msgid "Total"
 msgstr ""
 
@@ -2683,7 +2683,7 @@ msgid "Expected N"
 msgstr ""
 
 #: src/language/stats/chisquare.c:209 src/language/stats/chisquare.c:249
-#: src/language/stats/regression.q:318 src/ui/gui/crosstabs-dialog.c:62
+#: src/language/stats/regression.q:318 src/ui/gui/crosstabs-dialog.c:61
 msgid "Residual"
 msgstr ""
 
@@ -2854,8 +2854,8 @@ msgstr ""
 msgid "Directional measures."
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1221 src/ui/gui/psppire-var-sheet.c:97
-#: src/ui/gui/psppire.glade:2223
+#: src/language/stats/crosstabs.q:1221 src/ui/gui/psppire.glade:2223
+#: src/ui/gui/psppire-var-sheet.c:97
 msgid "Type"
 msgstr "Typ"
 
@@ -2900,7 +2900,7 @@ msgstr ""
 msgid "Measure of Agreement"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2040 src/ui/gui/crosstabs-dialog.c:42
+#: src/language/stats/crosstabs.q:2040 src/ui/gui/crosstabs-dialog.c:41
 msgid "Phi"
 msgstr ""
 
@@ -2920,7 +2920,7 @@ msgstr ""
 msgid "Kendall's tau-c"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2045 src/ui/gui/crosstabs-dialog.c:49
+#: src/language/stats/crosstabs.q:2045 src/ui/gui/crosstabs-dialog.c:48
 msgid "Gamma"
 msgstr ""
 
@@ -2932,7 +2932,7 @@ msgstr ""
 msgid "Pearson's R"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2048 src/ui/gui/crosstabs-dialog.c:51
+#: src/language/stats/crosstabs.q:2048 src/ui/gui/crosstabs-dialog.c:50
 msgid "Kappa"
 msgstr ""
 
@@ -2960,7 +2960,7 @@ msgstr ""
 msgid "Nominal by Interval"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2168 src/ui/gui/crosstabs-dialog.c:44
+#: src/language/stats/crosstabs.q:2168 src/ui/gui/crosstabs-dialog.c:43
 msgid "Lambda"
 msgstr ""
 
@@ -2976,7 +2976,7 @@ msgstr ""
 msgid "Somers' d"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2172 src/ui/gui/crosstabs-dialog.c:52
+#: src/language/stats/crosstabs.q:2172 src/ui/gui/crosstabs-dialog.c:51
 msgid "Eta"
 msgstr ""
 
@@ -2993,8 +2993,8 @@ msgstr ""
 #: src/language/stats/frequencies.q:123 src/language/stats/npar-summary.c:125
 #: src/language/stats/oneway.q:392 src/language/stats/t-test.q:694
 #: src/language/stats/t-test.q:717 src/language/stats/t-test.q:849
-#: src/language/stats/t-test.q:1187 src/ui/gui/descriptives-dialog.c:40
-#: src/ui/gui/frequencies-dialog.c:41
+#: src/language/stats/t-test.q:1187 src/ui/gui/descriptives-dialog.c:39
+#: src/ui/gui/frequencies-dialog.c:40
 msgid "Mean"
 msgstr ""
 
@@ -3007,14 +3007,14 @@ msgid "Std Dev"
 msgstr ""
 
 #: src/language/stats/descriptives.c:105 src/language/stats/examine.q:1636
-#: src/language/stats/frequencies.q:128 src/ui/gui/descriptives-dialog.c:47
-#: src/ui/gui/frequencies-dialog.c:46
+#: src/language/stats/frequencies.q:128 src/ui/gui/descriptives-dialog.c:46
+#: src/ui/gui/frequencies-dialog.c:45
 msgid "Variance"
 msgstr ""
 
 #: src/language/stats/descriptives.c:106 src/language/stats/examine.q:1743
-#: src/language/stats/frequencies.q:129 src/ui/gui/descriptives-dialog.c:48
-#: src/ui/gui/frequencies-dialog.c:51
+#: src/language/stats/frequencies.q:129 src/ui/gui/descriptives-dialog.c:47
+#: src/ui/gui/frequencies-dialog.c:50
 msgid "Kurtosis"
 msgstr ""
 
@@ -3023,8 +3023,8 @@ msgid "S E Kurt"
 msgstr ""
 
 #: src/language/stats/descriptives.c:108 src/language/stats/examine.q:1723
-#: src/language/stats/frequencies.q:131 src/ui/gui/descriptives-dialog.c:49
-#: src/ui/gui/frequencies-dialog.c:47
+#: src/language/stats/frequencies.q:131 src/ui/gui/descriptives-dialog.c:48
+#: src/ui/gui/frequencies-dialog.c:46
 msgid "Skewness"
 msgstr ""
 
@@ -3033,27 +3033,27 @@ msgid "S E Skew"
 msgstr ""
 
 #: src/language/stats/descriptives.c:110 src/language/stats/examine.q:1684
-#: src/language/stats/frequencies.q:133 src/ui/gui/descriptives-dialog.c:44
-#: src/ui/gui/frequencies-dialog.c:49
+#: src/language/stats/frequencies.q:133 src/ui/gui/descriptives-dialog.c:43
+#: src/ui/gui/frequencies-dialog.c:48
 msgid "Range"
 msgstr ""
 
 #: src/language/stats/descriptives.c:111 src/language/stats/examine.q:1661
 #: src/language/stats/frequencies.q:134 src/language/stats/npar-summary.c:131
-#: src/language/stats/oneway.q:404 src/ui/gui/descriptives-dialog.c:42
-#: src/ui/gui/frequencies-dialog.c:43
+#: src/language/stats/oneway.q:404 src/ui/gui/descriptives-dialog.c:41
+#: src/ui/gui/frequencies-dialog.c:42
 msgid "Minimum"
 msgstr ""
 
 #: src/language/stats/descriptives.c:112 src/language/stats/examine.q:1672
 #: src/language/stats/frequencies.q:135 src/language/stats/npar-summary.c:134
-#: src/language/stats/oneway.q:405 src/ui/gui/descriptives-dialog.c:43
-#: src/ui/gui/frequencies-dialog.c:44
+#: src/language/stats/oneway.q:405 src/ui/gui/descriptives-dialog.c:42
+#: src/ui/gui/frequencies-dialog.c:43
 msgid "Maximum"
 msgstr ""
 
 #: src/language/stats/descriptives.c:113 src/language/stats/frequencies.q:136
-#: src/ui/gui/descriptives-dialog.c:45 src/ui/gui/frequencies-dialog.c:54
+#: src/ui/gui/descriptives-dialog.c:44 src/ui/gui/frequencies-dialog.c:53
 msgid "Sum"
 msgstr ""
 
@@ -3161,7 +3161,7 @@ msgid "5%% Trimmed Mean"
 msgstr ""
 
 #: src/language/stats/examine.q:1614 src/language/stats/frequencies.q:125
-#: src/ui/gui/frequencies-dialog.c:53
+#: src/ui/gui/frequencies-dialog.c:52
 msgid "Median"
 msgstr ""
 
@@ -3291,7 +3291,7 @@ msgstr ""
 msgid "S.E. Mean"
 msgstr ""
 
-#: src/language/stats/frequencies.q:126 src/ui/gui/frequencies-dialog.c:50
+#: src/language/stats/frequencies.q:126 src/ui/gui/frequencies-dialog.c:49
 msgid "Mode"
 msgstr ""
 
@@ -3386,22 +3386,6 @@ msgstr ""
 msgid "TABLES subcommand may not appear more than once."
 msgstr ""
 
-#: src/language/stats/npar-summary.c:108
-msgid "Descriptive Statistics"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:145
-msgid "25th"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:148
-msgid "50th (Median)"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:151
-msgid "75th"
-msgstr ""
-
 #: src/language/stats/npar.q:98
 msgid "NPAR subcommand not currently implemented."
 msgstr ""
@@ -3426,6 +3410,22 @@ msgid ""
 "not match the number following (%zu)."
 msgstr ""
 
+#: src/language/stats/npar-summary.c:108
+msgid "Descriptive Statistics"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:145
+msgid "25th"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:148
+msgid "50th (Median)"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:151
+msgid "75th"
+msgstr ""
+
 #: src/language/stats/oneway.q:169
 msgid "Number of contrast coefficients must equal the number of groups"
 msgstr ""
@@ -3574,7 +3574,7 @@ msgstr ""
 msgid "Too many variables in INTO clause."
 msgstr ""
 
-#: src/language/stats/regression.q:167 src/ui/gui/regression-dialog.c:42
+#: src/language/stats/regression.q:167 src/ui/gui/regression-dialog.c:41
 msgid "R"
 msgstr ""
 
@@ -4525,72 +4525,72 @@ msgid ""
 "bad box: (%d+%d=%d,%d+%d=%d)-(%d+%d=%d,%d+%d=%d) in table size (%d,%d)\n"
 msgstr ""
 
-#: src/ui/gui/comments-dialog.c:59
+#: src/ui/gui/comments-dialog.c:58
 #, fuzzy, c-format
 msgid "Column Number: %d"
 msgstr "Spalten"
 
-#: src/ui/gui/crosstabs-dialog.c:41
+#: src/ui/gui/crosstabs-dialog.c:40
 msgid "Chisq"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:43
+#: src/ui/gui/crosstabs-dialog.c:42
 msgid "CC"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:45
+#: src/ui/gui/crosstabs-dialog.c:44
 msgid "UC"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:46
+#: src/ui/gui/crosstabs-dialog.c:45
 msgid "BTau"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:47
+#: src/ui/gui/crosstabs-dialog.c:46
 msgid "CTau"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:48
+#: src/ui/gui/crosstabs-dialog.c:47
 msgid "Risk"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:50
+#: src/ui/gui/crosstabs-dialog.c:49
 msgid "D"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:53
+#: src/ui/gui/crosstabs-dialog.c:52
 msgid "Corr"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:54 src/ui/gui/crosstabs-dialog.c:65
-#: src/ui/gui/crosstabs-dialog.c:100 src/ui/gui/crosstabs-dialog.c:108
+#: src/ui/gui/crosstabs-dialog.c:53 src/ui/gui/crosstabs-dialog.c:64
+#: src/ui/gui/crosstabs-dialog.c:99 src/ui/gui/crosstabs-dialog.c:107
 #: src/ui/gui/psppire-var-store.c:590 src/ui/gui/var-display.c:13
 msgid "None"
 msgstr "Keine"
 
-#: src/ui/gui/crosstabs-dialog.c:57
+#: src/ui/gui/crosstabs-dialog.c:56
 #, fuzzy
 msgid "Count"
 msgstr "Spalten"
 
-#: src/ui/gui/crosstabs-dialog.c:58
+#: src/ui/gui/crosstabs-dialog.c:57
 msgid "Row"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:59
+#: src/ui/gui/crosstabs-dialog.c:58
 #, fuzzy
 msgid "Column"
 msgstr "Spalten"
 
-#: src/ui/gui/crosstabs-dialog.c:61
+#: src/ui/gui/crosstabs-dialog.c:60
 msgid "Expected"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:63
+#: src/ui/gui/crosstabs-dialog.c:62
 msgid "Std. Residual"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:64
+#: src/ui/gui/crosstabs-dialog.c:63
 msgid "Adjusted Std. Residual"
 msgstr ""
 
@@ -4653,335 +4653,335 @@ msgstr ""
 msgid "Style of bevel around the custom entry button"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:150
+#: src/ui/gui/data-editor.c:149
 msgid "Transformations Pending"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:323
+#: src/ui/gui/data-editor.c:322
 #, fuzzy
 msgid "Labels"
 msgstr "Kennsatz"
 
-#: src/ui/gui/data-editor.c:324
+#: src/ui/gui/data-editor.c:323
 msgid "Show/hide value labels"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:342 src/ui/gui/data-editor.c:361
-#: src/ui/gui/data-editor.c:1494 src/ui/gui/data-editor.c:1546
+#: src/ui/gui/data-editor.c:341 src/ui/gui/data-editor.c:360
+#: src/ui/gui/data-editor.c:1492 src/ui/gui/data-editor.c:1544
 msgid "Clear"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:343
+#: src/ui/gui/data-editor.c:342
 msgid "Delete the cases at the selected position(s)"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:362
+#: src/ui/gui/data-editor.c:361
 msgid "Delete the variables at the selected position(s)"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:377 src/ui/gui/data-editor.c:1491
+#: src/ui/gui/data-editor.c:376 src/ui/gui/data-editor.c:1489
 #: src/ui/gui/data-editor.glade:137 src/ui/gui/data-editor.glade:808
 #, fuzzy
 msgid "Insert Variable"
 msgstr "Variableansicht"
 
-#: src/ui/gui/data-editor.c:378
+#: src/ui/gui/data-editor.c:377
 msgid "Create a new variable at the current position"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:396 src/ui/gui/data-editor.c:1543
+#: src/ui/gui/data-editor.c:395 src/ui/gui/data-editor.c:1541
 #: src/ui/gui/data-editor.glade:796
 #, fuzzy
 msgid "Insert Case"
 msgstr "_Stecken"
 
-#: src/ui/gui/data-editor.c:397
+#: src/ui/gui/data-editor.c:396
 msgid "Create a new case at the current position"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:417
+#: src/ui/gui/data-editor.c:416
 #, fuzzy
 msgid "Goto Case"
 msgstr "_Stecken"
 
-#: src/ui/gui/data-editor.c:418
+#: src/ui/gui/data-editor.c:417
 msgid "Jump to a Case in the Data Sheet"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:437
+#: src/ui/gui/data-editor.c:436
 #, fuzzy
 msgid "Weights"
 msgstr "Rechts"
 
-#: src/ui/gui/data-editor.c:438
+#: src/ui/gui/data-editor.c:437
 msgid "Weight cases by variable"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:447 src/ui/gui/data-editor.glade:312
+#: src/ui/gui/data-editor.c:446 src/ui/gui/data-editor.glade:312
 msgid "Transpose"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:448
+#: src/ui/gui/data-editor.c:447
 msgid "Transpose the cases with the variables"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:459
+#: src/ui/gui/data-editor.c:458
 #, fuzzy
 msgid "Split"
 msgstr "Alle Datei"
 
-#: src/ui/gui/data-editor.c:460
+#: src/ui/gui/data-editor.c:459
 msgid "Split the active file"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:470
+#: src/ui/gui/data-editor.c:469
 msgid "Sort"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:471
+#: src/ui/gui/data-editor.c:470
 msgid "Sort cases in the active file"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:479 src/ui/gui/data-editor.glade:347
+#: src/ui/gui/data-editor.c:478 src/ui/gui/data-editor.glade:347
 #: src/ui/gui/data-editor.glade:851
 msgid "Select Cases"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:480
+#: src/ui/gui/data-editor.c:479
 msgid "Select cases from the active file"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:489
+#: src/ui/gui/data-editor.c:488
 msgid "Compute"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:490
+#: src/ui/gui/data-editor.c:489
 #, fuzzy
 msgid "Compute new values for a variable"
 msgstr "Unpassend Wert für Variable"
 
-#: src/ui/gui/data-editor.c:498
+#: src/ui/gui/data-editor.c:497
 msgid "Oneway _ANOVA"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:499
+#: src/ui/gui/data-editor.c:498
 msgid "Perform one way analysis of variance"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:507 src/ui/gui/data-editor.glade:503
+#: src/ui/gui/data-editor.c:506 src/ui/gui/data-editor.glade:503
 msgid "_Independent Samples T Test"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:508
+#: src/ui/gui/data-editor.c:507
 msgid "Calculate T Test for samples from independent groups"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:517 src/ui/gui/data-editor.glade:511
+#: src/ui/gui/data-editor.c:516 src/ui/gui/data-editor.glade:511
 msgid "_Paired Samples T Test"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:518
+#: src/ui/gui/data-editor.c:517
 msgid "Calculate T Test for paired samples"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:527
+#: src/ui/gui/data-editor.c:526
 msgid "One _Sample T Test"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:528
+#: src/ui/gui/data-editor.c:527
 msgid "Calculate T Test for sample from a single distribution"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:537
+#: src/ui/gui/data-editor.c:536
 #, fuzzy
 msgid "Data File Comments"
 msgstr "Datei Fehler"
 
-#: src/ui/gui/data-editor.c:538
+#: src/ui/gui/data-editor.c:537
 msgid "Commentary text for the data file"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:546 src/ui/gui/data-editor.glade:776
+#: src/ui/gui/data-editor.c:545 src/ui/gui/data-editor.glade:776
 msgid "Find"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:547
+#: src/ui/gui/data-editor.c:546
 #, fuzzy
 msgid "Find Case"
 msgstr "_Stecken"
 
-#: src/ui/gui/data-editor.c:556 src/ui/gui/data-editor.glade:384
+#: src/ui/gui/data-editor.c:555 src/ui/gui/data-editor.glade:384
 #, fuzzy
 msgid "Ran_k Cases"
 msgstr "_Stecken"
 
-#: src/ui/gui/data-editor.c:557
+#: src/ui/gui/data-editor.c:556
 #, fuzzy
 msgid "Rank Cases"
 msgstr "_Stecken"
 
-#: src/ui/gui/data-editor.c:566 src/ui/gui/data-editor.glade:396
+#: src/ui/gui/data-editor.c:565 src/ui/gui/data-editor.glade:396
 #, fuzzy
 msgid "Recode into _Same Variables"
 msgstr "Variableansicht"
 
-#: src/ui/gui/data-editor.c:567
+#: src/ui/gui/data-editor.c:566
 #, fuzzy
 msgid "Recode values into the same Variables"
 msgstr "Unpassend Wert für Variable"
 
-#: src/ui/gui/data-editor.c:576 src/ui/gui/data-editor.glade:403
+#: src/ui/gui/data-editor.c:575 src/ui/gui/data-editor.glade:403
 msgid "Recode into _Different Variables"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:577
+#: src/ui/gui/data-editor.c:576
 msgid "Recode values into different Variables"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:586 src/ui/gui/data-editor.glade:286
+#: src/ui/gui/data-editor.c:585 src/ui/gui/data-editor.glade:286
 #: src/ui/gui/data-editor.glade:755
 msgid "Variables"
 msgstr "Variableansicht"
 
-#: src/ui/gui/data-editor.c:587
+#: src/ui/gui/data-editor.c:586
 #, fuzzy
 msgid "Jump to Variable"
 msgstr "Variableansicht"
 
-#: src/ui/gui/data-editor.c:595 src/ui/gui/data-editor.glade:457
+#: src/ui/gui/data-editor.c:594 src/ui/gui/data-editor.glade:457
 #: src/ui/gui/oneway.glade:179
 msgid "_Descriptives"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:596
+#: src/ui/gui/data-editor.c:595
 msgid "Calculate descriptive statistics (mean, variance, ...)"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:605 src/ui/gui/data-editor.glade:449
+#: src/ui/gui/data-editor.c:604 src/ui/gui/data-editor.glade:449
 #, fuzzy
 msgid "_Frequencies"
 msgstr "Variableansicht"
 
-#: src/ui/gui/data-editor.c:606
+#: src/ui/gui/data-editor.c:605
 msgid "Generate frequency statistics"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:614 src/ui/gui/data-editor.glade:473
+#: src/ui/gui/data-editor.c:613 src/ui/gui/data-editor.glade:473
 msgid "_Crosstabs"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:615
+#: src/ui/gui/data-editor.c:614
 msgid "Generate crosstabulations"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:624 src/ui/gui/data-editor.glade:465
+#: src/ui/gui/data-editor.c:623 src/ui/gui/data-editor.glade:465
 msgid "_Explore"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:625
+#: src/ui/gui/data-editor.c:624
 msgid "Examine Data by Factors"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:634 src/ui/gui/data-editor.glade:539
+#: src/ui/gui/data-editor.c:633 src/ui/gui/data-editor.glade:539
 msgid "Linear _Regression"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:635
+#: src/ui/gui/data-editor.c:634
 msgid "Estimate parameters of the linear model"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1022
+#: src/ui/gui/data-editor.c:1021
 msgid "Font Selection"
 msgstr "Schriftwahlung"
 
-#: src/ui/gui/data-editor.c:1094
+#: src/ui/gui/data-editor.c:1093
 msgid "No Split"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1103
+#: src/ui/gui/data-editor.c:1102
 #, fuzzy
 msgid "Split by "
 msgstr "Alle Datei"
 
-#: src/ui/gui/data-editor.c:1128
+#: src/ui/gui/data-editor.c:1127
 msgid "Filter off"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1140
+#: src/ui/gui/data-editor.c:1139
 #, c-format
 msgid "Filter by %s"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1158
+#: src/ui/gui/data-editor.c:1157
 msgid "Weights off"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1170
+#: src/ui/gui/data-editor.c:1169
 #, c-format
 msgid "Weight by %s"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1193 src/ui/gui/data-editor.c:1427
+#: src/ui/gui/data-editor.c:1192 src/ui/gui/data-editor.c:1425
 #: src/ui/gui/data-editor.glade:667
 msgid "Open"
 msgstr "Öffen"
 
-#: src/ui/gui/data-editor.c:1194
+#: src/ui/gui/data-editor.c:1193
 msgid "Open a data file"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1202 src/ui/gui/data-editor.c:1309
+#: src/ui/gui/data-editor.c:1201 src/ui/gui/data-editor.c:1308
 #: src/ui/gui/data-editor.glade:677
 msgid "Save"
 msgstr "Speichen"
 
-#: src/ui/gui/data-editor.c:1203 src/ui/gui/data-editor.c:1213
+#: src/ui/gui/data-editor.c:1202 src/ui/gui/data-editor.c:1212
 #, fuzzy
 msgid "Save data to file"
 msgstr "Speichern unter"
 
-#: src/ui/gui/data-editor.c:1212
+#: src/ui/gui/data-editor.c:1211
 #, fuzzy
 msgid "Save As"
 msgstr "Speichern unter"
 
-#: src/ui/gui/data-editor.c:1221 src/ui/gui/recode-dialog.c:929
-#: src/ui/gui/recode-dialog.c:1024
+#: src/ui/gui/data-editor.c:1220 src/ui/gui/recode-dialog.c:928
+#: src/ui/gui/recode-dialog.c:1023
 msgid "New"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1222
+#: src/ui/gui/data-editor.c:1221
 msgid "New data file"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1317 src/ui/gui/data-editor.c:1435
+#: src/ui/gui/data-editor.c:1316 src/ui/gui/data-editor.c:1433
 msgid "System Files (*.sav)"
 msgstr "Systemedatein (*.sav)"
 
-#: src/ui/gui/data-editor.c:1323 src/ui/gui/data-editor.c:1441
+#: src/ui/gui/data-editor.c:1322 src/ui/gui/data-editor.c:1439
 msgid "Portable Files (*.por) "
 msgstr "Tragbardatein (*.por)"
 
-#: src/ui/gui/data-editor.c:1329 src/ui/gui/data-editor.c:1447
+#: src/ui/gui/data-editor.c:1328 src/ui/gui/data-editor.c:1445
 #: src/ui/gui/syntax-editor.c:138 src/ui/gui/syntax-editor.c:522
 msgid "All Files"
 msgstr "Alle Datei"
 
-#: src/ui/gui/data-editor.c:1337
+#: src/ui/gui/data-editor.c:1336
 #, fuzzy
 msgid "System File"
 msgstr "Systemedatein (*.sav)"
 
-#: src/ui/gui/data-editor.c:1342
+#: src/ui/gui/data-editor.c:1341
 #, fuzzy
 msgid "Portable File"
 msgstr "Tragbardatein (*.por)"
 
-#: src/ui/gui/data-editor.c:1485
+#: src/ui/gui/data-editor.c:1483
 msgid "Sort Ascending"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1488
+#: src/ui/gui/data-editor.c:1486
 msgid "Sort Descending"
 msgstr ""
 
@@ -5310,11 +5310,11 @@ msgstr "_Kein Lösewerten"
 msgid "_Discrete missing values"
 msgstr "_Diskret Lösewerten"
 
-#: src/ui/gui/descriptives-dialog.c:41 src/ui/gui/frequencies-dialog.c:42
+#: src/ui/gui/descriptives-dialog.c:40 src/ui/gui/frequencies-dialog.c:41
 msgid "Standard deviation"
 msgstr ""
 
-#: src/ui/gui/descriptives-dialog.c:46
+#: src/ui/gui/descriptives-dialog.c:45
 #, fuzzy
 msgid "Standard error"
 msgstr "Skript Fehler"
@@ -5373,22 +5373,22 @@ msgstr ""
 msgid "Repeat values"
 msgstr ""
 
-#: src/ui/gui/find-dialog.c:659
+#: src/ui/gui/find-dialog.c:658
 #, c-format
 msgid "Bad regular expression: %s"
 msgstr ""
 
-#: src/ui/gui/frequencies-dialog.c:45
+#: src/ui/gui/frequencies-dialog.c:44
 #, fuzzy
 msgid "Standard error of the mean"
 msgstr "Skript Fehler"
 
-#: src/ui/gui/frequencies-dialog.c:48
+#: src/ui/gui/frequencies-dialog.c:47
 #, fuzzy
 msgid "Standard error of the skewness"
 msgstr "Skript Fehler"
 
-#: src/ui/gui/frequencies-dialog.c:52
+#: src/ui/gui/frequencies-dialog.c:51
 #, fuzzy
 msgid "Standard error of the kurtosis"
 msgstr "Skript Fehler"
@@ -5523,7 +5523,7 @@ msgstr "Unpassend Wert für Variable"
 msgid "Incorrect range specification"
 msgstr "Falshe Spannweitebeschreibung"
 
-#: src/ui/gui/oneway-anova-dialog.c:336
+#: src/ui/gui/oneway-anova-dialog.c:335
 #, c-format
 msgid "Contrast %d of %d"
 msgstr ""
@@ -5616,6 +5616,15 @@ msgstr "xyzzy"
 msgid "Paste"
 msgstr "Datum"
 
+#: src/ui/gui/psppire.c:195
+msgid "_Reset"
+msgstr "_Zurücksetzen"
+
+#: src/ui/gui/psppire.c:196
+#, fuzzy
+msgid "_Select"
+msgstr "Schriftwahlung"
+
 #: src/ui/gui/psppire-data-editor.c:604
 msgid "Data View"
 msgstr "Datenansicht"
@@ -5633,60 +5642,13 @@ msgstr ""
 msgid "%ld"
 msgstr ""
 
-#: src/ui/gui/psppire-var-sheet.c:96
-msgid "Name"
-msgstr "Name"
-
-#: src/ui/gui/psppire-var-sheet.c:98 src/ui/gui/psppire.glade:2187
-msgid "Width"
-msgstr "Große"
-
-#: src/ui/gui/psppire-var-sheet.c:99
-msgid "Decimals"
-msgstr "Dezimalstellen"
-
-#: src/ui/gui/psppire-var-sheet.c:101
-msgid "Values"
-msgstr "Werten"
-
-#: src/ui/gui/psppire-var-sheet.c:104
-msgid "Align"
-msgstr "Einstellung"
-
-#: src/ui/gui/psppire-var-sheet.c:105
-msgid "Measure"
-msgstr "Messe"
-
-#: src/ui/gui/psppire-var-store.c:600
-msgid "Scientific"
-msgstr "Wissenschäflich"
-
-#: src/ui/gui/psppire-var-store.c:603
-msgid "Custom"
-msgstr "Spezial"
-
-#: src/ui/gui/psppire-var-store.c:674 src/ui/gui/psppire-var-store.c:684
-#: src/ui/gui/psppire-var-store.c:694
-#, c-format
-msgid "%d"
-msgstr ""
-
-#: src/ui/gui/psppire.c:195
-msgid "_Reset"
-msgstr "_Zurücksetzen"
-
-#: src/ui/gui/psppire.c:196
-#, fuzzy
-msgid "_Select"
-msgstr "Schriftwahlung"
-
 #: src/ui/gui/psppire.glade:11
 #, fuzzy
 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:73 src/ui/gui/psppire.glade:154
-#: src/ui/gui/weight-cases-dialog.c:82
+#: src/ui/gui/weight-cases-dialog.c:80
 msgid "Do not weight cases"
 msgstr ""
 
@@ -5876,6 +5838,10 @@ msgstr ""
 msgid "Use expression as label"
 msgstr ""
 
+#: src/ui/gui/psppire.glade:2187 src/ui/gui/psppire-var-sheet.c:98
+msgid "Width"
+msgstr "Große"
+
 #: src/ui/gui/psppire.glade:2274
 msgid "Goto Case Number:"
 msgstr ""
@@ -5911,6 +5877,40 @@ msgstr ""
 msgid "Search backward"
 msgstr ""
 
+#: src/ui/gui/psppire-var-sheet.c:96
+msgid "Name"
+msgstr "Name"
+
+#: src/ui/gui/psppire-var-sheet.c:99
+msgid "Decimals"
+msgstr "Dezimalstellen"
+
+#: src/ui/gui/psppire-var-sheet.c:101
+msgid "Values"
+msgstr "Werten"
+
+#: src/ui/gui/psppire-var-sheet.c:104
+msgid "Align"
+msgstr "Einstellung"
+
+#: src/ui/gui/psppire-var-sheet.c:105
+msgid "Measure"
+msgstr "Messe"
+
+#: src/ui/gui/psppire-var-store.c:600
+msgid "Scientific"
+msgstr "Wissenschäflich"
+
+#: src/ui/gui/psppire-var-store.c:603
+msgid "Custom"
+msgstr "Spezial"
+
+#: src/ui/gui/psppire-var-store.c:674 src/ui/gui/psppire-var-store.c:684
+#: src/ui/gui/psppire-var-store.c:694
+#, c-format
+msgid "%d"
+msgstr ""
+
 #: src/ui/gui/rank.glade:111
 msgid "By:"
 msgstr ""
@@ -6016,26 +6016,26 @@ msgstr ""
 msgid "Rank Assigned to Ties"
 msgstr ""
 
-#: src/ui/gui/recode-dialog.c:880
+#: src/ui/gui/recode-dialog.c:879
 #, fuzzy
 msgid "Recode into Different Variables"
 msgstr "Variableansicht"
 
-#: src/ui/gui/recode-dialog.c:883
+#: src/ui/gui/recode-dialog.c:882
 #, fuzzy
 msgid "Recode into Same Variables"
 msgstr "Variableansicht"
 
-#: src/ui/gui/recode-dialog.c:914 src/ui/gui/recode-dialog.c:1016
+#: src/ui/gui/recode-dialog.c:913 src/ui/gui/recode-dialog.c:1015
 msgid "Old"
 msgstr ""
 
-#: src/ui/gui/recode-dialog.c:1275
+#: src/ui/gui/recode-dialog.c:1274
 #, fuzzy
 msgid "Recode into Different Variables: Old and New Values "
 msgstr "Variableansicht"
 
-#: src/ui/gui/recode-dialog.c:1276
+#: src/ui/gui/recode-dialog.c:1275
 #, fuzzy
 msgid "Recode into Same Variables: Old and New Values"
 msgstr "Variableansicht"
@@ -6131,15 +6131,15 @@ msgstr "Variableansicht"
 msgid "Old and New Values"
 msgstr "Werte:"
 
-#: src/ui/gui/regression-dialog.c:41
+#: src/ui/gui/regression-dialog.c:40
 msgid "Coeff"
 msgstr ""
 
-#: src/ui/gui/regression-dialog.c:43
+#: src/ui/gui/regression-dialog.c:42
 msgid "Anova"
 msgstr ""
 
-#: src/ui/gui/regression-dialog.c:44
+#: src/ui/gui/regression-dialog.c:43
 msgid "Bcov"
 msgstr ""
 
@@ -6167,17 +6167,17 @@ msgstr "Variableansicht"
 msgid "Residuals"
 msgstr ""
 
-#: src/ui/gui/select-cases-dialog.c:85
+#: src/ui/gui/select-cases-dialog.c:84
 #, c-format
 msgid "Approximately %3d%% of all cases."
 msgstr ""
 
-#: src/ui/gui/select-cases-dialog.c:86
+#: src/ui/gui/select-cases-dialog.c:85
 #, c-format
 msgid "Exactly %3d cases from the first %3d cases."
 msgstr "Aus %2$3d beispielen, wahl genau %1$3d daren"
 
-#: src/ui/gui/select-cases-dialog.c:226
+#: src/ui/gui/select-cases-dialog.c:225
 #, c-format
 msgid "%d thru %d"
 msgstr ""
@@ -6226,19 +6226,6 @@ msgstr ""
 msgid "To End"
 msgstr ""
 
-#: src/ui/gui/t-test-options.c:60
-#, c-format
-msgid "Confidence Interval: %2d %%"
-msgstr ""
-
-#: src/ui/gui/t-test-paired-samples.c:229
-msgid "Var 1"
-msgstr ""
-
-#: src/ui/gui/t-test-paired-samples.c:230
-msgid "Var 2"
-msgstr ""
-
 #: src/ui/gui/t-test.glade:56 src/ui/gui/t-test.glade:165
 msgid "Define Groups"
 msgstr ""
@@ -6278,37 +6265,50 @@ msgstr ""
 msgid "Test Value: "
 msgstr "Werte:"
 
-#: src/ui/gui/variable-info-dialog.c:90
+#: src/ui/gui/t-test-options.c:60
+#, c-format
+msgid "Confidence Interval: %2d %%"
+msgstr ""
+
+#: src/ui/gui/t-test-paired-samples.c:228
+msgid "Var 1"
+msgstr ""
+
+#: src/ui/gui/t-test-paired-samples.c:229
+msgid "Var 2"
+msgstr ""
+
+#: src/ui/gui/variable-info-dialog.c:88
 #, fuzzy, c-format
 msgid "Label: %s\n"
 msgstr "Kennsatz:"
 
-#: src/ui/gui/variable-info-dialog.c:99
+#: src/ui/gui/variable-info-dialog.c:97
 #, fuzzy, c-format
 msgid "Type: %s\n"
 msgstr "Typ"
 
-#: src/ui/gui/variable-info-dialog.c:103
+#: src/ui/gui/variable-info-dialog.c:101
 #, fuzzy, c-format
 msgid "Missing Values: %s\n"
 msgstr "Lösewerten"
 
-#: src/ui/gui/variable-info-dialog.c:108
+#: src/ui/gui/variable-info-dialog.c:106
 #, c-format
 msgid "Measurement Level: %s\n"
 msgstr ""
 
-#: src/ui/gui/variable-info-dialog.c:122
+#: src/ui/gui/variable-info-dialog.c:120
 #, fuzzy
 msgid "Value Labels:\n"
 msgstr "Werten"
 
-#: src/ui/gui/variable-info-dialog.c:134
+#: src/ui/gui/variable-info-dialog.c:132
 #, c-format
 msgid "%s %s\n"
 msgstr ""
 
-#: src/ui/gui/weight-cases-dialog.c:88
+#: src/ui/gui/weight-cases-dialog.c:86
 #, c-format
 msgid "Weight cases by %s"
 msgstr ""

diff --git a/po/en_GB.po b/po/en_GB.po
index 24dd322884cbfc3a5bbdee572a98929c44de7f12..70d93da1e6b249dde1ec80ec57bd4b51dd52c7a6 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2008-03-02 13:03+0900\n"
+"POT-Creation-Date: 2008-03-06 18:35+0900\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"
@@ -44,6 +44,12 @@ msgstr ""
 msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15."
 msgstr ""
 
+#: src/data/casereader-filter.c:221
+msgid ""
+"At least one case in the data read had a weight value that was user-missing, "
+"system-missing, zero, or negative.  These case(s) were ignored."
+msgstr ""
+
 #: src/data/case-tmpfile.c:57
 msgid "failed to create temporary file"
 msgstr ""
@@ -64,12 +70,6 @@ msgstr ""
 msgid "writing to temporary file"
 msgstr ""
 
-#: src/data/casereader-filter.c:221
-msgid ""
-"At least one case in the data read had a weight value that was user-missing, "
-"system-missing, zero, or negative.  These case(s) were ignored."
-msgstr ""
-
 #: src/data/data-in.c:257 src/data/data-in.c:447
 msgid "Field contents are not numeric."
 msgstr ""
@@ -315,14 +315,14 @@ msgid "%s variables are not compatible with %s format %s."
 msgstr ""
 
 #: src/data/format.c:327 src/data/sys-file-reader.c:639
-#: src/ui/gui/data-editor.glade:1197 src/ui/gui/psppire-var-store.c:604
-#: src/ui/gui/psppire.glade:2176
+#: src/ui/gui/data-editor.glade:1197 src/ui/gui/psppire.glade:2176
+#: src/ui/gui/psppire-var-store.c:604
 msgid "String"
 msgstr ""
 
 #: src/data/format.c:327 src/data/sys-file-reader.c:639
-#: src/ui/gui/data-editor.glade:1086 src/ui/gui/psppire-var-store.c:597
-#: src/ui/gui/psppire.glade:2131
+#: src/ui/gui/data-editor.glade:1086 src/ui/gui/psppire.glade:2131
+#: src/ui/gui/psppire-var-store.c:597
 msgid "Numeric"
 msgstr ""
 
@@ -1418,67 +1418,6 @@ msgstr ""
 msgid "Handle for %s not allowed here."
 msgstr ""
 
-#: src/language/data-io/get-data.c:62
-#, c-format
-msgid "Unsupported TYPE %s"
-msgstr ""
-
-#: src/language/data-io/get-data.c:258
-#, c-format
-msgid ""
-"%s is allowed only with %s arrangement, but %s arrangement was stated or "
-"implied earlier in this command."
-msgstr ""
-
-#: src/language/data-io/get-data.c:313
-msgid "expecting FIXED or DELIMITED"
-msgstr ""
-
-#: src/language/data-io/get-data.c:326
-msgid "Value of FIRSTCASE must be 1 or greater."
-msgstr ""
-
-#: src/language/data-io/get-data.c:351
-msgid "expecting LINE or VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:364
-msgid "Value of FIXCASE must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:384
-msgid "Value of FIRST must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:396
-msgid "Value of PERCENT must be between 1 and 100."
-msgstr ""
-
-#: src/language/data-io/get-data.c:445
-msgid ""
-"In compatible syntax mode, the QUALIFIER string must contain exactly one "
-"character."
-msgstr ""
-
-#: src/language/data-io/get-data.c:460
-msgid "expecting VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:482
-#: src/language/data-io/placement-parser.c:376
-#, c-format
-msgid ""
-"The record number specified, %ld, is at or before the previous record, %d.  "
-"Data fields must be listed in order of increasing record number."
-msgstr ""
-
-#: src/language/data-io/get-data.c:491
-#, c-format
-msgid ""
-"The record number specified, %ld, exceeds the number of records per case "
-"specified on FIXCASE, %d."
-msgstr ""
-
 #: src/language/data-io/get.c:99
 msgid "expecting COMM or TAPE"
 msgstr ""
@@ -1568,6 +1507,67 @@ msgid ""
 "variable in earlier file (%s)."
 msgstr ""
 
+#: src/language/data-io/get-data.c:62
+#, c-format
+msgid "Unsupported TYPE %s"
+msgstr ""
+
+#: src/language/data-io/get-data.c:258
+#, c-format
+msgid ""
+"%s is allowed only with %s arrangement, but %s arrangement was stated or "
+"implied earlier in this command."
+msgstr ""
+
+#: src/language/data-io/get-data.c:313
+msgid "expecting FIXED or DELIMITED"
+msgstr ""
+
+#: src/language/data-io/get-data.c:326
+msgid "Value of FIRSTCASE must be 1 or greater."
+msgstr ""
+
+#: src/language/data-io/get-data.c:351
+msgid "expecting LINE or VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:364
+msgid "Value of FIXCASE must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:384
+msgid "Value of FIRST must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:396
+msgid "Value of PERCENT must be between 1 and 100."
+msgstr ""
+
+#: src/language/data-io/get-data.c:445
+msgid ""
+"In compatible syntax mode, the QUALIFIER string must contain exactly one "
+"character."
+msgstr ""
+
+#: src/language/data-io/get-data.c:460
+msgid "expecting VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:482
+#: src/language/data-io/placement-parser.c:376
+#, c-format
+msgid ""
+"The record number specified, %ld, is at or before the previous record, %d.  "
+"Data fields must be listed in order of increasing record number."
+msgstr ""
+
+#: src/language/data-io/get-data.c:491
+#, c-format
+msgid ""
+"The record number specified, %ld, exceeds the number of records per case "
+"specified on FIXCASE, %d."
+msgstr ""
+
 #: src/language/data-io/inpt-pgm.c:129
 msgid "Unexpected end-of-file within INPUT PROGRAM."
 msgstr ""
@@ -1657,20 +1657,6 @@ msgstr ""
 msgid "The ending column for a field must be greater than the starting column."
 msgstr ""
 
-#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
-#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-
 #: src/language/data-io/print.c:265
 #, c-format
 msgid "Output calls for %d records but %zu specified on RECORDS subcommand."
@@ -1690,6 +1676,20 @@ msgid_plural "Writing %d records."
 msgstr[0] ""
 msgstr[1] ""
 
+#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
+#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+
 #: src/language/dictionary/apply-dictionary.c:75
 #, c-format
 msgid "Variable %s is %s in target file, but %s in source file."
@@ -1875,7 +1875,7 @@ msgstr ""
 #: src/language/dictionary/split-file.c:86
 #: src/language/dictionary/sys-file-info.c:397
 #: src/language/dictionary/sys-file-info.c:564 src/ui/gui/crosstabs.glade:275
-#: src/ui/gui/psppire-var-sheet.c:100 src/ui/gui/psppire.glade:2099
+#: src/ui/gui/psppire.glade:2099 src/ui/gui/psppire-var-sheet.c:100
 msgid "Label"
 msgstr ""
 
@@ -2628,7 +2628,7 @@ msgstr ""
 #: src/language/stats/crosstabs.q:1060 src/language/stats/crosstabs.q:1783
 #: src/language/stats/examine.q:918 src/language/stats/frequencies.q:1137
 #: src/language/stats/oneway.q:306 src/language/stats/oneway.q:476
-#: src/language/stats/regression.q:319 src/ui/gui/crosstabs-dialog.c:60
+#: src/language/stats/regression.q:319 src/ui/gui/crosstabs-dialog.c:59
 msgid "Total"
 msgstr ""
 
@@ -2674,7 +2674,7 @@ msgid "Expected N"
 msgstr ""
 
 #: src/language/stats/chisquare.c:209 src/language/stats/chisquare.c:249
-#: src/language/stats/regression.q:318 src/ui/gui/crosstabs-dialog.c:62
+#: src/language/stats/regression.q:318 src/ui/gui/crosstabs-dialog.c:61
 msgid "Residual"
 msgstr ""
 
@@ -2845,8 +2845,8 @@ msgstr ""
 msgid "Directional measures."
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1221 src/ui/gui/psppire-var-sheet.c:97
-#: src/ui/gui/psppire.glade:2223
+#: src/language/stats/crosstabs.q:1221 src/ui/gui/psppire.glade:2223
+#: src/ui/gui/psppire-var-sheet.c:97
 msgid "Type"
 msgstr ""
 
@@ -2891,7 +2891,7 @@ msgstr ""
 msgid "Measure of Agreement"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2040 src/ui/gui/crosstabs-dialog.c:42
+#: src/language/stats/crosstabs.q:2040 src/ui/gui/crosstabs-dialog.c:41
 msgid "Phi"
 msgstr ""
 
@@ -2911,7 +2911,7 @@ msgstr ""
 msgid "Kendall's tau-c"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2045 src/ui/gui/crosstabs-dialog.c:49
+#: src/language/stats/crosstabs.q:2045 src/ui/gui/crosstabs-dialog.c:48
 msgid "Gamma"
 msgstr ""
 
@@ -2923,7 +2923,7 @@ msgstr ""
 msgid "Pearson's R"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2048 src/ui/gui/crosstabs-dialog.c:51
+#: src/language/stats/crosstabs.q:2048 src/ui/gui/crosstabs-dialog.c:50
 msgid "Kappa"
 msgstr ""
 
@@ -2951,7 +2951,7 @@ msgstr ""
 msgid "Nominal by Interval"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2168 src/ui/gui/crosstabs-dialog.c:44
+#: src/language/stats/crosstabs.q:2168 src/ui/gui/crosstabs-dialog.c:43
 msgid "Lambda"
 msgstr ""
 
@@ -2967,7 +2967,7 @@ msgstr ""
 msgid "Somers' d"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:2172 src/ui/gui/crosstabs-dialog.c:52
+#: src/language/stats/crosstabs.q:2172 src/ui/gui/crosstabs-dialog.c:51
 msgid "Eta"
 msgstr ""
 
@@ -2984,8 +2984,8 @@ msgstr ""
 #: src/language/stats/frequencies.q:123 src/language/stats/npar-summary.c:125
 #: src/language/stats/oneway.q:392 src/language/stats/t-test.q:694
 #: src/language/stats/t-test.q:717 src/language/stats/t-test.q:849
-#: src/language/stats/t-test.q:1187 src/ui/gui/descriptives-dialog.c:40
-#: src/ui/gui/frequencies-dialog.c:41
+#: src/language/stats/t-test.q:1187 src/ui/gui/descriptives-dialog.c:39
+#: src/ui/gui/frequencies-dialog.c:40
 msgid "Mean"
 msgstr ""
 
@@ -2998,14 +2998,14 @@ msgid "Std Dev"
 msgstr ""
 
 #: src/language/stats/descriptives.c:105 src/language/stats/examine.q:1636
-#: src/language/stats/frequencies.q:128 src/ui/gui/descriptives-dialog.c:47
-#: src/ui/gui/frequencies-dialog.c:46
+#: src/language/stats/frequencies.q:128 src/ui/gui/descriptives-dialog.c:46
+#: src/ui/gui/frequencies-dialog.c:45
 msgid "Variance"
 msgstr ""
 
 #: src/language/stats/descriptives.c:106 src/language/stats/examine.q:1743
-#: src/language/stats/frequencies.q:129 src/ui/gui/descriptives-dialog.c:48
-#: src/ui/gui/frequencies-dialog.c:51
+#: src/language/stats/frequencies.q:129 src/ui/gui/descriptives-dialog.c:47
+#: src/ui/gui/frequencies-dialog.c:50
 msgid "Kurtosis"
 msgstr ""
 
@@ -3014,8 +3014,8 @@ msgid "S E Kurt"
 msgstr ""
 
 #: src/language/stats/descriptives.c:108 src/language/stats/examine.q:1723
-#: src/language/stats/frequencies.q:131 src/ui/gui/descriptives-dialog.c:49
-#: src/ui/gui/frequencies-dialog.c:47
+#: src/language/stats/frequencies.q:131 src/ui/gui/descriptives-dialog.c:48
+#: src/ui/gui/frequencies-dialog.c:46
 msgid "Skewness"
 msgstr ""
 
@@ -3024,27 +3024,27 @@ msgid "S E Skew"
 msgstr ""
 
 #: src/language/stats/descriptives.c:110 src/language/stats/examine.q:1684
-#: src/language/stats/frequencies.q:133 src/ui/gui/descriptives-dialog.c:44
-#: src/ui/gui/frequencies-dialog.c:49
+#: src/language/stats/frequencies.q:133 src/ui/gui/descriptives-dialog.c:43
+#: src/ui/gui/frequencies-dialog.c:48
 msgid "Range"
 msgstr ""
 
 #: src/language/stats/descriptives.c:111 src/language/stats/examine.q:1661
 #: src/language/stats/frequencies.q:134 src/language/stats/npar-summary.c:131
-#: src/language/stats/oneway.q:404 src/ui/gui/descriptives-dialog.c:42
-#: src/ui/gui/frequencies-dialog.c:43
+#: src/language/stats/oneway.q:404 src/ui/gui/descriptives-dialog.c:41
+#: src/ui/gui/frequencies-dialog.c:42
 msgid "Minimum"
 msgstr ""
 
 #: src/language/stats/descriptives.c:112 src/language/stats/examine.q:1672
 #: src/language/stats/frequencies.q:135 src/language/stats/npar-summary.c:134
-#: src/language/stats/oneway.q:405 src/ui/gui/descriptives-dialog.c:43
-#: src/ui/gui/frequencies-dialog.c:44
+#: src/language/stats/oneway.q:405 src/ui/gui/descriptives-dialog.c:42
+#: src/ui/gui/frequencies-dialog.c:43
 msgid "Maximum"
 msgstr ""
 
 #: src/language/stats/descriptives.c:113 src/language/stats/frequencies.q:136
-#: src/ui/gui/descriptives-dialog.c:45 src/ui/gui/frequencies-dialog.c:54
+#: src/ui/gui/descriptives-dialog.c:44 src/ui/gui/frequencies-dialog.c:53
 msgid "Sum"
 msgstr ""
 
@@ -3152,7 +3152,7 @@ msgid "5%% Trimmed Mean"
 msgstr ""
 
 #: src/language/stats/examine.q:1614 src/language/stats/frequencies.q:125
-#: src/ui/gui/frequencies-dialog.c:53
+#: src/ui/gui/frequencies-dialog.c:52
 msgid "Median"
 msgstr ""
 
@@ -3282,7 +3282,7 @@ msgstr ""
 msgid "S.E. Mean"
 msgstr ""
 
-#: src/language/stats/frequencies.q:126 src/ui/gui/frequencies-dialog.c:50
+#: src/language/stats/frequencies.q:126 src/ui/gui/frequencies-dialog.c:49
 msgid "Mode"
 msgstr ""
 
@@ -3377,22 +3377,6 @@ msgstr ""
 msgid "TABLES subcommand may not appear more than once."
 msgstr ""
 
-#: src/language/stats/npar-summary.c:108
-msgid "Descriptive Statistics"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:145
-msgid "25th"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:148
-msgid "50th (Median)"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:151
-msgid "75th"
-msgstr ""
-
 #: src/language/stats/npar.q:98
 msgid "NPAR subcommand not currently implemented."
 msgstr ""
@@ -3417,6 +3401,22 @@ msgid ""
 "not match the number following (%zu)."
 msgstr ""
 
+#: src/language/stats/npar-summary.c:108
+msgid "Descriptive Statistics"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:145
+msgid "25th"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:148
+msgid "50th (Median)"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:151
+msgid "75th"
+msgstr ""
+
 #: src/language/stats/oneway.q:169
 msgid "Number of contrast coefficients must equal the number of groups"
 msgstr ""
@@ -3565,7 +3565,7 @@ msgstr ""
 msgid "Too many variables in INTO clause."
 msgstr ""
 
-#: src/language/stats/regression.q:167 src/ui/gui/regression-dialog.c:42
+#: src/language/stats/regression.q:167 src/ui/gui/regression-dialog.c:41
 msgid "R"
 msgstr ""
 
@@ -4516,70 +4516,70 @@ msgid ""
 "bad box: (%d+%d=%d,%d+%d=%d)-(%d+%d=%d,%d+%d=%d) in table size (%d,%d)\n"
 msgstr ""
 
-#: src/ui/gui/comments-dialog.c:59
+#: src/ui/gui/comments-dialog.c:58
 #, c-format
 msgid "Column Number: %d"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:41
+#: src/ui/gui/crosstabs-dialog.c:40
 msgid "Chisq"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:43
+#: src/ui/gui/crosstabs-dialog.c:42
 msgid "CC"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:45
+#: src/ui/gui/crosstabs-dialog.c:44
 msgid "UC"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:46
+#: src/ui/gui/crosstabs-dialog.c:45
 msgid "BTau"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:47
+#: src/ui/gui/crosstabs-dialog.c:46
 msgid "CTau"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:48
+#: src/ui/gui/crosstabs-dialog.c:47
 msgid "Risk"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:50
+#: src/ui/gui/crosstabs-dialog.c:49
 msgid "D"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:53
+#: src/ui/gui/crosstabs-dialog.c:52
 msgid "Corr"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:54 src/ui/gui/crosstabs-dialog.c:65
-#: src/ui/gui/crosstabs-dialog.c:100 src/ui/gui/crosstabs-dialog.c:108
+#: src/ui/gui/crosstabs-dialog.c:53 src/ui/gui/crosstabs-dialog.c:64
+#: src/ui/gui/crosstabs-dialog.c:99 src/ui/gui/crosstabs-dialog.c:107
 #: src/ui/gui/psppire-var-store.c:590 src/ui/gui/var-display.c:13
 msgid "None"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:57
+#: src/ui/gui/crosstabs-dialog.c:56
 msgid "Count"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:58
+#: src/ui/gui/crosstabs-dialog.c:57
 msgid "Row"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:59
+#: src/ui/gui/crosstabs-dialog.c:58
 msgid "Column"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:61
+#: src/ui/gui/crosstabs-dialog.c:60
 msgid "Expected"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:63
+#: src/ui/gui/crosstabs-dialog.c:62
 msgid "Std. Residual"
 msgstr ""
 
-#: src/ui/gui/crosstabs-dialog.c:64
+#: src/ui/gui/crosstabs-dialog.c:63
 msgid "Adjusted Std. Residual"
 msgstr ""
 
@@ -4637,315 +4637,315 @@ msgstr ""
 msgid "Style of bevel around the custom entry button"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:150
+#: src/ui/gui/data-editor.c:149
 msgid "Transformations Pending"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:323
+#: src/ui/gui/data-editor.c:322
 msgid "Labels"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:324
+#: src/ui/gui/data-editor.c:323
 msgid "Show/hide value labels"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:342 src/ui/gui/data-editor.c:361
-#: src/ui/gui/data-editor.c:1494 src/ui/gui/data-editor.c:1546
+#: src/ui/gui/data-editor.c:341 src/ui/gui/data-editor.c:360
+#: src/ui/gui/data-editor.c:1492 src/ui/gui/data-editor.c:1544
 msgid "Clear"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:343
+#: src/ui/gui/data-editor.c:342
 msgid "Delete the cases at the selected position(s)"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:362
+#: src/ui/gui/data-editor.c:361
 msgid "Delete the variables at the selected position(s)"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:377 src/ui/gui/data-editor.c:1491
+#: src/ui/gui/data-editor.c:376 src/ui/gui/data-editor.c:1489
 #: src/ui/gui/data-editor.glade:137 src/ui/gui/data-editor.glade:808
 msgid "Insert Variable"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:378
+#: src/ui/gui/data-editor.c:377
 msgid "Create a new variable at the current position"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:396 src/ui/gui/data-editor.c:1543
+#: src/ui/gui/data-editor.c:395 src/ui/gui/data-editor.c:1541
 #: src/ui/gui/data-editor.glade:796
 msgid "Insert Case"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:397
+#: src/ui/gui/data-editor.c:396
 msgid "Create a new case at the current position"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:417
+#: src/ui/gui/data-editor.c:416
 msgid "Goto Case"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:418
+#: src/ui/gui/data-editor.c:417
 msgid "Jump to a Case in the Data Sheet"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:437
+#: src/ui/gui/data-editor.c:436
 msgid "Weights"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:438
+#: src/ui/gui/data-editor.c:437
 msgid "Weight cases by variable"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:447 src/ui/gui/data-editor.glade:312
+#: src/ui/gui/data-editor.c:446 src/ui/gui/data-editor.glade:312
 msgid "Transpose"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:448
+#: src/ui/gui/data-editor.c:447
 msgid "Transpose the cases with the variables"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:459
+#: src/ui/gui/data-editor.c:458
 msgid "Split"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:460
+#: src/ui/gui/data-editor.c:459
 msgid "Split the active file"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:470
+#: src/ui/gui/data-editor.c:469
 msgid "Sort"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:471
+#: src/ui/gui/data-editor.c:470
 msgid "Sort cases in the active file"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:479 src/ui/gui/data-editor.glade:347
+#: src/ui/gui/data-editor.c:478 src/ui/gui/data-editor.glade:347
 #: src/ui/gui/data-editor.glade:851
 msgid "Select Cases"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:480
+#: src/ui/gui/data-editor.c:479
 msgid "Select cases from the active file"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:489
+#: src/ui/gui/data-editor.c:488
 msgid "Compute"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:490
+#: src/ui/gui/data-editor.c:489
 msgid "Compute new values for a variable"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:498
+#: src/ui/gui/data-editor.c:497
 msgid "Oneway _ANOVA"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:499
+#: src/ui/gui/data-editor.c:498
 msgid "Perform one way analysis of variance"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:507 src/ui/gui/data-editor.glade:503
+#: src/ui/gui/data-editor.c:506 src/ui/gui/data-editor.glade:503
 msgid "_Independent Samples T Test"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:508
+#: src/ui/gui/data-editor.c:507
 msgid "Calculate T Test for samples from independent groups"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:517 src/ui/gui/data-editor.glade:511
+#: src/ui/gui/data-editor.c:516 src/ui/gui/data-editor.glade:511
 msgid "_Paired Samples T Test"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:518
+#: src/ui/gui/data-editor.c:517
 msgid "Calculate T Test for paired samples"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:527
+#: src/ui/gui/data-editor.c:526
 msgid "One _Sample T Test"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:528
+#: src/ui/gui/data-editor.c:527
 msgid "Calculate T Test for sample from a single distribution"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:537
+#: src/ui/gui/data-editor.c:536
 msgid "Data File Comments"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:538
+#: src/ui/gui/data-editor.c:537
 msgid "Commentary text for the data file"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:546 src/ui/gui/data-editor.glade:776
+#: src/ui/gui/data-editor.c:545 src/ui/gui/data-editor.glade:776
 msgid "Find"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:547
+#: src/ui/gui/data-editor.c:546
 msgid "Find Case"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:556 src/ui/gui/data-editor.glade:384
+#: src/ui/gui/data-editor.c:555 src/ui/gui/data-editor.glade:384
 msgid "Ran_k Cases"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:557
+#: src/ui/gui/data-editor.c:556
 msgid "Rank Cases"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:566 src/ui/gui/data-editor.glade:396
+#: src/ui/gui/data-editor.c:565 src/ui/gui/data-editor.glade:396
 msgid "Recode into _Same Variables"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:567
+#: src/ui/gui/data-editor.c:566
 msgid "Recode values into the same Variables"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:576 src/ui/gui/data-editor.glade:403
+#: src/ui/gui/data-editor.c:575 src/ui/gui/data-editor.glade:403
 msgid "Recode into _Different Variables"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:577
+#: src/ui/gui/data-editor.c:576
 msgid "Recode values into different Variables"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:586 src/ui/gui/data-editor.glade:286
+#: src/ui/gui/data-editor.c:585 src/ui/gui/data-editor.glade:286
 #: src/ui/gui/data-editor.glade:755
 msgid "Variables"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:587
+#: src/ui/gui/data-editor.c:586
 msgid "Jump to Variable"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:595 src/ui/gui/data-editor.glade:457
+#: src/ui/gui/data-editor.c:594 src/ui/gui/data-editor.glade:457
 #: src/ui/gui/oneway.glade:179
 msgid "_Descriptives"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:596
+#: src/ui/gui/data-editor.c:595
 msgid "Calculate descriptive statistics (mean, variance, ...)"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:605 src/ui/gui/data-editor.glade:449
+#: src/ui/gui/data-editor.c:604 src/ui/gui/data-editor.glade:449
 msgid "_Frequencies"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:606
+#: src/ui/gui/data-editor.c:605
 msgid "Generate frequency statistics"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:614 src/ui/gui/data-editor.glade:473
+#: src/ui/gui/data-editor.c:613 src/ui/gui/data-editor.glade:473
 msgid "_Crosstabs"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:615
+#: src/ui/gui/data-editor.c:614
 msgid "Generate crosstabulations"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:624 src/ui/gui/data-editor.glade:465
+#: src/ui/gui/data-editor.c:623 src/ui/gui/data-editor.glade:465
 msgid "_Explore"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:625
+#: src/ui/gui/data-editor.c:624
 msgid "Examine Data by Factors"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:634 src/ui/gui/data-editor.glade:539
+#: src/ui/gui/data-editor.c:633 src/ui/gui/data-editor.glade:539
 msgid "Linear _Regression"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:635
+#: src/ui/gui/data-editor.c:634
 msgid "Estimate parameters of the linear model"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1022
+#: src/ui/gui/data-editor.c:1021
 msgid "Font Selection"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1094
+#: src/ui/gui/data-editor.c:1093
 msgid "No Split"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1103
+#: src/ui/gui/data-editor.c:1102
 msgid "Split by "
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1128
+#: src/ui/gui/data-editor.c:1127
 msgid "Filter off"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1140
+#: src/ui/gui/data-editor.c:1139
 #, c-format
 msgid "Filter by %s"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1158
+#: src/ui/gui/data-editor.c:1157
 msgid "Weights off"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1170
+#: src/ui/gui/data-editor.c:1169
 #, c-format
 msgid "Weight by %s"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1193 src/ui/gui/data-editor.c:1427
+#: src/ui/gui/data-editor.c:1192 src/ui/gui/data-editor.c:1425
 #: src/ui/gui/data-editor.glade:667
 msgid "Open"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1194
+#: src/ui/gui/data-editor.c:1193
 msgid "Open a data file"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1202 src/ui/gui/data-editor.c:1309
+#: src/ui/gui/data-editor.c:1201 src/ui/gui/data-editor.c:1308
 #: src/ui/gui/data-editor.glade:677
 msgid "Save"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1203 src/ui/gui/data-editor.c:1213
+#: src/ui/gui/data-editor.c:1202 src/ui/gui/data-editor.c:1212
 msgid "Save data to file"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1212
+#: src/ui/gui/data-editor.c:1211
 msgid "Save As"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1221 src/ui/gui/recode-dialog.c:929
-#: src/ui/gui/recode-dialog.c:1024
+#: src/ui/gui/data-editor.c:1220 src/ui/gui/recode-dialog.c:928
+#: src/ui/gui/recode-dialog.c:1023
 msgid "New"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1222
+#: src/ui/gui/data-editor.c:1221
 msgid "New data file"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1317 src/ui/gui/data-editor.c:1435
+#: src/ui/gui/data-editor.c:1316 src/ui/gui/data-editor.c:1433
 msgid "System Files (*.sav)"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1323 src/ui/gui/data-editor.c:1441
+#: src/ui/gui/data-editor.c:1322 src/ui/gui/data-editor.c:1439
 msgid "Portable Files (*.por) "
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1329 src/ui/gui/data-editor.c:1447
+#: src/ui/gui/data-editor.c:1328 src/ui/gui/data-editor.c:1445
 #: src/ui/gui/syntax-editor.c:138 src/ui/gui/syntax-editor.c:522
 msgid "All Files"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1337
+#: src/ui/gui/data-editor.c:1336
 msgid "System File"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1342
+#: src/ui/gui/data-editor.c:1341
 msgid "Portable File"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1485
+#: src/ui/gui/data-editor.c:1483
 msgid "Sort Ascending"
 msgstr ""
 
-#: src/ui/gui/data-editor.c:1488
+#: src/ui/gui/data-editor.c:1486
 msgid "Sort Descending"
 msgstr ""
 
@@ -5262,11 +5262,11 @@ msgstr ""
 msgid "_Discrete missing values"
 msgstr ""
 
-#: src/ui/gui/descriptives-dialog.c:41 src/ui/gui/frequencies-dialog.c:42
+#: src/ui/gui/descriptives-dialog.c:40 src/ui/gui/frequencies-dialog.c:41
 msgid "Standard deviation"
 msgstr ""
 
-#: src/ui/gui/descriptives-dialog.c:46
+#: src/ui/gui/descriptives-dialog.c:45
 msgid "Standard error"
 msgstr ""
 
@@ -5323,20 +5323,20 @@ msgstr ""
 msgid "Repeat values"
 msgstr ""
 
-#: src/ui/gui/find-dialog.c:659
+#: src/ui/gui/find-dialog.c:658
 #, c-format
 msgid "Bad regular expression: %s"
 msgstr ""
 
-#: src/ui/gui/frequencies-dialog.c:45
+#: src/ui/gui/frequencies-dialog.c:44
 msgid "Standard error of the mean"
 msgstr ""
 
-#: src/ui/gui/frequencies-dialog.c:48
+#: src/ui/gui/frequencies-dialog.c:47
 msgid "Standard error of the skewness"
 msgstr ""
 
-#: src/ui/gui/frequencies-dialog.c:52
+#: src/ui/gui/frequencies-dialog.c:51
 msgid "Standard error of the kurtosis"
 msgstr ""
 
@@ -5460,7 +5460,7 @@ msgstr ""
 msgid "Incorrect range specification"
 msgstr ""
 
-#: src/ui/gui/oneway-anova-dialog.c:336
+#: src/ui/gui/oneway-anova-dialog.c:335
 #, c-format
 msgid "Contrast %d of %d"
 msgstr ""
@@ -5549,6 +5549,14 @@ msgstr ""
 msgid "Paste"
 msgstr ""
 
+#: src/ui/gui/psppire.c:195
+msgid "_Reset"
+msgstr ""
+
+#: src/ui/gui/psppire.c:196
+msgid "_Select"
+msgstr ""
+
 #: src/ui/gui/psppire-data-editor.c:604
 msgid "Data View"
 msgstr ""
@@ -5566,58 +5574,12 @@ msgstr ""
 msgid "%ld"
 msgstr ""
 
-#: src/ui/gui/psppire-var-sheet.c:96
-msgid "Name"
-msgstr ""
-
-#: src/ui/gui/psppire-var-sheet.c:98 src/ui/gui/psppire.glade:2187
-msgid "Width"
-msgstr ""
-
-#: src/ui/gui/psppire-var-sheet.c:99
-msgid "Decimals"
-msgstr ""
-
-#: src/ui/gui/psppire-var-sheet.c:101
-msgid "Values"
-msgstr ""
-
-#: src/ui/gui/psppire-var-sheet.c:104
-msgid "Align"
-msgstr ""
-
-#: src/ui/gui/psppire-var-sheet.c:105
-msgid "Measure"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:600
-msgid "Scientific"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:603
-msgid "Custom"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:674 src/ui/gui/psppire-var-store.c:684
-#: src/ui/gui/psppire-var-store.c:694
-#, c-format
-msgid "%d"
-msgstr ""
-
-#: src/ui/gui/psppire.c:195
-msgid "_Reset"
-msgstr ""
-
-#: src/ui/gui/psppire.c:196
-msgid "_Select"
-msgstr ""
-
 #: src/ui/gui/psppire.glade:11
 msgid "This is pre-alpha software.  Use at your own risk."
 msgstr ""
 
 #: src/ui/gui/psppire.glade:73 src/ui/gui/psppire.glade:154
-#: src/ui/gui/weight-cases-dialog.c:82
+#: src/ui/gui/weight-cases-dialog.c:80
 msgid "Do not weight cases"
 msgstr ""
 
@@ -5796,6 +5758,10 @@ msgstr ""
 msgid "Use expression as label"
 msgstr ""
 
+#: src/ui/gui/psppire.glade:2187 src/ui/gui/psppire-var-sheet.c:98
+msgid "Width"
+msgstr ""
+
 #: src/ui/gui/psppire.glade:2274
 msgid "Goto Case Number:"
 msgstr ""
@@ -5828,6 +5794,40 @@ msgstr ""
 msgid "Search backward"
 msgstr ""
 
+#: src/ui/gui/psppire-var-sheet.c:96
+msgid "Name"
+msgstr ""
+
+#: src/ui/gui/psppire-var-sheet.c:99
+msgid "Decimals"
+msgstr ""
+
+#: src/ui/gui/psppire-var-sheet.c:101
+msgid "Values"
+msgstr ""
+
+#: src/ui/gui/psppire-var-sheet.c:104
+msgid "Align"
+msgstr ""
+
+#: src/ui/gui/psppire-var-sheet.c:105
+msgid "Measure"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:600
+msgid "Scientific"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:603
+msgid "Custom"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:674 src/ui/gui/psppire-var-store.c:684
+#: src/ui/gui/psppire-var-store.c:694
+#, c-format
+msgid "%d"
+msgstr ""
+
 #: src/ui/gui/rank.glade:111
 msgid "By:"
 msgstr ""
@@ -5928,23 +5928,23 @@ msgstr ""
 msgid "Rank Assigned to Ties"
 msgstr ""
 
-#: src/ui/gui/recode-dialog.c:880
+#: src/ui/gui/recode-dialog.c:879
 msgid "Recode into Different Variables"
 msgstr ""
 
-#: src/ui/gui/recode-dialog.c:883
+#: src/ui/gui/recode-dialog.c:882
 msgid "Recode into Same Variables"
 msgstr ""
 
-#: src/ui/gui/recode-dialog.c:914 src/ui/gui/recode-dialog.c:1016
+#: src/ui/gui/recode-dialog.c:913 src/ui/gui/recode-dialog.c:1015
 msgid "Old"
 msgstr ""
 
-#: src/ui/gui/recode-dialog.c:1275
+#: src/ui/gui/recode-dialog.c:1274
 msgid "Recode into Different Variables: Old and New Values "
 msgstr ""
 
-#: src/ui/gui/recode-dialog.c:1276
+#: src/ui/gui/recode-dialog.c:1275
 msgid "Recode into Same Variables: Old and New Values"
 msgstr ""
 
@@ -6028,15 +6028,15 @@ msgstr ""
 msgid "Old and New Values"
 msgstr ""
 
-#: src/ui/gui/regression-dialog.c:41
+#: src/ui/gui/regression-dialog.c:40
 msgid "Coeff"
 msgstr ""
 
-#: src/ui/gui/regression-dialog.c:43
+#: src/ui/gui/regression-dialog.c:42
 msgid "Anova"
 msgstr ""
 
-#: src/ui/gui/regression-dialog.c:44
+#: src/ui/gui/regression-dialog.c:43
 msgid "Bcov"
 msgstr ""
 
@@ -6060,17 +6060,17 @@ msgstr ""
 msgid "Residuals"
 msgstr ""
 
-#: src/ui/gui/select-cases-dialog.c:85
+#: src/ui/gui/select-cases-dialog.c:84
 #, c-format
 msgid "Approximately %3d%% of all cases."
 msgstr ""
 
-#: src/ui/gui/select-cases-dialog.c:86
+#: src/ui/gui/select-cases-dialog.c:85
 #, c-format
 msgid "Exactly %3d cases from the first %3d cases."
 msgstr ""
 
-#: src/ui/gui/select-cases-dialog.c:226
+#: src/ui/gui/select-cases-dialog.c:225
 #, c-format
 msgid "%d thru %d"
 msgstr ""
@@ -6116,19 +6116,6 @@ msgstr ""
 msgid "To End"
 msgstr ""
 
-#: src/ui/gui/t-test-options.c:60
-#, c-format
-msgid "Confidence Interval: %2d %%"
-msgstr ""
-
-#: src/ui/gui/t-test-paired-samples.c:229
-msgid "Var 1"
-msgstr ""
-
-#: src/ui/gui/t-test-paired-samples.c:230
-msgid "Var 2"
-msgstr ""
-
 #: src/ui/gui/t-test.glade:56 src/ui/gui/t-test.glade:165
 msgid "Define Groups"
 msgstr ""
@@ -6166,36 +6153,49 @@ msgstr ""
 msgid "Test Value: "
 msgstr ""
 
-#: src/ui/gui/variable-info-dialog.c:90
+#: src/ui/gui/t-test-options.c:60
+#, c-format
+msgid "Confidence Interval: %2d %%"
+msgstr ""
+
+#: src/ui/gui/t-test-paired-samples.c:228
+msgid "Var 1"
+msgstr ""
+
+#: src/ui/gui/t-test-paired-samples.c:229
+msgid "Var 2"
+msgstr ""
+
+#: src/ui/gui/variable-info-dialog.c:88
 #, c-format
 msgid "Label: %s\n"
 msgstr ""
 
-#: src/ui/gui/variable-info-dialog.c:99
+#: src/ui/gui/variable-info-dialog.c:97
 #, c-format
 msgid "Type: %s\n"
 msgstr ""
 
-#: src/ui/gui/variable-info-dialog.c:103
+#: src/ui/gui/variable-info-dialog.c:101
 #, c-format
 msgid "Missing Values: %s\n"
 msgstr ""
 
-#: src/ui/gui/variable-info-dialog.c:108
+#: src/ui/gui/variable-info-dialog.c:106
 #, c-format
 msgid "Measurement Level: %s\n"
 msgstr ""
 
-#: src/ui/gui/variable-info-dialog.c:122
+#: src/ui/gui/variable-info-dialog.c:120
 msgid "Value Labels:\n"
 msgstr ""
 
-#: src/ui/gui/variable-info-dialog.c:134
+#: src/ui/gui/variable-info-dialog.c:132
 #, c-format
 msgid "%s %s\n"
 msgstr ""
 
-#: src/ui/gui/weight-cases-dialog.c:88
+#: src/ui/gui/weight-cases-dialog.c:86
 #, c-format
 msgid "Weight cases by %s"
 msgstr ""

diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c
index f8be1ec1afab2b810980ff45c2b2e7d0b40ff47c..47292d92fc6c12391eb1f2107df97ab595852741 100644 (file)
--- a/src/ui/gui/psppire-data-store.c
+++ b/src/ui/gui/psppire-data-store.c
@@ -891,7 +891,7 @@ psppire_data_store_sheet_column_init (GSheetColumnIface *iface)
 /* Row related funcs */
 
 static glong
-geometry_get_row_count (const GSheetRow *geom, gpointer data)
+geometry_get_row_count (const GSheetRow *geom)
 {
   PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
 
@@ -901,31 +901,31 @@ geometry_get_row_count (const GSheetRow *geom, gpointer data)
 #define ROW_HEIGHT 25
 
 static gint
-geometry_get_height (const GSheetRow *geom, glong unit, gpointer data)
+geometry_get_height (const GSheetRow *geom, glong unit)
 {
   return ROW_HEIGHT;
 }
 
 static guint
-geometry_get_top_ypixel (const GSheetRow *geo, glong row, gpointer data)
+geometry_get_top_ypixel (const GSheetRow *geo, glong row)
 {
   return row * ROW_HEIGHT;
 }
 
 static glong
-geometry_pixel_to_row (const GSheetRow *geo, guint pixel, gpointer data)
+geometry_pixel_to_row (const GSheetRow *geo, guint pixel)
 {
   glong row  = pixel / ROW_HEIGHT;
 
-  if (row >= geometry_get_row_count (geo, data))
-    row = geometry_get_row_count (geo, data) - 1;
+  if (row >= geometry_get_row_count (geo))
+    row = geometry_get_row_count (geo) - 1;
 
   return row;
 }
 
 
 static gboolean
-geometry_get_row_sensitivity (const GSheetRow *geom, glong unit, gpointer data)
+geometry_get_row_sensitivity (const GSheetRow *geom, glong unit)
 {
   PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
 
@@ -935,7 +935,7 @@ geometry_get_row_sensitivity (const GSheetRow *geom, glong unit, gpointer data)
 
 
 static gchar *
-geometry_get_row_button_label (const GSheetRow *geom, glong unit, gpointer data)
+geometry_get_row_button_label (const GSheetRow *geom, glong unit)
 {
   gchar *text;
   gchar *s;

diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c
index 7edc665a21cee5cd843e990d312d28648889ae30..f673b54eddefa73bf8b248ad726da64141581316 100644 (file)
--- a/src/ui/gui/psppire-var-store.c
+++ b/src/ui/gui/psppire-var-store.c
@@ -796,7 +796,7 @@ psppire_var_store_get_column_count (const GSheetModel * model)
 /* Row related funcs */
 
 static glong
-geometry_get_row_count (const GSheetRow *geom, gpointer data)
+geometry_get_row_count (const GSheetRow *geom)
 {
   gint rows = 0;
   PsppireVarStore *vs = PSPPIRE_VAR_STORE (geom);
@@ -809,14 +809,14 @@ geometry_get_row_count (const GSheetRow *geom, gpointer data)
 
 
 static gint
-geometry_get_height (const GSheetRow *geom, glong row, gpointer data)
+geometry_get_height (const GSheetRow *geom, glong row)
 {
   return 25;
 }
 
 
 static gboolean
-geometry_is_sensitive (const GSheetRow *geom, glong row, gpointer data)
+geometry_is_sensitive (const GSheetRow *geom, glong row)
 {
   PsppireVarStore *vs = PSPPIRE_VAR_STORE (geom);
 
@@ -834,7 +834,7 @@ gboolean always_true ()
 
 
 static gchar *
-geometry_get_button_label (const GSheetRow *geom, glong unit, gpointer data)
+geometry_get_button_label (const GSheetRow *geom, glong unit)
 {
   gchar *label = g_strdup_printf (_("%ld"), unit + 1);