From 24c5dee833bff8a499b6b6bca3c58231ae2a7f96 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Wed, 21 Jan 2009 12:41:20 +0000 Subject: [PATCH] Migrated src/ to use text-utils macros pmo-trunk-r7215 --- src/modest-init.c | 2 +- src/modest-tny-account-store.c | 2 +- src/modest-ui-actions.c | 21 +++++++++------------ src/modest-ui-dimming-rules.c | 14 +++++--------- 4 files changed, 16 insertions(+), 23 deletions(-) diff --git a/src/modest-init.c b/src/modest-init.c index a315b2b..677d2c8 100644 --- a/src/modest-init.c +++ b/src/modest-init.c @@ -183,7 +183,7 @@ static gboolean force_ke_recv_load (void) { if (strcmp ("cerm_device_memory_full", - dgettext("ke-recv", "cerm_device_memory_full")) == 0) { + _KR("cerm_device_memory_full")) == 0) { g_warning ("%s: cannot get translation for cerm_device_memory_full", __FUNCTION__); return FALSE; diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 29420e6..2143c8e 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -676,7 +676,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 = dgettext ("hildon-common-strings", "ecdg_ib_set_password_incorrect"); + msg = _CS ("ecdg_ib_set_password_incorrect"); else msg = _("mcen_ib_username_pw_incorrect"); show_password_warning_only (msg); diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 9d8fff4..17984de 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -874,7 +874,7 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op, error->code == MODEST_MAIL_OPERATION_ERROR_LOW_MEMORY) { GObject *source = modest_mail_operation_get_source (mail_op); modest_platform_run_information_dialog (GTK_IS_WINDOW (source) ? GTK_WINDOW (source) : NULL, - dgettext("ke-recv","memr_ib_operation_disabled"), + _KR("memr_ib_operation_disabled"), TRUE); g_object_unref (source); } @@ -1143,8 +1143,7 @@ check_memory_full_error (GtkWidget *parent_window, GError *err) if (is_memory_full_error (err)) modest_platform_information_banner (parent_window, - NULL, dgettext("ke-recv", - "cerm_device_memory_full")); + NULL, _KR("cerm_device_memory_full")); else if (err->code == TNY_SYSTEM_ERROR_MEMORY) /* If the account was created in memory full conditions then tinymail won't be able to @@ -1174,15 +1173,14 @@ modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op, if (status != MODEST_MAIL_OPERATION_STATUS_CANCELED) { if (is_memory_full_error ((GError *) error)) { modest_platform_information_banner ((GtkWidget *) win, - NULL, dgettext("ke-recv", - "cerm_device_memory_full")); + NULL, _KR("cerm_device_memory_full")); } else if (error->code == TNY_SYSTEM_ERROR_MEMORY) { modest_platform_information_banner ((GtkWidget *) win, NULL, _("emev_ui_imap_inbox_select_error")); } else if (error->domain == MODEST_MAIL_OPERATION_ERROR && error->code == MODEST_MAIL_OPERATION_ERROR_FILE_IO) { modest_platform_information_banner ((GtkWidget *) win, - NULL, dgettext ("hildon-common-strings", "sfil_ni_unable_to_open_file_not_found")); + NULL, _CS ("sfil_ni_unable_to_open_file_not_found")); } else if (user_data) { modest_platform_information_banner ((GtkWidget *) win, NULL, user_data); @@ -2484,7 +2482,7 @@ folder_refreshed_cb (ModestMailOperation *mail_op, if (error && error->domain == MODEST_MAIL_OPERATION_ERROR && error->code == MODEST_MAIL_OPERATION_ERROR_LOW_MEMORY) { modest_platform_run_information_dialog (GTK_WINDOW (win), - dgettext("ke-recv","memr_ib_operation_disabled"), + _KR("memr_ib_operation_disabled"), TRUE); return; } @@ -2743,8 +2741,7 @@ enough_space_for_message (ModestMsgEditWindow *edit_window, expected_size > available_disk) { modest_platform_information_banner (NULL, NULL, - dgettext("ke-recv", - "cerm_device_memory_full")); + _KR("cerm_device_memory_full")); return FALSE; } @@ -2767,7 +2764,7 @@ enough_space_for_message (ModestMsgEditWindow *edit_window, if (expected_size > MODEST_MAX_ATTACHMENT_SIZE) { modest_platform_run_information_dialog ( GTK_WINDOW(edit_window), - dgettext("ke-recv","memr_ib_operation_disabled"), + _KR("memr_ib_operation_disabled"), TRUE); return FALSE; } @@ -6262,7 +6259,7 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); break; case TNY_SERVICE_ERROR_SEND: - message = g_strdup (dgettext("hildon-common-strings", "sfil_ib_unable_to_send")); + message = g_strdup (_CS("sfil_ib_unable_to_send")); break; case TNY_SERVICE_ERROR_UNAVAILABLE: message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); @@ -6270,7 +6267,7 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, default: g_warning ("%s: unexpected ERROR %d", __FUNCTION__, err->code); - message = g_strdup (dgettext("hildon-common-strings", "sfil_ib_unable_to_send")); + message = g_strdup (_CS("sfil_ib_unable_to_send")); break; } diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index 9dc3076..113eea4 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -466,7 +466,7 @@ modest_ui_dimming_rules_on_delete (ModestWindow *win, gpointer user_data) !gtk_widget_is_focus (header_view) && !gtk_widget_is_focus (folder_view)) { dimmed = TRUE; - modest_dimming_rule_set_notification (rule, dgettext("hildon-common-strings", "ckct_ib_nothing_to_delete")); + modest_dimming_rule_set_notification (rule, _CS("ckct_ib_nothing_to_delete")); } #ifdef MODEST_TOOLKIT_HILDON2 @@ -1222,28 +1222,24 @@ modest_ui_dimming_rules_on_paste (ModestWindow *win, gpointer user_data) dimmed = _clipboard_is_empty (win); if (dimmed) modest_dimming_rule_set_notification (rule, - dgettext("hildon-common-strings", - "ecoc_ib_edwin_nothing_to_paste")); + _CS("ecoc_ib_edwin_nothing_to_paste")); if (!dimmed) { dimmed = _selected_folder_is_any_of_type (win, types, 3); if (dimmed) modest_dimming_rule_set_notification (rule, - dgettext("hildon-common-strings", - "ckct_ib_unable_to_paste_here")); + _CS("ckct_ib_unable_to_paste_here")); } if (!dimmed) { dimmed = !_folder_view_has_focus (win); if (dimmed) modest_dimming_rule_set_notification (rule, - dgettext("hildon-common-strings", - "ckct_ib_unable_to_paste_here")); + _CS("ckct_ib_unable_to_paste_here")); } if (!dimmed) { dimmed = _selected_folder_not_writeable (MODEST_MAIN_WINDOW(win), TRUE); if (dimmed) modest_dimming_rule_set_notification (rule, - dgettext("hildon-common-strings", - "ckct_ib_unable_to_paste_here")); + _CS("ckct_ib_unable_to_paste_here")); } if (!dimmed) { dimmed = _selected_folder_is_same_as_source (win); -- 1.7.9.5