LinGui: button and menu uix improvements

Make toolbar button order follow work flow better.
Improve text of buttons and menues.

5 files changed, 115 insertions, 76 deletions

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index f57fcb32a..6acee07ab 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -1244,7 +1244,7 @@ start_scan(
 
     widget = GHB_WIDGET(ud->builder, "sourcetoolbutton");
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-stop");
-    gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Stop Scan"));
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Stop\nScan"));
     gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), _("Stop Scan"));
 
     widget = GHB_WIDGET(ud->builder, "source_open");
@@ -3293,7 +3293,7 @@ ghb_backend_events(signal_user_data_t *ud)
 
         widget = GHB_WIDGET(ud->builder, "sourcetoolbutton");
         gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-source");
-        gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Source"));
+        gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Open\nSource"));
         gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), _("Choose Video Source"));
 
         widget = GHB_WIDGET(ud->builder, "source_open");
diff --git a/gtk/src/ghb-3.12.ui b/gtk/src/ghb-3.12.ui
index 32af82ce2..cf65d0346 100644
--- a/gtk/src/ghb-3.12.ui
+++ b/gtk/src/ghb-3.12.ui
@@ -551,7 +551,7 @@ libx264 authors:
         <signal name="activate" handler="show_hide_toggle_cb" swapped="no"/>
       </object>
       <object class="GtkMenuItem" id="tray_queue_pause">
-        <property name="label" translatable="yes">_Pause Queue</property>
+        <property name="label" translatable="yes">_Pause Encoding</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
@@ -607,7 +607,7 @@ libx264 authors:
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkMenuItem" id="source_open">
-                        <property name="label" translatable="yes">_Source</property>
+                        <property name="label" translatable="yes">Open _Source</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
@@ -616,7 +616,7 @@ libx264 authors:
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="source_title_open">
-                        <property name="label" translatable="yes">Single _Title</property>
+                        <property name="label" translatable="yes">Open Single _Title</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
@@ -625,7 +625,7 @@ libx264 authors:
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="destination_menu_item">
-                        <property name="label" translatable="yes">_Destination</property>
+                        <property name="label" translatable="yes">Set _Destination</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
@@ -696,7 +696,7 @@ libx264 authors:
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="queue_start_menu">
-                        <property name="label" translatable="yes">_Start</property>
+                        <property name="label" translatable="yes">_Start Encoding</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
@@ -705,7 +705,7 @@ libx264 authors:
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="queue_pause_menu">
-                        <property name="label" translatable="yes">_Pause</property>
+                        <property name="label" translatable="yes">_Pause Encoding</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
@@ -918,7 +918,8 @@ libx264 authors:
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="tooltip_text" translatable="yes">Choose Video Source</property>
                         <property name="is_important">True</property>
-                        <property name="label" translatable="yes">Source</property>
+                        <property name="label" translatable="yes">Open
+Source</property>
                         <property name="icon_name">hb-source</property>
                         <signal name="clicked" handler="source_button_clicked_cb" swapped="no"/>
                       </object>
@@ -928,6 +929,24 @@ libx264 authors:
                       </packing>
                     </child>
                     <child>
+                      <object class="GtkToolButton" id="queue_add">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="can_focus">False</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_text" translatable="yes">Add to Queue</property>
+                        <property name="is_important">True</property>
+                        <property name="label" translatable="yes">Add To
+Queue</property>
+                        <property name="icon_name">hb-add-queue</property>
+                        <signal name="clicked" handler="queue_add_clicked_cb" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="homogeneous">True</property>
+                      </packing>
+                    </child>
+                    <child>
                       <object class="GtkToolButton" id="queue_start1">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
@@ -935,7 +954,8 @@ libx264 authors:
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="tooltip_text" translatable="yes">Start Encoding</property>
                         <property name="is_important">True</property>
-                        <property name="label" translatable="yes">Start</property>
+                        <property name="label" translatable="yes">Start
+Encoding</property>
                         <property name="icon_name">hb-start</property>
                         <signal name="clicked" handler="queue_start_clicked_cb" swapped="no"/>
                       </object>
@@ -952,7 +972,8 @@ libx264 authors:
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="tooltip_text" translatable="yes">Pause Encoding</property>
                         <property name="is_important">True</property>
-                        <property name="label" translatable="yes">Pause</property>
+                        <property name="label" translatable="yes">Pause
+Encoding</property>
                         <property name="icon_name">hb-pause</property>
                         <signal name="clicked" handler="queue_pause_clicked_cb" swapped="no"/>
                       </object>
