diff --git a/gtk/actions.c b/gtk/actions.c
index cd2ab98db..4fd39aef6 100644
--- a/gtk/actions.c
+++ b/gtk/actions.c
@@ -46,15 +46,15 @@ action_cb( GtkAction * a,
 
 static GtkRadioActionEntry sort_radio_entries[] =
 {
-    { "sort-by-activity", NULL, N_( "Sort by _Activity" ), NULL, NULL, 0 },
-    { "sort-by-name",     NULL, N_( "Sort by _Name" ),     NULL, NULL, 1 },
-    { "sort-by-progress", NULL, N_( "Sort by _Progress" ), NULL, NULL, 2 },
-    { "sort-by-ratio",    NULL, N_( "Sort by _Ratio" ),    NULL, NULL, 3 },
-    { "sort-by-state",    NULL, N_( "Sort by _State" ),    NULL, NULL, 4 },
-    { "sort-by-tracker",  NULL, N_( "Sort by _Tracker" ),  NULL, NULL, 5 },
-    { "sort-by-age",      NULL, N_( "Sort by A_ge" ),      NULL, NULL, 6 },
-    { "sort-by-eta",      NULL, N_( "Sort by _ETA" ),      NULL, NULL, 7 },
-    { "sort-by-size",     NULL, N_( "Sort by Si_ze" ),     NULL, NULL, 8 }
+    { "sort-by-activity",  NULL, N_( "Sort by _Activity" ),  NULL, NULL, 0 },
+    { "sort-by-name",      NULL, N_( "Sort by _Name" ),      NULL, NULL, 1 },
+    { "sort-by-progress",  NULL, N_( "Sort by _Progress" ),  NULL, NULL, 2 },
+    { "sort-by-ratio",     NULL, N_( "Sort by Rati_o" ),     NULL, NULL, 3 },
+    { "sort-by-state",     NULL, N_( "Sort by Stat_e" ),     NULL, NULL, 4 },
+    { "sort-by-tracker",   NULL, N_( "Sort by T_racker" ),   NULL, NULL, 5 },
+    { "sort-by-age",       NULL, N_( "Sort by A_ge" ),       NULL, NULL, 6 },
+    { "sort-by-time-left", NULL, N_( "Sort by Time _Left" ), NULL, NULL, 7 },
+    { "sort-by-size",      NULL, N_( "Sort by Si_ze" ),      NULL, NULL, 8 }
 };
 
 static void
@@ -89,7 +89,7 @@ static GtkToggleActionEntry  pref_toggle_entries[] =
 {
     { "alt-speed-enabled", NULL, N_( "Temporary  Speed _Limits" ), NULL, NULL, G_CALLBACK( toggle_pref_cb ), FALSE },
     { "minimal-view",      NULL, N_( "_Minimal View" ), "<alt>M", NULL, G_CALLBACK( toggle_pref_cb ), FALSE },
-    { "sort-reversed",     NULL, N_( "_Reverse Sort Order" ), NULL, NULL, G_CALLBACK( toggle_pref_cb ), FALSE },
+    { "sort-reversed",     NULL, N_( "Re_verse Sort Order" ), NULL, NULL, G_CALLBACK( toggle_pref_cb ), FALSE },
     { "show-filterbar",    NULL, N_( "_Filterbar" ), NULL, NULL, G_CALLBACK( toggle_pref_cb ), FALSE },
     { "show-statusbar",    NULL, N_( "_Statusbar" ), NULL, NULL, G_CALLBACK( toggle_pref_cb ), FALSE },
     { "show-toolbar",      NULL, N_( "_Toolbar" ), NULL, NULL, G_CALLBACK( toggle_pref_cb ), FALSE }
diff --git a/gtk/ui.h b/gtk/ui.h
index fd341bcb3..ffad2b535 100644
--- a/gtk/ui.h
+++ b/gtk/ui.h
@@ -36,12 +36,12 @@ static const char * fallback_ui_file =
     "      <separator/>\n"
     "      <menuitem action='sort-by-activity'/>\n"
     "      <menuitem action='sort-by-age'/>\n"
-    "      <menuitem action='sort-by-eta'/>\n"
     "      <menuitem action='sort-by-name'/>\n"
     "      <menuitem action='sort-by-progress'/>\n"
     "      <menuitem action='sort-by-ratio'/>\n"
     "      <menuitem action='sort-by-size'/>\n"
     "      <menuitem action='sort-by-state'/>\n"
+    "      <menuitem action='sort-by-time-left'/>\n"
     "      <menuitem action='sort-by-tracker'/>\n"
     "      <separator/>\n"
     "      <menuitem action='sort-reversed'/>\n"
diff --git a/qt/mainwin.ui b/qt/mainwin.ui
index 17902fd48..cc27fdb82 100644
--- a/qt/mainwin.ui
+++ b/qt/mainwin.ui
@@ -118,12 +118,12 @@
     <addaction name="separator"/>
     <addaction name="action_SortByActivity"/>
     <addaction name="action_SortByAge"/>
-    <addaction name="action_SortByETA"/>
     <addaction name="action_SortByName"/>
     <addaction name="action_SortByProgress"/>
     <addaction name="action_SortByRatio"/>
     <addaction name="action_SortBySize"/>
     <addaction name="action_SortByState"/>
+    <addaction name="action_SortByETA"/>
     <addaction name="action_SortByTracker"/>
     <addaction name="separator"/>
     <addaction name="action_ReverseSortOrder"/>
@@ -367,7 +367,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Sort by &amp;ETA</string>
+    <string>Sort by Time &amp;Left</string>
    </property>
   </action>
   <action name="action_SortByName">
@@ -391,7 +391,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Sort by &amp;Ratio</string>
+    <string>Sort by Rati&amp;o</string>
    </property>
   </action>
   <action name="action_SortBySize">
@@ -407,7 +407,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Sort by &amp;State</string>
+    <string>Sort by Stat&amp;e</string>
    </property>
   </action>
   <action name="action_SortByTracker">
@@ -415,7 +415,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Sort by &amp;Tracker</string>
+    <string>Sort by T&amp;racker</string>
    </property>
   </action>
   <action name="action_ShowMessageLog">
@@ -449,7 +449,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>&amp;Reverse Sort Order</string>
+    <string>Re&amp;verse Sort Order</string>
    </property>
   </action>
   <action name="action_FilterByName">