[med-svn] [SCM] aghermann branch, master, updated. 99b1d5a023eee9df74b0e0d6f894516fc79435ad

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 102a01350ceb6301385f0d897045b9606bc22f00
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Mon Jun 10 02:11:58 2013 +0300

    rename in main menu item "Close" to "Close this session"

diff --git a/data/mw.glade b/data/mw.glade
index 3f702f9..e8cc2a4 100644
--- a/data/mw.glade
+++ b/data/mw.glade
@@ -62,6 +62,11 @@
       </object>
     </child>
   </object>
+  <object class="GtkImage" id="image4">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-missing-image</property>
+  </object>
   <object class="GtkImage" id="image7">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -832,6 +837,16 @@ rm */*/*/.*.{psd,mc,swu}</property>
                                       </object>
                                     </child>
                                     <child>
+                                      <object class="GtkImageMenuItem" id="iExpClose">
+                                        <property name="label">_Close This Session</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="image">image4</property>
+                                        <property name="use_stock">False</property>
+                                      </object>
+                                    </child>
+                                    <child>
                                       <object class="GtkSeparatorMenuItem" id="menuitem3">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
@@ -860,15 +875,6 @@ rm */*/*/.*.{psd,mc,swu}</property>
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkImageMenuItem" id="iExpClose">
-                                        <property name="label">gtk-close</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="use_stock">True</property>
-                                      </object>
-                                    </child>
-                                    <child>
                                       <object class="GtkImageMenuItem" id="iExpQuit">
                                         <property name="label">gtk-quit</property>
                                         <property name="visible">True</property>
@@ -7462,6 +7468,12 @@ dragging individual signals with <i>Alt</i>.</small></property
                                     <child>
                                       <placeholder/>
                                     </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
                                   </object>
                                 </child>
                                 <child>

-- 
Sleep experiment manager