* Fixed several logical id transations.

* Fixes: NB#60765, NB#60768, NB#60770, NB#60771, NB#60774, NB#60774
* Fixes: NB#60775, NB#60776, NB#60777, NB#60954, NB#60952, NB#60953
* Fixes: NB#60964, NB#60968

pmo-trunk-r2289

diff --git a/src/maemo/modest-main-window-ui.h b/src/maemo/modest-main-window-ui.h
index 1299510..22f1865 100644 (file)
--- a/src/maemo/modest-main-window-ui.h
+++ b/src/maemo/modest-main-window-ui.h
@@ -83,8 +83,8 @@ static const GtkActionEntry modest_action_entries [] = {
        /* View */
        { "ViewSort",            NULL,        N_("mcen_me_inbox_sort"),     NULL,      NULL,  G_CALLBACK (modest_ui_actions_on_sort) },
        { "ViewShowToolbar", NULL, N_("mcen_me_inbox_toolbar") }, /* submenu */
-       { "ViewPreviousMessage", NULL,    N_("qgn_toolb_gene_back"),         NULL, NULL, G_CALLBACK (modest_ui_actions_on_prev) },
-       { "ViewNextMessage", NULL, N_("qgn_toolb_gene_forward"),      NULL, NULL, G_CALLBACK (modest_ui_actions_on_next) },
+       { "ViewPreviousMessage", NULL,    N_("mcen_me_viewer_previousmessage"),         NULL, NULL, G_CALLBACK (modest_ui_actions_on_prev) },
+       { "ViewNextMessage", NULL, N_("mcen_me_viewer_nextmessage"),      NULL, NULL, G_CALLBACK (modest_ui_actions_on_next) },
 
        /* Attachments */
        { "ViewAttachment", NULL, N_("mcen_me_viewer_view_attachment"), NULL, NULL, G_CALLBACK (modest_ui_actions_view_attachment) },

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index d8ece67..b1d0ab6 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -132,6 +132,11 @@ _on_msg_count_changed (ModestHeaderView *header_view,
 
 static GtkWidget * create_empty_view (void);
 
+static gchar * 
+translate_func (const gchar *msgid,
+               const gchar *domain_name);
+
+
 /* list my signals */
 enum {
        /* MY_SIGNAL_1, */
@@ -685,10 +690,11 @@ modest_main_window_new (void)
 
        action_group = gtk_action_group_new ("ModestMainWindowActions");
        gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
+       gtk_action_group_set_translate_func (action_group, (GtkTranslateFunc) translate_func, GETTEXT_PACKAGE, g_free);
 
        menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules");
        toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules");
-       
+
        /* Add common actions */
        gtk_action_group_add_actions (action_group,
                                      modest_action_entries,
@@ -1844,3 +1850,10 @@ on_send_receive_csm_activated (GtkMenuItem *item,
 {
        refresh_account ((const gchar*) user_data);
 }
+
+static gchar * 
+translate_func (const gchar *msgid,
+               const gchar *domain_name)
+{
+       return _(msgid);
+}

diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index f9b7d6f..3b51a95 100644 (file)
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -104,6 +104,10 @@ static gboolean set_toolbar_transfer_mode     (ModestMsgViewWindow *self);
 
 static void update_window_title (ModestMsgViewWindow *window);
 
+static gchar * 
+translate_func (const gchar *msgid,
+               const gchar *domain_name);
+
 /* list my signals */
 enum {
        /* MY_SIGNAL_1, */
@@ -525,6 +529,7 @@ modest_msg_view_window_new (TnyMsg *msg,
 
        action_group = gtk_action_group_new ("ModestMsgViewWindowActions");
        gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
+       gtk_action_group_set_translate_func (action_group, (GtkTranslateFunc) translate_func, GETTEXT_PACKAGE, g_free);
 
        menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules");
        toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules");
@@ -1748,3 +1753,10 @@ update_window_title (ModestMsgViewWindow *window)
 
        gtk_window_set_title (GTK_WINDOW (window), subject);
 }
+
+static gchar * 
+translate_func (const gchar *msgid,
+               const gchar *domain_name)
+{
+       return _(msgid);
+}