@@ -962,20 +983,13 @@ libx264 authors:
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToolButton" id="queue_add">
+                      <object class="GtkSeparatorToolItem" id="main_tool_sep1">
                         <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">False</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_text" translatable="yes">Add to Queue</property>
-                        <property name="is_important">True</property>
-                        <property name="label" translatable="yes">Enqueue</property>
-                        <property name="icon_name">hb-add-queue</property>
-                        <signal name="clicked" handler="queue_add_clicked_cb" swapped="no"/>
+                        <property name="draw">False</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="homogeneous">True</property>
+                        <property name="expand">True</property>
+                        <property name="homogeneous">False</property>
                       </packing>
                     </child>
                     <child>
@@ -1000,8 +1014,7 @@ Queue</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</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_text" translatable="yes">Open Picture Settings and Preview window.
-Here you can adjust cropping, resolution, aspect ratio, and filters.</property>
+                        <property name="tooltip_text" translatable="yes">Show Preview Window</property>
                         <property name="is_important">True</property>
                         <property name="label" translatable="yes">Show
 Preview</property>
diff --git a/gtk/src/ghb-3.14.ui b/gtk/src/ghb-3.14.ui
index de6ca5653..7164d39b7 100644
--- a/gtk/src/ghb-3.14.ui
+++ b/gtk/src/ghb-3.14.ui
@@ -552,7 +552,7 @@ libx264 authors:
         <signal name="activate" handler="show_hide_toggle_cb" swapped="no"/>
       </object>
       <object class="GtkMenuItem" id="tray_queue_pause">
-        <property name="label" translatable="yes">_Pause Queue</property>
+        <property name="label" translatable="yes">_Pause Encoding</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
@@ -608,7 +608,7 @@ libx264 authors:
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkMenuItem" id="source_open">
-                        <property name="label" translatable="yes">_Source</property>
+                        <property name="label" translatable="yes">Open _Source</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
@@ -617,7 +617,7 @@ libx264 authors:
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="source_title_open">
-                        <property name="label" translatable="yes">Single _Title</property>
+                        <property name="label" translatable="yes">Open Single _Title</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
@@ -626,7 +626,7 @@ libx264 authors:
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="destination_menu_item">
-                        <property name="label" translatable="yes">_Destination</property>
+                        <property name="label" translatable="yes">Set _Destination</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
@@ -697,7 +697,7 @@ libx264 authors:
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="queue_start_menu">
-                        <property name="label" translatable="yes">_Start</property>
+                        <property name="label" translatable="yes">_Start Encoding</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
@@ -706,7 +706,7 @@ libx264 authors:
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="queue_pause_menu">
-                        <property name="label" translatable="yes">_Pause</property>
+                        <property name="label" translatable="yes">_Pause Encoding</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
@@ -919,7 +919,8 @@ libx264 authors:
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="tooltip_text" translatable="yes">Choose Video Source</property>
                         <property name="is_important">True</property>
-                        <property name="label" translatable="yes">Source</property>
+                        <property name="label" translatable="yes">Open
+Source</property>
                         <property name="icon_name">hb-source</property>
                         <signal name="clicked" handler="source_button_clicked_cb" swapped="no"/>
                       </object>
@@ -929,6 +930,24 @@ libx264 authors:
                       </packing>
                     </child>
                     <child>
+                      <object class="GtkToolButton" id="queue_add">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="can_focus">False</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_text" translatable="yes">Add to Queue</property>
+                        <property name="is_important">True</property>
+                        <property name="label" translatable="yes">Add To
+Queue</property>
+                        <property name="icon_name">hb-add-queue</property>
+                        <signal name="clicked" handler="queue_add_clicked_cb" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="homogeneous">True</property>
+                      </packing>
+                    </child>
+                    <child>
                       <object class="GtkToolButton" id="queue_start1">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
@@ -936,7 +955,8 @@ libx264 authors:
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="tooltip_text" translatable="yes">Start Encoding</property>
                         <property name="is_important">True</property>
-                        <property name="label" translatable="yes">Start</property>
+                        <property name="label" translatable="yes">Start
+Encoding</property>
                         <property name="icon_name">hb-start</property>
                         <signal name="clicked" handler="queue_start_clicked_cb" swapped="no"/>
                       </object>
