From 9ab15364c46c9ec1445cb901b04bc85045ead3d8 Mon Sep 17 00:00:00 2001
From: Pim Snel <mipmip@alumni.egroupware.org>
Date: Thu, 29 Jan 2004 21:27:14 +0000
Subject: [PATCH] update the rest of the htmlarea-tree

---
 phpgwapi/js/htmlarea/dialog.js                |   46 +-
 phpgwapi/js/htmlarea/htmlarea.css             |    6 +-
 phpgwapi/js/htmlarea/htmlarea.js              | 1139 ++++++++---------
 phpgwapi/js/htmlarea/index.html               |   66 +-
 phpgwapi/js/htmlarea/lang/cz.js               |   63 +
 phpgwapi/js/htmlarea/lang/de.js               |   37 +-
 phpgwapi/js/htmlarea/lang/ee.js               |   63 +
 phpgwapi/js/htmlarea/lang/el.js               |   84 ++
 phpgwapi/js/htmlarea/lang/en.js               |   33 +-
 phpgwapi/js/htmlarea/lang/es.js               |   35 +-
 phpgwapi/js/htmlarea/lang/fr.js               |   31 +-
 phpgwapi/js/htmlarea/lang/he.js               |   63 +
 phpgwapi/js/htmlarea/lang/hu.js               |   63 +
 phpgwapi/js/htmlarea/lang/it.js               |   58 +-
 phpgwapi/js/htmlarea/lang/lt.js               |   55 +
 phpgwapi/js/htmlarea/lang/lv.js               |   55 +
 phpgwapi/js/htmlarea/lang/makefile.xml        |    3 +
 phpgwapi/js/htmlarea/lang/nl.js               |  107 +-
 phpgwapi/js/htmlarea/lang/no.js               |   48 +
 phpgwapi/js/htmlarea/lang/ro.js               |   29 +-
 phpgwapi/js/htmlarea/lang/ru.js               |   79 +-
 phpgwapi/js/htmlarea/lang/si.js               |   63 +
 phpgwapi/js/htmlarea/lang/vn.js               |   55 +-
 phpgwapi/js/htmlarea/license.txt              |   29 +-
 .../htmlarea/plugins/SpellChecker/lang/cz.js  |   37 +
 .../htmlarea/plugins/SpellChecker/lang/da.js  |   37 +
 .../htmlarea/plugins/SpellChecker/lang/de.js  |   28 +
 .../htmlarea/plugins/SpellChecker/lang/en.js  |    2 +-
 .../htmlarea/plugins/SpellChecker/lang/hu.js  |   37 +
 .../htmlarea/plugins/SpellChecker/lang/it.js  |   28 +
 .../htmlarea/plugins/SpellChecker/lang/ro.js  |    2 +-
 .../plugins/SpellChecker/readme-tech.html     |    6 +-
 .../SpellChecker/spell-check-logic.cgi        |    2 +-
 .../plugins/SpellChecker/spell-check-ui.html  |    2 +-
 .../plugins/SpellChecker/spell-check-ui.js    |   18 +-
 .../plugins/SpellChecker/spell-checker.js     |   17 +-
 phpgwapi/js/htmlarea/popups/about.html        |  392 +++++-
 phpgwapi/js/htmlarea/popups/blank.html        |    2 +
 phpgwapi/js/htmlarea/popups/fullscreen.html   |  225 ++--
 phpgwapi/js/htmlarea/popups/insert_image.html |   83 +-
 phpgwapi/js/htmlarea/popups/insert_table.html |    7 +-
 phpgwapi/js/htmlarea/popups/link.html         |  142 ++
 phpgwapi/js/htmlarea/popups/popup.js          |  113 +-
 phpgwapi/js/htmlarea/popups/select_color.html |    3 +-
 phpgwapi/js/htmlarea/popupwin.js              |   16 +-
 phpgwapi/js/htmlarea/reference.html           |   71 +-
 phpgwapi/js/htmlarea/release-notes.html       |   88 +-
 47 files changed, 2604 insertions(+), 1064 deletions(-)
 create mode 100644 phpgwapi/js/htmlarea/lang/cz.js
 create mode 100644 phpgwapi/js/htmlarea/lang/ee.js
 create mode 100644 phpgwapi/js/htmlarea/lang/el.js
 create mode 100644 phpgwapi/js/htmlarea/lang/he.js
 create mode 100644 phpgwapi/js/htmlarea/lang/hu.js
 create mode 100644 phpgwapi/js/htmlarea/lang/lt.js
 create mode 100644 phpgwapi/js/htmlarea/lang/lv.js
 create mode 100644 phpgwapi/js/htmlarea/lang/makefile.xml
 create mode 100644 phpgwapi/js/htmlarea/lang/no.js
 create mode 100644 phpgwapi/js/htmlarea/lang/si.js
 create mode 100644 phpgwapi/js/htmlarea/plugins/SpellChecker/lang/cz.js
 create mode 100644 phpgwapi/js/htmlarea/plugins/SpellChecker/lang/da.js
 create mode 100644 phpgwapi/js/htmlarea/plugins/SpellChecker/lang/de.js
 create mode 100644 phpgwapi/js/htmlarea/plugins/SpellChecker/lang/hu.js
 create mode 100644 phpgwapi/js/htmlarea/plugins/SpellChecker/lang/it.js
 create mode 100644 phpgwapi/js/htmlarea/popups/link.html

diff --git a/phpgwapi/js/htmlarea/dialog.js b/phpgwapi/js/htmlarea/dialog.js
index 87134e7393..b66ec8a2fd 100644
--- a/phpgwapi/js/htmlarea/dialog.js
+++ b/phpgwapi/js/htmlarea/dialog.js
@@ -1,3 +1,16 @@
+// htmlArea v3.0 - Copyright (c) 2003-2004 interactivetools.com, inc.
+// This copyright notice MUST stay intact for use (see license.txt).
+//
+// Portions (c) dynarch.com, 2003-2004
+//
+// A free WYSIWYG editor replacement for <textarea> fields.
+// For full source code and docs, visit http://www.interactivetools.com/
+//
+// Version 3.0 developed by Mihai Bazon.
+//   http://dynarch.com/mishoo
+//
+// $Id$
+
 // Though "Dialog" looks like an object, it isn't really an object.  Instead
 // it's just namespace for protecting global symbols.
 
@@ -5,26 +18,13 @@ function Dialog(url, action, init) {
 	if (typeof init == "undefined") {
 		init = window;	// pass this window object by default
 	}
-	if (document.all) {	// here we hope that Mozilla will never support document.all
-		var value =
-			showModalDialog(url, init,
-//			window.open(url, '_blank',
-					"resizable: no; help: no; status: no; scroll: no");
-		if (action) {
-			action(value);
-		}
-	} else {
-		return Dialog._geckoOpenModal(url, action, init);
-	}
+	Dialog._geckoOpenModal(url, action, init);
 };
 
 Dialog._parentEvent = function(ev) {
 	if (Dialog._modal && !Dialog._modal.closed) {
 		Dialog._modal.focus();
-		// we get here in Mozilla only, anyway, so we can safely use
-		// the DOM version.
-		ev.preventDefault();
-		ev.stopPropagation();
+		HTMLArea._stopEvent(ev);
 	}
 };
 
@@ -38,23 +38,23 @@ Dialog._modal = null;
 Dialog._arguments = null;
 
 Dialog._geckoOpenModal = function(url, action, init) {
-	var dlg = window.open(url, "ha_dialog",
+	var dlg = window.open(url, "hadialog",
 			      "toolbar=no,menubar=no,personalbar=no,width=10,height=10," +
-			      "scrollbars=no,resizable=no");
+			      "scrollbars=no,resizable=yes");
 	Dialog._modal = dlg;
 	Dialog._arguments = init;
 
 	// capture some window's events
 	function capwin(w) {
-		w.addEventListener("click", Dialog._parentEvent, true);
-		w.addEventListener("mousedown", Dialog._parentEvent, true);
-		w.addEventListener("focus", Dialog._parentEvent, true);
+		HTMLArea._addEvent(w, "click", Dialog._parentEvent);
+		HTMLArea._addEvent(w, "mousedown", Dialog._parentEvent);
+		HTMLArea._addEvent(w, "focus", Dialog._parentEvent);
 	};
 	// release the captured events
 	function relwin(w) {
-		w.removeEventListener("focus", Dialog._parentEvent, true);
-		w.removeEventListener("mousedown", Dialog._parentEvent, true);
-		w.removeEventListener("click", Dialog._parentEvent, true);
+		HTMLArea._removeEvent(w, "click", Dialog._parentEvent);
+		HTMLArea._removeEvent(w, "mousedown", Dialog._parentEvent);
+		HTMLArea._removeEvent(w, "focus", Dialog._parentEvent);
 	};
 	capwin(window);
 	// capture other frames
diff --git a/phpgwapi/js/htmlarea/htmlarea.css b/phpgwapi/js/htmlarea/htmlarea.css
index 23bdf7d9db..0e034bfcbf 100644
--- a/phpgwapi/js/htmlarea/htmlarea.css
+++ b/phpgwapi/js/htmlarea/htmlarea.css
@@ -17,6 +17,8 @@
   border: 1px solid ButtonFace;
   padding: 1px;
   margin: 0px;
+  width: 18px;
+  height: 18px;
 }
 .htmlarea .toolbar .buttonHover {
   border: 1px solid;
@@ -39,11 +41,9 @@
   border: 1px solid ButtonShadow;
 }
 
