Replace hildon-common-strings with proper translation strings in gtk

diff --git a/src/gtk/modest-platform.c b/src/gtk/modest-platform.c
index a7baf8f..c91a977 100644 (file)
--- a/src/gtk/modest-platform.c
+++ b/src/gtk/modest-platform.c
@@ -311,7 +311,7 @@ entry_insert_text (GtkEditable *editable,
        /* Show WID-INF036 */
        if (chars_length >= 20) {
                modest_platform_information_banner  (gtk_widget_get_parent (GTK_WIDGET (data)), NULL,
-                                                  _CS("ckdg_ib_maximum_characters_reached"));
+                                                  _CS_MAXIMUM_CHARACTERS_REACHED);
        } else {
                if (modest_text_utils_is_forbidden_char (*text, FOLDER_NAME_FORBIDDEN_CHARS)) {
                        /* Show an error */
@@ -319,7 +319,7 @@ entry_insert_text (GtkEditable *editable,
 
                        tmp = g_strndup (folder_name_forbidden_chars,
                                         FOLDER_NAME_FORBIDDEN_CHARS_LENGTH);
-                       msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp);
+                       msg = g_strdup_printf (_CS_ILLEGAL_CHARACTERS_ENTERED, tmp);
                        modest_platform_information_banner  (gtk_widget_get_parent (GTK_WIDGET (data)),
                                                             NULL, msg);
                        g_free (msg);
@@ -327,7 +327,7 @@ entry_insert_text (GtkEditable *editable,
                } else {
                        if (length >= 20) {
                                modest_platform_information_banner  (gtk_widget_get_parent (GTK_WIDGET (data)), NULL,
-                                                                    _CS("ckdg_ib_maximum_characters_reached"));
+                                                                    _CS_MAXIMUM_CHARACTERS_REACHED);
                        }
                        /* Write the text in the entry if it's valid */
                        g_signal_handlers_block_by_func (editable,
@@ -358,7 +358,7 @@ entry_changed (GtkEditable *editable,
 
        if (g_utf8_strlen (chars,-1) >= 20) {
                modest_platform_information_banner  (gtk_widget_get_parent (GTK_WIDGET (user_data)), NULL,
-                                                    _CS("ckdg_ib_maximum_characters_reached"));
+                                                    _CS_MAXIMUM_CHARACTERS_REACHED);
        }
        gtk_widget_set_sensitive (ok_button, modest_text_utils_validate_folder_name(chars));
 
@@ -410,7 +410,7 @@ on_response (GtkDialog *dialog,
        if (exists) {
                /* Show an error */
                modest_platform_information_banner (gtk_widget_get_parent (GTK_WIDGET (dialog)), 
-                                                   NULL, _CS("ckdg_ib_folder_already_exists"));
+                                                   NULL, _CS_FOLDER_ALREADY_EXISTS);
                /* Select the text */
                gtk_entry_select_region (GTK_ENTRY (entry), 0, -1);
                gtk_widget_grab_focus (entry);

diff --git a/src/gtk/modest-shell-window.c b/src/gtk/modest-shell-window.c
index 2920f7e..a907bc3 100644 (file)
--- a/src/gtk/modest-shell-window.c
+++ b/src/gtk/modest-shell-window.c
@@ -211,7 +211,7 @@ on_zoom_minus_plus_not_implemented (ModestWindow *window)
 {
        g_return_val_if_fail (MODEST_IS_SHELL_WINDOW (window), FALSE);
 
-       modest_platform_information_banner (NULL, NULL, _CS("ckct_ib_cannot_zoom_here"));
+       modest_platform_information_banner (NULL, NULL, _CS_CANNOT_ZOOM_HERE);
        return FALSE;
 }
 void 

diff --git a/src/hildon2/modest-address-book.c b/src/hildon2/modest-address-book.c
index d2fc731..92c5015 100644 (file)
--- a/src/hildon2/modest-address-book.c
+++ b/src/hildon2/modest-address-book.c
@@ -421,7 +421,7 @@ run_add_email_addr_to_contact_dlg(const gchar * contact_name,
                                if ((invalid_char_offset != NULL)&&(*invalid_char_offset != '\0')) {
                                        gchar *char_in_string = g_strdup_printf ("%c", *invalid_char_offset);
                                        gchar *message = g_strdup_printf(
-                                               _CS("ckdg_ib_illegal_characters_entered"), 
+                                               _CS_ILLEGAL_CHARACTERS_ENTERED, 
                                                char_in_string);
                                        g_free (char_in_string);
                                        hildon_banner_show_information (
@@ -776,7 +776,7 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor,
                        if ((invalid_char_position != NULL) && (*invalid_char_position != '\0')) {
                                gchar *char_in_string = g_strdup_printf("%c", *invalid_char_position);
                                gchar *message = 
-                                       g_strdup_printf(_CS("ckdg_ib_illegal_characters_entered"), 
+                                       g_strdup_printf(_CS_ILLEGAL_CHARACTERS_ENTERED, 
                                                        char_in_string);
                                g_free (char_in_string);
                                hildon_banner_show_information (NULL, NULL, message );

diff --git a/src/hildon2/modest-hildon2-window.c b/src/hildon2/modest-hildon2-window.c
index ac1aa83..d29430f 100644 (file)
--- a/src/hildon2/modest-hildon2-window.c
+++ b/src/hildon2/modest-hildon2-window.c
@@ -238,7 +238,7 @@ on_zoom_minus_plus_not_implemented (ModestWindow *window)
 {
        g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW (window), FALSE);
 
-       hildon_banner_show_information (NULL, NULL, _CS("ckct_ib_cannot_zoom_here"));
+       hildon_banner_show_information (NULL, NULL, _CS_CANNOT_ZOOM_HERE);
        return FALSE;
 }
 void 

diff --git a/src/hildon2/modest-maemo-security-options-view.c b/src/hildon2/modest-maemo-security-options-view.c
index 1a0a15c..754c841 100644 (file)
--- a/src/hildon2/modest-maemo-security-options-view.c
+++ b/src/hildon2/modest-maemo-security-options-view.c
@@ -204,7 +204,7 @@ on_entry_max (ModestValidatingEntry *self,
              gpointer user_data)
 {
        modest_platform_information_banner (GTK_WIDGET (self), NULL, 
-                                           _CS("ckdg_ib_maximum_characters_reached"));
+                                           _CS_MAXIMUM_CHARACTERS_REACHED);
 }
 
 /*

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index 91992a9..f1b1fb0 100644 (file)
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -427,7 +427,7 @@ activate_uri_popup_item (GtkMenuItem *menu_item,
                        uri = popup_info->uri + strlen ("mailto:");
 
                gtk_clipboard_set_text (clipboard, uri, strlen (uri));
-               modest_platform_information_banner (NULL, NULL, _CS("ecoc_ib_edwin_copied"));
+               modest_platform_information_banner (NULL, NULL, _CS_COPIED);
                return; /* we're done */
        }
 
@@ -561,7 +561,7 @@ entry_insert_text (GtkEditable *editable,
        /* Show WID-INF036 */
        if (chars_length >= 20) {
                hildon_banner_show_information  (gtk_widget_get_parent (GTK_WIDGET (data)), NULL,
-                                                _CS("ckdg_ib_maximum_characters_reached"));
+                                                _CS_MAXIMUM_CHARACTERS_REACHED);
        } else {
                if (modest_text_utils_is_forbidden_char (*text, FOLDER_NAME_FORBIDDEN_CHARS)) {
                        /* Show an error */
@@ -569,7 +569,7 @@ entry_insert_text (GtkEditable *editable,
 
                        tmp = g_strndup (folder_name_forbidden_chars,
                                         FOLDER_NAME_FORBIDDEN_CHARS_LENGTH);
-                       msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp);
+                       msg = g_strdup_printf (_CS_ILLEGAL_CHARACTERS_ENTERED, tmp);
                        hildon_banner_show_information  (gtk_widget_get_parent (GTK_WIDGET (data)),
                                                         NULL, msg);
                        g_free (msg);
@@ -577,7 +577,7 @@ entry_insert_text (GtkEditable *editable,
                } else {
                        if (length >= 20) {
                                hildon_banner_show_information  (gtk_widget_get_parent (GTK_WIDGET (data)), NULL,
-                                                                _CS("ckdg_ib_maximum_characters_reached"));
+                                                                _CS_MAXIMUM_CHARACTERS_REACHED);
                        }
                        /* Write the text in the entry if it's valid */
                        g_signal_handlers_block_by_func (editable,
@@ -608,7 +608,7 @@ entry_changed (GtkEditable *editable,
 
        if (g_utf8_strlen (chars,-1) >= 20) {
                hildon_banner_show_information  (gtk_widget_get_parent (GTK_WIDGET (user_data)), NULL,
-                                                _CS("ckdg_ib_maximum_characters_reached"));
+                                                _CS_MAXIMUM_CHARACTERS_REACHED);
        }
        gtk_widget_set_sensitive (ok_button, modest_text_utils_validate_folder_name(chars));
 
@@ -660,7 +660,7 @@ on_response (GtkDialog *dialog,
        if (exists) {
                /* Show an error */
                hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (dialog)), 
-                                               NULL, _CS("ckdg_ib_folder_already_exists"));
+                                               NULL, _CS_FOLDER_ALREADY_EXISTS);
                /* Select the text */
                gtk_entry_select_region (GTK_ENTRY (entry), 0, -1);
                gtk_widget_grab_focus (entry);

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index d6882a9..41fe607 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -2138,7 +2138,7 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS,
-                            _CS("ckdg_ib_folder_already_exists"));
+                            _CS_FOLDER_ALREADY_EXISTS);
        }
 
        /* Check parent */
@@ -2378,7 +2378,7 @@ new_name_valid_if_local_account (ModestMailOperationPrivate *priv,
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS,
-                            _CS("ckdg_ib_folder_already_exists"));
+                            _CS_FOLDER_ALREADY_EXISTS);
                return FALSE;
        } else
                return TRUE;
@@ -3295,7 +3295,7 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
-                            _CS("ckct_ib_unable_to_paste_here"));
+                            _CS_UNABLE_TO_PASTE_HERE);
                /* Notify the queue */
                modest_mail_operation_notify_end (self);
                return;

diff --git a/src/modest-text-utils.h b/src/modest-text-utils.h
index e387c16..6249e67 100644 (file)
--- a/src/modest-text-utils.h
+++ b/src/modest-text-utils.h
@@ -67,6 +67,28 @@
 #define _HL_IB_FIND_COMPLETE _HL("ckct_ib_find_search_complete")
 #define _HL_IB_FIND_NO_MATCHES _HL("ckct_ib_find_no_matches")
 #define _HL_IB_ZOOM _HL("wdgt_ib_zoom")
+
+#define _CS_ILLEGAL_CHARACTERS_ENTERED _CS("ckdg_ib_illegal_characters_entered")
+#define _CS_CANNOT_ZOOM_HERE _CS("ckct_ib_cannot_zoom_here")
+#define _CS_MAX_ZOOM_LEVEL_REACHED _CS("ckct_ib_max_zoom_level_reached")
+#define _CS_MIN_ZOOM_LEVEL_REACHED _CS("ckct_ib_min_zoom_level_reached")
+#define _CS_MAXIMUM_CHARACTERS_REACHED _CS("ckdg_ib_maximum_characters_reached")
+#define _CS_FOLDER_ALREADY_EXISTS _CS("ckdg_ib_folder_already_exists")
+#define _CS_SET_PASSWORD_INCORRECT _CS("ecdg_ib_set_password_incorrect")
+#define _CS_UNABLE_TO_PASTE_HERE _CS("ckct_ib_unable_to_paste_here")
+#define _CS_UNABLE_TO_OPEN_FILE_NOT_FOUND _CS("sfil_ni_unable_to_open_file_not_found")
+#define _CS_UNABLE_TO_RENAME _CS("ckdg_ib_unable_to_rename")
+#define _CS_UNABLE_TO_DELETE _CS("ckdg_ib_unable_to_delete")
+#define _CS_NOTHING_TO_SORT _CS("ckdg_ib_nothing_to_sort")
+#define _CS_NOT_ENOUGH_MEMORY _CS("sfil_ni_not_enough_memory")
+#define _CS_FOLDER_ALREADY_EXISTS _CS("ckdg_ib_folder_already_exists")
+#define _CS_PASTING _CS("ckct_nw_pasting")
+#define _CS_GETTING_ITEMS _CS("mcen_ib_getting_items")
+#define _CS_COPIED _CS("ecoc_ib_edwin_copied")
+#define _CS_UNABLE_TO_SEND _CS("sfil_ib_unable_to_send")
+#define _CS_FIND_REP_ENTER_TEXT _CS("ecdg_ib_find_rep_enter_text")
+#define _CS_UPDATING _CS("ckdg_pb_updating")
+#define _CS_SAVED _CS("sfil_ib_saved")
 #else
 #define _HL_SAVE _("Save")
 #define _HL_YES _("Yes")
@@ -89,6 +111,28 @@
 #define _HL_IB_FIND_COMPLETE _("Search complete")
 #define _HL_IB_FIND_NO_MATCHES _("No matches")
 #define _HL_IB_ZOOM _("Zoom %d")
+
+#define _CS_ILLEGAL_CHARACTERS_ENTERED _("Illegal characters entered")
+#define _CS_CANNOT_ZOOM_HERE _("Cannot zoom here")
+#define _CS_MAX_ZOOM_LEVEL_REACHED _("Max. zoom level reached")
+#define _CS_MIN_ZOOM_LEVEL_REACHED _("Min. zoom level reached")
+#define _CS_MAXIMUM_CHARACTERS_REACHED _("Maximum characters reached")
+#define _CS_FOLDER_ALREADY_EXISTS _("Folder already exists")
+#define _CS_SET_PASSWORD_INCORRECT _("Password incorrect")
+#define _CS_UNABLE_TO_PASTE_HERE _("Unable to paste here")
+#define _CS_UNABLE_TO_OPEN_FILE_NOT_FOUND _("File not found")
+#define _CS_UNABLE_TO_RENAME _("Unable to rename")
+#define _CS_UNABLE_TO_DELETE _("Unable to delete")
+#define _CS_NOTHING_TO_SORT _("Nothing to sort")
+#define _CS_NOT_ENOUGH_MEMORY _("Not enough memory")
+#define _CS_FOLDER_ALREADY_EXISTS _("Folder already exists")
+#define _CS_PASTING _("Pasting")
+#define _CS_GETTING_ITEMS _("Getting items")
+#define _CS_COPIED _("Copied")
+#define _CS_UNABLE_TO_SEND _("Unable to send")
+#define _CS_FIND_REP_ENTER_TEXT _("Enter text to search")
+#define _CS_UPDATING _("Updating...")
+#define _CS_SAVED _("Saved")
 #endif
 
 /* Forbidden char arrays */

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 31373f5..d462461 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -640,7 +640,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
                                                                                             server_account_name);
                                /* If the login has ever succeeded then show a specific message */
                                if (username_known)
