diff --git a/gtk/actions.c b/gtk/actions.c
index 2a852abcb..ae04bac56 100644
--- a/gtk/actions.c
+++ b/gtk/actions.c
@@ -38,18 +38,13 @@ action_cb ( GtkAction * a, gpointer user_data )
 #define GTK_STOCK_INFO GTK_STOCK_PROPERTIES
 #endif
 
-#if !GTK_CHECK_VERSION(2,10,0)
-#define GTK_STOCK_SELECT_ALL NULL
-#endif
-
 static GtkRadioActionEntry sort_radio_entries[] =
 {
   { "sort-by-activity",   NULL, N_("Sort by _Activity"),   NULL, NULL, 0 },
-  { "sort-by-date-added", NULL, N_("Sort by _Date Added"), NULL, NULL, 1 },
-  { "sort-by-name",       NULL, N_("Sort by _Name"),       NULL, NULL, 2 },
-  { "sort-by-progress",   NULL, N_("Sort by _Progress"),   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-name",       NULL, N_("Sort by _Name"),       NULL, NULL, 1 },
+  { "sort-by-progress",   NULL, N_("Sort by _Progress"),   NULL, NULL, 2 },
+  { "sort-by-state",      NULL, N_("Sort by _State"),      NULL, NULL, 3 },
+  { "sort-by-tracker",    NULL, N_("Sort by _Tracker"),    NULL, NULL, 4 }
 };
 
 static void
@@ -118,7 +113,8 @@ static GtkActionEntry entries[] =
     N_("Close main window"),
     G_CALLBACK(action_cb) },
   { "quit", GTK_STOCK_QUIT, N_("_Quit"), NULL, NULL, G_CALLBACK(action_cb) },
-  { "select-all", GTK_STOCK_SELECT_ALL, NULL, "<control>A", NULL, G_CALLBACK(action_cb) },
+  { "select-all", NULL,
+    N_( "Select _All" ), "<control>A", NULL, G_CALLBACK(action_cb) },
   { "unselect-all", NULL,
     N_("Dese_lect All"), "<shift><control>A", NULL, G_CALLBACK(action_cb) },
   { "edit-preferences", GTK_STOCK_PREFERENCES, NULL, NULL, NULL, G_CALLBACK(action_cb) },
diff --git a/gtk/details.c b/gtk/details.c
index 40ba17cb3..7f640b56e 100644
--- a/gtk/details.c
+++ b/gtk/details.c
@@ -719,11 +719,11 @@ info_page_new (tr_torrent * tor)
 
     l = gtk_label_new (tr_torrentGetFolder (tor));
     gtk_label_set_ellipsize( GTK_LABEL( l ), PANGO_ELLIPSIZE_END );
-    hig_workarea_add_row (t, &row, _( "Destination folder" ), l, NULL); 
+    hig_workarea_add_row (t, &row, _( "Destination folder:" ), l, NULL); 
 
     l = gtk_label_new ( info->torrent );
     gtk_label_set_ellipsize( GTK_LABEL( l ), PANGO_ELLIPSIZE_END );
-    hig_workarea_add_row (t, &row, _( "Torrent file" ), l, NULL); 
+    hig_workarea_add_row (t, &row, _( "Torrent file:" ), l, NULL); 
 
   hig_workarea_finish (t, &row);
   return t;
@@ -1001,7 +1001,7 @@ options_page_new ( TrTorrent * gtor )
     maxConnectedPeers = tr_torrentGetMaxConnectedPeers( tor );
     w = gtk_spin_button_new_with_range( 1, 3000, 5 );
     gtk_spin_button_set_value( GTK_SPIN_BUTTON( w ), maxConnectedPeers );
-    hig_workarea_add_row( t, &row, _( "_Maximum number of peers:" ), w, w );
+    hig_workarea_add_row( t, &row, _( "_Maximum peers:" ), w, w );
     g_signal_connect( w, "value-changed", G_CALLBACK( max_peers_spun_cb ), gtor );
 
 #if 0
diff --git a/gtk/open-dialog.c b/gtk/open-dialog.c
index 46e6637e4..54161f16b 100644
--- a/gtk/open-dialog.c
+++ b/gtk/open-dialog.c
@@ -144,7 +144,7 @@ openSingleTorrentDialog( GtkWindow  * parent,
     uint8_t flag;
 
     /* make the dialog */
-    d = gtk_dialog_new_with_buttons( _( "Open Torrent" ), parent,
+    d = gtk_dialog_new_with_buttons( _( "Torrent Options" ), parent,
             GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_NO_SEPARATOR,
             GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
             GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
@@ -272,7 +272,7 @@ openDialog( GtkWindow * parent,
     GtkFileFilter * filter;
     char * folder;
 
-    w = gtk_file_chooser_dialog_new( _( "Select Torrents" ), parent,
+    w = gtk_file_chooser_dialog_new( _( "Open a Torrent" ), parent,
                                      GTK_FILE_CHOOSER_ACTION_OPEN,
                                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                                      GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,