diff --git a/data/glade/message_window.glade b/data/glade/message_window.glade
index 691d78aca..4cb02eeac 100644
--- a/data/glade/message_window.glade
+++ b/data/glade/message_window.glade
@@ -156,7 +156,7 @@
                       <widget class="GtkButton" id="emoticons_button">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Show a list of emoticons (Alt-M)</property>
+                        <property name="tooltip" translatable="yes">Show a list of emoticons (Alt+M)</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <property name="focus_on_click">False</property>
                         <property name="response_id">0</property>
@@ -189,7 +189,7 @@
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="no_show_all">True</property>
-                        <property name="tooltip" translatable="yes">Add this contact to roster (Ctrl-D)</property>
+                        <property name="tooltip" translatable="yes">Add this contact to roster (Ctrl+D)</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <property name="response_id">0</property>
                         <child>
@@ -211,7 +211,7 @@
                       <widget class="GtkButton" id="send_file_button">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Send a file (Ctrl-F)</property>
+                        <property name="tooltip" translatable="yes">Send a file (Ctrl+F)</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <property name="focus_on_click">False</property>
                         <property name="response_id">0</property>
@@ -233,7 +233,7 @@
                       <widget class="GtkButton" id="convert_to_gc_button">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Invite contacts to the conversation (Ctrl-G)</property>
+                        <property name="tooltip" translatable="yes">Invite contacts to the conversation (Ctrl+G)</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <property name="focus_on_click">False</property>
                         <property name="response_id">0</property>
@@ -255,7 +255,7 @@
                       <widget class="GtkButton" id="contact_information_button">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Show the contact's profile (Ctrl-I)</property>
+                        <property name="tooltip" translatable="yes">Show the contact's profile (Ctrl+I)</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <property name="focus_on_click">False</property>
                         <property name="response_id">0</property>
@@ -277,7 +277,7 @@
                       <widget class="GtkButton" id="history_button">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Browse the chat history (Ctrl-H)</property>
+                        <property name="tooltip" translatable="yes">Browse the chat history (Ctrl+H)</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <property name="focus_on_click">False</property>
                         <property name="response_id">0</property>
@@ -309,7 +309,7 @@
                       <widget class="GtkButton" id="message_window_actions_button">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Show a menu of advanced functions (Alt-A)</property>
+                        <property name="tooltip" translatable="yes">Show a menu of advanced functions (Alt+A)</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <property name="response_id">0</property>
                         <child>
@@ -600,7 +600,7 @@
                           <widget class="GtkButton" id="emoticons_button">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="tooltip" translatable="yes">Show a list of emoticons (Alt-M)</property>
+                            <property name="tooltip" translatable="yes">Show a list of emoticons (Alt+M)</property>
                             <property name="relief">GTK_RELIEF_NONE</property>
                             <property name="response_id">0</property>
                             <child>
@@ -635,7 +635,7 @@
                       <widget class="GtkButton" id="change_nick_button">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Change your nickname (Ctrl-N)</property>
+                        <property name="tooltip" translatable="yes">Change your nickname (Ctrl+N)</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <property name="response_id">0</property>
                         <child>
@@ -657,7 +657,7 @@
                       <widget class="GtkButton" id="change_subject_button">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Change the room's subject (Ctrl-T)</property>
+                        <property name="tooltip" translatable="yes">Change the room's subject (Ctrl+T)</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <property name="response_id">0</property>
                         <child>
@@ -679,7 +679,7 @@
                       <widget class="GtkButton" id="bookmark_button">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Bookmark this room (Ctrl-B)</property>
+                        <property name="tooltip" translatable="yes">Bookmark this room (Ctrl+B)</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <property name="response_id">0</property>
                         <child>
@@ -701,7 +701,7 @@
                       <widget class="GtkButton" id="history_button">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Browse the chat history (Ctrl-H)</property>
+                        <property name="tooltip" translatable="yes">Browse the chat history (Ctrl+H)</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <property name="response_id">0</property>
                         <child>
@@ -733,7 +733,7 @@
                       <widget class="GtkButton" id="muc_window_actions_button">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Show a menu of advanced functions (Alt-A)</property>
+                        <property name="tooltip" translatable="yes">Show a menu of advanced functions (Alt+A)</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <property name="response_id">0</property>
                         <child>