From bee6b4fe4cb395a6b32f2365878cfdab039f33c9 Mon Sep 17 00:00:00 2001 From: David Webster Date: Wed, 21 Sep 2011 15:25:20 +0000 Subject: [PATCH] Fixes: ALF-9344 and ALF-9345 - minor properties file merge issues from Team. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30684 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/system-messages.properties | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/config/alfresco/messages/system-messages.properties b/config/alfresco/messages/system-messages.properties index 3bda362996..bfe9f15d2c 100644 --- a/config/alfresco/messages/system-messages.properties +++ b/config/alfresco/messages/system-messages.properties @@ -43,16 +43,19 @@ reencryptor.batchprocessor.name=Reencryptor # START TRANSLATION system.usage.warn.limit_users_approached=The allowable user limit of {0} is being approached. There are {1} users in the system. system.usage.warn.limit_users_reached=The allowable user limit of {0} has been reached. There are {1} users in the system. -system.usage.warn.limit_documents_approached=The allowable document limit of {0} is being approached. There are {1} documents in the system. -system.usage.warn.limit_documents_reached=The allowable document limit of {0} has been reached. There are {1} documents in the system. +system.usage.warn.limit_documents_approached=The allowable content limit of {0} is being approached. There are {1} content objects in the system. +system.usage.warn.limit_documents_reached=The allowable content limit of {0} has been reached. There are {1} content objects in the system. system.usage.err.limit_users_exceeded=The allowable user limit of {0} has been exceeded. There are currently {1} users in the system. system.usage.err.limit_users_exceeded_verbose=The allowable user limit of {0} has been exceeded. Users added: {1} -system.usage.err.limit_documents_exceeded=The allowable document limit of {0} has been exceeded. There are currently {1} documents in the system. +system.usage.err.limit_documents_exceeded=The allowable content limit of {0} has been exceeded. There are currently {1} content objects in the system. system.usage.err.limit_license_expiring=The Alfresco license will expire in {0} days. system.usage.err.limit_license_expired=The Alfresco license has expired. # END TRANSLATION # License +system.license.msg.unknown=Unknown +system.license.msg.unlimited=Unlimited +system.license.msg.does_not_expire=Does not expire system.license.msg.reloaded=The Alfresco license has been reloaded. system.license.err.reloadFailed=Failed to reload license: {0}