-.htmlarea .toolbar .buttonDisabled { background-color: #aaa; }
-
 .htmlarea .toolbar .buttonDisabled img {
   filter: alpha(opacity = 25);
-  -moz-opacity: 25%;
+  -moz-opacity: 0.25;
 }
 
 .htmlarea .toolbar .separator {
diff --git a/phpgwapi/js/htmlarea/htmlarea.js b/phpgwapi/js/htmlarea/htmlarea.js
index 5417cd5e3c..fc8c6307bc 100644
--- a/phpgwapi/js/htmlarea/htmlarea.js
+++ b/phpgwapi/js/htmlarea/htmlarea.js
@@ -51,18 +51,18 @@ function HTMLArea(textarea, config) {
 
 // load some scripts
 (function() {
- var scripts = HTMLArea._scripts = [ _editor_url + "htmlarea.js",
- _editor_url + "dialog.js",
- _editor_url + "popupwin.js",
- _editor_url + "lang/" + _editor_lang + ".js" ];
- var head = document.getElementsByTagName("head")[0];
- // start from 1, htmlarea.js is already loaded
- for (var i = 1; i < scripts.length; ++i) {
- var script = document.createElement("script");
- script.src = scripts[i];
- head.appendChild(script);
- }
- })();
+	var scripts = HTMLArea._scripts = [ _editor_url + "htmlarea.js",
+					    _editor_url + "dialog.js",
+					    _editor_url + "popupwin.js",
+					    _editor_url + "lang/" + _editor_lang + ".js" ];
+	var head = document.getElementsByTagName("head")[0];
+	// start from 1, htmlarea.js is already loaded
+	for (var i = 1; i < scripts.length; ++i) {
+		var script = document.createElement("script");
+		script.src = scripts[i];
+		head.appendChild(script);
+	}
+})();
 
 // cache some regexps
 HTMLArea.RE_tagName = /(<\/|<)\s*([^ \t\n>]+)/ig;
@@ -119,19 +119,19 @@ HTMLArea.Config = function () {
 	 */
 	this.toolbar = [
 		[ "fontname", "space",
-	"fontsize", "space",
-	"formatblock", "space",
-	"bold", "italic", "underline", "strikethrough", "separator",
-	"subscript", "superscript", "separator",
-	"copy", "cut", "paste", "space", "undo", "redo" ],
+		  "fontsize", "space",
+		  "formatblock", "space",
+		  "bold", "italic", "underline", "strikethrough", "separator",
+		  "subscript", "superscript", "separator",
+		  "copy", "cut", "paste", "space", "undo", "redo" ],
 
-	[ "justifyleft", "justifycenter", "justifyright", "justifyfull", "separator",
-	"lefttoright", "righttoleft", "separator",
-	"insertorderedlist", "insertunorderedlist", "outdent", "indent", "separator",
-	"forecolor", "hilitecolor", "separator",
-	"inserthorizontalrule", "createlink", "insertimage", "inserttable", "htmlmode", "separator",
-	"popupeditor", "separator", "showhelp", "about" ]
-		];
+		[ "justifyleft", "justifycenter", "justifyright", "justifyfull", "separator",
+		  "lefttoright", "righttoleft", "separator",
+		  "insertorderedlist", "insertunorderedlist", "outdent", "indent", "separator",
+		  "forecolor", "hilitecolor", "separator",
+		  "inserthorizontalrule", "createlink", "insertimage", "inserttable", "htmlmode", "separator",
+		  "popupeditor", "separator", "showhelp", "about" ]
+	];
 
 	this.fontname = {
 		"Arial":	   'arial,helvetica,sans-serif',
@@ -187,37 +187,37 @@ HTMLArea.Config = function () {
 	//    - Icon: path to an icon image file for the button (TODO: use one image for all buttons!)
 	//    - Enabled in text mode: if false the button gets disabled for text-only mode; otherwise enabled all the time.
 	this.btnList = {
-bold: [ "Bold", "ed_format_bold.gif", false, function(e) {e.execCommand("bold");} ],
-italic: [ "Italic", "ed_format_italic.gif", false, function(e) {e.execCommand("italic");} ],
-underline: [ "Underline", "ed_format_underline.gif", false, function(e) {e.execCommand("underline");} ],
-strikethrough: [ "Strikethrough", "ed_format_strike.gif", false, function(e) {e.execCommand("strikethrough");} ],
-subscript: [ "Subscript", "ed_format_sub.gif", false, function(e) {e.execCommand("subscript");} ],
-superscript: [ "Superscript", "ed_format_sup.gif", false, function(e) {e.execCommand("superscript");} ],
-justifyleft: [ "Justify Left", "ed_align_left.gif", false, function(e) {e.execCommand("justifyleft");} ],
-justifycenter: [ "Justify Center", "ed_align_center.gif", false, function(e) {e.execCommand("justifycenter");} ],
-justifyright: [ "Justify Right", "ed_align_right.gif", false, function(e) {e.execCommand("justifyright");} ],
-justifyfull: [ "Justify Full", "ed_align_justify.gif", false, function(e) {e.execCommand("justifyfull");} ],
-insertorderedlist: [ "Ordered List", "ed_list_num.gif", false, function(e) {e.execCommand("insertorderedlist");} ],
-insertunorderedlist: [ "Bulleted List", "ed_list_bullet.gif", false, function(e) {e.execCommand("insertunorderedlist");} ],
-outdent: [ "Decrease Indent", "ed_indent_less.gif", false, function(e) {e.execCommand("outdent");} ],
-indent: [ "Increase Indent", "ed_indent_more.gif", false, function(e) {e.execCommand("indent");} ],
-forecolor: [ "Font Color", "ed_color_fg.gif", false, function(e) {e.execCommand("forecolor");} ],
-hilitecolor: [ "Background Color", "ed_color_bg.gif", false, function(e) {e.execCommand("hilitecolor");} ],
-inserthorizontalrule: [ "Horizontal Rule", "ed_hr.gif", false, function(e) {e.execCommand("inserthorizontalrule");} ],
-createlink: [ "Insert Web Link", "ed_link.gif", false, function(e) {e.execCommand("createlink", true);} ],
-insertimage: [ "Insert/Modify Image", "ed_image.gif", false, function(e) {e.execCommand("insertimage");} ],
-inserttable: [ "Insert Table", "insert_table.gif", false, function(e) {e.execCommand("inserttable");} ],
-htmlmode: [ "Toggle HTML Source", "ed_html.gif", true, function(e) {e.execCommand("htmlmode");} ],
-popupeditor: [ "Enlarge Editor", "fullscreen_maximize.gif", true, function(e) {e.execCommand("popupeditor");} ],
-about: [ "About this editor", "ed_about.gif", true, function(e) {e.execCommand("about");} ],
-showhelp: [ "Help using editor", "ed_help.gif", true, function(e) {e.execCommand("showhelp");} ],
-undo: [ "Undoes your last action", "ed_undo.gif", false, function(e) {e.execCommand("undo");} ],
-redo: [ "Redoes your last action", "ed_redo.gif", false, function(e) {e.execCommand("redo");} ],
-cut: [ "Cut selection", "ed_cut.gif", false, cut_copy_paste ],
-copy: [ "Copy selection", "ed_copy.gif", false, cut_copy_paste ],
-paste: [ "Paste from clipboard", "ed_paste.gif", false, cut_copy_paste ],
-lefttoright: [ "Direction left to right", "ed_left_to_right.gif", false, function(e) {e.execCommand("lefttoright");} ],
-righttoleft: [ "Direction right to left", "ed_right_to_left.gif", false, function(e) {e.execCommand("righttoleft");} ]
+		bold: [ "Bold", "ed_format_bold.gif", false, function(e) {e.execCommand("bold");} ],
+		italic: [ "Italic", "ed_format_italic.gif", false, function(e) {e.execCommand("italic");} ],
+		underline: [ "Underline", "ed_format_underline.gif", false, function(e) {e.execCommand("underline");} ],
+		strikethrough: [ "Strikethrough", "ed_format_strike.gif", false, function(e) {e.execCommand("strikethrough");} ],
+		subscript: [ "Subscript", "ed_format_sub.gif", false, function(e) {e.execCommand("subscript");} ],
+		superscript: [ "Superscript", "ed_format_sup.gif", false, function(e) {e.execCommand("superscript");} ],
+		justifyleft: [ "Justify Left", "ed_align_left.gif", false, function(e) {e.execCommand("justifyleft");} ],
+		justifycenter: [ "Justify Center", "ed_align_center.gif", false, function(e) {e.execCommand("justifycenter");} ],
+		justifyright: [ "Justify Right", "ed_align_right.gif", false, function(e) {e.execCommand("justifyright");} ],
+		justifyfull: [ "Justify Full", "ed_align_justify.gif", false, function(e) {e.execCommand("justifyfull");} ],
+		insertorderedlist: [ "Ordered List", "ed_list_num.gif", false, function(e) {e.execCommand("insertorderedlist");} ],
+		insertunorderedlist: [ "Bulleted List", "ed_list_bullet.gif", false, function(e) {e.execCommand("insertunorderedlist");} ],
+		outdent: [ "Decrease Indent", "ed_indent_less.gif", false, function(e) {e.execCommand("outdent");} ],
+		indent: [ "Increase Indent", "ed_indent_more.gif", false, function(e) {e.execCommand("indent");} ],
+		forecolor: [ "Font Color", "ed_color_fg.gif", false, function(e) {e.execCommand("forecolor");} ],
+		hilitecolor: [ "Background Color", "ed_color_bg.gif", false, function(e) {e.execCommand("hilitecolor");} ],
+		inserthorizontalrule: [ "Horizontal Rule", "ed_hr.gif", false, function(e) {e.execCommand("inserthorizontalrule");} ],
+		createlink: [ "Insert Web Link", "ed_link.gif", false, function(e) {e.execCommand("createlink", true);} ],
+		insertimage: [ "Insert/Modify Image", "ed_image.gif", false, function(e) {e.execCommand("insertimage");} ],
+		inserttable: [ "Insert Table", "insert_table.gif", false, function(e) {e.execCommand("inserttable");} ],
+		htmlmode: [ "Toggle HTML Source", "ed_html.gif", true, function(e) {e.execCommand("htmlmode");} ],
+		popupeditor: [ "Enlarge Editor", "fullscreen_maximize.gif", true, function(e) {e.execCommand("popupeditor");} ],
+		about: [ "About this editor", "ed_about.gif", true, function(e) {e.execCommand("about");} ],
+		showhelp: [ "Help using editor", "ed_help.gif", true, function(e) {e.execCommand("showhelp");} ],
+		undo: [ "Undoes your last action", "ed_undo.gif", false, function(e) {e.execCommand("undo");} ],
+		redo: [ "Redoes your last action", "ed_redo.gif", false, function(e) {e.execCommand("redo");} ],
+		cut: [ "Cut selection", "ed_cut.gif", false, cut_copy_paste ],
+		copy: [ "Copy selection", "ed_copy.gif", false, cut_copy_paste ],
+		paste: [ "Paste from clipboard", "ed_paste.gif", false, cut_copy_paste ],
+		lefttoright: [ "Direction left to right", "ed_left_to_right.gif", false, function(e) {e.execCommand("lefttoright");} ],
+		righttoleft: [ "Direction right to left", "ed_right_to_left.gif", false, function(e) {e.execCommand("righttoleft");} ]
 	};
 	/* ADDING CUSTOM BUTTONS
 	 * ---------------------
@@ -287,8 +287,8 @@ HTMLArea.Config.prototype.registerButton = function(id, tooltip, image, textMode
 		// alert("WARNING [HTMLArea.Config::registerDropdown]:\nA button with the same ID already exists.");
 	}
 	switch (typeof id) {
-		case "string": this.btnList[id] = [ tooltip, image, textMode, action, context ]; break;
-		case "object": this.btnList[id.id] = [ id.tooltip, id.image, id.textMode, id.action, id.context ]; break;
+	    case "string": this.btnList[id] = [ tooltip, image, textMode, action, context ]; break;
+	    case "object": this.btnList[id.id] = [ id.tooltip, id.image, id.textMode, id.action, id.context ]; break;
 	}
 };
 
@@ -384,21 +384,21 @@ HTMLArea.prototype._createToolbar = function () {
 		var el = this.element;
 		if (oldval != newval) {
 			switch (id) {
-				case "enabled":
-					if (newval) {
-						HTMLArea._removeClass(el, "buttonDisabled");
-						el.disabled = false;
-					} else {
-						HTMLArea._addClass(el, "buttonDisabled");
-						el.disabled = true;
-					}
+			    case "enabled":
+				if (newval) {
+					HTMLArea._removeClass(el, "buttonDisabled");
+					el.disabled = false;
+				} else {
+					HTMLArea._addClass(el, "buttonDisabled");
+					el.disabled = true;
+				}
 				break;
-				case "active":
-					if (newval) {
-						HTMLArea._addClass(el, "buttonPressed");
-					} else {
-						HTMLArea._removeClass(el, "buttonPressed");
-					}
+			    case "active":
+				if (newval) {
+					HTMLArea._addClass(el, "buttonPressed");
+				} else {
+					HTMLArea._removeClass(el, "buttonPressed");
+				}
 				break;
 			}
 			this[id] = newval;
@@ -416,20 +416,20 @@ HTMLArea.prototype._createToolbar = function () {
 		var customSelects = editor.config.customSelects;
 		var context = null;
 		switch (txt) {
-			case "fontsize":
-				case "fontname":
-				case "formatblock":
-				// the following line retrieves the correct
-				// configuration option because the variable name
-				// inside the Config object is named the same as the
-				// button/select in the toolbar.  For instance, if txt
-				// == "formatblock" we retrieve config.formatblock (or
-				// a different way to write it in JS is
-				// config["formatblock"].
-				options = editor.config[txt];
+		    case "fontsize":
+		    case "fontname":
+		    case "formatblock":
+			// the following line retrieves the correct
+			// configuration option because the variable name
+			// inside the Config object is named the same as the
+			// button/select in the toolbar.  For instance, if txt
+			// == "formatblock" we retrieve config.formatblock (or
+			// a different way to write it in JS is
+			// config["formatblock"].
+			options = editor.config[txt];
 			cmd = txt;
 			break;
-			default:
+		    default:
 			// try to fetch it from the list of registered selects
 			cmd = txt;
 			var dropdown = customSelects[cmd];
@@ -444,13 +444,13 @@ HTMLArea.prototype._createToolbar = function () {
 		if (options) {
 			el = document.createElement("select");
 			var obj = {
-name	: txt, // field name
-element : el,	// the UI element (SELECT)
-enabled : true, // is it enabled?
-text	: false, // enabled in text mode?
-cmd	: cmd, // command ID
-state	: setButtonStatus, // for changing state
-context : context
+				name	: txt, // field name
+				element : el,	// the UI element (SELECT)
+				enabled : true, // is it enabled?
+				text	: false, // enabled in text mode?
+				cmd	: cmd, // command ID
+				state	: setButtonStatus, // for changing state
+				context : context
 			};
 			tb_objects[txt] = obj;
 			for (var i in options) {
@@ -460,8 +460,8 @@ context : context
 				el.appendChild(op);
 			}
 			HTMLArea._addEvent(el, "change", function () {
-					editor._comboSelected(el, txt);
-					});
+				editor._comboSelected(el, txt);
+			});
 		}
 		return el;
 	}; // END of function: createSelect
@@ -472,34 +472,34 @@ context : context
 		var el = null;
 		var btn = null;
 		switch (txt) {
-			case "separator":
-				el = document.createElement("div");
+		    case "separator":
+			el = document.createElement("div");
 			el.className = "separator";
 			break;
-			case "space":
-				el = document.createElement("div");
+		    case "space":
+			el = document.createElement("div");
 			el.className = "space";
 			break;
-			case "linebreak":
-				newLine();
+		    case "linebreak":
+			newLine();
 			return false;
-			case "textindicator":
-				el = document.createElement("div");
+		    case "textindicator":
+			el = document.createElement("div");
 			el.appendChild(document.createTextNode("A"));
 			el.className = "indicator";
 			el.title = HTMLArea.I18N.tooltips.textindicator;
 			var obj = {
-name	: txt, // the button name (i.e. 'bold')
-element : el, // the UI element (DIV)
-enabled : true, // is it enabled?
-active	: false, // is it pressed?
-text	: false, // enabled in text mode?
-cmd	: "textindicator", // the command ID
-state	: setButtonStatus // for changing state
+				name	: txt, // the button name (i.e. 'bold')
+				element : el, // the UI element (DIV)
+				enabled : true, // is it enabled?
+				active	: false, // is it pressed?
+				text	: false, // enabled in text mode?
+				cmd	: "textindicator", // the command ID
+				state	: setButtonStatus // for changing state
 			};
 			tb_objects[txt] = obj;
 			break;
-			default:
+		    default:
 			btn = editor.config.btnList[txt];
 		}
 		if (!el && btn) {
@@ -509,45 +509,45 @@ state	: setButtonStatus // for changing state
 			// let's just pretend we have a button object, and
 			// assign all the needed information to it.
 			var obj = {
-name	: txt, // the button name (i.e. 'bold')
-element : el, // the UI element (DIV)
-enabled : true, // is it enabled?
-active	: false, // is it pressed?
-text	: btn[2], // enabled in text mode?
-cmd	: btn[3], // the command ID
-state	: setButtonStatus, // for changing state
-context : btn[4] || null // enabled in a certain context?
+				name	: txt, // the button name (i.e. 'bold')
+				element : el, // the UI element (DIV)
+				enabled : true, // is it enabled?
+				active	: false, // is it pressed?
+				text	: btn[2], // enabled in text mode?
+				cmd	: btn[3], // the command ID
+				state	: setButtonStatus, // for changing state
+				context : btn[4] || null // enabled in a certain context?
 			};
 			tb_objects[txt] = obj;
 			// handlers to emulate nice flat toolbar buttons
 			HTMLArea._addEvent(el, "mouseover", function () {
-					if (obj.enabled) {
+				if (obj.enabled) {
 					HTMLArea._addClass(el, "buttonHover");
-					}
-					});
+				}
+			});
 			HTMLArea._addEvent(el, "mouseout", function () {
-					if (obj.enabled) with (HTMLArea) {
+				if (obj.enabled) with (HTMLArea) {
 					_removeClass(el, "buttonHover");
 					_removeClass(el, "buttonActive");
 					(obj.active) && _addClass(el, "buttonPressed");
-					}
-					});
+				}
+			});
 			HTMLArea._addEvent(el, "mousedown", function (ev) {
-					if (obj.enabled) with (HTMLArea) {
+				if (obj.enabled) with (HTMLArea) {
 					_addClass(el, "buttonActive");
 					_removeClass(el, "buttonPressed");
 					_stopEvent(is_ie ? window.event : ev);
-					}
-					});
+				}
+			});
 			// when clicked, do the following:
 			HTMLArea._addEvent(el, "click", function (ev) {
-					if (obj.enabled) with (HTMLArea) {
+				if (obj.enabled) with (HTMLArea) {
 					_removeClass(el, "buttonActive");
 					_removeClass(el, "buttonHover");
 					obj.cmd(editor, obj.name, obj);
 					_stopEvent(is_ie ? window.event : ev);
-					}
-					});
+				}
+			});
 			var img = document.createElement("img");
 			img.src = btn[1];
 			img.style.width = "18px";
@@ -624,8 +624,8 @@ HTMLArea.prototype.generate = function () {
 		this._textArea = textarea = HTMLArea.getElementById("textarea", textarea);
 	}
 	this._ta_size = {
-w: textarea.offsetWidth,
-h: textarea.offsetHeight
+		w: textarea.offsetWidth,
+		h: textarea.offsetHeight
 	};
 	textarea.style.display = "none";
 
@@ -683,9 +683,9 @@ h: textarea.offsetHeight
 
 	if (!HTMLArea.is_ie) {
 		iframe.style.borderWidth = "1px";
-		// iframe.frameBorder = "1";
-		// iframe.marginHeight = "0";
-		// iframe.marginWidth = "0";
+	// iframe.frameBorder = "1";
+	// iframe.marginHeight = "0";
+	// iframe.marginWidth = "0";
 	}
 
 	// size the IFRAME according to user's prefs or initial textarea
@@ -713,7 +713,7 @@ h: textarea.offsetHeight
 	// the editor including the toolbar now have the same size as the
 	// original textarea.. which means that we need to reduce that a bit.
 	textarea.style.width = iframe.style.width;
-	textarea.style.height = iframe.style.height;
+ 	textarea.style.height = iframe.style.height;
 
 	// IMPORTANT: we have to allow Mozilla a short time to recognize the
 	// new frame.  Otherwise we get a stupid exception.
@@ -773,7 +773,7 @@ h: textarea.offsetHeight
 		HTMLArea._addEvents
 			(doc, ["keydown", "keypress", "mousedown", "mouseup", "drag"],
 			 function (event) {
-			 return editor._editorEvent(HTMLArea.is_ie ? editor._iframe.contentWindow.event : event);
+				 return editor._editorEvent(HTMLArea.is_ie ? editor._iframe.contentWindow.event : event);
 			 });
 
 		// check if any plugins have registered refresh handlers
@@ -784,8 +784,8 @@ h: textarea.offsetHeight
 		}
 
 		setTimeout(function() {
-				editor.updateToolbar();
-				}, 250);
+			editor.updateToolbar();
+		}, 250);
 
 		if (typeof editor.onGenerate == "function")
 			editor.onGenerate();
@@ -800,21 +800,21 @@ HTMLArea.prototype.setMode = function(mode) {
 		mode = ((this._editMode == "textmode") ? "wysiwyg" : "textmode");
 	}
 	switch (mode) {
-		case "textmode":
-			this._textArea.value = this.getHTML();
+	    case "textmode":
+		this._textArea.value = this.getHTML();
 		this._iframe.style.display = "none";
 		this._textArea.style.display = "block";
 		if (this.config.statusBar) {
 			this._statusBar.innerHTML = HTMLArea.I18N.msg["TEXT_MODE"];
 		}
 		break;
-		case "wysiwyg":
-			if (HTMLArea.is_gecko) {
-				// disable design mode before changing innerHTML
-				try {
-					this._doc.designMode = "off";
-				} catch(e) {};
-			}
+	    case "wysiwyg":
+		if (HTMLArea.is_gecko) {
+			// disable design mode before changing innerHTML
+			try {
+				this._doc.designMode = "off";
+			} catch(e) {};
+		}
 		if (!this.config.fullPage)
 			this._doc.body.innerHTML = this.getHTML();
 		else
@@ -833,7 +833,7 @@ HTMLArea.prototype.setMode = function(mode) {
 			this._statusBar.appendChild(this._statusBarTree);
 		}
 		break;
-		default:
+	    default:
 		alert("Mode <" + mode + "> not defined!");
 		return false;
 	}
@@ -904,14 +904,14 @@ HTMLArea.prototype.registerPlugin = function() {
 HTMLArea.loadPlugin = function(pluginName) {
 	var dir = _editor_url + "plugins/" + pluginName;
 	var plugin = pluginName.replace(/([a-z])([A-Z])([a-z])/g,
-			function (str, l1, l2, l3) {
-			return l1 + "-" + l2.toLowerCase() + l3;
-			}).toLowerCase() + ".js";
-			var plugin_file = dir + "/" + plugin;
-			var plugin_lang = dir + "/lang/" + HTMLArea.I18N.lang + ".js";
-			HTMLArea._scripts.push(plugin_file, plugin_lang);
-			document.write("<script type='text/javascript' src='" + plugin_file + "'></script>");
-			document.write("<script type='text/javascript' src='" + plugin_lang + "'></script>");
+					function (str, l1, l2, l3) {
+						return l1 + "-" + l2.toLowerCase() + l3;
+					}).toLowerCase() + ".js";
+	var plugin_file = dir + "/" + plugin;
+	var plugin_lang = dir + "/lang/" + HTMLArea.I18N.lang + ".js";
+	HTMLArea._scripts.push(plugin_file, plugin_lang);
+	document.write("<script type='text/javascript' src='" + plugin_file + "'></script>");
+	document.write("<script type='text/javascript' src='" + plugin_lang + "'></script>");
 };
 
 HTMLArea.loadStyle = function(style, plugin) {
@@ -1003,9 +1003,9 @@ HTMLArea.prototype.forceRedraw = function() {
 // focuses the iframe window.  returns a reference to the editor document.
 HTMLArea.prototype.focusEditor = function() {
 	switch (this._editMode) {
-		case "wysiwyg" : this._iframe.contentWindow.focus(); break;
-		case "textmode": this._textArea.focus(); break;
-		default	   : alert("ERROR: mode " + this._editMode + " is not defined");
+	    case "wysiwyg" : this._iframe.contentWindow.focus(); break;
+	    case "textmode": this._textArea.focus(); break;
+	    default	   : alert("ERROR: mode " + this._editMode + " is not defined");
 	}
 	return this._doc;
 };
@@ -1142,61 +1142,61 @@ HTMLArea.prototype.updateToolbar = function(noStatus) {
 			continue;
 		}
 		switch (cmd) {
-			case "fontname":
-				case "fontsize":
-				case "formatblock":
-				if (!text) try {
-					var value = ("" + doc.queryCommandValue(cmd)).toLowerCase();
-					if (!value) {
-						// FIXME: what do we do here?
+		    case "fontname":
+		    case "fontsize":
+		    case "formatblock":
+			if (!text) try {
+				var value = ("" + doc.queryCommandValue(cmd)).toLowerCase();
+				if (!value) {
+					// FIXME: what do we do here?
+					break;
+				}
+				// HACK -- retrieve the config option for this
+				// combo box.  We rely on the fact that the
+				// variable in config has the same name as
+				// button name in the toolbar.
+				var options = this.config[cmd];
+				var k = 0;
+				// btn.element.selectedIndex = 0;
+				for (var j in options) {
+					// FIXME: the following line is scary.
+					if ((j.toLowerCase() == value) ||
+					    (options[j].substr(0, value.length).toLowerCase() == value)) {
+						btn.element.selectedIndex = k;
 						break;
 					}
-					// HACK -- retrieve the config option for this
-					// combo box.  We rely on the fact that the
-					// variable in config has the same name as
-					// button name in the toolbar.
-					var options = this.config[cmd];
-					var k = 0;
-					// btn.element.selectedIndex = 0;
-					for (var j in options) {
-						// FIXME: the following line is scary.
-						if ((j.toLowerCase() == value) ||
-								(options[j].substr(0, value.length).toLowerCase() == value)) {
-							btn.element.selectedIndex = k;
-							break;
-						}
-						++k;
-					}
-				} catch(e) {};
-			break;
-			case "textindicator":
-				if (!text) {
-					try {with (btn.element.style) {
-						backgroundColor = HTMLArea._makeColor(
-								doc.queryCommandValue(HTMLArea.is_ie ? "backcolor" : "hilitecolor"));
-						if (/transparent/i.test(backgroundColor)) {
-							// Mozilla
-							backgroundColor = HTMLArea._makeColor(doc.queryCommandValue("backcolor"));
-						}
-						color = HTMLArea._makeColor(doc.queryCommandValue("forecolor"));
-						fontFamily = doc.queryCommandValue("fontname");
-						fontWeight = doc.queryCommandState("bold") ? "bold" : "normal";
-						fontStyle = doc.queryCommandState("italic") ? "italic" : "normal";
-					}} catch (e) {
-						// alert(e + "\n\n" + cmd);
-					}
+					++k;
 				}
+			} catch(e) {};
 			break;
-			case "htmlmode": btn.state("active", text); break;
-			case "lefttoright":
-				case "righttoleft":
-				var el = this.getParentElement();
+		    case "textindicator":
+			if (!text) {
+				try {with (btn.element.style) {
+					backgroundColor = HTMLArea._makeColor(
+						doc.queryCommandValue(HTMLArea.is_ie ? "backcolor" : "hilitecolor"));
+					if (/transparent/i.test(backgroundColor)) {
+						// Mozilla
+						backgroundColor = HTMLArea._makeColor(doc.queryCommandValue("backcolor"));
+					}
+					color = HTMLArea._makeColor(doc.queryCommandValue("forecolor"));
+					fontFamily = doc.queryCommandValue("fontname");
+					fontWeight = doc.queryCommandState("bold") ? "bold" : "normal";
+					fontStyle = doc.queryCommandState("italic") ? "italic" : "normal";
+				}} catch (e) {
+					// alert(e + "\n\n" + cmd);
+				}
+			}
+			break;
+		    case "htmlmode": btn.state("active", text); break;
+		    case "lefttoright":
+		    case "righttoleft":
+			var el = this.getParentElement();
 			while (el && !HTMLArea.isBlockElement(el))
 				el = el.parentNode;
 			if (el)
 				btn.state("active", (el.style.direction == ((cmd == "righttoleft") ? "rtl" : "ltr")));
 			break;
-			default:
+		    default:
 			try {
 				btn.state("active", (!text && doc.queryCommandState(cmd)));
 			} catch (e) {}
@@ -1207,8 +1207,8 @@ HTMLArea.prototype.updateToolbar = function(noStatus) {
 		this._undoTakeSnapshot();
 		var editor = this;
 		this._timerUndo = setTimeout(function() {
-				editor._timerUndo = null;
-				}, this.config.undoTimeout);
+			editor._timerUndo = null;
+		}, this.config.undoTimeout);
 	}
 	// check if any plugins have registered refresh handlers
 	for (var i in this.plugins) {
@@ -1231,35 +1231,35 @@ HTMLArea.prototype.insertNodeAtSelection = function(toBeInserted) {
 		var node = range.startContainer;
 		var pos = range.startOffset;
 		switch (node.nodeType) {
-			case 3: // Node.TEXT_NODE
-				// we have to split it at the caret position.
-				if (toBeInserted.nodeType == 3) {
-					// do optimized insertion
-					node.insertData(pos, toBeInserted.data);
-					range = this._createRange();
-					range.setEnd(node, pos + toBeInserted.length);
-					range.setStart(node, pos + toBeInserted.length);
-					sel.addRange(range);
-				} else {
-					node = node.splitText(pos);
-					var selnode = toBeInserted;
-					if (toBeInserted.nodeType == 11 /* Node.DOCUMENT_FRAGMENT_NODE */) {
-						selnode = selnode.firstChild;
-					}
-					node.parentNode.insertBefore(toBeInserted, node);
-					this.selectNodeContents(selnode);
-					this.updateToolbar();
-				}
-				break;
-			case 1: // Node.ELEMENT_NODE
+		    case 3: // Node.TEXT_NODE
+			// we have to split it at the caret position.
+			if (toBeInserted.nodeType == 3) {
+				// do optimized insertion
+				node.insertData(pos, toBeInserted.data);
+				range = this._createRange();
+				range.setEnd(node, pos + toBeInserted.length);
+				range.setStart(node, pos + toBeInserted.length);
+				sel.addRange(range);
+			} else {
+				node = node.splitText(pos);
 				var selnode = toBeInserted;
 				if (toBeInserted.nodeType == 11 /* Node.DOCUMENT_FRAGMENT_NODE */) {
 					selnode = selnode.firstChild;
 				}
-				node.insertBefore(toBeInserted, node.childNodes[pos]);
+				node.parentNode.insertBefore(toBeInserted, node);
 				this.selectNodeContents(selnode);
 				this.updateToolbar();
-				break;
+			}
+			break;
+		    case 1: // Node.ELEMENT_NODE
+			var selnode = toBeInserted;
+			if (toBeInserted.nodeType == 11 /* Node.DOCUMENT_FRAGMENT_NODE */) {
+				selnode = selnode.firstChild;
+			}
+			node.insertBefore(toBeInserted, node.childNodes[pos]);
+			this.selectNodeContents(selnode);
+			this.updateToolbar();
+			break;
 		}
 	} else {
 		return null;	// this function not yet used for IE <FIXME>
@@ -1272,28 +1272,28 @@ HTMLArea.prototype.getParentElement = function() {
 	var range = this._createRange(sel);
 	if (HTMLArea.is_ie) {
 		switch (sel.type) {
-			case "Text":
-				case "None":
-				// It seems that even for selection of type "None",
-				// there _is_ a parent element and it's value is not
-				// only correct, but very important to us.  MSIE is
-				// certainly the buggiest browser in the world and I
-				// wonder, God, how can Earth stand it?
-				return range.parentElement();
-			case "Control":
-				return range.item(0);
-			default:
+		    case "Text":
+		    case "None":
+			// It seems that even for selection of type "None",
+			// there _is_ a parent element and it's value is not
+			// only correct, but very important to us.  MSIE is
+			// certainly the buggiest browser in the world and I
+			// wonder, God, how can Earth stand it?
+			return range.parentElement();
+		    case "Control":
+			return range.item(0);
+		    default:
 			return this._doc.body;
 		}
 	} else try {
 		var p = range.commonAncestorContainer;
 		if (!range.collapsed && range.startContainer == range.endContainer &&
-				range.startOffset - range.endOffset <= 1 && range.startContainer.hasChildNodes())
+		    range.startOffset - range.endOffset <= 1 && range.startContainer.hasChildNodes())
 			p = range.startContainer.childNodes[range.startOffset];
 		/*
-		   alert(range.startContainer + ":" + range.startOffset + "\n" +
-		   range.endContainer + ":" + range.endOffset);
-		 */
+		alert(range.startContainer + ":" + range.startOffset + "\n" +
+		      range.endContainer + ":" + range.endOffset);
+		*/
 		while (p.nodeType == 3) {
 			p = p.parentNode;
 		}
@@ -1396,32 +1396,32 @@ HTMLArea.prototype._createLink = function(link) {
 			link = null;
 	}
 	if (link) outparam = {
-f_href   : HTMLArea.is_ie ? editor.stripBaseURL(link.href) : link.getAttribute("href"),
-f_title  : link.title,
-f_target : link.target
+		f_href   : HTMLArea.is_ie ? editor.stripBaseURL(link.href) : link.getAttribute("href"),
+		f_title  : link.title,
+		f_target : link.target
 	};
 	this._popupDialog("link.html", function(param) {
-			if (!param)
+		if (!param)
 			return false;
-			var a = link;
-			if (!a) {
+		var a = link;
+		if (!a) {
 			editor._doc.execCommand("createlink", false, param.f_href);
 			a = editor.getParentElement();
 			var sel = editor._getSelection();
 			var range = editor._createRange(sel);
 			if (!HTMLArea.is_ie) {
-			a = range.startContainer;
-			if (!/^a$/i.test(a.tagName))
-			a = a.nextSibling;
+				a = range.startContainer;
+				if (!/^a$/i.test(a.tagName))
+					a = a.nextSibling;
 			}
-			} else a.href = param.f_href.trim();
-			if (!/^a$/i.test(a.tagName))
+		} else a.href = param.f_href.trim();
+		if (!/^a$/i.test(a.tagName))
 			return false;
-			a.target = param.f_target.trim();
-			a.title = param.f_title.trim();
-			editor.selectNodeContents(a);
-			editor.updateToolbar();
-			}, outparam);
+		a.target = param.f_target.trim();
+		a.title = param.f_title.trim();
+		editor.selectNodeContents(a);
+		editor.updateToolbar();
+	}, outparam);
 };
 
 // Called when the user clicks on "InsertImage" button.  If an image is already
@@ -1435,44 +1435,44 @@ HTMLArea.prototype._insertImage = function(image) {
 			image = null;
 	}
 	if (image) outparam = {
-f_url    : HTMLArea.is_ie ? editor.stripBaseURL(image.src) : image.getAttribute("src"),
-f_alt    : image.alt,
-f_border : image.border,
-f_align  : image.align,
-f_vert   : image.vspace,
-f_horiz  : image.hspace
+		f_url    : HTMLArea.is_ie ? editor.stripBaseURL(image.src) : image.getAttribute("src"),
+		f_alt    : image.alt,
+		f_border : image.border,
+		f_align  : image.align,
+		f_vert   : image.vspace,
+		f_horiz  : image.hspace
 	};
 	this._popupDialog("insert_image.html", function(param) {
-			if (!param) {	// user must have pressed Cancel
+		if (!param) {	// user must have pressed Cancel
 			return false;
-			}
-			var img = image;
-			if (!img) {
+		}
+		var img = image;
+		if (!img) {
 			var sel = editor._getSelection();
 			var range = editor._createRange(sel);
 			editor._doc.execCommand("insertimage", false, param.f_url);
 			if (HTMLArea.is_ie) {
-			img = range.parentElement();
-			// wonder if this works...
-			if (img.tagName.toLowerCase() != "img") {
-			img = img.previousSibling;
-			}
-			} else {
-			img = range.startContainer.previousSibling;
-			}
-			} else {
-			img.src = param.f_url;
-			}
-			for (field in param) {
-				var value = param[field];
-				switch (field) {
-					case "f_alt"    : img.alt	 = value; break;
-					case "f_border" : img.border = parseInt(value || "0"); break;
-					case "f_align"  : img.align	 = value; break;
-					case "f_vert"   : img.vspace = parseInt(value || "0"); break;
-					case "f_horiz"  : img.hspace = parseInt(value || "0"); break;
+				img = range.parentElement();
+				// wonder if this works...
+				if (img.tagName.toLowerCase() != "img") {
+					img = img.previousSibling;
 				}
+			} else {
+				img = range.startContainer.previousSibling;
 			}
+		} else {
+			img.src = param.f_url;
+		}
+		for (field in param) {
+			var value = param[field];
+			switch (field) {
+			    case "f_alt"    : img.alt	 = value; break;
+			    case "f_border" : img.border = parseInt(value || "0"); break;
+			    case "f_align"  : img.align	 = value; break;
+			    case "f_vert"   : img.vspace = parseInt(value || "0"); break;
+			    case "f_horiz"  : img.hspace = parseInt(value || "0"); break;
+			}
+		}
 	}, outparam);
 };
 