@@ -953,7 +973,8 @@ libx264 authors:
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="tooltip_text" translatable="yes">Pause Encoding</property>
                         <property name="is_important">True</property>
-                        <property name="label" translatable="yes">Pause</property>
+                        <property name="label" translatable="yes">Pause
+Encoding</property>
                         <property name="icon_name">hb-pause</property>
                         <signal name="clicked" handler="queue_pause_clicked_cb" swapped="no"/>
                       </object>
@@ -963,20 +984,13 @@ libx264 authors:
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToolButton" id="queue_add">
+                      <object class="GtkSeparatorToolItem" id="main_tool_sep1">
                         <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">False</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_text" translatable="yes">Add to Queue</property>
-                        <property name="is_important">True</property>
-                        <property name="label" translatable="yes">Enqueue</property>
-                        <property name="icon_name">hb-add-queue</property>
-                        <signal name="clicked" handler="queue_add_clicked_cb" swapped="no"/>
+                        <property name="draw">False</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="homogeneous">True</property>
+                        <property name="expand">True</property>
+                        <property name="homogeneous">False</property>
                       </packing>
                     </child>
                     <child>
@@ -1001,8 +1015,7 @@ Queue</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</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_text" translatable="yes">Open Picture Settings and Preview window.
-Here you can adjust cropping, resolution, aspect ratio, and filters.</property>
+                        <property name="tooltip_text" translatable="yes">Show Preview Window</property>
                         <property name="is_important">True</property>
                         <property name="label" translatable="yes">Show
 Preview</property>
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 4d433a85d..6c3303eb2 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -551,7 +551,7 @@ libx264 authors:
         <signal name="activate" handler="show_hide_toggle_cb" swapped="no"/>
       </object>
       <object class="GtkMenuItem" id="tray_queue_pause">
-        <property name="label" translatable="yes">_Pause Queue</property>
+        <property name="label" translatable="yes">_Pause Encoding</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
@@ -607,7 +607,7 @@ libx264 authors:
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkMenuItem" id="source_open">
-                        <property name="label" translatable="yes">_Source</property>
+                        <property name="label" translatable="yes">Open _Source</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
@@ -616,7 +616,7 @@ libx264 authors:
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="source_title_open">
-                        <property name="label" translatable="yes">Single _Title</property>
+                        <property name="label" translatable="yes">Open Single _Title</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
@@ -625,7 +625,7 @@ libx264 authors:
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="destination_menu_item">
-                        <property name="label" translatable="yes">_Destination</property>
+                        <property name="label" translatable="yes">Set _Destination</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
@@ -696,7 +696,7 @@ libx264 authors:
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="queue_start_menu">
-                        <property name="label" translatable="yes">_Start</property>
+                        <property name="label" translatable="yes">_Start Encoding</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
@@ -705,7 +705,7 @@ libx264 authors:
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="queue_pause_menu">
-                        <property name="label" translatable="yes">_Pause</property>
+                        <property name="label" translatable="yes">_Pause Encoding</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
@@ -918,7 +918,8 @@ libx264 authors:
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="tooltip_text" translatable="yes">Choose Video Source</property>
                         <property name="is_important">True</property>
-                        <property name="label" translatable="yes">Source</property>
+                        <property name="label" translatable="yes">Open
+Source</property>
                         <property name="icon_name">hb-source</property>
                         <signal name="clicked" handler="source_button_clicked_cb" swapped="no"/>
                       </object>
@@ -928,6 +929,24 @@ libx264 authors:
                       </packing>
                     </child>
                     <child>
+                      <object class="GtkToolButton" id="queue_add">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="can_focus">False</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_text" translatable="yes">Add to Queue</property>
+                        <property name="is_important">True</property>
+                        <property name="label" translatable="yes">Add To
+Queue</property>
+                        <property name="icon_name">hb-add-queue</property>
+                        <signal name="clicked" handler="queue_add_clicked_cb" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="homogeneous">True</property>
+                      </packing>
+                    </child>
+                    <child>
                       <object class="GtkToolButton" id="queue_start1">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
@@ -935,7 +954,8 @@ libx264 authors:
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="tooltip_text" translatable="yes">Start Encoding</property>
                         <property name="is_important">True</property>
-                        <property name="label" translatable="yes">Start</property>
+                        <property name="label" translatable="yes">Start
+Encoding</property>
                         <property name="icon_name">hb-start</property>
                         <signal name="clicked" handler="queue_start_clicked_cb" swapped="no"/>
                       </object>
