Index: branches/RC/themes/default2007/platform/elements/forms.tpl
===================================================================
diff -u -r9022 -r9024
--- branches/RC/themes/default2007/platform/elements/forms.tpl	(.../forms.tpl)	(revision 9022)
+++ branches/RC/themes/default2007/platform/elements/forms.tpl	(.../forms.tpl)	(revision 9024)
@@ -304,7 +304,7 @@
 				<inp2:{$prefix}_CategorySelector render_as="selector_category_element" separator="&raquo;&nbsp;"/>
 			</select>
 
-			<input type="button" class="button" value="<inp2:m_Phrase name="lu_btn_Add"/>" onclick="$ItemCategories.AddCategory('&raquo;&amp;nbsp;', $delete_button, <inp2:m_GetConfig name="Link_MaxCategoriesAddLink"/>);"/><br />
+			<input type="button" class="button" value="<inp2:m_Phrase name="lu_btn_Add"/>" onclick="$ItemCategories.AddCategory('&raquo;&amp;nbsp;', $delete_button, <inp2:m_GetConfig name="{$prefix}_MaxCategories"/>);"/><br />
 			<table class="item-categories" id="item_categories">
 				<tbody>
 					<tr>
@@ -320,7 +320,8 @@
 
 			<script type="text/javascript">
 				var $delete_button = '<input type="button" class="delete-button" value="<inp2:m_Phrase name="lu_btn_Delete"/>" onclick="$ItemCategories.DeleteCategory(#CATEGORY_ID#);"/>';
-				var $ItemCategories = new ItemCategories('item_categories', '<inp2:{$prefix}_InputName field="$field"/>', <inp2:m_Get name="m_cat_id"/>);
+				var $phrases = ['<inp2:m_Phrase name="lu_error_CategoryLimitReached" escape="1"/>', '<inp2:m_Phrase name="lu_error_AlreadyAdded"/>'];
+				var $ItemCategories = new ItemCategories('item_categories', '<inp2:{$prefix}_InputName field="$field"/>', <inp2:m_Get name="m_cat_id"/>, $phrases);
 			</script>
 		</td>
 	</tr>
Index: branches/RC/themes/default2007/platform/inc/script.js
===================================================================
diff -u -r9022 -r9024
--- branches/RC/themes/default2007/platform/inc/script.js	(.../script.js)	(revision 9022)
+++ branches/RC/themes/default2007/platform/inc/script.js	(.../script.js)	(revision 9024)
@@ -14,11 +14,12 @@
 }
 
 // ItemCategories class
-function ItemCategories($table_id, $field_id, $primary_category) {
+function ItemCategories($table_id, $field_id, $primary_category, $phrases) {
 	this.CategoryTable = document.getElementById($table_id);
 	this.CategorySelector = document.getElementById($field_id + '_select');
 	this.MoreCategoriesField = document.getElementById($field_id);
 	this.PrimaryCategory = $primary_category;
+	this.Phrases = $phrases;
 
 	// get additional categories from item
 	if (this.MoreCategoriesField.value.length) {
@@ -35,13 +36,15 @@
 	var $category_name = this.CategorySelector.options[this.CategorySelector.selectedIndex].innerHTML.trim();
 
 	if ((this.SearchCategory($category_id) !== false) || ($category_id == this.PrimaryCategory) || ($category_id == 0)) {
-		// don't add same category twice & don't allow to add item's primary category
+		// don't add same category twice & don't allow to add item's primary category		
+		alert(this.Phrases[1]);
 		return ;
 	}
 	
-	if ((this.MoreCategories.length + 1) > $max_categories)
+	if ((this.MoreCategories.length + 2) > $max_categories)
 	{
 		// don't add more category - $max_categories limit
+		alert(this.Phrases[0]);
 		return ;
 	}