Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacsimage/editor_plugin.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacsimage/editor_plugin.js,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacsimage/editor_plugin.js	25 Jan 2008 21:44:07 -0000	1.1
+++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacsimage/editor_plugin.js	19 May 2009 17:16:13 -0000	1.1.2.1
@@ -1,146 +1,83 @@
-
 /**
  * $Id$
  *
  * @author Moxiecode
- * @copyright Copyright � 2004-2007, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright � 2004-2008, Moxiecode Systems AB, All rights reserved.
  */
 
-/* Import plugin specific language pack */
-// tinyMCE.importPluginLanguagePack('advimage');
+(function() {
+	// Load plugin specific language pack
+	tinymce.PluginManager.requireLangPack('oacsimage');
 
-var TinyMCE_OacsImagePlugin = {
-	getInfo : function() {
-		return {
-			longname : 'Oacs image',
-			author : 'SolutionGrove, Moxiecde Systems AB',
-			authorurl : 'http://tinymce.moxiecode.com',
-			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_oacsimage.html',
-			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
-		};
-	},
+	tinymce.create('tinymce.plugins.OacsImage', {
+		/**
+		 * Initializes the plugin, this will be executed after the plugin has been created.
+		 * This call is done before the editor instance has finished it's initialization so use the onInit event
+		 * of the editor instance to intercept that event.
+		 *
+		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+		 * @param {string} url Absolute URL to where the plugin is located.
+		 */
+		init : function(ed, url) {
+			// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
+			ed.addCommand('mceOacsImage', function() {
+			    var elm = tinyMCE.activeEditor.selection.getNode();
+			    if (elm != null && ed.dom.getAttrib(elm, 'class').indexOf('mceItem') != -1)
+                                return true;
 
-	getControlHTML : function(cn) {
-		switch (cn) {
-			case "image":
-				return tinyMCE.getButtonHTML(cn, 'lang_image_desc', '{$themeurl}/images/image.gif', 'mceOacsImage');
-		}
+			    ed.windowManager.open({
+                                url:'/acs-templating/scripts/xinha/attach-image',
+                                width: 380,
+                                height: 450,
+                                movable: true,
+                                inline: true});
 
-		return "";
-	},
+			    return true;
 
-	execCommand : function(editor_id, element, command, user_interface, value) {
-		switch (command) {
-			case "mceOacsImage":
-				var template = new Array();
+                            });
 
-				template['file']   = '/acs-templating/scripts/xinha/attach-image';
-				template['width']  = 500;
-				template['height'] = 400;
+			// Register example button
+			ed.addButton('image', {
+				title : 'oacsimage.desc',
+				cmd : 'mceOacsImage'
+			});
 
+			// Add a node change handler, selects the button in the UI when a image is selected
+			ed.onNodeChange.add(function(ed, cm, n) {
+			    cm.setActive('image',n.nameName == "IMG");
+                                            });
+                },
+		/**
+		 * Creates control instances based in the incomming name. This method is normally not
+		 * needed since the addButton method of the tinymce.Editor class is a more easy way of adding buttons
+		 * but you sometimes need to create more complex controls like listboxes, split buttons etc then this
+		 * method can be used to create those.
+		 *
+		 * @param {String} n Name of the control to create.
+		 * @param {tinymce.ControlManager} cm Control manager to use inorder to create new control.
+		 * @return {tinymce.ui.Control} New control instance or null if no control was created.
+		 */
+		createControl : function(n, cm) {
+			return null;
+		},
 
-				var inst = tinyMCE.getInstanceById(editor_id);
-				var elm = inst.getFocusElement();
-
-				if (elm != null && tinyMCE.getAttrib(elm, 'class').indexOf('mceItem') != -1)
-					return true;
-
-				tinyMCE.openWindow(template, {editor_id : editor_id, inline : "yes"});
-
-				return true;
+		/**
+		 * Returns information about the plugin as a name/value array.
+		 * The current keys are longname, author, authorurl, infourl and version.
+		 *
+		 * @return {Object} Name/value array containing information about the plugin.
+		 */
+		getInfo : function() {
+		    return {
+                        longname : 'Oacs image',
+			author : 'SolutionGrove, Moxiecde Systems AB',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_oacsimage.html',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		    };
 		}
+	});
 
-		return false;
-	},
-
-	cleanup : function(type, content) {
-		switch (type) {
-			case "insert_to_editor_dom":
-				var imgs = content.getElementsByTagName("img"), src, i;
-				for (i=0; i<imgs.length; i++) {
-					var onmouseover = tinyMCE.cleanupEventStr(tinyMCE.getAttrib(imgs[i], 'onmouseover'));
-					var onmouseout = tinyMCE.cleanupEventStr(tinyMCE.getAttrib(imgs[i], 'onmouseout'));
-
-					if ((src = this._getImageSrc(onmouseover)) != "") {
-						if (tinyMCE.getParam('convert_urls'))
-							src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], src);
-
-						imgs[i].setAttribute('onmouseover', "this.src='" + src + "';");
-					}
-
-					if ((src = this._getImageSrc(onmouseout)) != "") {
-						if (tinyMCE.getParam('convert_urls'))
-							src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], src);
-
-						imgs[i].setAttribute('onmouseout', "this.src='" + src + "';");
-					}
-				}
-				break;
-
-			case "get_from_editor_dom":
-				var imgs = content.getElementsByTagName("img");
-				for (var i=0; i<imgs.length; i++) {
-					var onmouseover = tinyMCE.cleanupEventStr(tinyMCE.getAttrib(imgs[i], 'onmouseover'));
-					var onmouseout = tinyMCE.cleanupEventStr(tinyMCE.getAttrib(imgs[i], 'onmouseout'));
-
-					if ((src = this._getImageSrc(onmouseover)) != "") {
-						if (tinyMCE.getParam('convert_urls'))
-							src = eval(tinyMCE.settings['urlconverter_callback'] + "(src, null, true);");
-
-						imgs[i].setAttribute('onmouseover', "this.src='" + src + "';");
-					}
-
-					if ((src = this._getImageSrc(onmouseout)) != "") {
-						if (tinyMCE.getParam('convert_urls'))
-							src = eval(tinyMCE.settings['urlconverter_callback'] + "(src, null, true);");
-
-						imgs[i].setAttribute('onmouseout', "this.src='" + src + "';");
-					}
-				}
-				break;
-		}
-
-		return content;
-	},
-
-	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
-		if (node == null)
-			return;
-
-		do {
-			if (node.nodeName == "IMG" && tinyMCE.getAttrib(node, 'class').indexOf('mceItem') == -1) {
-				tinyMCE.switchClass(editor_id + '_advimage', 'mceButtonSelected');
-				return true;
-			}
-		} while ((node = node.parentNode));
-
-		tinyMCE.switchClass(editor_id + '_advimage', 'mceButtonNormal');
-
-		return true;
-	},
-
-	/**
-	 * Returns the image src from a scripted mouse over image str.
-	 *
-	 * @param {string} s String to get real src from.
-	 * @return Image src from a scripted mouse over image str.
-	 * @type string
-	 */
-	_getImageSrc : function(s) {
-		var sr, p = -1;
-
-		if (!s)
-			return "";
-
-		if ((p = s.indexOf('this.src=')) != -1) {
-			sr = s.substring(p + 10);
-			sr = sr.substring(0, sr.indexOf('\''));
-
-			return sr;
-		}
-
-		return "";
-	}
-};
-
-tinyMCE.addPlugin("oacsimage", TinyMCE_OacsImagePlugin);
+	// Register plugin
+	tinymce.PluginManager.add('oacsimage', tinymce.plugins.OacsImage);
+})();
\ No newline at end of file
Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacsimage/editor_plugin_src.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacsimage/editor_plugin_src.js,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacsimage/editor_plugin_src.js	8 May 2009 18:18:34 -0000	1.3
+++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacsimage/editor_plugin_src.js	19 May 2009 17:16:13 -0000	1.3.2.1
@@ -38,13 +38,13 @@
 
 			// Register example button
 			ed.addButton('image', {
-				title : 'OacsImage.desc',
+				title : 'oacsimage.desc',
 				cmd : 'mceOacsImage'
 			});
 
 			// Add a node change handler, selects the button in the UI when a image is selected
 			ed.onNodeChange.add(function(ed, cm, n) {
-			    cm.setActive('_advimage',n.nameName == "IMG");
+			    cm.setActive('image',n.nameName == "IMG");
                                             });
                 },
 		/**
Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacsimage/langs/en.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacsimage/langs/en.js,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacsimage/langs/en.js	8 May 2009 18:18:34 -0000	1.2
+++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacsimage/langs/en.js	19 May 2009 17:16:13 -0000	1.2.2.1
@@ -1,4 +1,5 @@
 tinyMCE.addI18n('en.oacsimage_dlg',{
+desc:"Insert Image",
 tab_general:"General",
 tab_appearance:"Appearance",
 tab_advanced:"Advanced",
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacslink/editor_plugin.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacslink/editor_plugin_src.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacslink/editor_plugin_src.js,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacslink/editor_plugin_src.js	8 May 2009 18:18:34 -0000	1.3
+++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacslink/editor_plugin_src.js	19 May 2009 17:16:13 -0000	1.3.2.1
@@ -6,7 +6,10 @@
  */
 
 (function() {
-	tinymce.create('tinymce.plugins.OacsLinkPlugin', {
+     // Load plugin specific language pack
+     tinymce.PluginManager.requireLangPack('oacslink');
+
+     tinymce.create('tinymce.plugins.OacsLinkPlugin', {
 		init : function(ed, url) {
 			this.editor = ed;
 
Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacslink/langs/en.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacslink/langs/en.js,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacslink/langs/en.js	25 Jan 2008 21:44:09 -0000	1.1
+++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/plugins/oacslink/langs/en.js	19 May 2009 17:16:13 -0000	1.1.2.1
@@ -1,6 +1,6 @@
 // UK lang variables
 
-tinyMCE.addToLang('oacslink',{
+tinyMCE.addI18n('oacslink',{
 desc : 'Insert/edit attachment',
 general_tab : 'General',
 popup_tab : 'Popup',
Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/about.htm
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/about.htm,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/about.htm	8 May 2009 17:34:11 -0000	1.2
+++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/about.htm	19 May 2009 17:16:13 -0000	1.2.2.1
@@ -1,23 +1,23 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>{#advanced_dlg.about_title}</title>
+	<title>{#openacs_dlg.about_title}</title>
 	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
 	<script type="text/javascript" src="../../utils/mctabs.js"></script>
 	<script type="text/javascript" src="js/about.js"></script>
 </head>
 <body id="about" style="display: none">
 		<div class="tabs">
 			<ul>
-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.about_general}</a></span></li>
-				<li id="help_tab" style="display:none"><span><a href="javascript:mcTabs.displayTab('help_tab','help_panel');" onmousedown="return false;">{#advanced_dlg.about_help}</a></span></li>
-				<li id="plugins_tab"><span><a href="javascript:mcTabs.displayTab('plugins_tab','plugins_panel');" onmousedown="return false;">{#advanced_dlg.about_plugins}</a></span></li>
+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#openacs_dlg.about_general}</a></span></li>
+				<li id="help_tab" style="display:none"><span><a href="javascript:mcTabs.displayTab('help_tab','help_panel');" onmousedown="return false;">{#openacs_dlg.about_help}</a></span></li>
+				<li id="plugins_tab"><span><a href="javascript:mcTabs.displayTab('plugins_tab','plugins_panel');" onmousedown="return false;">{#openacs_dlg.about_plugins}</a></span></li>
 			</ul>
 		</div>
 
 		<div class="panel_wrapper">
 			<div id="general_panel" class="panel current">
-				<h3>{#advanced_dlg.about_title}</h3>
+				<h3>{#openacs_dlg.about_title}</h3>
 				<p>Version: <span id="version"></span> (<span id="date"></span>)</p>
 				<p>TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under <a href="../../license.txt" target="_blank">LGPL</a>
 				by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.</p>
@@ -33,7 +33,7 @@
 
 			<div id="plugins_panel" class="panel">
 				<div id="pluginscontainer">
-					<h3>{#advanced_dlg.about_loaded}</h3>
+					<h3>{#openacs_dlg.about_loaded}</h3>
 
 					<div id="plugintablecontainer">
 					</div>
Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/anchor.htm
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/anchor.htm,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/anchor.htm	8 May 2009 17:34:11 -0000	1.2
+++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/anchor.htm	19 May 2009 17:16:13 -0000	1.2.2.1
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>{#advanced_dlg.anchor_title}</title>
+	<title>{#openacs_dlg.anchor_title}</title>
 	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
 	<script type="text/javascript" src="js/anchor.js"></script>
 </head>
 <body style="display: none">
 <form onsubmit="AnchorDialog.update();return false;" action="#">
 	<table border="0" cellpadding="4" cellspacing="0">
 		<tr>
-			<td colspan="2" class="title">{#advanced_dlg.anchor_title}</td>
+			<td colspan="2" class="title">{#openacs_dlg.anchor_title}</td>
 		</tr>
 		<tr>
-			<td class="nowrap">{#advanced_dlg.anchor_name}:</td>
+			<td class="nowrap">{#openacs_dlg.anchor_name}:</td>
 			<td><input name="anchorName" type="text" class="mceFocus" id="anchorName" value="" style="width: 200px" /></td>
 		</tr>
 	</table>
Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/charmap.htm
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/charmap.htm,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/charmap.htm	8 May 2009 17:34:11 -0000	1.2
+++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/charmap.htm	19 May 2009 17:16:13 -0000	1.2.2.1
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>{#advanced_dlg.charmap_title}</title>
+	<title>{#openacs_dlg.charmap_title}</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
 	<script type="text/javascript" src="js/charmap.js"></script>
 </head>
 <body id="charmap" style="display:none">
 <table align="center" border="0" cellspacing="0" cellpadding="2">
     <tr>
-        <td colspan="2" class="title">{#advanced_dlg.charmap_title}</td>
+        <td colspan="2" class="title">{#openacs_dlg.charmap_title}</td>
     </tr>
     <tr>
         <td id="charmapView" rowspan="2" align="left" valign="top">
Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/color_picker.htm
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/color_picker.htm,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/color_picker.htm	8 May 2009 17:34:11 -0000	1.2
+++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/color_picker.htm	19 May 2009 17:16:13 -0000	1.2.2.1
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>{#advanced_dlg.colorpicker_title}</title>
+	<title>{#openacs_dlg.colorpicker_title}</title>
 	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
 	<script type="text/javascript" src="../../utils/mctabs.js"></script>
 	<script type="text/javascript" src="js/color_picker.js"></script>
@@ -10,16 +10,16 @@
 <form onsubmit="insertAction();return false" action="#">
 	<div class="tabs">
 		<ul>
-			<li id="picker_tab" class="current"><span><a href="javascript:mcTabs.displayTab('picker_tab','picker_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_picker_tab}</a></span></li>
-			<li id="rgb_tab"><span><a href="javascript:;" onclick="generateWebColors();mcTabs.displayTab('rgb_tab','rgb_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_palette_tab}</a></span></li>
-			<li id="named_tab"><span><a  href="javascript:;" onclick="generateNamedColors();javascript:mcTabs.displayTab('named_tab','named_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_named_tab}</a></span></li>
+			<li id="picker_tab" class="current"><span><a href="javascript:mcTabs.displayTab('picker_tab','picker_panel');" onmousedown="return false;">{#openacs_dlg.colorpicker_picker_tab}</a></span></li>
+			<li id="rgb_tab"><span><a href="javascript:;" onclick="generateWebColors();mcTabs.displayTab('rgb_tab','rgb_panel');" onmousedown="return false;">{#openacs_dlg.colorpicker_palette_tab}</a></span></li>
+			<li id="named_tab"><span><a  href="javascript:;" onclick="generateNamedColors();javascript:mcTabs.displayTab('named_tab','named_panel');" onmousedown="return false;">{#openacs_dlg.colorpicker_named_tab}</a></span></li>
 		</ul>
 	</div>
 
 	<div class="panel_wrapper">
 		<div id="picker_panel" class="panel current">
 			<fieldset>
-				<legend>{#advanced_dlg.colorpicker_picker_title}</legend>
+				<legend>{#openacs_dlg.colorpicker_picker_title}</legend>
 				<div id="picker">
 					<img id="colors" src="img/colorpicker.jpg" onclick="computeColor(event)" onmousedown="isMouseDown = true;return false;" onmouseup="isMouseDown = false;" onmousemove="if (isMouseDown && isMouseOver) computeColor(event); return false;" onmouseover="isMouseOver=true;" onmouseout="isMouseOver=false;" alt=" " />
 
@@ -34,7 +34,7 @@
 
 		<div id="rgb_panel" class="panel">
 			<fieldset>
-				<legend>{#advanced_dlg.colorpicker_palette_title}</legend>
+				<legend>{#openacs_dlg.colorpicker_palette_title}</legend>
 				<div id="webcolors">
 					<!-- Gets filled with web safe colors-->
 				</div>
@@ -45,15 +45,15 @@
 
 		<div id="named_panel" class="panel">
 			<fieldset>
-				<legend>{#advanced_dlg.colorpicker_named_title}</legend>
+				<legend>{#openacs_dlg.colorpicker_named_title}</legend>
 				<div id="namedcolors">
 					<!-- Gets filled with named colors-->
 				</div>
 
 				<br style="clear: both" />
 
 				<div id="colornamecontainer">
-					{#advanced_dlg.colorpicker_name} <span id="colorname"></span>
+					{#openacs_dlg.colorpicker_name} <span id="colorname"></span>
 				</div>
 			</fieldset>
 		</div>
@@ -67,7 +67,7 @@
 		<div id="preview"></div>
 
 		<div id="previewblock">
-			<label for="color">{#advanced_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" maxlength="8" class="text mceFocus" />
+			<label for="color">{#openacs_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" maxlength="8" class="text mceFocus" />
 		</div>
 	</div>
 </form>
Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/image.htm
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/image.htm,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/image.htm	8 May 2009 17:34:11 -0000	1.2
+++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/image.htm	19 May 2009 17:16:13 -0000	1.2.2.1
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>{#advanced_dlg.image_title}</title>
+	<title>{#openacs_dlg.image_title}</title>
 	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
 	<script type="text/javascript" src="../../utils/mctabs.js"></script>
 	<script type="text/javascript" src="../../utils/form_utils.js"></script>
@@ -11,15 +11,15 @@
 <form onsubmit="ImageDialog.update();return false;" action="#">
 	<div class="tabs">
 		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.image_title}</a></span></li>
+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#openacs_dlg.image_title}</a></span></li>
 		</ul>
 	</div>
 
 	<div class="panel_wrapper">
 		<div id="general_panel" class="panel current">
      <table border="0" cellpadding="4" cellspacing="0">
           <tr>
-            <td class="nowrap"><label for="src">{#advanced_dlg.image_src}</label></td>
+            <td class="nowrap"><label for="src">{#openacs_dlg.image_src}</label></td>
             <td><table border="0" cellspacing="0" cellpadding="0">
                 <tr>
                   <td><input id="src" name="src" type="text" class="mceFocus" value="" style="width: 200px" onchange="ImageDialog.getImageData();" /></td>
@@ -28,43 +28,43 @@
               </table></td>
           </tr>
 		  <tr>
-			<td><label for="image_list">{#advanced_dlg.image_list}</label></td>
+			<td><label for="image_list">{#openacs_dlg.image_list}</label></td>
 			<td><select id="image_list" name="image_list" onchange="document.getElementById('src').value=this.options[this.selectedIndex].value;document.getElementById('alt').value=this.options[this.selectedIndex].text;"></select></td>
 		  </tr>
           <tr>
-            <td class="nowrap"><label for="alt">{#advanced_dlg.image_alt}</label></td>
+            <td class="nowrap"><label for="alt">{#openacs_dlg.image_alt}</label></td>
             <td><input id="alt" name="alt" type="text" value="" style="width: 200px" /></td>
           </tr>
           <tr>
-            <td class="nowrap"><label for="align">{#advanced_dlg.image_align}</label></td>
+            <td class="nowrap"><label for="align">{#openacs_dlg.image_align}</label></td>
             <td><select id="align" name="align" onchange="ImageDialog.updateStyle();">
                 <option value="">{#not_set}</option>
-                <option value="baseline">{#advanced_dlg.image_align_baseline}</option>
-                <option value="top">{#advanced_dlg.image_align_top}</option>
-                <option value="middle">{#advanced_dlg.image_align_middle}</option>
-                <option value="bottom">{#advanced_dlg.image_align_bottom}</option>
-                <option value="text-top">{#advanced_dlg.image_align_texttop}</option>
-                <option value="text-bottom">{#advanced_dlg.image_align_textbottom}</option>
-                <option value="left">{#advanced_dlg.image_align_left}</option>
-                <option value="right">{#advanced_dlg.image_align_right}</option>
+                <option value="baseline">{#openacs_dlg.image_align_baseline}</option>
+                <option value="top">{#openacs_dlg.image_align_top}</option>
+                <option value="middle">{#openacs_dlg.image_align_middle}</option>
+                <option value="bottom">{#openacs_dlg.image_align_bottom}</option>
+                <option value="text-top">{#openacs_dlg.image_align_texttop}</option>
+                <option value="text-bottom">{#openacs_dlg.image_align_textbottom}</option>
+                <option value="left">{#openacs_dlg.image_align_left}</option>
+                <option value="right">{#openacs_dlg.image_align_right}</option>
               </select></td>
           </tr>
           <tr>
-            <td class="nowrap"><label for="width">{#advanced_dlg.image_dimensions}</label></td>
+            <td class="nowrap"><label for="width">{#openacs_dlg.image_dimensions}</label></td>
             <td><input id="width" name="width" type="text" value="" size="3" maxlength="5" />
               x
               <input id="height" name="height" type="text" value="" size="3" maxlength="5" /></td>
           </tr>
           <tr>
-            <td class="nowrap"><label for="border">{#advanced_dlg.image_border}</label></td>
+            <td class="nowrap"><label for="border">{#openacs_dlg.image_border}</label></td>
             <td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>
           </tr>
           <tr>
-            <td class="nowrap"><label for="vspace">{#advanced_dlg.image_vspace}</label></td>
+            <td class="nowrap"><label for="vspace">{#openacs_dlg.image_vspace}</label></td>
             <td><input id="vspace" name="vspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>
           </tr>
           <tr>
-            <td class="nowrap"><label for="hspace">{#advanced_dlg.image_hspace}</label></td>
+            <td class="nowrap"><label for="hspace">{#openacs_dlg.image_hspace}</label></td>
             <td><input id="hspace" name="hspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>
           </tr>
         </table>
Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/link.htm
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/link.htm,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/link.htm	8 May 2009 17:34:11 -0000	1.2
+++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/link.htm	19 May 2009 17:16:13 -0000	1.2.2.1
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>{#advanced_dlg.link_title}</title>
+	<title>{#openacs_dlg.link_title}</title>
 	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
 	<script type="text/javascript" src="../../utils/mctabs.js"></script>
 	<script type="text/javascript" src="../../utils/form_utils.js"></script>
@@ -12,7 +12,7 @@
 <form onsubmit="LinkDialog.update();return false;" action="#">
 	<div class="tabs">
 		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.link_title}</a></span></li>
+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#openacs_dlg.link_title}</a></span></li>
 		</ul>
 	</div>
 
@@ -21,7 +21,7 @@
 
 		<table border="0" cellpadding="4" cellspacing="0">
           <tr>
-            <td class="nowrap"><label for="href">{#advanced_dlg.link_url}</label></td>
+            <td class="nowrap"><label for="href">{#openacs_dlg.link_url}</label></td>
             <td><table border="0" cellspacing="0" cellpadding="0"> 
 				  <tr> 
 					<td><input id="href" name="href" type="text" class="mceFocus" value="" style="width: 200px" onchange="LinkDialog.checkPrefix(this);" /></td> 
@@ -30,15 +30,15 @@
 				</table></td>
           </tr>
 		  <tr>
-			<td><label for="link_list">{#advanced_dlg.link_list}</label></td>
+			<td><label for="link_list">{#openacs_dlg.link_list}</label></td>
 			<td><select id="link_list" name="link_list" onchange="document.getElementById('href').value=this.options[this.selectedIndex].value;"></select></td>
 		  </tr>
 		<tr>
-			<td><label id="targetlistlabel" for="targetlist">{#advanced_dlg.link_target}</label></td>
+			<td><label id="targetlistlabel" for="targetlist">{#openacs_dlg.link_target}</label></td>
 			<td><select id="target_list" name="target_list"></select></td>
 		</tr>
           <tr>
-            <td class="nowrap"><label for="linktitle">{#advanced_dlg.link_titlefield}</label></td>
+            <td class="nowrap"><label for="linktitle">{#openacs_dlg.link_titlefield}</label></td>
             <td><input id="linktitle" name="linktitle" type="text" value="" style="width: 200px" /></td>
           </tr>
 			<tr>
Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/source_editor.htm
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/source_editor.htm,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/source_editor.htm	8 May 2009 17:34:11 -0000	1.2
+++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/source_editor.htm	19 May 2009 17:16:13 -0000	1.2.2.1
@@ -1,16 +1,16 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-	<title>{#advanced_dlg.code_title}</title>
+	<title>{#openacs_dlg.code_title}</title>
 	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
 	<script type="text/javascript" src="js/source_editor.js"></script>
 </head>
 <body onresize="resizeInputs();" style="display:none; overflow:hidden;">
 	<form name="source" onsubmit="saveContent();return false;" action="#">
-		<div style="float: left" class="title">{#advanced_dlg.code_title}</div>
+		<div style="float: left" class="title">{#openacs_dlg.code_title}</div>
 
 		<div id="wrapline" style="float: right">
-			<input type="checkbox" name="wraped" id="wraped" onclick="toggleWordWrap(this);" class="wordWrapCode" /><label for="wraped">{#advanced_dlg.code_wordwrap}</label>
+			<input type="checkbox" name="wraped" id="wraped" onclick="toggleWordWrap(this);" class="wordWrapCode" /><label for="wraped">{#openacs_dlg.code_wordwrap}</label>
 		</div>
 
 		<br style="clear: both" />
Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/js/about.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/js/about.js,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/js/about.js	8 May 2009 17:53:05 -0000	1.1
+++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/js/about.js	19 May 2009 17:16:13 -0000	1.1.2.1
@@ -16,9 +16,9 @@
 	html += '<table id="plugintable">';
 	html += '<thead>';
 	html += '<tr>';
-	html += '<td>' + ed.getLang('advanced_dlg.about_plugin') + '</td>';
-	html += '<td>' + ed.getLang('advanced_dlg.about_author') + '</td>';
-	html += '<td>' + ed.getLang('advanced_dlg.about_version') + '</td>';
+	html += '<td>' + ed.getLang('openacs_dlg.about_plugin') + '</td>';
+	html += '<td>' + ed.getLang('openacs_dlg.about_author') + '</td>';
+	html += '<td>' + ed.getLang('openacs_dlg.about_version') + '</td>';
 	html += '</tr>';
 	html += '</thead>';
 	html += '<tbody>';
Index: openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/js/link.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/js/link.js,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/js/link.js	8 May 2009 17:53:05 -0000	1.1
+++ openacs-4/packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce/themes/openacs/js/link.js	19 May 2009 17:16:13 -0000	1.1.2.1
@@ -90,10 +90,10 @@
 	},
 
 	checkPrefix : function(n) {
-		if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_email')))
+		if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('openacs_dlg.link_is_email')))
 			n.value = 'mailto:' + n.value;
 
-		if (/^\s*www\./i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_external')))
+		if (/^\s*www\./i.test(n.value) && confirm(tinyMCEPopup.getLang('openacs_dlg.link_is_external')))
 			n.value = 'http://' + n.value;
 	},
 
@@ -140,8 +140,8 @@
 		var dom = tinyMCEPopup.dom, lst = dom.get(id), v;
 
 		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');
-		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('advanced_dlg.link_target_same'), '_self');
-		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('advanced_dlg.link_target_blank'), '_blank');
+		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('openacs_dlg.link_target_same'), '_self');
+		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('openacs_dlg.link_target_blank'), '_blank');
 
 		if (v = tinyMCEPopup.getParam('theme_advanced_link_targets')) {
 			tinymce.each(v.split(','), function(v) {