-                                       msg = _CS ("ecdg_ib_set_password_incorrect");
+                                       msg = _CS_SET_PASSWORD_INCORRECT;
                                else
                                        msg = _("mcen_ib_username_pw_incorrect");
                                if (modest_window_mgr_get_num_windows (modest_runtime_get_window_mgr ()))

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 150b532..06fce17 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -1115,7 +1115,7 @@ modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op,
                } else if (error->domain == MODEST_MAIL_OPERATION_ERROR &&
                           error->code == MODEST_MAIL_OPERATION_ERROR_FILE_IO) {
                        modest_platform_information_banner ((GtkWidget *) win,
-                                                           NULL, _CS ("sfil_ni_unable_to_open_file_not_found"));
+                                                           NULL, _CS_UNABLE_TO_OPEN_FILE_NOT_FOUND);
                } else if (user_data) {
                        modest_platform_information_banner ((GtkWidget *) win,
                                                            NULL, user_data);
@@ -1928,7 +1928,7 @@ modest_ui_actions_on_sort (GtkAction *action,
        }
 
        if (!header_view) {
-               modest_platform_information_banner (NULL, NULL, _CS("ckdg_ib_nothing_to_sort"));
+               modest_platform_information_banner (NULL, NULL, _CS_NOTHING_TO_SORT);
 
                return;
        }
@@ -2697,7 +2697,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
                if (error->domain == MODEST_MAIL_OPERATION_ERROR &&
                    error->code == MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED) {
                        g_warning ("%s failed: %s\n", __FUNCTION__, (modest_mail_operation_get_error (mail_operation))->message);
-                       modest_platform_information_banner (NULL, NULL, _CS("sfil_ni_not_enough_memory"));
+                       modest_platform_information_banner (NULL, NULL, _CS_NOT_ENOUGH_MEMORY);
                        had_error = TRUE;
                }
        }
