You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2012/08/16 07:33:48 UTC

svn commit: r1373737 - in /incubator/syncope/trunk: ./ console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties

Author: ilgrosso
Date: Thu Aug 16 05:33:48 2012
New Revision: 1373737

URL: http://svn.apache.org/viewvc?rev=1373737&view=rev
Log:
Merge from 1_0_X

Modified:
    incubator/syncope/trunk/   (props changed)
    incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties

Propchange: incubator/syncope/trunk/
------------------------------------------------------------------------------
  Merged /incubator/syncope/branches/1_0_X:r1373733-1373734

Modified: incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties?rev=1373737&r1=1373736&r2=1373737&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties Thu Aug 16 05:33:48 2012
@@ -36,7 +36,7 @@ mappingUserSchema=Mapping User Schema
 mappingRoleSchema=Mapping Role Schema
 delete=Delete
 intAttrNames=Internal Attributes
-forceMandatoryConstraint=Force mandatory constraint
+forceMandatoryConstraint=Enforce mandatory constraints
 fieldName=Field name
 
 accountIdValidation=There must be exactly one AccountId