* Fixed NB#97909, replaced a logical id "New accounts" in the Folder View

[modest] / src / hildon2 / modest-folder-window.c

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index 8dd66b8..11aa375 100644 (file)
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -264,18 +264,24 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
         */
 
        /* Register edit modes */
-       modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_DELETE,
-                                                 _("mcen_ti_edit_folder_delete"), _HL("wdgt_bd_delete"),
+       modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), 
+                                                 EDIT_MODE_COMMAND_DELETE,
+                                                 _("mcen_ti_edit_folder_delete"), 
+                                                 _HL("wdgt_bd_delete"),
                                                  GTK_TREE_VIEW (priv->folder_view),
                                                  GTK_SELECTION_SINGLE,
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_delete_folder));
-       modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE,
-                                                 _("mcen_ti_edit_move_folder"), _("mcen_me_move"),
+       modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), 
+                                                 EDIT_MODE_COMMAND_MOVE,
+                                                 _("mcen_ti_edit_move_folder"), 
+                                                 _("mcen_me_move"),
                                                  GTK_TREE_VIEW (priv->folder_view),
                                                  GTK_SELECTION_SINGLE,
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to)); 
-       modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_RENAME,
-                                                 _("mcen_ti_edit_rename_folde"), _HL("wdgt_bd_rename"),
+       modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), 
+                                                 EDIT_MODE_COMMAND_RENAME,
+                                                 _("mcen_ti_edit_rename_folder"), 
+                                                 _HL("wdgt_bd_rename"),
                                                  GTK_TREE_VIEW (priv->folder_view),
                                                  GTK_SELECTION_SINGLE,
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_rename_folder));
@@ -343,7 +349,7 @@ static void setup_menu (ModestFolderWindow *self)
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_folder"), NULL,
                                           APP_MENU_CALLBACK (modest_ui_actions_on_new_folder),
                                           NULL);
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_user_renamefolder"), NULL,
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_rename_folder"), NULL,
                                           APP_MENU_CALLBACK (set_rename_edit_mode),
                                           NULL);
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_move_folder"), NULL,
@@ -354,7 +360,7 @@ static void setup_menu (ModestFolderWindow *self)
                                           NULL);
 
        /* new message */
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_newemail"), "<Ctrl>n",
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "<Ctrl>n",
                                           APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
                                           NULL);
 
@@ -367,7 +373,7 @@ static void setup_menu (ModestFolderWindow *self)
                                           MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
 
        /* Settings menu buttons */
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_accounts"), NULL,
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_account"), NULL,
                                           APP_MENU_CALLBACK (modest_ui_actions_on_new_account),
                                           NULL);
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_edit_accounts"), NULL,