merge from trunk (r11929)

[win32] Please update to latest devlibs for Windows (r41)

(bzr r11668.1.44)

1 files changed, 8 insertions, 23 deletions

diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 8cf48f827..9d4ab5d8a 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -15,6 +15,8 @@
 #include <iostream>
 #include <algorithm>
 
+#include <glibmm/i18n.h>
+
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/label.h>
 #include <gtkmm/table.h>
@@ -97,16 +99,12 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
   guint row = 0;
 
   /******************** Symbol Sets *************************/
-  Gtk::Label* labelSet = new Gtk::Label("Symbol set: ");
+  Gtk::Label* labelSet = new Gtk::Label(_("Symbol set: "));
   table->attach(*Gtk::manage(labelSet),0,1,row,row+1,Gtk::SHRINK,Gtk::SHRINK);
 
   symbolSet = new Gtk::ComboBoxText();  // Fill in later
-#if WITH_GTKMM_2_24
-  symbolSet->append("Current Document");
-#else
-  symbolSet->append_text("Current Document");
-#endif
-  symbolSet->set_active_text("Current Document");
+  symbolSet->append(_("Current Document"));
+  symbolSet->set_active_text(_("Current Document"));
   table->attach(*Gtk::manage(symbolSet),1,2,row,row+1,Gtk::FILL|Gtk::EXPAND,Gtk::SHRINK);
 
   sigc::connection connSet =
@@ -142,18 +140,14 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
   ++row;
 
   /******************** Preview Scale ***********************/
-  Gtk::Label* labelScale = new Gtk::Label("Preview scale: ");
+  Gtk::Label* labelScale = new Gtk::Label(_("Preview scale: "));
   table->attach(*Gtk::manage(labelScale),0,1,row,row+1,Gtk::SHRINK,Gtk::SHRINK);
 
   previewScale = new Gtk::ComboBoxText();
   const gchar *scales[] =
-    {"Fit", "Fit to width", "Fit to height", "0.1", "0.2", "0.5", "1.0", "2.0", "5.0", NULL};
+    {_("Fit"), _("Fit to width"), _("Fit to height"), "0.1", "0.2", "0.5", "1.0", "2.0", "5.0", NULL};
   for( int i = 0; scales[i]; ++i ) {
-#if WITH_GTKMM_2_24
     previewScale->append(scales[i]);
-#else
-    previewScale->append_text(scales[i]);
-#endif
   }
   previewScale->set_active_text(scales[0]);
   table->attach(*Gtk::manage(previewScale),1,2,row,row+1,Gtk::FILL|Gtk::EXPAND,Gtk::SHRINK);
@@ -165,18 +159,13 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
   ++row;
 
   /******************** Preview Size ************************/
-  Gtk::Label* labelSize = new Gtk::Label("Preview size: ");
+  Gtk::Label* labelSize = new Gtk::Label(_("Preview size: "));
   table->attach(*Gtk::manage(labelSize),0,1,row,row+1,Gtk::SHRINK,Gtk::SHRINK);
 
   previewSize = new Gtk::ComboBoxText();
   const gchar *sizes[] = {"16", "24", "32", "48", "64", NULL};
   for( int i = 0; sizes[i]; ++i ) {
-#if WITH_GTKMM_2_24
     previewSize->append(sizes[i]);
-#else
-    previewSize->append_text(sizes[i]);
-#endif
-
   }
   previewSize->set_active_text(sizes[2]);
   table->attach(*Gtk::manage(previewSize),1,2,row,row+1,Gtk::FILL|Gtk::EXPAND,Gtk::SHRINK);
@@ -331,11 +320,7 @@ void SymbolsDialog::get_symbols() {
 	    SPDocument* symbol_doc = SPDocument::createNewDoc( fullname, FALSE );
 	    if( symbol_doc ) {
 	      symbolSets[Glib::ustring(filename)]= symbol_doc;
-#if WITH_GTKMM_2_24
 	      symbolSet->append(filename);
-#else
-	      symbolSet->append_text(filename);
-#endif
 	    }
 	  }
 	  g_free( fullname );