Phase one of merge of EC multilingual work

These files are their changes plus adjustments for formatting and immediate clashes
I anticipate that this will break the build, but there are too many changes coming to risk it.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/model/contentModel.xml

@@ -19,7 +19,7 @@
          <parameter name="expression"><value><![CDATA[(.*[\"\*\\\>\<\?\/\:\|\xA3\xAC\%\&\+\;]+.*)|(.*[\.]?.*[\.]+$)|(.*[ ]+$)]]></value></parameter>
          <parameter name="requiresMatch"><value>false</value></parameter>
       </constraint>
-	  <constraint name="cm:userNameConstraint" type="org.alfresco.repo.dictionary.constraint.UserNameConstraint" />
+      <constraint name="cm:userNameConstraint" type="org.alfresco.repo.dictionary.constraint.UserNameConstraint" />
    </constraints>
    
    <types>
@@ -143,12 +143,12 @@
          <title>Person</title>
          <parent>sys:base</parent>
          <properties>
-			<!-- The tokenisation set here is ignored - it is fixed for this type -->
-			<!-- This is so you can not break person lookup -->
+            <!-- The tokenisation set here is ignored - it is fixed for this type -->
+            <!-- This is so you can not break person lookup -->
             <property name="cm:userName">
                <type>d:text</type>
                <mandatory>true</mandatory>
-			   <constraints>
+               <constraints>
                   <constraint ref="cm:userNameConstraint" />
                </constraints>
             </property>
@@ -260,6 +260,8 @@
          </associations>
          <mandatory-aspects>
             <aspect>cm:versionable</aspect>
+            <aspect>cm:author</aspect>
+            <aspect>sys:localized</aspect>
          </mandatory-aspects>
       </type>
             
@@ -572,7 +574,7 @@
                <protected>true</protected>
                <mandatory>true</mandatory>
             </property>
-       	</properties>
+           </properties>
       </aspect>
    
       <aspect name="cm:versionable">
@@ -723,6 +725,12 @@
          </mandatory-aspects>
       </aspect>
             
+      <aspect name="cm:mlEmptyTranslation">
+         <title>Empty Translation</title>
+         <mandatory-aspects>
+            <aspect>cm:mlDocument</aspect>
+         </mandatory-aspects>
+      </aspect>
    </aspects>
 
 </model>