@@ -3075,14 +3075,14 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
                message = g_strdup_printf (_KR("cerm_device_memory_full"), "");
        } else if (error->domain == MODEST_MAIL_OPERATION_ERROR &&
                   error->code == MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS) {
-               message = _CS("ckdg_ib_folder_already_exists");
+               message = _CS_FOLDER_ALREADY_EXISTS;
        } else if (error->domain == TNY_ERROR_DOMAIN &&
                   error->code == TNY_SERVICE_ERROR_STATE) {
                /* This means that the folder is already in use (a
                   message is opened for example */
                message = _("emev_ni_internal_error");
        } else {
-               message = _CS("ckdg_ib_unable_to_rename");
+               message = _CS_UNABLE_TO_RENAME;
        }
 
        /* We don't set a parent for the dialog because the dialog
@@ -3724,7 +3724,7 @@ modest_ui_actions_on_copy (GtkAction *action,
 
                if (num_of_unc_msgs == 0 || continue_download) {
                        modest_platform_information_banner (
-                                       NULL, NULL, _CS("mcen_ib_getting_items"));
+                                       NULL, NULL, _CS_GETTING_ITEMS);
                        modest_header_view_copy_selection (
                                        MODEST_HEADER_VIEW (focused_widget));
                } else
@@ -3739,7 +3739,7 @@ modest_ui_actions_on_copy (GtkAction *action,
        /* Show information banner if there was a copy to clipboard */
        if(copied)
                modest_platform_information_banner (
-                               NULL, NULL, _CS("ecoc_ib_edwin_copied"));
+                               NULL, NULL, _CS_COPIED);
 }
 
 void
