From 6ebc200a0e281947ebdabd59ef9313696fb4138c Mon Sep 17 00:00:00 2001
From: Dave Ward
Date: Fri, 20 May 2011 13:30:26 +0000
Subject: [PATCH] Merged V3.4-TEAM to HEAD 26804: Fixed line endings and
removed sundry svn:mime-type properties after merge rev 26779 26805:
Merged BRANCHES/V3.4/ to BRANCHES/V3.4-TEAM: 26803: Fixes: ALF-8138,
adds a i18n property for a ToDo list's attachment title. 26817: Fixes:
ALF-7813 - Mini Calendar now highlights all events rather than only the ones
valid for the current view. 26821: Fixed ALF-7889: Auditable data should
not change during archive and restore - NodeService archive (private
method) and restore (public method) switch off cm:auditable behaviour -
This is system-wide and not configurable 26823: ALF-8152 - Simple view:
incorrect file type icon 26826: GDoc: Collections are now being correctly
created in GDoc when document is checked out
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
26829: Change initial load event back to onContentReady to keep Firefox & Firebug happy.
26830: ALF-8151 - Filetype icon or is incorrectly displayed at the Content I'm editing dashlet. (Copied mappings across from alfresco.js)
26833: Fixed ALF-8060 "Collaborator can't edit created links by other users"
26836: Fix for ALF-8126
26837: Fixes ALF-8124: Override default BitRock NLS readme strings
26840: Fixed ALF-8127 "Inconsistence between Create and Edit user page"
26841: Fix for ALF-1044. (Searching for groups whose names contain regex reserved chars.)
The fix was to add [] as reserved chars to the RegEx SimpleLanguageDef. Thanks AndyH.
26844: Fixed ALF-8000, ALF-7997, ALF-8108 and ALF-7721. Partial fix for ALF-8156. All these issues relate to admin console form configuration.
26845: Fix for ALF-8181 - Admin console - sometimes displays the 'previous' tool, one step behind mouse click
26854: Fixed ALF-8179: The new HTML email templates are bootstrapped with a mimetype of text/html they should be text/plain as they are freemarker files. Being plain text allows the content to be edited without TinyMCE corrupting the raw source. I also made all the templates inline editable.
NOTE: To see these changes you must start with a clean database as these changes are only applied during initial bootstrap.
26865: Merged V3.4-BUG-FIX to V3.4-TEAM
26864: ALF-8025: JMX forms will no longer persist invalid values and subsystem auto-start errors are non-fatal
- Errors on bootstrap subsystem startup are logged and absorbed. So should still always be possible to bring the server up to a level where its configuration can be corrected
- The JMX setAttributes() method, which sets multiple attributes at once, is now handled differently from an individual setAttribute()
- It attempts to restart the subsystem with the new properties. If successful these are persisted and a reload message is broadcast across the cluster. If unsuccessful it rolls back to the old properties and restarts the subsystem with those. Then the error is passed on to the caller.
- Unit tested through JMX by AuthenticationChainTest
26871: Refactor of fix to ALF-7888 to address clarified/extended requirements.
After discussions with various engineers & the product manager, it has been agreed that sites should not appear in the recycle bin as they cannot be recovered from there. This is not a change to existing behaviour.
However, formerly sites were only hard-deleted if deleted via the SiteService & remained archivable via the Explorer client and presumably other protocols such as CIFS.
Now sites will by default not be deletable at all. So any attempt to delete a site via Explorer, CIFS etc will fail with an exception. This is achieved with a policy/behaviour on Site deletion.
But that behaviour is disabled within the SiteService.deleteSite thus allowing deletion (and hard deletion at that) via that service only.
End result is that admins can't accidentally delete sites as most interfaces prevent it and Share allows it after the normal warning dialogs.
Had to tweak the SiteLoadPatch to delete a site via the SiteService rather than the NodeService.
26873: Merged BRANCHES/V3.4 to BRANCHES/V3.4-TEAM:
26860: ALF-7101 and ALF-7866 - don't show the rules options to collaborators, as they shouldn't be able to create/manage rules
26874: Previous check-in (svn r. 26871 for ALF-7888) slightly broke the sample site for Team.
Refactored the SiteLoadPatch to fix that.
26875: ALF-7835 - args["itemTitle"] and args["page"] are already decoded, so don't try to decodeURIComponent them a second time when building the activity feed, otherwise it'll fail with special characters
26893: Fixed ALF-7821 & ALF-7967 by making the OpenOffice read-only as it's all pre-installed for Team and shouldn't be editable. Also removed the (Subsystem) from the OpenOffice label.
Also updated forms to remove the 'operations' button and move back to a Save/Cancel button as since Dave's changes to setAttributes() all the logic (including rollback of invalid properties) is now handled, meaning we no longer have to call the start() operation on the MBean.
26901: Merged V3.4 to V3.4-TEAM
26900: ALF-8180: The installer shouldn't randomly delete a directory called tomcat that it didn't create
- Fix provided by Bitrock
26905: Fix for ALF-8207 - Themes are not translated (not resolving title ids)
26910: Fixed ALF-8206 "ES - Layout dashlets"
26913: ALF-7838 - When paging the comments, do the reverse ordering before we page, rather than after
26920: More on ALF-7004. The notification templates (used in the send email action of a rule) now follow the look and feel of the mockups Linton did originally.
For this to work the MailActionExcecuter action needed the shareUrl, as all other email sending processes go through this action they no longer need to pass the shareUrl in. There was some inconsistency in how the URL was structured (sometimes with a trailing slash, sometimes not) so this has been cleaned up, which did mean more template updates.
As before, this will require a clean database to see the updated templates.
26921: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
26349: ALF-6062 - Add sorting by display name to the Group REST APIs that support paging
26375: ALF-6062 - Make sorting of groups in the rest API case insensitive.
26376: Correct long-incorrect indent and style stuff (at Gav's request)
26402: ALF-6062 - Paging and Sorting (Case Insensitive) for the Groups REST APIs
26423: ALF-6062 - Support sorting and paging of the child authorities and users of a group in the REST API, where previously only child groups were sortable and pageable
26924: Some of ALF-8223: Added form config for GoogleDocs properties currently present on MBean
26931: ALF-8092 - Convert the archived nodes webscript to the new style paging, which fixes an array index issue
26933: Fixed ALF-8156: Too many detailed options for filesystem configuration in Admin Console
Also made the position of 'enabled' properties consistent i.e. the first thing in the form/section.
26937: Build fix for FeedCleanerTest. Also a refactoring of the Site deletion prevention behaviour for ALF-7888.
This pattern should now be reusable outside the site service.
I took my BeforeDeleteNode behaviour off the st:site node type. It was registered in SiteAspect.java.
This was causing the test case failure as when I disabled behaviours on a site node before deletion, I was
disabling all behaviours, including the necessary FeedCleaner behaviour.
Added new aspect cm:undeletable
Sites now have cm:undeletable as a mandatory aspect
The BeforeDeleteNode behaviour that was attached to sites is now attached to cm:undeletable in UndeletableAspect.java
site-services-context.xml defines an undeletableAspect bean which registers the behaviour on cm:undeletable.
This could perhaps be moved into the NodeService. Will discuss on Monday.
26938: Fixes ALF-8196: Ensure that WebView title bar link is updated as soon as its set
26940: Fix for ALF-8036. Incorrect permissions copied when copying folder with permissions from one site to another.
Permissions on nodes held within share sites are now cleaned after a move or a copy to a different share site.
Cleaning in this context means permissions relating to the old site are removed and permission inheritance is turned on again. In this way the relocated nodes will look like they have just been uploaded, as requested in the issue comments.
A new method in the SiteService stack (cleanSitePermissions) is used to initiate this clean-up from the move-to, copy-to slingshot webscripts.
This is delegated to a new class/bean SitesPermissionCleaner which encapsulates the clean-up operation.
The cleanup must be recursive as there could be nodes anywhere within the relocated tree which have permissions directly set on them. The tree is walked using nodeDAOs for efficiency. The cleanup is performed with aclDAOs, again for efficiency.
This fix was developed on 3.4.2, but was backed out of there and is now checked in (effectively for the first time) on Team. This check-in will need to be merged to 3.4.3 at some point.
26941: Updating svn properties on root associated with check-in 26940 for ALF-8036.
Sorry. I forgot to check these in a moment ago.
26949: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
26945: ALF-3554 / ALF-8257 - Adding rules to a node applies a marker aspect, so update the Rules Service to remove this when all removes are deleted.
26950: Fix failing tests caused by r26920. Now that we rely on the Mail Action Executor to set the share URL for the templates, it's no longer available at the mock level when not calling the MailActionExecutor. Switch to a different model variable to check
26954: ALF-8232 - Paging controls in doclib can overlay on top of sorting controls at 1024 screen res when 8+ pages are present
26955: Follow-up to r26954 (ALF-8232). Remove local i18n messages for Links component.
26956: Fixed ALF-8223 "Google integration needs Admin Console to configure options"
26963: Fixed ALF-8223 "Google integration needs Admin Console to configure options"
26964: Fixed ALF-8226 "ES FR DE Site pages in Customise Site to be spaced"
- tested in FF3.5, SF3 & IE6,7,8
26966: Added missing theme ID string
26968: Merged V3.4-BUG-FIX to V3.4-TEAM
26967: Fix for ALF-8259 - Static Asset Cache use of the /res resource servlet has overwritten the cachecontrol values set by the filter.
26969: Moving the cm:undeletable aspect out of the SiteService and into the NodeService. Loosely related to ALF-7888.
The cm:deletable aspect has been renamed to sys:undeletable.
The class which registers the default behaviour, UndeletableAspect, has been moved into repo/node.
Various minor changes in model files & spring config required.
26970: ALF-8267 - Data Lists: search for user should not require minimum characters
26971: Fixed ALF-8280 "ALL LANG - conversor pdf2swf - untranslated"
26976: ALF-8271 - "Repository" appears as a destination when creating/editing linked rules in Doc Library.
Rules picker now switches available modes based on whether Repository browsing is allowed or not. Removed reference to non-existent file. Also made rules picker sensitive to changing picker mode or site.
26977: Fixes: ALF-7812: Adds support for multiday events.
26978: Fixes: ALF-6107 - Fixes Tab order isses with Add event form.
26979: Fix for ALF-8264. My Tasks incorrect capitalization.
26991: ALF-8276 - "Select" dialog when adding items to workflow shows more information than in should
26992: Fix for ALF-8288 - ES - Typo in serach result and also variable doesn't seem to work. Translation error, corrupted {0} strings pattern.
26993: ALF-8148 - Details page Permissions incorrectly shows No privileges
26994: Follow-up to r26993 (ALF-8148) for folders.
26995: ALF-8265 - Data Lists: inconsistent capitalization; tooltip text is wordy
26998: Fixes ALF-8091: Decode page URLs when removing dynamic welcome dashlets
27000: Merged V3.4-BUG-FIX to V3.4-TEAM
26999: Update to correct latest spring-webscripts-api jar
27001: Fixes: ALF-8119 (IE8 bugs) & ALF-8118 - Clears event data from form.
27005: Fixes: ALF-8168 - JSON encoding issue in Calendar API
27025: Slight tweak to login dialog for iOS user usability
27026: Fixes ALF-7764: Remove fade effect on title bar actions in IE to ensure correct image rendering
27035: ALF-8314 - Document Library: Comment displays poorly when first word of comment is short.
27040: Fix for ALF-8126 - Incorrect title of Transformer ImageMagick - missed labels
27076: Merged V3.4-BUG-FIX to V3.4-TEAM
26668: Fixes ALF-7920: Updated Linux/OSX config to add support for missing TIFF files in ImageMagic (dependant upon r26667 in ALF-BINARIES)
27084: Merged V3.4 to V3.4-TEAM
27083: ALF-8124: Corrected ${} placeholders in Japanese installer strings
27091: Merged V3.4 to V3.4-TEAM
26834: Fixes ALF-7904, ALF-8063: BitRock config updates
27093: Fix for ALF-8308. Cannot like a folder that has rules defined for it.
Added a necessary fix which prevents the exception being thrown.
27094: Fixed ALF-8223: Google integration needs Admin Console to configure options.
Also fixed a couple of other strings broken in a previous commit.
27102: Further fix for ALF-8223: Google integration needs Admin Console to configure options. Removed application name to leave just enabled checkbox, username and password fields.
27105: Fixed ALF-8277 & ALF-8253: Tooltips are not translated
The JMX attribute description is no longer returned by the form processor as 99% of the time they don't contain anything useful and they are not localised.
27106: Fix for ALF-8321: Cancel workflows move it to trashcan
27115: ALF-7826, ALF-7949, ALF-8180, ALF-7904, ALF-8063: Reconciled project-team.xml with changes in project.xml
27118: Merged V3.4-BUG-FIX to V3.4-TEAM
26669: Fixes ALF-7987: Ensure rollback directories are removed on uninstall
27119: ALF-8128: Propagate Team project name into Linux installer builder
27137: Merged V3.4 to V3.4-TEAM
27136: Installer string updates from Gloria
27140: Temporary workaround to prevent rules running on cm:rating nodes (which happened for 'liked' folders ALF-8308 & ALF-8382)
27162: Fixed ALF-8427 "Language packs: It's impossible to view any version of the wiki page if it contains native characters"
27166: Updates to the invitation email templates following delivery of new l10n files.
These changes were 'hand-merged' due to missing styling markup in the delivered l10n files.
The new files had all styling markup removed.
For the record, here's what I did:
I compared the new and old files foreach {de, es, fr, it, ja} and found that all changes were short, simple and easy to merge.
So I pasted in the main content div from the new l10n files, leaving all other styling markup (meaning css) unchanged.
For the record, here's what diff says changed in this check-in:
DE
53c53
<
---
>
55c55
< hat Sie eingeladen, als ${args["inviteeSiteRole"]} an der Site ${args["siteName"]} teilzunehmen.
---
> hat Sie eingeladen, mit der Rolle ${args["inviteeSiteRole"]} an der Site ${args["siteName"]} teilzunehmen.
62,63c62,63
< Benutzername: ${args["inviteeUserName"]}
< Passwort: ${args["inviteeGenPassword"]}
---
> Benutzername: ${args["inviteeUserName"]}
> Passwort: ${args["inviteeGenPassword"]}
66c66
<
Wir legen Ihnen nahe, das Passwort bei der ersten Anmeldung zu ändern.
---
>
Wir legen Ihnen nahe, das Passwort bei der ersten Anmeldung zu ändern.
ES
52,53c52,53
<
>
55c55
< le ha invitado a unirse al sitio ${args["siteName"]} con el rol de ${args["inviteeSiteRole"]}.
---
> le ha invitado a unirse al sitio ${args["siteName"]} con el rol de ${args["inviteeSiteRole"]}.
62,63c62,63
< Nombre de usuario: ${args["inviteeUserName"]}
< Contraseña: ${args["inviteeGenPassword"]}
---
> Nombre de usuario: ${args["inviteeUserName"]}
> Contraseña: ${args["inviteeGenPassword"]}
66,67c66,67
<
Le recomendamos que cambie la contraseña la primera vez que inicie una sesión.
< Para hacerlo, vaya a Mi Perfil y seleccione Cambiar contraseña.
---
>
Le recomendamos que cambie la contraseña la primera vez que inicie sesión.
> Para hacerlo, vaya a Mi perfil y seleccione Cambiar contraseña.
FR
53c53
<
---
>
55c55
< vous invite à rejoindre le site ${args["siteName"]} avec un rôle de ${args["inviteeSiteRole"]}.
---
> vous invite à rejoindre le site ${args["siteName"]} avec un rôle de ${args["inviteeSiteRole"]}.
62,63c62,63
< Nom d'utilisateur : ${args["inviteeUserName"]}
< Mot de passe : ${args["inviteeGenPassword"]}
---
> Nom d'utilisateur : ${args["inviteeUserName"]}
> Mot de passe : ${args["inviteeGenPassword"]}
66c66
<
Nous vous conseillons vivement de modifier votre mot de passe lors de votre première connexion.
---
>
Nous vous conseillons vivement de modifier votre mot de passe lors de votre première connexion.
70c70
<
Si vous souhaitez décliner l'invitation de ${inviterPerson.properties["cm:firstName"]!""} cliquez sur ce lien :
---
>
Si vous souhaitez décliner l'invitation de ${inviterPerson.properties["cm:firstName"]!""}’, cliquez sur ce lien :
IT
53c53
<
---
>
55c55
< ti ha inviatato a partecipare al sito ${args["siteName"]} con il ruolo di ${args["inviteeSiteRole"]}.
---
> sei stato inviatato a partecipare al sito ${args["siteName"]} con il ruolo di ${args["inviteeSiteRole"]}.
57c57
<
Fare clic sul collegamento per accettare l’invito dell'${inviterPerson.properties["cm:firstName"]!""}':
---
>
Fare clic sul collegamento per accettare ${inviterPerson.properties["cm:firstName"]!""}'s l'invito:
62,63c62,63
< Nome utente: ${args["inviteeUserName"]}
< Password: ${args["inviteeGenPassword"]}
---
> Nome utente: ${args["inviteeUserName"]}
> Password: ${args["inviteeGenPassword"]}
66c66
<
Si consiglia di cambiare la password quando si effettua l'eccesso per la prima volta.
---
>
Si consiglia di cambiare la password quando si effettua l'eccesso per la prima volta.
70c70
<
Per rifiutare l’invito dell’${inviterPerson.properties["cm:firstName"]!""}, fare clic su questo collegamento:
---
>
Per rifiutare ${inviterPerson.properties["cm:firstName"]!""}’s l'invito, fare clic su questo collegamento:
JA
53c53
<
---
>
55c55
< ????${args["siteName"]} ??????${args["inviteeSiteRole"]}?????????????????????
?????????????????????????????
27172: Fixed ALF-7856 "Team: DocLib action displaying incorrect tooltip text"
27339: ALF-8330 - ALL LANG - "Assigned To" in Data List created displays untranslated
27340: Fixes Encoding issue in L10N files.
27471: Fix for ALF-8150 - check for visibility before applying focus to element for IE.
27499: Drop one and two of updates from translators based on rev26820
27501: ALF-8151 - Filetype icon or is incorrectly displayed at the Content I'm editing dashlet
27507: ALF-8478: Default repeat interval for activity email notifications should be 1 day
27520: Fixed ALF-8329 "Consumer can add comments to files, folders, links and blogs"
27527: Fixes ALF-8409: Ensure that UTF-8 encoded characters in file names can be uploaded to folders (that may also contain UTF-8 encoded characters) via DND in FireFox 3.6
27531: Merged V3.4-BUG-FIX to V3.4-TEAM
27525: Merged V3.4 to V3.4-BUG-FIX
27120: Resolve ALF-8187: Transaction retries of CMIS webscripts failing
27543: Fixed ALF-8464 "Start Workflow: Search for groups still requires minimum 1 character"
27562: Merged V3.4-BUG-FIX to V3.4-TEAM
27560: Fix for ALF-8434 - AVMRemoteStore not setting UTF-8 response encoding for some methods
27572: Fixes: ALF-7596 - Config values not being correctly read in FTL
27573: Fixed ALF-8504: Non-admin users are warned about license expiry too soon
- ALF-8502 Adjust admin warning period from 30 to 21 days
- ALF-7259 RTEAM 33: RepoAdmin Web Script to report Red/Amber/Green
27592: Fixes: ALF-8444 - JA properties file in incorrect location.
27594: ALF-8508 - Document Library: Google Docs actions not correct
27596: Fixed ALF-8484 "Consumer and Contributor should not be able to choose button "Revert" of the document"
27598: Annotated properties file to indicate which text is exposed to the UI and therefore needs translating. Needed for: ALF-8442
27615: Fix for ALF-8501 - License warning box needs to be toned down in colour
27616: Tweak for IE
27617: Fixes: ALF-8423 - string missed in earlier merge
27619: ALF-7904: Synchronize alfresco-customteam-settings.xml with alfresco-customstack-postgres-settings.xml!
27625: ALF-7518 - Update Team Help and Tutorial URLs once finalised. * DO NOT MERGE *
Note: version.edition cannot be used as a placeholder due to the mismatch between "edition=Enterprise" and help URL containing "team"
27626: Change default value for "useTitle" to true for Site DocLib
27648: Fix for ALF-8552
27649: Fixed ALF-8495: Alfresco Logo is incorrectly displayed in notify user letter
Usual note with these checkins applies, clean database will be required to see the updated templates.
27650: Fixed ALF-8425: Select Tags button is missing at the Edit Properties page for msg files
27664: Issue checking in XSLX Google Docs (related to ALF-8580)
27667: ALF-7518 - Update Team Help and Tutorial URLs once finalised
New tutorial URL for Share, now hosted within main docs system; uh-tutorial.html topic page.
27683: Merged BRANCHES/DEV/dwebsterTeam to BRANCHES/V3.4-TEAM:
27675: DE: Drop 3 & 4 for Team translations based on r27552
27676: ES: Drop 3 & 4 for Team translations based on r27552
27677: FR: Drop 3 & 4 for Team translations based on r27552
27678: IT: Drop 3 & 4 for Team translations based on r27552
27679: JA: Drop 3 & 4 for Team translations based on r27552
27680: L10N updates to system-messages.properties (for License messages exposed to UI)
27686: Fixes: ALF-8266
27694: Change related to ALF-8556. Sometimes Google Docs cannot be checked out.
This change was suggested by Roy. cm:failedThumbnail nodes were deleted onUpdateProperties. Now they are only deleted if there are no locks preventing their deletion (e.g. due to being checked out.)
27710: Fixed ALF-7721: There are no field rescrtictions on 'Edit: Fileservers' form and ALF-8558: There is no pattern for Username field in Google Docs
27711: ALF-8590 - Check Out for some documents is not working
ALF-8591 - CheckIn form Google docs for some documents is not working
Google Docs-specific filter code added to Manage Aspects UI to remove "gd:googleEditable from the list of addable aspects unless the file's mimetype is supported (i.e. txt, doc, xls, ppt). Google Docs enabled ootb in team-config.
27713: GDoc - Fix for checkout of .odt files (see ALF-8599)
27723: Added back theme name string that was removed in rev 26971
27740: Updates from Gloria following bundle completeness analysis.
27755: Removed extra unused Japanese translation files.
27756: ALF-8207 - ALL LANG - Themes are not translated
27759: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
27758: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
27757: Fix for ALF-8430.
27761: JA Updates from Gloria following bundle completeness analysis.
27767: Fixes: ALF-8279 - reloads translation Gloria sent.
27768: ALF-8213 - Manage My Subscription link now directs to team.alfresco.com - tooltip from label added
27769: Fixes ALF-8652: Add removed quotes and revert translations back to correct language
27770: Fixes: ALF-8228: Column widening needed
27771: Initial commit of these translated files from Gloria.
27772: ALF-8555 - Incorrect behavior of enabling Google docs (Really: Forms get submitted twice in certain circumstances)
27773: ALF-8329 - Consumer can add comments to files, folders, links and blogs
Fixed: 8. Open details page for file and try to add comment --> comment added successfully;
27774: Spanish Gender Changes following review from Gloria.
27779: Final fixes from L10N completeness check.
27792: Remove debugging code from r27772
27804: ALF-8207 - ALL LANG - SpringSurf issue with default theme definition
27826: Manually reverts (to a version prior to r27683) a file in each language that was incorrectly supplied in English, and ensures they match the current EN properties.
27827: Fixes: ALF-8210
27843: Fix for ALF-8449 - ALL LANG - site themes are not translated (Customise Site page)
27873: Merged V3.4 to V3.4-TEAM:
27871: Fixes ALF-8124: Ensure Spanish locale for installer shows product name correctly
27883: Implementation of ALF-8737 Support for thumbnailing/previewing of additional mimetypes (Adobe). Also video/audio playbac
k.
This check in enables thumbnails for Adobe Photoshop, recent Adobe Illustrator files and previews for Adobe Photoshop, recent Adobe Illustrator files
as well as metadata extraction for Adobe Illustrator files (PDF-based formats).
It also enables video playback of .m4v files, where the browser supports it.
I have also added placeholder icons for .m4v files.
Adobe Photoshop (.psd) files are handled by ImageMagick. However our existing ImageMagick-based content transformer excludes most mimetypes that don't start with "image/". By allowing "application/photoshop" to be accepted, that transformer
will now perform thumbnails and previews.
Recent Adobe Illustrator file formats are pdf files and so can use the PDF transformers/extractors i.e. PDFRenderer and
PDFBox and pdf2swf.
I have added a new complex transformer for .ai files which uses the existing PDF/ImageMagick component transformers.
New JUnit test cases for these transforms.
As part of testing, we discovered that IE9 will not play mp3s of mimetype == audio/x-mpeg, only audio/mpeg.
The latter is the correct mimetype, the former is out of date, but Alfresco was using the former. So we've updated that MIME type in various places in the code.
27888: Google Docs
- Updated client google doc api jars
- Fixes ALF-8592: Incorrect behavior on permissions for Google docs
27894: Minor fixes for iOS:
. overflow content shown by default in dashlets
. doclib long filenames no longer cause screen to resize
. ipad css overrides
. YUI dialogs no longer jump around the page during text entry input
27904: Minor fixes for iOS usability:
. Drag&drop doclist help removed for mobile devices
. Create New DataList shows list as full height (not scrollable)
. Removed default webkit inner shadow from input fields
27915: Minor fixes for iOS usability: Forced scrollbar appearance on overflowed div elements
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@27939 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
config/alfresco/content-services-context.xml | 32 +
.../video-thumbnail-context.xml.sample | 2 +-
.../video-transformation-context.xml.sample | 8 +-
.../messages/action-config_de.properties | 4 +-
.../messages/action-config_fr.properties | 6 +-
.../messages/action-config_it.properties | 12 +-
.../messages/bootstrap-spaces_fr.properties | 2 +-
.../messages/content-model_es.properties | 10 +-
.../messages/content-model_it.properties | 6 +-
.../messages/data-list-model.properties | 6 +-
.../messages/data-list-model_de.properties | 16 +-
.../messages/data-list-model_es.properties | 10 +-
.../messages/data-list-model_fr.properties | 28 +-
.../messages/data-list-model_it.properties | 8 +-
.../messages/data-list-model_ja.properties | 84 +-
.../messages/email-server-model_de.properties | 2 +-
.../messages/invitation-service_de.properties | 2 +-
.../messages/invitation-service_es.properties | 2 +-
.../messages/invitation-service_fr.properties | 2 +-
.../messages/invitation-service_it.properties | 2 +-
.../messages/patch-service_ja.properties | 17 +
.../messages/site-service_de.properties | 2 +-
.../messages/site-service_fr.properties | 2 +-
.../messages/site-service_it.properties | 2 +-
.../messages/system-messages.properties | 6 +
.../messages/system-messages_de.properties | 24 +-
.../messages/system-messages_es.properties | 24 +-
.../messages/system-messages_fr.properties | 24 +-
.../messages/system-messages_it.properties | 24 +-
.../messages/system-messages_ja.properties | 27 +
.../messages/transfer-model_de.properties | 20 +-
.../messages/transfer-model_es.properties | 6 +-
.../messages/transfer-model_fr.properties | 170 +-
.../messages/transfer-service_de.properties | 6 +-
config/alfresco/model/bpmModel.xml | 2 +-
config/alfresco/model/contentModel.xml | 1 +
config/alfresco/model/siteModel.xml | 2 +
config/alfresco/model/systemModel.xml | 5 +
config/alfresco/node-services-context.xml | 42 +-
.../alfresco/patch/patch-services-context.xml | 1 +
config/alfresco/site-services-context.xml | 14 +-
.../default/activities-jobs.properties | 2 +-
.../googledocs/default/googledocs.properties | 4 +-
.../default/swf-transform-context.xml | 8 +
.../templates/activities-email-templates.acp | Bin 10328 -> 10323 bytes
.../alfresco/templates/email_templates2.acp | Bin 3958 -> 7726 bytes
.../templates/invite-email-templates.acp | Bin 10758 -> 10719 bytes
.../alfresco/templates/new-user-templates.acp | Bin 9107 -> 9148 bytes
config/alfresco/thumbnail-service-context.xml | 1 +
.../thumbnail_placeholder_doclib_m4v.png | Bin 0 -> 6080 bytes
.../action/executer/MailActionExecuter.java | 4 +
.../activities/feed/FeedNotifierImpl.java | 1 -
.../repo/admin/patch/impl/SiteLoadPatch.java | 28 +-
.../metadata/PdfBoxMetadataExtracter.java | 2 +-
.../metadata/PdfBoxMetadataExtracterTest.java | 11 +-
.../PdfBoxPdfToImageContentTransformer.java | 8 +-
...dfBoxPdfToImageContentTransformerTest.java | 31 +-
.../PdfToImageContentTransformer.java | 15 +-
...ctImageMagickContentTransformerWorker.java | 11 +-
.../googledocs/GoogleDocsServiceImpl.java | 41 +-
.../repo/invitation/site/InviteSender.java | 1 -
.../invitation/site/InviteSenderTest.java | 9 +-
.../alfresco/repo/jscript/ScriptUtils.java | 42 +
.../AbstractPropertyBackedBean.java | 78 +-
.../subsystems/PropertyBackedBean.java | 11 +
.../alfresco/repo/node/UndeletableAspect.java | 94 +
.../node/archive/ArchiveAndRestoreTest.java | 42 +-
.../repo/node/db/DbNodeServiceImpl.java | 53 +-
.../alfresco/repo/rule/RuleServiceImpl.java | 9 +
.../repo/rule/RuleServiceImplTest.java | 78 +-
.../org/alfresco/repo/rule/RuleTypeImpl.java | 4 +-
.../security/authority/script/Authority.java | 51 +
.../script/ScriptAuthorityService.java | 89 +-
.../authority/script/ScriptGroup.java | 723 +--
.../security/person/PersonServiceImpl.java | 1 -
.../org/alfresco/repo/site/SiteAspect.java | 2 +-
.../org/alfresco/repo/site/SiteModel.java | 15 +-
.../alfresco/repo/site/SiteServiceImpl.java | 54 +-
.../repo/site/SiteServiceImplTest.java | 207 +-
.../repo/site/SitesPermissionCleaner.java | 145 +
.../repo/site/script/ScriptSiteService.java | 34 +-
.../FailedThumbnailSourceAspect.java | 26 +-
.../repo/usage/RepoUsageComponentImpl.java | 6 +-
.../service/cmr/site/SiteService.java | 16 +-
source/java/org/alfresco/util/ModelUtil.java | 120 +-
.../java/org/alfresco/util/ModelUtilTest.java | 126 +
.../java/org/alfresco/util/PagingDetails.java | 50 +
source/test-resources/quick/quickCS3.ai | 3941 +++++++++++++++++
source/test-resources/quick/quickCS5.ai | 3888 ++++++++++++++++
89 files changed, 10039 insertions(+), 708 deletions(-)
create mode 100644 config/alfresco/thumbnail/thumbnail_placeholder_doclib_m4v.png
create mode 100644 source/java/org/alfresco/repo/node/UndeletableAspect.java
create mode 100644 source/java/org/alfresco/repo/site/SitesPermissionCleaner.java
create mode 100644 source/java/org/alfresco/util/ModelUtilTest.java
create mode 100644 source/java/org/alfresco/util/PagingDetails.java
create mode 100644 source/test-resources/quick/quickCS3.ai
create mode 100644 source/test-resources/quick/quickCS5.ai
diff --git a/config/alfresco/content-services-context.xml b/config/alfresco/content-services-context.xml
index fa4d0a5ad8..6e4e94014a 100644
--- a/config/alfresco/content-services-context.xml
+++ b/config/alfresco/content-services-context.xml
@@ -325,6 +325,38 @@
+
+
+
+
+
+ application/illustrator
+ image/jpeg
+
+
+ application/illustrator
+ image/png
+
+
+ application/illustrator
+ image/gif
+
+
+
+
+
+
+
+
+
+
+
+ image/png
+
+
+
+
diff --git a/config/alfresco/extension/video-thumbnail-context.xml.sample b/config/alfresco/extension/video-thumbnail-context.xml.sample
index 350dc0be08..ef03f3f3a4 100644
--- a/config/alfresco/extension/video-thumbnail-context.xml.sample
+++ b/config/alfresco/extension/video-thumbnail-context.xml.sample
@@ -237,7 +237,7 @@
-
+
diff --git a/config/alfresco/extension/video-transformation-context.xml.sample b/config/alfresco/extension/video-transformation-context.xml.sample
index 5778918f6b..093dd02920 100644
--- a/config/alfresco/extension/video-transformation-context.xml.sample
+++ b/config/alfresco/extension/video-transformation-context.xml.sample
@@ -358,7 +358,7 @@
audio/x-aiff
- audio/x-mpeg
+ audio/mpeg
@@ -366,7 +366,7 @@
audio/basic
- audio/x-mpeg
+ audio/mpeg
@@ -374,7 +374,7 @@
audio/x-wav
- audio/x-mpeg
+ audio/mpeg
@@ -382,7 +382,7 @@
audio/ogg
- audio/x-mpeg
+ audio/mpeg
diff --git a/config/alfresco/messages/action-config_de.properties b/config/alfresco/messages/action-config_de.properties
index 1441cc1439..ab51804737 100755
--- a/config/alfresco/messages/action-config_de.properties
+++ b/config/alfresco/messages/action-config_de.properties
@@ -68,7 +68,7 @@ remove-features.title=Aspekt entfernen
remove-features.description=Damit wird ein Aspekt aus dem passenden Element entfernt.
remove-features.aspect-name.display-label=Aspekt
-simple-workflow.title=Einfachen Workflow hinzuf\u00fcgen
+simple-workflow.title=Einfachen Workflow hinzuf\u00fcgen.
simple-workflow.description=Hiermit wird ein einfacher Workflow zu dem passenden Element hinzugef\u00fcgt. Damit kann das Element f\u00fcr den n\u00e4chsten Schritt in einem Workflow in einen anderen Raum verschoben werden. Wenn Sie einen Schritt ablehnen wollen, k\u00f6nnen Sie auch einen Raum angeben, in den verschoben werden soll.
simple-workflow.approve-step.display-label=Schritt zustimmen
simple-workflow.approve-folder.display-label=Ordner Schritt zustimmen
@@ -182,7 +182,7 @@ simple-avm-submit.description=Damit werden neuere Knoten im passenden Element im
simple-avm-promote.title=Einfache Sandbox Bef\u00f6rderung
simple-avm-promote.description=Damit werden neuere Knoten im passenden Element in die angegebene Ziel-Sandbox bef\u00f6rdert.
-simple-avm-promote.target-store.display-label=Name des AVM-Zielspeichers.
+simple-avm-promote.target-store.display-label=Name des AVM-Zielspeichers
avm-revert-store.title=Einen Single Knoten in einem Speicher zur\u00fccksetzen.
avm-revert-store.description=Damit werden alle Knoten einschlie\u00dflich des und nach dem Argument-Knoten in eine vorherige Version zur\u00fcckgesetzt.
diff --git a/config/alfresco/messages/action-config_fr.properties b/config/alfresco/messages/action-config_fr.properties
index 86e2ae2982..5d95ddff3b 100755
--- a/config/alfresco/messages/action-config_fr.properties
+++ b/config/alfresco/messages/action-config_fr.properties
@@ -15,7 +15,7 @@ ac-content-properties.size=Taille
# Action conditions
no-condition.title=Tous les \u00e9l\u00e9ments
-no-condition.description=Cette condition correspondra \u00e0 tout \u00e9l\u00e9ment de contenu ajout\u00e9 \u00e0 l'espace. Utiliser celle-ci quand vous souhaitez appliquer une action \u00e0 tout ce qui est ajout\u00e9 \u00e0 l'espace.
+no-condition.description=Cette condition correspondra \u00e0 tout \u00e9l\u00e9ment de contenu ajout\u00e9 \u00e0 l'espace. Utiliser la quand vous souhaitez appliquer une action \u00e0 tout ce qui est ajout\u00e9 \u00e0 l'espace.
compare-property-value.title=Le nom contient une valeur
compare-property-value.description=La r\u00e8gle s'applique \u00e0 tous les \u00e9l\u00e9ments dont les noms pr\u00e9sentent une valeur sp\u00e9cifique.
@@ -30,7 +30,7 @@ in-category.category-aspect.display-label=Aspect de la cat\u00e9gorie
in-category.category-value.display-label=Valeur de la cat\u00e9gorie
is-subtype.title=Contenu du type ou du sous-type
-is-subtype.description=La r\u00e8gle est appliqu\u00e9e \u00e0 tout \u00e9l\u00e9ment appartenant \u00e0 un type ou un sous-type sp\u00e9cifique
+is-subtype.description=La r\u00e8gle est appliqu\u00e9e \u00e0 tout les \u00e9l\u00e9ments pour lesquels l'aspect sp\u00e9cifi\u00e9 est associ\u00e9.
is-subtype.type.display-label=Type
has-aspect.title=Poss\u00e8de un aspect
@@ -184,7 +184,7 @@ simple-avm-promote.title=Simple transfert vers un bac \u00e0 sable
simple-avm-promote.description=Transf\u00e8re tout nouveau noeud de l'\u00e9l\u00e9ment dans le bac \u00e0 sable s\u00e9lectionn\u00e9.
simple-avm-promote.target-store.display-label=Nom du magasin AVM cible.
-avm-revert-store.title=R\u00e9tablir un noeud simple dans un magasin.
+avm-revert-store.title=R\u00e9tablir un noeud unique dans un magasin.
avm-revert-store.description=R\u00e9tablit une version pr\u00e9c\u00e9dente du noeud indiqu\u00e9 et des noeuds inf\u00e9rieurs.
avm-revert-store.version.display-label=Version \u00e0 r\u00e9tablir.
diff --git a/config/alfresco/messages/action-config_it.properties b/config/alfresco/messages/action-config_it.properties
index 3d3c09b4a4..d49f49e776 100755
--- a/config/alfresco/messages/action-config_it.properties
+++ b/config/alfresco/messages/action-config_it.properties
@@ -8,7 +8,7 @@ ac-compare-operations.greater_than_equal=\u00c8 maggiore di o uguale a
ac-compare-operations.less_than=\u00c8 minore di
ac-compare-operations.less_than_equal=\u00c8 minore di o uguale a
-ac-content-properties.mime_type=Mimetype
+ac-content-properties.mime_type=Tipo MIME
ac-content-properties.encoding=Codifica
ac-content-properties.size=Dimensioni
@@ -37,10 +37,10 @@ has-aspect.title=Ha l'aspetto
has-aspect.description=La regola viene applicata a tutti gli elementi con l'aspetto specificato.
has-aspect.aspect.display-label=Aspetto
-compare-mime-type.title=Contenuto di mimetype
-compare-mime-type.description=La regola viene applicata a tutti gli elementi il cui contenuto \u00e8 del mimetype specificato.
+compare-mime-type.title=Contenuto del Tipo MIME
+compare-mime-type.description=La regola viene applicata a tutti gli elementi il cui contenuto \u00e8 del Tipo MIME specificato.
compare-mime-type.property.display-label=Propriet\u00e0
-compare-mime-type.value.display-label=Mimetype
+compare-mime-type.value.display-label=Tipo MIME
composite-condition.title=Condizione composita
composite-condition.description=Combina pi\u00f9 condizioni in modo da creare una condizione pi\u00f9 complessa.
@@ -84,7 +84,7 @@ link-category.category-value.display-label=Valore della categoria
transform.title=Trasforma e copia contenuto
transform.description=Trasforma il contenuto corrispondente e copia il risultato in uno spazio specifico
-transform.mime-type.display-label=Mimetype
+transform.mime-type.display-label=Tipo MIME
transform.destination-folder.display-label=Cartella di destinazione
transform.assoc-type.display-label=Tipo di associazione
transform.assoc-name.display-label=Nome di associazione
@@ -92,7 +92,7 @@ transform.overwrite-copy.display-label=Sovrascrivi copia
transform-image.title=Trasforma e copia immagine
transform-image.description=Trasforma l'immagine corrispondente e copia il risultato in uno spazio specifico
-transform-image.mime-type.display-label=Mimetype
+transform-image.mime-type.display-label=Tipo MIME
transform-image.destination-folder.display-label=Cartella di destinazione
transform-image.assoc-type.display-label=Tipo di associazione
transform-image.assoc-name.display-label=Nome di associazione
diff --git a/config/alfresco/messages/bootstrap-spaces_fr.properties b/config/alfresco/messages/bootstrap-spaces_fr.properties
index 9e71f6d743..53f7d07843 100755
--- a/config/alfresco/messages/bootstrap-spaces_fr.properties
+++ b/config/alfresco/messages/bootstrap-spaces_fr.properties
@@ -102,7 +102,7 @@ version.french=Version fran\u00e7aise
version.german=Version allemande
version.italian=Version italienne
version.japanese=Version japonaise
-version.spanish=Version espagnol
+version.spanish=Version espagnole
spaces.web.client.extension.name=Extension client Web
spaces.web.client.extension.title=Client Web personnalis\u00e9
diff --git a/config/alfresco/messages/content-model_es.properties b/config/alfresco/messages/content-model_es.properties
index f96c805061..a4d8eb0621 100755
--- a/config/alfresco/messages/content-model_es.properties
+++ b/config/alfresco/messages/content-model_es.properties
@@ -34,7 +34,7 @@ cm_contentmodel.type.cm_person.title=Persona
cm_contentmodel.type.cm_person.description=Persona
cm_contentmodel.property.cm_userName.title=Nombre de usuario
-cm_contentmodel.property.cm_userName.description=Nombre de usuario de la persona
+cm_contentmodel.property.cm_userName.description=Nombre de usuario de la user/usuario
cm_contentmodel.property.cm_homeFolder.title=Carpeta de inicio
cm_contentmodel.property.cm_homeFolder.description=Carpeta de inicio de la persona
cm_contentmodel.property.cm_firstName.title=Nombre
@@ -45,12 +45,12 @@ cm_contentmodel.property.cm_middleName.title=Segundo nombre
cm_contentmodel.property.cm_middleName.description=Segundo nombre de la persona
cm_contentmodel.property.cm_email.title=Direcci\u00f3n de correo electr\u00f3nico
cm_contentmodel.property.cm_email.description=Direcci\u00f3n de correo electr\u00f3nico de la persona
-cm_contentmodel.property.cm_homeFolderProvider.title=Carpeta de inicio de proveedor
-cm_contentmodel.property.cm_homeFolderProvider.description=Carpeta de inicio de proveedor
+cm_contentmodel.property.cm_homeFolderProvider.title=Proveedor de carpeta de inicio
+cm_contentmodel.property.cm_homeFolderProvider.description=Proveedor de carpeta de inicio
cm_contentmodel.property.cm_defaultHomeFolderPath.title=Ruta de la carpeta de inicio
cm_contentmodel.property.cm_defaultHomeFolderPath.description=Ruta a la carpeta de inicio de la persona
-cm_contentmodel.property.cm_presenceProvider.title=Proveedor de Presense
-cm_contentmodel.property.cm_presenceProvider.description=Proveedor de Presense
+cm_contentmodel.property.cm_presenceProvider.title=Proveedor de Presencia
+cm_contentmodel.property.cm_presenceProvider.description=Proveedor de Presencia
cm_contentmodel.property.cm_presenceUsername.title=Nombre de usuario de Presense
cm_contentmodel.property.cm_presenceUsername.description=Nombre de usuario de Presense
cm_contentmodel.property.cm_jobtitle.title=Cargo
diff --git a/config/alfresco/messages/content-model_it.properties b/config/alfresco/messages/content-model_it.properties
index 9a74247f84..ff5e50ca14 100755
--- a/config/alfresco/messages/content-model_it.properties
+++ b/config/alfresco/messages/content-model_it.properties
@@ -91,7 +91,7 @@ cm_contentmodel.property.cm_userStatusTime.title=Ora stato
cm_contentmodel.property.cm_userStatusTime.description=Ora ultimo aggiornamento dello stato della persona
cm_contentmodel.property.cm_googleusername.title=Nome utente Google
cm_contentmodel.property.cm_googleusername.description=Nome utente Google della persona
-cm_contentmodel.property.cm_sizeCurrent.title=Uso
+cm_contentmodel.property.cm_sizeCurrent.title=Utilizzo
cm_contentmodel.property.cm_sizeCurrent.description=Quantit\u00e0 di spazio su disco utilizzata dalla persona
cm_contentmodel.property.cm_sizeQuota.title=Quota
cm_contentmodel.property.cm_sizeQuota.description=Quantit\u00e0 massima di spazio su disco utilizzabile dalla persona
@@ -110,8 +110,8 @@ cm_contentmodel.type.cm_category.description=Categoria
cm_contentmodel.association.cm_subcategories.title=Categorie
cm_contentmodel.association.cm_subcategories.description=Sottocategorie della categoria
-cm_contentmodel.aspect.cm_titled.title=Titled
-cm_contentmodel.aspect.cm_titled.description=Titled
+cm_contentmodel.aspect.cm_titled.title=Titolato
+cm_contentmodel.aspect.cm_titled.description=Titolato
cm_contentmodel.property.cm_title.title=Titolo
cm_contentmodel.property.cm_title.description=Titolo del contenuto
cm_contentmodel.property.cm_description.title=Descrizione
diff --git a/config/alfresco/messages/data-list-model.properties b/config/alfresco/messages/data-list-model.properties
index bc679b3897..5a4dd7012d 100755
--- a/config/alfresco/messages/data-list-model.properties
+++ b/config/alfresco/messages/data-list-model.properties
@@ -18,6 +18,7 @@ dl_datalistmodel.property.dl_todoPriority.title=Priority
dl_datalistmodel.property.dl_todoStatus.title=Status
dl_datalistmodel.property.dl_todoNotes.title=Notes
dl_datalistmodel.association.dl_assignee.title=Assignee
+dl_datalistmodel.association.dl_attachments.title=Attachments
# Gantt Aspect
dl_datalistmodel.property.dl_ganttStartDate.title=Start Date
@@ -30,7 +31,7 @@ dl_datalistmodel.type.dl_task.description=Advanced tasks list including title, d
dl_datalistmodel.property.dl_taskPriority.title=Priority
dl_datalistmodel.property.dl_taskStatus.title=Status
dl_datalistmodel.property.dl_taskComments.title=Comments
-dl_datalistmodel.property.dl_taskAssignee.title=Assignee
+dl_datalistmodel.association.dl_taskAssignee.title=Assignee
# Task List (Simple)
dl_datalistmodel.type.dl_simpletask.title=Task List (Simple)
@@ -61,8 +62,7 @@ dl_datalistmodel.property.dl_issuePriority.title=Priority
dl_datalistmodel.property.dl_issueDescription.title=Description
dl_datalistmodel.property.dl_issueDueDate.title=Due Date
dl_datalistmodel.property.dl_issueComments.title=Comments
-dl_datalistmodel.property.dl_issueAssignedTo.title=Assigned To
-dl_datalistmodel.property.dl_issueRelatedIssues.title=Related Issues
+dl_datalistmodel.association.dl_issueAssignedTo.title=Assigned To
# Event
dl_datalistmodel.type.dl_event.title=Event List
diff --git a/config/alfresco/messages/data-list-model_de.properties b/config/alfresco/messages/data-list-model_de.properties
index a45d849d04..b5904a5d66 100755
--- a/config/alfresco/messages/data-list-model_de.properties
+++ b/config/alfresco/messages/data-list-model_de.properties
@@ -11,17 +11,18 @@ dl_datalistmodel.type.dl_dataListItem.description=Elterntyp, von dem Mustertypen
## Simple "To do" List
dl_datalistmodel.type.dl_todoList.title=Liste zu erledigender Aufgaben
-dl_datalistmodel.type.dl_todoList.description=Einfache Liste zu erledigender Aufgaben mit optionalem Bevollm\u00e4chtigten
+dl_datalistmodel.type.dl_todoList.description=Einfache Liste zu erledigender Aufgaben mit optionalem Bevollm\u00e4chtigten.
dl_datalistmodel.property.dl_todoTitle.title=Titel
dl_datalistmodel.property.dl_todoDueDate.title=F\u00e4lligkeitsdatum
dl_datalistmodel.property.dl_todoPriority.title=Priorit\u00e4t
dl_datalistmodel.property.dl_todoStatus.title=Status
dl_datalistmodel.property.dl_todoNotes.title=Notizen
dl_datalistmodel.association.dl_assignee.title=Bevollm\u00e4chtigter
+dl_datalistmodel.association.dl_attachments.title=Anlagen
# Gantt Aspect
dl_datalistmodel.property.dl_ganttStartDate.title=Anfangsdatum
-dl_datalistmodel.property.dl_ganttEndDate.title=Ende Datum
+dl_datalistmodel.property.dl_ganttEndDate.title=Enddatum
dl_datalistmodel.property.dl_ganttPercentComplete.title=% Abgeschlossen
# Task List (Advanced)
@@ -30,11 +31,11 @@ dl_datalistmodel.type.dl_task.description=Erweiterte Aufgabenliste einschlie\u00
dl_datalistmodel.property.dl_taskPriority.title=Priorit\u00e4t
dl_datalistmodel.property.dl_taskStatus.title=Status
dl_datalistmodel.property.dl_taskComments.title=Kommentare
-dl_datalistmodel.property.dl_taskAssignee.title=Bevollm\u00e4chtigter
+dl_datalistmodel.association.dl_taskAssignee.title=Bevollm\u00e4chtigter
# Task List (Simple)
dl_datalistmodel.type.dl_simpletask.title=Aufgabenliste (Einfach)
-dl_datalistmodel.type.dl_simpletask.description=Einfache Aufgabenliste einschlie\u00dflich Titel, Beschreibung, F\u00e4lligkeitsdatum, Priorit\u00e4t, Status, Kommentaren
+dl_datalistmodel.type.dl_simpletask.description=Einfache Aufgabenliste einschlie\u00dflich Titel, Beschreibung, F\u00e4lligkeitsdatum, Priorit\u00e4t, Status, Kommentaren
dl_datalistmodel.property.dl_simpletaskDueDate.title=F\u00e4lligkeitsdatum
dl_datalistmodel.property.dl_simpletaskPriority.title=Priorit\u00e4t
dl_datalistmodel.property.dl_simpletaskStatus.title=Status
@@ -61,13 +62,12 @@ dl_datalistmodel.property.dl_issuePriority.title=Priorit\u00e4t
dl_datalistmodel.property.dl_issueDescription.title=Beschreibung
dl_datalistmodel.property.dl_issueDueDate.title=F\u00e4lligkeitsdatum
dl_datalistmodel.property.dl_issueComments.title=Kommentare
-dl_datalistmodel.property.dl_issueAssignedTo.title=Zugewiesen an
-dl_datalistmodel.property.dl_issueRelatedIssues.title=\u00c4hnliche Elemente
+dl_datalistmodel.association.dl_issueAssignedTo.title=Zugewiesen an
# Event
dl_datalistmodel.type.dl_event.title=Ereignisliste
dl_datalistmodel.type.dl_event.description=Ereignisliste einschlie\u00dflich Titel, Beschreibung, Ort, Anfangs- und Enddatum/-zeit
-dl_datalistmodel.property.dl_eventLocation.title=Ort
+dl_datalistmodel.property.dl_eventLocation.title=Speicherort
dl_datalistmodel.property.dl_eventStartDate.title=Anfangsdatum
dl_datalistmodel.property.dl_eventEndDate.title=Enddatum
dl_datalistmodel.property.dl_eventRegistrations.title=Registrierungen
@@ -100,4 +100,4 @@ dl_datalistmodel.property.dl_eventAgendaEndTime.title=Endzeit
dl_datalistmodel.property.dl_eventAgendaSessionName.title=Name der Sitzung
dl_datalistmodel.property.dl_eventAgendaPresenter.title=Pr\u00e4sentator
dl_datalistmodel.property.dl_eventAgendaAudience.title=Publikum
-dl_datalistmodel.property.dl_eventAgendaNotes.title=Notizen
+dl_datalistmodel.property.dl_eventAgendaNotes.title=Notizen
\ No newline at end of file
diff --git a/config/alfresco/messages/data-list-model_es.properties b/config/alfresco/messages/data-list-model_es.properties
index 9e92d13611..0d980db2fa 100755
--- a/config/alfresco/messages/data-list-model_es.properties
+++ b/config/alfresco/messages/data-list-model_es.properties
@@ -17,7 +17,8 @@ dl_datalistmodel.property.dl_todoDueDate.title=Fecha de vencimiento
dl_datalistmodel.property.dl_todoPriority.title=Prioridad
dl_datalistmodel.property.dl_todoStatus.title=Estado
dl_datalistmodel.property.dl_todoNotes.title=Notas
-dl_datalistmodel.association.dl_assignee.title=Usuario a asignar la tarea
+dl_datalistmodel.association.dl_assignee.title=Asignado a
+dl_datalistmodel.association.dl_attachments.title=Adjuntos
# Gantt Aspect
dl_datalistmodel.property.dl_ganttStartDate.title=Fecha de inicio
@@ -30,7 +31,7 @@ dl_datalistmodel.type.dl_task.description=Lista de tareas avanzada, incluyendo t
dl_datalistmodel.property.dl_taskPriority.title=Prioridad
dl_datalistmodel.property.dl_taskStatus.title=Estado
dl_datalistmodel.property.dl_taskComments.title=Comentarios
-dl_datalistmodel.property.dl_taskAssignee.title=Usuario a asignar la tarea
+dl_datalistmodel.association.dl_taskAssignee.title=Asignado a
# Task List (Simple)
dl_datalistmodel.type.dl_simpletask.title=Lista de tareas (sencillas)
@@ -61,8 +62,7 @@ dl_datalistmodel.property.dl_issuePriority.title=Prioridad
dl_datalistmodel.property.dl_issueDescription.title=Descripci\u00f3n
dl_datalistmodel.property.dl_issueDueDate.title=Fecha de vencimiento
dl_datalistmodel.property.dl_issueComments.title=Comentarios
-dl_datalistmodel.property.dl_issueAssignedTo.title=Asignado a
-dl_datalistmodel.property.dl_issueRelatedIssues.title=Temas relacionados
+dl_datalistmodel.association.dl_issueAssignedTo.title=Asignado a
# Event
dl_datalistmodel.type.dl_event.title=Lista de eventos
@@ -100,4 +100,4 @@ dl_datalistmodel.property.dl_eventAgendaEndTime.title=Hora de fin
dl_datalistmodel.property.dl_eventAgendaSessionName.title=Nombre de sesi\u00f3n
dl_datalistmodel.property.dl_eventAgendaPresenter.title=Participante
dl_datalistmodel.property.dl_eventAgendaAudience.title=Audiencia
-dl_datalistmodel.property.dl_eventAgendaNotes.title=Notas
+dl_datalistmodel.property.dl_eventAgendaNotes.title=Notas
\ No newline at end of file
diff --git a/config/alfresco/messages/data-list-model_fr.properties b/config/alfresco/messages/data-list-model_fr.properties
index ce8a674aa0..d9652382a3 100755
--- a/config/alfresco/messages/data-list-model_fr.properties
+++ b/config/alfresco/messages/data-list-model_fr.properties
@@ -13,14 +13,15 @@ dl_datalistmodel.type.dl_dataListItem.description=Type parent \u00e0 partir duqu
dl_datalistmodel.type.dl_todoList.title=Liste de t\u00e2ches
dl_datalistmodel.type.dl_todoList.description=Une liste de t\u00e2ches avec acteur facultatif.
dl_datalistmodel.property.dl_todoTitle.title=Titre
-dl_datalistmodel.property.dl_todoDueDate.title=Ech\u00e9ance
+dl_datalistmodel.property.dl_todoDueDate.title=Date d'\u00e9ch\u00e9ance
dl_datalistmodel.property.dl_todoPriority.title=Priorit\u00e9
-dl_datalistmodel.property.dl_todoStatus.title=Etat
+dl_datalistmodel.property.dl_todoStatus.title=Statut
dl_datalistmodel.property.dl_todoNotes.title=Notes
dl_datalistmodel.association.dl_assignee.title=Personne assign\u00e9e
+dl_datalistmodel.association.dl_attachments.title=El\u00e9ments attach\u00e9s
# Gantt Aspect
-dl_datalistmodel.property.dl_ganttStartDate.title=Date de d\u00e9but
+dl_datalistmodel.property.dl_ganttStartDate.title=Date de D\u00e9but
dl_datalistmodel.property.dl_ganttEndDate.title=Date de fin
dl_datalistmodel.property.dl_ganttPercentComplete.title=% achev\u00e9
@@ -28,16 +29,16 @@ dl_datalistmodel.property.dl_ganttPercentComplete.title=% achev\u00e9
dl_datalistmodel.type.dl_task.title=Liste de t\u00e2ches (avanc\u00e9es)
dl_datalistmodel.type.dl_task.description=Liste de t\u00e2ches avanc\u00e9es comprenant le titre, la description, les dates de d\u00e9but et de fin, la priorit\u00e9, le statut, les commentaires, les acteurs et les pi\u00e8ces jointes.
dl_datalistmodel.property.dl_taskPriority.title=Priorit\u00e9
-dl_datalistmodel.property.dl_taskStatus.title=Etat
+dl_datalistmodel.property.dl_taskStatus.title=Statut
dl_datalistmodel.property.dl_taskComments.title=Commentaires
-dl_datalistmodel.property.dl_taskAssignee.title=Personne assign\u00e9e
+dl_datalistmodel.association.dl_taskAssignee.title=Personne assign\u00e9e
# Task List (Simple)
dl_datalistmodel.type.dl_simpletask.title=Liste de t\u00e2ches (simples)
dl_datalistmodel.type.dl_simpletask.description=Liste de t\u00e2ches simples comprenant le titre, la description, la date d'\u00e9ch\u00e9ance, la priorit\u00e9, le statut et les commentaires.
-dl_datalistmodel.property.dl_simpletaskDueDate.title=Ech\u00e9ance
+dl_datalistmodel.property.dl_simpletaskDueDate.title=Date d'\u00e9ch\u00e9ance
dl_datalistmodel.property.dl_simpletaskPriority.title=Priorit\u00e9
-dl_datalistmodel.property.dl_simpletaskStatus.title=Etat
+dl_datalistmodel.property.dl_simpletaskStatus.title=Statut
dl_datalistmodel.property.dl_simpletaskComments.title=Commentaires
# Contact
@@ -56,13 +57,12 @@ dl_datalistmodel.property.dl_contactNotes.title=Notes
dl_datalistmodel.type.dl_issue.title=Liste de publications
dl_datalistmodel.type.dl_issue.description=Liste de publications comprenant l'identifiant, le statut, la priorit\u00e9, la description, la date d'\u00e9ch\u00e9ance, les commentaires, l'assignation et les publications apparent\u00e9es.
dl_datalistmodel.property.dl_issueID.title=Identifiant de publication
-dl_datalistmodel.property.dl_issueStatus.title=Etat
+dl_datalistmodel.property.dl_issueStatus.title=Statut
dl_datalistmodel.property.dl_issuePriority.title=Priorit\u00e9
dl_datalistmodel.property.dl_issueDescription.title=Description
-dl_datalistmodel.property.dl_issueDueDate.title=Ech\u00e9ance
+dl_datalistmodel.property.dl_issueDueDate.title=Date d'\u00e9ch\u00e9ance
dl_datalistmodel.property.dl_issueComments.title=Commentaires
-dl_datalistmodel.property.dl_issueAssignedTo.title=Assign\u00e9 \u00e0
-dl_datalistmodel.property.dl_issueRelatedIssues.title=Publications apparent\u00e9es
+dl_datalistmodel.association.dl_issueAssignedTo.title=Assign\u00e9 \u00e0
# Event
dl_datalistmodel.type.dl_event.title=Liste d'\u00e9v\u00e9nements
@@ -77,8 +77,8 @@ dl_datalistmodel.property.dl_eventNote.title=Notes
dl_datalistmodel.type.dl_location.title=Carnet d'adresses
dl_datalistmodel.type.dl_location.description=Carnet d'adresses
dl_datalistmodel.property.dl_locationAddress1.title=Adresse (ligne\u00a01)
-dl_datalistmodel.property.dl_locationAddress2.title=Adresse (ligne\u00a02)
-dl_datalistmodel.property.dl_locationAddress3.title=Adresse (ligne\u00a03)
+dl_datalistmodel.property.dl_locationAddress2.title=Adresse (ligne 2)
+dl_datalistmodel.property.dl_locationAddress3.title=Adresse (ligne 3)
dl_datalistmodel.property.dl_locationZip.title=Code postal
dl_datalistmodel.property.dl_locationState.title=D\u00e9partement
dl_datalistmodel.property.dl_locationCountry.title=Pays
@@ -100,4 +100,4 @@ dl_datalistmodel.property.dl_eventAgendaEndTime.title=Heure de fin
dl_datalistmodel.property.dl_eventAgendaSessionName.title=Nom de la s\u00e9ance
dl_datalistmodel.property.dl_eventAgendaPresenter.title=Intervenant
dl_datalistmodel.property.dl_eventAgendaAudience.title=Auditoire
-dl_datalistmodel.property.dl_eventAgendaNotes.title=Notes
+dl_datalistmodel.property.dl_eventAgendaNotes.title=Notes
\ No newline at end of file
diff --git a/config/alfresco/messages/data-list-model_it.properties b/config/alfresco/messages/data-list-model_it.properties
index 16f6e5598e..26c5ebdf64 100755
--- a/config/alfresco/messages/data-list-model_it.properties
+++ b/config/alfresco/messages/data-list-model_it.properties
@@ -18,6 +18,7 @@ dl_datalistmodel.property.dl_todoPriority.title=Priorit\u00e0
dl_datalistmodel.property.dl_todoStatus.title=Stato
dl_datalistmodel.property.dl_todoNotes.title=Note
dl_datalistmodel.association.dl_assignee.title=Assegnatario
+dl_datalistmodel.association.dl_attachments.title=Allegati
# Gantt Aspect
dl_datalistmodel.property.dl_ganttStartDate.title=Data di inizio
@@ -30,7 +31,7 @@ dl_datalistmodel.type.dl_task.description=Elenco di compiti avanzato contenente
dl_datalistmodel.property.dl_taskPriority.title=Priorit\u00e0
dl_datalistmodel.property.dl_taskStatus.title=Stato
dl_datalistmodel.property.dl_taskComments.title=Commenti
-dl_datalistmodel.property.dl_taskAssignee.title=Assegnatario
+dl_datalistmodel.association.dl_taskAssignee.title=Assegnatario
# Task List (Simple)
dl_datalistmodel.type.dl_simpletask.title=Elenco di compiti (semplice)
@@ -61,8 +62,7 @@ dl_datalistmodel.property.dl_issuePriority.title=Priorit\u00e0
dl_datalistmodel.property.dl_issueDescription.title=Descrizione
dl_datalistmodel.property.dl_issueDueDate.title=Data di scadenza
dl_datalistmodel.property.dl_issueComments.title=Commenti
-dl_datalistmodel.property.dl_issueAssignedTo.title=Assegnato a
-dl_datalistmodel.property.dl_issueRelatedIssues.title=Problemi correlati
+dl_datalistmodel.association.dl_issueAssignedTo.title=Assegnato a
# Event
dl_datalistmodel.type.dl_event.title=Elenco di eventi
@@ -100,4 +100,4 @@ dl_datalistmodel.property.dl_eventAgendaEndTime.title=Ora di fine
dl_datalistmodel.property.dl_eventAgendaSessionName.title=Nome sessione
dl_datalistmodel.property.dl_eventAgendaPresenter.title=Relatore
dl_datalistmodel.property.dl_eventAgendaAudience.title=Destinatari
-dl_datalistmodel.property.dl_eventAgendaNotes.title=Note
+dl_datalistmodel.property.dl_eventAgendaNotes.title=Note
\ No newline at end of file
diff --git a/config/alfresco/messages/data-list-model_ja.properties b/config/alfresco/messages/data-list-model_ja.properties
index 57c21ab98e..195a150ea0 100755
--- a/config/alfresco/messages/data-list-model_ja.properties
+++ b/config/alfresco/messages/data-list-model_ja.properties
@@ -1,103 +1,103 @@
# Display labels for Share Data Lists Model
-dl_datalistmodel.description=Alfresco Share Data List Model
+dl_datalistmodel.description=Alfresco Share\u30c7\u30fc\u30bf\u30fb\u30ea\u30b9\u30c8\u30fb\u30e2\u30c7\u30eb
-dl_datalistmodel.type.dl_dataList.title=\u30c7\u30fc\u30bf\u30ea\u30b9\u30c8\u30fb\u30d5\u30a9\u30eb\u30c0\u30bf\u30a4\u30d7
-dl_datalistmodel.type.dl_dataList.description= dl:dataListItemType\u30d7\u30ed\u30d1\u30c6\u30a3\u3067\u6307\u5b9a\u3055\u308c\u308b\u30bf\u30a4\u30d7\u306e\u30c7\u30fc\u30bf\u30ea\u30b9\u30c8\u30a2\u30a4\u30c6\u30e0\u3092\u4fdd\u6301\u3057\u307e\u3059\u3002
-dl_datalistmodel.property.dl_dataListItemType.title=\u30c7\u30fc\u30bf\u30ea\u30b9\u30c8\u30fb\u30a2\u30a4\u30c6\u30e0\u30bf\u30a4\u30d7
-dl_datalistmodel.property.dl_dataListItemType.description=\u30c7\u30fc\u30bf\u30ea\u30b9\u30c8\u5185\u306b\u65b0\u898f\u30a2\u30a4\u30c6\u30e0\u304c\u4f5c\u3089\u308c\u305f\u6642\u306b\u3001\u3069\u306edl:dataListItem\u306e\u30b5\u30d6\u30bf\u30a4\u30d7\u3092\u4f7f\u7528\u3059\u308b\u304b\u3092\u6c7a\u5b9a\u3057\u307e\u3059\u3002
+dl_datalistmodel.type.dl_dataList.title=\u30c7\u30fc\u30bf\u30fb\u30ea\u30b9\u30c8\u30fb\u30d5\u30a9\u30eb\u30c0\u306e\u30bf\u30a4\u30d7
+dl_datalistmodel.type.dl_dataList.description=dl:dataListItemType\u30d7\u30ed\u30d1\u30c6\u30a3\u3067\u6307\u5b9a\u3055\u308c\u305f\u30bf\u30a4\u30d7\u306e\u30c7\u30fc\u30bf\u30fb\u30ea\u30b9\u30c8\u30fb\u30a2\u30a4\u30c6\u30e0\u3092\u4fdd\u6301\u3057\u307e\u3059\u3002
+dl_datalistmodel.property.dl_dataListItemType.title=\u30c7\u30fc\u30bf\u30fb\u30ea\u30b9\u30c8\u30fb\u30a2\u30a4\u30c6\u30e0\u306e\u30bf\u30a4\u30d7
+dl_datalistmodel.property.dl_dataListItemType.description=\u30c7\u30fc\u30bf\u30fb\u30ea\u30b9\u30c8\u306b\u65b0\u898f\u30a2\u30a4\u30c6\u30e0\u3092\u4f5c\u6210\u3059\u308b\u3068\u304d\u306b\u4f7f\u7528\u3059\u308bdl:dataListItem\u306e\u30b5\u30d6\u30bf\u30a4\u30d7\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
-dl_datalistmodel.type.dl_dataListItem.title=\u30c7\u30fc\u30bf\u30ea\u30b9\u30c8\u89aa\u30bf\u30a4\u30d7
-dl_datalistmodel.type.dl_dataListItem.description=\u30b5\u30f3\u30d7\u30eb\u306e\u30c7\u30fc\u30bf\u30ea\u30b9\u30c8\u30fb\u30a2\u30a4\u30c6\u30e0\u30bf\u30a4\u30d7\u3092\u6d3e\u751f\u3059\u308b\u89aa\u30bf\u30a4\u30d7\u3002
+dl_datalistmodel.type.dl_dataListItem.title=\u30c7\u30fc\u30bf\u30fb\u30ea\u30b9\u30c8\u306e\u89aa\u30bf\u30a4\u30d7
+dl_datalistmodel.type.dl_dataListItem.description=\u89aa\u30bf\u30a4\u30d7\u3068\u306f\u3001\u30b5\u30f3\u30d7\u30eb\u306e\u30c7\u30fc\u30bf\u30fb\u30ea\u30b9\u30c8\u30fb\u30a2\u30a4\u30c6\u30e0\u306e\u30bf\u30a4\u30d7\u304c\u5f93\u5c5e\u3059\u308b\u30bf\u30a4\u30d7\u3092\u6307\u3057\u307e\u3059\u3002
## Simple "To do" List
-dl_datalistmodel.type.dl_todoList.title=\u4e88\u5b9a\u30ea\u30b9\u30c8
-dl_datalistmodel.type.dl_todoList.description=\u30aa\u30d7\u30b7\u30e7\u30f3\u3067\u62c5\u5f53\u8005\u3092\u5272\u308a\u5f53\u3066\u308b\u5358\u7d14\u306a\u30ea\u30b9\u30c8
+dl_datalistmodel.type.dl_todoList.title=To Do\u30ea\u30b9\u30c8
+dl_datalistmodel.type.dl_todoList.description=\u30b7\u30f3\u30d7\u30eb\u306aTo Do\u30ea\u30b9\u30c8\u3067\u3001\u62c5\u5f53\u8005\u304c\u5272\u308a\u5f53\u3066\u3089\u308c\u3066\u3044\u308b\u5834\u5408\u306f\u305d\u306e\u60c5\u5831\u3082\u8868\u793a\u3055\u308c\u307e\u3059\u3002
dl_datalistmodel.property.dl_todoTitle.title=\u30bf\u30a4\u30c8\u30eb
dl_datalistmodel.property.dl_todoDueDate.title=\u7de0\u5207\u65e5
dl_datalistmodel.property.dl_todoPriority.title=\u512a\u5148
dl_datalistmodel.property.dl_todoStatus.title=\u30b9\u30c6\u30fc\u30bf\u30b9
dl_datalistmodel.property.dl_todoNotes.title=\u30e1\u30e2
dl_datalistmodel.association.dl_assignee.title=\u62c5\u5f53\u8005
+dl_datalistmodel.association.dl_attachments.title=\u6dfb\u4ed8
# Gantt Aspect
dl_datalistmodel.property.dl_ganttStartDate.title=\u958b\u59cb\u65e5
dl_datalistmodel.property.dl_ganttEndDate.title=\u7d42\u4e86\u65e5
-dl_datalistmodel.property.dl_ganttPercentComplete.title=% \u5b8c\u4e86
+dl_datalistmodel.property.dl_ganttPercentComplete.title=%\u5b8c\u4e86
# Task List (Advanced)
-dl_datalistmodel.type.dl_task.title=\u30bf\u30b9\u30af\u30ea\u30b9\u30c8\uff08\u8a73\u7d30\u7248\uff09
-dl_datalistmodel.type.dl_task.description=\u8a73\u7d30\u7248\u30bf\u30b9\u30af\u30ea\u30b9\u30c8\u306b\u306f\u30bf\u30a4\u30c8\u30eb\u3001\u8aac\u660e\u3001\u958b\u59cb\u65e5\u3068\u7d42\u4e86\u65e5\u3001\u512a\u5148\u5ea6\u3001\u30b9\u30c6\u30fc\u30bf\u30b9\u3001\u30b3\u30e1\u30f3\u30c8\u3001\u62c5\u5f53\u8005\u3001\u6dfb\u4ed8\u306a\u3069\u304c\u542b\u307e\u308c\u307e\u3059\u3002
+dl_datalistmodel.type.dl_task.title=\u30bf\u30b9\u30af\u30fb\u30ea\u30b9\u30c8\uff08\u30a2\u30c9\u30d0\u30f3\u30b9\u30c9\uff09
+dl_datalistmodel.type.dl_task.description=\u30a2\u30c9\u30d0\u30f3\u30b9\u30c9\u30fb\u30bf\u30b9\u30af\u30fb\u30ea\u30b9\u30c8\u306b\u306f\u3001\u30bf\u30a4\u30c8\u30eb\u3001\u8aac\u660e\u3001\u958b\u59cb\u65e5\u3001\u7d42\u4e86\u65e5\u3001\u512a\u5148\u3001\u30b9\u30c6\u30fc\u30bf\u30b9\u3001\u30b3\u30e1\u30f3\u30c8\u3001\u62c5\u5f53\u8005\u3001\u6dfb\u4ed8\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002
dl_datalistmodel.property.dl_taskPriority.title=\u512a\u5148
dl_datalistmodel.property.dl_taskStatus.title=\u30b9\u30c6\u30fc\u30bf\u30b9
dl_datalistmodel.property.dl_taskComments.title=\u30b3\u30e1\u30f3\u30c8
-dl_datalistmodel.property.dl_taskAssignee.title=\u62c5\u5f53\u8005
+dl_datalistmodel.association.dl_taskAssignee.title=\u62c5\u5f53\u8005
# Task List (Simple)
-dl_datalistmodel.type.dl_simpletask.title=\u30bf\u30b9\u30af\u30ea\u30b9\u30c8\uff08\u7c21\u6613\u7248\uff09
-dl_datalistmodel.type.dl_simpletask.description=\u7c21\u6613\u7248\u30bf\u30b9\u30af\u30ea\u30b9\u30c8\u306b\u306f\u30bf\u30a4\u30c8\u30eb\u3001\u8aac\u660e\u3001\u7de0\u5207\u65e5\u3001\u512a\u5148\u3001\u30b9\u30c6\u30fc\u30bf\u30b9\u3001\u30b3\u30e1\u30f3\u30c8\u306a\u3069\u304c\u542b\u307e\u308c\u307e\u3059\u3002
+dl_datalistmodel.type.dl_simpletask.title=\u30bf\u30b9\u30af\u30fb\u30ea\u30b9\u30c8\uff08\u7c21\u6613\uff09
+dl_datalistmodel.type.dl_simpletask.description=\u7c21\u6613\u30bf\u30b9\u30af\u30fb\u30ea\u30b9\u30c8\u306b\u306f\u3001\u30bf\u30a4\u30c8\u30eb\u3001\u8aac\u660e\u3001\u7de0\u5207\u65e5\u3001\u512a\u5148\u3001\u30b9\u30c6\u30fc\u30bf\u30b9\u3001\u30b3\u30e1\u30f3\u30c8\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002
dl_datalistmodel.property.dl_simpletaskDueDate.title=\u7de0\u5207\u65e5
dl_datalistmodel.property.dl_simpletaskPriority.title=\u512a\u5148
dl_datalistmodel.property.dl_simpletaskStatus.title=\u30b9\u30c6\u30fc\u30bf\u30b9
dl_datalistmodel.property.dl_simpletaskComments.title=\u30b3\u30e1\u30f3\u30c8
# Contact
-dl_datalistmodel.type.dl_contact.title=\u30b3\u30f3\u30bf\u30af\u30c8\u30ea\u30b9\u30c8
-dl_datalistmodel.type.dl_contact.description=\u30b3\u30f3\u30bf\u30af\u30c8\u30ea\u30b9\u30c8\u306b\u306f\u3001\u59d3\u3001\u540d\u3001\u30d5\u30eb\u30cd\u30fc\u30e0\u3001E\u30e1\u30fc\u30eb\u3001\u5f79\u8077\u540d\u3001\u96fb\u8a71\uff08\u30aa\u30d5\u30a3\u30b9\uff09\u3001\u96fb\u8a71\uff08\u643a\u5e2f\uff09\u304c\u542b\u307e\u308c\u307e\u3059\u3002
+dl_datalistmodel.type.dl_contact.title=\u9023\u7d61\u5148\u30ea\u30b9\u30c8
+dl_datalistmodel.type.dl_contact.description=\u9023\u7d61\u5148\u30ea\u30b9\u30c8\u306b\u306f\u3001\u59d3\u3001\u540d\u3001\u30d5\u30eb\u30fb\u30cd\u30fc\u30e0\u3001E\u30e1\u30fc\u30eb\u3001\u5f79\u8077\u540d\u3001\u96fb\u8a71\uff08\u4f1a\u793e\uff09\u3001\u96fb\u8a71\uff08\u643a\u5e2f\uff09\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002
dl_datalistmodel.property.dl_contactFirstName.title=\u540d
dl_datalistmodel.property.dl_contactLastName.title=\u59d3
dl_datalistmodel.property.dl_contactEmail.title=E\u30e1\u30fc\u30eb
dl_datalistmodel.property.dl_contactCompany.title=\u4f1a\u793e
dl_datalistmodel.property.dl_contactJobTitle.title=\u5f79\u8077\u540d
-dl_datalistmodel.property.dl_contactPhoneOffice.title=\u96fb\u8a71\uff08\u30aa\u30d5\u30a3\u30b9\uff09
+dl_datalistmodel.property.dl_contactPhoneOffice.title=\u96fb\u8a71\uff08\u4f1a\u793e\uff09
dl_datalistmodel.property.dl_contactPhoneMobile.title=\u96fb\u8a71\uff08\u643a\u5e2f\uff09
-dl_datalistmodel.property.dl_contactNotes.title=\u88dc\u8db3
+dl_datalistmodel.property.dl_contactNotes.title=\u30e1\u30e2
# Issues
-dl_datalistmodel.type.dl_issue.title=\u30a4\u30b7\u30e5\u30fc\u30ea\u30b9\u30c8
-dl_datalistmodel.type.dl_issue.description=\u30a4\u30b7\u30e5\u30fc\u30ea\u30b9\u30c8\u306b\u306fID\u3001\u30b9\u30c6\u30fc\u30bf\u30b9\u3001\u512a\u5148\u3001\u8aac\u660e\u3001\u7de0\u5207\u65e5\u3001\u30b3\u30e1\u30f3\u30c8\u3001\u62c5\u5f53\u8005\u3001\u95a2\u9023\u554f\u984c\u304c\u542b\u307e\u308c\u307e\u3059\u3002
-dl_datalistmodel.property.dl_issueID.title=\u30a4\u30b7\u30e5\u30fcID
+dl_datalistmodel.type.dl_issue.title=\u61f8\u6848\u4e8b\u9805\u30ea\u30b9\u30c8
+dl_datalistmodel.type.dl_issue.description=\u61f8\u6848\u4e8b\u9805\u30ea\u30b9\u30c8\u306b\u306f\u3001ID\u3001\u30b9\u30c6\u30fc\u30bf\u30b9\u3001\u512a\u5148\u3001\u8aac\u660e\u3001\u7de0\u5207\u65e5\u3001\u30b3\u30e1\u30f3\u30c8\u3001\u62c5\u5f53\u8005\u3001\u95a2\u9023\u61f8\u6848\u4e8b\u9805\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002
+dl_datalistmodel.property.dl_issueID.title=\u61f8\u6848\u4e8b\u9805ID
dl_datalistmodel.property.dl_issueStatus.title=\u30b9\u30c6\u30fc\u30bf\u30b9
dl_datalistmodel.property.dl_issuePriority.title=\u512a\u5148
dl_datalistmodel.property.dl_issueDescription.title=\u8aac\u660e
dl_datalistmodel.property.dl_issueDueDate.title=\u7de0\u5207\u65e5
dl_datalistmodel.property.dl_issueComments.title=\u30b3\u30e1\u30f3\u30c8
-dl_datalistmodel.property.dl_issueAssignedTo.title=\u62c5\u5f53\u8005
-dl_datalistmodel.property.dl_issueRelatedIssues.title=\u95a2\u9023\u8ab2\u984c
+dl_datalistmodel.association.dl_issueAssignedTo.title=\u62c5\u5f53\u8005
# Event
-dl_datalistmodel.type.dl_event.title=\u30a4\u30d9\u30f3\u30c8\u30ea\u30b9\u30c8
-dl_datalistmodel.type.dl_event.description=\u30a4\u30d9\u30f3\u30c8\u30ea\u30b9\u30c8\u306b\u306f\u3001\u30bf\u30a4\u30c8\u30eb\u3001\u8aac\u660e\u3001\u5834\u6240\u3001\u958b\u59cb\u65e5\u6642/\u7d42\u4e86\u65e5\u6642\u304c\u542b\u307e\u308c\u307e\u3059\u3002
+dl_datalistmodel.type.dl_event.title=\u30a4\u30d9\u30f3\u30c8\u30fb\u30ea\u30b9\u30c8
+dl_datalistmodel.type.dl_event.description=\u30a4\u30d9\u30f3\u30c8\u30fb\u30ea\u30b9\u30c8\u306b\u306f\u3001\u30bf\u30a4\u30c8\u30eb\u3001\u8aac\u660e\u3001\u5834\u6240\u3001\u512a\u5148\u3001\u958b\u59cb\u65e5\u3001\u7d42\u4e86\u65e5\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002
dl_datalistmodel.property.dl_eventLocation.title=\u5834\u6240
dl_datalistmodel.property.dl_eventStartDate.title=\u958b\u59cb\u65e5
dl_datalistmodel.property.dl_eventEndDate.title=\u7d42\u4e86\u65e5
-dl_datalistmodel.property.dl_eventRegistrations.title=\u767b\u9332
-dl_datalistmodel.property.dl_eventNote.title=\u88dc\u8db3
+dl_datalistmodel.property.dl_eventRegistrations.title=\u767b\u9332\u6570
+dl_datalistmodel.property.dl_eventNote.title=\u30e1\u30e2
# Location
-dl_datalistmodel.type.dl_location.title=\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3\u30ea\u30b9\u30c8
-dl_datalistmodel.type.dl_location.description=\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3/\u4f4f\u6240\u30ea\u30b9\u30c8
-dl_datalistmodel.property.dl_locationAddress1.title=\u4f4f\u6240\uff081\u884c\u76ee\uff09
-dl_datalistmodel.property.dl_locationAddress2.title=\u4f4f\u6240\uff082\u884c\u76ee\uff09
-dl_datalistmodel.property.dl_locationAddress3.title=\u4f4f\u6240\uff083\u884c\u76ee\uff09
+dl_datalistmodel.type.dl_location.title=\u5834\u6240\u30ea\u30b9\u30c8
+dl_datalistmodel.type.dl_location.description=\u5834\u6240/\u4f4f\u6240\u30ea\u30b9\u30c8
+dl_datalistmodel.property.dl_locationAddress1.title=\u4f4f\u6240\u306e1\u884c\u76ee
+dl_datalistmodel.property.dl_locationAddress2.title=\u4f4f\u6240\u306e2\u884c\u76ee
+dl_datalistmodel.property.dl_locationAddress3.title=\u4f4f\u6240\u306e3\u884c\u76ee
dl_datalistmodel.property.dl_locationZip.title=\u90f5\u4fbf\u756a\u53f7
dl_datalistmodel.property.dl_locationState.title=\u90fd\u9053\u5e9c\u770c
dl_datalistmodel.property.dl_locationCountry.title=\u56fd
-dl_datalistmodel.property.dl_locationNote.title=\u88dc\u8db3
+dl_datalistmodel.property.dl_locationNote.title=\u30e1\u30e2
# Meeting Agenda
dl_datalistmodel.type.dl_meetingAgenda.title=\u4f1a\u8b70\u30a2\u30b8\u30a7\u30f3\u30c0
-dl_datalistmodel.type.dl_meetingAgenda.description=\u4f1a\u8b70\u30a2\u30b8\u30a7\u30f3\u30c0\u306e\u30a2\u30a4\u30c6\u30e0\u306b\u306f\u8aac\u660e\u3001\u6240\u6709\u8005\u3001\u5145\u5f53\u6642\u9593\u304c\u542b\u307e\u308c\u307e\u3059\u3002
+dl_datalistmodel.type.dl_meetingAgenda.description=\u4f1a\u8b70\u30a2\u30b8\u30a7\u30f3\u30c0\u306e\u30a2\u30a4\u30c6\u30e0\uff08\u8aac\u660e\u3001\u6240\u6709\u8005\u3001\u5272\u308a\u5f53\u3066\u6642\u9593\uff09\u3092\u7ba1\u7406\u3057\u307e\u3059\u3002
dl_datalistmodel.property.dl_meetingAgendaRef.title=\u53c2\u7167
dl_datalistmodel.property.dl_meetingAgendaTime.title=\u6642\u9593\uff08\u5206\uff09
dl_datalistmodel.property.dl_meetingAgendaOwner.title=\u6240\u6709\u8005
# Event Agenda
-dl_datalistmodel.type.dl_eventAgenda.title=\u30a4\u30d9\u30f3\u30c8\u30a2\u30b8\u30a7\u30f3\u30c0
-dl_datalistmodel.type.dl_eventAgenda.description=\u30a4\u30d9\u30f3\u30c8\u30a2\u30b8\u30a7\u30f3\u30c0\u7ba1\u7406\u30a2\u30a4\u30c6\u30e0\u306b\u306f\u30bb\u30c3\u30b7\u30e7\u30f3\u540d\u3001\u767a\u8868\u8005\u3001\u958b\u59cb/\u7d42\u4e86\u6642\u9593\u304c\u542b\u307e\u308c\u307e\u3059\u3002
+dl_datalistmodel.type.dl_eventAgenda.title=\u30a4\u30d9\u30f3\u30c8\u30fb\u30a2\u30b8\u30a7\u30f3\u30c0
+dl_datalistmodel.type.dl_eventAgenda.description=\u30a4\u30d9\u30f3\u30c8\u30fb\u30a2\u30b8\u30a7\u30f3\u30c0\u306e\u30a2\u30a4\u30c6\u30e0\uff08\u30bb\u30c3\u30b7\u30e7\u30f3\u540d\u3001\u30d7\u30ec\u30bc\u30f3\u30bf\u3001\u958b\u59cb\u6642\u523b\u3001\u7d42\u4e86\u6642\u523b\uff09\u3092\u7ba1\u7406\u3057\u307e\u3059\u3002
dl_datalistmodel.property.dl_eventAgendaRef.title=\u53c2\u7167
-dl_datalistmodel.property.dl_eventAgendaStartTime.title=\u958b\u59cb\u6642\u9593
-dl_datalistmodel.property.dl_eventAgendaEndTime.title=\u7d42\u4e86\u6642\u9593
+dl_datalistmodel.property.dl_eventAgendaStartTime.title=\u958b\u59cb\u6642\u523b
+dl_datalistmodel.property.dl_eventAgendaEndTime.title=\u7d42\u4e86\u6642\u523b
dl_datalistmodel.property.dl_eventAgendaSessionName.title=\u30bb\u30c3\u30b7\u30e7\u30f3\u540d
-dl_datalistmodel.property.dl_eventAgendaPresenter.title=\u767a\u8868\u8005
-dl_datalistmodel.property.dl_eventAgendaAudience.title=\u8074\u8846
-dl_datalistmodel.property.dl_eventAgendaNotes.title=\u88dc\u8db3
+dl_datalistmodel.property.dl_eventAgendaPresenter.title=\u30d7\u30ec\u30bc\u30f3\u30bf
+dl_datalistmodel.property.dl_eventAgendaAudience.title=\u30aa\u30fc\u30c7\u30a3\u30a8\u30f3\u30b9
+dl_datalistmodel.property.dl_eventAgendaNotes.title=\u30e1\u30e2
\ No newline at end of file
diff --git a/config/alfresco/messages/email-server-model_de.properties b/config/alfresco/messages/email-server-model_de.properties
index dbbd1f87d0..bd83f02a55 100755
--- a/config/alfresco/messages/email-server-model_de.properties
+++ b/config/alfresco/messages/email-server-model_de.properties
@@ -1,4 +1,4 @@
-eemailserver_emailserverModel.aspect.emailserver_aliasable.title=E-Mail Alias
+emailserver_emailserverModel.aspect.emailserver_aliasable.title=E-Mail Alias
emailserver_emailserverModel.aspect.emailserver_aliasable.description=E-Mail Alias
emailserver_emailserverModel.property.emailserver_alias.title=Alias
emailserver_emailserverModel.property.emailserver_alias.description=Alias
diff --git a/config/alfresco/messages/invitation-service_de.properties b/config/alfresco/messages/invitation-service_de.properties
index 6755650c59..abaeac262b 100755
--- a/config/alfresco/messages/invitation-service_de.properties
+++ b/config/alfresco/messages/invitation-service_de.properties
@@ -13,7 +13,7 @@ invitation.invite.already_finished="Einladung {0} wurde bereits angenommen, abge
invitation.invite.authentication_chain="Authentifizierungskette l\u00e4sst das Erstellen neuer Konten nicht zu"
# InviteSender messages
-invitation.invitesender.email.subject=Alfresco {0}: Sie wurden aufgefordert, der {1} Site beizutreten
+invitation.invitesender.email.subject=Alfresco {0}: Sie wurden aufgefordert, der {1} Site beizutreten.
invitation.invitesender.email.role.SiteManager=Site Manager
invitation.invitesender.email.role.SiteCollaborator=Site Mitarbeiter
invitation.invitesender.email.role.SiteContributor=Site Beitragender
diff --git a/config/alfresco/messages/invitation-service_es.properties b/config/alfresco/messages/invitation-service_es.properties
index 64081158c6..5684544212 100755
--- a/config/alfresco/messages/invitation-service_es.properties
+++ b/config/alfresco/messages/invitation-service_es.properties
@@ -13,7 +13,7 @@ invitation.invite.already_finished="La invitaci\u00f3n, {0} ya ha sido aceptada,
invitation.invite.authentication_chain="El m\u00e9todo de autenticaci\u00f3n establecido no permite crear nuevas cuentas"
# InviteSender messages
-invitation.invitesender.email.subject={0} Alfresco: Se le ha invitado a unirse al sitio {1}
+invitation.invitesender.email.subject={0} Alfresco: Ha sido invitado a unirse al sitio {1}
invitation.invitesender.email.role.SiteManager=Administrador de sitio
invitation.invitesender.email.role.SiteCollaborator=Colaborador de sitio
invitation.invitesender.email.role.SiteContributor=Contribuidor de sitio
diff --git a/config/alfresco/messages/invitation-service_fr.properties b/config/alfresco/messages/invitation-service_fr.properties
index 8b2ebf946d..e9dcff5225 100755
--- a/config/alfresco/messages/invitation-service_fr.properties
+++ b/config/alfresco/messages/invitation-service_fr.properties
@@ -8,7 +8,7 @@ invitation.error.invalid_inviteId_format="Format de l''identifiant de l''invitat
invitation.invite.already_member="L''utilisateur {0} est d\u00e9j\u00e0 membre de {1} et ne peut pas \u00eatre \u00e0 nouveau invit\u00e9"
invitation.cancel.not_site_manager="L''utilisateur actuel {0} ne peut pas annuler l''invitation suivante : {1}, car il n''est pas un gestionnaire du site suivant : {2}"
invitation.invite.not_site_manager="L''utilisateur actuel {0} n''est pas un gestionnaire du site suivant : {1}"
-invitation.invite.unable_generate_id="Impossible de g\u00e9n\u00e9rer un nom d''utilisateur pour l''invit\u00e9, qui n''appartient pas d\u00e9j\u00e0 \u00e0 une autre personne firstName:{0} lastName:{1} email:{2}"
+invitation.invite.unable_generate_id="Impossible de g\u00e9n\u00e9rer un nom d''invit\u00e9 qui n''appartient pas d\u00e9j\u00e0 \u00e0 une autre personne firstName:{0} lastName:{1} email:{2}"
invitation.invite.already_finished="L''invitation {0} a d\u00e9j\u00e0 \u00e9t\u00e9 accept\u00e9e, annul\u00e9e ou rejet\u00e9e"
invitation.invite.authentication_chain="La cha\u00eene d'authentification ne permet pas la cr\u00e9ation de nouveaux comptes"
diff --git a/config/alfresco/messages/invitation-service_it.properties b/config/alfresco/messages/invitation-service_it.properties
index 42ce52c532..619cf86ac5 100755
--- a/config/alfresco/messages/invitation-service_it.properties
+++ b/config/alfresco/messages/invitation-service_it.properties
@@ -8,7 +8,7 @@ invitation.error.invalid_inviteId_format="Il formato dell''ID di invito non \u00
invitation.invite.already_member="L''utente, {0} \u00e8 gi\u00e0 un membro di {1} e non pu\u00f2 essere invitato di nuovo"
invitation.cancel.not_site_manager="L''utente attuale, {0}, non pu\u00f2 annullare l''invito: {1} perch\u00e9 non \u00e8 un manager del sito: {2}"
invitation.invite.not_site_manager="L''utente attuale, {0}, non \u00e8 un manager del sito: {1}"
-invitation.invite.unable_generate_id="Impossibile generare per l'invitato un nome, utente che non appartiene gi\u00e0 a un altro utente firstName:{0} lastName:{1} email:{2}"
+invitation.invite.unable_generate_id="Impossibile generare per l'invitato un nome utente che non appartenga gi\u00e0 a un altro utente nome:{0} cognome:{1} email:{2}"
invitation.invite.already_finished="L''invito, {0} \u00e8 gi\u00e0 stato accettato, annullato o respinto"
invitation.invite.authentication_chain="La catena di autenticazione non consente la creazione di nuovi account"
diff --git a/config/alfresco/messages/patch-service_ja.properties b/config/alfresco/messages/patch-service_ja.properties
index 6616e74850..bb49df60e8 100755
--- a/config/alfresco/messages/patch-service_ja.properties
+++ b/config/alfresco/messages/patch-service_ja.properties
@@ -148,6 +148,11 @@ patch.versionHistoryPerformance.result=Updated {0} version history objects to im
patch.multilingualBootstrap.description=Bootstraps the node that will hold the multilingual containers.
+patch.siteLoadPatch.description=Loads a sample site into the repository.
+patch.siteLoadPatch.exists=The Site {0} already exists and so could not be imported
+patch.siteLoadPatch.noBootstrapViews=No bootstrap views were given for importing Site {0} - please check the bootstrap extension bean configuration
+patch.siteLoadPatch.result=Site {0} imported.
+
patch.wcmFolders.description=Ensures the existance of the WCM specific 'Web Projects' and 'Web Forms' folders.
patch.wcmFolders.webprojects.result.exists=The Web Projects folder already exists: {0}
patch.wcmFolders.webprojects.result.created=The Web Projects folder was successfully created: {0}
@@ -383,3 +388,15 @@ patch.mtFixAdminExistingTenants.result=Fix bootstrapped creator/modifier
patch.fixUserQNames.description=Fixes user store qnames to improve native authentication performance
patch.fixUserQNames.result=Generated qnames for {0} users.
+
+patch.newUserEmailTemplates.description=Adds the email templates for notifying new users of their accounts
+patch.newUserEmailTemplates.created=Email templates added: {0}
+
+patch.inviteEmailTemplates.description=Adds the email templates for inviting users to a Site
+patch.inviteEmailTemplates.created=Email templates added: {0}
+
+patch.htmlNotificationMailTemplates.description=Adds HTML email templates for notifying users of new content
+
+patch.imapSpacesLocaleTemplates.description=Adds content templates for IMAP clients (Non-default locales only)
+
+patch.exampleJavaScript.description=Loads sample Javascript file into datadictionary scripts folder
\ No newline at end of file
diff --git a/config/alfresco/messages/site-service_de.properties b/config/alfresco/messages/site-service_de.properties
index 22f65ca0b5..1d1498c435 100755
--- a/config/alfresco/messages/site-service_de.properties
+++ b/config/alfresco/messages/site-service_de.properties
@@ -9,4 +9,4 @@ site_service.do_not_remove_manager=Eine Site ben\u00f6tigt mindestens einen Site
site_service.can_not_remove_membership=Der aktuelle Benutzer verf\u00fcgt nicht \u00fcber ausreichend Berechtigungen, um Mitgliedschaftsdetails der Site {0} zu l\u00f6schen.
site_service.do_not_change_manager=Eine Site ben\u00f6tigt mindestens einen Site Manager. Sie k\u00f6nnen die Rolle von {0} nicht \u00e4ndern, da sie derzeit die einzigen Site Manager sind.
site_service.can_not_change_membership=Der aktuelle Benutzer verf\u00fcgt nicht \u00fcber die Berechtigungen, um Mitgliedschaftsdetails der Site {0} zu \u00e4ndern.
-site_service.site_container_not_folder=Site Container {0} bezieht sich nicht auf einen Ordner.
+site_service.site_container_not_folder=Site Container {0} bezieht sich nicht auf einen Ordner.
\ No newline at end of file
diff --git a/config/alfresco/messages/site-service_fr.properties b/config/alfresco/messages/site-service_fr.properties
index ee981a5631..2b438ff82a 100755
--- a/config/alfresco/messages/site-service_fr.properties
+++ b/config/alfresco/messages/site-service_fr.properties
@@ -9,4 +9,4 @@ site_service.do_not_remove_manager=Un site n\u00e9cessite au moins un gestionnai
site_service.can_not_remove_membership=L''utilisateur actuel ne dispose pas des permissions suffisantes pour supprimer les d\u00e9tails d''appartenance du site {0}.
site_service.do_not_change_manager=Un site n\u00e9cessite au moins un gestionnaire de site. Vous ne pouvez pas modifier le r\u00f4le de {0} car il s''agit du seul gestionnaire du site.
site_service.can_not_change_membership=L''utilisateur actuel ne dispose pas des permissions suffisantes pour modifier les d\u00e9tails d''appartenance du site {0}.
-site_service.site_container_not_folder=Le conteneur de site {0} ne se r\u00e9f\u00e8re pas \u00e0 un dossier.
+site_service.site_container_not_folder=Le conteneur de site {0} ne se r\u00e9f\u00e8re pas \u00e0 un dossier.
\ No newline at end of file
diff --git a/config/alfresco/messages/site-service_it.properties b/config/alfresco/messages/site-service_it.properties
index f61d98003e..ac1c4b2067 100755
--- a/config/alfresco/messages/site-service_it.properties
+++ b/config/alfresco/messages/site-service_it.properties
@@ -9,4 +9,4 @@ site_service.do_not_remove_manager=Un sito deve avere almeno un manager. Non \u
site_service.can_not_remove_membership=L''utente attuale non dispone di permessi sufficienti per eliminare i dettagli delle appartenenze del sito {0}.
site_service.do_not_change_manager=Un sito deve avere almeno un manager. Non \u00e8 possibile cambiare il ruolo di {0} perch\u00e9 attualmente \u00e8 l''unico manager.
site_service.can_not_change_membership=L''utente attuale non dispone di permessi per modificare i dettagli delle appartenenze del sito {0}.
-site_service.site_container_not_folder=Il contenitore del sito {0} non referenzia una cartella.
+site_service.site_container_not_folder=Il contenitore del sito {0} non referenzia una cartella.
\ No newline at end of file
diff --git a/config/alfresco/messages/system-messages.properties b/config/alfresco/messages/system-messages.properties
index f19864e74b..03e1508c2e 100644
--- a/config/alfresco/messages/system-messages.properties
+++ b/config/alfresco/messages/system-messages.properties
@@ -1,5 +1,8 @@
# System-related messages
+# Note to Translators: Only some of the strings below should be localised
+# Those that should be localised are between START TRANSLATION and END TRANSLATION comment lines.
+
system.err.property_not_set=Property ''{0}'' has not been set: {1} ({2})
system.err.duplicate_name=Duplicate child name not allowed: {0}
@@ -33,6 +36,8 @@ system.mt.warn.upgrade_mt_admin_context=Please update your alfresco/extension/mt
# Usages
system.usage.err.no_txn=RepoUsageComponent must be called in a transaction.
system.usage.err.no_txn_readwrite=RepoUsageComponent must be called in a read-write transaction.
+
+# 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.
@@ -42,6 +47,7 @@ system.usage.err.limit_users_exceeded_verbose=The allowable user limit of {0} ha
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_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.reloaded=The Alfresco license has been reloaded.
diff --git a/config/alfresco/messages/system-messages_de.properties b/config/alfresco/messages/system-messages_de.properties
index 15ba99d73c..9a7ae07013 100755
--- a/config/alfresco/messages/system-messages_de.properties
+++ b/config/alfresco/messages/system-messages_de.properties
@@ -1,5 +1,8 @@
# System-related messages
+# Note to Translators: Only some of the strings below should be localised
+# Those that should be localised are between START TRANSLATION and END TRANSLATION comment lines.
+
system.err.property_not_set=Property ''{0}'' has not been set: {1} ({2})
system.err.duplicate_name=Duplicate child name not allowed: {0}
@@ -33,15 +36,18 @@ system.mt.warn.upgrade_mt_admin_context=Please update your alfresco/extension/mt
# Usages
system.usage.err.no_txn=RepoUsageComponent must be called in a transaction.
system.usage.err.no_txn_readwrite=RepoUsageComponent must be called in a read-write transaction.
-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.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_license_expiring=The Alfresco license will expire in {0} days.
-system.usage.err.limit_license_expired=The Alfresco license has expired.
+
+# START TRANSLATION
+system.usage.warn.limit_users_approached=Die zul\u00e4ssige Benutzerzahl von {0} ist nahezu erreicht. Es gibt {1} Benutzer im System.
+system.usage.warn.limit_users_reached=Die zul\u00e4ssige Benutzerzahl von {0} wurde erreicht. Es gibt {1} Benutzer im System.
+system.usage.warn.limit_documents_approached=Die zul\u00e4ssige Dokumentenzahl von {0} ist nahezu erreicht. Es gibt {1} Dokumente im System.
+system.usage.warn.limit_documents_reached=Die zul\u00e4ssige Dokumentenzahl von {0} wurde erreicht. Es gibt {1} Dokumente im System.
+system.usage.err.limit_users_exceeded=Die zul\u00e4ssige Benutzerzahl von {0} wurde \u00fcberschritten. Es gibt derzeit {1} Benutzer im System.
+system.usage.err.limit_users_exceeded_verbose=Die zul\u00e4ssige Benutzerzahl von {0} wurde \u00fcberschritten. Benutzer hinzugef\u00fcgt: {1}
+system.usage.err.limit_documents_exceeded=Die zul\u00e4ssige Dokumentenzahl von {0} wurde \u00fcberschritten. Es gibt derzeit {1} Dokumente im System.
+system.usage.err.limit_license_expiring=Die Alfresco Lizenz l\u00e4uft in {0}\u00a0Tagen ab.
+system.usage.err.limit_license_expired=Die Alfresco Lizenz ist abgelaufen.
+# END TRANSLATION
# License
system.license.msg.reloaded=The Alfresco license has been reloaded.
diff --git a/config/alfresco/messages/system-messages_es.properties b/config/alfresco/messages/system-messages_es.properties
index 15ba99d73c..558cfe25df 100755
--- a/config/alfresco/messages/system-messages_es.properties
+++ b/config/alfresco/messages/system-messages_es.properties
@@ -1,5 +1,8 @@
# System-related messages
+# Note to Translators: Only some of the strings below should be localised
+# Those that should be localised are between START TRANSLATION and END TRANSLATION comment lines.
+
system.err.property_not_set=Property ''{0}'' has not been set: {1} ({2})
system.err.duplicate_name=Duplicate child name not allowed: {0}
@@ -33,15 +36,18 @@ system.mt.warn.upgrade_mt_admin_context=Please update your alfresco/extension/mt
# Usages
system.usage.err.no_txn=RepoUsageComponent must be called in a transaction.
system.usage.err.no_txn_readwrite=RepoUsageComponent must be called in a read-write transaction.
-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.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_license_expiring=The Alfresco license will expire in {0} days.
-system.usage.err.limit_license_expired=The Alfresco license has expired.
+
+# START TRANSLATION
+system.usage.warn.limit_users_approached=Se est\u00e1 llegando al l\u00edmite de usuarios permitidos de {0}. Hay {1} usuarios en el sistema.
+system.usage.warn.limit_users_reached=Se ha alcanzado el l\u00edmite de usuarios permitidos de {0}. Hay {1} usuarios en el sistema.
+system.usage.warn.limit_documents_approached=Se est\u00e1 llegando al l\u00edmite de documentos permitidos de {0}. Hay {1} documentos en el sistema.
+system.usage.warn.limit_documents_reached=Se ha alcanzado el l\u00edmite de documentos permitidos de {0}. Hay {1} documentos en el sistema.
+system.usage.err.limit_users_exceeded=Se ha superado el l\u00edmite de usuarios permitidos de {0}. En estos momentos, hay {1} usuarios en el sistema.
+system.usage.err.limit_users_exceeded_verbose=Se ha superado el l\u00edmite de usuarios permitidos de {0}. Usuarios a\u00f1adidos: {1}
+system.usage.err.limit_documents_exceeded=Se ha superado el l\u00edmite de documentos permitidos de {0}. En estos momentos, hay {1} documentos en el sistema.
+system.usage.err.limit_license_expiring=La licencia de Alfresco caducar\u00e1 en {0} d\u00edas.
+system.usage.err.limit_license_expired=La licencia de Alfresco ha caducado.
+# END TRANSLATION
# License
system.license.msg.reloaded=The Alfresco license has been reloaded.
diff --git a/config/alfresco/messages/system-messages_fr.properties b/config/alfresco/messages/system-messages_fr.properties
index 15ba99d73c..7d64b88e93 100755
--- a/config/alfresco/messages/system-messages_fr.properties
+++ b/config/alfresco/messages/system-messages_fr.properties
@@ -1,5 +1,8 @@
# System-related messages
+# Note to Translators: Only some of the strings below should be localised
+# Those that should be localised are between START TRANSLATION and END TRANSLATION comment lines.
+
system.err.property_not_set=Property ''{0}'' has not been set: {1} ({2})
system.err.duplicate_name=Duplicate child name not allowed: {0}
@@ -33,15 +36,18 @@ system.mt.warn.upgrade_mt_admin_context=Please update your alfresco/extension/mt
# Usages
system.usage.err.no_txn=RepoUsageComponent must be called in a transaction.
system.usage.err.no_txn_readwrite=RepoUsageComponent must be called in a read-write transaction.
-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.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_license_expiring=The Alfresco license will expire in {0} days.
-system.usage.err.limit_license_expired=The Alfresco license has expired.
+
+# START TRANSLATION
+system.usage.warn.limit_users_approached=Le nombre maximum d''utilisateurs autoris\u00e9s de {0} est presque atteint. Il y a {1} utilisateurs dans le syst\u00e8me.
+system.usage.warn.limit_users_reached=Le nombre maximum d''utilisateurs autoris\u00e9s de {0} a \u00e9t\u00e9 atteint. Il y a {1} utilisateurs dans le syst\u00e8me.
+system.usage.warn.limit_documents_approached=Le nombre maximum de documents autoris\u00e9s de {0} est presque atteint. Il y a {1} documents dans le syst\u00e8me.
+system.usage.warn.limit_documents_reached=Le nombre maximum de documents autoris\u00e9s de {0} a \u00e9t\u00e9 atteint. Il y a {1} documents dans le syst\u00e8me.
+system.usage.err.limit_users_exceeded=Le nombre maximum d''utilisateurs autoris\u00e9s de {0} a \u00e9t\u00e9 d\u00e9pass\u00e9. Il y a actuellement {1} utilisateurs dans le syst\u00e8me.
+system.usage.err.limit_users_exceeded_verbose=Le nombre maximum d''utilisateurs autoris\u00e9s de {0} a \u00e9t\u00e9 d\u00e9pass\u00e9. Utilisateurs ajout\u00e9s : {1}
+system.usage.err.limit_documents_exceeded=Le nombre maximum de documents autoris\u00e9s de {0} a \u00e9t\u00e9 d\u00e9pass\u00e9. Il y a actuellement {1} documents dans le syst\u00e8me.
+system.usage.err.limit_license_expiring=La licence Alfresco expirera dans {0} jours.
+system.usage.err.limit_license_expired=La licence Alfresco a expir\u00e9.
+# END TRANSLATION
# License
system.license.msg.reloaded=The Alfresco license has been reloaded.
diff --git a/config/alfresco/messages/system-messages_it.properties b/config/alfresco/messages/system-messages_it.properties
index 15ba99d73c..2483c61a03 100755
--- a/config/alfresco/messages/system-messages_it.properties
+++ b/config/alfresco/messages/system-messages_it.properties
@@ -1,5 +1,8 @@
# System-related messages
+# Note to Translators: Only some of the strings below should be localised
+# Those that should be localised are between START TRANSLATION and END TRANSLATION comment lines.
+
system.err.property_not_set=Property ''{0}'' has not been set: {1} ({2})
system.err.duplicate_name=Duplicate child name not allowed: {0}
@@ -33,15 +36,18 @@ system.mt.warn.upgrade_mt_admin_context=Please update your alfresco/extension/mt
# Usages
system.usage.err.no_txn=RepoUsageComponent must be called in a transaction.
system.usage.err.no_txn_readwrite=RepoUsageComponent must be called in a read-write transaction.
-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.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_license_expiring=The Alfresco license will expire in {0} days.
-system.usage.err.limit_license_expired=The Alfresco license has expired.
+
+# START TRANSLATION
+system.usage.warn.limit_users_approached=Il limite utenti disponibile di {0} sta per essere raggiunto. Esistono {1} utenti nel sistema.
+system.usage.warn.limit_users_reached=Il limite utenti disponibile di {0} \u00e8 stato raggiunto. Esistono {1} utenti nel sistema.
+system.usage.warn.limit_documents_approached=Il limite documenti disponibile di {0} sta per essere raggiunto. Esistono {1} documenti nel sistema.
+system.usage.warn.limit_documents_reached=Il limite documenti disponibile di {0} \u00e8 stato raggiunto. Esistono {1} documenti nel sistema.
+system.usage.err.limit_users_exceeded=Il limite utenti disponibile di {0} \u00e8 stato superato. Attualmente esistono {1} utenti nel sistema.
+system.usage.err.limit_users_exceeded_verbose=Il limite utenti disponibile di {0} \u00e8 stato superato. Utenti aggiunti: {1}
+system.usage.err.limit_documents_exceeded=Il limite documenti disponibile di {0} \u00e8 stato superato. Attualmente esistono {1} documenti nel sistema.
+system.usage.err.limit_license_expiring=La licenza Alfresco scade tra {0} giorni.
+system.usage.err.limit_license_expired=La licenza Alfresco \u00e8 scaduta.
+# END TRANSLATION
# License
system.license.msg.reloaded=The Alfresco license has been reloaded.
diff --git a/config/alfresco/messages/system-messages_ja.properties b/config/alfresco/messages/system-messages_ja.properties
index b84511f727..858bb984ee 100755
--- a/config/alfresco/messages/system-messages_ja.properties
+++ b/config/alfresco/messages/system-messages_ja.properties
@@ -1,5 +1,8 @@
# System-related messages
+# Note to Translators: Only some of the strings below should be localised
+# Those that should be localised are between START TRANSLATION and END TRANSLATION comment lines.
+
system.err.property_not_set=Property ''{0}'' has not been set: {1} ({2})
system.err.duplicate_name=Duplicate child name not allowed: {0}
@@ -29,3 +32,27 @@ system.locks.err.excl_lock_exists=Failed to get lock ''{0}'' using token ''{1}''
# Multi-Tenant
system.mt.warn.upgrade_mt_admin_context=Please update your alfresco/extension/mt/mt-admin-context.xml (to use latest alfresco/extension/mt/mt-admin-context.xml.sample).
+
+# Usages
+system.usage.err.no_txn=RepoUsageComponent must be called in a transaction.
+system.usage.err.no_txn_readwrite=RepoUsageComponent must be called in a read-write transaction.
+
+# START TRANSLATION
+system.usage.warn.limit_users_approached=\u8a31\u53ef\u3055\u308c\u308b\u9650\u754c\u306e{0}\u4eba\u306e\u30e6\u30fc\u30b6\u304c\u30a2\u30d7\u30ed\u30fc\u30c1\u3055\u308c\u3066\u3044\u307e\u3059\u3002 \u30b7\u30b9\u30c6\u30e0\u306b{1}\u4eba\u306e\u30e6\u30fc\u30b6\u304c\u3044\u307e\u3059\u3002
+system.usage.warn.limit_users_reached=\u8a31\u53ef\u3055\u308c\u308b\u9650\u754c\u306e\u30e6\u30fc\u30b6\u6570\u3067\u3042\u308b{0}\u4eba\u306b\u9054\u3057\u307e\u3057\u305f\u3002 \u30b7\u30b9\u30c6\u30e0\u306b{1}\u4eba\u306e\u30e6\u30fc\u30b6\u304c\u3044\u307e\u3059\u3002
+system.usage.warn.limit_documents_approached=\u8a31\u53ef\u3055\u308c\u308b\u9650\u754c\u306e{0}\u306e\u6587\u66f8\u304c\u30a2\u30d7\u30ed\u30fc\u30c1\u3055\u308c\u3066\u3044\u307e\u3059\u3002 \u30b7\u30b9\u30c6\u30e0\u306b{1}\u306e\u6587\u66f8\u304c\u3042\u308a\u307e\u3059\u3002
+system.usage.warn.limit_documents_reached=\u8a31\u53ef\u3055\u308c\u308b\u9650\u754c\u306e\u6587\u66f8\u6570\u3067\u3042\u308b{0}\u306b\u9054\u3057\u307e\u3057\u305f\u3002 \u30b7\u30b9\u30c6\u30e0\u306b{1}\u306e\u6587\u66f8\u304c\u3042\u308a\u307e\u3059\u3002
+system.usage.err.limit_users_exceeded=\u8a31\u53ef\u3055\u308c\u308b\u9650\u754c\u306e\u30e6\u30fc\u30b6\u6570\u3067\u3042\u308b{0}\u4eba\u3092\u8d85\u3048\u307e\u3057\u305f\u3002 \u73fe\u5728\u30b7\u30b9\u30c6\u30e0\u306b{1}\u4eba\u306e\u30e6\u30fc\u30b6\u304c\u3044\u307e\u3059\u3002
+system.usage.err.limit_users_exceeded_verbose=\u8a31\u53ef\u3055\u308c\u308b\u9650\u754c\u306e\u30e6\u30fc\u30b6\u6570\u3067\u3042\u308b{0}\u4eba\u3092\u8d85\u3048\u307e\u3057\u305f\u3002 \u30e6\u30fc\u30b6\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f: {1}
+system.usage.err.limit_documents_exceeded=\u8a31\u53ef\u3055\u308c\u308b\u9650\u754c\u306e\u6587\u66f8\u6570{0}\u3092\u8d85\u3048\u307e\u3057\u305f\u3002 \u73fe\u5728\u30b7\u30b9\u30c6\u30e0\u306b{1}\u306e\u6587\u66f8\u304c\u3042\u308a\u307e\u3059\u3002
+system.usage.err.limit_license_expiring=Alfresco\u306e\u30e9\u30a4\u30bb\u30f3\u30b9\u304c\u3042\u3068{0}\u65e5\u3067\u671f\u9650\u5207\u308c\u306b\u306a\u308a\u307e\u3059\u3002
+system.usage.err.limit_license_expired=Alfresco\u306e\u30e9\u30a4\u30bb\u30f3\u30b9\u306e\u671f\u9650\u304c\u5207\u308c\u307e\u3057\u305f\u3002
+# END TRANSLATION
+
+# License
+system.license.msg.reloaded=The Alfresco license has been reloaded.
+system.license.err.reloadFailed=Failed to reload license: {0}
+
+# Startup message
+system.info.startup=Alfresco started ({0}{1}{2}). Current version: {3} schema {4}. Originally installed version: {5} schema {6}.
+system.warn.readonly=Alfresco is currently in read-only mode. Please check your license.
\ No newline at end of file
diff --git a/config/alfresco/messages/transfer-model_de.properties b/config/alfresco/messages/transfer-model_de.properties
index 699fbd3a8a..fffa9f0772 100755
--- a/config/alfresco/messages/transfer-model_de.properties
+++ b/config/alfresco/messages/transfer-model_de.properties
@@ -6,13 +6,13 @@ trx_applicationmodel.type.trx_transferGroup.title=\u00dcbertragungsgruppe
trx_applicationmodel.type.trx_transferGroup.description=Definition einer \u00dcbertragungsgruppe
trx_applicationmodel.type.trx_transferLock.title=\u00dcbertragungssperre
-trx_applicationmodel.type.trx_transferLock.description=Knoten-Typ, der f\u00fcr den \u00dcbertragungssperrknoten verwendet wurde
+trx_applicationmodel.type.trx_transferLock.description=Node-Typ, der f\u00fcr den \u00dcbertragungssperrknoten verwendet wurde
trx_applicationmodel.type.trx_transferRecord.title=\u00dcbertragungsaufzeichnung
-trx_applicationmodel.type.trx_transferRecord.description=Knoten-Typ, der f\u00fcr die Aufzeichnung der \u00dcbertragungsinformation verwendet wurde
+trx_applicationmodel.type.trx_transferRecord.description=Node-Typ, der f\u00fcr die Aufzeichnung der \u00dcbertragungsinformation verwendet wurde
trx_applicationmodel.type.trx_tempTransferStore.title=Tempor\u00e4rer \u00dcbertragungsspeicher
-trx_applicationmodel.type.trx_tempTransferStore.description=Knoten-Typ, der f\u00fcr die Speicherung tempor\u00e4r verwaister eingehender Knoten verwendet wird
+trx_applicationmodel.type.trx_tempTransferStore.description=Node-Typ, der f\u00fcr die Speicherung tempor\u00e4r verwaister eingehender Knoten verwendet wird
trx_applicationmodel.type.trx_transferReport.title=\u00dcbertragungsbericht
trx_applicationmodel.type.trx_transferReport.description=\u00dcbertragungsbericht
@@ -60,27 +60,27 @@ trx_applicationmodel.property.trx_transferId.title=\u00dcbertragungs-ID
trx_applicationmodel.property.trx_transferId.description=\u00dcbertragungs-ID
trx_applicationmodel.property.trx_invadedBy.title=Invasion von
-trx_applicationmodel.property.trx_invadedBy.description=Die Repositorys, die in diesen Knoten eingedrungen sind
+trx_applicationmodel.property.trx_invadedBy.description=Die Repositories, die in diesen Node beinflusst sind
-trx_applicationmodel.property.trx_repositoryId.title=Quell-Repository.
-trx_applicationmodel.property.trx_repositoryId.description=Die Repository-ID, von der der Knoten stammt.
+trx_applicationmodel.property.trx_repositoryId.title=Quell-Repository
+trx_applicationmodel.property.trx_repositoryId.description=Die Repository-ID, von der der Node stammt.
trx_applicationmodel.property.trx_fromRepositoryId.title=Von Repository-ID
-trx_applicationmodel.property.trx_fromContent.description=Die Inhalts-URLs, die mit diesem Knoten \u00fcbertragen werden
+trx_applicationmodel.property.trx_fromContent.description=Die Inhalts-URLs, die mit diesem Node \u00fcbertragen werden
trx_applicationmodel.association.trx_orphan.title=Verwaiste \u00fcbertragen
trx_applicationmodel.association.trx_orphan.description=Verwaiste \u00fcbertragen
trx_applicationmodel.aspect.trx_transferRelated.title=Zugeh\u00f6rige \u00fcbertragen
-trx_applicationmodel.aspect.trx_transferRelated.description=Knoten mit diesem Aspekt geh\u00f6ren zu einer bestimmten \u00dcbertragung.
+trx_applicationmodel.aspect.trx_transferRelated.description=Node mit diesem Aspekt geh\u00f6ren zu einer bestimmten \u00dcbertragung
trx_applicationmodel.aspect.trx_enableable.title=Aktivierbar
trx_applicationmodel.aspect.trx_enableable.description=Aktivierbar
trx_applicationmodel.aspect.trx_transferred.name=\u00dcbertragen
-trx_applicationmodel.aspect.trx_transferred.description=Knoten mit diesem Aspekt wurden von einem Repository zu einem anderen \u00fcbertragen
+trx_applicationmodel.aspect.trx_transferred.description=Node mit diesem Aspekt wurden von einem Repository zu einem anderen \u00fcbertragen
trx_applicationmodel.aspect.trx_alien.name=Fremde \u00fcbertragen
-trx_applicationmodel.aspect.trx_alien.description=Knoten mit diesem Aspekt sind entweder fremde Knoten oder andere fremde Knoten sind eingedrungen
+trx_applicationmodel.aspect.trx_alien.description=Node mit diesem Aspekt sind entweder fremde Knoten oder andere fremde Knoten sind eingedrungen
diff --git a/config/alfresco/messages/transfer-model_es.properties b/config/alfresco/messages/transfer-model_es.properties
index 115e438659..7d117b41ae 100755
--- a/config/alfresco/messages/transfer-model_es.properties
+++ b/config/alfresco/messages/transfer-model_es.properties
@@ -59,8 +59,8 @@ trx_applicationmodel.property.trx_transferError.description=Error de transferenc
trx_applicationmodel.property.trx_transferId.title=Identificador de transferencia
trx_applicationmodel.property.trx_transferId.description=Identificador de transferencia
-trx_applicationmodel.property.trx_invadedBy.title=Invadido por
-trx_applicationmodel.property.trx_invadedBy.description=Los repositorios que han invadido este nodo
+trx_applicationmodel.property.trx_invadedBy.title=Transferido desde por
+trx_applicationmodel.property.trx_invadedBy.description=Los repositorios que han transferido desde este nodo
trx_applicationmodel.property.trx_repositoryId.title=Repositorio de origen.
trx_applicationmodel.property.trx_repositoryId.description=El identificador del repositorio desde donde se origina este nodo.
@@ -81,6 +81,6 @@ trx_applicationmodel.aspect.trx_transferred.name=Transferido
trx_applicationmodel.aspect.trx_transferred.description=Los nodos con este aspecto han sido transferidos de un repositorio a otro
trx_applicationmodel.aspect.trx_alien.name=Ajeno a transferencia
-trx_applicationmodel.aspect.trx_alien.description=Los nodos con este aspecto son nodos ajenos o han sido invadidos por otros nodos ajenos
+trx_applicationmodel.aspect.trx_alien.description=Los nodos con este aspecto son nodos ajenos o han sido transferido desde por otros nodos ajenos
diff --git a/config/alfresco/messages/transfer-model_fr.properties b/config/alfresco/messages/transfer-model_fr.properties
index 1dd0cfcaab..5b236734af 100644
--- a/config/alfresco/messages/transfer-model_fr.properties
+++ b/config/alfresco/messages/transfer-model_fr.properties
@@ -1,86 +1,84 @@
-# Display labels for Transfer Model French
-
-trx_applicationmodel.description=Alfresco Transfer Application Model
-
-trx_applicationmodel.type.trx_transferGroup.title=Transfer Group
-trx_applicationmodel.type.trx_transferGroup.description=The definition of a transfer group
-
-trx_applicationmodel.type.trx_transferLock.title=Transfer Lock
-trx_applicationmodel.type.trx_transferLock.description=Node type used to represent the transfer lock node
-
-trx_applicationmodel.type.trx_transferRecord.title=Transfer Record
-trx_applicationmodel.type.trx_transferRecord.description=Node type used to record transfer information
-
-trx_applicationmodel.type.trx_tempTransferStore.title=Temp Transfer Store
-trx_applicationmodel.type.trx_tempTransferStore.description=Node type used for storage of temporarily orphaned incoming nodes
-
-trx_applicationmodel.type.trx_transferReport.title=Transfer Report
-trx_applicationmodel.type.trx_transferReport.description=Transfer Report
-
-trx_applicationmodel.type.trx_transferReportDest.title=Transfer Report From Destination
-trx_applicationmodel.type.trx_transferReportDest.description=Transfer Report From Destination
-
-trx_applicationmodel.type.trx_transferTarget.title=Transfer Target
-trx_applicationmodel.type.trx_transferTarget.description=The definition of a transfer target
-
-trx_applicationmodel.property.trx_endpointhost.title=Hte de destination
-trx_applicationmodel.property.trx_endpointhost.description=Hte de destination
-
-trx_applicationmodel.property.trx_endpointport.title=Port de destination
-trx_applicationmodel.property.trx_endpointport.description=Port de destination
-
-trx_applicationmodel.property.trx_endpointpath.title=Chemin de destination
-trx_applicationmodel.property.trx_endpointpath.description=Chemin de destination
-
-trx_applicationmodel.property.trx_endpointprotocol.title=Endpoint Protocol
-trx_applicationmodel.property.trx_endpointprotocol.description=Endpoint Protocol
-
-trx_applicationmodel.property.trx_username.title=Username
-trx_applicationmodel.property.trx_username.description=Username
-
-trx_applicationmodel.property.trx_password.title=Password
-trx_applicationmodel.property.trx_password.description=Password
-
-trx_applicationmodel.property.trx_progressPosition.title=Progress Position
-trx_applicationmodel.property.trx_progressPosition.description=Progress Position
-
-trx_applicationmodel.property.trx_progressEndpoint.title=Progress Endpoint
-trx_applicationmodel.property.trx_progressEndpoint.description=Progress Endpoint
-
-trx_applicationmodel.property.trx_transferStatus.title=Transfer Status
-trx_applicationmodel.property.trx_transferStatus.description=Transfer Status
-
-trx_applicationmodel.property.trx_transferError.title=Transfer Error
-trx_applicationmodel.property.trx_transferError.description=Transfer Error
-
-trx_applicationmodel.property.trx_enabled.title=Enabled
-trx_applicationmodel.property.trx_enabled.description=Is this enabled or disabled
-
-trx_applicationmodel.property.trx_transferId.title=Transfer Id
-trx_applicationmodel.property.trx_transferId.description=Transfer Id
-
-trx_applicationmodel.property.trx_invadedBy.title=Invaded By
-trx_applicationmodel.property.trx_invadedBy.description=The repositories that have invaded this node
-
-trx_applicationmodel.property.trx_repositoryId.title=Source Repository.
-trx_applicationmodel.property.trx_repositoryId.description=The repository id that this node originates from.
-
-trx_applicationmodel.property.trx_fromRepositoryId.title=From Repository Id
-trx_applicationmodel.property.trx_fromContent.description=The content URLs transferred with this node
-
-trx_applicationmodel.association.trx_orphan.title=Transfer Orphan
-trx_applicationmodel.association.trx_orphan.description=Transfer Orphan
-
-trx_applicationmodel.aspect.trx_transferRelated.title=Transfer Related
-trx_applicationmodel.aspect.trx_transferRelated.description=Nodes with this aspect are related to a particular transfer.
-
-trx_applicationmodel.aspect.trx_enableable.title=Enableable
-trx_applicationmodel.aspect.trx_enableable.description=Enableable
-
-trx_applicationmodel.aspect.trx_transferred.name=Transferred
-trx_applicationmodel.aspect.trx_transferred.description=Nodes with this aspect have been transferred from one repository to another
-
-trx_applicationmodel.aspect.trx_alien.name=Transfer Alien
-trx_applicationmodel.aspect.trx_alien.description=Nodes with this aspect are either alien nodes or have been invaded by other alien nodes
-
-
+# Display labels for Transfer Model
+
+trx_applicationmodel.description=Mod\u00e8le d'application de transfert Alfresco
+
+trx_applicationmodel.type.trx_transferGroup.title=Groupe de transfert
+trx_applicationmodel.type.trx_transferGroup.description=D\u00e9finition d'un groupe de transfert
+
+trx_applicationmodel.type.trx_transferLock.title=Verrou de transfert
+trx_applicationmodel.type.trx_transferLock.description=Type de noeud utilis\u00e9 pour repr\u00e9senter le noeud du verrou de transfert
+
+trx_applicationmodel.type.trx_transferRecord.title=Enregistrement de transfert
+trx_applicationmodel.type.trx_transferRecord.description=Type de noeud utilis\u00e9 pour enregistrer des informations de transfert
+
+trx_applicationmodel.type.trx_tempTransferStore.title=Stockage de transfert temporaire
+trx_applicationmodel.type.trx_tempTransferStore.description=Type de noeud utilis\u00e9 pour le stockage de noeuds entrants temporairement orphelins
+
+trx_applicationmodel.type.trx_transferReport.title=Rapport de transfert
+trx_applicationmodel.type.trx_transferReport.description=Rapport de transfert
+
+trx_applicationmodel.type.trx_transferReportDest.title=Rapport de transfert depuis la destination
+trx_applicationmodel.type.trx_transferReportDest.description=Rapport de transfert depuis la destination
+
+trx_applicationmodel.type.trx_transferTarget.title=Cible de transfert
+trx_applicationmodel.type.trx_transferTarget.description=D\u00e9finition d'une cible de transfert
+
+trx_applicationmodel.property.trx_endpointhost.title=H\u00f4te de point d'extr\u00e9mit\u00e9
+trx_applicationmodel.property.trx_endpointhost.description=H\u00f4te de point d'extr\u00e9mit\u00e9
+
+trx_applicationmodel.property.trx_endpointport.title=Port de point d'extr\u00e9mit\u00e9
+trx_applicationmodel.property.trx_endpointport.description=Port de point d'extr\u00e9mit\u00e9
+
+trx_applicationmodel.property.trx_endpointpath.title=Chemin de point d'extr\u00e9mit\u00e9
+trx_applicationmodel.property.trx_endpointpath.description=Chemin de point d'extr\u00e9mit\u00e9
+
+trx_applicationmodel.property.trx_endpointprotocol.title=Protocole de point d'extr\u00e9mit\u00e9
+trx_applicationmodel.property.trx_endpointprotocol.description=Protocole de point d'extr\u00e9mit\u00e9
+
+trx_applicationmodel.property.trx_enabled.title=Activ\u00e9
+trx_applicationmodel.property.trx_enabled.description=Activ\u00e9 ou d\u00e9sactiv\u00e9 ?
+
+trx_applicationmodel.property.trx_username.title=Nom d'utilisateur
+trx_applicationmodel.property.trx_username.description=Nom d'utilisateur
+
+trx_applicationmodel.property.trx_password.title=Mot de passe
+trx_applicationmodel.property.trx_password.description=Mot de passe
+
+trx_applicationmodel.property.trx_progressPosition.title=Position de la progression
+trx_applicationmodel.property.trx_progressPosition.description=Position de la progression
+
+trx_applicationmodel.property.trx_progressEndpoint.title=Point d'extr\u00e9mit\u00e9 de la progression
+trx_applicationmodel.property.trx_progressEndpoint.description=Point d'extr\u00e9mit\u00e9 de la progression
+
+trx_applicationmodel.property.trx_transferStatus.title=Statut de transfert
+trx_applicationmodel.property.trx_transferStatus.description=Statut de transfert
+
+trx_applicationmodel.property.trx_transferError.title=Erreur de transfert
+trx_applicationmodel.property.trx_transferError.description=Erreur de transfert
+
+trx_applicationmodel.property.trx_transferId.title=ID de transfert
+trx_applicationmodel.property.trx_transferId.description=ID de transfert
+
+trx_applicationmodel.property.trx_invadedBy.title=Envahi par
+trx_applicationmodel.property.trx_invadedBy.description=Entrep\u00f4ts ayant envahi ce noeud
+
+trx_applicationmodel.property.trx_repositoryId.title=Entrep\u00f4t source.
+trx_applicationmodel.property.trx_repositoryId.description=ID de l'entrep\u00f4t dont ce noeud est originaire.
+
+trx_applicationmodel.property.trx_fromRepositoryId.title=ID entrep\u00f4t de
+trx_applicationmodel.property.trx_fromContent.description=Adresses URL de contenu transf\u00e9r\u00e9es avec ce noeud
+
+trx_applicationmodel.association.trx_orphan.title=Orphelin de transfert
+trx_applicationmodel.association.trx_orphan.description=Orphelin de transfert
+
+trx_applicationmodel.aspect.trx_transferRelated.title=Li\u00e9 au transfert
+trx_applicationmodel.aspect.trx_transferRelated.description=Les noeuds avec cet aspect sont li\u00e9s \u00e0 un transfert particulier.
+
+trx_applicationmodel.aspect.trx_enableable.title=Activable
+trx_applicationmodel.aspect.trx_enableable.description=Activable
+
+trx_applicationmodel.aspect.trx_transferred.name=Transf\u00e9r\u00e9
+trx_applicationmodel.aspect.trx_transferred.description=Les noeuds avec cet aspect ont \u00e9t\u00e9 transf\u00e9r\u00e9s d'un entrep\u00f4t \u00e0 un autre
+
+trx_applicationmodel.aspect.trx_alien.name=Etranger de transfert
+trx_applicationmodel.aspect.trx_alien.description=Les noeuds avec cet aspect sont des noeuds \u00e9trangers ou ont \u00e9t\u00e9 envahis par d'autres noeuds \u00e9trangers
\ No newline at end of file
diff --git a/config/alfresco/messages/transfer-service_de.properties b/config/alfresco/messages/transfer-service_de.properties
index 6fcc9a430b..6eaa901b2f 100755
--- a/config/alfresco/messages/transfer-service_de.properties
+++ b/config/alfresco/messages/transfer-service_de.properties
@@ -9,14 +9,14 @@ transfer_service.comms.unsupported_protocol=Nicht unterst\u00fctztes Protokoll:
transfer_service.comms.unsuccessful_response=Von Zielserver erfolglosen Antwort Code erhalten: {0}, {1}
transfer_service.comms.http_request_failed=HTTP Anfrage {0} an Ziel: {1} Status: {2} nicht ausgef\u00fchrt
transfer_service.incompatible_versions=\u00dcbertragung zwischen nicht kompatiblen Versionen nicht m\u00f6glich, \u00dcbertragungs-ID:{0} von:{1} nach:{2}
-transfer_service.no_nodes=Keine zu \u00fcbertragenden Knoten
+transfer_service.no_nodes=Keine zu \u00fcbertragenden Nodes
transfer_service.target_not_enabled=\u00dcbertragungsziel nicht aktiviert {0}
transfer_service.cancelled=\u00dcbertragung abgebrochen
transfer_service.failed_to_get_transfer_status=Abrufen des \u00dcbertragungsstatus von Ziel {0} fehlgeschlagen
transfer_service.target_error=\u00dcbertragungsziel mit {0} fehlgeschlagen
transfer_service.unknown_target_error=Unbekannter Fehler
transfer_service.receiver.no_primary_parent_supplied=\u00dcbertragung nicht m\u00f6glich, kein Prim\u00e4relternteil angegeben.
-transfer_service.receiver.orphans_exist=\u00dcbertragung nicht m\u00f6glich, Waisen vorhanden
+transfer_service.receiver.orphans_exist=\u00dcbertragung nicht m\u00f6glich, Waisen vorhanden.
transfer_service.receiver.content_file_missing=\u00dcbertragung nicht m\u00f6glich, Inhaltsdateien fehlen.
transfer_service.receiver.failed_to_create_staging_folder=Staging-Verzeichnis f\u00fcr \u00dcbertragung {0} kann nicht erstellt werden
transfer_service.receiver.lock_folder_not_found=Angegebener Sperr-Ordner ist nicht auffindbar: {0}
@@ -26,7 +26,7 @@ transfer_service.receiver.record_folder_not_found=Angegebener Ordner f\u00fcr Pr
transfer_service.receiver.not_lock_owner=Fehlgeschlagener Versuch, eine \u00dcbertragung auszuf\u00fchren. Sperre nicht von angegebener \u00dcbertragung gehalten: {0}
transfer_service.receiver.error_ending_transfer=Anforderung zur Beendigung einer \u00dcbertragung ({0}) hat zu einem Fehler gef\u00fchrt.
transfer_service.receiver.error_staging_snapshot=Beim Staging der Momentaufnahme einer Datei zur \u00dcbertragung {0} ist ein Fehler aufgetreten
-transfer_service.receiver.error_staging_content=Beim Staging der Content-Datei zur \u00dcbertragung {0} ist ein Fehler aufgetreten. Feld-ID ist {1}
+transfer_service.receiver.error_staging_content=Beim Staging der Content-Datei zur \u00dcbertragung {0} ist ein Fehler aufgetreten Feld-ID ist {1}
transfer_service.receiver.no_snapshot_received=Eine Anfrage nach Ausf\u00fchrung einer \u00dcbertragung ({0}) ist eingegangen, es ist aber keine passende Momentaufnahmen-Datei eingegangen.
transfer_service.receiver.error_committing_transfer=Beim Versuch der Ausf\u00fchrung der \u00dcbertragung {0} ist ein Fehler aufgetreten
transfer_service.receiver.transfer_not_found=Konnte kein Protokoll einer \u00dcbertragungsanfrage finden: {0}
diff --git a/config/alfresco/model/bpmModel.xml b/config/alfresco/model/bpmModel.xml
index 010bab12a8..786bdac5e8 100644
--- a/config/alfresco/model/bpmModel.xml
+++ b/config/alfresco/model/bpmModel.xml
@@ -77,7 +77,7 @@
Package Foldercm:systemfolder
- true
+ false
diff --git a/config/alfresco/model/contentModel.xml b/config/alfresco/model/contentModel.xml
index c7ac00137e..d7d1dc0bd5 100644
--- a/config/alfresco/model/contentModel.xml
+++ b/config/alfresco/model/contentModel.xml
@@ -443,6 +443,7 @@
Rating
+ sys:baseRating
diff --git a/config/alfresco/model/siteModel.xml b/config/alfresco/model/siteModel.xml
index a96a7d51d9..ce2319ba63 100644
--- a/config/alfresco/model/siteModel.xml
+++ b/config/alfresco/model/siteModel.xml
@@ -47,6 +47,8 @@
cm:titled
+
+ sys:undeletable
diff --git a/config/alfresco/model/systemModel.xml b/config/alfresco/model/systemModel.xml
index f53335bfc4..3e2792aaf7 100644
--- a/config/alfresco/model/systemModel.xml
+++ b/config/alfresco/model/systemModel.xml
@@ -155,6 +155,11 @@
false
+
+
+ Undeletable
+
+
NoContent
diff --git a/config/alfresco/node-services-context.xml b/config/alfresco/node-services-context.xml
index f45b86ee63..856d9f5f7c 100644
--- a/config/alfresco/node-services-context.xml
+++ b/config/alfresco/node-services-context.xml
@@ -216,33 +216,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ ${spaces.archive.store}
@@ -260,4 +243,9 @@
+
+
+
+
+
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 96818dba05..9bb96341f4 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -2708,6 +2708,7 @@
+ swsdp
diff --git a/config/alfresco/site-services-context.xml b/config/alfresco/site-services-context.xml
index d7a8c04cae..932b701437 100644
--- a/config/alfresco/site-services-context.xml
+++ b/config/alfresco/site-services-context.xml
@@ -90,7 +90,9 @@
-
+
+
+
@@ -107,5 +109,13 @@
-
+
+
+
+
+
+
+
+
+
diff --git a/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties b/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties
index 5b811f8fcf..61c2f78565 100644
--- a/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties
+++ b/config/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties
@@ -10,7 +10,7 @@ activities.feed.max.ageMins=44640
# - refer to "sysAdmin" subsystem for Share url/ctx properties (share.*)
activities.feed.notifier.startDelayMins=0
# Feed notification period (eg. 1440 mins => every 24 hours)
-activities.feed.notifier.repeatIntervalMins=1
+activities.feed.notifier.repeatIntervalMins=1440
activities.feed.notifier.enabled=true
# activities feed generator
diff --git a/config/alfresco/subsystems/googledocs/default/googledocs.properties b/config/alfresco/subsystems/googledocs/default/googledocs.properties
index e262d205da..b6c63421fb 100755
--- a/config/alfresco/subsystems/googledocs/default/googledocs.properties
+++ b/config/alfresco/subsystems/googledocs/default/googledocs.properties
@@ -10,8 +10,8 @@ googledocs.url=http://docs.google.com/feeds/default/private/full
googledocs.downloadurl=https://docs.google.com/feeds/download
# System google docs authentication credentials
-#googledocs.username=
-#googledocs.password=
+googledocs.username=
+googledocs.password=
# Google docs spreadsheet service name
googledocs.spreadsheet.service.name=wise
\ No newline at end of file
diff --git a/config/alfresco/subsystems/thirdparty/default/swf-transform-context.xml b/config/alfresco/subsystems/thirdparty/default/swf-transform-context.xml
index 104c47f891..a709a87530 100644
--- a/config/alfresco/subsystems/thirdparty/default/swf-transform-context.xml
+++ b/config/alfresco/subsystems/thirdparty/default/swf-transform-context.xml
@@ -50,6 +50,14 @@
application/x-shockwave-flash
+
+
+ application/illustrator
+
+
+ application/x-shockwave-flash
+
+
diff --git a/config/alfresco/templates/activities-email-templates.acp b/config/alfresco/templates/activities-email-templates.acp
index 148cc4a5b622e8737ff6b9c82218f058c2ccdbec..de1f1a4bbb92b76f9497ff24293798132cafaa89 100644
GIT binary patch
delta 933
zcmcZ+a5-Rt6EowYr4wD#m`^TPx^Z0!D~R4K%GM5H%;zqKiU`(%8I$L8t8CsW77G!T
zlu2S0tSaoa>)E_N{Sgxb1D`AdgWSXd*?PT-+?>!5P6lR)g-d;Q@iHt&(fS**rHoz3SykOXF30*-}$(Dsyu1{(K+n&DOJD
z!8z>?lcm7oyS007#oE^N&W{sL({=EeRdjz}Y5O)-8z1FU%lG~L^LqE^1bf!zk4=Y)
z>ZjO8yg0vf-