diff options
| author | Christophe.Boulain <> | 2010-02-15 09:20:35 +0000 |
|---|---|---|
| committer | Christophe.Boulain <> | 2010-02-15 09:20:35 +0000 |
| commit | d860219f366a8fbe63b03d26c69525d4e6bd4f3a (patch) | |
| tree | 6520a9a0a70a941d122de10d8f5ae9e3883a0ac6 /framework/Exceptions/messages | |
| parent | 94e94e0a8566f23d16658a04c55b0bbfdd6689aa (diff) | |
Merge from r2765 (and some others) 3.1
Added TActiveTableRow QST page
Corrected an uninitialized array in TScaffoldBase
Diffstat (limited to 'framework/Exceptions/messages')
| -rw-r--r-- | framework/Exceptions/messages/messages-fr.txt | 6 | ||||
| -rw-r--r-- | framework/Exceptions/messages/messages.txt | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/framework/Exceptions/messages/messages-fr.txt b/framework/Exceptions/messages/messages-fr.txt index 5dce3812..d6785fdf 100644 --- a/framework/Exceptions/messages/messages-fr.txt +++ b/framework/Exceptions/messages/messages-fr.txt @@ -409,3 +409,9 @@ feedservice_id_required = TFeedService requires 'id' attribute in its feed e feedservice_feedtype_invalid = The class feed '{0}' must implement IFeedContentProvider interface. feedservice_class_required = TFeedService requires 'class' attribute in its feed elements. feedservice_feed_unknown = Unknown feed '{0}' requested. + +tactivetablecell_control_outoftable = {0} '{1}' must be enclosed within a TTableRow control. +tactivetablecell_control_notincollection = {0} '{1}' no member of the TTableCellCollection of the parent TTableRow control. + +tactivetablerow_control_outoftable = {0} '{1}' must be enclosed within a TTable control. +tactivetablerow_control_notincollection = {0} '{1}' no member of the TTableRowCollection of the parent TTable control.
\ No newline at end of file diff --git a/framework/Exceptions/messages/messages.txt b/framework/Exceptions/messages/messages.txt index 402b3252..b20c0f8b 100644 --- a/framework/Exceptions/messages/messages.txt +++ b/framework/Exceptions/messages/messages.txt @@ -201,6 +201,7 @@ page_control_outofform = {0} '{1}' must be enclosed within TForm. page_head_duplicated = A page can contain at most one THead. page_head_required = A THead control is needed in page template in order to render CSS and js in the HTML head section. page_statepersister_invalid = Page state persister must implement IPageStatePersister interface. +page_csmanagerclass_invalid = ClientScriptManager class '{0}' must be an instance of TClientScriptManager. csmanager_pradoscript_invalid = Unknown Prado script library name '{0}'. csmanager_invalid_packages = Unkownn packages '{1}' for javascript packages defined in '{0}'. Valid packages are '{2}'. |