diff --git a/config/alfresco/messages/office-addin.properties b/config/alfresco/messages/office-addin.properties
index 7e04b5d32b..faf249c97a 100644
--- a/config/alfresco/messages/office-addin.properties
+++ b/config/alfresco/messages/office-addin.properties
@@ -11,7 +11,7 @@ office.title.document_tags=Document Tags
 
 # Help
 office.help.title=Online Help
-office.help.url=http://docs.alfresco.com/{0}.{1}/topic/com.alfresco.team.doc/concepts/MSAddin-using.html
+office.help.url=http://docs.alfresco.com/{0}.{1}/topic/com.alfresco.{2}_{0}_{1}_0.doc/concepts/MSAddin-using.html
 
 # Headers and Subheaders
 office.header.my_checked_out_documents=My Checked Out Documents
diff --git a/config/alfresco/messages/office-addin_de.properties b/config/alfresco/messages/office-addin_de.properties
index 3fbb1ffa21..0fe7b09a17 100644
--- a/config/alfresco/messages/office-addin_de.properties
+++ b/config/alfresco/messages/office-addin_de.properties
@@ -5,18 +5,18 @@
 office.title.my_alfresco=Mein Alfresco
 office.title.navigation=R\u00e4ume und Dokumente durchsuchen
 office.title.search=Alfresco durchsuchen
-office.title.document_details=Dokumentendetails  
+office.title.document_details=Dokumentendetails
 office.title.my_tasks=Meine Aufgaben
 office.title.document_tags=Dokumenten-Tags
 
 # Help
 office.help.title=Online Hilfe
-office.help.url=http://www.alfresco.com/help/{0}{1}/{2}/msaddin/
+office.help.url=http://docs.alfresco.com/{0}.{1}/topic/com.alfresco.{2}_{0}_{1}_0.doc/concepts/MSAddin-using.html
 
 # Headers and Subheaders
 office.header.my_checked_out_documents=Meine ausgecheckten Dokumente
 office.header.my_tasks=Meine Aufgaben
-office.header.current_space=Aktueller Raum
+office.header.current_space=Aktueller Arbeitsbereich
 office.header.spaces_in=R\u00e4ume in {0}
 office.header.documents_in=Dokumente in {0}
 office.header.document_actions=Dokumentenaktionen
@@ -35,7 +35,7 @@ office.header.tagged=Getaggde Dokumente
 office.status.locked=Gesperrt
 
 # Actions
-office.action.add_tag=Tag hinzuf\u00fcgen
+office.action.add_tag=Einen Tag hinzuf\u00fcgen
 office.action.remove_tag=Tag "{0}" entfernen
 office.action.download={0} downloaden
 office.action.open={0} \u00f6ffnen
@@ -45,7 +45,7 @@ office.action.checkin=Einchecken
 office.action.checkin.description=Aktuelles Dokument einchecken.
 office.action.checkout=Auschecken
 office.action.checkout.description=Aktuelles Dokument als Arbeitskopie auschecken.
-office.action.start_workflow=Workflow beginnen
+office.action.start_workflow=Workflow starten
 office.action.start_workflow.description=Erweiterten Workflow f\u00fcr aktuelles Dokument starten.
 office.action.transform_pdf=In PDF umwandeln.
 office.action.transform_pdf.description=In Adobe PDF-Format umwandeln.
@@ -68,7 +68,7 @@ office.action.return_search.description=Zur\u00fcck zum Such-Tab
 office.action.manage_task=Verwalten
 
 # Buttons
-office.button.submit=Erstellen
+office.button.submit=Vorlegen
 office.button.cancel=Abbrechen
 office.button.ok=OK
 office.button.search=Suche
@@ -76,7 +76,7 @@ office.button.search=Suche
 # Messages
 office.message.unmanaged=Das aktuelle Dokument wird nicht von Alfresco verwaltet.
 office.message.unversioned=Das aktuelle Dokument ist nicht versioniert.
-office.message.none=Keine 
+office.message.none=Keine
 office.message.no_documents=Keine Dokumente
 office.message.no_due_date=Kein F\u00e4lligkeitsdatum
 office.message.no_tasks=Keine Aufgaben
@@ -87,13 +87,13 @@ office.message.results_max.after=Elemente
 office.message.no_results=Keine Ergebnisse gefunden
 office.message.confirm_delete=Wollen Sie dieses Dokument wirklich l\u00f6schen?
 office.message.enter_workflow_details=Neue Details f\u00fcr den Workflow untenstehend eingeben
-office.message.workflow_action_complete=Aktion ''{0}'' des Workflows abgeschlossen.
+office.message.workflow_action_complete=Aktion '{0}' des Workflows abgeschlossen.
 
 # Properties
 office.property.title=Titel
 office.property.description=Beschreibung
 office.property.creator=Ersteller
-office.property.created=Erstellt
+office.property.created=Angelegt
 office.property.modifier=Bearbeiter
 office.property.modified=Ge\u00e4ndert
 office.property.size=Gr\u00f6\u00dfe
@@ -105,7 +105,7 @@ office.property.name=Name
 office.property.template=Mustervorlage
 office.property.filename=Dateiname des Dokuments
 office.property.workflow=Workflow
-office.property.assign_to=Zuweisen 
+office.property.assign_to=Zuweisen
 office.property.due_on=F\u00e4llig am
 office.property.status=Status
 office.property.priority=Priorit\u00e4t
@@ -113,7 +113,7 @@ office.property.start_date=Anfangsdatum
 office.property.type=Typ
 office.property.complete=Abschlie\u00dfen
 
-#\u00c3\u0082\u00c2\u00a0Workflow
+#\u00c2\u00a0Workflow
 office.workflow.review=\u00dcberpr\u00fcfen und zustimmen
 office.workflow.adhoc=Adhoc Aufgabe
 
@@ -140,7 +140,6 @@ office.result.user_not_found=Benutzer nicht gefunden
 # Miscellaneous
 office.unit.kb=KB
 office.version.notes=Notizen
-office.task.overdue=\u00dcberf\u00e4llig
+office.task.overdue=\u00fcberf\u00e4llig
 office.task.due_today=heute f\u00e4llig
 office.tip.task_item=Aufgabenelement
-
diff --git a/config/alfresco/messages/office-addin_es.properties b/config/alfresco/messages/office-addin_es.properties
index 527a004b51..6eb465001d 100755
--- a/config/alfresco/messages/office-addin_es.properties
+++ b/config/alfresco/messages/office-addin_es.properties
@@ -10,8 +10,8 @@ office.title.my_tasks=Mis Tareas
 office.title.document_tags=Etiquetas de documento
 
 # Help
-office.help.title=Ayuda en l\u00c3\u00adnea
-office.help.url=http://www.alfresco.com/help/{0}{1}/{2}/msaddin/
+office.help.title=Ayuda en l\u00ednea
+office.help.url=http://docs.alfresco.com/{0}.{1}/topic/com.alfresco.{2}_{0}_{1}_0.doc/concepts/MSAddin-using.html
 
 # Headers and Subheaders
 office.header.my_checked_out_documents=Mis Documentos bloqueados
@@ -24,8 +24,8 @@ office.header.actions=Acciones
 office.header.details=Detalles del documento actual
 office.header.document_tags=Etiquetas de documento
 office.header.document_tags.for=Etiquetas de documento para {0}
-office.header.version_history=Hist\u00c3\u00b3rico de versiones
-office.header.version_history.for=Hist\u00c3\u00b3rico de versiones para ''{0}''
+office.header.version_history=Hist\u00f3rico de versiones
+office.header.version_history.for=Hist\u00f3rico de versiones para {0}
 office.header.search=Buscar
 office.header.task_details=Detalles de la tarea
 office.header.tag_cloud=Nube de etiquetas
@@ -35,7 +35,7 @@ office.header.tagged=Documentos etiquetados
 office.status.locked=Bloqueado
 
 # Actions
-office.action.add_tag=A\u00c3\u00b1adir una etiqueta
+office.action.add_tag=A\u00f1adir una etiqueta
 office.action.remove_tag=Quitar etiqueta ''{0}''
 office.action.download=Descargar {0}
 office.action.open=Abrir {0}
@@ -52,7 +52,7 @@ office.action.transform_pdf.description=Transformar en formato Adobe PDF.
 office.action.open_details=Abrir detalles completos
 office.action.open_details.description=Abrir los detalles del documento en Alfresco Explorer.
 office.action.save_to_alfresco=Guardar en Alfresco
-office.action.save_to_alfresco.description=Le permite colocar el documento actual bajo administraci\u00c3\u00b3n de Alfresco.
+office.action.save_to_alfresco.description=Le permite colocar el documento actual bajo administraci\u00f3n de Alfresco.
 office.action.insert=Insertar fichero en el documento actual
 office.action.create_collaboration_space=Crear espacio colaborativo
 office.action.create_collaboration_space.description=Crear un nuevo espacio colaborativo en el repositorio de Alfresco.
@@ -63,8 +63,8 @@ office.action.parent_space=Hasta espacio padre
 office.action.create_space=Crear nuevo espacio
 office.action.create_collaboration_space=Crear nuevo espacio colaborativo
 office.action.delete=Eliminar
-office.action.return_search=Volver a resultados de b\u00c3\u00basqueda
-office.action.return_search.description=Volver a la pesta\u00c3\u00b1a de b\u00c3\u00basqueda
+office.action.return_search=Volver a resultados de b\u00fasqueda
+office.action.return_search.description=Volver a la pesta\u00f1a de b\u00fasqueda
 office.action.manage_task=Gestionar
 
 # Buttons
@@ -74,30 +74,30 @@ office.button.ok=Aceptar
 office.button.search=Buscar
 
 # Messages
-office.message.unmanaged=El documento actual no est\u00c3\u00a1 administrado por Alfresco.
-office.message.unversioned=El documento actual no est\u00c3\u00a1 versionado.
+office.message.unmanaged=El documento actual no est\u00e1 administrado por Alfresco.
+office.message.unversioned=El documento actual no est\u00e1 versionado.
 office.message.none=Ninguno
 office.message.no_documents=No hay documentos
 office.message.no_due_date=No hay fecha de vencimiento
 office.message.no_tasks=No hay tareas
 office.message.no_subspaces=No hay subespacios
-office.message.search_for=B\u00c3\u00basqueda de
-office.message.results_max.before=Devolver un m\u00c3\u00a1ximo de
+office.message.search_for=B\u00fasqueda de
+office.message.results_max.before=Devolver un m\u00e1ximo de
 office.message.results_max.after=elementos
-office.message.no_results=Ning\u00c3\u00ban resultado encontrado
-office.message.confirm_delete=\u00c2\u00bfEst\u00c3\u00a1 seguro de que quiere eliminar este documento?
-office.message.enter_workflow_details=Introduzca los datos del nuevo flujo de trabajo a continuaci\u00c3\u00b3n
-office.message.workflow_action_complete=Acci\u00c3\u00b3n '{0}' de flujo de trabajo completada.
+office.message.no_results=Ning\u00fan resultado encontrado
+office.message.confirm_delete=\u00bfEst\u00e1 seguro de que quiere eliminar este documento?
+office.message.enter_workflow_details=Introduzca los datos del nuevo flujo de trabajo a continuaci\u00f3n
+office.message.workflow_action_complete=Acci\u00f3n '{0}' de flujo de trabajo completada.
 
 # Properties
-office.property.title=T\u00c3\u00adtulo
-office.property.description=Descripci\u00c3\u00b3n
+office.property.title=T\u00edtulo
+office.property.description=Descripci\u00f3n
 office.property.creator=Creador
 office.property.created=Creado
 office.property.modifier=Modificador
 office.property.modified=Modificado
-office.property.size=Tama\u00c3\u00b1o
-office.property.categories=Categor\u00c3\u00adas
+office.property.size=Tama\u00f1o
+office.property.categories=Categor\u00edas
 office.property.author=Autor
 office.property.date=Fecha
 office.property.due_date=Fecha de vencimiento
@@ -113,12 +113,12 @@ office.property.start_date=Fecha de inicio
 office.property.type=Tipo
 office.property.complete=Completar
 
-#\u00c3\u0082\u00c2\u00a0Workflow
+#\u00c2\u00a0Workflow
 office.workflow.review=Revisar y aprobar
 office.workflow.adhoc=Tarea ad hoc
 
 # Result messages
-office.result.failed=Acci\u00c3\u00b3n fallida
+office.result.failed=Acci\u00f3n fallida
 office.result.convert.failed=No se pudo convertir el documento
 office.result.converted=Documento convertido
 office.result.delete.failed=No se pudo eliminar el documento
@@ -130,8 +130,8 @@ office.result.checked_in=Documento desbloqueado
 office.result.version.failed=No se pudo versionar el documento
 office.result.versioned=Documento versionado
 office.result.workflow_started=Nuevo flujo de trabajo iniciado
-office.result.unknown=Acci\u00c3\u00b3n desconocida
-office.result.exception=Acci\u00c3\u00b3n fallida debido a una excepci\u00c3\u00b3n
+office.result.unknown=Acci\u00f3n desconocida
+office.result.exception=Acci\u00f3n fallida debido a una excepci\u00f3n
 office.result.create_space.failed=No se pudo crear el espacio
 office.result.create_space.missing_name=El espacio debe tener un nombre
 office.result.space_created=Nuevo espacio creado
diff --git a/config/alfresco/messages/office-addin_fr.properties b/config/alfresco/messages/office-addin_fr.properties
index b40df1ade8..1e04dd871f 100755
--- a/config/alfresco/messages/office-addin_fr.properties
+++ b/config/alfresco/messages/office-addin_fr.properties
@@ -11,7 +11,7 @@ office.title.document_tags=Tags du document
 
 # Help
 office.help.title=Aide en Ligne
-office.help.url=office.help.url=http://www.alfresco.com/help/{0}{1}/{2}/msaddin/
+office.help.url=http://docs.alfresco.com/{0}.{1}/topic/com.alfresco.{2}_{0}_{1}_0.doc/concepts/MSAddin-using.html
 
 # Headers and Subheaders
 office.header.my_checked_out_documents=Mes copies de travail
@@ -28,7 +28,7 @@ office.header.version_history=Historique des versions
 office.header.version_history.for=Historique des versions pour {0}
 office.header.search=Rechercher
 office.header.task_details=D\u00e9tails de la t\u00e2che
-office.header.tag_cloud=Nuage de tags
+office.header.tag_cloud=Nuage d'\u00e9tiquettes
 office.header.tagged=Documents tagg\u00e9s
 
 # Document Status
@@ -36,7 +36,7 @@ office.status.locked=Verrouill\u00e9
 
 # Actions
 office.action.add_tag=Ajouter un tag
-office.action.remove_tag=Supprimer le tag "{0}"
+office.action.remove_tag=Supprimer l''\u00e9tiquette "{0}"
 office.action.download=T\u00e9l\u00e9charger {0}
 office.action.open=Ouvrir {0}
 office.action.make_versionable=Rendre versionnable
@@ -55,7 +55,7 @@ office.action.save_to_alfresco=Enregistrer dans Alfresco
 office.action.save_to_alfresco.description=Vous permet de placer le document actuel sous la gestion Alfresco.
 office.action.insert=Ins\u00e9rer le fichier dans le document actuel
 office.action.create_collaboration_space=Cr\u00e9er un espace de collaboration
-office.action.create_collaboration_space.description=Cr\u00e9er un espace de collaboration dans le entrep\u00f4t Alfresco.
+office.action.create_collaboration_space.description=Cr\u00e9er un espace de collaboration dans l'entrep\u00f4t Alfresco.
 office.action.launch_alfresco=Lancer Alfresco
 office.action.launch_alfresco.description=D\u00e9marrer le client Web Alfresco Explorer.
 office.action.userhome=Vers l'espace personnel de l'utilisateur
@@ -63,7 +63,7 @@ office.action.parent_space=Vers l'espace parent
 office.action.create_space=Cr\u00e9er un espace
 office.action.create_collaboration_space=Cr\u00e9er un espace de collaboration
 office.action.delete=Supprimer
-office.action.return_search=Retourner aux r\u00e9sultats de la recherche
+office.action.return_search=Revenir aux r\u00e9sultats de la recherche
 office.action.return_search.description=Retourner \u00e0\u00a0 l'onglet de recherche
 office.action.manage_task=G\u00e9rer
 
@@ -87,13 +87,13 @@ office.message.results_max.after=d'articles
 office.message.no_results=Pas de r\u00e9sultat trouv\u00e9
 office.message.confirm_delete=Etes-vous s\u00fbr de vouloir supprimer ce document\u00a0?
 office.message.enter_workflow_details=Saisir les d\u00e9tails du nouveau workflow ci-dessous
-office.message.workflow_action_complete=Action de workflow '{0}' termin\u00e9e.
+office.message.workflow_action_complete=Action de workflow ''{0}'' termin\u00e9e.
 
 # Properties
 office.property.title=Titre
 office.property.description=Description
 office.property.creator=Cr\u00e9ateur
-office.property.created=Cr\u00e9e
+office.property.created=Cr\u00e9\u00e9
 office.property.modifier=Modificateur
 office.property.modified=Modifi\u00e9
 office.property.size=Taille
@@ -105,15 +105,15 @@ office.property.name=Nom
 office.property.template=Mod\u00e8le
 office.property.filename=Nom de fichier du document
 office.property.workflow=Workflow
-office.property.assign_to=Assigner \u00e0\u00a0
+office.property.assign_to=Assigner \u00e0
 office.property.due_on=A \u00e9ch\u00e9ance le
-office.property.status=Etat
+office.property.status=Statut
 office.property.priority=Priorit\u00e9
 office.property.start_date=Date de D\u00e9but
 office.property.type=Type
 office.property.complete=Achev\u00e9
 
-# Workflow
+#\u00c2\u00a0Workflow
 office.workflow.review=R\u00e9viser et approuver
 office.workflow.adhoc=T\u00e2che Adhoc
 
@@ -141,5 +141,5 @@ office.result.user_not_found=Utilisateur introuvable
 office.unit.kb=Ko
 office.version.notes=Notes
 office.task.overdue=En retard
-office.task.due_today=\u00e9ch\u00e9ance \u00e0\u00a0ce jour
-office.tip.task_item=\u00c9l\u00e9ment de t\u00e2che
+office.task.due_today=\u00e9ch\u00e9ance \u00e0 ce jour
+office.tip.task_item=El\u00e9ment de t\u00e2che
diff --git a/config/alfresco/messages/office-addin_it.properties b/config/alfresco/messages/office-addin_it.properties
index 6846267111..4becde2731 100755
--- a/config/alfresco/messages/office-addin_it.properties
+++ b/config/alfresco/messages/office-addin_it.properties
@@ -11,7 +11,7 @@ office.title.document_tags=Tag documento
 
 # Help
 office.help.title=Aiuto online
-office.help.url=http://www.alfresco.com/help/{0}{1}/{2}/msaddin/
+office.help.url=http://docs.alfresco.com/{0}.{1}/topic/com.alfresco.{2}_{0}_{1}_0.doc/concepts/MSAddin-using.html
 
 # Headers and Subheaders
 office.header.my_checked_out_documents=I miei documenti sottoposti a Check Out
@@ -108,12 +108,12 @@ office.property.workflow=Workflow
 office.property.assign_to=Assegna a
 office.property.due_on=Scade il
 office.property.status=Stato
-office.property.priority=Priorit\u00e0\u00a0
+office.property.priority=Priorit\u00e0
 office.property.start_date=Data di inizio
 office.property.type=Tipo
 office.property.complete=Completato
 
-# Workflow
+#\u00c2\u00a0Workflow
 office.workflow.review=Esamina e approva
 office.workflow.adhoc=Compito ad-hoc
 
diff --git a/config/alfresco/messages/office-addin_ja.properties b/config/alfresco/messages/office-addin_ja.properties
index 49aa358fed..c5695a9249 100755
--- a/config/alfresco/messages/office-addin_ja.properties
+++ b/config/alfresco/messages/office-addin_ja.properties
@@ -2,144 +2,144 @@
 ## Microsoft Office Add-In Messages
 ##
 # Page Titles
-office.title.my_alfresco=\u3042\u306a\u305f\u306eAlfresco
-office.title.navigation=\u30b9\u30da\u30fc\u30b9\u3068\u6587\u66f8\u306e\u95b2\u89a7
-office.title.search=Alfresco\u306e\u691c\u7d22
-office.title.document_details=\u6587\u66f8\u306e\u8a73\u7d30
-office.title.my_tasks=\u3042\u306a\u305f\u306e\u30bf\u30b9\u30af
-office.title.document_tags=\u6587\u66f8\u30bf\u30b0
+office.title.my_alfresco=\u3042\u306A\u305F\u306EAlfresco
+office.title.navigation=\u30B9\u30DA\u30FC\u30B9\u3068\u6587\u66F8\u306E\u95B2\u89A7
+office.title.search=Alfresco\u3092\u691C\u7D22
+office.title.document_details=\u6587\u66F8\u306E\u8A73\u7D30
+office.title.my_tasks=\u30BF\u30B9\u30AF
+office.title.document_tags=\u6587\u66F8\u30BF\u30B0
 
 # Help