@@ -1482,45 +1482,45 @@ HTMLArea.prototype._insertTable = function() {
 	var range = this._createRange(sel);
 	var editor = this;	// for nested functions
 	this._popupDialog("insert_table.html", function(param) {
-			if (!param) {	// user must have pressed Cancel
+		if (!param) {	// user must have pressed Cancel
 			return false;
-			}
-			var doc = editor._doc;
-			// create the table element
-			var table = doc.createElement("table");
-			// assign the given arguments
-			for (var field in param) {
+		}
+		var doc = editor._doc;
+		// create the table element
+		var table = doc.createElement("table");
+		// assign the given arguments
+		for (var field in param) {
 			var value = param[field];
 			if (!value) {
-			continue;
+				continue;
 			}
 			switch (field) {
-			case "f_width"   : table.style.width = value + param["f_unit"]; break;
-			case "f_align"   : table.align	 = value; break;
-			case "f_border"  : table.border	 = parseInt(value); break;
-			case "f_spacing" : table.cellspacing = parseInt(value); break;
-			case "f_padding" : table.cellpadding = parseInt(value); break;
+			    case "f_width"   : table.style.width = value + param["f_unit"]; break;
+			    case "f_align"   : table.align	 = value; break;
+			    case "f_border"  : table.border	 = parseInt(value); break;
+			    case "f_spacing" : table.cellspacing = parseInt(value); break;
+			    case "f_padding" : table.cellpadding = parseInt(value); break;
 			}
+		}
+		var tbody = doc.createElement("tbody");
+		table.appendChild(tbody);
+		for (var i = 0; i < param["f_rows"]; ++i) {
+			var tr = doc.createElement("tr");
+			tbody.appendChild(tr);
+			for (var j = 0; j < param["f_cols"]; ++j) {
+				var td = doc.createElement("td");
+				tr.appendChild(td);
+				// Mozilla likes to see something inside the cell.
+				(HTMLArea.is_gecko) && td.appendChild(doc.createElement("br"));
 			}
-			var tbody = doc.createElement("tbody");
-			table.appendChild(tbody);
-			for (var i = 0; i < param["f_rows"]; ++i) {
-				var tr = doc.createElement("tr");
-				tbody.appendChild(tr);
-				for (var j = 0; j < param["f_cols"]; ++j) {
-					var td = doc.createElement("td");
-					tr.appendChild(td);
-					// Mozilla likes to see something inside the cell.
-					(HTMLArea.is_gecko) && td.appendChild(doc.createElement("br"));
-				}
-			}
-			if (HTMLArea.is_ie) {
-				range.pasteHTML(table.outerHTML);
-			} else {
-				// insert the table
-				editor.insertNodeAtSelection(table);
-			}
-			return true;
+		}
+		if (HTMLArea.is_ie) {
+			range.pasteHTML(table.outerHTML);
+		} else {
+			// insert the table
+			editor.insertNodeAtSelection(table);
+		}
+		return true;
 	}, null);
 };
 
@@ -1534,13 +1534,13 @@ HTMLArea.prototype._comboSelected = function(el, txt) {
 	this.focusEditor();
 	var value = el.options[el.selectedIndex].value;
 	switch (txt) {
-		case "fontname":
-			case "fontsize": this.execCommand(txt, false, value); break;
-		case "formatblock":
-			(HTMLArea.is_ie) && (value = "<" + value + ">");
+	    case "fontname":
+	    case "fontsize": this.execCommand(txt, false, value); break;
+	    case "formatblock":
+		(HTMLArea.is_ie) && (value = "<" + value + ">");
 		this.execCommand(txt, false, value);
 		break;
-		default:
+	    default:
 		// try to look it up in the registered dropdowns
 		var dropdown = this.config.customSelects[txt];
 		if (typeof dropdown != "undefined") {
@@ -1558,68 +1558,68 @@ HTMLArea.prototype.execCommand = function(cmdID, UI, param) {
 	this.focusEditor();
 	cmdID = cmdID.toLowerCase();
 	switch (cmdID) {
-		case "htmlmode" : this.setMode(); break;
-		case "hilitecolor":
-			(HTMLArea.is_ie) && (cmdID = "backcolor");
-		case "forecolor":
-			this._popupDialog("select_color.html", function(color) {
-					if (color) { // selection not canceled
-					editor._doc.execCommand(cmdID, false, "#" + color);
-					}
-					}, HTMLArea._colorToRgb(this._doc.queryCommandValue(cmdID)));
-		break;
-		case "createlink":
-			this._createLink();
-		break;
-		case "popupeditor":
-			if (HTMLArea.is_ie) {
-				//if (confirm(HTMLArea.I18N.msg["IE-sucks-full-screen"]))
-				{
-					window.open(this.popupURL("fullscreen.html"), "ha_fullscreen",
-							"toolbar=no,location=no,directories=no,status=no,menubar=no," +
-							"scrollbars=no,resizable=yes,width=640,height=480");
-				}
-			} else {
-				window.open(this.popupURL("fullscreen.html"), "ha_fullscreen",
-						"toolbar=no,menubar=no,personalbar=no,width=640,height=480," +
-						"scrollbars=no,resizable=yes");
+	    case "htmlmode" : this.setMode(); break;
+	    case "hilitecolor":
+		(HTMLArea.is_ie) && (cmdID = "backcolor");
+	    case "forecolor":
+		this._popupDialog("select_color.html", function(color) {
+			if (color) { // selection not canceled
+				editor._doc.execCommand(cmdID, false, "#" + color);
 			}
+		}, HTMLArea._colorToRgb(this._doc.queryCommandValue(cmdID)));
+		break;
+	    case "createlink":
+		this._createLink();
+		break;
+	    case "popupeditor":
+		if (HTMLArea.is_ie) {
+			//if (confirm(HTMLArea.I18N.msg["IE-sucks-full-screen"]))
+			{
+				window.open(this.popupURL("fullscreen.html"), "ha_fullscreen",
+					    "toolbar=no,location=no,directories=no,status=no,menubar=no," +
+					    "scrollbars=no,resizable=yes,width=640,height=480");
+			}
+		} else {
+			window.open(this.popupURL("fullscreen.html"), "ha_fullscreen",
+				    "toolbar=no,menubar=no,personalbar=no,width=640,height=480," +
+				    "scrollbars=no,resizable=yes");
+		}
 		// pass this object to the newly opened window
 		HTMLArea._object = this;
 		break;
-		case "undo":
-			case "redo":
-			if (this._customUndo)
-				this[cmdID]();
-			else
-				this._doc.execCommand(cmdID, UI, param);
+	    case "undo":
+	    case "redo":
+		if (this._customUndo)
+			this[cmdID]();
+		else
+			this._doc.execCommand(cmdID, UI, param);
 		break;
-		case "inserttable": this._insertTable(); break;
-		case "insertimage": this._insertImage(); break;
-		case "about"    : this._popupDialog("about.html", null, this); break;
-		case "showhelp" : window.open(_editor_url + "reference.html", "ha_help"); break;
+	    case "inserttable": this._insertTable(); break;
+	    case "insertimage": this._insertImage(); break;
+	    case "about"    : this._popupDialog("about.html", null, this); break;
+	    case "showhelp" : window.open(_editor_url + "reference.html", "ha_help"); break;
 
-		case "killword": this._wordClean(); break;
+	    case "killword": this._wordClean(); break;
 
-		case "cut":
-			case "copy":
-			case "paste":
-			try {
-				if (this.config.killWordOnPaste)
-					this._wordClean();
-				this._doc.execCommand(cmdID, UI, param);
-			} catch (e) {
-				if (HTMLArea.is_gecko) {
-					if (confirm("Unprivileged scripts cannot access Cut/Copy/Paste programatically " +
-								"for security reasons.  Click OK to see a technical note at mozilla.org " +
-								"which shows you how to allow a script to access the clipboard."))
-						window.open("http://mozilla.org/editor/midasdemo/securityprefs.html");
-				}
+	    case "cut":
+	    case "copy":
+	    case "paste":
+		try {
+			if (this.config.killWordOnPaste)
+				this._wordClean();
+			this._doc.execCommand(cmdID, UI, param);
+		} catch (e) {
+			if (HTMLArea.is_gecko) {
+				if (confirm("Unprivileged scripts cannot access Cut/Copy/Paste programatically " +
+					    "for security reasons.  Click OK to see a technical note at mozilla.org " +
+					    "which shows you how to allow a script to access the clipboard."))
+					window.open("http://mozilla.org/editor/midasdemo/securityprefs.html");
 			}
+		}
 		break;
-		case "lefttoright":
-			case "righttoleft":
-			var dir = (cmdID == "righttoleft") ? "rtl" : "ltr";
+	    case "lefttoright":
+	    case "righttoleft":
+		var dir = (cmdID == "righttoleft") ? "rtl" : "ltr";
 		var el = this.getParentElement();
 		while (el && !HTMLArea.isBlockElement(el))
 			el = el.parentNode;
@@ -1630,7 +1630,7 @@ HTMLArea.prototype.execCommand = function(cmdID, UI, param) {
 				el.style.direction = dir;
 		}
 		break;
-		default: this._doc.execCommand(cmdID, UI, param);
+	    default: this._doc.execCommand(cmdID, UI, param);
 	}
 	this.updateToolbar();
 	return false;
@@ -1648,47 +1648,47 @@ HTMLArea.prototype._editorEvent = function(ev) {
 		var cmd = null;
 		var value = null;
 		switch (key) {
-			case 'a':
-				if (!HTMLArea.is_ie) {
-					// KEY select all
-					sel = this._getSelection();
-					sel.removeAllRanges();
-					range = this._createRange();
-					range.selectNodeContents(this._doc.body);
-					sel.addRange(range);
-					HTMLArea._stopEvent(ev);
-				}
-				break;
+		    case 'a':
+			if (!HTMLArea.is_ie) {
+				// KEY select all
+				sel = this._getSelection();
+				sel.removeAllRanges();
+				range = this._createRange();
+				range.selectNodeContents(this._doc.body);
+				sel.addRange(range);
+				HTMLArea._stopEvent(ev);
+			}
+			break;
 
-				// simple key commands follow
+			// simple key commands follow
 
-			case 'b': cmd = "bold"; break;
-			case 'i': cmd = "italic"; break;
-			case 'u': cmd = "underline"; break;
-			case 's': cmd = "strikethrough"; break;
-			case 'l': cmd = "justifyleft"; break;
-			case 'e': cmd = "justifycenter"; break;
-			case 'r': cmd = "justifyright"; break;
-			case 'j': cmd = "justifyfull"; break;
-			case 'z': cmd = "undo"; break;
-			case 'y': cmd = "redo"; break;
-			case 'v': cmd = "paste"; break;
+		    case 'b': cmd = "bold"; break;
+		    case 'i': cmd = "italic"; break;
+		    case 'u': cmd = "underline"; break;
+		    case 's': cmd = "strikethrough"; break;
+		    case 'l': cmd = "justifyleft"; break;
+		    case 'e': cmd = "justifycenter"; break;
+		    case 'r': cmd = "justifyright"; break;
+		    case 'j': cmd = "justifyfull"; break;
+		    case 'z': cmd = "undo"; break;
+		    case 'y': cmd = "redo"; break;
+		    case 'v': cmd = "paste"; break;
 
-			case '0': cmd = "killword"; break;
+		    case '0': cmd = "killword"; break;
 
-					  // headings
-			case '1':
-			case '2':
-			case '3':
-			case '4':
-			case '5':
-			case '6':
-					  cmd = "formatblock";
-					  value = "h" + key;
-					  if (HTMLArea.is_ie) {
-						  value = "<" + value + ">";
-					  }
-					  break;
+			// headings
+		    case '1':
+		    case '2':
+		    case '3':
+		    case '4':
+		    case '5':
+		    case '6':
+			cmd = "formatblock";
+			value = "h" + key;
+			if (HTMLArea.is_ie) {
+				value = "<" + value + ">";
+			}
+			break;
 		}
 		if (cmd) {
 			// execute simple command
@@ -1697,38 +1697,38 @@ HTMLArea.prototype._editorEvent = function(ev) {
 		}
 	}
 	/*
-	   else if (keyEvent) {
-	// other keys here
-	switch (ev.keyCode) {
-	case 13: // KEY enter
-	// if (HTMLArea.is_ie) {
-	this.insertHTML("<br />");
-	HTMLArea._stopEvent(ev);
-	// }
-	break;
+	else if (keyEvent) {
+		// other keys here
+		switch (ev.keyCode) {
+		    case 13: // KEY enter
+			// if (HTMLArea.is_ie) {
+			this.insertHTML("<br />");
+			HTMLArea._stopEvent(ev);
+			// }
+			break;
+		}
 	}
-	}
-	 */
+	*/
 	// update the toolbar state after some time
 	if (editor._timerToolbar) {
 		clearTimeout(editor._timerToolbar);
 	}
 	editor._timerToolbar = setTimeout(function() {
-			editor.updateToolbar();
-			editor._timerToolbar = null;
-			}, 50);
+		editor.updateToolbar();
+		editor._timerToolbar = null;
+	}, 50);
 };
 
 // retrieve the HTML
 HTMLArea.prototype.getHTML = function() {
 	switch (this._editMode) {
-		case "wysiwyg"  :
-			if (!this.config.fullPage) {
-				return HTMLArea.getHTML(this._doc.body, false, this);
-			} else
-				return this.doctype + "\n" + HTMLArea.getHTML(this._doc.documentElement, true, this);
-			case "textmode" : return this._textArea.value;
-		default	    : alert("Mode <" + mode + "> not defined!");
+	    case "wysiwyg"  :
+		if (!this.config.fullPage) {
+			return HTMLArea.getHTML(this._doc.body, false, this);
+		} else
+			return this.doctype + "\n" + HTMLArea.getHTML(this._doc.documentElement, true, this);
+	    case "textmode" : return this._textArea.value;
+	    default	    : alert("Mode <" + mode + "> not defined!");
 	}
 	return false;
 };
@@ -1736,13 +1736,13 @@ HTMLArea.prototype.getHTML = function() {
 // retrieve the HTML (fastest version, but uses innerHTML)
 HTMLArea.prototype.getInnerHTML = function() {
 	switch (this._editMode) {
-		case "wysiwyg"  :
-			if (!this.config.fullPage)
-				return this._doc.body.innerHTML;
-			else
-				return this.doctype + "\n" + this._doc.documentElement.innerHTML;
-		case "textmode" : return this._textArea.value;
-		default	    : alert("Mode <" + mode + "> not defined!");
+	    case "wysiwyg"  :
+		if (!this.config.fullPage)
+			return this._doc.body.innerHTML;
+		else
+			return this.doctype + "\n" + this._doc.documentElement.innerHTML;
+	    case "textmode" : return this._textArea.value;
+	    default	    : alert("Mode <" + mode + "> not defined!");
 	}
 	return false;
 };
@@ -1750,15 +1750,15 @@ HTMLArea.prototype.getInnerHTML = function() {
 // completely change the HTML inside
 HTMLArea.prototype.setHTML = function(html) {
 	switch (this._editMode) {
-		case "wysiwyg"  :
-			if (!this.config.fullPage)
-				this._doc.body.innerHTML = html;
-			else
-				// this._doc.documentElement.innerHTML = html;
-				this._doc.body.innerHTML = html;
+	    case "wysiwyg"  :
+		if (!this.config.fullPage)
+			this._doc.body.innerHTML = html;
+		else
+			// this._doc.documentElement.innerHTML = html;
+			this._doc.body.innerHTML = html;
 		break;
-		case "textmode" : this._textArea.value = html; break;
-		default	    : alert("Mode <" + mode + "> not defined!");
+	    case "textmode" : this._textArea.value = html; break;
+	    default	    : alert("Mode <" + mode + "> not defined!");
 	}
 	return false;
 };
@@ -1811,12 +1811,12 @@ HTMLArea.checkSupportedBrowser = function() {
 	if (HTMLArea.is_gecko) {
 		if (navigator.productSub < 20021201) {
 			alert("You need at least Mozilla-1.3 Alpha.\n" +
-					"Sorry, your Gecko is not supported.");
+			      "Sorry, your Gecko is not supported.");
 			return false;
 		}
 		if (navigator.productSub < 20030210) {
 			alert("Mozilla < 1.3 Beta is not supported!\n" +
-					"I'll try, though, but it might not work.");
+			      "I'll try, though, but it might not work.");
 		}
 	}
 	return HTMLArea.is_gecko || HTMLArea.is_ie;
@@ -1953,88 +1953,88 @@ HTMLArea.htmlEncode = function(str) {
 HTMLArea.getHTML = function(root, outputRoot, editor) {
 	var html = "";
 	switch (root.nodeType) {
-		case 1: // Node.ELEMENT_NODE
-		case 11: // Node.DOCUMENT_FRAGMENT_NODE
-			var closed;
-			var i;
-			var root_tag = (root.nodeType == 1) ? root.tagName.toLowerCase() : '';
-			if (HTMLArea.is_ie && root_tag == "head") {
-				if (outputRoot)
-					html += "<head>";
-				// lowercasize
-				var save_multiline = RegExp.multiline;
-				RegExp.multiline = true;
-				var txt = root.innerHTML.replace(HTMLArea.RE_tagName, function(str, p1, p2) {
-						return p1 + p2.toLowerCase();
-						});
-				RegExp.multiline = save_multiline;
-				html += txt;
-				if (outputRoot)
-					html += "</head>";
-				break;
-			} else if (outputRoot) {
-				closed = (!(root.hasChildNodes() || HTMLArea.needsClosingTag(root)));
-				html = "<" + root.tagName.toLowerCase();
-				var attrs = root.attributes;
-				for (i = 0; i < attrs.length; ++i) {
-					var a = attrs.item(i);
-					if (!a.specified) {
-						continue;
-					}
-					var name = a.nodeName.toLowerCase();
-					if (/_moz|contenteditable/.test(name)) {
-						// avoid certain attributes
-						continue;
-					}
-					var value;
-					if (name != "style") {
-						// IE5.5 reports 25 when cellSpacing is
-						// 1; other values might be doomed too.
-						// For this reason we extract the
-						// values directly from the root node.
-						// I'm starting to HATE JavaScript
-						// development.  Browser differences
-						// suck.
-						//
-						// Using Gecko the values of href and src are converted to absolute links
-						// unless we get them using nodeValue()
-						if (typeof root[a.nodeName] != "undefined" && name != "href" && name != "src") {
-							value = root[a.nodeName];
-						} else {
-							value = a.nodeValue;
-							// IE seems not willing to return the original values - it converts to absolute
-							// links using a.nodeValue, a.value, a.stringValue, root.getAttribute("href")
-							// So we have to strip the baseurl manually -/
-							if (HTMLArea.is_ie && (name == "href" || name == "src")) {
-								value = editor.stripBaseURL(value);
-							}
-						}
-					} else { // IE fails to put style in attributes list
-						// FIXME: cssText reported by IE is UPPERCASE
-						value = root.style.cssText;
-					}
-					if (/(_moz|^$)/.test(value)) {
-						// Mozilla reports some special tags
-						// here; we don't need them.
-						continue;
-					}
-					html += " " + name + '="' + value + '"';
+	    case 1: // Node.ELEMENT_NODE
+	    case 11: // Node.DOCUMENT_FRAGMENT_NODE
+		var closed;
+		var i;
+		var root_tag = (root.nodeType == 1) ? root.tagName.toLowerCase() : '';
+		if (HTMLArea.is_ie && root_tag == "head") {
+			if (outputRoot)
+				html += "<head>";
+			// lowercasize
+			var save_multiline = RegExp.multiline;
+			RegExp.multiline = true;
+			var txt = root.innerHTML.replace(HTMLArea.RE_tagName, function(str, p1, p2) {
+				return p1 + p2.toLowerCase();
+			});
+			RegExp.multiline = save_multiline;
+			html += txt;
+			if (outputRoot)
+				html += "</head>";
+			break;
+		} else if (outputRoot) {
+			closed = (!(root.hasChildNodes() || HTMLArea.needsClosingTag(root)));
+			html = "<" + root.tagName.toLowerCase();
+			var attrs = root.attributes;
+			for (i = 0; i < attrs.length; ++i) {
+				var a = attrs.item(i);
+				if (!a.specified) {
+					continue;
 				}
-				html += closed ? " />" : ">";
+				var name = a.nodeName.toLowerCase();
+				if (/_moz|contenteditable/.test(name)) {
+					// avoid certain attributes
+					continue;
+				}
+				var value;
+				if (name != "style") {
+					// IE5.5 reports 25 when cellSpacing is
+					// 1; other values might be doomed too.
+					// For this reason we extract the
+					// values directly from the root node.
+					// I'm starting to HATE JavaScript
+					// development.  Browser differences
+					// suck.
+					//
+					// Using Gecko the values of href and src are converted to absolute links
+					// unless we get them using nodeValue()
+					if (typeof root[a.nodeName] != "undefined" && name != "href" && name != "src") {
+						value = root[a.nodeName];
+					} else {
+						value = a.nodeValue;
+						// IE seems not willing to return the original values - it converts to absolute
+						// links using a.nodeValue, a.value, a.stringValue, root.getAttribute("href")
+						// So we have to strip the baseurl manually -/
+						if (HTMLArea.is_ie && (name == "href" || name == "src")) {
+							value = editor.stripBaseURL(value);
+						}
+					}
+				} else { // IE fails to put style in attributes list
+					// FIXME: cssText reported by IE is UPPERCASE
+					value = root.style.cssText;
+				}
+				if (/(_moz|^$)/.test(value)) {
+					// Mozilla reports some special tags
+					// here; we don't need them.
+					continue;
+				}
+				html += " " + name + '="' + value + '"';
 			}
-			for (i = root.firstChild; i; i = i.nextSibling) {
-				html += HTMLArea.getHTML(i, true, editor);
-			}
-			if (outputRoot && !closed) {
-				html += "</" + root.tagName.toLowerCase() + ">";
-			}
-			break;
-		case 3: // Node.TEXT_NODE
-			html = HTMLArea.htmlEncode(root.data);
-			break;
-		case 8: // Node.COMMENT_NODE
-			html = "<!--" + root.data + "-->";
-			break;		// skip comments, for now.
+			html += closed ? " />" : ">";
+		}
+		for (i = root.firstChild; i; i = i.nextSibling) {
+			html += HTMLArea.getHTML(i, true, editor);
+		}
+		if (outputRoot && !closed) {
+			html += "</" + root.tagName.toLowerCase() + ">";
+		}
+		break;
+	    case 3: // Node.TEXT_NODE
+		html = HTMLArea.htmlEncode(root.data);
+		break;
+	    case 8: // Node.COMMENT_NODE
+		html = "<!--" + root.data + "-->";
+		break;		// skip comments, for now.
 	}
 	return html;
 };
@@ -2072,45 +2072,45 @@ HTMLArea._makeColor = function(v) {
 };
 
 // returns hexadecimal color representation from a number or a rgb-style color.
-	HTMLArea._colorToRgb = function(v) {
-		if (!v)
-			return '';
+HTMLArea._colorToRgb = function(v) {
+	if (!v)
+		return '';
 
-		// returns the hex representation of one byte (2 digits)
-		function hex(d) {
-			return (d < 16) ? ("0" + d.toString(16)) : d.toString(16);
-		};
+	// returns the hex representation of one byte (2 digits)
+	function hex(d) {
+		return (d < 16) ? ("0" + d.toString(16)) : d.toString(16);
+	};
 
-		if (typeof v == "number") {
-			// we're talking to IE here
-			var r = v & 0xFF;
-			var g = (v >> 8) & 0xFF;
-			var b = (v >> 16) & 0xFF;
+	if (typeof v == "number") {
+		// we're talking to IE here
+		var r = v & 0xFF;
+		var g = (v >> 8) & 0xFF;
+		var b = (v >> 16) & 0xFF;
+		return "#" + hex(r) + hex(g) + hex(b);
+	}
+
+	if (v.substr(0, 3) == "rgb") {
+		// in rgb(...) form -- Mozilla
+		var re = /rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/;
+		if (v.match(re)) {
+			var r = parseInt(RegExp.$1);
+			var g = parseInt(RegExp.$2);
+			var b = parseInt(RegExp.$3);
 			return "#" + hex(r) + hex(g) + hex(b);
 		}
-
-		if (v.substr(0, 3) == "rgb") {
-			// in rgb(...) form -- Mozilla
-			var re = /rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/;
-			if (v.match(re)) {
-				var r = parseInt(RegExp.$1);
-				var g = parseInt(RegExp.$2);
-				var b = parseInt(RegExp.$3);
-				return "#" + hex(r) + hex(g) + hex(b);
-			}
-			// doesn't match RE?!  maybe uses percentages or float numbers
-			// -- FIXME: not yet implemented.
-			return null;
-		}
-
-		if (v.substr(0, 1) == "#") {
-			// already hex rgb (hopefully :D )
-			return v;
-		}
-
-		// if everything else fails ;)
+		// doesn't match RE?!  maybe uses percentages or float numbers
+		// -- FIXME: not yet implemented.
 		return null;
-	};
+	}
+
+	if (v.substr(0, 1) == "#") {
+		// already hex rgb (hopefully :D )
+		return v;
+	}
+
+	// if everything else fails ;)
+	return null;
+};
 
 // modal dialogs for Mozilla (for IE we're using the showModalDialog() call).
 
@@ -2164,4 +2164,3 @@ HTMLArea.getElementById = function(tag, id) {
 // c-basic-offset:8 //
 // indent-tabs-mode:t //
 // End: //
-
diff --git a/phpgwapi/js/htmlarea/index.html b/phpgwapi/js/htmlarea/index.html
index 38853f95ec..1293133379 100644
--- a/phpgwapi/js/htmlarea/index.html
+++ b/phpgwapi/js/htmlarea/index.html
@@ -14,13 +14,13 @@
     <div style="float: right; border: 1px solid #aaa; background-color: #eee; padding: 3px; margin-left: 10px; margin-bottom: 10px;">
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>
-          <td class="label">Version:</td><td>3.0</td>
+          <td class="label">Version:</td><td><% $version %></td>
         </tr>
         <tr>
-          <td class="label">Release:</td><td>beta (<a href="release-notes.html">release notes</a>)</td>
+          <td class="label">Release:</td><td><% $release %> (<a href="release-notes.html">release notes</a>)</td>
         </tr>
         <tr>
-          <td class="label bline">Compiled at:</td><td class="bline">Aug 11, 2003 [21:30] GMT</td>
+          <td class="label bline">Compiled at:</td><td class="bline"><% $time %></td>
         </tr>
         <tr>
           <td class="label">SourceForge page:</td><td><a href="http://sf.net/projects/itools-htmlarea/">http://sf.net/projects/itools-htmlarea/</a></td>
@@ -37,30 +37,41 @@
 
     <p>
       HTMLArea is copyright <a
-      href="http://interactivetools.com">InteractiveTools.com</a> and
+      href="http://interactivetools.com">InteractiveTools.com</a> and <a
+      href="http://dynarch.com">Dynarch.com</a> and it is
       released under a BSD-style license.  HTMLArea is created and developed
       upto version 2.03 by InteractiveTools.com.  Version 3.0 developed by
-      <a href="http://students.infoiasi.ro/~mishoo/">Mihai Bazon</a> for
-      InteractiveTools.  It contains code sponsored by other companies as
-      well.
+      <a href="http://dynarch.com/mishoo/">Mihai Bazon</a> for
+      InteractiveTools.  It contains code sponsored by third-party companies as well.
+      Please see our About Box for details about who sponsored what plugins.
     </p>
 
     <h2>Online demos</h2>
 
     <ul>
 
-      <li><a href="example.html">HTMLArea standard</a> -- contains the core
+      <li><a href="examples/core.html">HTMLArea standard</a> -- contains the core
         editor.</li>
 
-      <li><a href="example-table-operations.html">HTMLArea + tables</a> --
-        loads the <tt>TableOperations</tt> plugin, sponsored by <a
-          href="http://bloki.com">Zapatec Inc.</a></li>
+      <li><a href="examples/table-operations.html">HTMLArea + tables</a> --
+        loads the <tt>TableOperations</tt> plugin which provides some extra
+        editing features for tables.</li>
 
-      <li><a href="example-spell-checker.html">HTMLArea + spell checher</a>
-        -- loads the <tt>SpellChecker</tt> plugin, sponsored by <a
-          href="http://americanbible.org">American Bible Society</a>.</li>
+      <li><a href="examples/spell-checker.html">HTMLArea + spell checher</a>
+        -- loads the <tt>SpellChecker</tt> plugin which provides what its
+        name says: a spell checker.  This one requires additional support on
+        the server-side.</li>
 
-      <li><a href="example-fully-loaded.html">HTMLArea fully loaded</a> ;-)</li>
+      <li><a href="examples/full-page.html">HTMLArea Full HTML Editor</a> --
+        loads the <tt>FullPage</tt> plugin which allows you to edit a full
+        HTML page, including &lt;title&gt;, &lt;!DOCTYPE...&gt; and some
+        other options.</li>
+
+      <li><a href="examples/context-menu.html">HTMLArea with Context
+          Menu</a> -- this plugin provides a nice and useful context menu.</li>
+
+      <li><a href="examples/fully-loaded.html">HTMLArea fully loaded</a> --
+        all of the above. ;-)</li>
 
     </ul>
 
@@ -78,14 +89,15 @@
     <pre style="margin-left: 2em"
 >
 cd /var/www/html
-unzip /path/to/archive/HTMLArea-3.0-beta.zip
-mv HTMLArea-3.0-beta htmlarea
+unzip /path/to/archive/<% $basename %>.zip
+mv <% $basename %> htmlarea
 find htmlarea/ -type f -exec chmod 644 {} \;
 find htmlarea/ -type d -exec chmod 755 {} \;
 find htmlarea/ -name "*.cgi" -exec chmod 755 {} \;</pre>
 
     <p>
-      <strong>Notes.</strong> You may chose to symlink "htmlarea" to "HTMLArea-3.0-beta", in which case your server needs to be configured to
+      <strong>Notes.</strong> You may chose to symlink "htmlarea" to "<%
+      $basename %>", in which case your server needs to be configured to
       "<tt>FollowSymLinks</tt>".  You need to make sure that *.cgi files are
       interpreted as CGI scripts.  If you want to use the SpellChecker
       plugin you need to have a recent version of Perl installed (I
@@ -146,7 +158,7 @@ find htmlarea/ -name "*.cgi" -exec chmod 755 {} \;</pre>
     latest news.</p>
 
     <p>Sometimes I post news about the latest developments on <a
-    href="http://students.infoiasi.ro/~mishoo/">my personal homepage</a>.</p>
+    href="http://dynarch.com/mishoo/">my personal homepage</a>.</p>
 
     <h2>"It doesn't work, what's wrong?"</h2>
 
@@ -178,13 +190,21 @@ find htmlarea/ -name "*.cgi" -exec chmod 755 {} \;</pre>
     get back into the public HTMLArea distribution) I'll be cheaper. ;-)</p>
 
     <hr />
-    <address><a href="http://students.infoiasi.ro/~mishoo/">Mihai Bazon</a></address>
+    <address><a href="http://dynarch.com/mishoo/">Mihai Bazon</a></address>
 <!-- Created: Sun Aug  3 14:11:26 EEST 2003 -->
-<!-- hhmts start -->
-Last modified on Tue Aug 12 00:23:26 2003
-<!-- hhmts end -->
+<!-- hhmts start --> Last modified: Wed Jan 28 11:54:47 EET 2004 <!-- hhmts end -->
 <!-- doc-lang: English -->
   </body>
 </html>
 
+<%ARGS>
+  $project => 'HTMLArea'
+  $version => '3.0'
+  $release => 'rc1'
+  $basename => 'HTMLArea-3.0-rc1'
+</%ARGS>
 
+<%INIT>;
+use POSIX qw(strftime);
+my $time = strftime '%b %e, %Y [%H:%M] GMT', gmtime;
+</%INIT>
diff --git a/phpgwapi/js/htmlarea/lang/cz.js b/phpgwapi/js/htmlarea/lang/cz.js
new file mode 100644
index 0000000000..91f6595a8b
--- /dev/null
+++ b/phpgwapi/js/htmlarea/lang/cz.js
@@ -0,0 +1,63 @@
+// I18N constants
+
+// LANG: "cz", ENCODING: UTF-8 | ISO-8859-2
+// Author: Jiri Löw, <jirilow@jirilow.com>
+
+// FOR TRANSLATORS:
+//
+//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
+//      (at least a valid email address)
+//
+//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
+//      (if this is not possible, please include a comment
+//       that states what encoding is necessary.)
+
+HTMLArea.I18N = {
+
+	// the following should be the filename without .js extension
+	// it will be used for automatically load plugin language.
+	lang: "cz",
+
+	tooltips: {
+		bold:           "Tučně",
+		italic:         "Kurzíva",
+		underline:      "Podtržení",
+		strikethrough:  "Přeškrtnutí",
+		subscript:      "Dolní index",
+		superscript:    "Horní index",
+		justifyleft:    "Zarovnat doleva",
+		justifycenter:  "Na střed",
+		justifyright:   "Zarovnat doprava",
+		justifyfull:    "Zarovnat do stran",
+		orderedlist:    "Seznam",
+		unorderedlist:  "Odrážky",
+		outdent:        "Předsadit",
+		indent:         "Odsadit",
+		forecolor:      "Barva písma",
+		hilitecolor:    "Barva pozadí",
+		horizontalrule: "Vodorovná čára",
+		createlink:     "Vložit odkaz",
+		insertimage:    "Vložit obrázek",
+		inserttable:    "Vložit tabulku",
+		htmlmode:       "Přepnout HTML",
+		popupeditor:    "Nové okno editoru",
+		about:          "O této aplikaci",
+		showhelp:       "Nápověda aplikace",
+		textindicator:  "Zvolený styl",
+		undo:           "Vrátí poslední akci",
+		redo:           "Opakuje poslední akci",
+		cut:            "Vyjmout",
+		copy:           "Kopírovat",
+		paste:          "Vložit"
+	},
+
+	buttons: {
+		"ok":           "OK",
+		"cancel":       "Zrušit"
+	},
+
+	msg: {
+		"Path":         "Cesta",
+		"TEXT_MODE":    "Jste v TEXTOVÉM REŽIMU.  Použijte tlačítko [<>] pro přepnutí do WYSIWIG."
+	}
+};
diff --git a/phpgwapi/js/htmlarea/lang/de.js b/phpgwapi/js/htmlarea/lang/de.js
index 78c5383372..550b79430b 100644
--- a/phpgwapi/js/htmlarea/lang/de.js
+++ b/phpgwapi/js/htmlarea/lang/de.js
@@ -1,6 +1,7 @@
 // german version for htmlArea v3.0 - Alpha Release
 // - translated by AtK<atk@chello.at>
 // term�s and licenses are equal to htmlarea!
+// translation improved by broxx<broxx@broxx.com>
 
 HTMLArea.I18N = {
 
@@ -13,41 +14,41 @@ HTMLArea.I18N = {
 		italic:         "Kursiv",
 		underline:      "Unterstrichen",
 		strikethrough:  "Durchgestrichen",
-		subscript:      "hochgestellt",
-		superscript:    "tiefgestellt",
+		subscript:      "Hochgestellt",
+		superscript:    "Tiefgestellt",
 		justifyleft:    "Links ausrichten",
 		justifycenter:  "Zentrieren",
 		justifyright:   "Rechts ausrichten",
 		justifyfull:    "Blocksatz",
 		orderedlist:    "Nummerierung",
-		unorderedlist:  "Aufz�hlungszeichen",
+		unorderedlist:  "Aufzaehlungszeichen",
 		outdent:        "Einzug verkleinern",
 		indent:         "Einzug vergr�ssern",
 		forecolor:      "Text Farbe",
-		backcolor:      "Hintergrund Farbe",
+		hilitecolor:    "Hintergrund Farbe",
 		horizontalrule: "Horizontale Linie",
-		createlink:     "Hyperlink einf�gen",
-		insertimage:    "Bild einf�gen",
-		inserttable:    "Tabelle einf�gen",
+		createlink:     "Hyperlink einfuegen",
+		insertimage:    "Bild einfuegen",
+		inserttable:    "Tabelle einfuegen",
 		htmlmode:       "HTML Modus",
 		popupeditor:    "Editor im Popup �ffnen",
-		about:          "�ber htmlarea",
-		help:           "Hilfe",
+		about:          "Ueber HtmlArea",
+		showhelp:       "Hilfe",
 		textindicator:  "derzeitiger Stil",
-		undo:           "macht ihre letzte Aktion r�ckg�ngig",
-		redo:           "f�hrt ihre letzte Aktion wieder aus",
-		cut:            "Auswahl ausschneiden",
-		copy:           "Auswahl kopieren",
-		paste:          "einf�gen aus Zwischenablage"
+		undo:           "Rueckgaengig",
+		redo:           "Wiederholen",
+		cut:            "Ausschneiden",
+		copy:           "Kopieren",
+		paste:          "Einfuegen"
 	},
-
-	buttons: {
+  
+ buttons: {
 		"ok":           "OK",
-		"cancel":       "Abruch"
+		"cancel":       "Abbrechen"
 	},
 
 	msg: {
 		"Path":         "Pfad",
-		"TEXT_MODE":    "Sie sind in TEXT MODE.  Ben�tzen sie den [<>] Knopf um zu WYSIWIG zur�ck zu wechseln."
+		"TEXT_MODE":    "Du befindest dich im HTML Modus.  Benuetze die [<>] Schaltflaeche um in den WYSIWIG-Modus zu wechseln."
 	}
 };
diff --git a/phpgwapi/js/htmlarea/lang/ee.js b/phpgwapi/js/htmlarea/lang/ee.js
new file mode 100644
index 0000000000..3e4f8bb305
--- /dev/null
+++ b/phpgwapi/js/htmlarea/lang/ee.js
@@ -0,0 +1,63 @@
+// I18N constants
+
+// LANG: "ee", ENCODING: UTF-8 | ISO-8859-1
+// Author: Martin Raie, <albertvill@hot.ee>
+
+// FOR TRANSLATORS:
+//
+//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
+//      (at least a valid email address)
+//
+//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
+//      (if this is not possible, please include a comment
+//       that states what encoding is necessary.)
+
+HTMLArea.I18N = {
+
+	// the following should be the filename without .js extension
+	// it will be used for automatically load plugin language.
+	lang: "ee",
+
+	tooltips: {
+		bold:           "Paks",
+		italic:         "Kursiiv",
+		underline:      "Allakriipsutatud",
+		strikethrough:  "L�bikriipsutatud",
+		subscript:      "Allindeks",
+		superscript:    "�laindeks",
+		justifyleft:    "Joonda vasakule",
+		justifycenter:  "Joonda keskele",
+		justifyright:   "Joonda paremale",
+		justifyfull:    "R��pjoonda",
+		insertorderedlist:    "Nummerdus",
+		insertunorderedlist:  "T�pploend",
+		outdent:        "V�henda taanet",
+		indent:         "Suurenda taanet",
+		forecolor:      "Fondi v�rv",
+		hilitecolor:    "Tausta v�rv",
+		inserthorizontalrule: "Horisontaaljoon",
+		createlink:     "Lisa viit",
+		insertimage:    "Lisa pilt",
+		inserttable:    "Lisa tabel",
+		htmlmode:       "HTML/tavaline vaade",
+		popupeditor:    "Suurenda toimeti aken",
+		about:          "Teave toimeti kohta",
+		showhelp:       "Spikker",
+		textindicator:  "Kirjastiil",
+		undo:           "V�ta tagasi",
+		redo:           "Tee uuesti",
+		cut:            "L�ika",
+		copy:           "Kopeeri",
+		paste:          "Kleebi"
+	},
+
+	buttons: {
+		"ok":           "OK",
+		"cancel":       "Loobu"
+	},
+
+	msg: {
+		"Path":         "Path",
+		"TEXT_MODE":    "Sa oled tekstireziimis.  Kasuta nuppu [<>] l�litamaks tagasi WYSIWIG reziimi."
+	}
+};
diff --git a/phpgwapi/js/htmlarea/lang/el.js b/phpgwapi/js/htmlarea/lang/el.js
new file mode 100644
index 0000000000..ac2204717e
--- /dev/null
+++ b/phpgwapi/js/htmlarea/lang/el.js
@@ -0,0 +1,84 @@
+// I18N constants
+
+// LANG: "en", ENCODING: UTF-8 | ISO-8859-1
+// Author: Mihai Bazon, http://dynarch.com/mishoo
+
+// FOR TRANSLATORS:
+//
+//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
+//      (at least a valid email address)
+//
+//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
+//      (if this is not possible, please include a comment
+//       that states what encoding is necessary.)
+
+HTMLArea.I18N = {
+
+	// the following should be the filename without .js extension
+	// it will be used for automatically load plugin language.
+	lang: "el",
+
+	tooltips: {
+		bold:           "Έντονα",
+		italic:         "Πλάγια",
+		underline:      "Υπογραμμισμένα",
+		strikethrough:  "Διαγραμμένα",
+		subscript:      "Δείκτης",
+		superscript:    "Δείκτης",
+		justifyleft:    "Στοίχιση Αριστερά",
+		justifycenter:  "Στοίχιση Κέντρο",
+		justifyright:   "Στοίχιση Δεξιά",
+		justifyfull:    "Πλήρης Στοίχιση",
+		orderedlist:    "Αρίθμηση",
+		unorderedlist:  "Κουκκίδες",
+		outdent:        "Μείωση Εσοχής",
+		indent:         "Αύξηση Εσοχής",
+		forecolor:      "Χρώμα Γραμματοσειράς",
+		hilitecolor:    "Χρώμα Φόντου",
+		horizontalrule: "Οριζόντια Γραμμή",
+		createlink:     "Εισαγωγή Συνδέσμου",
+		insertimage:    "Εισαγωγή/Τροποποίηση Εικόνας",
+		inserttable:    "Εισαγωγή Πίνακα",
+		htmlmode:       "Εναλλαγή σε/από HTML",
+		popupeditor:    "Μεγένθυνση επεξεργαστή",
+		about:          "Πληροφορίες",
+		showhelp:       "Βοήθεια",
+		textindicator:  "Παρών στυλ",
+		undo:           "Αναίρεση τελευταίας ενέργειας",
+		redo:           "Επαναφορά από αναίρεση",
+		cut:            "Αποκοπή",
+		copy:           "Αντιγραφή",
+		paste:          "Επικόλληση",
+        lefttoright:    "Κατεύθυνση αριστερά προς δεξιά",
+        righttoleft:    "Κατεύθυνση από δεξιά προς τα αριστερά"
+	},
+
+	buttons: {
+		"ok":           "OK",
+		"cancel":       "Ακύρωση"
+	},
+
+	msg: {
+		"Path":         "Διαδρομή",
+		"TEXT_MODE":    "Είστε σε TEXT MODE.  Χρησιμοποιήστε το κουμπί [<>] για να επανέρθετε στο WYSIWIG.",
+
+       "IE-sucks-full-screen":	"Η κατάσταση πλήρης οθόνης έχει προβλήματα με τον Internet Explorer, " +
+       							"λόγω σφαλμάτων στον ίδιο τον browser.  Αν το σύστημα σας είναι Windows 9x " +
+       							"μπορεί και να χρειαστείτε reboot. Αν είστε σίγουροι, πατήστε ΟΚ."
+       },
+
+       dialogs: {
+               "Cancel"                                            : "Ακύρωση",
+               "Insert/Modify Link"                                : "Εισαγωγή/Τροποποίηση σύνδεσμου",
+               "New window (_blank)"                               : "Νέο παράθυρο (_blank)",
+               "None (use implicit)"                               : "Κανένα (χρήση απόλυτου)",
+               "OK"                                                : "Εντάξει",
+               "Other"                                             : "Αλλο",
+               "Same frame (_self)"                                : "Ίδιο frame (_self)",
+               "Target:"                                           : "Target:",
+               "Title (tooltip):"                                  : "Τίτλος (tooltip):",
+               "Top frame (_top)"                                  : "Πάνω frame (_top)",
+               "URL:"                                              : "URL:",
+               "You must enter the URL where this link points to"  : "Πρέπει να εισάγετε το URL που οδηγεί αυτός ο σύνδεσμος"
+       }
+};
diff --git a/phpgwapi/js/htmlarea/lang/en.js b/phpgwapi/js/htmlarea/lang/en.js
index 70e0c350f5..361c7abab3 100644
--- a/phpgwapi/js/htmlarea/lang/en.js
+++ b/phpgwapi/js/htmlarea/lang/en.js
@@ -1,7 +1,7 @@
 // I18N constants
 
 // LANG: "en", ENCODING: UTF-8 | ISO-8859-1
-// Author: Mihai Bazon, <mishoo@infoiasi.ro>
+// Author: Mihai Bazon, http://dynarch.com/mishoo
 
 // FOR TRANSLATORS:
 //
@@ -37,7 +37,7 @@ HTMLArea.I18N = {
 		hilitecolor:    "Background Color",
 		horizontalrule: "Horizontal Rule",
 		createlink:     "Insert Web Link",
-		insertimage:    "Insert Image",
+		insertimage:    "Insert/Modify Image",
 		inserttable:    "Insert Table",
 		htmlmode:       "Toggle HTML Source",
 		popupeditor:    "Enlarge Editor",
@@ -48,7 +48,9 @@ HTMLArea.I18N = {
 		redo:           "Redoes your last action",
 		cut:            "Cut selection",
 		copy:           "Copy selection",
-		paste:          "Paste from clipboard"
+		paste:          "Paste from clipboard",
+		lefttoright:    "Direction left to right",
+		righttoleft:    "Direction right to left"
 	},
 
 	buttons: {
@@ -58,6 +60,29 @@ HTMLArea.I18N = {
 
 	msg: {
 		"Path":         "Path",
-		"TEXT_MODE":    "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWIG."
+		"TEXT_MODE":    "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.",
+
+		"IE-sucks-full-screen" :
+		// translate here
+		"The full screen mode is known to cause problems with Internet Explorer, " +
+		"due to browser bugs that we weren't able to workaround.  You might experience garbage " +
+		"display, lack of editor functions and/or random browser crashes.  If your system is Windows 9x " +
+		"it's very likely that you'll get a 'General Protection Fault' and need to reboot.\n\n" +
+		"You have been warned.  Please press OK if you still want to try the full screen editor."
+	},
+
+	dialogs: {
+		"Cancel"                                            : "Cancel",
+		"Insert/Modify Link"                                : "Insert/Modify Link",
+		"New window (_blank)"                               : "New window (_blank)",
+		"None (use implicit)"                               : "None (use implicit)",
+		"OK"                                                : "OK",
+		"Other"                                             : "Other",
+		"Same frame (_self)"                                : "Same frame (_self)",
+		"Target:"                                           : "Target:",
+		"Title (tooltip):"                                  : "Title (tooltip):",
+		"Top frame (_top)"                                  : "Top frame (_top)",
+		"URL:"                                              : "URL:",
+		"You must enter the URL where this link points to"  : "You must enter the URL where this link points to"
 	}
 };
diff --git a/phpgwapi/js/htmlarea/lang/es.js b/phpgwapi/js/htmlarea/lang/es.js
index 38e4836012..766ec66a18 100644
--- a/phpgwapi/js/htmlarea/lang/es.js
+++ b/phpgwapi/js/htmlarea/lang/es.js
@@ -7,30 +7,45 @@ HTMLArea.I18N = {
 	lang: "es",
 
 	tooltips: {
-		bold:           "Negritas",
+		bold:           "Negrita",
 		italic:         "Cursiva",
 		underline:      "Subrayado",
-		strikethrough:  "Texto Cruzado",
-		subscript:      "Subscript",
-		superscript:    "Superscript",
+		strikethrough:  "Tachado",
+		subscript:      "Sub�ndice",
+		superscript:    "Super�ndice",
 		justifyleft:    "Alinear a la Izquierda",
 		justifycenter:  "Centrar",
 		justifyright:   "Alinear a la Derecha",
 		justifyfull:    "Justificar",
-		orderedlist:    "Lista Ordenada",
-		unorderedlist:  "Lista No Ordenada",
+		insertorderedlist:    "Lista Ordenada",
+		insertunorderedlist:  "Lista No Ordenada",
 		outdent:        "Aumentar Sangr�a",
 		indent:         "Disminuir Sangr�a",
 		forecolor:      "Color del Texto",
-		backcolor:      "Color del Fondo",
-		horizontalrule: "L�nea Horizontal",
+		hilitecolor:    "Color del Fondo",
+		inserthorizontalrule: "L�nea Horizontal",
 		createlink:     "Insertar Enlace",
 		insertimage:    "Insertar Imagen",
 		inserttable:    "Insertar Tabla",
 		htmlmode:       "Ver Documento en HTML",
 		popupeditor:    "Ampliar Editor",
 		about:          "Acerca del Editor",
-		help:           "Ayuda",
-		textindicator:  "Estilo Actual"
+		showhelp:       "Ayuda",
+		textindicator:  "Estilo Actual",
+		undo:           "Deshacer",
+		redo:           "Rehacer",
+		cut:            "Cortar selecci�n",
+		copy:           "Copiar selecci�n",
+		paste:          "Pegar desde el portapapeles"
+	},
+
+	buttons: {
+		"ok":           "Aceptar",
+		"cancel":       "Cancelar"
+	},
+
+	msg: {
+		"Path":         "Ruta",
+		"TEXT_MODE":    "Esta en modo TEXTO. Use el boton [<>] para cambiar a WYSIWIG",
 	}
 };
diff --git a/phpgwapi/js/htmlarea/lang/fr.js b/phpgwapi/js/htmlarea/lang/fr.js
index a5d5f7dc52..d4cd6ac683 100644
--- a/phpgwapi/js/htmlarea/lang/fr.js
+++ b/phpgwapi/js/htmlarea/lang/fr.js
@@ -1,4 +1,14 @@
 // I18N constants
+// Author: Jonathan Ernst, <Jonathan.Ernst@NetOxygen.ch>
+
+// FOR TRANSLATORS:
+//
+//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
+//      (at least a valid email address)
+//
+//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
+//      (if this is not possible, please include a comment
+//       that states what encoding is necessary.)
 
 HTMLArea.I18N = {
 
@@ -22,7 +32,7 @@ HTMLArea.I18N = {
 		outdent:        "Augmenter le retrait",
 		indent:         "Diminuer le retrait",
 		forecolor:      "Couleur du texte",
-		backcolor:      "Couleur du fond",
+		hilitecolor:    "Couleur du fond",
 		horizontalrule: "Ligne horizontale",
 		createlink:     "Ins�rer un lien",
 		insertimage:    "Ins�rer une image",
@@ -30,7 +40,22 @@ HTMLArea.I18N = {
 		htmlmode:       "Passer au code source HTML",
 		popupeditor:    "Agrandir l'�diteur",
 		about:          "A propos de cet �diteur",
-		help:           "Aide sur l'�diteur",
-		textindicator:  "Style courant"
+		showhelp:       "Aide sur l'�diteur",
+		textindicator:  "Style courant",
+		undo:           "Annule la derni�re action",
+		redo:           "Refait la derni�re action",
+		cut:            "Coupe la s�lection",
+		copy:           "Copie la s�lection",
+		paste:          "Colle depuis le presse papiers"
+	},
+
+	buttons: {
+		"ok":           "OK",
+		"cancel":       "Annuler"
+	},
+
+	msg: {
+		"Path":         "Chemin",
+		"TEXT_MODE":    "Vous �tes en mode texte.  Utilisez le bouton [<>] pour revenir au mode WYSIWIG."
 	}
 };
diff --git a/phpgwapi/js/htmlarea/lang/he.js b/phpgwapi/js/htmlarea/lang/he.js
new file mode 100644
index 0000000000..18436323a4
--- /dev/null
+++ b/phpgwapi/js/htmlarea/lang/he.js
@@ -0,0 +1,63 @@
+// I18N constants
+
+// LANG: "he", ENCODING: UTF-8
+// Author: Liron Newman, <plastish@ultinet.org>
+
+// FOR TRANSLATORS:
+//
+//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
+//      (at least a valid email address)
+//
+//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
+//      (if this is not possible, please include a comment
+//       that states what encoding is necessary.)
+
+HTMLArea.I18N = {
+
+	// the following should be the filename without .js extension
+	// it will be used for automatically load plugin language.
+	lang: "he",
+
+	tooltips: {
+		bold:           "מודגש",
+		italic:         "נטוי",
+		underline:      "קו תחתי",
+		strikethrough:  "קו אמצע",
+		subscript:      "כתב עילי",
+		superscript:    "כתב תחתי",
+		justifyleft:    " ישור לשמאל",
+		justifycenter:  "ישור למרכז",
+		justifyright:   "ישור לימין",
+		justifyfull:    "יישור לשורה מלאה",
+		orderedlist:    "רשימה ממוספרת",
+		unorderedlist:  "רשימה לא ממוספרת",
+		outdent:        "הקטן כניסה",
+		indent:         "הגדל כניסה",
+		forecolor:      "צבע גופן",
+		hilitecolor:    "צבע רקע",
+		horizontalrule: "קו אנכי",
+		createlink:     "הכנס היפר-קישור",
+		insertimage:    "הכנס תמונה",
+		inserttable:    "הכנס טבלה",
+		htmlmode:       "שנה מצב קוד HTML",
+		popupeditor:    "הגדל את העורך",
+		about:          "אודות עורך זה",
+		showhelp:       "עזרה לשימוש בעורך",
+		textindicator:  "סגנון נוכחי",
+		undo:           "מבטל את פעולתך האחרונה",
+		redo:           "מבצע מחדש את הפעולה האחרונה שביטלת",
+		cut:            "גזור בחירה",
+		copy:           "העתק בחירה",
+		paste:          "הדבק מהלוח"
+	},
+
+	buttons: {
+		"ok":           "OK",
+		"cancel":       "ביטול"
+	},
+
+	msg: {
+		"Path":         "נתיב עיצוב",
+		"TEXT_MODE":    "אתה במצב טקסט נקי (קוד). השתמש בכפתור [<>] כדי לחזור למצב WYSIWYG (תצוגת עיצוב)."
+	}
+};
diff --git a/phpgwapi/js/htmlarea/lang/hu.js b/phpgwapi/js/htmlarea/lang/hu.js
new file mode 100644
index 0000000000..828aec1523
--- /dev/null
+++ b/phpgwapi/js/htmlarea/lang/hu.js
@@ -0,0 +1,63 @@
+// I18N constants
+
+// LANG: "hu", ENCODING: UTF-8
+// Author: Miklós Somogyi, <somogyine@vnet.hu>
+
+// FOR TRANSLATORS:
+//
+//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
+//      (at least a valid email address)
+//
+//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
+//      (if this is not possible, please include a comment
+//       that states what encoding is necessary.)
+
+HTMLArea.I18N = {
+
+	// the following should be the filename without .js extension
+	// it will be used for automatically load plugin language.
+	lang: "hu",
+
+	tooltips: {
+		bold:           "Félkövér",
+		italic:         "Dőlt",
+		underline:      "Aláhúzott",
+		strikethrough:  "Áthúzott",
+		subscript:      "Alsó index",
+		superscript:    "Felső index",
+		justifyleft:    "Balra zárt",
+		justifycenter:  "Középre zárt",
+		justifyright:   "Jobbra zárt",
+		justifyfull:    "Sorkizárt",
+		orderedlist:    "Számozott lista",
+		unorderedlist:  "Számozatlan lista",
+		outdent:        "Behúzás csökkentése",
+		indent:         "Behúzás növelése",
+		forecolor:      "Karakterszín",
+		hilitecolor:    "Háttérszín",
+		horizontalrule: "Elválasztó vonal",
+		createlink:     "Hiperhivatkozás beszúrása",
+		insertimage:    "Kép beszúrása",
+		inserttable:    "Táblázat beszúrása",
+		htmlmode:       "HTML forrás be/ki",
+		popupeditor:    "Szerkesztő külön ablakban",
+		about:          "Névjegy",
+		showhelp:       "Súgó",
+		textindicator:  "Aktuális stílus",
+		undo:           "Visszavonás",
+		redo:           "Újra végrehajtás",
+		cut:            "Kivágás",
+		copy:           "Másolás",
+		paste:          "Beillesztés"
+	},
+
+	buttons: {
+		"ok":           "Rendben",
+		"cancel":       "Mégsem"
+	},
+
+	msg: {
+		"Path":         "Hierarchia",
+		"TEXT_MODE":    "Forrás mód. Visszaváltás [<>] gomb"
+	}
+};
diff --git a/phpgwapi/js/htmlarea/lang/it.js b/phpgwapi/js/htmlarea/lang/it.js
index be072872f8..be06e99376 100644
--- a/phpgwapi/js/htmlarea/lang/it.js
+++ b/phpgwapi/js/htmlarea/lang/it.js
@@ -1,5 +1,8 @@
 // I18N constants
 
+// LANG: "it", ENCODING: UTF-8 | ISO-8859-1
+// Author: Fabio Rotondo <fabio@rotondo.it>
+
 HTMLArea.I18N = {
 
 	// the following should be the filename without .js extension
@@ -8,29 +11,44 @@ HTMLArea.I18N = {
 
 	tooltips: {
 		bold:           "Grassetto",
-		italic:         "Corsivo",
+		italic:         "Italico",
 		underline:      "Sottolineato",
 		strikethrough:  "Barrato",
 		subscript:      "Pedice",
 		superscript:    "Apice",
-		justifyleft:    "Allinea a sinistra",
-		justifycenter:  "Centra",
-		justifyright:   "Allinea a destra",
-		justifyfull:    "Giustifica",
-		orderedlist:    "Elenco numerato",
-		unorderedlist:  "Elenco puntato",
-		outdent:        "Riduci rientro",
-		indent:         "Aumenta rientro",
-		forecolor:      "Colore carattere",
-		backcolor:      "Colore di sfondo",
-		horizontalrule: "Linea orizzontale",
-		createlink:     "Inserisci collegamento ipertestuale",
-		insertimage:    "Inserisci immagine",
-		inserttable:    "Inserisci tabella",
-		htmlmode:       "Passa alla visualizzazione HTML",
-		popupeditor:    "Ingrandisci editor",
-		about:          "Info",
-		help:           "Aiuto",
-		textindicator:  "Stile utilizzato"
+		justifyleft:    "Giustifica a Sinistra",
+		justifycenter:  "Giustifica in Centro",
+		justifyright:   "Giustifica a Destra",
+		justifyfull:    "Giustifica Completamente",
+		orderedlist:    "Lista Ordinata",
+		unorderedlist:  "Lista Puntata",
+		outdent:        "Decrementa Indentazione",
+		indent:         "Incrementa Indentazione",
+		forecolor:      "Colore del Carattere",
+		hilitecolor:    "Colore di Sfondo",
+		horizontalrule: "Linea Orizzontale",
+		createlink:     "Inserisci un Link",
+		insertimage:    "Inserisci un'Immagine",
+		inserttable:    "Inserisci una Tabella",
+		htmlmode:       "Attiva il codice HTML",
+		popupeditor:    "Allarga l'editor",
+		about:          "Info sull'editor",
+		showhelp:       "Aiuto sull'editor",
+		textindicator:  "Stile Attuale",
+		undo:           "Elimina l'ultima modifica",
+		redo:           "Ripristina l'ultima modifica",
+		cut:            "Taglia l'area selezionata",
+		copy:           "Copia l'area selezionata",
+		paste:          "Incolla dalla memoria"
+	},
+
+	buttons: {
+		"ok":           "OK",
+		"cancel":       "Annulla"
+	},
+
+	msg: {
+		"Path":         "Percorso",
+		"TEXT_MODE":    "Sei in MODALITA' TESTO. Usa il bottone [<>] per tornare alla modalità WYSIWYG."
 	}
 };
diff --git a/phpgwapi/js/htmlarea/lang/lt.js b/phpgwapi/js/htmlarea/lang/lt.js
new file mode 100644
index 0000000000..bf1efc5842
--- /dev/null
+++ b/phpgwapi/js/htmlarea/lang/lt.js
@@ -0,0 +1,55 @@
+// I18N constants
+
+// LANG: "lt", ENCODING: UTF-8
+// Author: Jaroslav Šatkevič, <jaro@akl.lt>
+
+
+HTMLArea.I18N = {
+
+	// the following should be the filename without .js extension
+	// it will be used for automatically load plugin language.
+	lang: "lt",
+
+	tooltips: {
+		bold:           "Paryškinti",
+		italic:         "Kursyvas",
+		underline:      "Pabraukti",
+		strikethrough:  "Perbraukti",
+		subscript:      "Apatinis indeksas",
+		superscript:    "Viršutinis indeksas",
+		justifyleft:    "Lygiavimas pagal kairę",
+		justifycenter:  "Lygiavimas pagal centrą",
+		justifyright:   "Lygiavimas pagal dešinę",
+		justifyfull:    "Lygiuoti pastraipą",
+		orderedlist:    "Numeruotas sąrašas",
+		unorderedlist:  "Suženklintas sąrašas",
+		outdent:        "Sumažinti paraštę",
+		indent:         "Padidinti paraštę",
+		forecolor:      "Šrifto spalva",
+		hilitecolor:    "Fono spalva",
+		horizontalrule: "Horizontali linija",
+		createlink:     "Įterpti nuorodą",
+		insertimage:    "Įterpti paveiksliuką",
+		inserttable:    "Įterpti lentelę",
+		htmlmode:       "Perjungti į HTML/WYSIWYG",
+		popupeditor:    "Išplėstas redagavimo ekranas/Enlarge Editor",
+		about:          "Apie redaktorių",
+		showhelp:       "Pagalba naudojant redaktorių",
+		textindicator:  "Dabartinis stilius",
+		undo:           "Atšaukia paskutini jūsų veiksmą",
+		redo:           "Pakartoja paskutinį atšauktą jūsų veiksmą",
+		cut:            "Iškirpti",
+		copy:           "Kopijuoti",
+		paste:          "Įterpti"
+	},
+
+	buttons: {
+		"ok":           "OK",
+		"cancel":       "Atšaukti"
+	},
+
+	msg: {
+		"Path":         "Kelias",
+		"TEXT_MODE":    "Jūs esete teksto režime.  Naudokite [<>] mygtuką grįžimui į WYSIWYG."
+	}
+};
diff --git a/phpgwapi/js/htmlarea/lang/lv.js b/phpgwapi/js/htmlarea/lang/lv.js
new file mode 100644
index 0000000000..8cdfb5df0b
--- /dev/null
+++ b/phpgwapi/js/htmlarea/lang/lv.js
@@ -0,0 +1,55 @@
+// I18N constants
+
+// LANG: "lv", ENCODING: UTF-8 | ISO-8859-1
+// Author: Mihai Bazon, http://dynarch.com/mishoo
+// Translated by: Janis Klavins, <janis.klavins@devia.lv>
+
+HTMLArea.I18N = {
+
+	// the following should be the filename without .js extension
+	// it will be used for automatically load plugin language.
+	lang: "lv",
+
+	tooltips: {
+		bold:           "Trekniem burtiem",
+		italic:         "Kurs�v�",
+		underline:      "Pasv�trots",
+		strikethrough:  "P�rsv�trots",
+		subscript:      "Novietot zem rindas",
+		superscript:    "Novietot virs rindas",
+		justifyleft:    "Izl�dzin�t pa kreisi",
+		justifycenter:  "Izl�dzin�t centr�",
+		justifyright:   "Izl�dzin�t pa labi",
+		justifyfull:    "Izl�dzin�t pa visu lapu",
+		orderedlist:    "Numur�ts saraksts",
+		unorderedlist:  "Saraksts",
+		outdent:        "Samazin�t atk�pi",
+		indent:         "Palielin�t atk�pi",
+		forecolor:      "Burtu kr�sa",
+		hilitecolor:    "Fona kr�sa",
+		horizontalrule: "Horizont�la atdal�t�jsv�tra",
+		createlink:     "Ievietot hipersaiti",
+		insertimage:    "Ievietot att�lu",
+		inserttable:    "Ievietot tabulu",
+		htmlmode:       "Skat�t HTML kodu",
+		popupeditor:    "Palielin�t Redi��t�ju",
+		about:          "Par �o redi��t�ju",
+		showhelp:       "Redi��t�ja pal�gs",
+		textindicator:  "Patreiz�jais stils",
+		undo:           "Atcelt p�d�jo darb�bu",
+		redo:           "Atk�rtot p�d�jo darb�bu",
+		cut:            "Izgriezt iez�m�to",
+		copy:           "Kop�t iez�m�to",
+		paste:          "Ievietot iez�m�to"
+	},
+
+	buttons: {
+		"ok":           "Labi",
+		"cancel":       "Atcelt"
+	},
+
+	msg: {
+		"Path":         "Ce��",
+		"TEXT_MODE":    "J�s patlaban darbojaties TEKSTA RE��M�. Lai p�rietu atpaka� uz GRAFISKO RE��MU (WYSIWIG), lietojiet [<>] pogu."
+	}
+};
diff --git a/phpgwapi/js/htmlarea/lang/makefile.xml b/phpgwapi/js/htmlarea/lang/makefile.xml
new file mode 100644
index 0000000000..eed81b0a11
--- /dev/null
+++ b/phpgwapi/js/htmlarea/lang/makefile.xml
@@ -0,0 +1,3 @@
+<files>
+  <file name="*.js" />
+</files>
diff --git a/phpgwapi/js/htmlarea/lang/nl.js b/phpgwapi/js/htmlarea/lang/nl.js
index dcd00d0d6c..59bfe18cfb 100644
--- a/phpgwapi/js/htmlarea/lang/nl.js
+++ b/phpgwapi/js/htmlarea/lang/nl.js
@@ -1,5 +1,16 @@
-// Dutch version
-// Author: Wouter Meeus alias Redspider <webmaster@tielt.be>
+// I18N constants
+
+// LANG: "nl", ENCODING: UTF-8 | ISO-8859-1
+// Author: Michel Weegeerink (info@mmc-shop.nl), http://mmc-shop.nl
+
+// FOR TRANSLATORS:
+//
+//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
+//      (at least a valid email address)
+//
+//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
+//      (if this is not possible, please include a comment
+//       that states what encoding is necessary.)
 
 HTMLArea.I18N = {
 
@@ -8,30 +19,72 @@ HTMLArea.I18N = {
 	lang: "nl",
 
 	tooltips: {
-		bold:           "Vet",
-		italic:         "Cursief",
-		underline:      "Onderlijnen",
-		strikethrough:  "Doorstrepen",
-		subscript:      "Subscript",
-		superscript:    "Superscript",
-		justifyleft:    "Links Uitlijnen",
-		justifycenter:  "Centreren",
-		justifyright:   "Rechts Uitlijnen",
-		justifyfull:    "Uitvullen",
-		orderedlist:    "Nummering",
-		unorderedlist:  "Opsomming",
-		outdent:        "Verklein insprong",
-		indent:         "Vergroot insprong",
-		forecolor:      "Tekst Kleur",
-		backcolor:      "Achtergrond Kleur",
-		horizontalrule: "Horizontale lijn",
-		createlink:     "Hyperlink invoegen",
-		insertimage:    "Afbeelding invoegen",
-		inserttable:    "Tabel invoegen",
-		htmlmode:       "HTML broncode",
-		popupeditor:    "Vergroot Editor",
-		about:          "Over deze editor",
-		help:           "Help",
-		textindicator:  "Huidige stijl"
+		bold:					"Vet",
+		italic:					"Cursief",
+		underline:				"Onderstrepen",
+		strikethrough:			"Doorhalen",
+		subscript:				"Subscript",
+		superscript:			"Superscript",
+		justifyleft:			"Links uitlijnen",
+		justifycenter:			"Centreren",
+		justifyright:			"Rechts uitlijnen",
+		justifyfull:			"Uitvullen",
+		insertorderedlist:		"Nummering",
+		insertunorderedlist:	"Opsommingstekens",
+		outdent:				"Inspringing verkleinen",
+		indent:					"Inspringing vergroten",
+		forecolor:				"Tekstkleur",
+		hilitecolor:			"Achtergrondkleur",
+		inserthorizontalrule:	"Horizontale lijn",
+		createlink:				"Hyperlink invoegen/aanpassen",
+		insertimage:			"Afbeelding invoegen/aanpassen",
+		inserttable:			"Tabel invoegen",
+		htmlmode:				"HTML broncode",
+		popupeditor:			"Vergroot Editor",
+		about:					"Over deze editor",
+		showhelp:				"HTMLArea help",
+		textindicator:			"Huidige stijl",
+		undo:					"Ongedaan maken",
+		redo:					"Herhalen",
+		cut:					"Knippen",
+		copy:					"Kopi�ren",
+		paste:					"Plakken",
+		lefttoright:			"Tekstrichting links naar rechts",
+		righttoleft:			"Tekstrichting rechts naar links"
+	},
+
+	buttons: {
+		"ok":					"OK",
+		"cancel":				"Annuleren"
+	},
+
+	msg: {
+		"Path":					"Pad",
+		"TEXT_MODE":			"Je bent in TEKST-mode. Gebruik de [<>] knop om terug te keren naar WYSIWYG-mode.",
+      
+		"IE-sucks-full-screen" :
+		// translate here
+		"Fullscreen-mode veroorzaakt problemen met Internet Explorer door bugs in de webbrowser " +
+		"die we niet kunnen omzeilen. Hierdoor kunnen de volgende effecten optreden: verknoeide teksten, " +
+		"een verlies aan editor-functionaliteit en/of willekeurig vastlopen van de webbrowser. " +
+		"Als u Windows 95 of 98 gebruikt, is het zeer waarschijnlijk dat u een algemene beschermingsfout " +
+		"('General Protection Fault') krijgt en de computer opnieuw zal moeten opstarten.\n\n" +
+		"U bent gewaarschuwd. Druk OK als u toch nog de Fullscreen-editor wil gebruiken."
+	},
+
+	dialogs: {
+		"Cancel"                                            : "Annuleren",
+		"Insert/Modify Link"                                : "Hyperlink invoegen/aanpassen",
+		"New window (_blank)"                               : "Nieuw venster (_blank)",
+		"None (use implicit)"                               : "Geen",
+		"OK"                                                : "OK",
+		"Other"                                             : "Ander",
+		"Same frame (_self)"                                : "Zelfde frame (_self)",
+		"Target:"                                           : "Doel:",
+		"Title (tooltip):"                                  : "Titel (tooltip):",
+		"Top frame (_top)"                                  : "Bovenste frame (_top)",
+		"URL:"                                              : "URL:",
+		"You must enter the URL where this link points to"  : "Geef de URL in waar de link naar verwijst"
 	}
 };
+
diff --git a/phpgwapi/js/htmlarea/lang/no.js b/phpgwapi/js/htmlarea/lang/no.js
new file mode 100644
index 0000000000..5239715e52
--- /dev/null
+++ b/phpgwapi/js/htmlarea/lang/no.js
@@ -0,0 +1,48 @@
+// Norwegian version for htmlArea v3.0 - Alpha Release
+// - translated by ses<ses@online.no>
+// term�s and licenses are equal to htmlarea!
+
+HTMLArea.I18N = {
+
+	// the following should be the filename without .js extension
+	// it will be used for automatically load plugin language.
+	lang: "no",
+
+	tooltips: {
+		bold:           "Fet",
+		italic:         "Kursiv",
+		underline:      "Understreket",
+		strikethrough:  "Gjennomstreket",
+		subscript:      "Nedsenket",
+		superscript:    "Opph�yet",
+		justifyleft:    "Venstrejuster",
+		justifycenter:  "Midtjuster",
+		justifyright:   "H�yrejuster",
+		justifyfull:    "Blokkjuster",
+		orderedlist:    "Nummerert liste",
+		unorderedlist:  "Punktliste",
+		outdent:        "Reduser innrykk",
+		indent:         "�ke innrykk",
+		forecolor:      "Tekstfarge",
+		backcolor:      "Bakgrundsfarge",
+		horizontalrule: "Vannrett linje",
+		createlink:     "Lag lenke",
+		insertimage:    "Sett inn bilde",
+		inserttable:    "Sett inn tabell",
+		htmlmode:       "Vis kildekode",
+		popupeditor:    "Vis i eget vindu",
+		about:          "Om denne editor",
+		help:           "Hjelp",
+		textindicator:  "N�v�rende stil"
+	},
+    
+	buttons: {
+		"ok":           "OK",
+		"cancel":       "Avbryt"
+	},
+
+	msg: {
+		"Path":         "Tekstvelger",
+		"TEXT_MODE":    "Du er i tekstmodus  Klikk p� [<>] for � g� tilbake til WYSIWIG."
+	}
+};
diff --git a/phpgwapi/js/htmlarea/lang/ro.js b/phpgwapi/js/htmlarea/lang/ro.js
index 8a8dda7d49..9e33775e4c 100644
--- a/phpgwapi/js/htmlarea/lang/ro.js
+++ b/phpgwapi/js/htmlarea/lang/ro.js
@@ -1,7 +1,7 @@
 // I18N constants
 
 // LANG: "ro", ENCODING: UTF-8
-// Author: Mihai Bazon, <mishoo@infoiasi.ro>
+// Author: Mihai Bazon, http://dynarch.com/mishoo
 
 // FOR TRANSLATORS:
 //
@@ -23,8 +23,8 @@ HTMLArea.I18N = {
 		italic:         "Italic",
 		underline:      "Subliniat",
 		strikethrough:  "Tăiat",
-		subscript:      "Subscript",
-		superscript:    "Superscript",
+		subscript:      "Indice jos",
+		superscript:    "Indice sus",
 		justifyleft:    "Aliniere la stânga",
 		justifycenter:  "Aliniere pe centru",
 		justifyright:   "Aliniere la dreapta",
@@ -36,8 +36,8 @@ HTMLArea.I18N = {
 		forecolor:      "Culoarea textului",
 		hilitecolor:    "Culoare de fundal",
 		horizontalrule: "Linie orizontală",
-		createlink:     "Inserează link",
-		insertimage:    "Inserează o imagine",
+		createlink:     "Inserează/modifică link",
+		insertimage:    "Inserează/modifică imagine",
 		inserttable:    "Inserează un tabel",
 		htmlmode:       "Sursa HTML / WYSIWYG",
 		popupeditor:    "Maximizează editorul",
@@ -48,7 +48,9 @@ HTMLArea.I18N = {
 		redo:           "Reface ultima acţiune anulată",
 		cut:            "Taie în clipboard",
 		copy:           "Copie în clipboard",
-		paste:          "Aduce din clipboard"
+		paste:          "Aduce din clipboard",
+		lefttoright:    "Direcţia de scriere: stânga - dreapta",
+		righttoleft:    "Direcţia de scriere: dreapta - stânga"
 	},
 
 	buttons: {
@@ -59,5 +61,20 @@ HTMLArea.I18N = {
 	msg: {
 		"Path":         "Calea",
 		"TEXT_MODE":    "Eşti în modul TEXT.  Apasă butonul [<>] pentru a te întoarce în modul WYSIWYG."
+	},
+
+	dialogs: {
+		"Cancel"                                            : "Renunţă",
+		"Insert/Modify Link"                                : "Inserează/modifcă link",
+		"New window (_blank)"                               : "Fereastră nouă (_blank)",
+		"None (use implicit)"                               : "Nimic (foloseşte ce-i implicit)",
+		"OK"                                                : "Acceptă",
+		"Other"                                             : "Alt target",
+		"Same frame (_self)"                                : "Aceeaşi fereastră (_self)",
+		"Target:"                                           : "Ţinta:",
+		"Title (tooltip):"                                  : "Titlul (tooltip):",
+		"Top frame (_top)"                                  : "Fereastra principală (_top)",
+		"URL:"                                              : "URL:",
+		"You must enter the URL where this link points to"  : "Trebuie să introduceţi un URL"
 	}
 };
diff --git a/phpgwapi/js/htmlarea/lang/ru.js b/phpgwapi/js/htmlarea/lang/ru.js
index bd00d073b0..e8e1a326c4 100644
--- a/phpgwapi/js/htmlarea/lang/ru.js
+++ b/phpgwapi/js/htmlarea/lang/ru.js
@@ -1,4 +1,16 @@
-// I18N constants
+// I18N constants
+
+// LANG: "ru", ENCODING: UTF-8 | ISO-8859-1
+// Author: Yulya Shtyryakova, <yulya@vdcom.ru>
+
+// FOR TRANSLATORS:
+//
+//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
+//      (at least a valid email address)
+//
+//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
+//      (if this is not possible, please include a comment
+//       that states what encoding is necessary.)
 
 HTMLArea.I18N = {
 
@@ -7,30 +19,45 @@ HTMLArea.I18N = {
 	lang: "ru",
 
 	tooltips: {
-		bold:           "������",
-		italic:         "���������",
-		underline:      "������������",
-		strikethrough:  "�������������",
-		subscript:      "������ ������",
-		superscript:    "������� ������",
-		justifyleft:    "������������ �� ������ ����",
-		justifycenter:  "������������ �� ������",
-		justifyright:   "������������ �� ������� ����",
-		justifyfull:    "���������� �����",
-		orderedlist:    "������������ ������",
-		unorderedlist:  "������������� ������",
-		outdent:        "����� � ����",
-		indent:         "����� � �����",
-		forecolor:      "���� ������",
-		backcolor:      "���� ����",
-		horizontalrule: "�������������� �����",
-		createlink:     "�������� ������",
-		insertimage:    "�������� ��������",
-		inserttable:    "�������� �������",
-		htmlmode:       "������ HTML ���",
-		popupeditor:    "��������� ��������",
-		about:          "� ���������",
-		help:           "������ � �������������",
-		textindicator:  "������ �����"
+		bold:           "Полужирный",
+		italic:         "Наклонный",
+		underline:      "Подчеркнутый",
+		strikethrough:  "Перечеркнутый",
+		subscript:      "Нижний индекс",
+		superscript:    "Верхний индекс",
+		justifyleft:    "По левому краю",
+		justifycenter:  "По центру",
+		justifyright:   "По правому краю",
+		justifyfull:    "По ширине",
+		insertorderedlist:    "Нумерованный лист",
+		insertunorderedlist:  "Маркированный лист",
+		outdent:        "Уменьшить отступ",
+		indent:         "Увеличить отступ",
+		forecolor:      "Цвет шрифта",
+		hilitecolor:    "Цвет фона",
+		horizontalrule: "Горизонтальный разделитель",
+		createlink:     "Вставить гиперссылку",
+		insertimage:    "Вставить изображение",
+		inserttable:    "Вставить таблицу",
+		htmlmode:       "Показать Html-код",
+		popupeditor:    "Увеличить редактор",
+		about:          "О редакторе",
+		showhelp:       "Помощь",
+		textindicator:  "Текущий стиль",
+		undo:           "Отменить",
+		redo:           "Повторить",
+		cut:            "Вырезать",
+		copy:           "Копировать",
+		paste:          "Вставить"
+	},
+
+	buttons: {
+		"ok":           "OK",
+		"cancel":       "Отмена"
+	},
+
+	msg: {
+		"Path":         "Путь",
+		"TEXT_MODE":    "Вы в режиме отображения Html-кода. нажмите кнопку [<>], чтобы переключиться в визуальный режим."
 	}
 };
diff --git a/phpgwapi/js/htmlarea/lang/si.js b/phpgwapi/js/htmlarea/lang/si.js
new file mode 100644
index 0000000000..7cfb49601d
--- /dev/null
+++ b/phpgwapi/js/htmlarea/lang/si.js
@@ -0,0 +1,63 @@
+// I18N constants
+
+// LANG: "si", ENCODING: ISO-8859-2
+// Author: Tomaz Kregar, x_tomo_x@email.si
+
+// FOR TRANSLATORS:
+//
+//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
+//      (at least a valid email address)
+//
+//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
+//      (if this is not possible, please include a comment
+//       that states what encoding is necessary.)
+
+HTMLArea.I18N = {
+
+	// the following should be the filename without .js extension
+	// it will be used for automatically load plugin language.
+	lang: "si",
+
+	tooltips: {
+		bold:           "Krepko",
+		italic:         "Le�e�e",
+		underline:      "Pod�rtano",
+		strikethrough:  "Pre�rtano",
+		subscript:      "Podpisano",
+		superscript:    "Nadpisano",
+		justifyleft:    "Poravnaj levo",
+		justifycenter:  "Na sredino",
+		justifyright:   "Poravnaj desno",
+		justifyfull:    "Porazdeli vsebino",
+		orderedlist:    "O�tevil�evanje",
+		unorderedlist:  "Ozna�evanje",
+		outdent:        "Zmanj�aj zamik",
+		indent:         "Pove�aj zamik",
+		forecolor:      "Barva pisave",
+		hilitecolor:    "Barva ozadja",
+		horizontalrule: "Vodoravna �rta",
+		createlink:     "Vstavi hiperpovezavo",
+		insertimage:    "Vstavi sliko",
+		inserttable:    "Vstavi tabelo",
+		htmlmode:       "Preklopi na HTML kodo",
+		popupeditor:    "Pove�aj urejevalnik",
+		about:          "Vizitka za urejevalnik",
+		showhelp:       "Pomo� za urejevalnik",
+		textindicator:  "Trenutni slog",
+		undo:           "Razveljavi zadnjo akcijo",
+		redo:           "Uveljavi zadnjo akcijo",
+		cut:            "Izre�i",
+		copy:           "Kopiraj",
+		paste:          "Prilepi"
+	},
+
+	buttons: {
+		"ok":           "V redu",
+		"cancel":       "Prekli�i"
+	},
+
+	msg: {
+		"Path":         "Pot",
+		"TEXT_MODE":    "Si v tekstovnem na�inu.  Uporabi [<>] gumb za prklop nazaj na WYSIWYG."
+	}
+};
diff --git a/phpgwapi/js/htmlarea/lang/vn.js b/phpgwapi/js/htmlarea/lang/vn.js
index 5b5e800a83..77424965b6 100644
--- a/phpgwapi/js/htmlarea/lang/vn.js
+++ b/phpgwapi/js/htmlarea/lang/vn.js
@@ -1,6 +1,6 @@
 // I18N constants : Vietnamese
-// mviet: download the free Vietnamese script addon for htmlArea at: www.mviet.org
-// email: mviet@socal.rr.com
+// LANG: "en", ENCODING: UTF-8
+// Author: Nguyễn Đình Nam, <hncryptologist@yahoo.com>
 
 HTMLArea.I18N = {
 
@@ -11,28 +11,41 @@ HTMLArea.I18N = {
 	tooltips: {
 		bold:           "Đậm",
 		italic:         "Nghiêng",
-		underline:      "Gạch Đít",
+		underline:      "Gạch Chân",
 		strikethrough:  "Gạch Xóa",
 		subscript:      "Viết Xuống Dưới",
-		superscript:    "Viết Lên Trên ",
-		justifyleft:    "Ngay Hàng Bên Trái  ",
-		justifycenter:  "Ngay Hàng Giữa",
-		justifyright:   "Ngay Hàng Lên Phải",
-		justifyfull:    "Ngay Hàng Trái & Phải",
-		orderedlist:    "Chuỗi Thứ Tự 123",
-		unorderedlist:  "Chuỗi Nút",
-		outdent:        "Giảm Vào Hàng",
-		indent:         "Tăng Vào Hàng",
+		superscript:    "Viết Lên Trên",
+		justifyleft:    "Căn Trái",
+		justifycenter:  "Căn Giữa",
+		justifyright:   "Căn Phải",
+		justifyfull:    "Căn Đều",
+		orderedlist:    "Danh Sách Có Thứ Tự",
+		unorderedlist:  "Danh Sách Phi Thứ Tự",
+		outdent:        "Lùi Ra Ngoài",
+		indent:         "Thụt Vào Trong",
 		forecolor:      "Màu Chữ",
 		backcolor:      "Màu Nền",
-		horizontalrule: "Thước Ngang",
-		createlink:     "Tạo Nối",
-		insertimage:    "Mang Hình Vô",
-		inserttable:    "Mang Khuôn Vô",
-		htmlmode:       "Bật / Tắt Nguồn HTML",
-		popupeditor:    "Póp Lớn Khung Viết",
-		about:          "Nói Về Chương Trình",
-		help:           "Giúp Đỡ",
-		textindicator:  "Loại Kiểu Viết"
+		horizontalrule: "Dòng Kẻ Ngang",
+		createlink:     "Tạo Liên Kết",
+		insertimage:    "Chèn Ảnh",
+		inserttable:    "Chèn Bảng",
+		htmlmode:       "Chế Độ Mã HTML",
+		popupeditor:    "Phóng To Ô Soạn Thảo",
+		about:          "Tự Giới Thiệu",
+		showhelp:       "Giúp Đỡ",
+		textindicator:  "Định Dạng Hiện Thời",
+		undo:           "Undo",
+		redo:           "Redo",
+		cut:            "Cắt",
+		copy:           "Copy",
+		paste:          "Dán"
+	},
+	buttons: {
+		"ok":           "OK",
+		"cancel":       "Hủy"
+	},
+	msg: {
+		"Path":         "Đường Dẫn",
+		"TEXT_MODE":    "Bạn đang ở chế độ text.  Sử dụng nút [<>] để chuyển lại chế độ WYSIWIG."
 	}
 };
diff --git a/phpgwapi/js/htmlarea/license.txt b/phpgwapi/js/htmlarea/license.txt
index 4365ee4e91..32ac404a5b 100644
--- a/phpgwapi/js/htmlarea/license.txt
+++ b/phpgwapi/js/htmlarea/license.txt
@@ -1,13 +1,30 @@
 htmlArea License (based on BSD license)
-Copyright (c) 2002, interactivetools.com, inc.
+Copyright (c) 2002-2004, interactivetools.com, inc.
+Copyright (c) 2003-2004 dynarch.com
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-1) Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 
+1) Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
 
-2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 
+2) Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
 
-3) Neither the name of interactivetools.com, inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. 
+3) Neither the name of interactivetools.com, inc. nor the names of its
+   contributors may be used to endorse or promote products derived from this
+   software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/cz.js b/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/cz.js
new file mode 100644
index 0000000000..108c037d11
--- /dev/null
+++ b/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/cz.js
@@ -0,0 +1,37 @@
+// I18N constants
+
+// LANG: "cz", ENCODING: UTF-8 | ISO-8859-2
+// Author: Jiri Löw, <jirilow@jirilow.com>
+
+// FOR TRANSLATORS:
+//
+//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
+//      (at least a valid email address)
+//
+//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
+//      (if this is not possible, please include a comment
+//       that states what encoding is necessary.)
+
+SpellChecker.I18N = {
+	"CONFIRM_LINK_CLICK"                    : "Prosím potvrďte otevření tohoto odkazu",
+	"Cancel"                                : "Zrušit",
+	"Dictionary"                            : "Slovník",
+	"Finished list of mispelled words"      : "Dokončen seznam chybných slov",
+	"I will open it in a new page."         : "Bude otevřen jej v nové stránce.",
+	"Ignore all"                            : "Ignorovat vše",
+	"Ignore"                                : "Ignorovat",
+	"NO_ERRORS"                             : "Podle zvoleného slovníku nebyla nalezena žádná chybná slova.",
+	"NO_ERRORS_CLOSING"                     : "Kontrola správnosti slov dokončena, nebyla nalezena žádná chybná slova. Ukončování ...",
+	"OK"                                    : "OK",
+	"Original word"                         : "Původní slovo",
+	"Please wait.  Calling spell checker."  : "Prosím čekejte. Komunikuace s kontrolou správnosti slov.",
+	"Please wait: changing dictionary to"   : "Prosím čekejte: změna adresáře na",
+	"QUIT_CONFIRMATION"                     : "Změny budou zrušeny a kontrola správnosti slov ukončena. Prosím potvrďte.",
+	"Re-check"                              : "Překontrolovat",
+	"Replace all"                           : "Zaměnit všechno",
+	"Replace with"                          : "Zaměnit za",
+	"Replace"                               : "Zaměnit",
+	"SC-spell-check"                        : "Kontrola správnosti slov",
+	"Suggestions"                           : "Doporučení",
+	"pliz weit ;-)"                         : "strpení prosím ;-)"
+};
diff --git a/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/da.js b/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/da.js
new file mode 100644
index 0000000000..690293ec01
--- /dev/null
+++ b/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/da.js
@@ -0,0 +1,37 @@
+// I18N constants
+
+// LANG: "en", ENCODING: UTF-8 | ISO-8859-1
+// Author: Steen Sønderup, <steen@soenderup.com>
+
+// FOR TRANSLATORS:
+//
+//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
+//      (at least a valid email address)
+//
+//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
+//      (if this is not possible, please include a comment
+//       that states what encoding is necessary.)
+
+SpellChecker.I18N = {
+	"CONFIRM_LINK_CLICK"                    : "Vil du følge dette link?",
+	"Cancel"                                : "Anuler",
+	"Dictionary"                            : "Ordbog",
+	"Finished list of mispelled words"      : "Listen med stavefejl er gennemgået",
+	"I will open it in a new page."         : "Jeg vil åbne det i en ny side.",
+	"Ignore all"                            : "Ignorer alle",
+	"Ignore"                                : "Ignorer",
+	"NO_ERRORS"                             : "Der blev ikke fundet nogle stavefejl med den valgte ordbog.",
+	"NO_ERRORS_CLOSING"                     : "Stavekontrollen er gennemført, der blev ikke fundet nogle stavefejl.  Lukker...",
+	"OK"                                    : "OK",
+	"Original word"                         : "Oprindeligt ord",
+	"Please wait.  Calling spell checker."  : "Vent venligst.  Henter stavekontrol.",
+	"Please wait: changing dictionary to"   : "Vent venligst: skifter ordbog til",
+	"QUIT_CONFIRMATION"                     : "Alle dine ændringer vil gå tabt, vil du fortsætte?",
+	"Re-check"                              : "Tjek igen",
+	"Replace all"                           : "Erstat alle",
+	"Replace with"                          : "Erstat med",
+	"Replace"                               : "Erstat",
+	"SC-spell-check"                        : "Stavekontrol",
+	"Suggestions"                           : "Forslag",
+	"pliz weit ;-)"                         : "Vent venligst"
+};
diff --git a/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/de.js b/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/de.js
new file mode 100644
index 0000000000..1a8f4b5287
--- /dev/null
+++ b/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/de.js
@@ -0,0 +1,28 @@
+// I18N constants
+
+// LANG: "en", ENCODING: UTF-8 | ISO-8859-1
+// Author: Broxx, <broxx@broxx.com>
+
+SpellChecker.I18N = {
+	"CONFIRM_LINK_CLICK"                    : "Wollen Sie diesen Link oeffnen",
+	"Cancel"                                : "Abbrechen",
+	"Dictionary"                            : "Woerterbuch",
+	"Finished list of mispelled words"      : "Liste der nicht bekannten Woerter",
+	"I will open it in a new page."         : "Wird auf neuer Seite geoeffnet",
+	"Ignore all"                            : "Alle ignorieren",
+	"Ignore"                                : "Ignorieren",
+	"NO_ERRORS"                             : "Keine falschen Woerter mit gewaehlten Woerterbuch gefunden",
+	"NO_ERRORS_CLOSING"                     : "Rechtsschreibpruefung wurde ohne Fehler fertiggestellt.  Wird nun geschlossen...",
+	"OK"                                    : "OK",
+	"Original word"                         : "Original Wort",
+	"Please wait.  Calling spell checker."  : "Bitte warten.  Woerterbuch wird durchsucht.",
+	"Please wait: changing dictionary to"   : "Bitte warten: Woerterbuch wechseln zu",
+	"QUIT_CONFIRMATION"                     : "Aenderungen werden nicht uebernommen.  Bitte bestaettigen.",
+	"Re-check"                              : "Neuueberpruefung",
+	"Replace all"                           : "Alle ersetzen",
+	"Replace with"                          : "Ersetzen mit",
+	"Replace"                               : "Ersetzen",
+	"SC-spell-check"                        : "Ueberpruefung",
+	"Suggestions"                           : "Vorschlag",
+	"pliz weit ;-)"                         : "bittsche wartn ;-)"
+};
diff --git a/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/en.js b/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/en.js
index c14d7d74ea..b573309889 100644
--- a/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/en.js
+++ b/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/en.js
@@ -1,7 +1,7 @@
 // I18N constants
 
 // LANG: "en", ENCODING: UTF-8 | ISO-8859-1
-// Author: Mihai Bazon, <mishoo@infoiasi.ro>
+// Author: Mihai Bazon, http://dynarch.com/mishoo
 
 // FOR TRANSLATORS:
 //
diff --git a/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/hu.js b/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/hu.js
new file mode 100644
index 0000000000..64102c558e
--- /dev/null
+++ b/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/hu.js
@@ -0,0 +1,37 @@
+// I18N constants
+
+// LANG: "hu", ENCODING: UTF-8
+// Author: Miklós Somogyi, <somogyine@vnet.hu>
+
+// FOR TRANSLATORS:
+//
+//   1. PLEASE PUT YOUR CONTACT INFO IN THE ABOVE LINE
+//      (at least a valid email address)
+//
+//   2. PLEASE TRY TO USE UTF-8 FOR ENCODING;
+//      (if this is not possible, please include a comment
+//       that states what encoding is necessary.)
+
+SpellChecker.I18N = {
+	"CONFIRM_LINK_CLICK"                    : "Megerősítés",
+	"Cancel"                                : "Mégsem",
+	"Dictionary"                            : "Szótár",
+	"Finished list of mispelled words"      : "A tévesztett szavak listájának vége",
+	"I will open it in a new page."         : "Megnyitás új lapon",
+	"Ignore all"                            : "Minden elvetése",
+	"Ignore"                                : "Elvetés",
+	"NO_ERRORS"                             : "A választott szótár szerint nincs tévesztett szó.",
+	"NO_ERRORS_CLOSING"                     : "A helyesírásellenőrzés kész, tévesztett szó nem fordult elő. Bezárás...",
+	"OK"                                    : "Rendben",
+	"Original word"                         : "Eredeti szó",
+	"Please wait.  Calling spell checker."  : "Kis türelmet, a helyesírásellenőrző hívása folyamatban.",
+	"Please wait: changing dictionary to"   : "Kis türelmet, szótár cseréje",
+	"QUIT_CONFIRMATION"                     : "Kilépés a változások eldobásával. Jóváhagyja?",
+	"Re-check"                              : "Újraellenőrzés",
+	"Replace all"                           : "Mind cseréje",
+	"Replace with"                          : "Csere a következőre:",
+	"Replace"                               : "Csere",
+	"SC-spell-check"                        : "Helyesírásellenőrzés",
+	"Suggestions"                           : "Tippek",
+	"pliz weit ;-)"                         : "Kis türelmet ;-)"
+};
diff --git a/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/it.js b/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/it.js
new file mode 100644
index 0000000000..0af5f7705f
--- /dev/null
+++ b/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/it.js
@@ -0,0 +1,28 @@
+// I18N constants
+
+// LANG: "it", ENCODING: UTF-8 | ISO-8859-1
+// Author: Fabio Rotondo, <fabio@rotondo.it>
+
+SpellChecker.I18N = {
+	"CONFIRM_LINK_CLICK"                    : "Devi confermare l'apertura di questo link",
+	"Cancel"                                : "Annulla",
+	"Dictionary"                            : "Dizionario",
+	"Finished list of mispelled words"      : "La lista delle parole scritte male è terminata",
+	"I will open it in a new page."         : "Lo aprirò in una nuova pagina.",
+	"Ignore all"                            : "Ignora sempre",
+	"Ignore"                                : "Ignora",
+	"NO_ERRORS"                             : "Non sono state trovate parole scritte male con il dizionario selezionato.",
+	"NO_ERRORS_CLOSING"                     : "Controllo completato, non sono state trovate parole scritte male. Sto chiudendo...",
+	"OK"                                    : "OK",
+	"Original word"                         : "Parola originale",
+	"Please wait.  Calling spell checker."  : "Attendere.  Sto invocando lo Spell Checker.",
+	"Please wait: changing dictionary to"   : "Attendere. Cambio il dizionario in",
+	"QUIT_CONFIRMATION"                     : "Questo annullerà le modifiche e chiuderà lo Spell Checker. Conferma.",
+	"Re-check"                              : "Ricontrolla",
+	"Replace all"                           : "Sostituisci sempre",
+	"Replace with"                          : "Stostituisci con",
+	"Replace"                               : "Sostituisci",
+	"SC-spell-check"                        : "Spell-check",
+	"Suggestions"                           : "Suggerimenti",
+	"pliz weit ;-)"                         : "Attendere Prego ;-)"
+};
diff --git a/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/ro.js b/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/ro.js
index 618b398cf5..d8e96b9be2 100644
--- a/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/ro.js
+++ b/phpgwapi/js/htmlarea/plugins/SpellChecker/lang/ro.js
@@ -1,7 +1,7 @@
 // I18N constants
 
 // LANG: "ro", ENCODING: UTF-8
-// Author: Mihai Bazon, <mishoo@infoiasi.ro>
+// Author: Mihai Bazon, http://dynarch.com/mishoo
 
 // FOR TRANSLATORS:
 //
diff --git a/phpgwapi/js/htmlarea/plugins/SpellChecker/readme-tech.html b/phpgwapi/js/htmlarea/plugins/SpellChecker/readme-tech.html
index 52bf4c6c38..e01d082d77 100644
--- a/phpgwapi/js/htmlarea/plugins/SpellChecker/readme-tech.html
+++ b/phpgwapi/js/htmlarea/plugins/SpellChecker/readme-tech.html
@@ -105,11 +105,9 @@
       others are likely to be available by default in most Perl distributions.</p>
 
     <hr />
-    <address><a href="http://students.infoiasi.ro/~mishoo/">Mihai Bazon</a></address>
+    <address><a href="http://dynarch.com/mishoo/">Mihai Bazon</a></address>
 <!-- Created: Thu Jul 17 13:22:27 EEST 2003 -->
-<!-- hhmts start -->
-Last modified on Sun Aug 10 12:28:24 2003
-<!-- hhmts end -->
+<!-- hhmts start --> Last modified: Wed Jan 28 11:13:13 EET 2004 <!-- hhmts end -->
 <!-- doc-lang: English -->
   </body>
 </html>
diff --git a/phpgwapi/js/htmlarea/plugins/SpellChecker/spell-check-logic.cgi b/phpgwapi/js/htmlarea/plugins/SpellChecker/spell-check-logic.cgi
index 3b767b464e..a47b82766c 100644
--- a/phpgwapi/js/htmlarea/plugins/SpellChecker/spell-check-logic.cgi
+++ b/phpgwapi/js/htmlarea/plugins/SpellChecker/spell-check-logic.cgi
@@ -10,7 +10,7 @@
 # For full source code and docs, visit http://www.interactivetools.com/
 #
 # Version 3.0 developed by Mihai Bazon for InteractiveTools.
-#	     http://students.infoiasi.ro/~mishoo
+#   http://dynarch.com/mishoo
 #
 # $Id$
 
diff --git a/phpgwapi/js/htmlarea/plugins/SpellChecker/spell-check-ui.html b/phpgwapi/js/htmlarea/plugins/SpellChecker/spell-check-ui.html
index 85e3e9e840..6b81c66a48 100644
--- a/phpgwapi/js/htmlarea/plugins/SpellChecker/spell-check-ui.html
+++ b/phpgwapi/js/htmlarea/plugins/SpellChecker/spell-check-ui.html
@@ -16,7 +16,7 @@
    For full source code and docs, visit http://www.interactivetools.com/
   
    Version 3.0 developed by Mihai Bazon for InteractiveTools.
-  	     http://students.infoiasi.ro/~mishoo
+  	     http://dynarch.com/mishoo
   
    $Id$
 
diff --git a/phpgwapi/js/htmlarea/plugins/SpellChecker/spell-check-ui.js b/phpgwapi/js/htmlarea/plugins/SpellChecker/spell-check-ui.js
index f24287b6f2..d17ba71841 100644
--- a/phpgwapi/js/htmlarea/plugins/SpellChecker/spell-check-ui.js
+++ b/phpgwapi/js/htmlarea/plugins/SpellChecker/spell-check-ui.js
@@ -1,15 +1,11 @@
 // Spell Checker Plugin for HTMLArea-3.0
-// Implementation by Mihai Bazon.  Sponsored by www.americanbible.org
+// Sponsored by www.americanbible.org
+// Implementation by Mihai Bazon, http://dynarch.com/mishoo/
 //
-// htmlArea v3.0 - Copyright (c) 2002 interactivetools.com, inc.
+// (c) dynarch.com 2003.
+// Distributed under the same terms as HTMLArea itself.
 // This notice MUST stay intact for use (see license.txt).
 //
-// A free WYSIWYG editor replacement for <textarea> fields.
-// For full source code and docs, visit http://www.interactivetools.com/
-//
-// Version 3.0 developed by Mihai Bazon for InteractiveTools.
-//	     http://students.infoiasi.ro/~mishoo
-//
 // $Id$
 
 // internationalization file was already loaded in parent ;-)
@@ -71,13 +67,15 @@ function cancelClicked() {
 
 function replaceWord(el) {
 	var replacement = document.getElementById("v_replacement").value;
-	modified = (el.innerHTML != replacement);
+	var this_word_modified = (el.innerHTML != replacement);
+	if (this_word_modified)
+		modified = true;
 	if (el) {
 		el.className = el.className.replace(/\s*HA-spellcheck-(hover|fixed)\s*/g, " ");
 	}
 	el.className += " HA-spellcheck-fixed";
 	el.__msh_fixed = true;
-	if (!modified) {
+	if (!this_word_modified) {
 		return false;
 	}
 	el.innerHTML = replacement;
diff --git a/phpgwapi/js/htmlarea/plugins/SpellChecker/spell-checker.js b/phpgwapi/js/htmlarea/plugins/SpellChecker/spell-checker.js
index 48a8fa6d6b..d1ee25a055 100644
--- a/phpgwapi/js/htmlarea/plugins/SpellChecker/spell-checker.js
+++ b/phpgwapi/js/htmlarea/plugins/SpellChecker/spell-checker.js
@@ -8,7 +8,7 @@
 // For full source code and docs, visit http://www.interactivetools.com/
 //
 // Version 3.0 developed by Mihai Bazon for InteractiveTools.
-//	     http://students.infoiasi.ro/~mishoo
+//   http://dynarch.com/mishoo
 //
 // $Id$
 
@@ -28,7 +28,7 @@ function SpellChecker(editor) {
 			toolbar.push("separator");
 		} else {
 			var id = "SC-" + btn[0];
-			cfg.registerButton(id, tt[id], "plugins/SpellChecker/img/" + btn[0] + ".gif", false,
+			cfg.registerButton(id, tt[id], editor.imgURL(btn[0] + ".gif", "SpellChecker"), false,
 					   function(editor, id) {
 						   // dispatch button press event
 						   self.buttonPress(editor, id);
@@ -42,6 +42,17 @@ function SpellChecker(editor) {
 	}
 };
 
+SpellChecker._pluginInfo = {
+	name          : "SpellChecker",
+	version       : "1.0",
+	developer     : "Mihai Bazon",
+	developer_url : "http://dynarch.com/mishoo/",
+	c_owner       : "Mihai Bazon",
+	sponsor       : "American Bible Society",
+	sponsor_url   : "http://www.americanbible.org",
+	license       : "htmlArea"
+};
+
 SpellChecker.btnList = [
 	null, // separator
 	["spell-check"]
@@ -52,7 +63,7 @@ SpellChecker.prototype.buttonPress = function(editor, id) {
 	    case "SC-spell-check":
 		SpellChecker.editor = editor;
 		SpellChecker.init = true;
-		var uiurl = editor.config.editorURL + "plugins/SpellChecker/spell-check-ui.html";
+		var uiurl = _editor_url + "plugins/SpellChecker/spell-check-ui.html";
 		var win;
 		if (HTMLArea.is_ie) {
 			win = window.open(uiurl, "SC_spell_checker",
diff --git a/phpgwapi/js/htmlarea/popups/about.html b/phpgwapi/js/htmlarea/popups/about.html
index 9b052185b5..e579259905 100644
--- a/phpgwapi/js/htmlarea/popups/about.html
+++ b/phpgwapi/js/htmlarea/popups/about.html
@@ -1,55 +1,391 @@
-<html style="width: 380px; height: 250px;">
-<head><title>About HTMLArea</title>
+<!--
+
+(c) dynarch.com, 2003-2004
+Author: Mihai Bazon, http://dynarch.com/mishoo
+Distributed as part of HTMLArea 3.0
+
+"You are not expected to understand this...  I don't neither."
+
+                      (from The Linux Kernel Source Code,
+                            ./arch/x86_64/ia32/ptrace.c:90)
+
+;-)
+
+-->
+
+<html style="height: 100%">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>About HTMLArea</title>
 <script type="text/javascript" src="popup.js"></script>
 <script type="text/javascript">
-function closeAbout() {
-  __dlg_close(null);
+window.resizeTo(450, 250);
+var TABS = [];
+var CURRENT_TAB = 0;
+var CONTENT_HEIGHT_DIFF = 0;
+var CONTENT_WIDTH_DIFF = 0;
+function selectTab(idx) {
+  var ct = TABS[CURRENT_TAB];
+  ct.className = ct.className.replace(/\s*tab-current\s*/, ' ');
+  ct = TABS[CURRENT_TAB = idx];
+  ct.className += ' tab-current';
+  for (var i = TABS.length; --i >= 0;) {
+    var area = document.getElementById("tab-area-" + i);
+    if (CURRENT_TAB == i) {
+      area.style.display = "block";
+    } else {
+      area.style.display = "none";
+    }
+  }
+  document.body.style.visibility = "hidden";
+  document.body.style.visibility = "visible";
+  document.cookie = "HTMLAREA-ABOUT-TAB=" + idx;
+}
+var editor = null;
+function initDocument() {
+  editor = window.dialogArguments;
+  HTMLArea = window.opener.HTMLArea;
+
+  var plugins = document.getElementById("plugins");
+  var j = 0;
+  var html = "<table width='99%' cellpadding='0' style='margin-top: 1em; collapse-borders: collapse; border: 1px solid #8b8;'>" +
+	  "<thead><tr>" +
+	  "<td>Name</td>" +
+	  "<td>Developer</td>" +
+	  "<td>Sponsored by</td>" +
+	  "<td>License<sup>*</sup></td>" +
+	  "</tr></thead><tbody>";
+  for (var i in editor.plugins) {
+    var info = editor.plugins[i];
+    html += "<tr><td>" + info.name + " v" + info.version + "</td>" + 
+            "<td><a href='" + info.developer_url + "' target='_blank' title='Visit developer website'>" +
+	    info.developer + "</a></td>" +
+	    "<td><a href='" + info.sponsor_url + "' target='_blank' title='Visit sponsor website'>" +
+	    info.sponsor + "</a></td>" +
+	    "<td>" + info.license + "</td></tr>";
+    ++j;
+  }
+
+  if (j) {
+          html += "</tbody></table>" +
+		  "<p><sup>*</sup> License \"htmlArea\" means that the plugin is distributed under the same terms " +
+		  "as HTMLArea itself.  Such plugins are likely to be those included in the official " +
+		  "HTMLArea distribution</p>";
+	  plugins.innerHTML = "<p>The following plugins have been loaded.</p>" + html;
+  } else {
+	  plugins.innerHTML = "<p>No plugins have been loaded</p>";
+  }
+
+  plugins.innerHTML += "<p>User agent reports:<br/>" + navigator.userAgent + "</p>";
+
+  var content = document.getElementById("content");
+  if (window.innerHeight) {
+    CONTENT_HEIGHT_DIFF = window.innerHeight - 250;
+    CONTENT_WIDTH_DIFF = window.innerWidth - content.offsetWidth;
+  } else {
+    CONTENT_HEIGHT_DIFF = document.body.offsetHeight - 250;
+    CONTENT_WIDTH_DIFF = document.body.offsetWidth - 400;
+  }
+  window.onresize();
+  var bar = document.getElementById("tabbar");
+  j = 0;
+  for (var i = bar.firstChild; i; i = i.nextSibling) {
+    TABS.push(i);
+    i.__msh_tab = j;
+    i.onmousedown = function(ev) { selectTab(this.__msh_tab); HTMLArea._stopEvent(ev || window.event); };
+    var area = document.getElementById("tab-area-" + j);
+    if (/tab-current/.test(i.className)) {
+      CURRENT_TAB = j;
+      area.style.display = "block";
+    } else {
+      area.style.display = "none";
+    }
+    ++j;
+  }
+  if (document.cookie.match(/HTMLAREA-ABOUT-TAB=([0-9]+)/))
+    selectTab(RegExp.$1);
+}
+window.onresize = function() {
+  var content = document.getElementById("content");
+  if (window.innerHeight) {
+    content.style.height = (window.innerHeight - CONTENT_HEIGHT_DIFF) + "px";
+    content.style.width = (window.innerWidth - CONTENT_WIDTH_DIFF) + "px";
+  } else {
+    content.style.height = (document.body.offsetHeight - CONTENT_HEIGHT_DIFF) + "px";
+    //content.style.width = (document.body.offsetWidth - CONTENT_WIDTH_DIFF) + "px";
+  }
 }
 </script>
 <style>
-  html,body,textarea { font-family: tahoma,verdana,arial; font-size: 11px;
+  html,body,textarea,table { font-family: tahoma,verdana,arial; font-size: 11px;
 padding: 0px; margin: 0px; }
   tt { font-size: 120%; }
-  body { padding: 0px; background: ButtonFace; color: ButtonText; }
+  body { padding: 0px; background: #cea; color: 000; }
   a:link, a:visited { color: #00f; }
   a:hover { color: #f00; }
   a:active { color: #f80; }
-  button { font: 11px tahoma,verdana,sans-serif; }
+  button { font: 11px tahoma,verdana,sans-serif; background-color: #cea;
+      border-width: 1px; }
+
+  p { margin: 0.5em 0px; }
+
+  h1 { font: bold 130% georgia,"times new roman",serif; margin: 0px; border-bottom: 1px solid #6a6; }
+  h2 { font: bold 110% georgia,"times new roman",serif; margin: 0.7em 0px; }
+
+  thead {
+    font-weight: bold;
+    background-color: #dfb;
+  }
+
+  .logo, .logo-hover {
+    white-space: nowrap;
+    background-color: #8f4; color: #040; padding: 3px; border-bottom: 1px solid #555;
+    height: 5em;
+  }
+  .logo .brand, .logo-hover .brand {
+    margin-left: 0.5em; margin-right: 0.5em; padding-bottom: 0.1em;
+    font-family: impact,'arial black',arial,sans-serif; font-size: 28px;
+    border-bottom: 1px solid #595; text-align: center;
+    cursor: pointer;
+  }
+  .logo-hover {
+    background-color: #fff;
+  }
+  .logo-hover .brand {
+    color: #800;
+    border-color: #04f;
+  }
+  .logo .letter, .logo-hover .letter { position: relative; font-family: monospace; }
+  .logo .letter1 { top: 0.1em; }
+  .logo .letter2 { top: 0.05em; }
+  .logo .letter3 { top: -0.05em; }
+  .logo .letter4 { top: -0.1em; }
+
+  .logo-hover .letter1 { top: -0.1em; }
+  .logo-hover .letter2 { top: -0.05em; }
+  .logo-hover .letter3 { top: 0.05em; }
+  .logo-hover .letter4 { top: 0.1em; }
+  .logo .version, .logo-hover .version { font-family: georgia,"times new roman",serif; }
+  .logo .release {
+    font-size: 90%; margin-bottom: 1em;
+    text-align: center; color: #484;
+  }
+  .logo .visit { display: none; }
+  .logo-hover .release { display: none; }
+  .logo-hover .visit {
+    font-size: 90%; margin-bottom: 1em;
+    text-align: center; color: #448;
+  }
+  .buttons {
+    text-align: right; padding: 3px; background-color: #8f4;
+    border-top: 1px solid #555;
+  }
+  #tabbar {
+    position: relative;
+    left: 10px;
+  }
+  .tab {
+    color: #454;
+    cursor: pointer;
+    margin-left: -5px;
+    float: left; position: relative;
+    border: 1px solid #555;
+    top: -3px; left: -2px;
+    padding: 2px 10px 3px 10px;
+    border-top: none; background-color: #9b7;
+    -moz-border-radius: 0px 0px 4px 4px;
+    z-index: 0;
+  }
+  .tab-current {
+    color: #000;
+    top: -4px;
+    background-color: #cea;
+    padding: 3px 10px 4px 10px;
+    z-index: 10;
+  }
+  table.sponsors { border-top: 1px solid #aca; }
+  table.sponsors td {
+    border-bottom: 1px solid #aca; vertical-align: top;
+  }
+  table.sponsors tr td { padding: 2px 0px; }
+  table.sponsors tr td.sponsor { text-align: right; padding-right: 0.3em; white-space: nowrap; }
+  li, ol, ul { margin-top: 0px; margin-bottom: 0px; }
 </style></head>
-<body onload="__dlg_init()">
+<body onload="__dlg_init(); initDocument();"
+><table cellspacing="0" cellpadding="0" style="border-collapse: collapse;
+      width: 100%; height: 100%;">
 
-<div style="background-color: #fff; color: #000; padding: 3px; border-bottom: 1px solid #000;">
-<div style="font-family: 'arial black',arial,sans-serif; font-size: 28px;
-letter-spacing: -1px;">
-<span style="position: relative; top: -0.2em">H</span><span
-style="position: relative; top: 0.1em">T</span><span
-style="position: relative; top: -0.1em">M</span><span
-style="position: relative; top: 0.2em">L</span> Area
-3.0 <span style="position: relative; top: -0.6em; font-size: 50%; font-weight: normal">[ rev. beta ]</span></div>
+<tr style="height: 1em"><td id="tdheader">
 
-<div style="text-align: right; font-size: 90%; margin-bottom: 1em">
-Released on Aug 11, 2003 [21:30] GMT
-</div>
+<div class="logo">
+<div class="brand"
+onmouseover="this.parentNode.className='logo-hover';"
+onmouseout="this.parentNode.className='logo';"
+onclick="window.open('http://dynarch.com/htmlarea/');">
+<span class="letter letter1">&lt;H</span><span
+class="letter letter2">T</span><span
+class="letter letter3">M</span><span
+class="letter letter4">L</span>Area <span class="letter">/&gt;</span>
+<span class="version"><% $version.$release %></span></div>
+<div class="release">Compiled on <% $time %></div>
+<div class="visit">Go to http://dynarch.com/htmlarea/ [latest milestone release]</div>
 </div>
 
-<div style="margin: 1em">
+</td></tr>
+<tr><td id="tdcontent" style="padding: 0.5em;">
 
-<p>A free WYSIWYG editor replacement for <tt>&lt;textarea&gt;</tt> fields.</p>
+<div style="overflow: auto; height: 250px;" id="content">
+<div id="tab-areas">
 
-<p>For full source code and docs, visit:<br />
-<a href="http://www.interactivetools.com/products/htmlarea/" target="_blank"
->http://www.interactivetools.com/products/htmlarea/</a></p>
+<div id="tab-area-0">
 
-<p>Version 3.0 developed and maintained by <a href="http://students.infoiasi.ro/~mishoo/" target="_blank">mishoo</a>.</p>
+  <h1>HTMLArea</h1>
+  
+  <p>A free WYSIWYG editor replacement for <tt>&lt;textarea&gt;</tt> fields.<br />
+  For Mozilla 1.3+ (any platform) or Internet Explorer 5.5+ (Windows).
+  </p>
 
-<p>&copy; 2002, 2003 <a href="http://interactivetools.com" target="_blank">interactivetools.com</a>, inc. All Rights Reserved.</p>
+  <p style="text-align: center"
+  >&copy; 2002-2004 <a href="http://interactivetools.com" target="_blank">interactivetools.com</a>, inc.<br />
+  &copy; 2003-2004 <a href="http://dynarch.com" target="_blank">dynarch.com</a> LLC.<br />
+  All Rights Reserved.</p>
+
+  <h2>Project resources</h2>
+
+  <ul>
+  <li><a href="http://sourceforge.net/projects/itools-htmlarea/" target="_blank"
+  >Project page</a> (@ sourceforge.net)</li>
+  <li><a href="http://sourceforge.net/cvs/?group_id=69750" target="_blank"
+  >Anonymous CVS access</a> (@ sourceforge.net)</li>
+  <li><a href="http://sourceforge.net/tracker/?atid=525656&group_id=69750&func=browse" target="_blank"
+  >Bug system</a> (@ sourceforge.net)</li>
+  <li><a href="http://www.interactivetools.com/forum/gforum.cgi?forum=14;" target="_blank"
+  >Forum</a> (@ interactivetools.com)</li>
+  <li><a href="http://www.dynarch.com/htmlarea/" target="_blank"
+  >Last public release</a> (@ dynarch.com)</li>
+  </ul>
+
+  <p>
+  For download section please see the <a href="http://sourceforge.net/projects/itools-htmlarea/" target="_blank"
+  >project page @ SourceForge</a>.
+  </p>
+
+<p style="margin-top: 1em; text-align: center;">Version 3.0 developed and maintained by <a
+href="http://dynarch.com/mishoo/" title="http://dynarch.com/mishoo/" target="_blank">Mihai Bazon</a> / <a
+href="http://dynarch.com" title="http://dynarch.com/" target="_blank">dynarch.com</a></p>
 
 </div>
 
-<div style="text-align: right; padding: 0px 3px 3px 0px;">
-<button type="button" onclick="closeAbout()">I agree it's cool</button>
+<div id="tab-area-1">
+<h1>Thank you</h1>
+
+  <p>
+  <a href="http://dynarch.com" target="_blank">dynarch.com</a> would like to thank the following
+  companies/persons for their <em>donations</em> to support development of HTMLArea (listed alphabetically):
+  </p>
+
+  <ul>
+    <li><a href="http://www.neomedia.ro">Neomedia</a> (Romania)</li>
+    <li><a href="http://www.os3.it" target="_blank">OS3</a> (Italy)</li>
+    <li><a href="http://www.softwerk.net">SoftWerk</a> (Italy)</li>
+  </ul>
+
+  <p>Also many thanks to all people at InteractiveTools.com
+  <a href="http://www.interactivetools.com/forum/gforum.cgi?forum=14;">HTMLArea forums</a> for
+  contributing translations, feedback, bug reports and fixes.</p>
+
+  <p>
+  Last but not least, this project wouldn't have existed without
+  <a href="http://interactivetools.com" target="_blank">InteractiveTools.com</a>.
+  </p>
+
 </div>
 
+<div id="tab-area-2">
+<h1>htmlArea License (based on BSD license)</h1>
+
+<p style="text-align: center">© 2002-2004, interactivetools.com, inc.<br />
+  © 2003-2004 dynarch.com LLC<br />
+  All rights reserved.</p>
+
+<p>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+</p>
+
+<ol>
+<li>
+Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+</li>
+
+<li>
+Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+</li>
+
+<li>
+Neither the name of interactivetools.com, inc. nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
+</li>
+</ol>
+
+<p>
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+</p>
+
+</div>
+
+<div id="tab-area-3">
+<h1>Plugins</h1>
+<div id="plugins">
+</div>
+</div>
+
+</div></div>
+
+
+</tr></td>
+<tr style="height: 1em"><td id="tdfooter">
+
+
+<div class="buttons">
+<div id="tabbar"
+><div class="tab tab-current"
+>About</div><div class="tab"
+>Thanks</div><div class="tab"
+>License</div><div class="tab"
+>Plugins</div></div>
+<button type="button" onclick="__dlg_close(null);">I agree it's cool</button>
+</div>
+
+</td></tr></table>
+
 </body></html>
 
+<%ARGS>
+  $version => '3.0'
+  $release => 'beta+'
+  $basename => 'HTMLArea-3.0-beta'
+</%ARGS>
 
+<%INIT>;
+if ($release =~ /\S/) {
+    $release = ' <span style="position: relative; top: -0.6em; font-size: 50%; font-weight: normal">[ rev. '.$release.' ]</span>';
+}
+
+use POSIX qw(strftime);
+my $time = strftime '%b %e, %Y %H:%M GMT', gmtime;
+</%INIT>
diff --git a/phpgwapi/js/htmlarea/popups/blank.html b/phpgwapi/js/htmlarea/popups/blank.html
index e69de29bb2..8c7fe21114 100644
--- a/phpgwapi/js/htmlarea/popups/blank.html
+++ b/phpgwapi/js/htmlarea/popups/blank.html
@@ -0,0 +1,2 @@
+<html>
+</html>
\ No newline at end of file
diff --git a/phpgwapi/js/htmlarea/popups/fullscreen.html b/phpgwapi/js/htmlarea/popups/fullscreen.html
index cd67bdda4c..8a9f27fd18 100644
--- a/phpgwapi/js/htmlarea/popups/fullscreen.html
+++ b/phpgwapi/js/htmlarea/popups/fullscreen.html
@@ -1,162 +1,133 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-<head><title>Fullscreen Editor</title>
-<style type="text/css">
-@import url(../htmlarea.css);
-html, body {	margin: 0px; border: 0px; background-color: buttonface; } </style>
+  <head>
+    <title>Fullscreen HTMLArea</title>
+    <script type="text/javascript">
+      _editor_url = window.opener._editor_url;
+      _editor_lang = window.opener._editor_lang;
+      var BASE = window.opener.document.baseURI || window.opener.document.URL;
+      var head = document.getElementsByTagName("head")[0];
+      var base = document.createElement("base");
+      base.href = BASE;
+      head.appendChild(base);
+    </script>
 
-<!--
-<script type="text/javascript" src="../htmlarea.js"></script>
-<script type="text/javascript" src="../htmlarea-lang-en.js"></script>
-<script type="text/javascript" src="../dialog.js"></script>
--->
+    <script type="text/javascript" src="../htmlarea.js"></script>
 
-<script type="text/javascript">
-// load same scripts that were present in the opener page
-var scripts = opener.document.getElementsByTagName("script");
-var head = document.getElementsByTagName("head")[0];
-for (var i = 0; i < scripts.length; ++i) {
-  var script = scripts[i];
-  if (typeof script.src != "undefined" && /\S/.test(script.src)) {
-    // document.write("<scr" + "ipt type=" + "\"script/javascript\"");
-    // document.write(" src=\"../" + script.src + "\"></scr" + "ipt>");
-    var new_script = document.createElement("script");
-    if (/^http:/i.test(script.src)) {
-      new_script.src = script.src;
-    } else {
-      new_script.src = "../" + script.src;
-    }
-    head.appendChild(new_script);
-  }
-}
-</script>
-
-<script type="text/javascript">
+    <script type="text/javascript">
+	// load HTMLArea scripts that are present in the opener frame
+	var scripts = window.opener.HTMLArea._scripts;
+	for (var i = 4; i < scripts.length; ++i) {
+           document.write("<scr" + "ipt type='text/javascript' src='" + scripts[i] + "'></scr" + "ipt>");
+        }
+    </script>
 
+    <!-- browser takes a coffee break here -->
+    <script type="text/javascript">
 var parent_object  = null;
-var editor         = null;      // to be initialized later [ function init() ]
+var editor	   = null;	// to be initialized later [ function init() ]
 
 /* ---------------------------------------------------------------------- *\
-  Function    : 
-  Description : 
+   Function    : 
+   Description : 
 \* ---------------------------------------------------------------------- */
 
 function _CloseOnEsc(ev) {
-  if (document.all) {
-    // IE
-    ev = window.event;
-  }
-  if (ev.keyCode == 27) {
-    // update_parent();
-    window.close();
-    return;
-  }
+	ev || (ev = window.event);
+	if (ev.keyCode == 27) {
+		// update_parent();
+		window.close();
+		return;
+	}
 }
 
 /* ---------------------------------------------------------------------- *\
-  Function    : cloneObject
-  Description : copy an object by value instead of by reference
-  Usage       : var newObj = cloneObject(oldObj);
-\* ---------------------------------------------------------------------- */
-
-function cloneObject(obj) {
-  var newObj          = new Object; 
-
-  // check for array objects
-  if (obj.constructor.toString().indexOf("function Array(") == 1) {
-    newObj = obj.constructor();
-  }
-
-  // check for function objects (as usual, IE is fucked up)
-  if (obj.constructor.toString().indexOf("function Function(") == 1) {
-    newObj = obj; // just copy reference to it
-  } else for (var n in obj) {
-    var node = obj[n];
-    if (typeof node == 'object') { newObj[n] = cloneObject(node); }
-    else                         { newObj[n] = node; }
-  }
-  
-  return newObj;
-}
-
-/* ---------------------------------------------------------------------- *\
-  Function    : resize_editor
-  Description : resize the editor when the user resizes the popup
+   Function    : resize_editor
+   Description : resize the editor when the user resizes the popup
 \* ---------------------------------------------------------------------- */
 
 function resize_editor() {  // resize editor to fix window
-  var newHeight;
-  if (document.all) {
-    // IE
-    newHeight = document.body.offsetHeight - editor._toolbar.offsetHeight;
-    if (newHeight < 0) { newHeight = 0; }
-  } else {
-    // Gecko
-    newHeight = window.innerHeight - editor._toolbar.offsetHeight;
-  }
-  if (editor.config.statusBar) {
-    newHeight -= editor._statusBar.offsetHeight;
-  }
-  editor._textArea.style.height = editor._iframe.style.height = newHeight + "px";
+	var newHeight;
+	if (document.all) {
+		// IE
+		newHeight = document.body.offsetHeight - editor._toolbar.offsetHeight;
+		if (newHeight < 0) { newHeight = 0; }
+	} else {
+		// Gecko
+		newHeight = window.innerHeight - editor._toolbar.offsetHeight;
+	}
+	if (editor.config.statusBar) {
+		newHeight -= editor._statusBar.offsetHeight;
+	}
+	editor._textArea.style.height = editor._iframe.style.height = newHeight + "px";
 }
 
 /* ---------------------------------------------------------------------- *\
-  Function    : init
-  Description : run this code on page load
+   Function    : init
+   Description : run this code on page load
 \* ---------------------------------------------------------------------- */
 
 function init() {
-  parent_object      = opener.HTMLArea._object;
-  var config         = cloneObject( parent_object.config );
-  config.editorURL   = "../";
-  config.width       = "100%";
-  config.height      = "auto";
+	parent_object	   = opener.HTMLArea._object;
+	var config	   = HTMLArea.cloneObject( parent_object.config );
+	config.width	   = "100%";
+	config.height	   = "auto";
 
-  // change maximize button to minimize button
-  config.btnList["popupeditor"] = [ 'Minimize Editor', 'images/fullscreen_minimize.gif', true,
-                                    function() { window.close(); } ];
+	// change maximize button to minimize button
+	config.btnList["popupeditor"] = [ 'Minimize Editor', _editor_url + 'images/fullscreen_minimize.gif', true,
+					  function() { window.close(); } ];
 
-  // generate editor and resize it
-  editor = new HTMLArea("editor", config);
-  editor.generate();
-  editor._iframe.style.width = "100%";
-  editor._textArea.style.width = "100%";
-  resize_editor();
+	// generate editor and resize it
+	editor = new HTMLArea("editor", config);
 
-  // set child window contents and event handlers, after a small delay
-  setTimeout(function() {
-    editor.setHTML(parent_object.getInnerHTML());
+	// register the plugins, if any
+	for (var i in parent_object.plugins) {
+		var plugin = parent_object.plugins[i];
+		editor.registerPlugin2(plugin.name, plugin.args);
+	}
+	// and restore the original toolbar
+        config.toolbar = parent_object.config.toolbar;
+	editor.generate();
+	editor._iframe.style.width = "100%";
+	editor._textArea.style.width = "100%";
+	resize_editor();
 
-    // switch mode if needed
-    if (parent_object._mode == "textmode") { editor.setMode("textmode"); }
+	editor.doctype = parent_object.doctype;
 
-    // continuously update parent editor window
-    setInterval(update_parent, 500);
+	// set child window contents and event handlers, after a small delay
+	setTimeout(function() {
+			   editor.setHTML(parent_object.getInnerHTML());
 
-    // setup event handlers
-    document.body.onkeypress = _CloseOnEsc;
-    editor._doc.body.onkeypress = _CloseOnEsc;
-    editor._textArea.onkeypress = _CloseOnEsc;
-    window.onresize = resize_editor;
-  }, 333);                      // give it some time to meet the new frame
+			   // switch mode if needed
+			   if (parent_object._mode == "textmode") { editor.setMode("textmode"); }
+
+			   // continuously update parent editor window
+			   setInterval(update_parent, 500);
+
+			   // setup event handlers
+			   document.body.onkeypress = _CloseOnEsc;
+			   editor._doc.body.onkeypress = _CloseOnEsc;
+			   editor._textArea.onkeypress = _CloseOnEsc;
+			   window.onresize = resize_editor;
+		   }, 333);			 // give it some time to meet the new frame
 }
 
 /* ---------------------------------------------------------------------- *\
-  Function    : update_parent
-  Description : update parent window editor field with contents from child window
-\* ---------------------------------------------------------------------- */
+   Function    : update_parent
+   Description : update parent window editor field with contents from child window
+   \* ---------------------------------------------------------------------- */
 
 function update_parent() {
-  // use the fast version
-  parent_object.setHTML(editor.getInnerHTML());
+	// use the fast version
+	parent_object.setHTML(editor.getInnerHTML());
 }
 
-
-</script>
-</head>
-<body scroll="no" onload="init()" onunload="update_parent()">
-
-<form style="margin: 0px; border: 1px solid; border-color: threedshadow threedhighlight threedhighlight threedshadow;">
-<textarea name="editor" id="editor" style="width:100%; height:300px">&nbsp;</textarea>
-</form>
-
-</body></html>
+    </script>
+    <style type="text/css"> html, body { height: 100%; margin: 0px; border: 0px; background-color: buttonface; } </style>
+  </head>
+  <body scroll="no" onload="setTimeout(function(){init();}, 500)" onunload="update_parent()">
+    <form style="margin: 0px; border: 1px solid; border-color: threedshadow threedhighlight threedhighlight threedshadow;">
+      <textarea name="editor" id="editor" style="width:100%; height:300px">&nbsp;</textarea>
+    </form>
+  </body>
+</html>
diff --git a/phpgwapi/js/htmlarea/popups/insert_image.html b/phpgwapi/js/htmlarea/popups/insert_image.html
index 55e56a0c0e..1a0e9604a0 100644
--- a/phpgwapi/js/htmlarea/popups/insert_image.html
+++ b/phpgwapi/js/htmlarea/popups/insert_image.html
@@ -1,4 +1,4 @@
-<html style="width: 398; height: 218">
+<html>
 
 <head>
   <title>Insert Image</title>
@@ -6,17 +6,27 @@
 <script type="text/javascript" src="popup.js"></script>
 
 <script type="text/javascript">
-var preview_window = null;
+
+window.resizeTo(400, 100);
 
 function Init() {
   __dlg_init();
+  var param = window.dialogArguments;
+  if (param) {
+      document.getElementById("f_url").value = param["f_url"];
+      document.getElementById("f_alt").value = param["f_alt"];
+      document.getElementById("f_border").value = param["f_border"];
+      document.getElementById("f_align").value = param["f_align"];
+      document.getElementById("f_vert").value = param["f_vert"];
+      document.getElementById("f_horiz").value = param["f_horiz"];
+      window.ipreview.location.replace(param.f_url);
+  }
   document.getElementById("f_url").focus();
 };
 
 function onOK() {
   var required = {
-    "f_url": "You must enter the URL",
-    "f_alt": "Please enter the alternate text"
+    "f_url": "You must enter the URL"
   };
   for (var i in required) {
     var el = document.getElementById(i);
@@ -35,23 +45,16 @@ function onOK() {
     var el = document.getElementById(id);
     param[id] = el.value;
   }
-  if (preview_window) {
-    preview_window.close();
-  }
   __dlg_close(param);
   return false;
 };
 
 function onCancel() {
-  if (preview_window) {
-    preview_window.close();
-  }
   __dlg_close(null);
   return false;
 };
 
 function onPreview() {
-  alert("FIXME: preview needs rewritten:\n  show the image inside this window instead of opening a new one.");
   var f_url = document.getElementById("f_url");
   var url = f_url.value;
   if (!url) {
@@ -59,40 +62,7 @@ function onPreview() {
     f_url.focus();
     return false;
   }
-  var img = new Image();
-  img.src = url;
-  var win = null;
-  if (!document.all) {
-    win = window.open("about:blank", "ha_imgpreview", "toolbar=no,menubar=no,personalbar=no,innerWidth=100,innerHeight=100,scrollbars=no,resizable=yes");
-  } else {
-    win = window.open("about:blank", "ha_imgpreview", "channelmode=no,directories=no,height=100,width=100,location=no,menubar=no,resizable=yes,scrollbars=no,toolbar=no");
-  }
-  preview_window = win;
-  var doc = win.document;
-  var body = doc.body;
-  if (body) {
-    body.innerHTML = "";
-    body.style.padding = "0px";
-    body.style.margin = "0px";
-    var el = doc.createElement("img");
-    el.src = url;
-
-    var table = doc.createElement("table");
-    body.appendChild(table);
-    table.style.width = "100%";
-    table.style.height = "100%";
-    var tbody = doc.createElement("tbody");
-    table.appendChild(tbody);
-    var tr = doc.createElement("tr");
-    tbody.appendChild(tr);
-    var td = doc.createElement("td");
-    tr.appendChild(td);
-    td.style.textAlign = "center";
-
-    td.appendChild(el);
-    win.resizeTo(el.offsetWidth + 30, el.offsetHeight + 30);
-  }
-  win.focus();
+  window.ipreview.location.replace(url);
   return false;
 };
 </script>
@@ -131,7 +101,7 @@ form { padding: 0px; margin: 0px; }
 <body onload="Init()">
 
 <div class="title">Insert Image</div>
-
+<!--- new stuff --->
 <form action="" method="get">
 <table border="0" width="100%" style="padding: 0px; margin: 0px">
   <tbody>
@@ -203,14 +173,19 @@ title="Vertical padding" />
 <div class="space"></div>
 
 </fieldset>
-
-<div style="margin-top: 85px; text-align: right;">
-<hr />
-<button type="button" name="ok" onclick="return onOK();">OK</button>
-<button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-</div>
-
+<br clear="all" />
+<table width="100%" style="margin-bottom: 0.2em">
+ <tr>
+  <td valign="bottom">
+    Image Preview:<br />
+    <iframe name="ipreview" id="ipreview" frameborder="0" style="border : 1px solid gray;" height="200" width="300" src=""></iframe>
+  </td>
+  <td valign="bottom" style="text-align: right">
+    <button type="button" name="ok" onclick="return onOK();">OK</button><br>
+    <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
+  </td>
+ </tr>
+</table>
 </form>
-
 </body>
 </html>
diff --git a/phpgwapi/js/htmlarea/popups/insert_table.html b/phpgwapi/js/htmlarea/popups/insert_table.html
index efdf3f0442..508dbf8e15 100644
--- a/phpgwapi/js/htmlarea/popups/insert_table.html
+++ b/phpgwapi/js/htmlarea/popups/insert_table.html
@@ -1,4 +1,4 @@
-<html style="width: 398; height: 218">
+<html>
 
 <head>
   <title>Insert Table</title>
@@ -7,6 +7,8 @@
 
 <script type="text/javascript">
 
+window.resizeTo(400, 100);
+
 function Init() {
   __dlg_init();
   document.getElementById("f_rows").focus();
@@ -161,8 +163,7 @@ title="Space between content and border in cell" />
 
 </fieldset>
 
-<div style="margin-top: 85px; text-align: right;">
-<hr />
+<div style="margin-top: 85px; border-top: 1px solid #999; padding: 2px; text-align: right;">
 <button type="button" name="ok" onclick="return onOK();">OK</button>
 <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
 </div>
diff --git a/phpgwapi/js/htmlarea/popups/link.html b/phpgwapi/js/htmlarea/popups/link.html
new file mode 100644
index 0000000000..4234019fe1
--- /dev/null
+++ b/phpgwapi/js/htmlarea/popups/link.html
@@ -0,0 +1,142 @@
+<html>
+
+<head>
+  <title>Insert/Modify Link</title>
+  <script type="text/javascript" src="popup.js"></script>
+  <script type="text/javascript">
+    window.resizeTo(400, 200);
+
+//I18N = window.opener.HTMLArea.I18N.dialogs;
+
+function i18n(str) {
+//  return (I18N[str] || str);
+};
+
+function onTargetChanged() {
+  var f = document.getElementById("f_other_target");
+  if (this.value == "_other") {
+    f.style.visibility = "visible";
+    f.select();
+    f.focus();
+  } else f.style.visibility = "hidden";
+};
+
+function Init() {
+  __dlg_translate(I18N);
+  __dlg_init();
+  var param = window.dialogArguments;
+  var target_select = document.getElementById("f_target");
+  if (param) {
+      document.getElementById("f_href").value = param["f_href"];
+      document.getElementById("f_title").value = param["f_title"];
+      comboSelectValue(target_select, param["f_target"]);
+      if (target_select.value != param.f_target) {
+        var opt = document.createElement("option");
+        opt.value = param.f_target;
+        opt.innerHTML = opt.value;
+        target_select.appendChild(opt);
+        opt.selected = true;
+      }
+  }
+  var opt = document.createElement("option");
+  opt.value = "_other";
+  opt.innerHTML = i18n("Other");
+  target_select.appendChild(opt);
+  target_select.onchange = onTargetChanged;
+  document.getElementById("f_href").focus();
+  document.getElementById("f_href").select();
+};
+
+function onOK() {
+  var required = {
+    "f_href": i18n("You must enter the URL where this link points to")
+  };
+  for (var i in required) {
+    var el = document.getElementById(i);
+    if (!el.value) {
+      alert(required[i]);
+      el.focus();
+      return false;
+    }
+  }
+  // pass data back to the calling window
+  var fields = ["f_href", "f_title", "f_target" ];
+  var param = new Object();
+  for (var i in fields) {
+    var id = fields[i];
+    var el = document.getElementById(id);
+    param[id] = el.value;
+  }
+  if (param.f_target == "_other")
+    param.f_target = document.getElementById("f_other_target").value;
+  __dlg_close(param);
+  return false;
+};
+
+function onCancel() {
+  __dlg_close(null);
+  return false;
+};
+
+</script>
+
+<style type="text/css">
+html, body {
+  background: ButtonFace;
+  color: ButtonText;
+  font: 11px Tahoma,Verdana,sans-serif;
+  margin: 0px;
+  padding: 0px;
+}
+body { padding: 5px; }
+table {
+  font: 11px Tahoma,Verdana,sans-serif;
+}
+select, input, button { font: 11px Tahoma,Verdana,sans-serif; }
+button { width: 70px; }
+table .label { text-align: right; width: 8em; }
+
+.title { background: #ddf; color: #000; font-weight: bold; font-size: 120%; padding: 3px 10px; margin-bottom: 10px;
+border-bottom: 1px solid black; letter-spacing: 2px;
+}
+
+#buttons {
+      margin-top: 1em; border-top: 1px solid #999;
+      padding: 2px; text-align: right;
+}
+</style>
+
+</head>
+
+<body onload="Init()">
+<div class="title">Insert/Modify Link</div>
+
+<table border="0" style="width: 100%;">
+  <tr>
+    <td class="label">URL:</td>
+    <td><input type="text" id="f_href" style="width: 100%" /></td>
+  </tr>
+  <tr>
+    <td class="label">Title (tooltip):</td>
+    <td><input type="text" id="f_title" style="width: 100%" /></td>
+  </tr>
+  <tr>
+    <td class="label">Target:</td>
+    <td><select id="f_target">
+      <option value="">None (use implicit)</option>
+      <option value="_blank">New window (_blank)</option>
+      <option value="_self">Same frame (_self)</option>
+      <option value="_top">Top frame (_top)</option>
+    </select>
+    <input type="text" name="f_other_target" id="f_other_target" size="10" style="visibility: hidden" />
+    </td>
+  </tr>
+</table>
+
+<div id="buttons">
+  <button type="button" name="ok" onclick="return onOK();">OK</button>
+  <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
+</div>
+
+</body>
+</html>
diff --git a/phpgwapi/js/htmlarea/popups/popup.js b/phpgwapi/js/htmlarea/popups/popup.js
index 68cbeb2615..15f5268652 100644
--- a/phpgwapi/js/htmlarea/popups/popup.js
+++ b/phpgwapi/js/htmlarea/popups/popup.js
@@ -1,42 +1,109 @@
-function __dlg_onclose() {
-	if (!document.all) {
-		opener.Dialog._return(null);
+// htmlArea v3.0 - Copyright (c) 2002, 2003 interactivetools.com, inc.
+// This copyright notice MUST stay intact for use (see license.txt).
+//
+// Portions (c) dynarch.com, 2003
+//
+// A free WYSIWYG editor replacement for <textarea> fields.
+// For full source code and docs, visit http://www.interactivetools.com/
+//
+// Version 3.0 developed by Mihai Bazon.
+//   http://dynarch.com/mishoo
+//
+// $Id$
+
+function getAbsolutePos(el) {
+	var r = { x: el.offsetLeft, y: el.offsetTop };
+	if (el.offsetParent) {
+		var tmp = getAbsolutePos(el.offsetParent);
+		r.x += tmp.x;
+		r.y += tmp.y;
 	}
+	return r;
 };
 
-function __dlg_init() {
+function comboSelectValue(c, val) {
+	var ops = c.getElementsByTagName("option");
+	for (var i = ops.length; --i >= 0;) {
+		var op = ops[i];
+		op.selected = (op.value == val);
+	}
+	c.value = val;
+};
+
+function __dlg_onclose() {
+	opener.Dialog._return(null);
+};
+
+function __dlg_init(bottom) {
+	var body = document.body;
+	var body_height = 0;
+	if (typeof bottom == "undefined") {
+		var div = document.createElement("div");
+		body.appendChild(div);
+		var pos = getAbsolutePos(div);
+		body_height = pos.y;
+	} else {
+		var pos = getAbsolutePos(bottom);
+		body_height = pos.y + bottom.offsetHeight;
+	}
+	window.dialogArguments = opener.Dialog._arguments;
 	if (!document.all) {
-		// init dialogArguments, as IE gets it
-		window.dialogArguments = opener.Dialog._arguments;
 		window.sizeToContent();
 		window.sizeToContent();	// for reasons beyond understanding,
 					// only if we call it twice we get the
 					// correct size.
 		window.addEventListener("unload", __dlg_onclose, true);
 		// center on parent
-		var px1 = opener.screenX;
-		var px2 = opener.screenX + opener.outerWidth;
-		var py1 = opener.screenY;
-		var py2 = opener.screenY + opener.outerHeight;
-		var x = (px2 - px1 - window.outerWidth) / 2;
-		var y = (py2 - py1 - window.outerHeight) / 2;
+		var x = opener.screenX + (opener.outerWidth - window.outerWidth) / 2;
+		var y = opener.screenY + (opener.outerHeight - window.outerHeight) / 2;
 		window.moveTo(x, y);
-		var body = document.body;
-		window.innerHeight = body.offsetHeight;
-		window.innerWidth = body.offsetWidth;
+		window.innerWidth = body.offsetWidth + 5;
+		window.innerHeight = body_height + 2;
 	} else {
-		var body = document.body;
-		window.dialogHeight = body.offsetHeight + 50 + "px";
-		window.dialogWidth = body.offsetWidth + "px";
+		// window.dialogHeight = body.offsetHeight + 50 + "px";
+		// window.dialogWidth = body.offsetWidth + "px";
+		window.resizeTo(body.offsetWidth, body_height);
+		var ch = body.clientHeight;
+		var cw = body.clientWidth;
+		window.resizeBy(body.offsetWidth - cw, body_height - ch);
+		var W = body.offsetWidth;
+		var H = 2 * body_height - ch;
+		var x = (screen.availWidth - W) / 2;
+		var y = (screen.availHeight - H) / 2;
+		window.moveTo(x, y);
 	}
+	document.body.onkeypress = __dlg_close_on_esc;
+};
+
+function __dlg_translate(i18n) {
+	var types = ["span", "option", "td", "button", "div"];
+	for (var type in types) {
+		var spans = document.getElementsByTagName(types[type]);
+		for (var i = spans.length; --i >= 0;) {
+			var span = spans[i];
+			if (span.firstChild && span.firstChild.data) {
+				var txt = i18n[span.firstChild.data];
+				if (txt)
+					span.firstChild.data = txt;
+			}
+		}
+	}
+	var txt = i18n[document.title];
+	if (txt)
+		document.title = txt;
 };
 
 // closes the dialog and passes the return info upper.
 function __dlg_close(val) {
-	if (document.all) {	// IE
-		window.returnValue = val;
-	} else {
-		opener.Dialog._return(val);
-	}
+	opener.Dialog._return(val);
 	window.close();
 };
+
+function __dlg_close_on_esc(ev) {
+	ev || (ev = window.event);
+	if (ev.keyCode == 27) {
+		window.close();
+		return false;
+	}
+	return true;
+};
diff --git a/phpgwapi/js/htmlarea/popups/select_color.html b/phpgwapi/js/htmlarea/popups/select_color.html
index d1fd26b576..bc3d77964c 100644
--- a/phpgwapi/js/htmlarea/popups/select_color.html
+++ b/phpgwapi/js/htmlarea/popups/select_color.html
@@ -1,11 +1,12 @@
 <!-- note: this version of the color picker is optimized for IE 5.5+ only -->
 
-<html style="width: 238px; height: 182px"><head><title>Select Color</title>
+<html><head><title>Select Color</title>
 
 <script type="text/javascript" src="popup.js"></script>
 
 <script type="text/javascript">
 
+window.resizeTo(240, 182);
 function _CloseOnEsc() {
   if (event.keyCode == 27) { window.close(); return; }
 }
diff --git a/phpgwapi/js/htmlarea/popupwin.js b/phpgwapi/js/htmlarea/popupwin.js
index 8d37f254fe..0e0c4268ff 100644
--- a/phpgwapi/js/htmlarea/popupwin.js
+++ b/phpgwapi/js/htmlarea/popupwin.js
@@ -1,8 +1,11 @@
+// (c) dynarch.com 2003-2004
+// Distributed under the same terms as HTMLArea itself.
+
 function PopupWin(editor, title, handler, initFunction) {
 	this.editor = editor;
 	this.handler = handler;
 	var dlg = window.open("", "__ha_dialog",
-			      "toolbar=no,menubar=no,personalbar=no,width=600,height=600," +
+			      "toolbar=no,menubar=no,personalbar=no,width=600,height=600,left=20,top=40" +
 			      "scrollbars=no,resizable=no");
 	this.window = dlg;
 	var doc = dlg.document;
@@ -13,6 +16,17 @@ function PopupWin(editor, title, handler, initFunction) {
 	if (base && base.match(/(.*)\/([^\/]+)/)) {
 		base = RegExp.$1 + "/";
 	}
+	if (typeof _editor_url != "undefined" && !/^\//.test(_editor_url)) {
+		// _editor_url doesn't start with '/' which means it's relative
+		// FIXME: there's a problem here, it could be http:// which
+		// doesn't start with slash but it's not relative either.
+		base += _editor_url;
+	} else
+		base = _editor_url;
+	if (!/\/$/.test(base)) {
+		// base does not end in slash, add it now
+		base += '/';
+	}
 	this.baseURL = base;
 
 	doc.open();
diff --git a/phpgwapi/js/htmlarea/reference.html b/phpgwapi/js/htmlarea/reference.html
index 81d617f6a3..0760a73ace 100644
--- a/phpgwapi/js/htmlarea/reference.html
+++ b/phpgwapi/js/htmlarea/reference.html
@@ -1,5 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.2//EN">
 <html> <head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>HTMLArea-3.0 Reference</title>
 
 <style type="text/css">
@@ -67,6 +68,10 @@ padding: 5px; text-align: center; }
 
 </style>
 
+<script type="text/javascript">
+  _editor_url = './';
+  _editor_lang = 'en';
+</script>
 <script type="text/javascript" src="htmlarea.js"></script>
 <script type="text/javascript" src="dialog.js"></script>
 <script tyle="text/javascript" src="lang/en.js"></script>
@@ -116,7 +121,7 @@ other web based WYSIWYG editors are as follows:</p>
   <li>It's lightweight, fast loading and can transform a regular textarea
   into a rich-text editor with a single line of JavaScript.</li>
   <li>Generates clean, valid HTML.</li>
-  <li>It's 100% backwards compatible with older or non-supported browsers
+  <li>It degrades gracefully to older or non-supported browsers
   (they get the original textarea field).</li>
   <li>It's free and can be incorporated into any free or commercial
   program.</li>
@@ -145,8 +150,8 @@ href="http://mozilla.org">Mozilla</a> &gt;= 1.3-Beta</span> on any platform.
 Any browser based on <a href="http://mozilla.org/newlayout">Gecko</a> will
 also work, provided that Gecko version is at least the one included in
 Mozilla-1.3-Beta (for example, <a
-href="http://galeon.sf.net">Galeon-1.2.8</a>).  However, it is backwards
-compatible with other browsers. They will get a regular textarea field
+href="http://galeon.sf.net">Galeon-1.2.8</a>).  However, it degrades
+gracefully to other browsers. They will get a regular textarea field
 instead of a WYSIWYG editor.</p>
 
 <h3>Can I see an example of what it looks like?</h3>
@@ -171,7 +176,7 @@ today!</u></b></font><br /></p>
 other HTMLArea users?</h3>
 
 <p>You can find out more about HTMLArea and download the latest version on
-the <a href="http://www.interactivetools.com/products/htmlarea/">HTMLArea
+the <a href="http://dynarch.com/htmlarea/">HTMLArea
 homepage</a> and you can talk to other HTMLArea users and post any comments
 or suggestions you have in the <a
 href="http://www.interactivetools.com/iforum/Open_Source_C3/htmlArea_v3.0_-_Alpha_Release_F14/"
@@ -192,6 +197,7 @@ href="http://www.interactivetools.com/iforum/Open_Source_C3/htmlArea_v3.0_-_Alph
   <li>CTRL-R -- justify right</li>
   <li>CTRL-J -- justify full</li>
   <li>CTRL-1 .. CTRL-6 -- headings (&lt;h1&gt; .. &lt;h6&gt;)</li>
+  <li>CTRL-0 (zero) -- clean content pasted from Word</li>
 </ul>
 
 <h2>Installation</h2>
@@ -211,7 +217,7 @@ Just follow these steps.</p>
   NOT inside the cgi-bin).</li>
   <li>Transfer all the HTMLArea files from your local computer into the
   /htmlarea/ folder on your website.</li>
-  <li>Open the example page /htmlarea/example.html with your browser to make
+  <li>Open the example page /htmlarea/examples/core.html with your browser to make
   sure everything works.</li>
 </ol>
 
@@ -221,32 +227,23 @@ to do that.</p>
 
 <ol>
 
+  <li>Define some global variables.  "_editor_url" has to be the absolute
+  URL where HTMLArea resides within your
+  website; as we discussed, this would be “/htmlarea/”.  "_editor_lang" must
+  be the language code in which you want HTMLArea to appear.  This defaults
+  to "en" (English); for a list of supported languages, please look into
+  the "lang" subdirectory in the distribution.
+  <pre class="code"
+  ><span class="function-name">&lt;</span><span class="html-tag">script</span> <span class="variable-name">type=</span><span class="string">&quot;text/javascript&quot;</span><span class="function-name">&gt;</span>
+   _editor_url = <span class="string">&quot;/htmlarea/&quot;</span>;
+   _editor_lang = <span class="string">&quot;en&quot;</span>;
+<span class="function-name">&lt;</span><span class="html-tag">/script</span><span class="function-name">&gt;</span></pre>
+
   <li>Include the "htmlarea.js" script:
   <pre class="code"
   ><span class="function-name">&lt;</span><span class="html-tag">script</span> <span class="variable-name">type=</span><span class="string">&quot;text/javascript&quot;</span> <span class="variable-name">src=</span><span class="string">&quot;/htmlarea/htmlarea.js&quot;</span><span class="function-name">&gt;</span><span class="paren-face-match">&lt;</span><span class="html-tag">/script</span><span class="paren-face-match">&gt;</span></pre>
   </li>
 
-  <li>If you are using popup dialogs, i.e. for insert table, insert image,
-  select color, then you need to include the "dialog.js" file.  This is
-  recommended anyway.
-  <pre class="code"
-  ><span class="function-name">&lt;</span><span class="html-tag">script</span> <span class="variable-name">type=</span><span class="string">&quot;text/javascript&quot;</span> <span class="variable-name">src=</span><span class="string">&quot;/htmlarea/dialog.js&quot;</span><span class="paren-face-match">&gt;</span><span class="function-name">&lt;</span><span class="html-tag">/script</span><span class="function-name">&gt;</span></pre>
-  </li>
-
-  <li>Include the corresponding language definition file.  <span
-  class="note">Note</span>:
-  internationalization is available only since version 3.0.  Check the files
-  containing "lang" in the distribution ZIP.  If your preferred language is
-  not there yet and you decide to write it, please consider sending it to
-  us so that it gets included in the next release.
-  <pre class="code"
-  ><span class="function-name">&lt;</span><span class="html-tag">script</span> <span class="variable-name">type=</span><span class="string">&quot;text/javascript&quot;</span> <span class="variable-name">src=</span><span class="string">&quot;/htmlarea/lang/en.js&quot;</span><span class="function-name">&gt;</span><span class="paren-face-match">&lt;</span><span class="html-tag">/script</span><span class="paren-face-match">&gt;</span></pre>
-
-  <li>Include the stylesheet (be sure to put this inside the HEAD tag):
-  <pre class="code"
-  ><span class="function-name">&lt;</span><span class="html-tag">style</span> <span class="variable-name">type=</span><span class="string">&quot;text/css&quot;</span><span class="function-name">&gt;</span>@import url<span class="function-name">(</span>/htmlarea/htmlarea.css<span class="function-name">)</span><span class="paren-face-match">&lt;</span><span class="html-tag">/style</span><span class="paren-face-match">&gt;</span></pre>
-  </li>
-
   <li><p>If you want to change all your &lt;textarea&gt;-s into
   HTMLArea-s then you can use the simplest way to create HTMLArea:</p>
   <pre class="code"
@@ -264,6 +261,12 @@ to do that.</p>
 
 </ol>
 
+<p>This section applies to HTMLArea-3.0 release candidate 1 or later; prior
+to this version, one needed to include more files; however, now HTMLArea is
+able to include other files too (such as stylesheet, language definition
+file, etc.) so you only need to define the editor path and load
+"htmlarea.js".  Nice, eh? ;-)</p>
+
 <h3>I want to change the editor settings, how do I do that?</h3>
 
 <p>While it's true that all you need is one line of JavaScript to create an
@@ -289,7 +292,7 @@ config.height = '<span class="string">200px</span>';
 
 <p><span class="warning">Important:</span> It's recommended that you add
 custom features and configuration to a separate file.  This will ensure you
-that when we release a new official version of HTMLArea you'll have no
+that when we release a new official version of HTMLArea you'll have less
 trouble upgrading it.</p>
 
 <h3>How do I customize the toolbar?</h3>
@@ -345,7 +348,7 @@ These three have the following meaning, and need not be present in
 
 <p><span class="warning">Important:</span> It's recommended that you add
 custom features and configuration to a separate file.  This will ensure you
-that when we release a new official version of HTMLArea you'll have no
+that when we release a new official version of HTMLArea you'll have less
 trouble upgrading it.</p>
 
 <h3>How do I create custom buttons?</h3>
@@ -454,7 +457,7 @@ button.</p>
 
 <p><span class="warning">Important:</span> It's recommended that you add
 custom features and configuration to a separate file.  This will ensure you
-that when we release a new official version of HTMLArea you'll have no
+that when we release a new official version of HTMLArea you'll have less
 trouble upgrading it.</p>
 
 <h4 id="btnex">A complete example</h4>
@@ -507,16 +510,14 @@ config.registerButton(&quot;<span class="string">my-hilite</span>&quot;, &quot;<
 
 <hr />
 <address>&copy; <a href="http://interactivetools.com" title="Visit our website"
->InteractiveTools.com</a> 2002, 2003.
+>InteractiveTools.com</a> 2002-2004.
 <br />
+© <a href="http://dynarch.com">dynarch.com</a> 2003-2004<br />
 HTMLArea v3.0 developed by <a
-href="http://students.infoiasi.ro/~mishoo">Mihai Bazon</a> for
-InteractiveTools.com.
+href="http://dynarch.com/mishoo/">Mihai Bazon</a>.
 <br />
 Documentation written by Mihai Bazon.
 </address>
-<!-- hhmts start -->
-Last modified on Sun Aug  3 16:11:23 2003
-<!-- hhmts end -->
+<!-- hhmts start --> Last modified: Wed Jan 28 12:18:23 EET 2004 <!-- hhmts end -->
 <!-- doc-lang: English -->
 </body> </html>
diff --git a/phpgwapi/js/htmlarea/release-notes.html b/phpgwapi/js/htmlarea/release-notes.html
index f37d40a160..86d476b1eb 100644
--- a/phpgwapi/js/htmlarea/release-notes.html
+++ b/phpgwapi/js/htmlarea/release-notes.html
@@ -1,15 +1,74 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.2//EN">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <title>HTMLArea-3.0-beta release notes</title>
+    <title><% $basename %> release notes</title>
   </head>
 
   <body>
 
-    <h1>HTMLArea-3.0-beta release notes</h1>
+    <h1><% $basename %> release notes</h1>
 
-    <p>This release was compiled on Aug 11, 2003 [21:30] GMT.</p>
+    <p>This release was compiled on <% $time %>.</p>
 
+    <h2>3.0-rc1</h2>
+
+    <p>Changes since 3.0-Beta:</p>
+
+    <ul>
+      <li>
+        ContextMenu plugin (provides a nice context menu with common
+        operations, including table ops, link ops, etc.)
+      </li>
+      <li>
+        CSS plugin (provides an easy way to insert/change CSS classes)
+      </li>
+      <li>
+        FullPage plugin (allows HTMLArea to edit a whole HTML file,
+        not only the content within &lt;body&gt;.)
+      </li>
+      <li>
+        Better plugin support (they register information about
+        themselves with the editor; can register event handlers for
+        the editor, etc.)
+      </li>
+      <li>
+        New about box ;-)
+      </li>
+      <li>
+        Word cleaner (can be enabled to automatically kill Word crap
+        on paste (see Config.killWordOnPaste); otherwise accessible by
+        pressing CTRL-0 in the editor; a toolbar button will come up
+        soon)
+      </li>
+      <li>
+        Image preview in "insert image" dialog.  Also allows
+        modification of current image, if selected.
+      </li>
+      <li>
+        New "insert link" dialog, allows target and title
+        specification, allows editing links.
+      </li>
+      <li>
+        Implemented support for text direction (left-to-right or
+        right-to-left).
+      </li>
+      <li>
+        <a href="ChangeLog">Full CVS ChangeLog</a> is now
+        automatically generated from the CVS logs.
+      </li>
+      <li>
+        Lots of bug fixes!
+      </li>
+    </ul>
+
+    <p>I don't have the power to go through the <a
+href="http://sourceforge.net/tracker/?atid=525656&group_id=69750&func=browse">bug
+system</a> at SourceForge
+    now.  Some of the bugs reported there may be fixed; I'll update
+    their status, some other time.  If you reported bugs there and now
+    find them to be fixed, please let me know.</p>
+
+    <h2>3.0-Beta</h2>
 
     <p>Changes since 3.0-Alpha:</p>
 
@@ -35,7 +94,7 @@
       <li>Cut, copy, paste, undo, redo buttons.</li>
 
     </ul>
-
+<%doc>
     <h2>Rationale for Beta</h2>
 
     <p>Why was this released as "Beta"?  The code is quite stable and it
@@ -67,16 +126,23 @@
       <li><strong>Documentation</strong>.</li>
 
     </ol>
-
-
+</%doc>
     <hr />
-    <address><a href="http://students.infoiasi.ro/~mishoo/">Mihai Bazon</a></address>
+    <address><a href="http://dynarch.com/mishoo/">Mihai Bazon</a></address>
 <!-- Created: Sun Aug  3 16:55:08 EEST 2003 -->
-<!-- hhmts start -->
-Last modified on Sun Aug 10 19:31:39 2003
-<!-- hhmts end -->
+<!-- hhmts start --> Last modified: Wed Jan 28 12:53:03 EET 2004 <!-- hhmts end -->
 <!-- doc-lang: English -->
   </body>
 </html>
 
+<%ARGS>
+  $project => 'HTMLArea'
+  $version => '3.0'
+  $release => 'rc1'
+  $basename => 'HTMLArea-3.0-rc1'
+</%ARGS>
 
+<%INIT>;
+use POSIX qw(strftime);
+my $time = strftime '%b %e, %Y [%H:%M] GMT', gmtime;
+</%INIT>