updated to latest trunk

(bzr r14876.2.4)

1 files changed, 4 insertions, 6 deletions

diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp
index 11e75391b..a1d4d88b8 100644
--- a/src/ui/dialog/tracedialog.cpp
+++ b/src/ui/dialog/tracedialog.cpp
@@ -12,18 +12,16 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include "config.h"
 #endif
 
 #include "tracedialog.h"
 #include <gtkmm/notebook.h>
 #include <gtkmm/frame.h>
+#include <gtkmm/radiobutton.h>
 #include "ui/widget/spinbutton.h"
 #include "ui/widget/frame.h"
-#include <gtkmm/radiobutton.h>
-#include <gtkmm/stock.h>
 
-#include <gtk/gtk.h> //for GTK_RESPONSE* types
 #include <glibmm/i18n.h>
 
 #include "desktop.h"
@@ -814,12 +812,12 @@ TraceDialogImpl::TraceDialogImpl() :
     mainResetButton ->set_tooltip_text(_("Reset all settings to defaults"));
 
     //## The OK button
-    mainCancelButton = addResponseButton(Gtk::Stock::STOP, GTK_RESPONSE_CANCEL);
+    mainCancelButton = addResponseButton(_("_Stop"), GTK_RESPONSE_CANCEL);
     if (mainCancelButton) {
 	mainCancelButton->set_tooltip_text(_("Abort a trace in progress"));
 	mainCancelButton->set_sensitive(false);
     }
-    mainOkButton = addResponseButton(Gtk::Stock::OK, GTK_RESPONSE_OK);
+    mainOkButton = addResponseButton(_("_OK"), GTK_RESPONSE_OK);
     mainOkButton->set_tooltip_text(_("Execute the trace"));
 
     show_all_children();