-office.help.title=\u30aa\u30f3\u30e9\u30a4\u30f3\u30fb\u30d8\u30eb\u30d7
-office.help.url=http://www.alfresco.com/help/34/{0}{1}/{2}/msaddin/
+office.help.title=\u30AA\u30F3\u30E9\u30A4\u30F3\u30FB\u30D8\u30EB\u30D7
+office.help.url=http://docs.alfresco.com/{0}.{1}/topic/com.alfresco.{2}_{0}_{1}_0.doc/concepts/MSAddin-using.html
 
 # Headers and Subheaders
-office.header.my_checked_out_documents=\u3042\u306a\u305f\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u6e08\u6587\u66f8
-office.header.my_tasks=\u3042\u306a\u305f\u306e\u30bf\u30b9\u30af
-office.header.current_space=\u73fe\u5728\u306e\u30b9\u30da\u30fc\u30b9
-office.header.spaces_in={0}\u306e\u30b9\u30da\u30fc\u30b9
-office.header.documents_in={0}\u306e\u6587\u66f8
-office.header.document_actions=\u6587\u66f8\u30a2\u30af\u30b7\u30e7\u30f3
-office.header.actions=\u30a2\u30af\u30b7\u30e7\u30f3
-office.header.details=\u73fe\u5728\u306e\u6587\u66f8\u306e\u8a73\u7d30
-office.header.document_tags=\u6587\u66f8\u30bf\u30b0
-office.header.document_tags.for={0}\u306e\u6587\u66f8\u30bf\u30b0
-office.header.version_history=\u30d0\u30fc\u30b8\u30e7\u30f3\u5c65\u6b74
-office.header.version_history.for={0}\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u5c65\u6b74
-office.header.search=\u691c\u7d22
-office.header.task_details=\u30bf\u30b9\u30af\u306e\u8a73\u7d30
-office.header.tag_cloud=\u30bf\u30b0\u30fb\u30af\u30e9\u30a6\u30c9
-office.header.tagged=\u30bf\u30b0\u4ed8\u6587\u66f8
+office.header.my_checked_out_documents=\u3042\u306A\u305F\u306E\u30C1\u30A7\u30C3\u30AF\u30A2\u30A6\u30C8\u6E08\u6587\u66F8
+office.header.my_tasks=\u30BF\u30B9\u30AF
+office.header.current_space=\u73FE\u5728\u306E\u30B9\u30DA\u30FC\u30B9
+office.header.spaces_in={0}\u306E\u30B9\u30DA\u30FC\u30B9
+office.header.documents_in={0}\u306E\u6587\u66F8
+office.header.document_actions=\u6587\u66F8\u5411\u3051\u30A2\u30AF\u30B7\u30E7\u30F3
+office.header.actions=\u30A2\u30AF\u30B7\u30E7\u30F3
+office.header.details=\u73FE\u5728\u306E\u6587\u66F8\u306E\u8A73\u7D30
+office.header.document_tags=\u6587\u66F8\u30BF\u30B0
+office.header.document_tags.for={0}\u306E\u6587\u66F8\u30BF\u30B0
+office.header.version_history=\u30D0\u30FC\u30B8\u30E7\u30F3\u5C65\u6B74
+office.header.version_history.for={0}\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u5C65\u6B74
+office.header.search=\u691C\u7D22
+office.header.task_details=\u30BF\u30B9\u30AF\u306E\u8A73\u7D30
+office.header.tag_cloud=\u30BF\u30B0\u30FB\u30AF\u30E9\u30A6\u30C9
+office.header.tagged=\u30BF\u30B0\u4ED8\u304D\u6587\u66F8
 
 # Document Status
-office.status.locked=\u30ed\u30c3\u30af\u6e08
+office.status.locked=\u30ED\u30C3\u30AF\u6E08
 
 # Actions
-office.action.add_tag=\u30bf\u30b0\u3092\u8ffd\u52a0
-office.action.remove_tag="{0}"\u30bf\u30b0\u3092\u53d6\u9664\u304f
-office.action.download={0}\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9
-office.action.open={0}\u3092\u958b\u304f
-office.action.make_versionable=\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u7ba1\u7406\u53ef\u80fd\u306b\u3059\u308b
-office.action.compare_current=\u73fe\u5728\u306e\u6587\u66f8\u3068\u6bd4\u8f03
-office.action.checkin=\u30c1\u30a7\u30c3\u30af\u30a4\u30f3
-office.action.checkin.description=\u73fe\u5728\u306e\u6587\u66f8\u3092\u30c1\u30a7\u30c3\u30af\u30a4\u30f3\u3057\u307e\u3059\u3002
-office.action.checkout=\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8
-office.action.checkout.description=\u73fe\u5728\u306e\u6587\u66f8\u3092\u4f5c\u696d\u4e2d\u306e\u30b3\u30d4\u30fc\u306b\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u307e\u3059\u3002
-office.action.start_workflow=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306e\u958b\u59cb
-office.action.start_workflow.description=\u73fe\u5728\u306e\u6587\u66f8\u306e\u30a2\u30c9\u30d0\u30f3\u30b9\u30c9\u30fb\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u3092\u958b\u59cb\u3057\u307e\u3059\u3002
-office.action.transform_pdf=PDF\u306b\u5909\u63db
-office.action.transform_pdf.description=Adobe PDF\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306b\u5909\u63db\u3057\u307e\u3059\u3002
-office.action.open_details=\u3059\u3079\u3066\u306e\u8a73\u7d30\u3092\u958b\u304f
-office.action.open_details.description=Alfresco Explorer\u306e\u6587\u66f8\u8a73\u7d30\u3092\u958b\u304d\u307e\u3059\u3002
-office.action.save_to_alfresco=Alfresco\u306b\u4fdd\u5b58
-office.action.save_to_alfresco.description=\u73fe\u5728\u306e\u6587\u66f8\u3092Alfresco\u306e\u7ba1\u7406\u4e0b\u306b\u7f6e\u304d\u307e\u3059\u3002
-office.action.insert=\u73fe\u5728\u306e\u6587\u66f8\u306b\u30d5\u30a1\u30a4\u30eb\u3092\u633f\u5165\u3057\u307e\u3059\u3002
-office.action.create_collaboration_space=\u30b3\u30e9\u30dc\u30ec\u30fc\u30b7\u30e7\u30f3\u30fb\u30b9\u30da\u30fc\u30b9\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002
-office.action.create_collaboration_space.description=Alfresco\u30ea\u30dd\u30b8\u30c8\u30ea\u5185\u306b\u65b0\u3057\u3044\u30b3\u30e9\u30dc\u30ec\u30fc\u30b7\u30e7\u30f3\u30b9\u30da\u30fc\u30b9\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002
-office.action.launch_alfresco=Alfresco\u306e\u8d77\u52d5
-office.action.launch_alfresco.description=Alfresco Explorer\u306eWeb\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u3092\u8d77\u52d5\u3057\u307e\u3059\u3002
-office.action.userhome=\u30e6\u30fc\u30b6\u306e\u30db\u30fc\u30e0\u30b9\u30da\u30fc\u30b9\u3078
-office.action.parent_space=\u89aa\u30b9\u30da\u30fc\u30b9\u307e\u3067
-office.action.create_space=\u65b0\u898f\u30b9\u30da\u30fc\u30b9\u306e\u4f5c\u6210
-office.action.create_collaboration_space=\u65b0\u898f\u30b3\u30e9\u30dc\u30ec\u30fc\u30b7\u30e7\u30f3\u30fb\u30b9\u30da\u30fc\u30b9\u306e\u4f5c\u6210
-office.action.delete=\u524a\u9664
-office.action.return_search=\u691c\u7d22\u7d50\u679c\u306b\u623b\u308b
-office.action.return_search.description=\u691c\u7d22\u30bf\u30d6\u306b\u623b\u308b
-office.action.manage_task=\u7ba1\u7406
+office.action.add_tag=\u30BF\u30B0\u306E\u8FFD\u52A0
+office.action.remove_tag=\u30BF\u30B0"{0}"\u306E\u524A\u9664
+office.action.download={0}\u306E\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9
+office.action.open={0}\u3092\u958B\u304F
+office.action.make_versionable=\u30D0\u30FC\u30B8\u30E7\u30F3\u7BA1\u7406\u5BFE\u8C61\u306B\u3059\u308B
+office.action.compare_current=\u73FE\u5728\u3068\u6BD4\u8F03
+office.action.checkin=\u30C1\u30A7\u30C3\u30AF\u30A4\u30F3
+office.action.checkin.description=\u73FE\u5728\u306E\u6587\u66F8\u3092\u30C1\u30A7\u30C3\u30AF\u30A4\u30F3\u3057\u307E\u3059\u3002
+office.action.checkout=\u30C1\u30A7\u30C3\u30AF\u30A2\u30A6\u30C8
+office.action.checkout.description=\u73FE\u5728\u306E\u6587\u66F8\u3092\u4F5C\u696D\u7528\u30B3\u30D4\u30FC\u306B\u30C1\u30A7\u30C3\u30AF\u30A2\u30A6\u30C8\u3057\u307E\u3059\u3002
+office.action.start_workflow=\u30EF\u30FC\u30AF\u30D5\u30ED\u30FC\u306E\u958B\u59CB
+office.action.start_workflow.description=\u73FE\u5728\u306E\u6587\u66F8\u306E\u30A2\u30C9\u30D0\u30F3\u30B9\u30C9\u30FB\u30EF\u30FC\u30AF\u30D5\u30ED\u30FC\u3092\u958B\u59CB\u3057\u307E\u3059\u3002
+office.action.transform_pdf=PDF\u3078\u306E\u5909\u63DB
+office.action.transform_pdf.description=Adobe PDF\u5F62\u5F0F\u306B\u5909\u63DB\u3057\u307E\u3059\u3002.
+office.action.open_details=\u8A73\u7D30\u3092\u958B\u304F
+office.action.open_details.description=Alfresco Explorer\u3067\u6587\u66F8\u306E\u8A73\u7D30\u3092\u958B\u304D\u307E\u3059\u3002
+office.action.save_to_alfresco=Alfresco\u306B\u4FDD\u5B58
+office.action.save_to_alfresco.description=\u73FE\u5728\u306E\u6587\u66F8\u3092Alfresco\u306E\u7BA1\u7406\u30B7\u30B9\u30C6\u30E0\u306B\u4FDD\u5B58\u3057\u307E\u3059\u3002
+office.action.insert=\u73FE\u5728\u306E\u6587\u66F8\u306B\u30D5\u30A1\u30A4\u30EB\u3092\u633F\u5165
+office.action.create_collaboration_space=\u30B3\u30E9\u30DC\u30EC\u30FC\u30B7\u30E7\u30F3\u30FB\u30B9\u30DA\u30FC\u30B9\u306E\u4F5C\u6210
+office.action.create_collaboration_space.description=Alfresco\u30EA\u30DD\u30B8\u30C8\u30EA\u306B\u65B0\u3057\u3044\u30B3\u30E9\u30DC\u30EC\u30FC\u30B7\u30E7\u30F3\u30FB\u30B9\u30DA\u30FC\u30B9\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002
+office.action.launch_alfresco=Alfresco\u306E\u8D77\u52D5
+office.action.launch_alfresco.description=Alfresco Explorer\u306EWeb\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u3092\u958B\u59CB\u3057\u307E\u3059\u3002
+office.action.userhome=\u30E6\u30FC\u30B6\u306E\u30DB\u30FC\u30E0\u30FB\u30B9\u30DA\u30FC\u30B9\u306B
+office.action.parent_space=\u89AA\u30B9\u30DA\u30FC\u30B9\u307E\u3067
+office.action.create_space=\u65B0\u898F\u30B9\u30DA\u30FC\u30B9\u306E\u4F5C\u6210
+office.action.create_collaboration_space=\u65B0\u898F\u30B3\u30E9\u30DC\u30EC\u30FC\u30B7\u30E7\u30F3\u30FB\u30B9\u30DA\u30FC\u30B9\u306E\u4F5C\u6210
+office.action.delete=\u524A\u9664
+office.action.return_search=\u691C\u7D22\u7D50\u679C\u306B\u623B\u308B
+office.action.return_search.description=\u691C\u7D22\u30BF\u30D6\u306B\u623B\u308B
+office.action.manage_task=\u7BA1\u7406
 
 # Buttons
-office.button.submit=\u9001\u4fe1
-office.button.cancel=\u30ad\u30e3\u30f3\u30bb\u30eb
+office.button.submit=\u9001\u4FE1
+office.button.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
 office.button.ok=OK
-office.button.search=\u691c\u7d22
+office.button.search=\u691C\u7D22
 
 # Messages
-office.message.unmanaged=\u73fe\u5728\u306e\u6587\u66f8\u306fAlfresco\u306b\u3088\u3063\u3066\u7ba1\u7406\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
-office.message.unversioned=\u73fe\u5728\u306e\u6587\u66f8\u306f\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
-office.message.none=\u306a\u3057
-office.message.no_documents=\u6587\u66f8\u304c\u3042\u308a\u307e\u305b\u3093\u3002
-office.message.no_due_date=\u7de0\u5207\u65e5\u304c\u3042\u308a\u307e\u305b\u3093\u3002
-office.message.no_tasks=\u30bf\u30b9\u30af\u306f\u3042\u308a\u307e\u305b\u3093\u3002
-office.message.no_subspaces=\u30b5\u30d6\u30b9\u30da\u30fc\u30b9\u304c\u3042\u308a\u307e\u305b\u3093\u3002
-office.message.search_for=\u691c\u7d22\u5bfe\u8c61
-office.message.results_max.before=\u6700\u5927\u5024\u306b\u623b\u308b
-office.message.results_max.after=\u30a2\u30a4\u30c6\u30e0
-office.message.no_results=\u7d50\u679c\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
-office.message.confirm_delete=\u3053\u306e\u6587\u66f8\u3092\u524a\u9664\u3057\u307e\u3059\u304b?
-office.message.enter_workflow_details=\u65b0\u3057\u3044\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306e\u8a73\u7d30\u3092\u4ee5\u4e0b\u306b\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-office.message.workflow_action_complete=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u30fb\u30a2\u30af\u30b7\u30e7\u30f3'{0}'\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f\u3002
+office.message.unmanaged=\u73FE\u5728\u306E\u6587\u66F8\u306FAlfresco\u306B\u3088\u3063\u3066\u7BA1\u7406\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+office.message.unversioned=\u73FE\u5728\u306E\u6587\u66F8\u306F\u30D0\u30FC\u30B8\u30E7\u30F3\u7BA1\u7406\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+office.message.none=\u306A\u3057
+office.message.no_documents=\u6587\u66F8\u304C\u3042\u308A\u307E\u305B\u3093
+office.message.no_due_date=\u7DE0\u5207\u65E5\u306A\u3057
+office.message.no_tasks=\u30BF\u30B9\u30AF\u306F\u3042\u308A\u307E\u305B\u3093\u3002
+office.message.no_subspaces=\u30B5\u30D6\u30B9\u30DA\u30FC\u30B9\u304C\u3042\u308A\u307E\u305B\u3093
+office.message.search_for=\u691C\u7D22\u5BFE\u8C61
+office.message.results_max.before=\u6700\u5927\u691C\u7D22\u6570
+office.message.results_max.after=\u30A2\u30A4\u30C6\u30E0
+office.message.no_results=\u691C\u7D22\u7D50\u679C\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+office.message.confirm_delete=\u3053\u306E\u6587\u66F8\u3092\u524A\u9664\u3057\u307E\u3059\u304B\uFF1F
+office.message.enter_workflow_details=\u65B0\u3057\u3044\u30EF\u30FC\u30AF\u30D5\u30ED\u30FC\u8A73\u7D30\u3092\u4E0B\u306B\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+office.message.workflow_action_complete=\u30EF\u30FC\u30AF\u30D5\u30ED\u30FC\u30FB\u30A2\u30AF\u30B7\u30E7\u30F3'{0}'\u304C\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002
 
 # Properties
-office.property.title=\u30bf\u30a4\u30c8\u30eb
-office.property.description=\u8aac\u660e
-office.property.creator=\u4f5c\u6210\u8005
-office.property.created=\u4f5c\u6210\u6e08\u307f
-office.property.modifier=\u4fee\u6b63\u8005
-office.property.modified=\u4fee\u6b63\u6e08
-office.property.size=\u30b5\u30a4\u30ba
-office.property.categories=\u30ab\u30c6\u30b4\u30ea
-office.property.author=\u4f5c\u6210\u8005
-office.property.date=\u65e5\u4ed8
-office.property.due_date=\u7de0\u5207\u65e5
-office.property.name=\u540d\u524d
-office.property.template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
-office.property.filename=\u6587\u66f8\u30d5\u30a1\u30a4\u30eb\u540d
-office.property.workflow=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc
-office.property.assign_to=\u5272\u5f53\u3066\u5148
-office.property.due_on=\u671f\u9650
-office.property.status=\u30b9\u30c6\u30fc\u30bf\u30b9
-office.property.priority=\u512a\u5148
-office.property.start_date=\u958b\u59cb\u65e5
-office.property.type=\u30bf\u30a4\u30d7
-office.property.complete=\u5b8c\u4e86
+office.property.title=\u30BF\u30A4\u30C8\u30EB
+office.property.description=\u8AAC\u660E
+office.property.creator=\u4F5C\u6210\u8005
+office.property.created=\u4F5C\u6210\u6E08
+office.property.modifier=\u4FEE\u6B63\u8005
+office.property.modified=\u5909\u66F4\u6E08
+office.property.size=\u30B5\u30A4\u30BA
+office.property.categories=\u30AB\u30C6\u30B4\u30EA
+office.property.author=\u4F5C\u6210\u8005
+office.property.date=\u65E5\u4ED8
+office.property.due_date=\u7DE0\u5207\u65E5
+office.property.name=\u540D\u524D
+office.property.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
+office.property.filename=\u6587\u66F8\u306E\u30D5\u30A1\u30A4\u30EB\u540D
+office.property.workflow=\u30EF\u30FC\u30AF\u30D5\u30ED\u30FC
+office.property.assign_to=\u5272\u5F53\u3066\u5148
+office.property.due_on=\u7DE0\u5207\u65E5
+office.property.status=\u30B9\u30C6\u30FC\u30BF\u30B9
+office.property.priority=\u512A\u5148
+office.property.start_date=\u958B\u59CB\u65E5
+office.property.type=\u30BF\u30A4\u30D7
+office.property.complete=\u5B8C\u4E86
 
-# Workflow
-office.workflow.review=\u30ec\u30d3\u30e5\u30fc\u3068\u627f\u8a8d
-office.workflow.adhoc=\u30a2\u30c9\u30db\u30c3\u30af\u30fb\u30bf\u30b9\u30af
+#\u00A0Workflow
+office.workflow.review=\u30EC\u30D3\u30E5\u30FC\u3068\u627F\u8A8D
+office.workflow.adhoc=\u30A2\u30C9\u30DB\u30C3\u30AF\u30FB\u30BF\u30B9\u30AF
 
 # Result messages
-office.result.failed=\u5931\u6557\u3057\u305f\u30a2\u30af\u30b7\u30e7\u30f3
-office.result.convert.failed=\u6587\u66f8\u3092\u5909\u63db\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-office.result.converted=\u6587\u66f8\u304c\u5909\u63db\u3055\u308c\u307e\u3057\u305f\u3002
-office.result.delete.failed=\u6587\u66f8\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-office.result.deleted=\u6587\u66f8\u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f\u3002
-office.result.checkout.failed=\u6587\u66f8\u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-office.result.checked_out=\u6587\u66f8\u304c\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3055\u308c\u307e\u3057\u305f\u3002
-office.result.checkin.failed=\u6587\u66f8\u3092\u30c1\u30a7\u30c3\u30af\u30a4\u30f3\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-office.result.checked_in=\u6587\u66f8\u304c\u30c1\u30a7\u30c3\u30af\u30a4\u30f3\u3055\u308c\u307e\u3057\u305f
-office.result.version.failed=\u6587\u66f8\u3092\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-office.result.versioned=\u6587\u66f8\u3092\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u3057\u307e\u3057\u305f\u3002
-office.result.workflow_started=\u65b0\u898f\u306e\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u3092\u958b\u59cb\u3057\u307e\u3057\u305f\u3002
-office.result.unknown=\u4e0d\u660e\u306a\u30a2\u30af\u30b7\u30e7\u30f3
-office.result.exception=\u4f8b\u5916\u306e\u305f\u3081\u30a2\u30af\u30b7\u30e7\u30f3\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-office.result.create_space.failed=\u30b9\u30da\u30fc\u30b9\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-office.result.create_space.missing_name=\u30b9\u30da\u30fc\u30b9\u306b\u306f\u540d\u524d\u3092\u3064\u3051\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-office.result.space_created=\u65b0\u898f\u30b9\u30da\u30fc\u30b9\u304c\u4f5c\u6210\u3055\u308c\u307e\u3057\u305f\u3002
-office.result.user_not_found=\u30e6\u30fc\u30b6\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
+office.result.failed=\u30A2\u30AF\u30B7\u30E7\u30F3\u304C\u5931\u6557\u3057\u307E\u3057\u305F
+office.result.convert.failed=\u6587\u66F8\u3092\u5909\u63DB\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+office.result.converted=\u6587\u66F8\u304C\u5909\u63DB\u3055\u308C\u307E\u3057\u305F
+office.result.delete.failed=\u6587\u66F8\u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+office.result.deleted=\u6587\u66F8\u304C\u524A\u9664\u3055\u308C\u307E\u3057\u305F
+office.result.checkout.failed=\u6587\u66F8\u3092\u30C1\u30A7\u30C3\u30AF\u30A2\u30A6\u30C8\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+office.result.checked_out=\u6587\u66F8\u304C\u30C1\u30A7\u30C3\u30AF\u30A2\u30A6\u30C8\u3055\u308C\u307E\u3057\u305F
+office.result.checkin.failed=\u6587\u66F8\u3092\u30C1\u30A7\u30C3\u30AF\u30A4\u30F3\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+office.result.checked_in=\u6587\u66F8\u304C\u30C1\u30A7\u30C3\u30AF\u30A4\u30F3\u3055\u308C\u307E\u3057\u305F
+office.result.version.failed=\u6587\u66F8\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u7BA1\u7406\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+office.result.versioned=\u6587\u66F8\u304C\u30D0\u30FC\u30B8\u30E7\u30F3\u7BA1\u7406\u3055\u308C\u307E\u3057\u305F
+office.result.workflow_started=\u65B0\u3057\u3044\u30EF\u30FC\u30AF\u30D5\u30ED\u30FC\u304C\u958B\u59CB\u3055\u308C\u307E\u3057\u305F
+office.result.unknown=\u4E0D\u660E\u306A\u30A2\u30AF\u30B7\u30E7\u30F3
+office.result.exception=\u4F8B\u5916\u304C\u767A\u751F\u3057\u305F\u305F\u3081\u30A2\u30AF\u30B7\u30E7\u30F3\u3092\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+office.result.create_space.failed=\u30B9\u30DA\u30FC\u30B9\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+office.result.create_space.missing_name=\u30B9\u30DA\u30FC\u30B9\u306B\u306F\u540D\u524D\u304C\u5FC5\u8981\u3067\u3059
+office.result.space_created=\u65B0\u898F\u30B9\u30DA\u30FC\u30B9\u304C\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F
+office.result.user_not_found=\u30E6\u30FC\u30B6\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 
 # Miscellaneous
 office.unit.kb=KB
