[project @ 2004-02-27 17:45:19 by bursa]

Move English text to Messages file for translation.

svn path=/import/netsurf/; revision=576

2 files changed, 13 insertions, 6 deletions

diff --git a/content/content.c b/content/content.c
index 9a53869ed..b189dd5ee 100644
--- a/content/content.c
+++ b/content/content.c
@@ -42,6 +42,7 @@
 #endif
 #endif
 #include "netsurf/utils/log.h"
+#include "netsurf/utils/messages.h"
 #include "netsurf/utils/utils.h"
 
 
@@ -190,7 +191,7 @@ struct content * content_create(char *url)
 	c->size = sizeof(struct content);
 	c->fetch = 0;
 	c->mime_type = 0;
-	strcpy(c->status_message, "Loading");
+	strcpy(c->status_message, messages_get("Loading"));
 	user_sentinel = xcalloc(1, sizeof(*user_sentinel));
 	user_sentinel->callback = 0;
 	user_sentinel->p1 = user_sentinel->p2 = 0;
diff --git a/content/fetchcache.c b/content/fetchcache.c
index f2ad43a71..3639c39a0 100644
--- a/content/fetchcache.c
+++ b/content/fetchcache.c
@@ -170,18 +170,23 @@ void fetchcache_callback(fetch_msg msg, void *p, char *data, unsigned long size)
 			LOG(("FETCH_DATA"));
 			c->fetch_size += size;
 			if (c->total_size)
-				sprintf(c->status_message, "Received %lu of %lu bytes (%u%%)",
+				sprintf(c->status_message,
+						messages_get("RecPercent"),
 						c->fetch_size, c->total_size,
-						(unsigned int) (c->fetch_size * 100.0 / c->total_size));
+						(unsigned int) (c->fetch_size *
+						100.0 / c->total_size));
 			else
-				sprintf(c->status_message, "Received %lu bytes", c->fetch_size);
+				sprintf(c->status_message,
+						messages_get("Received"),
+						c->fetch_size);
 			content_broadcast(c, CONTENT_MSG_STATUS, 0);
 			content_process_data(c, data, size);
 			break;
 
 		case FETCH_FINISHED:
 			LOG(("FETCH_FINISHED"));
-			sprintf(c->status_message, "Converting %lu bytes", c->fetch_size);
+			sprintf(c->status_message, messages_get("Converting"),
+					c->fetch_size);
 			c->fetch = 0;
 			content_broadcast(c, CONTENT_MSG_STATUS, 0);
 			content_convert(c, c->width, c->height);
@@ -211,7 +216,8 @@ void fetchcache_callback(fetch_msg msg, void *p, char *data, unsigned long size)
 				content_broadcast(c, CONTENT_MSG_REDIRECT, url);
 				xfree(url);
 			} else {
-				content_broadcast(c, CONTENT_MSG_ERROR, "Bad redirect");
+				content_broadcast(c, CONTENT_MSG_ERROR,
+						messages_get("BadRedirect"));
 			}
 			if (c->cache)
 				cache_destroy(c);