X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=18b16802da65626b8d40402209d08dd7282ac1dd;hp=47236021a97c3c5255bf8824327c9e41cb2d2a16;hb=83cfbd96aa351d1ffc91d409cacb26ad1ec7df2d;hpb=61bbe9ed9335ddcc1957bf8c3158975139c794a7

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 4723602..18b1680 100644
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -2201,31 +2201,32 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
 
 			mime_part = tny_platform_factory_new_mime_part
 				(modest_runtime_get_platform_factory ());
-				
+
 			TnyStream *stream = create_stream_for_uri (uri);
 
 			if (stream == NULL) {
 
-				modest_platform_information_banner (NULL, NULL, dgettext("hildon-fm", "sfil_ib_opening_not_allowed"));
-				
+				modest_platform_information_banner (NULL, NULL, 
+								    _FM("sfil_ib_opening_not_allowed"));
+
 				g_object_unref (mime_part);
 				gnome_vfs_file_info_unref (info);
 				continue;
 			}
 
 			tny_mime_part_construct (mime_part, stream, mime_type, "base64");
-			
+
 			content_id = g_strdup_printf ("%d", priv->next_cid);
 			tny_mime_part_set_content_id (mime_part, content_id);
 			g_free (content_id);
 			priv->next_cid++;
-			
+
 			basename = g_path_get_basename (filename);
 			tny_mime_part_set_filename (mime_part, basename);
 			g_free (basename);
 
 			pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size);
-			
+
 			if (pixbuf != NULL) {
 				priv->images_size += stream_size;
 				priv->images_count ++;
@@ -2377,7 +2378,7 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window,
 			size = info->size;
 			if (size > allowed_size) {
 				modest_platform_information_banner (NULL, NULL, 
-								    dgettext("hildon-fm", "sfil_ib_opening_not_allowed"));
+								    _FM("sfil_ib_opening_not_allowed"));
 				return 0;
 			}
 		} else
@@ -2387,7 +2388,7 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window,
 		
 		if (stream == NULL) {
 
-			modest_platform_information_banner (NULL, NULL, dgettext("hildon-fm", "sfil_ib_opening_not_allowed"));
+			modest_platform_information_banner (NULL, NULL, _FM("sfil_ib_opening_not_allowed"));
 
 			g_object_unref (mime_part);
 			gnome_vfs_file_info_unref (info);
@@ -3312,8 +3313,7 @@ subject_field_insert_text (GtkEditable *editable,
 
 	if (result_len + old_length > 1000) {
 		hildon_banner_show_information (GTK_WIDGET (window), NULL, 
-						dgettext("hildon-common-strings",
-							 "ckdg_ib_maximum_characters_reached"));
+						_CS("ckdg_ib_maximum_characters_reached"));
 	}
 	g_string_free (result, TRUE);
 }
@@ -3419,7 +3419,7 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget,
 		g_free (priv->last_search);
 		priv->last_search = NULL;
 		/* Information banner about empty search */
-		hildon_banner_show_information (NULL, NULL, dgettext ("hildon-common-strings", "ecdg_ib_find_rep_enter_text"));
+		hildon_banner_show_information (NULL, NULL, _CS("ecdg_ib_find_rep_enter_text"));
 		return;
 	}
 
@@ -3435,14 +3435,14 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget,
 		result = gtk_text_iter_forward_search_insensitive (&selection_end, current_search, 
 								   &match_start, &match_end);
 		if (!result)
-			hildon_banner_show_information (NULL, NULL, dgettext ("hildon-libs", "ckct_ib_find_search_complete"));
+			hildon_banner_show_information (NULL, NULL, _HL("ckct_ib_find_search_complete"));
 	} else {
 		GtkTextIter buffer_start;
 		gtk_text_buffer_get_start_iter (priv->text_buffer, &buffer_start);
 		result = gtk_text_iter_forward_search_insensitive (&buffer_start, current_search, 
 								   &match_start, &match_end);
 		if (!result)
-			hildon_banner_show_information (NULL, NULL, dgettext ("hildon-libs", "ckct_ib_find_no_matches"));
+			hildon_banner_show_information (NULL, NULL, _HL("ckct_ib_find_no_matches"));
 	}
 
 	/* Mark as selected the string found in search */