From ea45f41e492d40f8977b82d17b0065bbdcab6280 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Mon, 12 Jan 2009 10:18:52 +0000 Subject: [PATCH] * Fixes NB#97657, replace "TODO" strings by the proper logical ids pmo-trunk-r7095 --- src/hildon2/modest-accounts-window.c | 4 ++-- src/hildon2/modest-folder-window.c | 16 ++++++++-------- src/hildon2/modest-header-window.c | 4 ++-- src/hildon2/modest-msg-edit-window.c | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/hildon2/modest-accounts-window.c b/src/hildon2/modest-accounts-window.c index 0b4b1ee..d5f4e99 100644 --- a/src/hildon2/modest-accounts-window.c +++ b/src/hildon2/modest-accounts-window.c @@ -282,10 +282,10 @@ setup_menu (ModestAccountsWindow *self) g_return_if_fail (MODEST_IS_ACCOUNTS_WINDOW(self)); /* Settings menu buttons */ - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("TODO: new account"), + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_account"), APP_MENU_CALLBACK (modest_ui_actions_on_new_account), NULL); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("TODO: edit accounts"), + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_edit_accounts"), APP_MENU_CALLBACK (modest_ui_actions_on_accounts), NULL); modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_options"), diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c index 9bce0c0..f446bd5 100644 --- a/src/hildon2/modest-folder-window.c +++ b/src/hildon2/modest-folder-window.c @@ -286,17 +286,17 @@ modest_folder_window_new (TnyFolderStoreQuery *query) /* Register edit modes */ modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_DELETE, - _("TODO: Select folder to delete"), _("TODO: 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, - _("TODO: Select folder to move"), _("TODO: 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, - _("TODO: Select folder to rename"), _("TODO: Rename"), + _("mcen_ti_edit_rename_folde"), _HL("wdgt_bd_rename"), GTK_TREE_VIEW (priv->folder_view), GTK_SELECTION_SINGLE, EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_rename_folder)); @@ -373,16 +373,16 @@ static void setup_menu (ModestFolderWindow *self) g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self)); /* folders actions */ - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("TODO: new folder"), + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_folder"), APP_MENU_CALLBACK (modest_ui_actions_on_new_folder), NULL); modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_user_renamefolder"), APP_MENU_CALLBACK (set_rename_edit_mode), NULL); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("TODO: move folder"), + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_move_folder"), APP_MENU_CALLBACK (set_moveto_edit_mode), NULL); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("TODO: delete folder"), + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_delete_folder"), APP_MENU_CALLBACK (set_delete_edit_mode), NULL); @@ -400,10 +400,10 @@ 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), _("TODO: new account"), + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_accounts"), APP_MENU_CALLBACK (modest_ui_actions_on_new_account), NULL); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("TODO: edit accounts"), + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_edit_accounts"), APP_MENU_CALLBACK (modest_ui_actions_on_accounts), NULL); modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_options"), diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c index 739f7a1..bed9327 100644 --- a/src/hildon2/modest-header-window.c +++ b/src/hildon2/modest-header-window.c @@ -446,12 +446,12 @@ modest_header_window_new (TnyFolder *folder) /* setup edit modes */ modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_DELETE, - _("TODO: Select messages to delete"), _("TODO: Delete"), + _("mcen_ti_edit_delete"), _HL("wdgt_bd_delete"), GTK_TREE_VIEW (priv->header_view), GTK_SELECTION_MULTIPLE, EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_delete_message)); modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE, - _("TODO: Select messages to move"), _("TODO: Move"), + _("mcen_ti_edit_move"), _("mcen_me_move"), GTK_TREE_VIEW (priv->header_view), GTK_SELECTION_MULTIPLE, EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to)); diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c index 18bf302..29dac8f 100644 --- a/src/hildon2/modest-msg-edit-window.c +++ b/src/hildon2/modest-msg-edit-window.c @@ -211,7 +211,7 @@ static void DEBUG_BUFFER (WPTextBuffer *buffer) } static const GtkActionEntry hildon2_msg_edit_action_entries [] = { - { "MessageSettings", NULL, N_("TODO: settings..."), NULL, NULL, G_CALLBACK (on_message_settings)}, + { "MessageSettings", NULL, N_("mcen_me_message_settings"), NULL, NULL, G_CALLBACK (on_message_settings)}, }; @@ -3777,7 +3777,7 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window) g_object_unref (title_sizegroup); g_object_unref (value_sizegroup); - gtk_window_set_title (GTK_WINDOW (dialog), _("TODO: Message settings")); + gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_me_message_settings")); /* Set current values */ switch (priv->priority_flags) { @@ -3912,7 +3912,7 @@ setup_menu (ModestMsgEditWindow *self) modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_remove_attachments"), APP_MENU_CALLBACK (modest_ui_actions_on_remove_attachments), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_remove_attachment)); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("TODO: Message settings..."), + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_message_settings"), APP_MENU_CALLBACK (on_message_settings), NULL); priv->find_toolbar_button = hildon_check_button_new (0); -- 1.7.9.5