Author: andre
Date: 2009-07-07 09:39:27 +0200 (Tue, 07 Jul 2009)
New Revision: 36611
Modified:
mmbase/trunk/applications/media/src/main/config/builders/media/mediafragments.fields.xml
Log:
found a conflict
Modified:
mmbase/trunk/applications/media/src/main/config/builders/media/mediafragments.fields.xml
===================================================================
---
mmbase/trunk/applications/media/src/main/config/builders/media/mediafragments.fields.xml
2009-07-07 07:28:53 UTC (rev 36610)
+++
mmbase/trunk/applications/media/src/main/config/builders/media/mediafragments.fields.xml
2009-07-07 07:39:27 UTC (rev 36611)
@@ -23,8 +23,8 @@
<description xml:lang="nl">Een titel is verplicht</description>
</required>
<minLength value="2" enforce="onvalidate">
- <description xml:lang="en">A title is required</description>
- <description xml:lang="nl">Een titel is verplicht</description>
+ <description xml:lang="en">A title is required and should be at least
2 characters</description>
+ <description xml:lang="nl">Een titel is verplicht en moet tenminste 2
karakters lang zijn</description>
</minLength>
<maxLength value="255" enforce="never" />
</datatype>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