-office.version.notes=\u30e1\u30e2
-office.task.overdue=\u671f\u9650\u5207\u308c
-office.task.due_today=\u672c\u65e5\u671f\u9650
-office.tip.task_item=\u30bf\u30b9\u30af\u30fb\u30a2\u30a4\u30c6\u30e0
+office.version.notes=\u30E1\u30E2
+office.task.overdue=\u671F\u9650\u5207\u308C
+office.task.due_today=\u672C\u65E5\u671F\u9650
+office.tip.task_item=\u30BF\u30B9\u30AF\u30FB\u30A2\u30A4\u30C6\u30E0
diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index 6fabf35bbb..9e282ab9ad 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -525,6 +525,7 @@ navigator_desc=Allows tree based navigation around the repository
 shelf=Shelf
 shelf_desc=Area that includes the clipboard, recent space and shortcuts
 reset_navigator=Refresh
+reset_categories=Refresh
 navigator_node_deleted=The space just selected is no longer in the repository, please Refresh the Navigator before continuing.
 
 # Common Wizard messages
diff --git a/config/alfresco/messages/webclient_de.properties b/config/alfresco/messages/webclient_de.properties
index 7c4ff4a398..1c91c20d78 100644
--- a/config/alfresco/messages/webclient_de.properties
+++ b/config/alfresco/messages/webclient_de.properties
@@ -180,8 +180,8 @@ advanced_search=Erweiterte Suche
 value_not_set=nicht eingestellt
 description_not_set=Keine Beschreibung eingestellt.
 clear=Ergebnisse l\u00f6schen
-results_contains=Ergebnisse f\u00fcr "{0}"...
-results_contains_filter=Ergebnisse f\u00fcr "{0}" aus "{1}".
+results_contains=Ergebnisse f\u00fcr ''{0}''.
+results_contains_filter=Ergebnisse f\u00fcr ''{0}'' aus ''{1}''.
 details_view=Ansicht Details
 view_icon=Ansicht Icon
 view_browse=Ansicht Durchsuchen
@@ -465,7 +465,7 @@ title_save_search=Suchanfrage speichern
 save_search_description=Suchanfrage f\u00fcr sp\u00e4teren Gebrauch speichern
 search_props=Gespeicherte Sucheigenschaften
 select_saved_search=Eine gespeicherte Suche ausw\u00e4hlen...
-saved_search_warning=Mit diesem Vorgang wird versucht, die bestehende, gespeicherte Suche "{0}" zu \u00fcberschreiben
+saved_search_warning=Mit diesem Vorgang wird versucht, die bestehende, gespeicherte Suche ''{0}'' zu \u00fcberschreiben
 user_searches=Ihre Suchen
 global_searches=\u00d6ffentliche Suchen
 save_search_global=Als \u00f6ffentliche, allen Benutzern zug\u00e4ngliche Suche speichern.
@@ -525,6 +525,7 @@ navigator_desc=Erm\u00f6glicht auf Baumstruktur basierende Navigation durch das
 shelf=Regal
 shelf_desc=Bereich, der die Zwischenablage, k\u00fcrzlich besuchten Arbeitsbereiche und Verkn\u00fcpfungen beinhaltet
 reset_navigator=Aktualisieren
+reset_categories=Aktualisieren
 navigator_node_deleted=Der gerade ausgew\u00e4hlte Arbeitsbereich ist nicht mehr im Repository vorhanden, bitte erst Navigator aktualisieren und dann fortfahren.
 
 # Common Wizard messages
@@ -609,8 +610,8 @@ selected_usersgroups_perms=Ausgew\u00e4hlte Benutzer/Gruppen und dazugeh\u00f6ri
 remove_permissions_title=Benutzer "{0}" entfernen
 remove_permissions_subtitle=Ja anklicken, um alle Berechtigungen des Benutzers zu entfernen.
 remove_permissions=M\u00f6chten Sie wirklich alle Berechtigungen dieses Benutzers entfernen?
-edit_permissions_title=Berechtigungen f\u00fcr "{0}" \u00e4ndern
-view_permissions_title=Berechtigungen f\u00fcr "{0}" anzeigen
+edit_permissions_title=Berechtigungen f\u00fcr ''{0}'' \u00e4ndern
+view_permissions_title=Berechtigungen f\u00fcr ''{0}'' anzeigen
 edit_permissions_subtitle=Berechtigungen auf Zugriff auf Ihren Ordner oder Ihre Datei \u00e4ndern, die Sie einem Benutzer einger\u00e4umt haben.
 view_permissions_subtitle=Berechtigungen auf Zugriff auf Ihren Ordner oder Ihre Datei, die Sie einem Benutzer einger\u00e4umt haben.
 select_perm=Berechtigung ausw\u00e4hlen
@@ -802,7 +803,7 @@ import_error_info=Wenn diese Option gew\u00e4hlt wird, erfolgt der Import im Hin
 
 # Edit Content messages
 edit_file_title=Datei bearbeiten
-edit_file_prompt=Zur Bearbeitung der Datei "{0}" untenstehenden Link anklicken und auf Aufforderung Speichern w\u00e4hlen.
+edit_file_prompt=Zur Bearbeitung der Datei ''{0}'' untenstehenden Link anklicken und auf Aufforderung Speichern w\u00e4hlen.
 edit_download_complete=Nach Abschluss des Downloads, Schlie\u00dfen anklicken.
 edit_using_web_form=Hier klicken, um diese Datei mit einem Web-Formular zu bearbeiten.
 checkout_file_title=Datei auschecken
@@ -1018,15 +1019,15 @@ condition_compare_property_value=Namenseigenschaft passt zu "{0}".
 condition_compare_property_value_not=Namenseigenschaft passt nicht zu "{0}".
 action_add_features=Aspekt "{0}" hinzuf\u00fcgen.
 action_remove_features=Aspekt {0} entfernen
-action_specialise_type=Element ist vom Typ "{0}"
-action_simple_workflow={0} Element nach "{1}" wenn Aktion "{2}" durchgef\u00fchrt wird.
-action_link_category=Mit Kategorie "{0}" verlinken
-action_transform=Kopiert Inhalt nach "{0}" und wandelt in "{1}" um
-action_transform_image=Kopiert Bild nach "{0}" und wandelt mit Option "{2}" in "{1}" um
-action_copy=Nach "{0}" kopieren
-action_copy_to_web_project_folder=Nach "{0}" in "{1}" kopieren
-action_move=Nach "{0}" verschieben
-action_mail=E-Mail an "{0} senden
+action_specialise_type=Element ist vom Typ ''{0}''
+action_simple_workflow={0} Element nach ''{1}'' wenn Aktion ''{2}'' durchgef\u00fchrt wird.
+action_link_category=Mit Kategorie ''{0}'' verlinken
+action_transform=Kopiert Inhalt nach ''{0}'' und wandelt in ''{1}'' um
+action_transform_image=Kopiert Bild nach ''{0}'' und wandelt mit Option ''{2}'' in ''{1}'' um
+action_copy=Nach ''{0}'' kopieren
+action_copy_to_web_project_folder=Nach ''{0}'' in ''{1}'' kopieren
+action_move=Nach ''{0}'' verschieben
+action_mail=E-Mail an ''{0} senden
 action_mail_template=Mustervorlage verwenden
 action_check_in=Inhalt als "{0}" mit Kommentar "{1}" einchecken
 action_check_out=Inhalt nach "{0}" auschecken
@@ -1291,7 +1292,7 @@ shared_folder=Geschichteter Ordner
 shared_file=Geschichtete Datei
 stale_shared_folder=Gegenstandsloser geschichteter Ordner
 stale_shared_file=Gegenstandslose geschichtete Datei
-target_is_deleted=Zielordner f\u00fcr "{0}" wurde gel\u00f6scht.
+target_is_deleted=Zielordner f\u00fcr ''{0}" wurde gel\u00f6scht.
 shared_from=Von {0} geschichtet
 add_avm_content_dialog_desc=Anhand dieses Dialogs k\u00f6nnen Sie Inhalt zu einem Ordner hinzuf\u00fcgen.
 update_avm_file_desc=Datei der Site mit Inhalt Ihres Computers aktualisieren.
@@ -1350,7 +1351,7 @@ deploy_successful=Deployment erfolgreich
 deploy_failed=Deployment fehlgeschlagen
 deploy_server_not_selected=Dieser Server wurde nicht ausgew\u00e4hlt, da die Momentaufnahme bereits erfolgreich angewandt wurde.
 deploy_test_server_not_available=Keine nicht zugewiesenen Testserver verf\u00fcgbar.
-deploy_test_server_allocated=Der Testserver "{0}" ist dieser Sandbox zugewiesen. F\u00fcr die Vorschau des aktuellen Deployment untenstehenden Vorschau-Link anklicken (wenn URL bekannt) oder OK anklicken, um die letzten \u00c4nderungen anzuwenden.
+deploy_test_server_allocated=Der Testserver ''{0}'' ist dieser Sandbox zugewiesen. F\u00fcr die Vorschau des aktuellen Deployment untenstehenden Vorschau-Link anklicken (wenn URL bekannt) oder OK anklicken, um die letzten \u00c4nderungen anzuwenden.
 deploy_started=gestartet
 deploy_finished=Abgeschlossen
 deployed_by=Von
@@ -1511,12 +1512,12 @@ delete_listed_items_confirm=M\u00f6chten Sie wirklich folgenden gel\u00f6schte D
 recover_listed_items=Gelistete Elemente wiederherstellen
 recover_listed_items_info=Gelistete Dateien und Arbeitsbereiche aus dem Speicher gel\u00f6schter Dateien wiederherstellen
 recover_listed_items_confirm=Wollen Sie wirklich folgende gel\u00f6schten Dateien und Arbeitsbereiche aus dem Speicher gel\u00f6schter Dateien wiederherstellen?
-recovered_item_success=Element \"{0}\" ist erfolgreich wiederhergestellt worden.
-recovered_item_parent=Element \"{0}\" konnte nicht wiederhergestellt werden, da Elternordner fehlt.
+recovered_item_success=Element \''{0}\'' ist erfolgreich wiederhergestellt worden.
+recovered_item_parent=Element \''{0}\'' konnte nicht wiederhergestellt werden, da Elternordner fehlt.
 recovered_item_parent_short=Elternordner fehlt
-recovered_item_permission=Element \"{0}\" konnte nicht wiederhergestellt werden, da Sie nicht \u00fcber die erforderlichen Berechtigungen verf\u00fcgen, das Element im Elternordner wiederherzustellen.
+recovered_item_permission=Element \''{0}\'' konnte nicht wiederhergestellt werden, da Sie nicht \u00fcber die erforderlichen Berechtigungen verf\u00fcgen, das Element im Elternordner wiederherzustellen.
 recovered_item_permission_short=Keine Schreib-Berechtigung
-recovered_item_integrity=Element \"{0}\" konnte nicht wiederhergestellt werden, da im Elternordner jetzt ein gleichnamiges Element vorhanden ist.
+recovered_item_integrity=Element \''{0}\'' konnte nicht wiederhergestellt werden, da im Elternordner jetzt ein gleichnamiges Element vorhanden ist.
 recovered_item_integrity_short=Es gibt ein gleichnamiges Element
 recovered_item_failure=Element \"{0}\" konnte aufgrund von Fehler: {1} nicht wiederhergestellt werden
 recovered_item_failure_short=Fehlgeschlagen
@@ -1713,7 +1714,7 @@ outcome=Ergebnis
 reassign=Neu zuweisen
 cancel_workflow=Workflow abbrechen
 cancel_workflow_info=\u00dcber OK diesen Workflow abbrechen.
-cancel_workflow_confirm=M\u00f6chten Sie den Workflow \"{0}\" wirklich abbrechen?
+cancel_workflow_confirm=M\u00f6chten Sie den Workflow \''{0}\'' wirklich abbrechen?
 error_cancel_workflow=Workflow kann aufgrund eines Systemfehlers nicht abgebrochen werden:
 reassign_task_title=Aufgabe neu zuweisen
 reassign_task_desc=Mit diesem Dialog k\u00f6nnen Sie eine Aufgabe neu zuweisen.
@@ -1960,10 +1961,10 @@ error_update_category=Kategorie konnte aufgrund des Systemfehlers: {0} nicht akt
 error_update_simpleworkflow=Einfacher Arbeitsablauf konnte aufgrund des Systemfehlers: {0} nicht aktualisiert werden
 error_workflow_approve=Dokument konnte aufgrund des Systemfehlers: {0} nicht zugestimmt werden:
 error_workflow_reject=Dokument konnte aufgrund des Systemfehlers: {0} nicht abgelehnt werden:
-error_aspect_classify=Aspekt "klassifizierbar" konnte aufgrund des Systemfehlers: {0} nicht auf das Dokument angewandt werden.
-error_aspect_classify_space=Aspekt "klassifizierbar" konnte aufgrund des Systemfehlers: {0} nicht auf den Raum angewandt werden.
-error_aspect_versioning=Aspekt "versionierbar" konnte aufgrund des Systemfehlers: {0} nicht auf das Dokument angewandt werden.
-error_aspect_inlineeditable=Aspekt "inline-editierbar" konnte aufgrund des Systemfehlers: {0} nicht auf das Dokument angewandt werden.
+error_aspect_classify=Aspekt ''klassifizierbar'' konnte aufgrund des Systemfehlers: {0} nicht auf das Dokument angewandt werden.
+error_aspect_classify_space=Aspekt ''klassifizierbar'' konnte aufgrund des Systemfehlers: {0} nicht auf den Raum angewandt werden.
+error_aspect_versioning=Aspekt ''versionierbar'' konnte aufgrund des Systemfehlers: {0} nicht auf das Dokument angewandt werden.
+error_aspect_inlineeditable=Aspekt ''inline-editierbar'' konnte aufgrund des Systemfehlers: {0} nicht auf das Dokument angewandt werden.
 error_content_missing=Der Inhalt des Nodes fehlt: \n   Knoten: {0} \n   Leser: {1}  \nBitte wenden Sie sich an Ihren Systemadministrator.
 error_export=Export: {0} konnte nicht ausgef\u00fchrt werden.
 error_import=Import: {0} konnte nicht ausgef\u00fchrt werden.
@@ -1978,9 +1979,9 @@ error_association=Zuordnungsdefinition f\u00fcr Zuordnung \"{0}\" konnte nicht g
 error_charset_null=Zeichensatzwert Null
 error_negative_quota=Kontingent kann nicht negativ sein: {0}
 error_search_not_exist=Suche mit Namen: {0} existiert nicht
-error_search_not_exist=Suche mit Namen: \"{0}\" existiert nicht
-error_retrieving_search_results=Fehler bei der Ermittlung der Ergebnisse der Suche \"{0}\"- \"{1}\"
-error_domain_mismatch=Domain Diskrepanz: erwarteter Wert = {0}, tats\u00e4chlicher = {1}
+error_search_not_exist=Suche mit Namen: \''{0}\'' existiert nicht
+error_retrieving_search_results=Fehler bei der Ermittlung der Ergebnisse der Suche \''{0}\''- \''{1}\''
+error_domain_mismatch=Domain Diskrepanz: erwarteter Wert={0}, tats\u00e4chlicher={1}
 error_not_stored=Derzeit kein Fehler gespeichert
 error_no_stack_trace=Keine Stapelverfolgung verf\u00fcgbar
 error_permissions=Sie verf\u00fcgen nicht \u00fcber ausreichend Berechtigungen, um das angefragte Element anzuzeigen.
@@ -1992,8 +1993,8 @@ return_to_application=Zur\u00fcck zur Anwendung
 return_home=Mein Inhalt
 delete_space_info=OK anklicken, um diesen Raum mit seinem gesamten Inhalt zu entfernen.
 delete_space_assoc_info=Dieser Raum erscheint an vielen Speicherorten. Zum Entfernen des Raums aus dem aktuellen Speicherort OK anklicken.
-delete_space_confirm=M\u00f6chten Sie \"{0}\" mit seinem gesamten Inhalt wirklich l\u00f6schen?
-delete_space_assoc_confirm=M\u00f6chten Sie \"{0}\" wirklich aus dem aktuellen Speicherort l\u00f6schen?
+delete_space_confirm=M\u00f6chten Sie \''{0}\'' mit seinem gesamten Inhalt wirklich l\u00f6schen?
+delete_space_assoc_confirm=M\u00f6chtenSie \''{0}\'' wirklich aus dem aktuellen Speicherort l\u00f6schen?
 delete_space_multiple_parents_warn=Dieser Raum erscheint an vielen Speicherorten. Daher wird der untenstehend ausgew\u00e4hlte Vorgang alle Speicherorte betreffen.
 delete_forums_info=OK anklicken, um diesen Forenraum mit seinem gesamten Inhalt zu entfernen.
 delete_forum_info=OK anklicken, um dieses Forum mit seinen Themen zu entfernen.
@@ -2001,21 +2002,21 @@ delete_forum_confirm=M\u00f6chten Sie \"{0}\" mit seinen gesamten Themen wirklic
 delete_topic_info=OK anklicken, um dieses Thema mit seinen Posts zu entfernen.
 delete_topic_confirm=M\u00f6chten Sie \"{0}\" mit seinen gesamten Posts wirklich l\u00f6schen?
 delete_post_info=OK anklicken, um diesen Post aus dem Thema zu entfernen.
-delete_post_confirm=M\u00f6chten Sie den Post wirklich aus \"{0}\" l\u00f6schen?
+delete_post_confirm=M\u00f6chten Sie den Post wirklich aus \''{0}\'' l\u00f6schen?
 delete_file_info=OK anklicken, um diese Datei samt der Vorg\u00e4ngerversionen zu entfernen.
 delete_file_assoc_info=Diese Datei erscheint an vielen Speicherorten. Zum Entfernen der Datei aus dem aktuellen Speicherort OK anklicken.
-delete_file_confirm=M\u00f6chten Sie \"{0}\" und alle Vorg\u00e4ngerversionen wirklich l\u00f6schen?
-delete_file_assoc_confirm=M\u00f6chtenSie \"{0}\" wirklich aus dem aktuellen Speicherort l\u00f6schen?
-delete_file_multiple_parents_confirm=\"{0}\" erscheint an mehreren Speicherorten. M\u00f6chten Sie es wirklich aus allen Speicherorten entfernen und alle Vorg\u00e4ngerversionen l\u00f6schen?
-delete_translation_confirm=M\u00f6chten Sie \"{0}\" und alle Vorg\u00e4ngerversionen wirklich l\u00f6schen? Die mehrsprachigen Eigenschaften lassen sich nicht wiederherstellen.
-delete_empty_translation_confirm=M\u00f6chten Sie \"{0}\" wirklich endg\u00fcltig l\u00f6schen? Dieses Dokument wird nicht wiederhergestellt.
-delete_ml_container_confirm=M\u00f6chten Sie \"{0}\" und alle Vorg\u00e4ngerausgaben wirklich l\u00f6schen? Dabei wird auch jede \u00dcbersetzung gel\u00f6scht.
+delete_file_confirm=M\u00f6chten Sie \''{0}\'' und alle Vorg\u00e4ngerversionen wirklich l\u00f6schen?
+delete_file_assoc_confirm=M\u00f6chtenSie \''{0}\'' wirklich aus dem aktuellen Speicherort l\u00f6schen?
+delete_file_multiple_parents_confirm=\''{0}\'' erscheint an mehreren Speicherorten. M\u00f6chten Sie es wirklich aus allen Speicherorten entfernen und alle Vorg\u00e4ngerversionen l\u00f6schen?
+delete_translation_confirm=M\u00f6chten Sie \''{0}\'' und alle Vorg\u00e4ngerversionen wirklich l\u00f6schen? Die mehrsprachigen Eigenschaften lassen sich nicht wiederherstellen.
+delete_empty_translation_confirm=M\u00f6chten Sie \''{0}\'' wirklich endg\u00fcltig l\u00f6schen? Dieses Dokument wird nicht wiederhergestellt.
+delete_ml_container_confirm=M\u00f6chten Sie \''{0}\'' und alle Vorg\u00e4ngerausgaben wirklich l\u00f6schen? Dabei wird auch jede \u00dcbersetzung gel\u00f6scht.
 delete_rule_info=Ja anklicken, um diese Regel aus dem Raum zu entfernen.
 delete_user_info=Ja anklicken, um diesen Benutzer aus dem Raum zu entfernen.
