svn commit: r1549518 - in /syncope/trunk: ./ console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties console/src/main/resources/org/apache/syncope/console/SyncopeApplication_pt_BR.properties

[il...@apache.org]

Author: ilgrosso
Date: Mon Dec  9 09:11:02 2013
New Revision: 1549518

URL: http://svn.apache.org/r1549518
Log:
Merge from 1_1_X

Modified:
    syncope/trunk/   (props changed)
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_pt_BR.properties

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_1_X:r1547810-1549517

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties?rev=1549518&r1=1549517&r2=1549518&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties Mon Dec  9 09:11:02 2013
@@ -26,7 +26,7 @@ schema=Schema
 operation_succeeded=Operation executed successfully
 operation_error=Error occurred during the requested operation
 alert=Alert:
-confirmDelete=Do you really want to delete the selected item?
+confirmDelete=Do you really want to delete the selected item(s)?
 confirmUnlink=Do you really want to remove the link between the selected item(s) and the resource?
 confirmUnassign=Do you really want to remove the assignment between the selected item(s) and the resource?
 confirmDeprovision=Do you really want to de-provision the selected item(s)?

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_pt_BR.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_pt_BR.properties?rev=1549518&r1=1549517&r2=1549518&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_pt_BR.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_pt_BR.properties Mon Dec  9 09:11:02 2013
@@ -26,7 +26,7 @@ schema=Esquemas
 operation_succeeded=Opera\u00e7\u00e3o executada com sucesso
 operation_error=Um erro ocorreu ao executar esta opera\u00e7\u00e3o
 alert=Alerta:
-confirmDelete=Voc\u00ea realmente deseja apagar este item selecionado?
+confirmDelete=Voc\u00ea realmente deseja apagar este item(s) selecionado?
 confirmUnlink=Voc\u00ea realmente deseja apagar o v\u00ednculo entre o item e de recursos?
 confirmUnassign=Voc\u00ea realmente deseja apagar a atribui\u00e7\u00e3o entre o item e de recursos?
 confirmDeprovision=Voc\u00ea realmente de-provision item?