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

Move English text to Messages file for translation. svn path=/import/netsurf/; revision=576
author: James Bursa <james@netsurf-browser.org> 2004-02-27 17:45:19 +0000
committer: James Bursa <james@netsurf-browser.org> 2004-02-27 17:45:19 +0000
commit: 7f68e012cc9f64bd09a8452e85df9df2a0e9211b (patch)
tree: 3825cab5266ed7ed24dd7273b40a7b7e0de9e917
parent: 13787963e26dd2cdb39bbcb28cfaafb1d13ec5ea (diff)
download: netsurf-7f68e012cc9f64bd09a8452e85df9df2a0e9211b.tar.gz
netsurf-7f68e012cc9f64bd09a8452e85df9df2a0e9211b.tar.bz2
13 files changed, 114 insertions, 35 deletions
diff --git a/!NetSurf/Resources/en/Messages b/!NetSurf/Resources/en/Messages
index 8557d014e..50ca3fd36 100644
--- a/!NetSurf/Resources/en/Messages
+++ b/!NetSurf/Resources/en/Messages
@@ -1,5 +1,4 @@
 # English messages for NetSurf
-#Version:0.01
 
 # Menus
 NetSurf:NetSurf
@@ -48,3 +47,33 @@ ErrorPage:<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/T
 InvalidURL:The address <em>%s</em> could not be understood.
 
 NoMemory:NetSurf is running out of memory. Please free some memory and try again.
+
+Loading:Opening page...
+RecPercent:Received %lu of %lu bytes (%u%%)
+Received:Received %lu bytes
+Converting:Converting %lu bytes
+BadRedirect:Bad redirect URL
+FetchFailed:Unable to fetch document
+Complete:Page complete (%gs)
+Redirecting:Redirecting...
+Processing:Processing document
+Formatting:Formatting document
+FetchObjs:Loading %u objects
+FetchObjs2:Loading %u objects: %s
+Done:Document done
+FetchStyle:Loading %u stylesheets
+FetchStyle2:Loading %u stylesheets: %s
+NotCSS:Warning: stylesheet is not CSS
+BadObject:Warning: bad object type
+ObjError:Error loading object: %s
+
+DrawTitle:Draw image (%lux%lu, %lu bytes)
+GIFTitle:GIF image (%lux%lu)
+JPEGTitle:JPEG image (%ux%u, %lu bytes)
+PNGImage:PNG image (%lux%lu)
+SpriteTitle:Sprite image (%lux%lu, %lu bytes)
+
+SelectMenu:Select
+
+SaveSource:Source
+SaveDraw:Webpage
diff --git a/!NetSurf/Resources/fr/Messages b/!NetSurf/Resources/fr/Messages
index e086b10d8..ab2c4013e 100644
--- a/!NetSurf/Resources/fr/Messages
+++ b/!NetSurf/Resources/fr/Messages
@@ -1,5 +1,4 @@
 # French messages for NetSurf
-#Version:0.01
 
 # Menus
 NetSurf:NetSurf
@@ -48,3 +47,33 @@ ErrorPage:<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/T
 InvalidURL:L'adresse <em>%s</em> est incomprise.
 
 NoMemory:NetSurf a besoin de plus de m�moire. Veuillez lib�rer de la m�moire et r�essayer.