-delete_rule_confirm=M\u00f6chten Sie \"{0}\" wirklich l\u00f6schen?
-delete_user_confirm=Der Benutzer wird nicht mehr auf das System zugreifen k\u00f6nnen. M\u00f6chten Sie den Benutzer \"{0}\" wirklich l\u00f6schen?
-remove_invited_user_confirm=Der Benutzer wird nicht mehr auf die Dokumente und Ordner in diesem Raum zugreifen k\u00f6nnen. M\u00f6chten Sie den Benutzer \"{0}\" wirklich entfernen?
-remove_content_user_confirm=Der Benutzer wird nicht mehr auf diesen Inhalt zugreifen k\u00f6nnen. M\u00f6chten Sie den Benutzer \"{0}\" wirklich entfernen?
+delete_rule_confirm=M\u00f6chten Sie \''{0}\'' wirklich l\u00f6schen?
+delete_user_confirm=Der Benutzer wird nicht mehr auf das System zugreifen k\u00f6nnen. M\u00f6chten Sie den Benutzer \''{0}\'' wirklich l\u00f6schen?
+remove_invited_user_confirm=Der Benutzer wird nicht mehr auf die Dokumente und Ordner in diesem Raum zugreifen k\u00f6nnen. M\u00f6chten Sie den Benutzer \''{0}\'' wirklich entfernen?
+remove_content_user_confirm=Der Benutzer wird nicht mehr auf diesen Inhalt zugreifen k\u00f6nnen. M\u00f6chten Sie den Benutzer \''{0}\'' wirklich entfernen?
 delete_companyroot_confirm=WARNUNG: Dies ist ein Sonderordner, auf den alle Benutzer zugreifen! Bitte pr\u00fcfen Sie, dass Sie diesen Ordner wirklich l\u00f6schen wollen. Ein Entfernen des Ordners kann Systemfehler herbeif\u00fchren.
 delete_node_not_found=Das Element, das Sie zu l\u00f6schen versuchen, ist nicht auffindbar. Es kann sein, dass es bereits gel\u00f6scht wurde. Bitte schlie\u00dfen Sie diesen Dialog und versuchen Sie den L\u00f6schvorgang noch einmal.
 
diff --git a/config/alfresco/messages/webclient_es.properties b/config/alfresco/messages/webclient_es.properties
index b5b28a7428..51b81ceeca 100755
--- a/config/alfresco/messages/webclient_es.properties
+++ b/config/alfresco/messages/webclient_es.properties
@@ -525,6 +525,7 @@ navigator_desc=Permite navegar mediante \u00e1rboles por todo el repositorio
 shelf=Tableta
 shelf_desc=\u00c1rea que incluye el portapapeles, recientes espacios y accesos directos
 reset_navigator=Actualizar
+reset_categories=Actualizar
 navigator_node_deleted=El espacio que acaba de seleccionar ya no est\u00e1 en el repositorio, por favor, Actualizar el navegador antes de continuar.
 
 # Common Wizard messages
@@ -1980,7 +1981,7 @@ error_negative_quota=La cuota no puede ser negativa: {0}
 error_search_not_exist=No existe b\u00fasqueda con el nombre: {0}
 error_search_not_exist=No existe b\u00fasqueda con el nombre: \"{0}\"
 error_retrieving_search_results=Error al obtener resultados para la b\u00fasqueda \"{0}\" - \"{1}\"
-error_domain_mismatch=Error de coincidencia de dominio: previsto = {0}, real = {1}
+error_domain_mismatch=Error de coincidencia de dominio: expected = {0}, actual = {1}
 error_not_stored=Actualmente no hay errores almacenados
 error_no_stack_trace=La traza de la pila no est\u00e1 disponible
 error_permissions=No tiene los permisos suficientes para ver el elemento solicitado.
diff --git a/config/alfresco/messages/webclient_fr.properties b/config/alfresco/messages/webclient_fr.properties
index 05af64476d..641b7e9ef7 100755
--- a/config/alfresco/messages/webclient_fr.properties
+++ b/config/alfresco/messages/webclient_fr.properties
@@ -525,6 +525,7 @@ navigator_desc=Permet une navigation en arbre sur l'entrep\u00f4t
 shelf=Panneau lat\u00e9ral
 shelf_desc=Emplacement qui inclut le presse-papiers, les Espace r\u00e9cents et les raccourcis
 reset_navigator=Rafra\u00eechir
+reset_categories=Rafra\u00eechir
 navigator_node_deleted=L'espace s\u00e9lectionn\u00e9 n'est pr\u00e9sent dans l'entrep\u00f4t, merci de rafra\u00eechir la vue avant de continuer.
 
 # Common Wizard messages
