From 9cc6b7fffd31f4b9ee9aceef9224c84dcf28aeb8 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 4 Jul 2006 23:25:41 +0000
Subject: Merge from 3.0 branch till 1239.

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

(limited to 'framework/Exceptions')

diff --git a/framework/Exceptions/messages.txt b/framework/Exceptions/messages.txt
index 22b28a42..ff9ab1f3 100644
--- a/framework/Exceptions/messages.txt
+++ b/framework/Exceptions/messages.txt
@@ -320,6 +320,8 @@ databoundcontrol_datasourceid_inexistent = databoundcontrol_datasourceid_inexist
 databoundcontrol_datasourceid_invalid	= databoundcontrol_datasourceid_invalid
 databoundcontrol_datamember_invalid		= databoundcontrol_datamember_invalid
 
+clientscript_invalid_file_position		= Invalid file position '{1}' for TClientScript control '{0}', must be 'Head', 'Here' or 'Begin'.
+
 callback_not_support_no_priority_state_update	= Callback request does not support unprioritized pagestate update.
 callback_invalid_callback_options		= '{1}' is not a valid TCallbackOptions control for Callback control '{0}'.
 callback_invalid_clientside_options		= Callback ClientSide property must be either a string that is the ID of a TCallbackOptions control or an instance of TCallbackClientSideOptions.=======
-- 
cgit v1.2.3