Merge 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4340 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4350 .
   svn resolved root\projects\3rd-party\.classpath
   svn resolved root\projects\repository\source\java\org\alfresco\repo\workflow\WorkflowInterpreter.java
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4379 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4380 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4420 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4421 .
   svn resolved root\projects\3rd-party\.classpath


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-19 14:24:45 +00:00
parent 473c9ff1ff
commit cfb373ae36
17 changed files with 473 additions and 70 deletions

View File

@@ -19,16 +19,16 @@ patch.general.property_not_set=Patch property ''{0}'' has not been set on this p
patch.marker.description=Marker patch to record installations and upgrades
patch.marker.result=Marker patch applied
patch.savedSearchesFolder.description=Ensures the existence of the 'Saved Searches' folder.
patch.savedSearchesFolder.description=Ensures the existence of the ''Saved Searches'' folder.
patch.savedSearchesFolder.result.exists=The saved searches folder already exists: {0}
patch.savedSearchesFolder.result.created=The saved searches folder was successfully created: {0}
patch.savedSearchesPermission.description=Sets required permissions on 'Saved Searches' folder.
patch.savedSearchesPermission.description=Sets required permissions on ''Saved Searches'' folder.
patch.savedSearchesPermission.result.applied=Granted CONTRIBUTOR role to EVERYONE on ''Saved Searches'' folder: {0}.
patch.savedSearchesPermission.err.not_found='Saved Searches' folder could not be found.
patch.savedSearchesPermission.err.not_found=''Saved Searches'' folder could not be found.
patch.updatePermissionData.description=Update permissions from 'folder' to 'cmobject' [JIRA: AR-344].
patch.updatePermissionData.result=Changed {0} 'folder' access control entries to 'cmobject'.
patch.updatePermissionData.description=Update permissions from ''folder'' to ''cmobject'' [JIRA: AR-344].
patch.updatePermissionData.result=Changed {0} ''folder'' access control entries to ''cmobject''.
patch.authoritiesFolder.description=Ensures the existence of the user authorities folder [JIRA: AR-497].
@@ -38,26 +38,26 @@ patch.guestUser.result=Added guest user and fixed permissions.
patch.fixNodeSerializableValues.description=Ensure that property values are not stored as Serializable if at all possible
patch.fixNodeSerializableValues.result=Fixed {0} node property serialized values
patch.updateGuestPermission.description=Rename guest permission from 'Guest' to 'Consumer'
patch.updateGuestPermission.result=Changed {0} 'Guest' access control entries to 'Consumer'.
patch.updateGuestPermission.description=Rename guest permission from 'Guest' to ''Consumer''
patch.updateGuestPermission.result=Changed {0} ''Guest'' access control entries to ''Consumer''.
patch.categoryRootPermission.description=Sets required permissions on 'Category Root' folder.
patch.categoryRootPermission.description=Sets required permissions on ''Category Root'' folder.
patch.categoryRootPermission.result=Granted CONSUMER role to GUEST on ''Category Root'' folder: {0}.
patch.categoryRootPermission.err.not_found='Category Root' folder ({0}) could not be found.
patch.categoryRootPermission.err.not_found=''Category Root'' folder ({0}) could not be found.
patch.guestPersonPermission.description=Change Guest Person permission from 'Consumer' to 'Read'
patch.guestPersonPermission.result=Updated Guest Person permission from 'Consumer' to 'Read'
patch.guestPersonPermission.description=Change Guest Person permission from ''Consumer'' to ''Read''
patch.guestPersonPermission.result=Updated Guest Person permission from ''Consumer'' to ''Read''
patch.spacesRootPermission.description=Change Spaces store root permission from 'Consumer' to 'Read'
patch.spacesRootPermission.result=Updated Spaces store root permission from 'Consumer' to 'Read'
patch.spacesRootPermission.description=Change Spaces store root permission from ''Consumer'' to ''Read''
patch.spacesRootPermission.result=Updated Spaces store root permission from ''Consumer'' to ''Read''
patch.contentPermission.description=Update permission entries from 'cm:content' to 'sys:base'.
patch.contentPermission.result=Changed {0} 'cm:content' access control entries to 'sys:base'.
patch.contentPermission.description=Update permission entries from 'cm:content' to ''sys:base''.
patch.contentPermission.result=Changed {0} ''cm:content'' access control entries to ''sys:base''.
patch.forumsIcons.description=Updates forums icon references
patch.forumsIcons.result=Updated {0} icon references
patch.emailTemplatesFolder.description=Ensures the existence of the 'Email Templates' folder.
patch.emailTemplatesFolder.description=Ensures the existence of the ''Email Templates'' folder.
patch.emailTemplatesFolder.result.exists=The email templates folder already exists: {0}
patch.emailTemplatesFolder.result.created=The email templates folder was successfully created: {0}
@@ -67,7 +67,7 @@ patch.emailTemplatesContent.result=Imported the Email Templates into the default
patch.descriptorUpdate.description=Update Repository descriptor
patch.descriptorUpdate.result=Repository descriptor updated
patch.scriptsFolder.description=Ensures the existence of the 'Scripts' folder.
patch.scriptsFolder.description=Ensures the existence of the ''Scripts'' folder.
patch.scriptsFolder.result.exists=The scripts folder already exists: {0}
patch.scriptsFolder.result.created=The scripts folder was successfully created: {0}
@@ -82,15 +82,15 @@ patch.actionRuleDecouplingPatch.result=Updated {0} rules.
patch.systemWorkflowFolder.description=Ensures the existence of the system workflow container.
patch.systemWorkflowFolder.result.created=Created system workflow container {0}.
patch.rssTemplatesFolder.description=Ensures the existence of the 'RSS Templates' folder.
patch.rssTemplatesFolder.description=Ensures the existence of the ''RSS Templates'' folder.
patch.rssTemplatesFolder.result.exists=The RSS Templates folder already exists: {0}
patch.rssTemplatesFolder.result.created=The RSS Templates folder was successfully created: {0}
patch.uifacetsAspectRemovalPatch.description=Removes the incorrectly applied uifacets aspect from presentation template files.
patch.uifacetsAspectRemovalPatch.updated=Successfully removed the uifacets aspect from {0} presentation template files.
patch.guestPersonPermission2.description=Change Guest Person permission to visible by all users as 'Consumer'.
patch.guestPersonPermission2.result=Updated Guest Person permission to visible by all users as 'Consumer'.
patch.guestPersonPermission2.description=Change Guest Person permission to visible by all users as ''Consumer''.
patch.guestPersonPermission2.result=Updated Guest Person permission to visible by all users as ''Consumer''.
patch.schemaUpgradeScript.description=Ensures that the database upgrade script has been run.
patch.schemaUpgradeScript.err.not_executed=The schema upgrade script, ''{0}'', has not been run against this database.
@@ -99,3 +99,8 @@ patch.uniqueChildName.description=Checks and renames duplicate children.
patch.uniqueChildName.copyOf=({0}-{1})
patch.uniqueChildName.result=Checked {0} associations and fixed {1} duplicates. See file {2} for details.
patch.uniqueChildName.err.unable_to_fix=Auto-fixing of duplicate names failed. See file {0} for details.
patch.invalidNameEnding.description=Fixes names ending with a space or full stop.
patch.invalidNameEnding.result=Fixed {0} names ending with a space or full stop. See file {1} for details.
patch.invalidNameEnding.err.unable_to_fix=Auto-fixing of names ending with a space or full stop failed. See file {0} for details.
patch.invalidNameEnding.rewritten=Name ''{0}'' rewritten to ''{1}''

View File

@@ -12,4 +12,8 @@ system.config_check.err.missing_index=CONTENT INTEGRITY ERROR: Indexes not found
system.config_check.err.missing_content=CONTENT INTEGRITY ERROR: Content not found for {0} stores.
system.config_check.err.fix_dir_root=Ensure that the ''dir.root'' property is pointing to the correct data location.
system.config_check.msg.howto_index_recover=You may set 'index.recovery.mode=FULL' if you need to rebuild the indexes.
system.config_check.warn.starting_with_errors=Alfresco is starting with errors.
system.config_check.warn.starting_with_errors=Alfresco is starting with errors.
# OpenOffice
system.openoffice.info.connection_verified=The connection to OpenOffice has been established.
system.openoffice.err.connection_failed=A connection to OpenOffice could not be established.