@@ -1773,7 +1774,7 @@ workflow_context=Contexte
 workflow_command=Commande (tapez help pour l'aide)
 workflow_command_submit=Soumettre
 workflow_last_command=Derni\u00e8re commande\u00a0:
-workflow_duration=Dur\u00e9e :
+workflow_duration=Dur\u00e9e:
 workflow_duration_ms=ms
 
 # JMX Dumper messages
@@ -1786,7 +1787,7 @@ configadmin_context=Contexte
 configadmin_command=Commande (tapez help pour l'aide)
 configadmin_command_submit=Soumettre
 configadmin_last_command=Derni\u00e8re commande\u00a0:
-configadmin_duration=Dur\u00e9e :
+configadmin_duration=Dur\u00e9e:
 configadmin_duration_ms=ms
 
 
@@ -1796,7 +1797,7 @@ repoadmin_context=Contexte
 repoadmin_command=Commande (tapez help pour l'aide)
 repoadmin_command_submit=Soumettre
 repoadmin_last_command=Derni\u00e8re commande\u00a0:
-repoadmin_duration=Dur\u00e9e :
+repoadmin_duration=Dur\u00e9e:
 repoadmin_duration_ms=ms
 
 # Tenant Admin Console messages
@@ -1805,7 +1806,7 @@ tenantadmin_context=Contexte
 tenantadmin_command=Commande (tapez help pour l'aide)
 tenantadmin_command_submit=Soumettre
 tenantadmin_last_command=Derni\u00e8re commande\u00a0:
-tenantadmin_duration=Dur\u00e9e :
+tenantadmin_duration=Dur\u00e9e:
 tenantadmin_duration_ms=ms
 
 
@@ -1980,7 +1981,7 @@ error_negative_quota=Le quota ne peut pas \u00eatre n\u00e9gatif\u00a0: {0}
 error_search_not_exist=Search does not exist with name: {0}
 error_search_not_exist=Aucune recherche n''existe avec le nom suivant\u00a0: \"{0}\"
 error_retrieving_search_results=Erreur d''obtention de r\u00e9sultats pour la recherche \"{0}\" - \"{1}\"
-error_domain_mismatch=Discordance de domaine\u00a0: valeur attendue = {0}, valeur r\u00e9elle = {1}
+error_domain_mismatch=Discordance de domaine : attendu = {0}, r\u00e9el = {1}
 error_not_stored=Aucune erreur actuellement enregistr\u00e9e
 error_no_stack_trace=Aucune trace de pile disponible
 error_permissions=Vous ne disposez pas des permissions suffisantes pour afficher l'\u00e9l\u00e9ment requis.
@@ -1991,10 +1992,10 @@ error_external_protocol_support=Les liens externes doivent \u00eatre saisis manu
 return_to_application=Retourner \u00e0 l'application
 return_home=Mon contenu
 delete_space_info=Pour supprimer cet Espace et tout son contenu, cliquez sur OK.
-delete_space_assoc_info=Cet espace s'affiche dans plusieurs emplacements.Pour supprimer l'espace de l'emplacement actuel, cliquer sur OK.
+delete_space_assoc_info=Cet espace s'affiche dans plusieurs emplacements. Pour supprimer l'espace de l'emplacement actuel, cliquer sur OK.
 delete_space_confirm=\u00cates-vous s\u00fbr de vouloir supprimer \"{0}\" et l''ensemble de son contenu\u00a0?
 delete_space_assoc_confirm=\u00cates-vous certain de vouloir supprimer \"{0}\" de son emplacement actuel\u00a0?
-delete_space_multiple_parents_warn=Cet espace s'affiche dans plusieurs emplacements.Par cons\u00e9quent, l'op\u00e9ration s\u00e9lectionn\u00e9e ci-dessous s'appliquera sur tous les emplacements.
+delete_space_multiple_parents_warn=Cet espace s'affiche dans plusieurs emplacements. Par cons\u00e9quent, l'op\u00e9ration s\u00e9lectionn\u00e9e ci-dessous s'appliquera sur tous les emplacements.
 delete_forums_info=Pour supprimer cet Espace forum et son contenu, cliquez sur OK.
 delete_forum_info=Pour supprimer ce forum et ses discussions, cliquez sur OK.
 delete_forum_confirm=\u00cates-vous s\u00fbr de vouloir supprimer \"{0}\" et ses sujets\u00a0?
@@ -2003,7 +2004,7 @@ delete_topic_confirm=Etes-vous s\u00fbr de vouloir supprimer \"{0}\" et tous ses
 delete_post_info=Pour supprimer ce message de la discussion, cliquez sur OK.
 delete_post_confirm=Etes-vous s\u00fbr que vous voulez supprimer le message de \"{0}\"\u00a0?
 delete_file_info=Pour supprimer ce fichier et toutes les versions pr\u00e9c\u00e9dentes, cliquez sur OK.
-delete_file_assoc_info=Ce fichier s'affiche dans plusieurs emplacements.Pour supprimer le fichier de l'emplacement actuel, cliquer sur OK.
+delete_file_assoc_info=Ce fichier s'affiche dans plusieurs emplacements. Pour supprimer le fichier de l'emplacement actuel, cliquer sur OK.
 delete_file_confirm=\u00cates-vous s\u00fbre de vouloir supprimer \"{0}\" et tous ses versions pr\u00e9c\u00e9dentes\u00a0?
 delete_file_assoc_confirm=\u00cates-vous certain de vouloir supprimer \"{0}\" de son emplacement actuel\u00a0?
 delete_file_multiple_parents_confirm=\"{0}\" apparait en de multiples endroits, \u00eates-vous s\u00fbr de vouloir le supprimer de tous les emplacements et de supprimer toutes les versions ant\u00e9rieures\u00a0?
diff --git a/config/alfresco/messages/webclient_it.properties b/config/alfresco/messages/webclient_it.properties
index 7f6e6b4502..9b1ecbeb22 100755
--- a/config/alfresco/messages/webclient_it.properties
+++ b/config/alfresco/messages/webclient_it.properties
@@ -525,6 +525,7 @@ navigator_desc=Consente di spostarsi tramite la struttura ad albero all'interno
 shelf=Scaffale
 shelf_desc=Area contenente gli appunti, gli spazi recenti e le scorciatoie
 reset_navigator=Aggiorna
+reset_categories=Aggiorna
 navigator_node_deleted=Lo spazio selezionato non \u00e8 pi\u00f9 presente nel repository, aggiornare il Navigatore prima di continuare.
 
 # Common Wizard messages
@@ -2125,6 +2126,3 @@ trx.transferStatus=Stato attuale
 trx.fromRepositoryId=Trasferito da
 trx.repositoryId=Origine trasferita
 trx.invadedBy=Contiene trasferimenti 
-
-# Team properties
-team_login_warning=La pagina Alfresco Explorer non \u00e8 supportata. Accedere a questa pagina solo seguendo le istruzioni del Supporto Alfresco.
diff --git a/config/alfresco/messages/webclient_ja.properties b/config/alfresco/messages/webclient_ja.properties
index 4a07dd91f6..6f03fd22ea 100755
--- a/config/alfresco/messages/webclient_ja.properties
+++ b/config/alfresco/messages/webclient_ja.properties
@@ -21,7 +21,7 @@ ml_common_content_properties=\u5171\u901a\u306e\u591a\u8a00\u8a9e\u30b3\u30f3\u3
 ml_other_options=\u4ed6\u306e\u30aa\u30d7\u30b7\u30e7\u30f3
 ml_add_trans_when_diag_close=\u3053\u306e\u30c0\u30a4\u30a2\u30ed\u30b0\u3092\u9589\u3058\u308b\u3068\u304d\u306b\u7ffb\u8a33\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002
 ml_with_content=\u30b3\u30f3\u30c6\u30f3\u30c4\u3042\u308a
-ml_just_trans_info=\u30b3\u30f3\u30c6\u30f3\u30c4\u306a\u3057 (\u7ffb\u8a33\u60c5\u5831\u306e\u307f)
+ml_just_trans_info=\u30b3\u30f3\u30c6\u30f3\u30c4\u306a\u3057\uff08\u7ffb\u8a33\u60c5\u5831\u306e\u307f\uff09
 not_multilingual=\u3053\u306e\u6587\u66f8\u306b\u306f\u591a\u8a00\u8a9e\u306e\u30a2\u30b9\u30da\u30af\u30c8\u304c\u3064\u3044\u3066\u3044\u307e\u305b\u3093\u3002
 allow_multilinguism=\u591a\u8a00\u8a9e\u30a2\u30b9\u30da\u30af\u30c8\u3092\u8a31\u53ef
 select_language=<\u8a00\u8a9e\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044>
@@ -186,7 +186,7 @@ details_view=\u8a73\u7d30\u8868\u793a
 view_icon=\u30a2\u30a4\u30b3\u30f3\u8868\u793a
 view_browse=\u95b2\u89a7\u8868\u793a
 create_options=\u4f5c\u6210
-more_options=\u305d\u306e\u4ed6\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u2026
+more_options=\u305d\u306e\u4ed6\u306e\u30a2\u30af\u30b7\u30e7\u30f3...
 more_actions=\u305d\u306e\u4ed6\u306e\u30a2\u30af\u30b7\u30e7\u30f3
 more_options_space=\u3053\u306e\u30b9\u30da\u30fc\u30b9\u306e\u8a73\u7d30\u306a\u30a2\u30af\u30b7\u30e7\u30f3
 more_options_file=\u3053\u306e\u6587\u66f8\u306e\u8a73\u7d30\u306a\u30a2\u30af\u30b7\u30e7\u30f3
@@ -201,9 +201,9 @@ change=\u5909\u66f4
 select=\u9078\u629e
 set=\u8a2d\u5b9a
 no_categories_applied=\u3053\u306e\u6587\u66f8\u306b\u306f\u30ab\u30c6\u30b4\u30ea\u304c\u307e\u3060\u9069\u7528\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
-has_following_categories=\u3053\u306e\u6587\u66f8\u306b\u306f\u6b21\u306e\u30ab\u30c6\u30b4\u30ea\u304c\u9069\u7528\u3055\u308c\u307e\u3059\u30fb\u30fb\u30fb
+has_following_categories=\u3053\u306e\u6587\u66f8\u306b\u306f\u6b21\u306e\u30ab\u30c6\u30b4\u30ea\u304c\u9069\u7528\u3055\u308c\u307e\u3059...
 no_categories_applied_space=\u3053\u306e\u30b9\u30da\u30fc\u30b9\u306b\u306f\u307e\u3060\u30ab\u30c6\u30b4\u30ea\u304c\u9069\u7528\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
-has_following_categories_space=\u3053\u306e\u30b9\u30da\u30fc\u30b9\u306b\u306f\u6b21\u306e\u30ab\u30c6\u30b4\u30ea\u304c\u9069\u7528\u3055\u308c\u3066\u3044\u307e\u3059\u30fb\u30fb\u30fb
+has_following_categories_space=\u3053\u306e\u30b9\u30da\u30fc\u30b9\u306b\u306f\u6b21\u306e\u30ab\u30c6\u30b4\u30ea\u304c\u9069\u7528\u3055\u308c\u3066\u3044\u307e\u3059...
 moved=\u79fb\u52d5\u6e08
 copied=\u30b3\u30d4\u30fc\u6e08
 clipboard=\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9
@@ -268,7 +268,7 @@ information=\u60c5\u5831
 move=\u79fb\u52d5
 type=\u30bf\u30a4\u30d7
 tag=\u30bf\u30b0
-encoding=\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0
+encoding=\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0
 aspect=\u30a2\u30b9\u30da\u30af\u30c8
 workflow=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc
 workflows=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc
@@ -278,7 +278,7 @@ login=\u30ed\u30b0\u30a4\u30f3
 templates=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
 template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
 rss_template=RSS\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
-select_button=\u9078\u629e\u30fb\u30fb\u30fb
+select_button=\u9078\u629e...
 select_items=\u30a2\u30a4\u30c6\u30e0\u306e\u9078\u629e
 select_an_item=\u30a2\u30a4\u30c6\u30e0\u3092\u9078\u629e
 selected_items=\u9078\u629e\u6e08\u30a2\u30a4\u30c6\u30e0
@@ -464,7 +464,7 @@ saved_searches=\u4fdd\u5b58\u3057\u305f\u691c\u7d22\u30aa\u30d7\u30b7\u30e7\u30f
 title_save_search=\u691c\u7d22\u30af\u30a8\u30ea\u306e\u4fdd\u5b58
 save_search_description=\u5f8c\u3067\u518d\u4f7f\u7528\u3067\u304d\u308b\u3088\u3046\u306b\u691c\u7d22\u30af\u30a8\u30ea\u3092\u4fdd\u5b58\u3057\u307e\u3059\u3002
 search_props=\u4fdd\u5b58\u6e08\u306e\u691c\u7d22\u30d7\u30ed\u30d1\u30c6\u30a3
-select_saved_search=\u4fdd\u5b58\u3057\u305f\u691c\u7d22\u306e\u9078\u629e\u30fb\u30fb\u30fb
+select_saved_search=\u4fdd\u5b58\u3057\u305f\u691c\u7d22\u306e\u9078\u629e...
 saved_search_warning=\u3053\u306e\u30aa\u30da\u30ec\u30fc\u30b7\u30e7\u30f3\u3092\u884c\u3046\u3068\u3001\u4fdd\u5b58\u3057\u305f\u65e2\u5b58\u306e\u691c\u7d22''{0}''\u304c\u4e0a\u66f8\u304d\u3055\u308c\u307e\u3059
 user_searches=\u691c\u7d22
 global_searches=\u691c\u7d22\uff08\u516c\u958b\u30ec\u30d9\u30eb\uff09
@@ -525,6 +525,7 @@ navigator_desc=\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u95a2\u3057\u3066\u30c4\u30e
 shelf=\u30b7\u30a7\u30eb\u30d5
 shelf_desc=\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u3001\u6700\u8fd1\u306e\u30b9\u30da\u30fc\u30b9\u3001\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8\u306a\u3069\u3092\u542b\u3080\u30a8\u30ea\u30a2
 reset_navigator=\u518d\u8aad\u307f\u8fbc\u307f
+reset_categories=\u518d\u8aad\u307f\u8fbc\u307f
 navigator_node_deleted=\u9078\u629e\u3055\u308c\u305f\u30b9\u30da\u30fc\u30b9\u306f\u30ea\u30dd\u30b8\u30c8\u30ea\u5185\u306b\u5b58\u5728\u3057\u307e\u305b\u3093\u3002\u30ca\u30d3\u30b2\u30fc\u30bf\u3092\u518d\u8aad\u307f\u8fbc\u307f\u3057\u3066\u304b\u3089\u7d9a\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
 # Common Wizard messages
@@ -540,7 +541,7 @@ clear_button=\u30af\u30ea\u30a2
 you_may_want=\u6b21\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u63a8\u5968\u3057\u307e\u3059\u3002
 summary_step_description=\u5165\u529b\u60c5\u5831\u306e\u6982\u8981\u3092\u8868\u793a\u3057\u307e\u3059\u3002
 error_wizard_completed_already=\u3053\u306e\u30a6\u30a3\u30b6\u30fc\u30c9\u306f\u3059\u3067\u306b\u5b8c\u4e86\u3057\u3066\u3044\u307e\u3059\u3002
-you_may_want_checkout_document=\u7d9a\u3051\u308b\u306b\u306f\u518d\u8d77\u52d5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002<x type="lb"/><x type="lb"/><x type="lb"/>\u3053\u306e\u6587\u66f8\u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3059\u308b\u3053\u3068\u3067\u3001\u4ed6\u306e\u30e6\u30fc\u30b6\u306b\u3088\u308b\u5909\u66f4\u306e\u4e0a\u66f8\u3092\u9632\u3050\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 
+you_may_want_checkout_document=\u7d9a\u3051\u308b\u306b\u306f\u518d\u8d77\u52d5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u3053\u306e\u6587\u66f8\u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3059\u308b\u3053\u3068\u3067\u3001\u4ed6\u306e\u30e6\u30fc\u30b6\u306b\u3088\u308b\u5909\u66f4\u306e\u4e0a\u66f8\u3092\u9632\u3050\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 
 
 # Category Management messages
 title_categories_list=\u30ab\u30c6\u30b4\u30ea
@@ -591,7 +592,7 @@ selected_users=\u9078\u629e\u3055\u308c\u305f\u30e6\u30fc\u30b6
 groups_err_group_name_length=\u30b0\u30eb\u30fc\u30d7ID\u306f{0}\u304b\u3089{1}\u6587\u5b57\u306e\u9593\u306e\u9577\u3055\u306b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 
 groups_err_group_name=\u30b0\u30eb\u30fc\u30d7ID\u306b\u6587\u5b57''{0}''\u3092\u542b\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
 groups_err_exists=\u540c\u540d\u306e\u30b0\u30eb\u30fc\u30d7ID\u304c\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059\u3002\u30b0\u30eb\u30fc\u30d7ID\u306f\u56fa\u6709\u306e\u3082\u306e\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-Read=\u8aad\u8fbc
+Read=\u8aad\u3080
 Write=\u66f8\u8fbc\u307f
 Delete=\u524a\u9664
 permission=\u6a29\u9650
@@ -621,10 +622,10 @@ change_user_perms=\u30e6\u30fc\u30b6\u30fc\u306e\u6a29\u9650\u306e\u5909\u66f4
 invite_title=\u30e6\u30fc\u30b6\u306e\u62db\u5f85\u30a6\u30a3\u30b6\u30fc\u30c9
 invite_desc=\u3053\u306e\u30a6\u30a3\u30b6\u30fc\u30c9\u3067\u306f\u3001\u4ed6\u306e\u30e6\u30fc\u30b6\u30fc\u306b\u3053\u306e\u30b9\u30da\u30fc\u30b9\u3078\u306e\u30a2\u30af\u30bb\u30b9\u6a29\u9650\u3092\u4e0e\u3048\u307e\u3059\u3002
 invite_step1_title=\u30b9\u30c6\u30c3\u30d7 1 - \u30e6\u30fc\u30b6\u306e\u62db\u5f85
-invite_step1_desc=\u3053\u306e\u30b9\u30fc\u30da\u30b9\u306b\u5272\u5f53\u3066\u308b\u3001\u30e6\u30fc\u30b6\u3068\u305d\u306e\u5f79\u5272\u3092\u9078\u629e\u3057\u307e\u3059\u3002
+invite_step1_desc=\u3053\u306e\u30b9\u30da\u30fc\u30b9\u306b\u3001\u30e6\u30fc\u30b6\u3068\u30e6\u30fc\u30b6\u304c\u679c\u305f\u3059\u5f79\u5272\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 invite_step2_title=\u30b9\u30c6\u30c3\u30d7 2 - \u30e6\u30fc\u30b6\u306b\u901a\u77e5\u3059\u308b
 invite_step2_desc=\u9078\u629e\u3057\u305f\u30e6\u30fc\u30b6\u306b\u901a\u77e5\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-i_want_to=\u4ee5\u4e0b\u3092\u5b9f\u884c\u30fb\u30fb\u30fb
+i_want_to=\u4ee5\u4e0b\u3092\u5b9f\u884c...
 invite_step_1=\u30e6\u30fc\u30b6\u306e\u62db\u5f85
 invite_step_2=\u30e6\u30fc\u30b6\u3078\u901a\u77e5
 invite_all=\u5168\u3066\u306e\u30e6\u30fc\u30b6\u3092\u30b2\u30b9\u30c8\u3068\u3057\u3066\u62db\u5f85
@@ -661,7 +662,7 @@ content_owner=\u30e6\u30fc\u30b6 ''{0}'' \u306f\u3053\u306e\u30b3\u30f3\u30c6\u3
 
 # AVM Compare 
 snapshot_compare_to_current=\u73fe\u5728\u306e\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3068\u306e\u6bd4\u8f03
-snapshot_compare_to_current_description=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8''{0}''\u3068\u73fe\u5728\u306e\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u306e\u9593\u306e\u5909\u66f4\u3092\u306e\u30ea\u30b9\u30c8\u3092\u8868\u793a
+snapshot_compare_to_current_description=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8''{0}''\u3068\u73fe\u5728\u306e\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u306e\u9593\u306e\u5909\u66f4\u306e\u30ea\u30b9\u30c8\u3092\u8868\u793a
 snapshot_compare_to_previous=\u524d\u306e\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3068\u306e\u6bd4\u8f03
 snapshot_compare_to_previous_description=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8''{0}''\u3068 ''{1}''\u306e\u9593\u306e\u5909\u66f4\u306e\u30ea\u30b9\u30c8\u3092\u8868\u793a
 snapshot_compare_to_any=\u4efb\u610f\u306e\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3068\u306e\u6bd4\u8f03
@@ -831,8 +832,8 @@ show_details=\u8a73\u7d30\u3092\u8868\u793a
 user_search_info=\u30e6\u30fc\u30b6\u3092\u898b\u3064\u3051\u308b\u306b\u306f\u3001\u59d3\u3001\u540d\u3001\u3042\u308b\u3044\u306f\u30e6\u30fc\u30b6\u540d\u3067\u30e6\u30fc\u30b6\u3092\u691c\u7d22\u3057\u307e\u3059\u3002 \u307e\u305f\u3001\u5168\u3066\u306e\u30e6\u30fc\u30b6\u3092\u8868\u793a\u3059\u308b\u306b\u306f'\u5168\u3066\u8868\u793a'\u3092\u30af\u30ea\u30c3\u30af\u3057\u307e\u3059\u3002\u305f\u3060\u3057\u3001\u30b7\u30b9\u30c6\u30e0\u306b\u30e6\u30fc\u30b6\u6570\u304c\u591a\u3044\u5834\u5408\u3001\u6642\u9593\u304c\u304b\u304b\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002
 group_search_info=\u30b0\u30eb\u30fc\u30d7\u540d\u3092\u4f7f\u3063\u3066\u30b0\u30eb\u30fc\u30d7\u691c\u7d22\u3092\u898b\u3064\u3051\u307e\u3059\u3002 \u307e\u305f\u3001'\u5168\u3066\u8868\u793a'\u3092\u30af\u30ea\u30c3\u30af\u3059\u308b\u3053\u3068\u3067\u5168\u3066\u306e\u30b0\u30eb\u30fc\u30d7\u3092\u5168\u3066\u8868\u793a\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002\u305f\u3060\u3057\u3001\u30b7\u30b9\u30c6\u30e0\u306b\u30b0\u30eb\u30fc\u30d7\u6570\u304c\u591a\u3044\u5834\u5408\u3001\u6642\u9593\u304c\u304b\u304b\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002
 user_change_homespace_info=\u3042\u308b\u30e6\u30fc\u30b6\u306b\u65b0\u898f\u306e\u30db\u30fc\u30e0\u30b9\u30da\u30fc\u30b9\u3092\u9078\u629e\u3057\u305f\u5834\u5408\u3067\u3082\u3001\u5143\u306e\u30db\u30fc\u30e0\u30b9\u30da\u30fc\u30b9\u306e\u65e2\u5b58\u306e\u6a29\u9650\u306f\u7dad\u6301\u3055\u308c\u307e\u3059\u3002 \u5143\u306e\u30db\u30fc\u30e0\u30b9\u30da\u30fc\u30b9\u306b\u5fc5\u8981\u306a\u304f\u306a\u3063\u305f\u5834\u5408\u3001\u6a29\u9650\u3092\u5909\u66f4\u3059\u308b\u305f\u3081\u306b[\u30b9\u30da\u30fc\u30b9\u30e6\u30fc\u30b6\u306e\u7ba1\u7406]\u30c0\u30a4\u30a2\u30ed\u30b0\u3092\u4f7f\u7528\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002
-quota_totalusage=\u5408\u8a08\u4f7f\u7528\u91cf (\u3053\u306e\u691c\u7d22\u306e)
-quota_totalquota=\u5408\u8a08\u30af\u30a9\u30fc\u30bf (\u3053\u306e\u691c\u7d22\u306e)
+quota_totalusage=\u5408\u8a08\u4f7f\u7528\u91cf\uff08\u3053\u306e\u691c\u7d22\u306e\uff09
+quota_totalquota=\u5408\u8a08\u30af\u30a9\u30fc\u30bf\uff08\u3053\u306e\u691c\u7d22\u306e\uff09
 caused_by=\u539f\u56e0:
 
 # Content Wizard messages
@@ -983,7 +984,7 @@ reject_step_name=\u5374\u4e0b\u30b9\u30c6\u30c3\u30d7\u306e\u540d\u524d
 required_format=\u8981\u6c42\u3055\u308c\u305f\u30d5\u30a9\u30fc\u30de\u30c3\u30c8
 details=\u8a73\u7d30
 select_condition=\u6761\u4ef6\u306e\u9078\u629e
-select_a_condition=\u6761\u4ef6\u306e\u9078\u629e\u30fb\u30fb\u30fb
+select_a_condition=\u6761\u4ef6\u306e\u9078\u629e...
 condition=\u6761\u4ef6
 conditions=\u6761\u4ef6
 condition_settings=\u6761\u4ef6\u306e\u8a2d\u5b9a
@@ -1037,7 +1038,7 @@ action_script_select=\u5b9f\u884c\u3059\u308b\u30b9\u30af\u30ea\u30d7\u30c8\u309
 not_condition_result=\u4e0a\u8a18\u306e\u57fa\u6e96\u306b\u30de\u30c3\u30c1\u3057\u306a\u3044\u30a2\u30a4\u30c6\u30e0\u3092\u30c1\u30a7\u30c3\u30af
 space=\u30b9\u30da\u30fc\u30b9
 import_to=\u30a4\u30f3\u30dd\u30fc\u30c8\u5148
-encoding=\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0
+encoding=\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0
 encoding_utf8=UTF-8
 rule_type=\u30eb\u30fc\u30eb\u30bf\u30a4\u30d7
 rule_background_info=\u3053\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u9078\u629e\u3057\u305f\u5834\u5408\u3001\u30eb\u30fc\u30eb\u306f\u30d0\u30c3\u30af\u30b0\u30e9\u30a6\u30f3\u30c9\u3067\u5b9f\u884c\u3055\u308c\u308b\u305f\u3081\u3001\u7d50\u679c\u304c\u3059\u3050\u306b\u53cd\u6620\u3055\u308c\u306a\u3044\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002
@@ -1064,8 +1065,8 @@ a_template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
 creating_from=\u4f5c\u6210\u5143
 save_as_template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3068\u3057\u3066\u4fdd\u5b58
 template_name=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u540d
-select_a_template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u9078\u629e\u3057\u307e\u3059\u30fb\u30fb\u30fb
-select_a_script=\u30b9\u30af\u30ea\u30d7\u30c8\u3092\u306e\u9078\u629e\u3057\u307e\u3059\u30fb\u30fb\u30fb
+select_a_template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u9078\u629e\u3057\u307e\u3059...
+select_a_script=\u30b9\u30af\u30ea\u30d7\u30c8\u3092\u9078\u629e\u3057\u307e\u3059...
 starting_space=\u30b9\u30da\u30fc\u30b9\u3092\u958b\u59cb
 space_options=\u30b9\u30da\u30fc\u30b9\u30fb\u30aa\u30d7\u30b7\u30e7\u30f3
 space_details=\u30b9\u30da\u30fc\u30b9\u306e\u8a73\u7d30
@@ -1334,7 +1335,7 @@ revert_selected_confirm=\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u304b\u3089\u
 revert_all_title=\u5168\u3066\u306e\u30a2\u30a4\u30c6\u30e0\u3092\u5143\u306b\u623b\u3059
 revert_snapshot_title=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u306e\u30ea\u30d0\u30fc\u30c8
 revert_snapshot_desc=\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u3092\u7279\u5b9a\u306e\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u30d0\u30fc\u30b8\u30e7\u30f3ID\u306b\u30ea\u30d0\u30fc\u30c8\u3057\u307e\u3059\u3002
-revert_snapshot_confirm=\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u3092\u30d0\u30fc\u30b8\u30e7\u30f3:\u00a0{0} \u306b\u30ea\u30d0\u30fc\u30c8\u3057\u307e\u3059\u3002
+revert_snapshot_confirm=\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u3092\u30d0\u30fc\u30b8\u30e7\u30f3:?{0} \u306b\u30ea\u30d0\u30fc\u30c8\u3057\u307e\u3059\u3002
 revert_all_conflicts=\u5168\u3066\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u30ea\u30d0\u30fc\u30c8\u3059\u308b
 revert_all_desc=\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u306e\u5168\u3066\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u3092\u5143\u306b\u623b\u3059\u306b\u306f\u3001[OK]\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 revert_all_confirm=\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u306e\u5168\u3066\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u3092\u5143\u306b\u623b\u3057\u307e\u3059\u304b?
@@ -1345,7 +1346,7 @@ deploy_sandbox_desc=\u30c7\u30d7\u30ed\u30a4\u5148\u306e\u30c6\u30b9\u30c8\u30b5
 redeploy_sandbox_title=\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u306e\u5909\u66f4\u306e\u30c7\u30d7\u30ed\u30a4
 redeploy_sandbox_desc=[OK]\u3092\u30af\u30ea\u30c3\u30af\u3057\u3001\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u5185\u306e\u5909\u66f4\u3092\u5272\u5f53\u3066\u6e08\u30c6\u30b9\u30c8\u30b5\u30fc\u30d0\u306b\u30c7\u30d7\u30ed\u30a4\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 deploy_destination=\u30c7\u30d7\u30ed\u30a4\u5148\u306e\u30b5\u30fc\u30d0\u3092\u9078\u629e
-deploying=\u30c7\u30d7\u30ed\u30a4\u4e2d\u30fb\u30fb\u30fb
+deploying=\u30c7\u30d7\u30ed\u30a4\u4e2d...
 deploy_successful=\u30c7\u30d7\u30ed\u30a4\u306b\u6210\u529f\u3057\u307e\u3057\u305f\u3002
 deploy_failed=\u30c7\u30d7\u30ed\u30a4\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
 deploy_server_not_selected=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u304c\u3059\u3067\u306b\u30c7\u30d7\u30ed\u30a4\u6e08\u3067\u3042\u308b\u305f\u3081\u3001\u3053\u306e\u30b5\u30fc\u30d0\u306f\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3068\u3057\u3066\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
@@ -1392,7 +1393,7 @@ deploy_attempt_date=\u8a66\u884c\u65e5
 select_deploy_attempt=\u30c7\u30d7\u30ed\u30a4\u8a66\u884c\u3092\u8868\u793a
 deployed_to_servers=\u30c7\u30d7\u30ed\u30a4\u5148
 no_deploy_attempts=\u65e5\u4ed8\u7bc4\u56f2\u306b\u8868\u793a\u3059\u308b\u30c7\u30d7\u30ed\u30a4\u8a66\u884c\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
-no_deploy_reports=\u30c7\u30d7\u30ed\u30a4\u306e\u8a73\u7d30\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u30c7\u30d7\u30ed\u30a4\u304c\u9032\u884c\u4e2d\u3067\u3042\u308b\u3068\u601d\u308f\u308c\u307e\u3059\u3002\u8a73\u7d30\u304c\u8868\u793a\u3055\u308c\u308b\u307e\u3067\u3053\u306e\u30da\u30fc\u30b8\u3092\u518d\u8aad\u8fbc\u307f\u3057\u307e\u3059\u3002
+no_deploy_reports=\u30c7\u30d7\u30ed\u30a4\u306e\u8a73\u7d30\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u30c7\u30d7\u30ed\u30a4\u304c\u9032\u884c\u4e2d\u3067\u3042\u308b\u3068\u601d\u308f\u308c\u307e\u3059\u3002\u8a73\u7d30\u304c\u8868\u793a\u3055\u308c\u308b\u307e\u3067\u3053\u306e\u30da\u30fc\u30b8\u3092\u518d\u8aad\u307f\u8fbc\u307f\u3057\u307e\u3059\u3002
 port_must_be_number=\u30dd\u30fc\u30c8\u756a\u53f7\u306b\u306f\u6570\u5b57\u3092\u542b\u3081\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 host_wrong_format=\u30db\u30b9\u30c8\u540d\u304c\u7121\u52b9\u306a\u5f62\u5f0f\u3067\u3059\u3002
 edit_deploy_server=\u30c7\u30d7\u30ed\u30a4\u30fb\u30b5\u30fc\u30d0\u306e\u8a73\u7d30\u3092\u7de8\u96c6
@@ -1437,7 +1438,7 @@ static_tab={0}\u9759\u7684\u30d5\u30a1\u30a4\u30eb
 generated_tab={0}\u751f\u6210\u30d5\u30a1\u30a4\u30eb
 all_items_tab=\u5168\u3066\u306e\u30a2\u30a4\u30c6\u30e0
 inc_tab_size=\u30b9\u30af\u30ed\u30fc\u30eb\u3067\u304d\u308b\u30a8\u30ea\u30a2\u306e\u30b5\u30a4\u30ba\u3092100px\u5358\u4f4d\u3067\u5897\u3084\u3057\u307e\u3059\u3002
-dec_tab_size=\u30b9\u30af\u30ed\u30fc\u30eb\u3067\u304d\u308b\u30a8\u30ea\u30a2\u306e\u30b5\u30a4\u30ba\u3092100px\u5358\u4f4d\u3067\u6e1b\u5c11\u3057\u307e\u3059\u3002 (\u6700\u5c0f100px)
+dec_tab_size=\u30b9\u30af\u30ed\u30fc\u30eb\u3067\u304d\u308b\u30a8\u30ea\u30a2\u306e\u30b5\u30a4\u30ba\u3092100px\u5358\u4f4d\u3067\u6e1b\u5c11\u3057\u307e\u3059\u3002\uff08\u6700\u5c0f100px\uff09
 
 prompt_for_web_form=Web\u30d5\u30a9\u30fc\u30e0\u306e\u9078\u629e
 prompt_for_web_form_info=\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u7de8\u96c6\u3059\u308b\u305f\u3081\u306eWeb\u30d5\u30a9\u30fc\u30e0\u3092\u9078\u629e
@@ -1543,7 +1544,7 @@ recovery_report_reason=\u5931\u6557\u7406\u7531
 my_alfresco=\u3042\u306a\u305f\u306eAlfresco
 title_my_alfresco=\u3042\u306a\u305f\u306eAlfresco
 dashboard_info=\u3042\u306a\u305f\u306eAlfresco\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9
-dashboard_description=\u3053\u306e\u30d3\u30e5\u30fc\u3092\u8a2d\u5b9a\u3057\u3066\u3001\u30d1\u30fc\u30bd\u30ca\u30eb\u30fbAlfresco\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002
+dashboard_description=\u3053\u306e\u30d3\u30e5\u30fc\u3092\u8a2d\u5b9a\u3057\u3066\u3001\u30d1\u30fc\u30bd\u30ca\u30ebAlfresco\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002
 configure=\u8a2d\u5b9a
 error_dashboard=\u30c0\u30c3\u30b7\u30e5\u30ec\u30c3\u30c8\u306e1\u3064\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
 
@@ -1581,7 +1582,7 @@ layout_three_column_desc=\u3053\u306e\u30ec\u30a4\u30a2\u30a6\u30c8\u3067\u306f\
 # My Alfresco Dashlet components messages
 dashlet_gettingstarted_label=\u30b9\u30bf\u30fc\u30c8\u30ac\u30a4\u30c9
 dashlet_gettingstarted_desc=Alfresco Web\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u3092\u521d\u3081\u3066\u4f7f\u3046\u65b9\u3092\u5bfe\u8c61\u3068\u3057\u305f\u3001\u5f79\u7acb\u3064\u60c5\u5831\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002
-dashlet_mydocuments=\u3042\u306a\u305f\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8
+dashlet_mydocuments=\u30de\u30a4\u30fb\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8
 dashlet_mydocuments_desc=\u30db\u30fc\u30e0\u30b9\u30da\u30fc\u30b9\u306b\u6587\u66f8\u306e\u30ea\u30b9\u30c8\u3092\u8868\u793a\u3057\u307e\u3059\u3002
 dashlet_checkedoutdocs=\u3042\u306a\u305f\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u6e08\u6587\u66f8
 dashlet_checkedoutdocs_desc=\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3055\u308c\u3066\u3044\u308b\u6587\u66f8\u306e\u30ea\u30b9\u30c8\u3092\u8868\u793a\u3057\u307e\u3059\u3002
@@ -1701,7 +1702,7 @@ doclist-webscript_title=\u6587\u66f8\u30ea\u30b9\u30c8
 doclist-webscript_desc=\u6587\u66f8\u30ea\u30b9\u30c8Web\u30b9\u30af\u30ea\u30d7\u30c8
 myspaces-webscript_title=\u3042\u306a\u305f\u306e\u30b9\u30da\u30fc\u30b9\u30fb\u30ea\u30b9\u30c8
 myspaces-webscript_desc=\u3042\u306a\u305f\u306e\u30b9\u30da\u30fc\u30b9Web\u30b9\u30af\u30ea\u30d7\u30c8
-mytasks-webscript_title=\u3042\u306a\u305f\u306e\u30bf\u30b9\u30af
+mytasks-webscript_title=\u30bf\u30b9\u30af
 mytasks-webscript_desc=\u3042\u306a\u305f\u306e\u30bf\u30b9\u30afWeb\u30b9\u30af\u30ea\u30d7\u30c8
 mywebforms-webscript_title=\u3042\u306a\u305f\u306eWeb\u30d5\u30a9\u30fc\u30e0
 mywebforms-webscript_desc=\u3042\u306a\u305f\u306eWeb\u30d5\u30a9\u30fc\u30e0Web\u30b9\u30af\u30ea\u30d7\u30c8
@@ -1763,14 +1764,14 @@ imap.attachments.folder=\u6dfb\u4ed8\u30d5\u30a9\u30eb\u30c0
 title_admin_console=\u7ba1\u7406\u8005\u30b3\u30f3\u30bd\u30fc\u30eb
 admin_console=\u7ba1\u7406\u8005\u30b3\u30f3\u30bd\u30fc\u30eb
 admin_description=\u3053\u306e\u30d3\u30e5\u30fc\u3092\u4f7f\u7528\u3057\u3066\u3001\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u3092\u884c\u3044\u307e\u3059\u3002
-admin_limited_license=\u30e9\u30a4\u30bb\u30f3\u30b9\u6e08: {0} \u30e9\u30a4\u30bb\u30f3\u30b9\u304c {1} \u306b\u4e0e\u3048\u3089\u308c\u3066\u304a\u308a\u3001{3} \u65e5\u5f8c\u306b\u671f\u9650\u5207\u308c\u306b\u306a\u308a\u307e\u3059 {4,date,short} (\u6b8b\u308a {5} \u65e5 - \u767a\u884c\u65e5 {2,date,short})\u3002
-admin_unlimited_license=\u30e9\u30a4\u30bb\u30f3\u30b9\u6e08: {0} \u30e9\u30a4\u30bb\u30f3\u30b9\u304c {1} \u306b\u4e0e\u3048\u3089\u308c\u3066\u304a\u308a\u3001\u307e\u3060\u671f\u9650\u306f\u5207\u308c\u3066\u3044\u307e\u305b\u3093\u3002(\u767a\u884c\u65e5 {2,date,short})\u3002
+admin_limited_license=\u30e9\u30a4\u30bb\u30f3\u30b9\u6e08: {0} \u30e9\u30a4\u30bb\u30f3\u30b9\u304c {1} \u306b\u4e0e\u3048\u3089\u308c\u3066\u304a\u308a\u3001{3} \u65e5\u5f8c\u306b\u671f\u9650\u5207\u308c\u306b\u306a\u308a\u307e\u3059 {4,date,short} \uff08\u6b8b\u308a {5} \u65e5 - \u767a\u884c\u65e5 {2,date,short}\uff09\u3002
+admin_unlimited_license=\u30e9\u30a4\u30bb\u30f3\u30b9\u6e08: {0} \u30e9\u30a4\u30bb\u30f3\u30b9\u304c {1} \u306b\u4e0e\u3048\u3089\u308c\u3066\u304a\u308a\u3001\u307e\u3060\u671f\u9650\u306f\u5207\u308c\u3066\u3044\u307e\u305b\u3093\u3002\uff08\u767a\u884c\u65e5 {2,date,short}\uff09\u3002
 admin_invalid_license=\u30e9\u30a4\u30bb\u30f3\u30b9\u6e08: \u7121\u52b9\u306a\u30e9\u30a4\u30bb\u30f3\u30b9 - Alfresco\u30ea\u30dd\u30b8\u30c8\u30ea\u306f\u8aad\u53d6\u5c02\u7528\u6a5f\u80fd\u306b\u5236\u9650\u3055\u308c\u307e\u3059\u3002
 
 # Workflow Console messages
 title_workflow_console=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u30fb\u30b3\u30f3\u30bd\u30fc\u30eb
 workflow_context=\u30b3\u30f3\u30c6\u30af\u30b9\u30c8
-workflow_command=\u30b3\u30de\u30f3\u30c9 (help\u306b\u306f\u30d8\u30eb\u30d7\u3068\u5165\u529b)
+workflow_command=\u30b3\u30de\u30f3\u30c9\uff08help\u306b\u306f\u30d8\u30eb\u30d7\u3068\u5165\u529b\uff09
 workflow_command_submit=\u9001\u4fe1
 workflow_last_command=\u6700\u5f8c\u306e\u30b3\u30de\u30f3\u30c9:
 workflow_duration=\u671f\u9593:
@@ -1783,7 +1784,7 @@ title_jmx_output=\u30a2\u30a6\u30c8\u30d7\u30c3\u30c8
 # WebClient Config Admin Console messages
 title_configadmin_console=Web\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u8a2d\u5b9a\u7ba1\u7406\u8005\u30b3\u30f3\u30bd\u30fc\u30eb
 configadmin_context=\u30b3\u30f3\u30c6\u30af\u30b9\u30c8
-configadmin_command=\u30b3\u30de\u30f3\u30c9 (help\u306b\u306f\u30d8\u30eb\u30d7\u3068\u5165\u529b)
+configadmin_command=\u30b3\u30de\u30f3\u30c9\uff08help\u306b\u306f\u30d8\u30eb\u30d7\u3068\u5165\u529b\uff09
 configadmin_command_submit=\u9001\u4fe1
 configadmin_last_command=\u6700\u5f8c\u306e\u30b3\u30de\u30f3\u30c9:
 configadmin_duration=\u671f\u9593:
@@ -1793,7 +1794,7 @@ configadmin_duration_ms=ms
 # Repository Admin Console messages
 title_repoadmin_console=\u30ea\u30dd\u30b8\u30c8\u30ea\u7ba1\u7406\u8005\u30b3\u30f3\u30bd\u30fc\u30eb
 repoadmin_context=\u30b3\u30f3\u30c6\u30af\u30b9\u30c8
-repoadmin_command=\u30b3\u30de\u30f3\u30c9 (help\u306b\u306f\u30d8\u30eb\u30d7\u3068\u5165\u529b)
+repoadmin_command=\u30b3\u30de\u30f3\u30c9\uff08help\u306b\u306f\u30d8\u30eb\u30d7\u3068\u5165\u529b\uff09
 repoadmin_command_submit=\u9001\u4fe1
 repoadmin_last_command=\u6700\u5f8c\u306e\u30b3\u30de\u30f3\u30c9:
 repoadmin_duration=\u671f\u9593:
@@ -1802,7 +1803,7 @@ repoadmin_duration_ms=ms
 # Tenant Admin Console messages
 title_tenantadmin_console=\u30c6\u30ca\u30f3\u30c8\u7ba1\u7406\u8005\u30b3\u30f3\u30bd\u30fc\u30eb
 tenantadmin_context=\u30b3\u30f3\u30c6\u30af\u30b9\u30c8
-tenantadmin_command=\u30b3\u30de\u30f3\u30c9 (help\u306b\u306f\u30d8\u30eb\u30d7\u3068\u5165\u529b)
+tenantadmin_command=\u30b3\u30de\u30f3\u30c9\uff08help\u306b\u306f\u30d8\u30eb\u30d7\u3068\u5165\u529b\uff09
 tenantadmin_command_submit=\u9001\u4fe1
 tenantadmin_last_command=\u6700\u5f8c\u306e\u30b3\u30de\u30f3\u30c9:
 tenantadmin_duration=\u671f\u9593:
@@ -1934,7 +1935,7 @@ error_checkin=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u306b\u3088\u308a\u30b3
 error_paste=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u306b\u3088\u308a\u30a2\u30a4\u30c6\u30e0\u3092\u8cbc\u308a\u4ed8\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093:
 error_login_user=\u30ed\u30b0\u30a4\u30f3\u3067\u304d\u307e\u305b\u3093 - \u4e0d\u660e\u306a\u30e6\u30fc\u30b6\u540d/\u30d1\u30b9\u30ef\u30fc\u30c9\u3067\u3059\u3002
 error_login_missing=\u30e6\u30fc\u30b6\u540d\u3068\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-error_login_disallowed=\u30e6\u30fc\u30b6\u540d\u304c\u5374\u4e0b\u3055\u308c\u307e\u3057\u305f \uff70 \u5f8c\u3067\u518d\u8a66\u884c\u3092\u3059\u308b\u304b\u3001\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+error_login_disallowed=\u30e6\u30fc\u30b6\u540d\u304c\u5374\u4e0b\u3055\u308c\u307e\u3057\u305f - \u5f8c\u3067\u518d\u8a66\u884c\u3092\u3059\u308b\u304b\u3001\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 error_login_maxusers=\u30e6\u30fc\u30b6\u306e\u6700\u5927\u6570\u3092\u8d85\u3048\u307e\u3057\u305f - \u5f8c\u3067\u518d\u8a66\u884c\u3092\u3059\u308b\u304b\u3001\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 error_delete_rule=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u306b\u3088\u308a\u30eb\u30fc\u30eb\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093:
 error_actions=\u30a8\u30e9\u30fc\u306b\u3088\u308a\u30a2\u30af\u30b7\u30e7\u30f3\u306e\u5b9f\u884c\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0}
@@ -2006,7 +2007,7 @@ delete_file_info=\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u3068\u4ee5\u524d\u306e\u3
 delete_file_assoc_info=\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u8907\u6570\u306e\u5834\u6240\u306b\u8868\u793a\u3055\u308c\u307e\u3059\u3002\u73fe\u5728\u306e\u5834\u6240\u304b\u3089\u30d5\u30a1\u30a4\u30eb\u3092\u53d6\u9664\u304f\u306b\u306f\u3001[OK]\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 delete_file_confirm=\"{0}\" \u3068\u4ee5\u524d\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u5168\u3066\u524a\u9664\u3057\u307e\u3059\u304b?
 delete_file_assoc_confirm=\"{0}\" \u3092\u73fe\u5728\u306e\u5834\u6240\u304b\u3089\u53d6\u9664\u304d\u307e\u3059\u304b?
-delete_file_multiple_parents_confirm=\u5168\u3066\u306e\u5834\u6240\u304b\u3089\u53d6\u9664\u304d\u3001\u4ee5\u524d\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u5168\u3066\u524a\u9664\u3057\u307e\u3059\u304b?
+delete_file_multiple_parents_confirm=\"{0}\"\u5168\u3066\u306e\u5834\u6240\u304b\u3089\u53d6\u9664\u304d\u3001\u4ee5\u524d\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u5168\u3066\u524a\u9664\u3057\u307e\u3059\u304b?
 delete_translation_confirm=\"{0}\" \u3068\u4ee5\u524d\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u5168\u3066\u524a\u9664\u3057\u307e\u3059\u304b? \u305d\u306e\u591a\u8a00\u8a9e\u30d7\u30ed\u30d1\u30c6\u30a3\u306f\u5fa9\u65e7\u3055\u308c\u307e\u305b\u3093\u3002
 delete_empty_translation_confirm=\"{0}\"\u3092\u6052\u4e45\u7684\u306b\u524a\u9664\u3057\u307e\u3059\u304b? \u5f8c\u3067\u3053\u306e\u6587\u66f8\u3092\u5fa9\u65e7\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002
 delete_ml_container_confirm=\"{0}\" \u3068\u4ee5\u524d\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u5168\u3066\u524a\u9664\u3057\u307e\u3059\u304b? \u305d\u308c\u305e\u308c\u306e\u7ffb\u8a33\u3082\u524a\u9664\u3055\u308c\u307e\u3059\u3002
@@ -2039,7 +2040,7 @@ idle=\u30a2\u30a4\u30c9\u30eb
 loading=\u30ed\u30fc\u30c7\u30a3\u30f3\u30b0
 eg=\u4f8b
 click_to_edit=\u30af\u30ea\u30c3\u30af\u3057\u3066\u7de8\u96c6
-please_select=\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u30fb\u30fb\u30fb
+please_select=\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044...
 
 # File Picker
 go_up=\u4e0a\u3078
@@ -2059,7 +2060,7 @@ category_browser_browse_description=\u3053\u306e\u30d3\u30e5\u30fc\u3067\u306f\u
 title_category_browse=Alfresco Web\u30af\u30e9\u30a4\u30a2\u30f3\u30c8 - \u30ab\u30c6\u30b4\u30ea\u95b2\u89a7
 
 # 3.0 Sites messages
-ReadPermissions=\u8aad\u8fbc
+ReadPermissions=\u8aad\u3080
 SiteManager=\u30b5\u30a4\u30c8\u30fb\u30de\u30cd\u30fc\u30b8\u30e3
 SiteConsumer=\u30b5\u30a4\u30c8\u30fb\u30b2\u30b9\u30c8
 SiteCollaborator=\u30b5\u30a4\u30c8\u5171\u540c\u4f5c\u696d\u8005
@@ -2077,9 +2078,9 @@ composite_condition_page_description=\u4ed6\u306e\u6761\u4ef6\u3092\u3044\u304f\
 composite_condition_page_title=\u5408\u6210\u6761\u4ef6\u3092\u4f5c\u6210
 composite_condition_page_selected=\u7d50\u5408\u3055\u308c\u308b\u9078\u629e\u6e08\u6761\u4ef6
 composite_condition_page_or=\u307e\u305f\u306f
-text_property_condition_property=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d (\u4f8b\u3048\u3070\u3001description\u307e\u305f\u306fcm:description)
-integer_property_condition_property=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d (\u4f8b\u3048\u3070\u3001count\u307e\u305f\u306fmy:count)
-date_property_condition_property=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d (\u4f8b\u3048\u3070\u3001created\u307e\u305f\u306fcm:created)
+text_property_condition_property=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d\uff08\u4f8b\u3048\u3070\u3001description\u307e\u305f\u306fcm:description\uff09
+integer_property_condition_property=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d\uff08\u4f8b\u3048\u3070\u3001count\u307e\u305f\u306fmy:count\uff09
+date_property_condition_property=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d\uff08\u4f8b\u3048\u3070\u3001created\u307e\u305f\u306fcm:created\uff09
 property_condition_operation=\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u5024
 property_condition_value=\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u5024
 property_condition_operation=\u30aa\u30da\u30ec\u30fc\u30b7\u30e7\u30f3
@@ -2105,9 +2106,9 @@ condition_compare_date_property_value=\u65e5\u4ed8\u578b\u30d7\u30ed\u30d1\u30c6
 condition_compare_date_property_value_not=\u65e5\u4ed8\u578b\u30d7\u30ed\u30d1\u30c6\u30a3 ''{0}'' \u306e\u5024\u304c ''{2}'' {1}\u3001\u304c\u6210\u308a\u7acb\u305f\u306a\u3044\u6642
 condition_compare_boolean_property_value=\u30d6\u30fc\u30ea\u30a2\u30f3\u578b\u30d7\u30ed\u30d1\u30c6\u30a3 ''{0}'' \u306e\u5024\u304c ''{2}'' {1}\u3001\u304c\u6210\u308a\u7acb\u3064\u6642
 condition_compare_boolean_property_value_not=\u30d6\u30fc\u30ea\u30a2\u30f3\u578b\u30d7\u30ed\u30d1\u30c6\u30a3 ''{0}'' \u306e\u5024\u304c ''{2}'' {1}\u3001\u304c\u6210\u308a\u7acb\u305f\u306a\u3044\u6642
-condition_composite_summary=\u5408\u6210\u6761\u4ef6 ({0} \u6761\u4ef6 {1})
-condition_composite_summary_not=\u5408\u6210\u6761\u4ef6 ({0} \u6761\u4ef6 {1} \u3068\u53cd\u8ee2)
-condition_composite_error=\u5408\u6210\u6761\u4ef6 (\u30a8\u30e9\u30fc)
+condition_composite_summary=\u5408\u6210\u6761\u4ef6\uff08{0} \u6761\u4ef6 {1}\uff09
+condition_composite_summary_not=\u5408\u6210\u6761\u4ef6\uff08{0} \u6761\u4ef6 {1} \u3068\u53cd\u8ee2\uff09
+condition_composite_error=\u5408\u6210\u6761\u4ef6\uff08\u30a8\u30e9\u30fc\uff09
 
 component_property=\u30d7\u30ed\u30d1\u30c6\u30a3
 component_value=\u5024
diff --git a/config/alfresco/templates/client/portlet_node_summary_panel.ftl b/config/alfresco/templates/client/portlet_node_summary_panel.ftl
index 2e6c73b015..cf6869130c 100644
--- a/config/alfresco/templates/client/portlet_node_summary_panel.ftl
+++ b/config/alfresco/templates/client/portlet_node_summary_panel.ftl
@@ -54,9 +54,9 @@
 	            <#if node.properties.description?exists>
 	               <tr><td>&nbsp;${msg("description")}:</td><td>${node.properties.description?html}</td></tr>
 	            </#if>
-	            <tr><td>&nbsp;${msg("created")}:</td><td>${node.properties.created?datetime}</td></tr>
+	            <tr><td>&nbsp;${msg("created")}:</td><td>${node.properties.created?string(msg("date_time_pattern"))}</td></tr>
 	            <tr><td>&nbsp;${msg("creator")}:</td><td>${node.properties.creator}</td></tr>
-	            <tr><td>&nbsp;${msg("modified")}:</td><td>${node.properties.modified?datetime}</td></tr>
+	            <tr><td>&nbsp;${msg("modified")}:</td><td>${node.properties.modified?string(msg("date_time_pattern"))}</td></tr>
 	            <tr><td>&nbsp;${msg("modifier")}:</td><td>${node.properties.modifier}</td></tr>
 	            <#if node.properties.owner?exists>
 	               <tr><td>&nbsp;${msg("owner")}:</td><td>${node.properties.owner}</td></tr>
diff --git a/config/alfresco/templates/client/task_summary_panel.ftl b/config/alfresco/templates/client/task_summary_panel.ftl
index 3d5bb615b4..822d81af20 100644
--- a/config/alfresco/templates/client/task_summary_panel.ftl
+++ b/config/alfresco/templates/client/task_summary_panel.ftl
@@ -16,7 +16,7 @@
 	         <table cellpadding='2' cellspacing='0' class='taskPopupData'>
 	            <tr><td>${msg("task_summary_panel.type")}:</td><td>${task.type?html}</td></tr>
 	            <tr><td>${msg("task_summary_panel.name")}:</td><td>${task.name?html}</td></tr>
-	            <tr><td>${msg("task_summary_panel.start_date")}:</td><td>${task.startDate?date}</td></tr>
+	            <tr><td>${msg("task_summary_panel.start_date")}:</td><td>${task.startDate?string(msg("date_pattern"))}</td></tr>
 	            <tr><td>${msg("task_summary_panel.due_date")}:</td><td>
 	            <#if task.properties["bpm:dueDate"]?exists>
 	               ${task.properties["bpm:dueDate"]?date}
diff --git a/config/alfresco/web-client-config-actions.xml b/config/alfresco/web-client-config-actions.xml
index bef4d279ab..a59a2bc672 100644
--- a/config/alfresco/web-client-config-actions.xml
+++ b/config/alfresco/web-client-config-actions.xml
@@ -1188,7 +1188,6 @@
          </action-group>
          
          <action-group id="deleteditem_actions">
-            <style-class>inlineAction</style-class>
             <action idref="recover_item" />
             <action idref="delete_item" />
          </action-group>
diff --git a/config/alfresco/web-client-config-dialogs.xml b/config/alfresco/web-client-config-dialogs.xml
index 949b427b94..62657ed997 100644
--- a/config/alfresco/web-client-config-dialogs.xml
+++ b/config/alfresco/web-client-config-dialogs.xml
@@ -527,7 +527,7 @@
          
          <dialog name="itemDetails" page="/jsp/trashcan/item-details.jsp" managed-bean="TrashcanItemDetailsDialog"
                  icon="/images/icons/details_large.gif" description-id="deleteditem_details_description" 
-                 show-ok-button="false" actions-config-id="deleteditem_actions" error-message-id="empty_message" />
+                 show-ok-button="false" error-message-id="empty_message" />
          
          <dialog name="recoverItem" page="/jsp/trashcan/recover-item.jsp" managed-bean="TrashcanRecoverItemDialog"
                  icon="/images/icons/recover_large.gif" title-id="recover_item"
@@ -678,7 +678,7 @@
          <dialog name="manageTask" page="/jsp/wcm/manage-review-task-dialog.jsp"
                  managed-bean="ManageReviewTaskDialog" 
                  icon="/images/icons/manage_workflow_task_large.gif" 
-                 description-id="manage_task_desc" />
+                 description-id="manage_task_desc" error-message-id="empty_message" />
       </dialogs>
    </config>
    
diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml
index ba7493e030..587ce84c58 100644
--- a/config/alfresco/web-client-config.xml
+++ b/config/alfresco/web-client-config.xml
@@ -75,7 +75,7 @@
          <allow-guest-config>false</allow-guest-config>
          
          <!-- the URL to the client Help file -->
-         <help-url>http://docs.alfresco.com/{version.major}.{version.minor}/topic/com.alfresco.team.doc/topics/guh-wcm-welcome-explorer.html</help-url>
+         <help-url>http://docs.alfresco.com/{version.major}.{version.minor}/topic/com.alfresco.{version.edition}_{version.major}_{version.minor}_0.doc/topics/guh-wcm-welcome-explorer.html</help-url>
          
          <!-- the type of edit link to use, NOTE: inline editable will always take precedence -->
          <!-- can be: http|webdav -->
diff --git a/source/java/org/alfresco/web/action/evaluator/CancelWorkflowEvaluator.java b/source/java/org/alfresco/web/action/evaluator/CancelWorkflowEvaluator.java
index 52067ec6ef..771dc71509 100644
--- a/source/java/org/alfresco/web/action/evaluator/CancelWorkflowEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/CancelWorkflowEvaluator.java
@@ -24,7 +24,6 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.workflow.WorkflowTask;
-import org.alfresco.util.ISO9075;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.repository.Repository;
@@ -58,7 +57,7 @@ public class CancelWorkflowEvaluator extends BaseActionEvaluator
          {
             // find the current username
             User user = Application.getCurrentUser(context);
-            String currentUserName = ISO9075.encode(user.getUserName());
+            String currentUserName = user.getUserName();
    
             // get the username of the initiator
             NodeService nodeSvc = Repository.getServiceRegistry(
diff --git a/source/java/org/alfresco/web/action/evaluator/DiscussionCopyEvaluator.java b/source/java/org/alfresco/web/action/evaluator/DiscussionCopyEvaluator.java
index 5617d5b02e..da9faa26d7 100644
--- a/source/java/org/alfresco/web/action/evaluator/DiscussionCopyEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/DiscussionCopyEvaluator.java
@@ -24,6 +24,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.model.ForumModel;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.repository.Repository;
@@ -66,6 +67,11 @@ public class DiscussionCopyEvaluator extends BaseActionEvaluator
          result = false;
       }
       
+      if (!node.hasPermission(PermissionService.READ)) 
+      { 
+          result = false; 
+      } 
+      
       return result;
    }
 }
diff --git a/source/java/org/alfresco/web/app/servlet/command/TaskCommandProcessor.java b/source/java/org/alfresco/web/app/servlet/command/TaskCommandProcessor.java
index 916d8acfd1..01785096ac 100644
--- a/source/java/org/alfresco/web/app/servlet/command/TaskCommandProcessor.java
+++ b/source/java/org/alfresco/web/app/servlet/command/TaskCommandProcessor.java
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.service.ServiceRegistry;
+import org.alfresco.web.bean.workflow.WorkflowUtil;
 import org.alfresco.web.ui.common.Utils;
 
 /**
@@ -52,7 +53,7 @@ public final class TaskCommandProcessor implements CommandProcessor
    /* (non-Javadoc)
     * @see org.alfresco.web.app.servlet.command.CommandProcessor#validateArguments(javax.servlet.ServletContext, java.lang.String, java.util.Map, java.lang.String[])
     */
-   public boolean validateArguments(ServletContext sc, String command, Map<String, String> args, String[] urlElements)
+   public boolean validateArguments(ServletContext sc, String cmd, Map<String, String> args, String[] urlElements)
    {
        if (urlElements.length == 0)
        {
@@ -63,13 +64,13 @@ public final class TaskCommandProcessor implements CommandProcessor
        {
            transition = urlElements[1];
        }
-       return true;
+       return WorkflowUtil.isTaskEditable(cmd, sc);
    }
    
    /**
     * @see org.alfresco.web.app.servlet.command.CommandProcessor#process(org.alfresco.service.ServiceRegistry, javax.servlet.http.HttpServletRequest, java.lang.String)
     */
-   public void process(ServiceRegistry serviceRegistry, HttpServletRequest request, String command)
+   public void process(ServiceRegistry serviceRegistry, HttpServletRequest request, String commandName)
    {
       Map<String, Object> properties = new HashMap<String, Object>(1, 1.0f);
       // all workflow commands use a "target" Node property as an argument
@@ -78,13 +79,13 @@ public final class TaskCommandProcessor implements CommandProcessor
       {
           properties.put(EndTaskCommand.PROP_TRANSITION, transition);
       }
-      Command cmd = CommandFactory.getInstance().createCommand(command);
+      Command cmd = CommandFactory.getInstance().createCommand(commandName);
       if (cmd == null)
       {
-         throw new AlfrescoRuntimeException("Unregistered workflow command specified: " + command);
+         throw new AlfrescoRuntimeException("Unregistered workflow command specified: " + commandName);
       }
       cmd.execute(serviceRegistry, properties);
-      this.command = command;
+      this.command = commandName;
    }
 
    /**
diff --git a/source/java/org/alfresco/web/app/servlet/command/UIActionCommandProcessor.java b/source/java/org/alfresco/web/app/servlet/command/UIActionCommandProcessor.java
index 7cc346a8dc..b21d4ea52d 100644
--- a/source/java/org/alfresco/web/app/servlet/command/UIActionCommandProcessor.java
+++ b/source/java/org/alfresco/web/app/servlet/command/UIActionCommandProcessor.java
@@ -31,6 +31,7 @@ import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.web.app.AlfrescoNavigationHandler;
 import org.alfresco.web.app.servlet.FacesHelper;
+import org.alfresco.web.bean.workflow.WorkflowUtil;
 import org.alfresco.web.ui.common.Utils;
 
 /**
@@ -48,7 +49,12 @@ import org.alfresco.web.ui.common.Utils;
  */
 public class UIActionCommandProcessor implements ExtCommandProcessor
 {
-   public static final String PARAM_CONTAINER = "container";
+   /**
+     * 
+     */
+    private static final String MANAGE_TASK = "managetask";
+
+public static final String PARAM_CONTAINER = "container";
    
    private ServletContext sc = null;
    private String command = null;
@@ -59,7 +65,7 @@ public class UIActionCommandProcessor implements ExtCommandProcessor
       // add our commands to the command registry
       CommandFactory.getInstance().registerCommand("createwebcontent", CreateWebContentCommand.class);
       CommandFactory.getInstance().registerCommand("editwebcontent", EditWebContentCommand.class);
-      CommandFactory.getInstance().registerCommand("managetask", ManageTaskDialogCommand.class);
+      CommandFactory.getInstance().registerCommand(MANAGE_TASK, ManageTaskDialogCommand.class);
       CommandFactory.getInstance().registerCommand("editcontentprops", EditContentPropertiesCommand.class);
       CommandFactory.getInstance().registerCommand("userprofile", UserProfileDialogCommand.class);
       CommandFactory.getInstance().registerCommand("editspace", EditSpaceCommand.class);
@@ -76,6 +82,11 @@ public class UIActionCommandProcessor implements ExtCommandProcessor
       {
          this.args = new HashMap<String, String>(args);
       }
+      if(MANAGE_TASK.equals(command))
+      {
+          String taskId = args.get(ManageTaskDialogCommand.PROP_TASKID);
+          return WorkflowUtil.isTaskEditable(taskId, sc);
+      }
       return true;
    }
    
diff --git a/source/java/org/alfresco/web/bean/BrowseBean.java b/source/java/org/alfresco/web/bean/BrowseBean.java
index b05304fba7..320640a0a3 100644
--- a/source/java/org/alfresco/web/bean/BrowseBean.java
+++ b/source/java/org/alfresco/web/bean/BrowseBean.java
@@ -664,7 +664,8 @@ public class BrowseBean implements IContextListener, Serializable
          QName currentNodeType = currentNode.getType();
          
          if (SiteModel.TYPE_SITES.isMatch(currentNodeType) ||
-             SiteModel.TYPE_SITE.isMatch(currentNodeType))
+             SiteModel.TYPE_SITE.isMatch(currentNodeType) ||
+             getDictionaryService().isSubClass(currentNodeType, SiteModel.TYPE_SITE))
          {
             siteSpace = true;
          }
diff --git a/source/java/org/alfresco/web/bean/NavigationBean.java b/source/java/org/alfresco/web/bean/NavigationBean.java
index 560648435f..1c7297beda 100644
--- a/source/java/org/alfresco/web/bean/NavigationBean.java
+++ b/source/java/org/alfresco/web/bean/NavigationBean.java
@@ -539,7 +539,7 @@ public class NavigationBean implements Serializable
             do
             {
                value = serverDescriptor.getDescriptor(m.group(1));
-               m.appendReplacement(sb, value != null ? value.toLowerCase() : m.group(1));
+               m.appendReplacement(sb, value != null ? value : m.group(1));
                result = m.find();
             } while (result);
             m.appendTail(sb);
diff --git a/source/java/org/alfresco/web/bean/actions/handlers/CopyHandler.java b/source/java/org/alfresco/web/bean/actions/handlers/CopyHandler.java
index 04b92216ee..205e90cd1e 100644
--- a/source/java/org/alfresco/web/bean/actions/handlers/CopyHandler.java
+++ b/source/java/org/alfresco/web/bean/actions/handlers/CopyHandler.java
@@ -24,11 +24,8 @@ import java.util.Map;
 
 import javax.faces.context.FacesContext;
 
-import org.alfresco.model.ContentModel;
 import org.alfresco.repo.action.executer.CopyActionExecuter;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.namespace.NamespaceService;
-import org.alfresco.service.namespace.QName;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.bean.wizard.IWizardBean;
@@ -54,12 +51,6 @@ public class CopyHandler extends BaseActionHandler
       NodeRef destNodeRef = (NodeRef)actionProps.get(PROP_DESTINATION);
       repoProps.put(CopyActionExecuter.PARAM_DESTINATION_FOLDER, destNodeRef);
       
-      // add the type and name of the association to create when the copy
-      // is performed
-      repoProps.put(CopyActionExecuter.PARAM_ASSOC_TYPE_QNAME, 
-            ContentModel.ASSOC_CONTAINS);
-      repoProps.put(CopyActionExecuter.PARAM_ASSOC_QNAME, 
-            QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "copy"));
    }
 
    public void prepareForEdit(Map<String, Serializable> actionProps,
diff --git a/source/java/org/alfresco/web/bean/actions/handlers/MoveHandler.java b/source/java/org/alfresco/web/bean/actions/handlers/MoveHandler.java
index e3d93b5716..056d493dc1 100644
--- a/source/java/org/alfresco/web/bean/actions/handlers/MoveHandler.java
+++ b/source/java/org/alfresco/web/bean/actions/handlers/MoveHandler.java
@@ -24,11 +24,8 @@ import java.util.Map;
 
 import javax.faces.context.FacesContext;
 
-import org.alfresco.model.ContentModel;
 import org.alfresco.repo.action.executer.MoveActionExecuter;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.namespace.NamespaceService;
-import org.alfresco.service.namespace.QName;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.bean.wizard.IWizardBean;
@@ -53,13 +50,6 @@ public class MoveHandler extends BaseActionHandler
       // add the destination space id to the action properties
       NodeRef destNodeRef = (NodeRef)actionProps.get(PROP_DESTINATION);
       repoProps.put(MoveActionExecuter.PARAM_DESTINATION_FOLDER, destNodeRef);
-      
-      // add the type and name of the association to create when the move
-      // is performed
-      repoProps.put(MoveActionExecuter.PARAM_ASSOC_TYPE_QNAME, 
-            ContentModel.ASSOC_CONTAINS);
-      repoProps.put(MoveActionExecuter.PARAM_ASSOC_QNAME, 
-            QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "move"));
    }
 
    public void prepareForEdit(Map<String, Serializable> actionProps,
diff --git a/source/java/org/alfresco/web/bean/coci/CCCheckinFileDialog.java b/source/java/org/alfresco/web/bean/coci/CCCheckinFileDialog.java
index a96d7288a8..acf4ac2908 100644
--- a/source/java/org/alfresco/web/bean/coci/CCCheckinFileDialog.java
+++ b/source/java/org/alfresco/web/bean/coci/CCCheckinFileDialog.java
@@ -57,4 +57,9 @@ public class CCCheckinFileDialog extends CheckinCheckoutDialog
       return false;
    }
    