+
+Loading:Opening page...
+RecPercent:Received %lu of %lu bytes (%u%%)
+Received:Received %lu bytes
+Converting:Converting %lu bytes
+BadRedirect:Bad redirect URL
+FetchFailed:Unable to fetch document
+Complete:Page complete (%gs)
+Redirecting:Redirecting...
+Processing:Processing document
+Formatting:Formatting document
+FetchObjs:Loading %u objects
+FetchObjs2:Loading %u objects: %s
+Done:Document done
+FetchStyle:Loading %u stylesheets
+FetchStyle2:Loading %u stylesheets: %s
+NotCSS:Warning: stylesheet is not CSS
+BadObject:Warning: bad object type
+ObjError:Error loading object: %s
+
+DrawTitle:Draw image (%lux%lu, %lu bytes)
+GIFTitle:GIF image (%lux%lu)
+JPEGTitle:JPEG image (%ux%u, %lu bytes)
+PNGImage:PNG image (%lux%lu)
+SpriteTitle:Sprite image (%lux%lu, %lu bytes)
+
+SelectMenu:Select
+
+SaveSource:Source
+SaveDraw:Webpage
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);
diff --git a/desktop/browser.c b/desktop/browser.c
index 84b60ff79..d75b1c33f 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -149,7 +149,7 @@ void browser_window_go_post(struct browser_window *bw, const char *url,
 
 	browser_window_stop(bw);
 
-	browser_window_set_status(bw, "Opening page...");
+	browser_window_set_status(bw, messages_get("Loading"));
 	bw->history_add = history_add;
 	bw->time0 = clock();
 	c = fetchcache(url, 0,
@@ -159,7 +159,7 @@ void browser_window_go_post(struct browser_window *bw, const char *url,
 			post_urlenc, post_multipart,
 			true);
 	if (!c) {
-		browser_window_set_status(bw, "Unable to fetch document");
+		browser_window_set_status(bw, messages_get("FetchFailed"));
 		return;
 	}
 	bw->loading_content = c;
@@ -230,7 +230,7 @@ void browser_window_callback(content_msg msg, struct content *c,
 			browser_window_update(bw, false);
 			content_reshape_instance(c, bw, 0, 0, 0,
 					&bw->current_content_state);
-			sprintf(status, "Page complete (%gs)",
+			sprintf(status, messages_get("Complete"),
 					((float) (clock() - bw->time0)) /
 					CLOCKS_PER_SEC);
 			browser_window_set_status(bw, status);
@@ -253,7 +253,8 @@ void browser_window_callback(content_msg msg, struct content *c,
 
 		case CONTENT_MSG_REDIRECT:
 			bw->loading_content = 0;
-			browser_window_set_status(bw, "Redirecting");
+			browser_window_set_status(bw,
+					messages_get("Redirecting"));
 			/* error actually holds the new URL */
 			browser_window_go(bw, error);
 			break;
diff --git a/render/html.c b/render/html.c
index 2484b50b3..2eccc78d7 100644
--- a/render/html.c
+++ b/render/html.c
@@ -23,6 +23,7 @@
 #include "netsurf/render/html.h"
 #include "netsurf/render/layout.h"
 #include "netsurf/utils/utils.h"
+#include "netsurf/utils/messages.h"
 #include "netsurf/utils/log.h"
 
 #define CHUNK 4096
@@ -161,7 +162,7 @@ int html_convert(struct content *c, unsigned int width, unsigned int height)
 
 	/* convert xml tree to box tree */
 	LOG(("XML to box"));
-	sprintf(c->status_message, "Processing document");
+	sprintf(c->status_message, messages_get("Processing"));
 	content_broadcast(c, CONTENT_MSG_STATUS, 0);
 	xml_to_box(html, c);
 	/*box_dump(c->data.html.layout->children, 0);*/
@@ -170,7 +171,7 @@ int html_convert(struct content *c, unsigned int width, unsigned int height)
 	xmlFreeDoc(document);
 
 	/* layout the box tree */
-	sprintf(c->status_message, "Formatting document");
+	sprintf(c->status_message, messages_get("Formatting"));
 	content_broadcast(c, CONTENT_MSG_STATUS, 0);
 	LOG(("Layout document"));
 	layout_document(c->data.html.layout->children, width);
@@ -181,10 +182,11 @@ int html_convert(struct content *c, unsigned int width, unsigned int height)
 
 	if (c->active == 0) {
 		c->status = CONTENT_STATUS_DONE;
-		sprintf(c->status_message, "Document done");
+		sprintf(c->status_message, messages_get("Done"));
 	} else {
 		c->status = CONTENT_STATUS_READY;
-		sprintf(c->status_message, "Fetching %u objects", c->active);
+		sprintf(c->status_message, messages_get("FetchObjs"),
+				c->active);
 	}
 
 	return 0;
@@ -393,7 +395,8 @@ void html_find_stylesheets(struct content *c, xmlNode *head)
 	/* complete the fetches */
 	while (c->active != 0) {
 		if (c->active != last_active) {
-			sprintf(c->status_message, "Loading %u stylesheets", c->active);
+			sprintf(c->status_message, messages_get("FetchStyle"),
+					c->active);
 			content_broadcast(c, CONTENT_MSG_STATUS, 0);
 			last_active = c->active;
 		}
@@ -424,7 +427,7 @@ void html_convert_css_callback(content_msg msg, struct content *css,
 				c->data.html.stylesheet_content[i] = 0;
 				c->active--;
 				c->error = 1;
-				sprintf(c->status_message, "Warning: stylesheet is not CSS");
+				sprintf(c->status_message, messages_get("NotCSS"));
 				content_broadcast(c, CONTENT_MSG_STATUS, 0);
 				content_remove_user(css, html_convert_css_callback, c, (void*)i);
 			}
@@ -445,7 +448,7 @@ void html_convert_css_callback(content_msg msg, struct content *css,
 			break;
 
 		case CONTENT_MSG_STATUS:
-			snprintf(c->status_message, 80, "Loading %u stylesheets: %s",
+			snprintf(c->status_message, 80, messages_get("FetchStyle2"),
 					c->active, css->status_message);
 			content_broadcast(c, CONTENT_MSG_STATUS, 0);
 			break;
@@ -550,7 +553,7 @@ void html_object_callback(content_msg msg, struct content *object,
 			c->data.html.object[i].content = 0;
 			c->active--;
 			c->error = 1;
-			sprintf(c->status_message, "Warning: bad object type");
+			sprintf(c->status_message, messages_get("BadObject"));
 			content_broadcast(c, CONTENT_MSG_STATUS, 0);
 			content_remove_user(object, html_object_callback, c, (void*)i);
 			break;
@@ -589,12 +592,13 @@ void html_object_callback(content_msg msg, struct content *object,
 			c->data.html.object[i].content = 0;
 			c->active--;
 			c->error = 1;
-			snprintf(c->status_message, 80, "Image error: %s", error);
+			snprintf(c->status_message, 80,
+					messages_get("ObjError"), error);
 			content_broadcast(c, CONTENT_MSG_STATUS, 0);
 			break;
 
 		case CONTENT_MSG_STATUS:
-			snprintf(c->status_message, 80, "Loading %i objects: %s",
+			snprintf(c->status_message, 80, messages_get("FetchObjs2"),
 					c->active, object->status_message);
 			/* content_broadcast(c, CONTENT_MSG_STATUS, 0); */
 			break;
@@ -641,11 +645,12 @@ void html_object_callback(content_msg msg, struct content *object,
 		/* all objects have arrived */
 		content_reformat(c, c->available_width, 0);
 		c->status = CONTENT_STATUS_DONE;
-		sprintf(c->status_message, "Document done");
+		sprintf(c->status_message, messages_get("Done"));
 		content_broadcast(c, CONTENT_MSG_DONE, 0);
 	}
 	if (c->status == CONTENT_STATUS_READY)
-		sprintf(c->status_message, "Loading %i objects", c->active);
+		sprintf(c->status_message, messages_get("FetchObjs"),
+				c->active);
 }
 
 
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;
author	James Bursa <james@netsurf-browser.org>	2004-02-27 17:45:19 +0000
committer	James Bursa <james@netsurf-browser.org>	2004-02-27 17:45:19 +0000
commit	7f68e012cc9f64bd09a8452e85df9df2a0e9211b (patch)
tree	3825cab5266ed7ed24dd7273b40a7b7e0de9e917
parent	13787963e26dd2cdb39bbcb28cfaafb1d13ec5ea (diff)
download	netsurf-7f68e012cc9f64bd09a8452e85df9df2a0e9211b.tar.gz netsurf-7f68e012cc9f64bd09a8452e85df9df2a0e9211b.tar.bz2