bakery r121 - in trunk: . bakery/App

[murrayc svn gnome org]

Author: murrayc
Date: Thu Dec 11 16:11:16 2008
New Revision: 121
URL: http://svn.gnome.org/viewvc/bakery?rev=121&view=rev

Log:
2008-12-11  Murray Cumming  <murrayc murrayc com>

* bakery/App/App_Gtk.cc:
* bakery/App/App_WithDoc_Gtk.cc: Mark the File, Edit, and Help 
menu titles for translation.
Ubuntu bug https://bugs.launchpad.net/ubuntu/+source/glom/+bug/306942

Modified:
   trunk/ChangeLog
   trunk/bakery/App/App_Gtk.cc
   trunk/bakery/App/App_WithDoc_Gtk.cc

Modified: trunk/bakery/App/App_Gtk.cc
==============================================================================
--- trunk/bakery/App/App_Gtk.cc	(original)
+++ trunk/bakery/App/App_Gtk.cc	Thu Dec 11 16:11:16 2008
@@ -23,7 +23,7 @@
 #include <gtkmm/aboutdialog.h>
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/toolbutton.h>
-#include <libintl.h>
+#include <glibmm/i18n-lib.h>
 #include <algorithm>
 #include <iostream>
 
@@ -244,7 +244,7 @@
 
   //Build actions:
   m_refFileActionGroup = ActionGroup::create("BakeryFileActions");
-  m_refFileActionGroup->add(Action::create("BakeryAction_Menu_File", "_File"));
+  m_refFileActionGroup->add(Action::create("BakeryAction_Menu_File", _("File")));
 
   m_refFileActionGroup->add(Action::create("BakeryAction_File_New", Gtk::Stock::NEW),
                         sigc::mem_fun((Bakery::App&)*this, &App_Gtk::on_menu_file_new));
@@ -287,7 +287,7 @@
   
   //Build actions:
   m_refEditActionGroup = ActionGroup::create("BakeryEditActions");
-  m_refEditActionGroup->add(Action::create("BakeryAction_Menu_Edit", "_Edit"));
+  m_refEditActionGroup->add(Action::create("BakeryAction_Menu_Edit", _("_Edit")));
   
   m_refEditActionGroup->add(Action::create("BakeryAction_Edit_Cut", Gtk::Stock::CUT));
   m_refEditActionGroup->add(Action::create("BakeryAction_Edit_Copy", Gtk::Stock::COPY));
@@ -330,7 +330,7 @@
 
   //Build actions:
   m_refHelpActionGroup = ActionGroup::create("BakeryHelpActions");
-  m_refHelpActionGroup->add(Action::create("BakeryAction_Menu_Help", "_Help")); //TODO: Use stock?
+  m_refHelpActionGroup->add(Action::create("BakeryAction_Menu_Help", _("_Help")));
 
   //TODO: Use stock?
   m_refHelpActionGroup->add(Action::create("BakeryAction_Help_About",

Modified: trunk/bakery/App/App_WithDoc_Gtk.cc
==============================================================================
--- trunk/bakery/App/App_WithDoc_Gtk.cc	(original)
+++ trunk/bakery/App/App_WithDoc_Gtk.cc	Thu Dec 11 16:11:16 2008
@@ -28,7 +28,7 @@
 #include <gtkmm/recentchoosermenu.h>
 #endif // GTKMM_GEQ_2_10
 #include <algorithm>
-#include <libintl.h>
+#include <glibmm/i18n-lib.h>
 
 //#include <gtk/gtkfilesel.h>
 
@@ -147,7 +147,7 @@
   //Build actions:
   m_refFileActionGroup = Gtk::ActionGroup::create("BakeryFileActions");
 
-  m_refFileActionGroup->add(Gtk::Action::create("BakeryAction_Menu_File", gettext("_File")));
+  m_refFileActionGroup->add(Gtk::Action::create("BakeryAction_Menu_File", _("_File")));
   m_refFileActionGroup->add(Gtk::Action::create("BakeryAction_Menu_File_RecentFiles", gettext("_Recent Files")));
 
   //File actions