+   @Override
+   protected String getErrorOutcome(Throwable exception)
+   {
+      return "dialog:close";
+   }
 }
diff --git a/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java b/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java
index c2e7901ffc..7965fdab17 100644
--- a/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java
+++ b/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java
@@ -529,7 +529,7 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements  Navigatio
                if (this.getNodeService().exists(ref))
                {
                   builder.append("<li>");
-                  builder.append(Utils.encode(Repository.getNameForNode(this.getNodeService(), ref)));
+                  builder.append(Utils.encode(Repository.getNameForCategoryNode(this.getNodeService(), ref)));
                   builder.append("</li>");
                }
             }
diff --git a/source/java/org/alfresco/web/bean/repository/Repository.java b/source/java/org/alfresco/web/bean/repository/Repository.java
index 5ce36f38ff..ac35af1f86 100644
--- a/source/java/org/alfresco/web/bean/repository/Repository.java
+++ b/source/java/org/alfresco/web/bean/repository/Repository.java
@@ -229,6 +229,27 @@ public final class Repository
       return name;
    }
 
+   /** 
+    * Helper to get the display name path for a category node. 
+    * 
+    * @param nodeService 
+    * @param ref the category node ref
+    * @return display name string for the specified category node.
+    */ 
+   public static String getNameForCategoryNode(NodeService nodeService, NodeRef ref) 
+   { 
+      String name = null; 
+       
+      // Check that node reference still exists 
+      if (nodeService.exists(ref) == true) 
+      { 
+          Path path = nodeService.getPath(ref); 
+          name = Repository.getNamePath(nodeService, path, null, "/", null); 
+      } 
+       
+      return name; 
+   } 
+
    /**
     * Escape a QName value so it can be used in lucene search strings
     * 
diff --git a/source/java/org/alfresco/web/bean/trashcan/TrashcanDeleteItemDialog.java b/source/java/org/alfresco/web/bean/trashcan/TrashcanDeleteItemDialog.java
index 04d9041f9f..8b8b000020 100644
--- a/source/java/org/alfresco/web/bean/trashcan/TrashcanDeleteItemDialog.java
+++ b/source/java/org/alfresco/web/bean/trashcan/TrashcanDeleteItemDialog.java
@@ -64,12 +64,16 @@ public class TrashcanDeleteItemDialog extends TrashcanDialog
         return newOutcome;
     }
 
+    @Override
+    protected String getDefaultFinishOutcome()
+    {
+       return "dialog:close[2]";
+    }
+
     @Override
     protected String finishImpl(FacesContext context, String outcome) throws Exception
     {
-        deleteItem(context, outcome);
-        return "dialog:close";
-
+        return deleteItem(context, outcome);
     }
 
     @Override
diff --git a/source/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java b/source/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java
index 4e320a9379..a901d87d07 100644
--- a/source/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java
+++ b/source/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java
@@ -118,14 +118,19 @@ public class TrashcanRecoverItemDialog extends TrashcanDialog
             }
         }
 
-        return "dialog:close";
+        return outcome;
+    }
+    
+    @Override    
+    protected String getDefaultFinishOutcome()
+    {
+       return "dialog:close[2]";
     }
 
     @Override
     protected String finishImpl(FacesContext context, String outcome) throws Exception
     {
         return recoverItem(context, outcome);
-
     }
 
     @Override
diff --git a/source/java/org/alfresco/web/bean/workflow/WorkflowUtil.java b/source/java/org/alfresco/web/bean/workflow/WorkflowUtil.java
index f6437e1e77..5d4e30f69a 100644
--- a/source/java/org/alfresco/web/bean/workflow/WorkflowUtil.java
+++ b/source/java/org/alfresco/web/bean/workflow/WorkflowUtil.java
@@ -24,14 +24,19 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.ServletContext;
+
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ApplicationModel;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.repository.AssociationRef;
 import org.alfresco.service.cmr.repository.CopyService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.workflow.WorkflowService;
+import org.alfresco.service.cmr.workflow.WorkflowTask;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.web.bean.repository.Node;
@@ -265,7 +270,7 @@ public class WorkflowUtil
       
       // TODO: Deal with child associations if and when we need to support
       //       them for workflow tasks, for now warn that they are being used
-      Map childAssocs = node.getAddedChildAssociations();
+      Map<?, ?> childAssocs = node.getAddedChildAssociations();
       if (childAssocs.size() > 0)
       {
          if (logger.isWarnEnabled())
@@ -274,4 +279,17 @@ public class WorkflowUtil
       
       return params;
    }
+   
+   public static boolean isTaskEditable(String taskId, ServletContext sc)
+   {
+       if(taskId ==null|| taskId.isEmpty())
+       {
+           return false;
+       }
+        ServiceRegistry serviceRegistry = Repository.getServiceRegistry(sc);
+        String username = serviceRegistry.getAuthenticationService().getCurrentUserName();
+        WorkflowService workflowService = serviceRegistry.getWorkflowService();
+        WorkflowTask task = workflowService.getTaskById(taskId);
+        return workflowService.isTaskEditable(task, username);
+   }
 }
diff --git a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
index 4d62a7cb88..422a59f441 100644
--- a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
+++ b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
@@ -486,11 +486,11 @@ public class Schema2XForms implements Serializable
                   }
                }
 
-               // Check the nil attribute
-               if (oldEl.getAttributeNS(NamespaceConstants.XMLSCHEMA_INSTANCE_NS, "nil").equals("true"))
+               // Populate the nil attribute. It may be true or false
+               if (proto.hasAttributeNS(NamespaceConstants.XMLSCHEMA_INSTANCE_NS, "nil"))
                {
                   clone.setAttributeNS(NamespaceConstants.XMLSCHEMA_INSTANCE_NS,
-                        NamespaceConstants.XMLSCHEMA_INSTANCE_PREFIX + ":nil", "true");
+                        NamespaceConstants.XMLSCHEMA_INSTANCE_PREFIX + ":nil", String.valueOf(isEmpty));
                }
                
                // Copy over attributes present in the prototype
@@ -2679,8 +2679,23 @@ public class Schema2XForms implements Serializable
       final Map<String, XSAnnotation> enumValues =
          new LinkedHashMap<String, XSAnnotation>(enumFacets.getLength());
       
-      final String nullValue = Application.getMessage(FacesContext.getCurrentInstance(), "please_select");
-      enumValues.put(nullValue, null);
+      String appearance = extractPropertyFromAnnotation(NamespaceService.ALFRESCO_URI,
+                  "appearance",
+                  this.getAnnotation(owner),
+                  resourceBundle);
+      if (appearance == null || appearance.length() == 0)
+      {
+         appearance = enumFacets.getLength() < Schema2XForms.LONG_LIST_SIZE ? "full" : "compact";
+      }
+      
+      // if appearance is "full" a radio button control is used, in this case we don't want the
+      // please select option available
+      if (!"full".equals(appearance))
+      {
+         final String nullValue = Application.getMessage(FacesContext.getCurrentInstance(), "please_select");
+         enumValues.put(nullValue, null);
+      }
+      
       for (int i = 0; i < enumFacets.getLength(); i++)
       {
          enumValues.put(enumFacets.item(i),
@@ -2689,14 +2704,6 @@ public class Schema2XForms implements Serializable
                          : null));
       }
 
-      String appearance = extractPropertyFromAnnotation(NamespaceService.ALFRESCO_URI,
-                                                        "appearance",
-                                                        this.getAnnotation(owner),
-                                                        resourceBundle);
-      if (appearance == null || appearance.length() == 0)
-      {
-         appearance = enumFacets.getLength() < Schema2XForms.LONG_LIST_SIZE ? "full" : "compact";
-      }
       control.setAttributeNS(NamespaceConstants.XFORMS_NS,
                              NamespaceConstants.XFORMS_PREFIX + ":appearance",
                              appearance);
diff --git a/source/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java b/source/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java
index f6f4b425da..d3c574aadb 100644
--- a/source/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java
+++ b/source/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java
@@ -953,7 +953,7 @@ public abstract class BaseAssociationEditor extends UIInput
                
                // get all available groups
                AuthorityService authorityService = Repository.getServiceRegistry(context).getAuthorityService();
-               Set<String> groups = authorityService.getAllAuthorities(AuthorityType.GROUP);
+               Set<String> groups = authorityService.getAllAuthoritiesInZone(AuthorityService.ZONE_APP_DEFAULT, AuthorityType.GROUP);
                this.availableOptions = new ArrayList<NodeRef>(groups.size());
                
                // get the NodeRef for each matching group
diff --git a/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java b/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java
index ed124812c9..b5e61b321b 100644
--- a/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java
+++ b/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java
@@ -526,10 +526,11 @@ public class UIPropertySheet extends UIPanel implements NamingContainer
       // output variable to hold flag for which submit button was pressed
       out.write("var finishButtonPressed = false;\n");
       out.write("var nextButtonPressed = false;\n");
+      out.write("var transitionButtonPressed = false;\n");
       
       // output the validate() function
       out.write("function validate()\n{\n   var result = true;\n   ");
-      out.write("if ((finishButtonPressed || nextButtonPressed) && (");
+      out.write("if ((transitionButtonPressed || finishButtonPressed || nextButtonPressed) && (");
       
       int numberValidations = this.validations.size();
       List<ClientValidation> realTimeValidations = 
@@ -549,7 +550,7 @@ public class UIPropertySheet extends UIPanel implements NamingContainer
       
       // return false if validation failed to stop the form submitting
       out.write(")\n   { result = false; }\n\n");
-      out.write("   finishButtonPressed = false;\n   nextButtonPressed = false;\n");
+      out.write("   finishButtonPressed = false;\n   nextButtonPressed = false;\n   transitionButtonPressed = false;\n");
       out.write("   return result;\n}\n\n");
       
       // output the processButtonState() function (if necessary)
@@ -616,7 +617,18 @@ public class UIPropertySheet extends UIPanel implements NamingContainer
       out.write(getFinishButtonId());
       out.write("').onclick = function() { finishButtonPressed = true; }\n");
       
-      // set the flag when the finish button is clicked
+      // transition buttons on the workflow page also need to handle validation
+      // so look for submit buttons with ":transition_" in the id
+      out.write("   var inputItems = document.getElementsByTagName('input');\n");
+      out.write("   for (i in inputItems)\n");
+      out.write("   {\n");
+      out.write("      if (inputItems[i].type == 'submit' && inputItems[i].id !== undefined && inputItems[i].id.indexOf(':transition_') != -1)\n");
+      out.write("      {\n");
+      out.write("         inputItems[i].onclick = function() { transitionButtonPressed = true; }\n");
+      out.write("      }\n");
+      out.write("   }\n");
+      
+      // set the flag when the next button is clicked
       if (this.nextButtonId != null && this.nextButtonId.length() > 0)
       {
          out.write("   document.getElementById('");
diff --git a/source/java/org/alfresco/web/ui/repo/renderer/BaseMultiValueRenderer.java b/source/java/org/alfresco/web/ui/repo/renderer/BaseMultiValueRenderer.java
index a6632c0fa8..27230927b8 100644
--- a/source/java/org/alfresco/web/ui/repo/renderer/BaseMultiValueRenderer.java
+++ b/source/java/org/alfresco/web/ui/repo/renderer/BaseMultiValueRenderer.java
@@ -28,6 +28,7 @@ import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.convert.Converter;
 
+import org.alfresco.model.ContentModel;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.web.app.Application;
@@ -254,9 +255,18 @@ public abstract class BaseMultiValueRenderer extends BaseRenderer
       }
       out.write("'>");
       
-      if (value instanceof NodeRef)
-      {
-         out.write(Utils.encode(Repository.getNameForNode(nodeService, (NodeRef)value)));
+      if (value instanceof NodeRef) 
+      { 
+          String name; 
+          if (ContentModel.TYPE_CATEGORY.equals(nodeService.getType((NodeRef)value))) 
+          { 
+              name = Repository.getNameForCategoryNode(nodeService, (NodeRef)value); 
+          } 
+          else 
+          { 
+              name = Repository.getNameForNode(nodeService, (NodeRef)value); 
+          } 
+          out.write(Utils.encode(name)); 
       }
       else if (value instanceof Date)
       {
diff --git a/source/web/cmisfs/browser/browser.css b/source/web/cmisfs/browser/browser.css
index 07a1916919..cec87f7da6 100644
--- a/source/web/cmisfs/browser/browser.css
+++ b/source/web/cmisfs/browser/browser.css
@@ -33,7 +33,7 @@ a:hover {
 }
 
 a:active {
-	color: a40000;
+	color: #a40000;
 	text-decoration: underline;
 }
 
diff --git a/source/web/css/main.css b/source/web/css/main.css
index e5091b60e3..99196a3a64 100644
--- a/source/web/css/main.css
+++ b/source/web/css/main.css
@@ -209,7 +209,7 @@ a.headbarLink
    margin-top: 5px;
    margin-bottom: 5px;
    background: #dfe6ed;
-   vertical-align: center;
+   vertical-align: middle;
    padding-left: 6px;
 }
 
@@ -332,7 +332,7 @@ input,textarea,select
 
 a.topToolbarLink, a.topToolbarLink:link, a.topToolbarLink:visited
 {
-   color: 004488;
+   color: #004488;
    font-weight: normal;
    font-size: 12px;
 }
diff --git a/source/web/css/xforms.css b/source/web/css/xforms.css
index bd47794c9b..a3da91aeac 100644
--- a/source/web/css/xforms.css
+++ b/source/web/css/xforms.css
@@ -98,6 +98,7 @@
 .xformsTextArea
 {
 	height: 200px;
+	width: 100%;
 }
 
 .xformsRichTextEditorHoverLayer
diff --git a/source/web/images/icons/recover_all.gif b/source/web/images/icons/recover_all.gif
new file mode 100644
index 0000000000..29c35e8a24
Binary files /dev/null and b/source/web/images/icons/recover_all.gif differ
diff --git a/source/web/jsp/dialog/container.jsp b/source/web/jsp/dialog/container.jsp
index d5304e2de2..0f98974376 100644
--- a/source/web/jsp/dialog/container.jsp
+++ b/source/web/jsp/dialog/container.jsp
@@ -186,7 +186,7 @@ if (Application.getDialogManager().getState() == null)
                         <tr>
                            <td width="100%" valign="top">
                            
-                              <a:errors message="#{DialogManager.errorMessage}" styleClass="errorMessage" />
+                              <a:errors message="#{DialogManager.errorMessage}" infoClass="statusWarningText" errorClass="statusErrorText" styleClass="errorMessage"  />
                               
                               <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
                               <f:subview id="dialog-body">
diff --git a/source/web/jsp/ml/add-translation-without-content.jsp b/source/web/jsp/ml/add-translation-without-content.jsp
index 95302949ee..131d064b87 100644
--- a/source/web/jsp/ml/add-translation-without-content.jsp
+++ b/source/web/jsp/ml/add-translation-without-content.jsp
@@ -27,11 +27,11 @@
 
 <h:panelGrid columns="3" cellpadding="3" cellspacing="3" border="0">
 
-   <h:graphicImage/>
+   <h:outputText/>
    <h:outputText value="#{msg.title}:"/>
    <h:inputText id="title" value="#{DialogManager.bean.title}"  maxlength="1024" size="35" immediate="false"/>
 
-   <h:graphicImage/>
+   <h:outputText/>
    <h:outputText value="#{msg.description}:"/>
    <h:inputTextarea id="description" value="#{DialogManager.bean.description}" cols="35" rows="5" immediate="false"/>
 
diff --git a/source/web/jsp/trashcan/item-details.jsp b/source/web/jsp/trashcan/item-details.jsp
index f2add47edd..ee06c9e7b6 100644
--- a/source/web/jsp/trashcan/item-details.jsp
+++ b/source/web/jsp/trashcan/item-details.jsp
@@ -22,20 +22,31 @@
 <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
+<f:verbatim><div style="padding:4px"></f:verbatim>
 <h:outputText value="#{msg.original_location}: " styleClass="mainSubTitle" />
 <r:nodePath value="#{TrashcanDialogProperty.item.properties.locationPath}" breadcrumb="true" actionListener="#{BrowseBean.clickSpacePath}" showLeaf="true" />
-<f:verbatim><div style="padding:4px"></div></f:verbatim>
+<f:verbatim></div></f:verbatim>
 
+<f:verbatim>
+   <table cellspacing="0" cellpadding="3" border="0" width="100%">
+      <tr>
+         <td width="100%" valign="top">
+         </f:verbatim>
 <a:panel label="#{msg.view_links}" id="link-panel" progressive="true"
 border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white">
-<f:verbatim><table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
+            <f:verbatim>
+            <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
 <tr>
 <td>
-</f:verbatim><a:actionLink value="#{msg.view_in_browser}" href="#{TrashcanItemDetailsDialog.itemBrowserUrl}" target="new" id="link1" rendered="#{TrashcanDialogProperty.item.properties.isFolder == false}" />
-<f:verbatim></td>
+            </f:verbatim>
+                     <a:actionLink value="#{msg.view_in_browser}" href="#{TrashcanItemDetailsDialog.itemBrowserUrl}" target="new" id="link1" rendered="#{TrashcanDialogProperty.item.properties.isFolder == false}" />
+            <f:verbatim>
+                  </td>
 <td>
-</f:verbatim><a:actionLink value="#{msg.download_content}" href="#{TrashcanItemDetailsDialog.itemDownloadUrl}" target="new" id="link2" rendered="#{TrashcanDialogProperty.item.properties.isFolder == false}" />
-<f:verbatim></td>
+            </f:verbatim>
+                     <a:actionLink value="#{msg.download_content}" href="#{TrashcanItemDetailsDialog.itemDownloadUrl}" target="new" id="link2" rendered="#{TrashcanDialogProperty.item.properties.isFolder == false}" />
+            <f:verbatim>
+                  </td>
 <td>
 <a href='</f:verbatim><a:outputText value="#{TrashcanItemDetailsDialog.itemNodeRefUrl}" id="out1" /><f:verbatim>' onclick="return false;"></f:verbatim><a:outputText value="#{msg.noderef_link}" id="out4" /><f:verbatim></a>
 </td>
@@ -45,35 +56,37 @@ border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted"
 </a:panel>
 
 <f:verbatim><div style="padding:4px"></div></f:verbatim>
+            
 <a:panel label="#{msg.properties}" id="properties-panel" progressive="true"
 border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white">
-
 <f:verbatim>
 <table cellspacing="0" cellpadding="0" border="0" width="100%">
 <tr>
-<td width=80 align=center>
+                  <td width="80" align="center">
 <%-- icon image for the object --%>
-<table cellspacing=0 cellpadding=0 border=0>
+                     <table cellspacing="0" cellpadding="0" border="0">
 <tr>
 <td>
 <div style="border: thin solid #CCCCCC; padding:4px">
-</f:verbatim><a:actionLink id="logo-content" value="#{TrashcanDialogProperty.item.name}" href="#{TrashcanItemDetailsDialog.itemDownloadUrl}" target="new" rendered="#{TrashcanDialogProperty.item.properties.isFolder == false}"
+            </f:verbatim>
+                                 <a:actionLink id="logo-content" value="#{TrashcanDialogProperty.item.name}" href="#{TrashcanItemDetailsDialog.itemDownloadUrl}" target="new" rendered="#{TrashcanDialogProperty.item.properties.isFolder == false}"
 image="#{TrashcanDialogProperty.item.properties.icon}" showLink="false" />
 <a:actionLink id="logo-folder" value="#{TrashcanDialogProperty.item.name}" rendered="#{TrashcanDialogProperty.item.properties.isFolder == true}"
 image="#{TrashcanDialogProperty.item.properties.icon}" showLink="false" />
 <f:verbatim>
 </div>
 </td>
-<td><img src="<%=request.getContextPath()%>/images/parts/rightSideShadow42.gif" width=6 height=42></td>
+                           <td><img src="<%=request.getContextPath()%>/images/parts/rightSideShadow42.gif" width="6" height="42"></td>
 </tr>
 <tr>
-<td colspan=2><img src="<%=request.getContextPath()%>/images/parts/bottomShadow42.gif" width=48 height=5></td>
+                           <td colspan="2"><img src="<%=request.getContextPath()%>/images/parts/bottomShadow42.gif" width="48" height="5"></td>
 </tr>
 </table>
 </td>
 <td>
 <%-- properties for the item --%>
-</f:verbatim><r:propertySheetGrid id="item-props" value="#{TrashcanDialogProperty.item}" var="itemProps"
+            </f:verbatim>
+                  <r:propertySheetGrid id="item-props" value="#{TrashcanDialogProperty.item}" var="itemProps"
 columns="1" mode="view" labelStyleClass="propertiesLabel" externalConfig="true" />
 <h:messages globalOnly="true" id="props-msgs" styleClass="errorMessage" layout="table" />
 <h:message for="item-props" styleClass="statusMessage" />
@@ -81,9 +94,19 @@ columns="1" mode="view" labelStyleClass="propertiesLabel" externalConfig="true"
 </td>
 </tr>
 </table>
-
 </f:verbatim>
 </a:panel>
-
-
+         <f:verbatim>
+         </td>
+         <td valign="top">
+         </f:verbatim>
+         <%-- Document Actions --%>
+         <a:panel label="#{msg.actions}" id="actions-panel" border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" style="text-align:center" progressive="true" expanded="true">
+            <r:actions id="actions_doc" value="deleteditem_actions" context="#{DialogManager.bean.item}" verticalSpacing="3" style="white-space:nowrap" />
+         </a:panel>
+         <f:verbatim>
+         </td>
+      </tr>
+   </table>
+</f:verbatim>
 
diff --git a/source/web/jsp/wcm/create-website-wizard/form-details.jsp b/source/web/jsp/wcm/create-website-wizard/form-details.jsp
index 6a4dfa6ca7..ae1e2b4e0e 100644
--- a/source/web/jsp/wcm/create-website-wizard/form-details.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/form-details.jsp
@@ -43,7 +43,7 @@
       var additionalConditionInput = document.getElementById('dialog:dialog-body:title');
       var description = document.getElementById("dialog:dialog-body:description");
       validateOutputPathPattern(disabledElement, outputPathInput, additionalConditionInput);
-      disabledElement.disabled = (disabledElement.disabled || description.value.length > 1024 || !validateName(name, "", false));
+      disabledElement.disabled = (disabledElement.disabled || description.value.length > 1024 || !validateName(additionalConditionInput, "", false));
    }
 </script>
 </f:verbatim>
diff --git a/source/web/jsp/wcm/file-details.jsp b/source/web/jsp/wcm/file-details.jsp
index 083fd239ca..9140610505 100644
--- a/source/web/jsp/wcm/file-details.jsp
+++ b/source/web/jsp/wcm/file-details.jsp
@@ -115,7 +115,7 @@
                <a:actionLink id="view-link" value="#{msg.view}" href="#{r.url}" target="new" image="#{r.fileType16}" style="padding-right:8px" />
                
                <r:permissionEvaluator id="eval2" value="#{DialogManager.bean.avmNode}" allow="Write">
-                  <r:actionInstanceEvaluator id="acEv1" value="#{DialogManager.bean.avmNode}" evaluatorClassName="org.alfresco.web.action.evaluator.WCMWorkflowEvaluator">
+                  <r:actionInstanceEvaluator id="acEv2" value="#{DialogManager.bean.avmNode}" evaluatorClassName="org.alfresco.web.action.evaluator.WCMWorkflowEvaluator">
                      <a:actionLink id="revert-link" value="#{msg.revert}" actionListener="#{DialogManager.bean.revertNode}" action="dialog:close" image="/images/icons/revert.gif">
                         <f:param name="version" value="#{r.strVersion}" />
                      </a:actionLink>
diff --git a/source/web/scripts/ajax/deployment.js b/source/web/scripts/ajax/deployment.js
index d8091ffe4a..ce65b3c3fe 100644
--- a/source/web/scripts/ajax/deployment.js
+++ b/source/web/scripts/ajax/deployment.js
@@ -120,8 +120,6 @@ Alfresco.checkDeployConfigButtonState = function()
    var port = document.getElementById('wizard:wizard-body:deployServerPort');
    var button = document.getElementById('wizard:wizard-body:deployActionButton');
    
-   console.log(button);
-   
    if (button != null)
    {
 	  var buttonState = false;
diff --git a/source/web/scripts/ajax/doclist.js b/source/web/scripts/ajax/doclist.js
index ec5e09774a..0291bbbba5 100644
--- a/source/web/scripts/ajax/doclist.js
+++ b/source/web/scripts/ajax/doclist.js
@@ -4,7 +4,7 @@ var MyDocs = {
    ANIM_LENGTH: 300,
    DETAIL_MARGIN: 8,
    TITLE_FONT_SIZE: 18,
-   RESOURCE_PANEL_HEIGHT: 150,
+   RESOURCE_PANEL_HEIGHT: 180,
    OVERLAY_OPACITY: 0.8,
    ServiceContext: null,
    Filter: null,
diff --git a/source/web/scripts/ajax/myspaces.js b/source/web/scripts/ajax/myspaces.js
index b2291742f2..6fd1bf467c 100644
--- a/source/web/scripts/ajax/myspaces.js
+++ b/source/web/scripts/ajax/myspaces.js
@@ -4,7 +4,7 @@ var MySpaces = {
    ANIM_LENGTH: 300,
    DETAIL_MARGIN: 56,
    TITLE_FONT_SIZE: 18,
-   RESOURCE_PANEL_HEIGHT: 150,
+   RESOURCE_PANEL_HEIGHT: 180,
    OVERLAY_OPACITY: 0.8,
    fileInput: null,
    Path: null,
diff --git a/source/web/scripts/ajax/xforms.js b/source/web/scripts/ajax/xforms.js
index 1912f86be0..567479d70c 100644
--- a/source/web/scripts/ajax/xforms.js
+++ b/source/web/scripts/ajax/xforms.js
@@ -121,15 +121,16 @@ alfresco.xforms.Widget = new Class({
   /** Sets the widget's modified state, as indicated by an XFormsEvent. */
   setModified: function(b)
   {
-    if (this._modified != b)
-    {
       this._modified = b;
       this._updateDisplay(false);
       if (this.isValidForSubmit())
       {
         this.hideAlert();
       }
-    }
+      else
+      {
+        this.showAlert();
+      }
   },
 
   /** Sets the widget's valid state, as indicated by an XFormsEvent */
