From e2149e3d8b87b382563a9def6f376a5f289754d3 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Fri, 12 May 2006 12:38:32 +0000
Subject: Merge from 3.0 branch till 1054.

---
 framework/Exceptions/messages.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'framework/Exceptions/messages.txt')

diff --git a/framework/Exceptions/messages.txt b/framework/Exceptions/messages.txt
index effc3636..ebdbaaea 100644
--- a/framework/Exceptions/messages.txt
+++ b/framework/Exceptions/messages.txt
@@ -161,7 +161,7 @@ templatecontrol_mastercontrol_invalid	= Master control must be of type TTemplate
 templatecontrol_contentid_duplicated	= TContent ID '{0}' is duplicated.
 templatecontrol_placeholderid_duplicated= TContentPlaceHolder ID '{0}' is duplicated.
 templatecontrol_directive_invalid		= {0}.{1} can only accept a static text string through a template directive.
-templatecontrol_placeholder_inexistent	= TContent '{0}' does not have a matching TPlaceHolder.
+templatecontrol_placeholder_inexistent	= TContent '{0}' does not have a matching TContentPlaceHolder.
 
 page_form_duplicated					= A page can contain at most one TForm. Use regular HTML form tags for the rest forms.
 page_isvalid_unknown					= TPage.IsValid has not been evaluated yet.
-- 
cgit v1.2.3