Merge branch 'sasl'

[empathy.git] / src / empathy-chat-window.ui

diff --git a/src/empathy-chat-window.ui b/src/empathy-chat-window.ui
index 13b81257248af0b17961f41b3323f92ecf7cc354..25749861cf1635c21655f763f06353c489757444 100644 (file)
--- a/src/empathy-chat-window.ui
+++ b/src/empathy-chat-window.ui
@@ -28,7 +28,13 @@
         <child>
           <object class="GtkToggleAction" id="menu_conv_favorite">
             <property name="name">menu_conv_favorite</property>
-            <property name="label" translatable="yes">_Favorite Chatroom</property>
+            <property name="label" translatable="yes">_Favorite Chat Room</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleAction" id="menu_conv_always_urgent">
+            <property name="name">menu_conv_always_urgent</property>
+            <property name="label" translatable="yes">Notify for All Messages</property>
           </object>
         </child>
         <child>
@@ -84,6 +90,13 @@
           </object>
           <accelerator key="V" modifiers="GDK_CONTROL_MASK"/>
         </child>
+        <child>
+          <object class="GtkAction" id="menu_edit_find">
+            <property name="stock_id">gtk-find</property>
+            <property name="name">menu_edit_find</property>
+          </object>
+          <accelerator key="F" modifiers="GDK_CONTROL_MASK"/>
+        </child>
         <child>
           <object class="GtkAction" id="menu_tabs">
             <property name="name">menu_tabs</property>
@@ -104,17 +117,26 @@
           </object>
           <accelerator key="Page_Down" modifiers="GDK_CONTROL_MASK"/>
         </child>
+        <child>
+          <object class="GtkAction" id="menu_tabs_undo_close_tab">
+            <property name="name">menu_tabs_undo_close_tab</property>
+            <property name="label" translatable="yes">_Undo Close Tab</property>
+          </object>
+          <accelerator key="t" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
+        </child>
         <child>
           <object class="GtkAction" id="menu_tabs_left">
             <property name="name">menu_tabs_left</property>
             <property name="label" translatable="yes">Move Tab _Left</property>
           </object>
+          <accelerator key="Page_Up" modifiers="GDK_CONTROL_MASK|GDK_SHIFT_MASK"/>
         </child>
         <child>
           <object class="GtkAction" id="menu_tabs_right">
             <property name="name">menu_tabs_right</property>
             <property name="label" translatable="yes">Move Tab _Right</property>
           </object>
+          <accelerator key="Page_Down" modifiers="GDK_CONTROL_MASK|GDK_SHIFT_MASK"/>
         </child>
         <child>
           <object class="GtkAction" id="menu_tabs_detach">
@@ -150,6 +172,7 @@
           <menuitem action="menu_conv_clear"/>
           <menuitem action="menu_conv_insert_smiley"/>
           <menuitem action="menu_conv_favorite"/>
+          <menuitem action="menu_conv_always_urgent"/>
           <menuitem action="menu_conv_toggle_contacts"/>
           <menuitem action="menu_conv_invite_participant"/>
           <separator/>
@@ -160,10 +183,13 @@
           <menuitem action="menu_edit_cut"/>
           <menuitem action="menu_edit_copy"/>
           <menuitem action="menu_edit_paste"/>
+          <separator/>
+          <menuitem action="menu_edit_find"/>
         </menu>
         <menu action="menu_tabs">
           <menuitem action="menu_tabs_prev"/>
           <menuitem action="menu_tabs_next"/>
+          <menuitem action="menu_tabs_undo_close_tab"/>
           <separator/>
           <menuitem action="menu_tabs_left"/>
           <menuitem action="menu_tabs_right"/>