@@ -281,13 +282,21 @@ alfresco.xforms.Widget = new Class({
   /** Commits the changed value to the server */
   _commitValueChange: function(value)
   {
-    if (this._compositeParent)
+    if (this.isRequired() && this.domNode.type == "select-one" && this.domNode.selectedIndex == 0) 
+    { 
+      this.xform.setXFormsValue(this.id, null); 
+      this.setValue(null);
+    } 
+    else 
     {
-      this._compositeParent._commitValueChange(value);
-    }
-    else
-    {
-      this.xform.setXFormsValue(this.id, value || this.getValue());
+      if (this._compositeParent)
+      {
+        this._compositeParent._commitValueChange(value);
+      }
+      else
+      {
+        this.xform.setXFormsValue(this.id, value || this.getValue());
+      }
     }
   },
 
@@ -813,7 +822,7 @@ alfresco.xforms.NumericalRange = alfresco.xforms.Widget.extend({
                                       this.currentValueDiv.firstChild);
     if (!this.widget._isDragInProgress)
     {
-      this._commitValueChange();
+      this._commitValueChange(value);
     }
   }
 });
@@ -977,6 +986,8 @@ alfresco.xforms.RichTextEditor = alfresco.xforms.Widget.extend({
     this.widget.style.border = "2px inset #f0f0f0";
     this.widget.style.marginRight = "2px";
     this.widget.style.overflow = "auto";
+    this.widget.style.position = "absolute";
+   
     this._oldValue = this.getInitialValue() || "";
     this.widget.innerHTML = this._oldValue;
     this.widget.id = this.id+'-editorWidget';
@@ -1196,8 +1207,8 @@ alfresco.xforms.RichTextEditor = alfresco.xforms.Widget.extend({
   {
     alfresco.xforms.RichTextEditor.clickMask.style.display='none'
     document.body.appendChild(alfresco.xforms.RichTextEditor.clickMask);
-    if (alfresco.xforms.RichTextEditor.currentInstance &&
-        alfresco.xforms.RichTextEditor.currentInstance != this)
+    if (alfresco.xforms.RichTextEditor.currentInstance && document.getElementById(alfresco.xforms.RichTextEditor.currentInstance.domNode.id)
+        && alfresco.xforms.RichTextEditor.currentInstance != this)
     {
         alfresco.xforms.RichTextEditor.currentInstance._removeTinyMCE();
     }
@@ -3524,9 +3535,6 @@ alfresco.xforms.Repeat = alfresco.xforms.VGroup.extend({
     var toChild = this.getChildAt(toIndex);
     this.xform.swapRepeatItems(fromChild, toChild);
     
-    // set tinymce current instance to null
-    alfresco.xforms.RichTextEditor.currentInstance = null;
-    
     var anim = dojo.lfx.html.fadeOut(fromChild.domContainer, 500);
     anim.onEnd = function()
       {
@@ -3775,9 +3783,6 @@ alfresco.xforms.Repeat = alfresco.xforms.VGroup.extend({
       event.stopPropagation();
       if (this.isInsertRepeatItemEnabled())
       {
-        // set tinymce current instance to null
-        alfresco.xforms.RichTextEditor.currentInstance = null;
-        
         this.setFocusedChild(null);
         var trigger = this._getRepeatItemTrigger("insert", { position: "before" });
         trigger.fire();
@@ -3795,9 +3800,6 @@ alfresco.xforms.Repeat = alfresco.xforms.VGroup.extend({
     event.stopPropagation();
     if (this.isRemoveRepeatItemEnabled())
     {
-      // set tinymce current instance to null
-      alfresco.xforms.RichTextEditor.currentInstance = null;
-
       var index = this._repeatControls.indexOf(event.target.parentNode);
       var repeatItem = this.getChildAt(index);
       this.setFocusedChild(repeatItem);
@@ -4487,12 +4489,11 @@ alfresco.xforms.XForm = new Class({
       case "chiba-state-changed":
       {
         alfresco.log("handleStateChanged(" + xfe.targetId + ")");
-        var isModified = false;
         
         if ("valid" in xfe.properties)
         {
           xfe.getTarget().setValid(xfe.properties["valid"] == "true");
-          isModified= true;
+          xfe.getTarget().setModified(true);
         }
         if ("required" in xfe.properties)
         {
@@ -4510,9 +4511,8 @@ alfresco.xforms.XForm = new Class({
         {
           alfresco.log("setting " + xfe.getTarget().id + " = " + xfe.properties["value"]);
           xfe.getTarget().setValue(xfe.properties["value"]);
-          isModified= true;
+          xfe.getTarget().setModified(true);
         }
-        xfe.getTarget().setModified(isModified);
         break;
       }
       case "chiba-prototype-cloned":