Merge branch 'master' into import-gui

[pspp] / src / ui / gui / data-editor.ui

diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index 8d948a5b6e9c0b648b9c15b8d5a2d3887a221f66..2a5289477977ff180b2453e82389dfab1464f66c 100644 (file)
--- a/src/ui/gui/data-editor.ui
+++ b/src/ui/gui/data-editor.ui
@@ -49,9 +49,9 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="file_import-text">
-            <property name="name">file_import-text</property>
-            <property name="label" translatable="yes">_Import Delimited Text Data...</property>
+          <object class="GtkAction" id="file_import">
+            <property name="name">file_import</property>
+            <property name="label" translatable="yes">I_mport Data...</property>
            <property name="stock-id">gtk-convert</property>
           </object>
         </child>
@@ -367,8 +367,9 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="crosstabs">
+          <object class="PsppireDialogActionCrosstabs" id="crosstabs">
             <property name="name">crosstabs</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">_Crosstabs...</property>
           </object>
         </child>
@@ -564,7 +565,7 @@
             <menuitem action="file_new_data"/>
           </menu>
           <menuitem action="file_open"/>
-          <menuitem action="file_import-text"/>
+          <menuitem action="file_import"/>
           <separator/>
           <menuitem action="file_save"/>
           <menuitem action="file_save_as"/>