Author: ilgrosso
Date: Thu Jan 2 09:59:55 2014
New Revision: 1554778
URL: http://svn.apache.org/r1554778
Log:
Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.properties
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1554761-1554777
Modified:
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.properties
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.properties?rev=1554778&r1=1554777&r2=1554778&view=diff
==============================================================================
---
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.properties
(original)
+++
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage.properties
Thu Jan 2 09:59:55 2014
@@ -23,7 +23,7 @@ name=Name
description=Description
lastExec=Last Execution
nextExec=Next Execution
-updates=Update matched identities
+updates=Update matching identities
cron=Schedule (seconds, minutes, hours, days of month, months, days of week)
templates=Remove task from scheduler / Use a template to schedule
apply=Save
