Merge branch 'master' of git://git.netsurf-browser.org/netsurf

Conflicts:
	atari/gui.h

1 files changed, 47 insertions, 4 deletions

diff --git a/utils/corestrings.h b/utils/corestrings.h
index c50cc3113..b41d1f859 100644
--- a/utils/corestrings.h
+++ b/utils/corestrings.h
@@ -24,6 +24,7 @@
 #define NETSURF_UTILS_CORESTRINGS_H_
 
 #include <libwapcaplet/libwapcaplet.h>
+#include "utils/nsurl.h"
 #include "utils/errors.h"
 
 nserror corestrings_init(void);
@@ -31,6 +32,7 @@ void corestrings_fini(void);
 
 /* lwc_string strings */
 extern lwc_string *corestring_lwc_a;
+extern lwc_string *corestring_lwc_about;
 extern lwc_string *corestring_lwc_abscenter;
 extern lwc_string *corestring_lwc_absmiddle;
 extern lwc_string *corestring_lwc_align;
@@ -46,10 +48,12 @@ extern lwc_string *corestring_lwc_charset;
 extern lwc_string *corestring_lwc_checkbox;
 extern lwc_string *corestring_lwc_circle;
 extern lwc_string *corestring_lwc_col;
+extern lwc_string *corestring_lwc_data;
 extern lwc_string *corestring_lwc_default;
 extern lwc_string *corestring_lwc_div;
 extern lwc_string *corestring_lwc_embed;
 extern lwc_string *corestring_lwc_file;
+extern lwc_string *corestring_lwc_filename;
 extern lwc_string *corestring_lwc_font;
 extern lwc_string *corestring_lwc_frame;
 extern lwc_string *corestring_lwc_frameset;
@@ -63,18 +67,21 @@ extern lwc_string *corestring_lwc_head;
 extern lwc_string *corestring_lwc_hidden;
 extern lwc_string *corestring_lwc_hr;
 extern lwc_string *corestring_lwc_html;
+extern lwc_string *corestring_lwc_http;
 extern lwc_string *corestring_lwc_https;
+extern lwc_string *corestring_lwc_icon;
 extern lwc_string *corestring_lwc_iframe;
 extern lwc_string *corestring_lwc_image;
 extern lwc_string *corestring_lwc_img;
 extern lwc_string *corestring_lwc_input;
+extern lwc_string *corestring_lwc_javascript;
 extern lwc_string *corestring_lwc_justify;
 extern lwc_string *corestring_lwc_left;
 extern lwc_string *corestring_lwc_li;
 extern lwc_string *corestring_lwc_link;
 extern lwc_string *corestring_lwc_meta;
 extern lwc_string *corestring_lwc_middle;
-extern lwc_string *corestring_lwc_multipart_form_data;
+extern lwc_string *corestring_lwc_multipart_form_data; /* multipart/form-data */
 extern lwc_string *corestring_lwc_no;
 extern lwc_string *corestring_lwc_noscript;
 extern lwc_string *corestring_lwc_object;
@@ -91,9 +98,11 @@ extern lwc_string *corestring_lwc_rect;
 extern lwc_string *corestring_lwc_rectangle;
 extern lwc_string *corestring_lwc_refresh;
 extern lwc_string *corestring_lwc_reset;
+extern lwc_string *corestring_lwc_resource;
 extern lwc_string *corestring_lwc_right;
 extern lwc_string *corestring_lwc_search;
 extern lwc_string *corestring_lwc_select;
+extern lwc_string *corestring_lwc_shortcut_icon; /* shortcut icon */
 extern lwc_string *corestring_lwc_src;
 extern lwc_string *corestring_lwc_style;
 extern lwc_string *corestring_lwc_submit;
@@ -103,7 +112,7 @@ extern lwc_string *corestring_lwc_td;
 extern lwc_string *corestring_lwc_text;
 extern lwc_string *corestring_lwc_textarea;
 extern lwc_string *corestring_lwc_texttop;
-extern lwc_string *corestring_lwc_text_css;
+extern lwc_string *corestring_lwc_text_css; /* text/css */
 extern lwc_string *corestring_lwc_tfoot;
 extern lwc_string *corestring_lwc_th;
 extern lwc_string *corestring_lwc_thead;
@@ -122,6 +131,7 @@ struct dom_string;
 
 /* dom_string strings */
 extern struct dom_string *corestring_dom_a;
+extern struct dom_string *corestring_dom_alt;
 extern struct dom_string *corestring_dom_abort;
 extern struct dom_string *corestring_dom_afterprint;
 extern struct dom_string *corestring_dom_align;
@@ -142,14 +152,18 @@ extern struct dom_string *corestring_dom_cellspacing;
 extern struct dom_string *corestring_dom_change;
 extern struct dom_string *corestring_dom_charset;
 extern struct dom_string *corestring_dom_class;
+extern struct dom_string *corestring_dom_classid;
 extern struct dom_string *corestring_dom_click;
 extern struct dom_string *corestring_dom_close;
+extern struct dom_string *corestring_dom_codebase;
 extern struct dom_string *corestring_dom_color;
 extern struct dom_string *corestring_dom_cols;