@@ -3841,7 +3841,7 @@ modest_ui_actions_on_paste (GtkAction *action,
                        PasteAsAttachmentHelper *helper = g_new0 (PasteAsAttachmentHelper, 1);
                        helper->window = MODEST_MSG_EDIT_WINDOW (window);
                        helper->banner = modest_platform_animation_banner (GTK_WIDGET (window), NULL,
-                                                                          _CS("ckct_nw_pasting"));
+                                                                          _CS_PASTING);
                        modest_email_clipboard_get_data (e_clipboard, &src_folder, &data, &delete);
                        mail_op = modest_mail_operation_new (G_OBJECT (window));
                        if (helper->banner != NULL) {
@@ -3898,7 +3898,7 @@ modest_ui_actions_on_paste (GtkAction *action,
                        if (response == GTK_RESPONSE_OK) {
                                /* Launch notification */
                                inf_note = modest_platform_animation_banner (GTK_WIDGET (window), NULL,
-                                                                            _CS("ckct_nw_pasting"));
+                                                                            _CS_PASTING);
                                if (inf_note != NULL)  {
                                        gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE);
                                        gtk_widget_show (GTK_WIDGET(inf_note));
@@ -3918,7 +3918,7 @@ modest_ui_actions_on_paste (GtkAction *action,
                } else if (src_folder != NULL) {
                        /* Launch notification */
                        inf_note = modest_platform_animation_banner (GTK_WIDGET (window), NULL,
-                                                                    _CS("ckct_nw_pasting"));
+                                                                    _CS_PASTING);
                        if (inf_note != NULL)  {
                                gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE);
                                gtk_widget_show (GTK_WIDGET(inf_note));
@@ -4151,7 +4151,7 @@ modest_ui_actions_on_limit_error (GtkAction *action,
 {
        g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (win));
 
-       modest_platform_information_banner ((GtkWidget *) win, NULL, _CS("ckdg_ib_maximum_characters_reached"));
+       modest_platform_information_banner ((GtkWidget *) win, NULL, _CS_MAXIMUM_CHARACTERS_REACHED);
 
 }
 
@@ -4765,7 +4765,7 @@ on_move_folder_cb (gboolean canceled,
        MoveToHelper *helper = g_new0 (MoveToHelper, 1);
 #ifndef MODEST_TOOLKIT_HILDON2
        helper->banner = modest_platform_animation_banner (GTK_WIDGET (parent_window), NULL,
-                       _CS("ckct_nw_pasting"));
+                       _CS_PASTING);
        if (helper->banner != NULL)  {
                g_object_ref (helper->banner);
                gtk_widget_show (GTK_WIDGET(helper->banner));
@@ -5430,7 +5430,7 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self,
                                                           server_name);
                break;
        case TNY_SERVICE_ERROR_SEND:
-               message = g_strdup (_CS("sfil_ib_unable_to_send"));
+               message = g_strdup (_CS_UNABLE_TO_SEND);
                break;
        case TNY_SERVICE_ERROR_UNAVAILABLE:
                message = modest_protocol_get_translation (protocol,
@@ -5440,7 +5440,7 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self,
        default:
                g_warning ("%s: unexpected ERROR %d",
                           __FUNCTION__, err->code);
-               message = g_strdup (_CS("sfil_ib_unable_to_send"));
+               message = g_strdup (_CS_UNABLE_TO_SEND);
                break;
        }
 

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 9090c23..c929b22 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -411,7 +411,7 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
                        if (state)
                                dimmed = state->sent_in_progress;
                        if (dimmed)
-                               modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete"));
+                               modest_dimming_rule_set_notification (rule, _CS_UNABLE_TO_DELETE);
                }
 
                /* This could happen if we're viewing a message of the
@@ -427,7 +427,7 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
                        if (!modest_msg_view_window_is_search_result (MODEST_MSG_VIEW_WINDOW(win))) {
                                dimmed = !modest_msg_view_window_has_headers_model (MODEST_MSG_VIEW_WINDOW(win));
                                if (dimmed) {
-                                       modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete"));
+                                       modest_dimming_rule_set_notification (rule, _CS_UNABLE_TO_DELETE);
                                }
                        }
                }

diff --git a/src/modest-utils.c b/src/modest-utils.c
index fb9952b..fe4ef28 100644 (file)
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -824,7 +824,7 @@ modest_utils_on_entry_invalid_character (ModestValidatingEntry *self,
                show_char = "' '";
        }
        
-       message = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), show_char);
+       message = g_strdup_printf (_CS_ILLEGAL_CHARACTERS_ENTERED, show_char);
        modest_platform_information_banner (GTK_WIDGET (self), NULL, message);
        g_free (message);
 }

diff --git a/src/widgets/modest-default-account-settings-dialog.c b/src/widgets/modest-default-account-settings-dialog.c
index d8f7e73..4230aba 100644 (file)
--- a/src/widgets/modest-default-account-settings-dialog.c
+++ b/src/widgets/modest-default-account-settings-dialog.c
@@ -295,7 +295,7 @@ on_entry_invalid_account_title_character (ModestValidatingEntry *self, const gch
        gchar *tmp, *msg;
                        
        tmp = g_strndup (account_title_forbidden_chars, ACCOUNT_TITLE_FORBIDDEN_CHARS_LENGTH);
-       msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp);
+       msg = g_strdup_printf (_CS_ILLEGAL_CHARACTERS_ENTERED, tmp);
 
        modest_platform_information_banner (GTK_WIDGET (self), NULL, msg);
 
@@ -309,7 +309,7 @@ on_entry_invalid_fullname_character (ModestValidatingEntry *self, const gchar* c
        gchar *tmp, *msg;
                        
        tmp = g_strndup (user_name_forbidden_chars, USER_NAME_FORBIDDEN_CHARS_LENGTH);
-       msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp);
+       msg = g_strdup_printf (_CS_ILLEGAL_CHARACTERS_ENTERED, tmp);
 
        modest_platform_information_banner (GTK_WIDGET (self), NULL, msg);
 
@@ -322,7 +322,7 @@ static void
 on_entry_max (ModestValidatingEntry *self, gpointer user_data)
 {
        modest_platform_information_banner (GTK_WIDGET (self), NULL, 
-                                           _CS("ckdg_ib_maximum_characters_reached"));
+                                           _CS_MAXIMUM_CHARACTERS_REACHED);
 }
 
 static GtkWidget*

diff --git a/src/widgets/modest-easysetup-wizard-dialog.c b/src/widgets/modest-easysetup-wizard-dialog.c
index 90b957a..d8a4b3c 100644 (file)
--- a/src/widgets/modest-easysetup-wizard-dialog.c
+++ b/src/widgets/modest-easysetup-wizard-dialog.c
@@ -524,7 +524,7 @@ static void
 on_entry_max (ModestValidatingEntry *self, gpointer user_data)
 {
        modest_platform_information_banner (GTK_WIDGET (self), NULL,
-                                           _CS("ckdg_ib_maximum_characters_reached"));
+                                           _CS_MAXIMUM_CHARACTERS_REACHED);
 }
 
 static GtkWidget*

diff --git a/src/widgets/modest-gtk-security-options-view.c b/src/widgets/modest-gtk-security-options-view.c
index 7654ce9..a0c1e9e 100644 (file)
--- a/src/widgets/modest-gtk-security-options-view.c
+++ b/src/widgets/modest-gtk-security-options-view.c
@@ -185,7 +185,7 @@ on_entry_max (ModestValidatingEntry *self,
              gpointer user_data)
 {
        modest_platform_information_banner (GTK_WIDGET (self), NULL, 
-                                           _CS("ckdg_ib_maximum_characters_reached"));
+                                           _CS_MAXIMUM_CHARACTERS_REACHED);
 }
 
 /*

diff --git a/src/widgets/modest-header-window.c b/src/widgets/modest-header-window.c
index 160ac7d..d93cd05 100644 (file)
--- a/src/widgets/modest-header-window.c
+++ b/src/widgets/modest-header-window.c
@@ -1082,7 +1082,7 @@ show_updating_banner (gpointer user_data)
                gdk_threads_enter ();
                priv->updating_banner = 
                        modest_platform_animation_banner (GTK_WIDGET (user_data), NULL,
-                                                         _CS ("ckdg_pb_updating"));
+                                                         _CS_UPDATING);
 
                /* We need this because banners in Maemo could be
                   destroyed by dialogs so we need to properly update

diff --git a/src/widgets/modest-msg-edit-window.c b/src/widgets/modest-msg-edit-window.c
index f8dcb8b..726f69a 100644 (file)
--- a/src/widgets/modest-msg-edit-window.c
+++ b/src/widgets/modest-msg-edit-window.c
@@ -3702,7 +3702,7 @@ body_insert_text (GtkTextBuffer *buffer,
                if (priv->max_chars_banner == NULL) {
 #ifdef MODEST_TOOLKIT_HILDON2
                        priv->max_chars_banner = hildon_banner_show_information (GTK_WIDGET (window), NULL, 
-                                                                                _CS("ckdg_ib_maximum_characters_reached"));
+                                                                                _CS_MAXIMUM_CHARACTERS_REACHED);
                        g_object_weak_ref (G_OBJECT (priv->max_chars_banner), (GWeakNotify) max_chars_banner_unref, window);
 #endif
                }
@@ -3762,7 +3762,7 @@ subject_field_insert_text (GtkEditable *editable,
 
        if (result_len + old_length > 1000) {
                modest_platform_system_banner (GTK_WIDGET (window), NULL, 
-                                               _CS("ckdg_ib_maximum_characters_reached"));
+                                               _CS_MAXIMUM_CHARACTERS_REACHED);
        }
        g_string_free (result, TRUE);
 }
@@ -3869,7 +3869,7 @@ modest_msg_edit_window_isearch_toolbar_search (GtkWidget *widget,
                g_free (priv->last_search);
                priv->last_search = NULL;
                /* Information banner about empty search */
-               modest_platform_system_banner (NULL, NULL, _CS("ecdg_ib_find_rep_enter_text"));
+               modest_platform_system_banner (NULL, NULL, _CS_FIND_REP_ENTER_TEXT);
                return;
        }
 

