Merge remote branch 'savannah/master' into sourceview

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

diff --git a/src/ui/gui/syntax-editor.ui b/src/ui/gui/syntax-editor.ui
index 4f134c2e1cb51b966674a5c0dc764941b7a5b93e..51e589ec730c048cbd2a72799fc8c4800dff0f1c 100644 (file)
--- a/src/ui/gui/syntax-editor.ui
+++ b/src/ui/gui/syntax-editor.ui
@@ -29,21 +29,10 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="open2">
+          <object class="GtkAction" id="file_open">
             <property name="stock-id">gtk-open</property>
-            <property name="name">open2</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="file_open_syntax">
-            <property name="name">file_open_syntax</property>
-            <property name="label" translatable="yes">_Syntax</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="file_open_data">
-            <property name="name">file_open_data</property>
-            <property name="label" translatable="yes">_Data</property>
+            <property name="name">file_open</property>
+            <property name="label" translatable="yes">_Open...</property>
           </object>
         </child>
         <child>
@@ -56,6 +45,7 @@
           <object class="GtkAction" id="file_save_as">
             <property name="stock-id">gtk-save-as</property>
             <property name="name">file_save_as</property>
+            <property name="label" translatable="yes">Save _As...</property>
           </object>
         </child>
         <child>
@@ -168,10 +158,7 @@
             <menuitem action="file_new_syntax"/>
             <menuitem action="file_new_data"/>
           </menu>
-          <menu action="open2">
-            <menuitem action="file_open_syntax"/>
-            <menuitem action="file_open_data"/>
-          </menu>
+          <menuitem action="file_open"/>
           <menuitem action="file_save"/>
           <menuitem action="file_save_as"/>
           <separator/>