@@ -952,7 +972,8 @@ libx264 authors:
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="tooltip_text" translatable="yes">Pause Encoding</property>
                         <property name="is_important">True</property>
-                        <property name="label" translatable="yes">Pause</property>
+                        <property name="label" translatable="yes">Pause
+Encoding</property>
                         <property name="icon_name">hb-pause</property>
                         <signal name="clicked" handler="queue_pause_clicked_cb" swapped="no"/>
                       </object>
@@ -962,20 +983,13 @@ libx264 authors:
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToolButton" id="queue_add">
+                      <object class="GtkSeparatorToolItem" id="main_tool_sep1">
                         <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">False</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_text" translatable="yes">Add to Queue</property>
-                        <property name="is_important">True</property>
-                        <property name="label" translatable="yes">Enqueue</property>
-                        <property name="icon_name">hb-add-queue</property>
-                        <signal name="clicked" handler="queue_add_clicked_cb" swapped="no"/>
+                        <property name="draw">False</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="homogeneous">True</property>
+                        <property name="expand">True</property>
+                        <property name="homogeneous">False</property>
                       </packing>
                     </child>
                     <child>
@@ -1000,8 +1014,7 @@ Queue</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</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_text" translatable="yes">Open Picture Settings and Preview window.
-Here you can adjust cropping, resolution, aspect ratio, and filters.</property>
+                        <property name="tooltip_text" translatable="yes">Show Preview Window</property>
                         <property name="is_important">True</property>
                         <property name="label" translatable="yes">Show
 Preview</property>
diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index 1aabc5298..61ed78a16 100644
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -2066,14 +2066,14 @@ ghb_queue_buttons_grey(signal_user_data_t *ud)
     {
         gtk_widget_set_sensitive (widget, TRUE);
         gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-stop");
-        gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Stop"));
+        gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Stop\nEncoding"));
         gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), _("Stop Encoding"));
     }
     else
     {
         gtk_widget_set_sensitive (widget, show_start);
         gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-start");
-        gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Start"));
+        gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Start\nEncoding"));
         gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), _("Start Encoding"));
     }
     widget = GHB_WIDGET (ud->builder, "queue_pause1");
@@ -2081,14 +2081,14 @@ ghb_queue_buttons_grey(signal_user_data_t *ud)
     {
         gtk_widget_set_sensitive (widget, show_stop);
         gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-start");
-        gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Resume"));
+        gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Resume\nEncoding"));
         gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), _("Resume Encoding"));
     }
     else
     {
         gtk_widget_set_sensitive (widget, show_stop);
         gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-pause");
-        gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Pause"));
+        gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Pause\nEncoding"));
         gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), _("Pause Encoding"));
     }
 
@@ -2096,26 +2096,26 @@ ghb_queue_buttons_grey(signal_user_data_t *ud)
     if (show_stop)
     {
         gtk_widget_set_sensitive (widget, TRUE);
-        gtk_menu_item_set_label(GTK_MENU_ITEM(widget), _("S_top Queue"));
+        gtk_menu_item_set_label(GTK_MENU_ITEM(widget), _("S_top Encoding"));
         gtk_widget_set_tooltip_text(widget, _("Stop Encoding"));
     }
     else
     {
         gtk_widget_set_sensitive (widget, show_start);
-        gtk_menu_item_set_label(GTK_MENU_ITEM(widget), _("_Start Queue"));
+        gtk_menu_item_set_label(GTK_MENU_ITEM(widget), _("_Start Encoding"));
         gtk_widget_set_tooltip_text(widget, _("Start Encoding"));
     }
     widget = GHB_WIDGET (ud->builder, "queue_pause_menu");
     if (paused)
     {
         gtk_widget_set_sensitive (widget, show_start);
-        gtk_menu_item_set_label(GTK_MENU_ITEM(widget), _("_Resume Queue"));
+        gtk_menu_item_set_label(GTK_MENU_ITEM(widget), _("_Resume Encoding"));
         gtk_widget_set_tooltip_text(widget, _("Resume Encoding"));
     }
     else
     {
         gtk_widget_set_sensitive (widget, show_stop);
-        gtk_menu_item_set_label(GTK_MENU_ITEM(widget), _("_Pause Queue"));
+        gtk_menu_item_set_label(GTK_MENU_ITEM(widget), _("_Pause Encoding"));
         gtk_widget_set_tooltip_text(widget, _("Pause Encoding"));
     }
 }