+extern struct dom_string *corestring_dom_colspan;
 extern struct dom_string *corestring_dom_content;
 extern struct dom_string *corestring_dom_contextmenu;
 extern struct dom_string *corestring_dom_coords;
 extern struct dom_string *corestring_dom_cuechange;
+extern struct dom_string *corestring_dom_data;
 extern struct dom_string *corestring_dom_dblclick;
 extern struct dom_string *corestring_dom_defer;
 extern struct dom_string *corestring_dom_DOMAttrModified;
@@ -168,12 +182,13 @@ extern struct dom_string *corestring_dom_emptied;
 extern struct dom_string *corestring_dom_ended;
 extern struct dom_string *corestring_dom_error;
 extern struct dom_string *corestring_dom_focus;
+extern struct dom_string *corestring_dom_frameborder;
 extern struct dom_string *corestring_dom_hashchange;
 extern struct dom_string *corestring_dom_height;
 extern struct dom_string *corestring_dom_href;
 extern struct dom_string *corestring_dom_hreflang;
 extern struct dom_string *corestring_dom_hspace;
-extern struct dom_string *corestring_dom_http_equiv;
+extern struct dom_string *corestring_dom_http_equiv; /* http-equiv */
 extern struct dom_string *corestring_dom_id;
 extern struct dom_string *corestring_dom_input;
 extern struct dom_string *corestring_dom_invalid;
@@ -186,6 +201,8 @@ extern struct dom_string *corestring_dom_loadeddata;
 extern struct dom_string *corestring_dom_loadedmetadata;
 extern struct dom_string *corestring_dom_loadstart;
 extern struct dom_string *corestring_dom_map;
+extern struct dom_string *corestring_dom_marginheight;
+extern struct dom_string *corestring_dom_marginwidth;
 extern struct dom_string *corestring_dom_media;
 extern struct dom_string *corestring_dom_message;
 extern struct dom_string *corestring_dom_mousedown;
@@ -196,6 +213,7 @@ extern struct dom_string *corestring_dom_mouseup;
 extern struct dom_string *corestring_dom_mousewheel;
 extern struct dom_string *corestring_dom_name;
 extern struct dom_string *corestring_dom_nohref;
+extern struct dom_string *corestring_dom_noresize;
 extern struct dom_string *corestring_dom_offline;
 extern struct dom_string *corestring_dom_online;
 extern struct dom_string *corestring_dom_pagehide;
@@ -212,10 +230,13 @@ extern struct dom_string *corestring_dom_rel;
 extern struct dom_string *corestring_dom_reset;
 extern struct dom_string *corestring_dom_resize;
 extern struct dom_string *corestring_dom_rows;
+extern struct dom_string *corestring_dom_rowspan;
 extern struct dom_string *corestring_dom_scroll;
+extern struct dom_string *corestring_dom_scrolling;
 extern struct dom_string *corestring_dom_seeked;
 extern struct dom_string *corestring_dom_seeking;
 extern struct dom_string *corestring_dom_select;
+extern struct dom_string *corestring_dom_selected;
 extern struct dom_string *corestring_dom_shape;
 extern struct dom_string *corestring_dom_show;
 extern struct dom_string *corestring_dom_size;
@@ -228,17 +249,39 @@ extern struct dom_string *corestring_dom_submit;
 extern struct dom_string *corestring_dom_suspend;
 extern struct dom_string *corestring_dom_target;
 extern struct dom_string *corestring_dom_text;
-extern struct dom_string *corestring_dom_text_javascript;
+extern struct dom_string *corestring_dom_text_javascript; /* text/javascript */
 extern struct dom_string *corestring_dom_timeupdate;
+extern struct dom_string *corestring_dom_title;
 extern struct dom_string *corestring_dom_type;
 extern struct dom_string *corestring_dom_unload;
 extern struct dom_string *corestring_dom_valign;
+extern struct dom_string *corestring_dom_value;
 extern struct dom_string *corestring_dom_vlink;
 extern struct dom_string *corestring_dom_volumechange;
 extern struct dom_string *corestring_dom_vspace;
 extern struct dom_string *corestring_dom_waiting;
 extern struct dom_string *corestring_dom_width;
+/* DOM node types */
+extern struct dom_string *corestring_dom_BUTTON;
+extern struct dom_string *corestring_dom_INPUT;
+extern struct dom_string *corestring_dom_SELECT;
+extern struct dom_string *corestring_dom_TEXTAREA;
+/* DOM input node types */
+extern struct dom_string *corestring_dom_button;
+/* extern struct dom_string *corestring_dom_submit; */
+/* extern struct dom_string *corestring_dom_reset; */
+extern struct dom_string *corestring_dom_image;
+extern struct dom_string *corestring_dom_radio;
+extern struct dom_string *corestring_dom_checkbox;
+extern struct dom_string *corestring_dom_file;
+extern struct dom_string *corestring_dom_on;
+/* DOM userdata keys */
+extern struct dom_string *corestring_dom___ns_key_box_node_data;
 extern struct dom_string *corestring_dom___ns_key_libcss_node_data;
+extern struct dom_string *corestring_dom___ns_key_file_name_node_data;
+extern struct dom_string *corestring_dom___ns_key_image_coords_node_data;
 
+/* URLs */
+extern nsurl *corestring_nsurl_about_blank;
 
 #endif