[glom] Provide context for translations.

[Murray Cumming <murrayc src gnome org>]

commit 7555d4474069a252081ea7a81a3a307991237f82
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Apr 12 09:44:09 2010 +0200

    Provide context for translations.
    
    	* glom/application.cc:
    	* glom/frame_glom.cc:
    	* glom/mode_design/users/dialog_users_list.cc: Use the new (in glib 2.16)
        C_() macro to provide context for bare uses of "User" and "Developer",
        providing some explanation and allowing translators to use translate them
        differently, as may be required by some languages.
        Fixes bug #606931 (Urmas, André Klapper)

 ChangeLog                                   |   12 ++++++++++++
 glom/application.cc                         |    8 ++++----
 glom/frame_glom.cc                          |    5 +++--
 glom/mode_design/users/dialog_users_list.cc |    2 +-
 4 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index de458a1..d4e0f39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 1.14.0:
 
+2010-04-12  Murray Cumming  <murrayc murrayc com>
+
+	Provide context for translations.
+
+	* glom/application.cc:
+	* glom/frame_glom.cc:
+	* glom/mode_design/users/dialog_users_list.cc: Use the new (in glib 2.16) 
+    C_() macro to provide context for bare uses of "User" and "Developer", 
+    providing some explanation and allowing translators to use translate them 
+    differently, as may be required by some languages.
+    Fixes bug #606931 (Urmas, André Klapper)
+
 2010-04-10  Murray Cumming  <murrayc murrayc-x61>
 
   dialog_run_with_help(): Get the help ID from the class.
diff --git a/glom/application.cc b/glom/application.cc
index ca5e2cf..5dfd61d 100644
--- a/glom/application.cc
+++ b/glom/application.cc
@@ -41,7 +41,6 @@
 #include <memory> //For std::auto_ptr<>
 #include <giomm.h>
 #include <sstream> //For stringstream.
-#include <glibmm/i18n.h>
 
 #ifdef GLOM_ENABLE_MAEMO
 #include <hildon/hildon.h>
@@ -63,6 +62,7 @@
 
 #include <gtk/gtkuimanager.h>
 
+#include <glibmm/i18n.h>
 
 namespace Glom
 {
@@ -449,11 +449,11 @@ void Application::init_menus()
   m_refActionGroup_Others->add(Gtk::Action::create("Glom_Menu_userlevel", _("_User Level")));
   Gtk::RadioAction::Group group_userlevel;
 
-  m_action_menu_userlevel_developer = Gtk::RadioAction::create(group_userlevel, "GlomAction_Menu_userlevel_Developer", _("_Developer"));
+  m_action_menu_userlevel_developer = Gtk::RadioAction::create(group_userlevel, "GlomAction_Menu_userlevel_Developer", C_("User-level menu item", "_Developer"));
   m_refActionGroup_Others->add(m_action_menu_userlevel_developer,
                         sigc::mem_fun(*this, &Application::on_menu_userlevel_developer) );
 
-  m_action_menu_userlevel_operator =  Gtk::RadioAction::create(group_userlevel, "GlomAction_Menu_userlevel_Operator", _("_Operator"));
+  m_action_menu_userlevel_operator =  Gtk::RadioAction::create(group_userlevel, "GlomAction_Menu_userlevel_Operator", C_("User-level menu item", "_Operator"));
   m_refActionGroup_Others->add(m_action_menu_userlevel_operator,
                           sigc::mem_fun(*this, &Application::on_menu_userlevel_operator) );
 #endif // !GLOM_ENABLE_CLIENT_ONLY
@@ -474,7 +474,7 @@ void Application::init_menus()
   m_listTableSensitiveActions.push_back(action);
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
-  action = Gtk::Action::create("Glom_Menu_Developer", _("_Developer"));
+  action = Gtk::Action::create("Glom_Menu_Developer", C_("Developer menu title", "_Developer"));
   m_listDeveloperActions.push_back(action);
   m_refActionGroup_Others->add(action);
 
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index 1b18545..57a6e5b 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -1521,9 +1521,10 @@ void Frame_Glom::on_notebook_find_criteria(const Glib::ustring& where_clause)
 void Frame_Glom::on_userlevel_changed(AppState::userlevels userlevel)
 {
   //show user level:
-  Glib::ustring user_level_name = _("Operator");
+  //The _C macro provides translator context.
+  Glib::ustring user_level_name = C_("Mode", "Operator");
   if(userlevel == AppState::USERLEVEL_DEVELOPER)
-    user_level_name = _("Developer");
+    user_level_name = C_("Mode", "Developer");
 
   if(m_pLabel_userlevel)
     m_pLabel_userlevel->set_text(user_level_name);
diff --git a/glom/mode_design/users/dialog_users_list.cc b/glom/mode_design/users/dialog_users_list.cc
index 579199e..76fd1b4 100644
--- a/glom/mode_design/users/dialog_users_list.cc
+++ b/glom/mode_design/users/dialog_users_list.cc
@@ -64,7 +64,7 @@ Dialog_UsersList::Dialog_UsersList(BaseObjectType* cobject, const Glib::RefPtr<G
 
 
     // Append the View columns:
-    m_treeview_users->append_column(_("User"), m_model_columns_users.m_col_name);
+    m_treeview_users->append_column(C_("Users List", "User"), m_model_columns_users.m_col_name);
   }