diff --git a/src/widgets/modest-msg-view-window.c b/src/widgets/modest-msg-view-window.c
index cae371e..38456ee 100644 (file)
--- a/src/widgets/modest-msg-view-window.c
+++ b/src/widgets/modest-msg-view-window.c
@@ -1591,7 +1591,7 @@ modest_msg_view_window_isearch_toolbar_search (GtkWidget *widget,
        current_search = modest_isearch_toolbar_get_search (MODEST_ISEARCH_TOOLBAR (widget));
 
        if ((current_search == NULL) || (strcmp (current_search, "") == 0)) {
-               modest_platform_system_banner (NULL, NULL, _CS("ecdg_ib_find_rep_enter_text"));
+               modest_platform_system_banner (NULL, NULL, _CS_FIND_REP_ENTER_TEXT);
                return;
        }
 
@@ -1663,7 +1663,7 @@ modest_msg_view_window_zoom_plus (ModestWindow *window)
 
        if (zoom_level >= 2.0) {
                modest_platform_system_banner (NULL, NULL, 
-                                               _CS("ckct_ib_max_zoom_level_reached"));
+                                               _CS_MAX_ZOOM_LEVEL_REACHED);
                return FALSE;
        } else if (zoom_level >= 1.5) {
                zoom_level = 2.0;
@@ -1704,7 +1704,7 @@ modest_msg_view_window_zoom_minus (ModestWindow *window)
 
        if (zoom_level <= 0.5) {
                modest_platform_system_banner (NULL, NULL, 
-                                               _CS("ckct_ib_min_zoom_level_reached"));
+                                               _CS_MIN_ZOOM_LEVEL_REACHED);
                return FALSE;
        } else if (zoom_level <= 0.8) {
                zoom_level = 0.5;
@@ -1957,7 +1957,7 @@ message_reader (ModestMsgViewWindow *window,
 
        /* We set the header from model while we're loading */
        tny_header_view_set_header (TNY_HEADER_VIEW (priv->msg_view), header);
-       modest_window_set_title (MODEST_WINDOW (window), _CS("ckdg_pb_updating"));
+       modest_window_set_title (MODEST_WINDOW (window), _CS_UPDATING);
 
        if (header)
                folder = NULL;
@@ -2977,7 +2977,7 @@ idle_save_mime_part_show_result (SaveMimePartInfo *info)
 
        gdk_threads_enter (); /* CHECKED */
        if (info->result == GNOME_VFS_OK) {
-               modest_platform_system_banner (NULL, NULL, _CS("sfil_ib_saved"));
+               modest_platform_system_banner (NULL, NULL, _CS_SAVED);
        } else if (info->result == GNOME_VFS_ERROR_NO_SPACE) {
                gchar *msg = NULL;