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

Move English text to Messages file for translation.

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

7 files changed, 19 insertions, 11 deletions

diff --git a/riscos/draw.c b/riscos/draw.c
index fbaf1be85..325106f63 100644
--- a/riscos/draw.c
+++ b/riscos/draw.c
@@ -12,6 +12,7 @@
 #include "netsurf/content/content.h"
 #include "netsurf/riscos/draw.h"
 #include "netsurf/utils/utils.h"
+#include "netsurf/utils/messages.h"
 #include "netsurf/utils/log.h"
 #include "oslib/drawfile.h"
 
@@ -64,7 +65,7 @@ int draw_convert(struct content *c, unsigned int width, unsigned int height)
 	c->data.draw.x0 = bbox->x0 / 2;
 	c->data.draw.y0 = bbox->y0 / 2;
 	c->title = xcalloc(100, 1);
-	sprintf(c->title, "Draw image (%lux%lu, %lu bytes)", c->width,
+	sprintf(c->title, messages_get("DrawTitle"), c->width,
 	                                c->height, c->data.draw.length);
 	c->status = CONTENT_STATUS_DONE;
 	xfree(matrix);
diff --git a/riscos/gif.c b/riscos/gif.c
index faf54e655..b587c6665 100644
--- a/riscos/gif.c
+++ b/riscos/gif.c
@@ -19,6 +19,7 @@
 #include "netsurf/content/content.h"
 #include "netsurf/riscos/gif.h"
 #include "netsurf/utils/log.h"
+#include "netsurf/utils/messages.h"
 #include "netsurf/utils/utils.h"
 
 #ifdef WITH_GIF
@@ -113,7 +114,7 @@ int nsgif_convert(struct content *c, unsigned int iwidth, unsigned int iheight)
       memset(mask, 255, (unsigned int)(header->mask - header->image));
 
   c->title = xcalloc(100, sizeof(char));
-  sprintf(c->title, "GIF image (%lux%lu)", c->width, c->height);
+  sprintf(c->title, messages_get("GIFTitle"), c->width, c->height);
   c->status = CONTENT_STATUS_DONE;
 
 /*  xosspriteop_save_sprite_file(osspriteop_USER_AREA,
diff --git a/riscos/gui.c b/riscos/gui.c
index aa722e26f..dd976ee4e 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -708,7 +708,8 @@ void gui_gadget_combo(struct browser_window* bw, struct form_control* g, unsigne
 
 	combo_menu = xcalloc(1, wimp_SIZEOF_MENU(count));
 
-	combo_menu->title_data.indirected_text.text = "Select";
+	combo_menu->title_data.indirected_text.text =
+			messages_get("SelectMenu");
 	combo_menu->title_fg = wimp_COLOUR_BLACK;
 	combo_menu->title_bg = wimp_COLOUR_LIGHT_GREY;
 	combo_menu->work_fg = wimp_COLOUR_BLACK;
diff --git a/riscos/jpeg.c b/riscos/jpeg.c
index 3d72e7acb..f273207b4 100644
--- a/riscos/jpeg.c
+++ b/riscos/jpeg.c
@@ -22,6 +22,7 @@
 #include "netsurf/desktop/gui.h"
 #include "netsurf/riscos/jpeg.h"
 #include "netsurf/utils/log.h"
+#include "netsurf/utils/messages.h"
 #include "netsurf/utils/utils.h"
 
 /**
@@ -166,7 +167,7 @@ int nsjpeg_convert(struct content *c, unsigned int width, unsigned int height)
 	    c->width = w;
 	    c->height = h;
 	    c->title = xcalloc(100, 1);
-	    sprintf(c->title, "JPEG image (%ux%u, %lu bytes)", w, h, c->data.jpeg.length);
+	    sprintf(c->title, messages_get("JPEGTitle"), w, h, c->data.jpeg.length);
 	    c->status = CONTENT_STATUS_DONE;
 	   return 0;
 	  }
diff --git a/riscos/menus.c b/riscos/menus.c
index ee4fc1254..d874eb13e 100644
--- a/riscos/menus.c
+++ b/riscos/menus.c
@@ -297,7 +297,8 @@ void ro_gui_menu_warning(wimp_message_menu_warning *warning)
 			ro_gui_set_icon_string(dialog_saveas,
 					ICON_SAVE_ICON, "file_aff");
 			ro_gui_set_icon_string(dialog_saveas,
-					ICON_SAVE_PATH, "Webpage");
+					ICON_SAVE_PATH,
+					messages_get("SaveDraw"));
 			break;
 
 		case -1:
@@ -306,7 +307,8 @@ void ro_gui_menu_warning(wimp_message_menu_warning *warning)
 			ro_gui_set_icon_string(dialog_saveas,
 					ICON_SAVE_ICON, "file_faf");
 			ro_gui_set_icon_string(dialog_saveas,
-					ICON_SAVE_PATH, "Source");
+					ICON_SAVE_PATH,
+					messages_get("SaveSource"));
 			break;
 	}
 
diff --git a/riscos/png.c b/riscos/png.c
index f2947133d..079c394e3 100644
--- a/riscos/png.c
+++ b/riscos/png.c
@@ -19,6 +19,7 @@
 #include "netsurf/content/content.h"
 #include "netsurf/riscos/png.h"
 #include "netsurf/utils/log.h"
+#include "netsurf/utils/messages.h"
 #include "netsurf/utils/utils.h"
 
 #ifdef WITH_PNG
@@ -346,7 +347,7 @@ int nspng_convert(struct content *c, unsigned int width, unsigned int height)
 		png_destroy_read_struct(&c->data.png.png, &c->data.png.info, 0);
 
 	c->title = xcalloc(100, 1);
-	sprintf(c->title, "PNG image (%lux%lu)", c->width, c->height);
+	sprintf(c->title, messages_get("PNGTitle"), c->width, c->height);
 	c->status = CONTENT_STATUS_DONE;
 	return 0;
 }
diff --git a/riscos/sprite.c b/riscos/sprite.c
index 2c9abb31d..b7d2bf068 100644
--- a/riscos/sprite.c
+++ b/riscos/sprite.c
@@ -8,13 +8,14 @@
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
+#include "oslib/colourtrans.h"
+#include "oslib/osspriteop.h"
 #include "netsurf/utils/config.h"
 #include "netsurf/content/content.h"
 #include "netsurf/riscos/sprite.h"
-#include "netsurf/utils/utils.h"
 #include "netsurf/utils/log.h"
-#include "oslib/colourtrans.h"
-#include "oslib/osspriteop.h"
+#include "netsurf/utils/messages.h"
+#include "netsurf/utils/utils.h"
 
 #ifdef WITH_SPRITE
 
@@ -56,7 +57,7 @@ int sprite_convert(struct content *c, unsigned int width, unsigned int height)
 	c->width = w;
 	c->height = h;
 	c->title = xcalloc(100, 1);
-	sprintf(c->title, "Sprite image (%lux%lu, %lu bytes)", c->width,
+	sprintf(c->title, messages_get("SpriteTitle"), c->width,
 	                                c->height, c->data.sprite.length);
 	c->status = CONTENT_STATUS_DONE;
 	return 0;