diff --git a/config/alfresco/messages/action-config_ja.properties b/config/alfresco/messages/action-config_ja.properties
index 7d14f541aa..65a726d39a 100755
--- a/config/alfresco/messages/action-config_ja.properties
+++ b/config/alfresco/messages/action-config_ja.properties
@@ -28,9 +28,9 @@ in-category.title=\u30ab\u30c6\u30b4\u30ea\u304c\u3042\u308b
 in-category.description=\u30eb\u30fc\u30eb\u306f\u3001\u6307\u5b9a\u3055\u308c\u305f\u30ab\u30c6\u30b4\u30ea\u5024\u3092\u6301\u3064\u3059\u3079\u3066\u306e\u30a2\u30a4\u30c6\u30e0\u306b\u9069\u7528\u3055\u308c\u307e\u3059\u3002
 in-category.category-aspect.display-label=\u30ab\u30c6\u30b4\u30ea\u306e\u30a2\u30b9\u30da\u30af\u30c8
 in-category.category-value.display-label=\u30ab\u30c6\u30b4\u30ea\u306e\u5024
-	
+
 is-subtype.title=\u30b3\u30f3\u30c6\u30f3\u30c4\u306e\u30bf\u30a4\u30d7\u307e\u305f\u306f\u30b5\u30d6\u30bf\u30a4\u30d7
-is-subtype.description=\u30eb\u30fc\u30eb\u306f\u3001\u6307\u5b9a\u3055\u308c\u305f\u30bf\u30a4\u30d7\u307e\u305f\u306f\u305d\u306e\u30b5\u30d6\u30bf\u30a4\u30d7\u3067\u3042\u308b\u3059\u3079\u3066\u306e\u30a2\u30a4\u30c6\u30e0\u306b\u9069\u7528\u3055\u308c\u307e\u3059\u3002 
+is-subtype.description=\u30eb\u30fc\u30eb\u306f\u3001\u6307\u5b9a\u3055\u308c\u305f\u30bf\u30a4\u30d7\u307e\u305f\u306f\u305d\u306e\u30b5\u30d6\u30bf\u30a4\u30d7\u3067\u3042\u308b\u3059\u3079\u3066\u306e\u30a2\u30a4\u30c6\u30e0\u306b\u9069\u7528\u3055\u308c\u307e\u3059\u3002
 is-subtype.type.display-label=\u30bf\u30a4\u30d7
 
 has-aspect.title=\u30a2\u30b9\u30da\u30af\u30c8\u3092\u6301\u3064
@@ -43,7 +43,7 @@ compare-mime-type.property.display-label=\u30d7\u30ed\u30d1\u30c6\u30a3
 compare-mime-type.value.display-label=MIME\u30bf\u30a4\u30d7
 
 composite-condition.title=\u5408\u6210\u6761\u4ef6
-composite-condition.description=\u8907\u6570\u306e\u6761\u4ef6\u3092\u7d44\u307f\u5408\u308f\u305b\u3066\u3088\u308a\u8907\u96d1\u306a1\u3064\u306e\u6761\u4ef6\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002 
+composite-condition.description=\u8907\u6570\u306e\u6761\u4ef6\u3092\u7d44\u307f\u5408\u308f\u305b\u3066\u3088\u308a\u8907\u96d1\u306a1\u3064\u306e\u6761\u4ef6\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002
 
 compare-date-property.title=\u65e5\u4ed8\u5024\u3092\u6301\u3064\u30d7\u30ed\u30d1\u30c6\u30a3
 compare-date-property.description=\u30e1\u30bf\u30c7\u30fc\u30bf\u3001\u30a2\u30b9\u30da\u30af\u30c8\u3001\u307e\u305f\u306f\u30bf\u30a4\u30d7\u306e\u65e5\u4ed8\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u6bd4\u8f03\u3057\u307e\u3059\u3002
@@ -64,11 +64,11 @@ add-features.title=\u30a2\u30b9\u30da\u30af\u30c8\u3092\u8ffd\u52a0\u3059\u308b
 add-features.description=\u3053\u308c\u306b\u3088\u308a\u3001\u30a2\u30b9\u30da\u30af\u30c8\u304c\u30de\u30c3\u30c1\u3057\u305f\u30a2\u30a4\u30c6\u30e0\u306b\u8ffd\u52a0\u3055\u308c\u307e\u3059\u3002
 add-features.aspect-name.display-label=\u30a2\u30b9\u30da\u30af\u30c8
 
-remove-features.title=\u30a2\u30b9\u30da\u30af\u30c8\u3092\u53d6\u308a\u9664\u304f 
+remove-features.title=\u30a2\u30b9\u30da\u30af\u30c8\u3092\u53d6\u308a\u9664\u304f
 remove-features.description=\u3053\u308c\u306b\u3088\u308a\u3001\u30a2\u30b9\u30da\u30af\u30c8\u304c\u30de\u30c3\u30c1\u3057\u305f\u30a2\u30a4\u30c6\u30e0\u304b\u3089\u53d6\u308a\u9664\u304b\u308c\u307e\u3059\u3002
 remove-features.aspect-name.display-label=\u30a2\u30b9\u30da\u30af\u30c8
 
-simple-workflow.title=\u7c21\u6613\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u3092\u8ffd\u52a0\u3059\u308b 
+simple-workflow.title=\u7c21\u6613\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u3092\u8ffd\u52a0\u3059\u308b
 simple-workflow.description=\u3053\u308c\u306b\u3088\u308a\u3001\u7c21\u6613\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u304c\u30de\u30c3\u30c1\u3057\u305f\u30a2\u30a4\u30c6\u30e0\u306b\u8ffd\u52a0\u3055\u308c\u307e\u3059\u3002  \u3053\u308c\u306b\u3088\u308a\u3001\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306e\u6b21\u306e\u30b9\u30c6\u30c3\u30d7\u306b\u3064\u3044\u3066\u3001\u7570\u306a\u308b\u30b9\u30da\u30fc\u30b9\u306b\u30a2\u30a4\u30c6\u30e0\u3092\u79fb\u52d5\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002  \u307e\u305f\u3001\u5374\u4e0b\u30b9\u30c6\u30c3\u30d7\u304c\u5fc5\u8981\u306a\u5834\u5408\u306f\u3001\u79fb\u52d5\u5148\u306e\u30b9\u30da\u30fc\u30b9\u3092\u63d0\u4f9b\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002
 simple-workflow.approve-step.display-label=\u627f\u8a8d\u30b9\u30c6\u30c3\u30d7
 simple-workflow.approve-folder.display-label=\u627f\u8a8d\u30b9\u30c6\u30c3\u30d7\u30d5\u30a9\u30eb\u30c0
@@ -76,13 +76,13 @@ simple-workflow.approve-move.display-label=\u79fb\u52d5\u3092\u627f\u8a8d\u3059\
 simple-workflow.reject-step.display-label=\u5374\u4e0b\u30b9\u30c6\u30c3\u30d7
 simple-workflow.reject-folder.display-label=\u5374\u4e0b\u30b9\u30c6\u30c3\u30d7\u30d5\u30a9\u30eb\u30c0
 simple-workflow.reject-move.display-label=\u79fb\u52d5\u3092\u5374\u4e0b\u3059\u308b
-            
+
 link-category.title=\u30ab\u30c6\u30b4\u30ea\u306b\u30ea\u30f3\u30af\u3059\u308b
 link-category.description=\u3053\u308c\u306b\u3088\u308a\u3001\u30de\u30c3\u30c1\u3057\u305f\u30a2\u30a4\u30c6\u30e0\u306b\u30ab\u30c6\u30b4\u30ea\u304c\u9069\u7528\u3055\u308c\u307e\u3059\u3002
 link-category.category-aspect.display-label=\u30ab\u30c6\u30b4\u30ea\u306e\u30a2\u30b9\u30da\u30af\u30c8
 link-category.category-value.display-label=\u30ab\u30c6\u30b4\u30ea\u306e\u5024
 
-transform.title=\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u5909\u63db\u304a\u3088\u3073\u30b3\u30d4\u30fc\u3059\u308b 
+transform.title=\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u5909\u63db\u304a\u3088\u3073\u30b3\u30d4\u30fc\u3059\u308b
 transform.description=\u3053\u308c\u306b\u3088\u308a\u3001\u30de\u30c3\u30c1\u3057\u305f\u30b3\u30f3\u30c6\u30f3\u30c4\u304c\u5909\u63db\u3055\u308c\u3001\u7279\u5b9a\u306e\u30b9\u30da\u30fc\u30b9\u306b\u7d50\u679c\u304c\u30b3\u30d4\u30fc\u3055\u308c\u307e\u3059\u3002
 transform.mime-type.display-label=MIME\u30bf\u30a4\u30d7
 transform.destination-folder.display-label=\u5b9b\u5148\u30d5\u30a9\u30eb\u30c0
@@ -90,7 +90,7 @@ transform.assoc-type.display-label=\u95a2\u9023\u30bf\u30a4\u30d7
 transform.assoc-name.display-label=\u95a2\u9023\u540d
 transform.overwrite-copy.display-label=\u30b3\u30d4\u30fc\u306b\u4e0a\u66f8\u304d\u3059\u308b
 
-transform-image.title=\u753b\u50cf\u3092\u5909\u63db\u304a\u3088\u3073\u30b3\u30d4\u30fc\u3059\u308b 
+transform-image.title=\u753b\u50cf\u3092\u5909\u63db\u304a\u3088\u3073\u30b3\u30d4\u30fc\u3059\u308b
 transform-image.description=\u3053\u308c\u306b\u3088\u308a\u3001\u30de\u30c3\u30c1\u3057\u305f\u753b\u50cf\u304c\u5909\u63db\u3055\u308c\u3001\u7279\u5b9a\u306e\u30b9\u30da\u30fc\u30b9\u306b\u7d50\u679c\u304c\u30b3\u30d4\u30fc\u3055\u308c\u307e\u3059\u3002
 transform-image.mime-type.display-label=MIME\u30bf\u30a4\u30d7
 transform-image.destination-folder.display-label=\u5b9b\u5148\u30d5\u30a9\u30eb\u30c0
@@ -99,7 +99,7 @@ transform-image.assoc-name.display-label=\u95a2\u9023\u540d
 transform-image.overwrite-copy.display-label=\u30b3\u30d4\u30fc\u306b\u4e0a\u66f8\u304d\u3059\u308b
 transform-image.convert-command.display-label=\u5909\u63db\u30b3\u30de\u30f3\u30c9
 
-copy.title=\u30b3\u30d4\u30fc 
+copy.title=\u30b3\u30d4\u30fc
 copy.description=\u3053\u308c\u306b\u3088\u308a\u3001\u30de\u30c3\u30c1\u3057\u305f\u30a2\u30a4\u30c6\u30e0\u304c\u5225\u306e\u30b9\u30da\u30fc\u30b9\u306b\u30b3\u30d4\u30fc\u3055\u308c\u307e\u3059\u3002
 copy.destination-folder.display-label=\u5b9b\u5148\u30d5\u30a9\u30eb\u30c0
 copy.assoc-type.display-label=\u95a2\u9023\u30bf\u30a4\u30d7
@@ -124,18 +124,18 @@ mail.template.display-label=E\u30e1\u30fc\u30eb\u30c6\u30f3\u30d7\u30ec\u30fc\u3
 mail.template_model.display-label=E\u30e1\u30fc\u30eb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u8ffd\u52a0\u306e\u30d1\u30e9\u30e1\u30fc\u30bf
 mail.ignore_send_failure.display-label=\u9001\u4fe1\u30a8\u30e9\u30fc\u3092\u7121\u8996\u3059\u308b
 
-check-in.title=\u30c1\u30a7\u30c3\u30af\u30a4\u30f3 
+check-in.title=\u30c1\u30a7\u30c3\u30af\u30a4\u30f3
 check-in.description=\u3053\u308c\u306b\u3088\u308a\u3001\u30de\u30c3\u30c1\u3057\u305f\u30b3\u30f3\u30c6\u30f3\u30c4\u304c\u30c1\u30a7\u30c3\u30af\u30a4\u30f3\u3055\u308c\u307e\u3059\u3002
 check-in.description.display-label=\u8aac\u660e
 check-in.minorChange.display-label=\u5c0f\u3055\u306a\u5909\u66f4
 
-check-out.title=\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8 
+check-out.title=\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8
 check-out.description=\u3053\u308c\u306b\u3088\u308a\u3001\u30de\u30c3\u30c1\u3057\u305f\u30b3\u30f3\u30c6\u30f3\u30c4\u304c\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3055\u308c\u307e\u3059\u3002
 check-out.destination-folder.display-label=\u5b9b\u5148\u30d5\u30a9\u30eb\u30c0
 check-out.assoc-type.display-label=\u95a2\u9023\u30bf\u30a4\u30d7
 check-out.assoc-name.display-label=\u95a2\u9023\u540d
 
-take-ownership.title=\u6240\u6709\u6a29\u306e\u7372\u5f97 
+take-ownership.title=\u6240\u6709\u6a29\u306e\u7372\u5f97
 take-ownership.description=\u4e00\u81f4\u3059\u308b\u30b3\u30f3\u30c6\u30f3\u30c4\u306e\u6240\u6709\u6a29\u3092\u7372\u5f97\u3057\u307e\u3059\u3002
 
 set-property-value.title=\u30d7\u30ed\u30d1\u30c6\u30a3\u5024\u3092\u8a2d\u5b9a\u3059\u308b
@@ -148,14 +148,14 @@ import.description=Alfresco\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u30d1\u30c3\u30b
 import.encoding.display-label=\u7b26\u53f7\u5316
 import.destination.display-label=\u5b9b\u5148
 
-extract-metadata.title=\u5171\u901a\u306e\u30e1\u30bf\u30c7\u30fc\u30bf\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u62bd\u51fa\u3059\u308b 
+extract-metadata.title=\u5171\u901a\u306e\u30e1\u30bf\u30c7\u30fc\u30bf\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u62bd\u51fa\u3059\u308b
 extract-metadata.description=\u5171\u901a\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u30bf\u30a4\u30d7\u304b\u3089\u30bf\u30a4\u30c8\u30eb\u3001\u4f5c\u6210\u8005\u3001\u304a\u3088\u3073\u8aac\u660e\u306e\u30e1\u30bf\u30c7\u30fc\u30bf\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u30a4\u30f3\u30dd\u30fc\u30c8\u3057\u307e\u3059\u3002
 
 embed-metadata.title=\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u30e1\u30bf\u30c7\u30fc\u30bf\u3068\u3057\u3066\u30b3\u30f3\u30c6\u30f3\u30c4\u306b\u57cb\u3081\u8fbc\u3080
 embed-metadata.description=\u30b3\u30f3\u30c6\u30f3\u30c4\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u30d5\u30a1\u30a4\u30eb\u81ea\u4f53\u306b\u30e1\u30bf\u30c7\u30fc\u30bf\u3068\u3057\u3066\u57cb\u3081\u8fbc\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u3059
 
 specialise-type.title=\u30bf\u30a4\u30d7\u3092\u7279\u6b8a\u5316\u3059\u308b
-specialise-type.description=\u3053\u308c\u306b\u3088\u308a\u3001\u30de\u30c3\u30c1\u3057\u305f\u30a2\u30a4\u30c6\u30e0\u304c\u7279\u5b9a\u306e\u30bf\u30a4\u30d7\u3078\u3068\u7279\u6b8a\u5316\u3055\u308c\u307e\u3059\u3002 
+specialise-type.description=\u3053\u308c\u306b\u3088\u308a\u3001\u30de\u30c3\u30c1\u3057\u305f\u30a2\u30a4\u30c6\u30e0\u304c\u7279\u5b9a\u306e\u30bf\u30a4\u30d7\u3078\u3068\u7279\u6b8a\u5316\u3055\u308c\u307e\u3059\u3002
 specialise-type.type-name.display-label=\u30bf\u30a4\u30d7
 
 export.title=\u30b9\u30da\u30fc\u30b9\u3092\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u3059\u308b
diff --git a/config/alfresco/messages/activiti-engine-messages_ja.properties b/config/alfresco/messages/activiti-engine-messages_ja.properties
index 6e30a2282f..ec311afa01 100755
--- a/config/alfresco/messages/activiti-engine-messages_ja.properties
+++ b/config/alfresco/messages/activiti-engine-messages_ja.properties
@@ -1,6 +1,6 @@
 activiti.engine.mandatory.properties.missing=\u5fc5\u9808\u306e\u30bf\u30b9\u30af\u30d7\u30ed\u30d1\u30c6\u30a3\u304c\u5165\u529b\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002 {0}
 activiti.engine.deploy.workflow.error=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u5b9a\u7fa9\u3092\u30c7\u30d7\u30ed\u30a4\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-activiti.engine.is.workflow.deployed.error=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u5b9a\u7fa9\u304c\u30c7\u30d7\u30ed\u30a4\u6e08\u307f\u304b\u3069\u3046\u304b\u5224\u65ad\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 
+activiti.engine.is.workflow.deployed.error=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u5b9a\u7fa9\u304c\u30c7\u30d7\u30ed\u30a4\u6e08\u307f\u304b\u3069\u3046\u304b\u5224\u65ad\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 activiti.engine.undeploy.workflow.error=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u5b9a\u7fa9{0}\u3092\u30a2\u30f3\u30c7\u30d7\u30ed\u30a4\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 activiti.engine.undeploy.workflow.unexisting.error=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u5b9a\u7fa9 {0} \u306f\u5b58\u5728\u3057\u306a\u3044\u305f\u3081\u3001\u30a2\u30f3\u30c7\u30d7\u30ed\u30a4\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 activiti.engine.get.workflow.definition.error=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u5b9a\u7fa9\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
diff --git a/config/alfresco/messages/activity-list_ja.properties b/config/alfresco/messages/activity-list_ja.properties
index 5e28595b1d..3357dbb433 100755
--- a/config/alfresco/messages/activity-list_ja.properties
+++ b/config/alfresco/messages/activity-list_ja.properties
@@ -61,3 +61,4 @@ org.alfresco.datalists.list-deleted={1}\u304c\u30c7\u30fc\u30bf\u30ea\u30b9\u30c
 org.alfresco.subscriptions.followed={1}\u304c\u73fe\u5728 "{5}" \u3092\u30d5\u30a9\u30ed\u30fc\u3057\u3066\u3044\u307e\u3059
 org.alfresco.subscriptions.subscribed={1}\u304c "{2}" \u3092\u8cfc\u8aad\u3057\u307e\u3057\u305f
 org.alfresco.profile.status-changed={1}: {2}
+org.alfresco.doclink.link-created={1} \u304c {0} \u3078\u306e\u30ea\u30f3\u30af\u3092\u4f5c\u6210\u3057\u307e\u3057\u305f
diff --git a/config/alfresco/messages/authentication_ja.properties b/config/alfresco/messages/authentication_ja.properties
index a7d2eb5392..0ad9ce9be7 100644
--- a/config/alfresco/messages/authentication_ja.properties
+++ b/config/alfresco/messages/authentication_ja.properties
@@ -21,7 +21,7 @@ authentication.err.passthru.user.notfound=\u30d1\u30b9\u30b9\u30eb\u30fc\u30e6\u
 
 # Authentication Diagnostic Steps
 authentication.step.ldap.validation=\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u691c\u8a3c
-authentication.step.ldap.connecting=LDAP \u30b5\u30fc\u30d0\u30fc {0} \u306b\u63a5\u7d9a\u3057\u3066\u3044\u307e\u3059 
+authentication.step.ldap.connecting=LDAP \u30b5\u30fc\u30d0\u30fc {0} \u306b\u63a5\u7d9a\u3057\u3066\u3044\u307e\u3059
 authentication.step.ldap.connected=\u30d7\u30ea\u30f3\u30b7\u30d1\u30eb ''{1}'' \u306e LDAP \u30b5\u30fc\u30d0\u30fc ''{0}'' \u306b\u63a5\u7d9a\u3057\u307e\u3057\u305f
 authentication.step.ldap.lookup=\u30af\u30a8\u30ea ''{1}'' \u3092\u4f7f\u3063\u3066\u30e6\u30fc\u30b6\u30fc ID ''{0}'' \u306e\u30c6\u30b9\u30c8\u30e6\u30fc\u30b6\u30fc\u3092\u30eb\u30c3\u30af\u30a2\u30c3\u30d7\u3057\u307e\u3059
 authentication.step.ldap.lookedup=\u30e6\u30fc\u30b6\u30fc ID {0} \u306e\u30c6\u30b9\u30c8\u30e6\u30fc\u30b6\u30fc\u3092\u691c\u7d22\u3057\u3001\u8b58\u5225\u540d \uff08DN\uff09{1} \u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f
@@ -53,7 +53,7 @@ synchronization.err.ldap.group.member.missing="\u6b21\u306e\u8b58\u5225\u540d\u3
 
 
 
-       
+
 
 
 
diff --git a/config/alfresco/messages/bootstrap-example-javascripts_ja.properties b/config/alfresco/messages/bootstrap-example-javascripts_ja.properties
index 2b3bf47c16..4c4c624ee9 100755
--- a/config/alfresco/messages/bootstrap-example-javascripts_ja.properties
+++ b/config/alfresco/messages/bootstrap-example-javascripts_ja.properties
@@ -1,4 +1,4 @@
-# Javascript Examples Localization
+# Javascript Exapmples Localization
 
 javascripts.example.backup.title=\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u30b9\u30af\u30ea\u30d7\u30c8
 javascripts.example.backup.description=\u5358\u7d14\u306a\u6587\u66f8\u306e\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u306e\u30b9\u30af\u30ea\u30d7\u30c8
diff --git a/config/alfresco/messages/bootstrap-example-smartfoldertemplates_ja.properties b/config/alfresco/messages/bootstrap-example-smartfoldertemplates_ja.properties
index 8c49c10af9..727e39ca78 100644
--- a/config/alfresco/messages/bootstrap-example-smartfoldertemplates_ja.properties
+++ b/config/alfresco/messages/bootstrap-example-smartfoldertemplates_ja.properties
@@ -1,4 +1,4 @@
 
-#Virtual Folder Templates  Localization Sample
+#Smart Folder Templates  Localization Sample
 
-virtualfolder.example.title=\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u30b5\u30f3\u30d7\u30eb
+smartfolder.example.title=\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u4f8b
diff --git a/config/alfresco/messages/bootstrap-imapScripts_ja.properties b/config/alfresco/messages/bootstrap-imapScripts_ja.properties
index 85e498b197..2cc2fc2370 100755
--- a/config/alfresco/messages/bootstrap-imapScripts_ja.properties
+++ b/config/alfresco/messages/bootstrap-imapScripts_ja.properties
@@ -9,4 +9,4 @@ imap.command_search.description=E\u30e1\u30fc\u30eb\u691c\u7d22\u30b3\u30de\u30f
 imap.command_utils.name=command-utils.js
 imap.command_utils.title=\u30b3\u30de\u30f3\u30c9\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3
 imap.command_utils.description=E\u30e1\u30fc\u30eb\u30b3\u30de\u30f3\u30c9\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3
-     
+
diff --git a/config/alfresco/messages/bootstrap-spaces_ja.properties b/config/alfresco/messages/bootstrap-spaces_ja.properties
index 9fc5006edf..693b78285b 100755
--- a/config/alfresco/messages/bootstrap-spaces_ja.properties
+++ b/config/alfresco/messages/bootstrap-spaces_ja.properties
@@ -104,6 +104,8 @@ spaces.templates.email.notify.description=\u901a\u77e5 E \u30e1\u30fc\u30eb\u30c
 spaces.templates.email.generate_the_invite_email.description=Alfresco Share \u3078\u306e\u62db\u5f85 E \u30e1\u30fc\u30eb\u306e\u751f\u6210\u306b\u4f7f\u7528\u3059\u308b E \u30e1\u30fc\u30eb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
 spaces.templates.email.generate_the_invite_email_add_direct.description=Alfresco Share \u306e\u30b5\u30a4\u30c8 E \u30e1\u30fc\u30eb\u306b\u8ffd\u52a0\u3059\u308b\u30e6\u30fc\u30b6\u30fc\u306e\u751f\u6210\u306b\u4f7f\u7528\u3059\u308b E \u30e1\u30fc\u30eb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
 
+spaces.templates.email.generate_the_invite_email_moderated.description=Alfresco Share \u306e\u30b5\u30a4\u30c8 E \u30e1\u30fc\u30eb\u306e\u7d50\u5408\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u751f\u6210\u306b\u4f7f\u7528\u3059\u308b E \u30e1\u30fc\u30eb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
+
 spaces.templates.email.generate_the_wf_notification_email.description=\u65b0\u3057\u3044\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u30bf\u30b9\u30af\u3092\u30e6\u30fc\u30b6\u30fc\u306b\u901a\u77e5\u3059\u308b\u305f\u3081\u306e E \u30e1\u30fc\u30eb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
 
 email.template.email_template_for_notifying_users=\u30eb\u30fc\u30eb\u307e\u305f\u306f\u51e6\u7406\u3092\u901a\u3058\u3066\u30e6\u30fc\u30b6\u30fc\u306b\u901a\u77e5\u3059\u308b\u305f\u3081\u306e E  \u30e1\u30fc\u30eb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
diff --git a/config/alfresco/messages/bootstrap-webScripts_ja.properties b/config/alfresco/messages/bootstrap-webScripts_ja.properties
index 9b18b83c0f..fe37f24f0c 100755
--- a/config/alfresco/messages/bootstrap-webScripts_ja.properties
+++ b/config/alfresco/messages/bootstrap-webScripts_ja.properties
@@ -1,3 +1,4 @@
 webscripts.url_addressable_web_services=URL\u30a2\u30c9\u30ec\u30b9\u53ef\u80fd\u306aWeb\u30b5\u30fc\u30d3\u30b9
 webscripts.web_scripts=Web\u30b9\u30af\u30ea\u30d7\u30c8
 webscripts.what_are_web_scripts=Web\u30b9\u30af\u30ea\u30d7\u30c8\u3068\u306f\u3001\u307e\u305f\u305d\u308c\u3092\u958b\u767a\u3059\u308b\u65b9\u6cd5\u306f?
+
diff --git a/config/alfresco/messages/content-filter-languages_ja.properties b/config/alfresco/messages/content-filter-languages_ja.properties
index 3a2c38a4cb..0f5bc6b2cb 100755
--- a/config/alfresco/messages/content-filter-languages_ja.properties
+++ b/config/alfresco/messages/content-filter-languages_ja.properties
@@ -1,4 +1,4 @@
-## Translations of ISO 639-1 languages codes
+## Translations of ISO 639-1 languages codes   
 
 content_filter_lang.aa=\u30a2\u30d5\u30a1\u30eb\u8a9e
 content_filter_lang.ab=\u30a2\u30d6\u30cf\u30ba\u8a9e
@@ -188,7 +188,7 @@ content_filter_lang.zh=\u4e2d\u56fd\u8a9e
 content_filter_lang.zu=\u30ba\u30fc\u30eb\u30fc\u8a9e
 
 ## Duplicate messages to take in account the old 
-## ISO code.
+## ISO code.  
 content_filter_lang.iw=\u30d8\u30d6\u30e9\u30a4\u8a9e
 content_filter_lang.in=\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u8a9e
 content_filter_lang.ji=\u30a4\u30c7\u30a3\u30c3\u30b7\u30e5\u8a9e
diff --git a/config/alfresco/messages/content-model_ja.properties b/config/alfresco/messages/content-model_ja.properties
index 6ed8be28fb..ede514d260 100755
--- a/config/alfresco/messages/content-model_ja.properties
+++ b/config/alfresco/messages/content-model_ja.properties
@@ -94,16 +94,16 @@ cm_contentmodel.property.cm_userStatus.description=\u3053\u306e\u30e6\u30fc\u30b
 cm_contentmodel.property.cm_userStatusTime.title=\u30b9\u30c6\u30fc\u30bf\u30b9\u65e5\u6642
 cm_contentmodel.property.cm_userStatusTime.description=\u3053\u306e\u30e6\u30fc\u30b6\u30fc\u306e\u30b9\u30c6\u30fc\u30bf\u30b9\u304c\u6700\u5f8c\u306b\u66f4\u65b0\u3055\u308c\u305f\u65e5\u6642
 cm_contentmodel.property.cm_googleusername.title=Google \u30e6\u30fc\u30b6\u30fc\u540d
-cm_contentmodel.property.cm_googleusername.description=\u3053\u306e\u30e6\u30fc\u30b6\u30fc\u306e Google \u30e6\u30fc\u30b6\u30fc\u540d 
+cm_contentmodel.property.cm_googleusername.description=\u3053\u306e\u30e6\u30fc\u30b6\u30fc\u306e Google \u30e6\u30fc\u30b6\u30fc\u540d
 cm_contentmodel.property.cm_sizeCurrent.title=\u4f7f\u7528\u91cf
 cm_contentmodel.property.cm_sizeCurrent.description=\u3053\u306e\u30e6\u30fc\u30b6\u30fc\u304c\u4f7f\u7528\u3057\u3066\u3044\u308b\u30c7\u30a3\u30b9\u30af\u9818\u57df\u306e\u91cf
 cm_contentmodel.property.cm_sizeQuota.title=\u30af\u30a9\u30fc\u30bf
-cm_contentmodel.property.cm_sizeQuota.description=\u3053\u306e\u30e6\u30fc\u30b6\u30fc\u304c\u4f7f\u7528\u3067\u304d\u308b\u6700\u5927\u30c7\u30a3\u30b9\u30af\u9818\u57df 
+cm_contentmodel.property.cm_sizeQuota.description=\u3053\u306e\u30e6\u30fc\u30b6\u30fc\u304c\u4f7f\u7528\u3067\u304d\u308b\u6700\u5927\u30c7\u30a3\u30b9\u30af\u9818\u57df
 cm_contentmodel.property.cm_emailFeedId.title=E \u30e1\u30fc\u30eb\u30d5\u30a3\u30fc\u30c9 ID
 cm_contentmodel.property.cm_emailFeedId.description=\u3053\u306e\u30e6\u30fc\u30b6\u30fc\u306e E \u30e1\u30fc\u30eb\u30d5\u30a3\u30fc\u30c9\u306e ID
 cm_contentmodel.association.cm_avatar.title=\u30a2\u30d0\u30bf\u30fc
 cm_contentmodel.association.cm_avatar.description=\u3053\u306e\u30e6\u30fc\u30b6\u30fc\u306e\u30a2\u30d0\u30bf\u30fc\u753b\u50cf
-            
+
 cm_contentmodel.type.cm_category_root.title=\u30ab\u30c6\u30b4\u30ea\u30eb\u30fc\u30c8
 cm_contentmodel.type.cm_category_root.description=\u30eb\u30fc\u30c8\u30ab\u30c6\u30b4\u30ea
 cm_contentmodel.association.cm_categories.title=\u30ab\u30c6\u30b4\u30ea
@@ -132,7 +132,7 @@ cm_contentmodel.property.cm_modified.description=\u3053\u306e\u30a2\u30a4\u30c6\
 cm_contentmodel.property.cm_modifier.title=\u5909\u66f4\u8005
 cm_contentmodel.property.cm_modifier.description=\u3053\u306e\u30a2\u30a4\u30c6\u30e0\u306e\u6700\u7d42\u5909\u66f4\u8005
 cm_contentmodel.property.cm_accessed.title=\u6700\u5f8c\u30a2\u30af\u30bb\u30b9\u65e5
-cm_contentmodel.property.cm_accessed.description=\u3053\u306e\u30a2\u30a4\u30c6\u30e0\u3078\u306e\u6700\u7d42\u30a2\u30af\u30bb\u30b9\u65e5 
+cm_contentmodel.property.cm_accessed.description=\u3053\u306e\u30a2\u30a4\u30c6\u30e0\u3078\u306e\u6700\u7d42\u30a2\u30af\u30bb\u30b9\u65e5
 
 cm_contentmodel.aspect.cm_author.title=\u8457\u8005
 cm_contentmodel.aspect.cm_author.description=\u8457\u8005
@@ -142,7 +142,7 @@ cm_contentmodel.property.cm_author.description=\u8457\u8005
 cm_contentmodel.aspect.cm_localizable.title=\u30ed\u30fc\u30ab\u30e9\u30a4\u30ba\u53ef\u80fd
 cm_contentmodel.aspect.cm_localizable.description=\u30ed\u30fc\u30ab\u30e9\u30a4\u30ba\u53ef\u80fd
 cm_contentmodel.property.cm_locale.title=\u5730\u57df
-cm_contentmodel.property.cm_locale.description=\u5730\u57df 
+cm_contentmodel.property.cm_locale.description=\u5730\u57df
 
 cm_contentmodel.aspect.cm_translatable.title=\u7ffb\u8a33\u53ef\u80fd
 cm_contentmodel.aspect.cm_translatable.description=\u7ffb\u8a33\u53ef\u80fd
diff --git a/config/alfresco/messages/doclink-service_ja.properties b/config/alfresco/messages/doclink-service_ja.properties
new file mode 100644
index 0000000000..6bdcc103e2
--- /dev/null
+++ b/config/alfresco/messages/doclink-service_ja.properties
@@ -0,0 +1,3 @@
+# link service externalised display strings
+
+doclink_service.link_to_label={0} \u3078\u306e\u30ea\u30f3\u30af
diff --git a/config/alfresco/messages/email-server-model_ja.properties b/config/alfresco/messages/email-server-model_ja.properties
index 496aaba8bb..807d3801f9 100755
--- a/config/alfresco/messages/email-server-model_ja.properties
+++ b/config/alfresco/messages/email-server-model_ja.properties
@@ -2,3 +2,4 @@ emailserver_emailserverModel.aspect.emailserver_aliasable.title=E \u30e1\u30fc\u
 emailserver_emailserverModel.aspect.emailserver_aliasable.description=E \u30e1\u30fc\u30eb\u30a8\u30a4\u30ea\u30a2\u30b9
 emailserver_emailserverModel.property.emailserver_alias.title=\u5225\u540d
 emailserver_emailserverModel.property.emailserver_alias.description=\u5225\u540d
+
diff --git a/config/alfresco/messages/email-service_ja.properties b/config/alfresco/messages/email-service_ja.properties
index 9b902e7a07..e137bb850c 100755
--- a/config/alfresco/messages/email-service_ja.properties
+++ b/config/alfresco/messages/email-service_ja.properties
@@ -5,7 +5,7 @@ email.server.err.duplicate_alias=''{0}'' \u3068\u3044\u3046\u540d\u524d\u306e E
 email.server.err.sender_blocked=''{0}'' \u306e\u30a2\u30af\u30bb\u30b9\u304c\u62d2\u5426\u3055\u308c\u307e\u3057\u305f\u3002
 email.server.err.from_syntax=\u69cb\u6587: MAIL FROM: <address>  \u30d1\u30e9\u30e1\u30fc\u30bf\u306b\u30a8\u30e9\u30fc\u304c\u3042\u308a\u307e\u3059
 email.server.err.inbound_mail_disabled=Alfresco\u30b5\u30fc\u30d0\u30fc \u306f\u3001\u7740\u4fe1 E \u30e1\u30fc\u30eb\u3092\u53d7\u4fe1\u3059\u308b\u3088\u3046\u306b\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
-email.server.err.access_denied=''{0}'' \u306e ''{1}'' \u3078\u306e\u30a2\u30af\u30bb\u30b9\u304c\u62d2\u5426\u3055\u308c\u307e\u3057\u305f\u3002 
+email.server.err.access_denied=''{0}'' \u306e ''{1}'' \u3078\u306e\u30a2\u30af\u30bb\u30b9\u304c\u62d2\u5426\u3055\u308c\u307e\u3057\u305f\u3002
 email.server.err.invalid_subject=\u4ef6\u540d\u306e\u884c\u306b\u6709\u52b9\u306a\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 email.server.err.unknown_source_address=''\u5dee\u51fa\u4eba'' \u306e E \u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u304c\u627f\u8a8d\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f: {0}
 email.server.err.user_not_email_contributor=\u30e6\u30fc\u30b6\u30fc ''{0}'' \u306f\u3001E \u30e1\u30fc\u30eb\u30b3\u30f3\u30c8\u30ea\u30d3\u30e5\u30fc\u30bf\u30b0\u30eb\u30fc\u30d7\u306b\u542b\u307e\u308c\u3066\u3044\u307e\u305b\u3093\u3002
@@ -29,6 +29,6 @@ email.outbound.err.send.failed=E \u30e1\u30fc\u30eb\u3092\u9001\u4fe1\u3067\u304
 
 email.outbound.test.send.success=\u30c6\u30b9\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u9001\u4fe1\u3057\u307e\u3057\u305f\u3002\u5b9b\u5148: {0}
 
-email.outbound.err.test.no.to='testMessageTo' \u304c\u7a7a\u306e\u305f\u3081\u3001\u30c6\u30b9\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u9001\u4fe1\u3067\u304d\u307e\u305b\u3093 
+email.outbound.err.test.no.to='testMessageTo' \u304c\u7a7a\u306e\u305f\u3081\u3001\u30c6\u30b9\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u9001\u4fe1\u3067\u304d\u307e\u305b\u3093
 email.outbound.err.test.no.subject='subject' \u304c\u7a7a\u306e\u305f\u3081\u3001\u30c6\u30b9\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u9001\u4fe1\u3067\u304d\u307e\u305b\u3093
 email.outbound.err.test.no.text='text' \u304c\u7a7a\u306e\u305f\u3081\u3001\u30c6\u30b9\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u9001\u4fe1\u3067\u304d\u307e\u305b\u3093
diff --git a/config/alfresco/messages/imap-service_ja.properties b/config/alfresco/messages/imap-service_ja.properties
index 6a64abf1e1..7adb6381af 100755
--- a/config/alfresco/messages/imap-service_ja.properties
+++ b/config/alfresco/messages/imap-service_ja.properties
@@ -1,14 +1,17 @@
 #
 #   Imap I18N messages
 #
- 
+
 # Information messages. prefix 'imap.server.info'
-imap.server.info.message_body_not_found = \u300c\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u672c\u6587\u306e\u4e00\u90e8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u300d
+imap.server.info.message_body_not_found=\u300c\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u672c\u6587\u306e\u4e00\u90e8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u300d
 
 # Error messages. prefix 'imap.server.error'
-imap.server.error.properties_dont_exist = \u300c\u8a72\u5f53\u3059\u308b\u30d7\u30ed\u30d1\u30c6\u30a3\u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u300d
-imap.server.error.permission_denied = \u300c\u30d5\u30a9\u30eb\u30c0\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093 \u2013 \u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093\u300d
-imap.server.error.folder_already_exist = \u300c\u30d5\u30a9\u30eb\u30c0\u304c\u3059\u3067\u306b\u5b58\u5728\u3057\u3066\u3044\u307e\u3059\u300d
-imap.server.error.mailbox_name_is_mandatory = \u300c\u30e1\u30fc\u30eb\u30dc\u30c3\u30af\u30b9\u540d\u306f\u5fc5\u9808\u30d1\u30e9\u30e1\u30fc\u30bf\u3067\u3059\u300d
-imap.server.error.cannot_get_a_folder = \u300c''{0}''\u3068\u3044\u3046\u30d5\u30a9\u30eb\u30c0\u306f\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u300d
-imap.server.error.cannot_parse_default_email = \u300c\u30c7\u30d5\u30a9\u30eb\u30c8\u306eE\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9''{0}''\u3092\u89e3\u6790\u3067\u304d\u307e\u305b\u3093\u300d
+imap.server.error.properties_dont_exist=\u300c\u8a72\u5f53\u3059\u308b\u30d7\u30ed\u30d1\u30c6\u30a3\u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u300d
+imap.server.error.permission_denied=\u300c\u30d5\u30a9\u30eb\u30c0\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093 \u2013 \u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093\u300d
+imap.server.error.folder_already_exist=\u300c\u30d5\u30a9\u30eb\u30c0\u304c\u3059\u3067\u306b\u5b58\u5728\u3057\u3066\u3044\u307e\u3059\u300d
+imap.server.error.mailbox_name_is_mandatory=\u300c\u30e1\u30fc\u30eb\u30dc\u30c3\u30af\u30b9\u540d\u306f\u5fc5\u9808\u30d1\u30e9\u30e1\u30fc\u30bf\u3067\u3059\u300d
+imap.server.error.cannot_get_a_folder=\u300c''{0}''\u3068\u3044\u3046\u30d5\u30a9\u30eb\u30c0\u306f\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u300d
+imap.server.error.cannot_parse_default_email=\u300c\u30c7\u30d5\u30a9\u30eb\u30c8\u306eE\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9''{0}''\u3092\u89e3\u6790\u3067\u304d\u307e\u305b\u3093\u300d
+
+
+
diff --git a/config/alfresco/messages/invitation-service_ja.properties b/config/alfresco/messages/invitation-service_ja.properties
index 70a50a8dcc..45c965ed0b 100755
--- a/config/alfresco/messages/invitation-service_ja.properties
+++ b/config/alfresco/messages/invitation-service_ja.properties
@@ -23,6 +23,8 @@ invitation.invitesender.email.role.SiteConsumer=\u30b5\u30a4\u30c8\u5229\u7528\u
 
 invitation.invitesender.emailAddDirect.subject=Alfresco {0}: \u3042\u306a\u305f\u306f\u3001{1} \u30b5\u30a4\u30c8\u306b\u8ffd\u52a0\u3055\u308c\u3066\u3044\u307e\u3059
 
+invitation.moderated.email.subject=\u65b0\u898f\u30e6\u30fc\u30b6\u30fc\u304c {0} \u3078\u306e\u53c2\u52a0\u3092\u5e0c\u671b\u3057\u3066\u3044\u307e\u3059
+
 # Invitation workflow task description
 invitation.nominated.workflow.description={0}\u30b5\u30a4\u30c8\u3078\u306e\u53c2\u52a0\u306e\u62db\u5f85
 invitation.moderated.workflow.description={0}\u30b5\u30a4\u30c8\u3078\u306e\u53c2\u52a0\u306e\u8981\u6c42
diff --git a/config/alfresco/messages/quickshare-service_ja.properties b/config/alfresco/messages/quickshare-service_ja.properties
index 5a9d4d5634..c600e6c466 100644
--- a/config/alfresco/messages/quickshare-service_ja.properties
+++ b/config/alfresco/messages/quickshare-service_ja.properties
@@ -1,2 +1,2 @@
 # QuickShare  Service
-quickshare.notifier.email.subject={0} {1} \u304c\u3042\u306a\u305f\u3068 {2} \u3092\u5171\u6709\u3057\u307e\u3057\u305f
\ No newline at end of file
+quickshare.notifier.email.subject={0} {1} \u304c\u3042\u306a\u305f\u3068 {2} \u3092\u5171\u6709\u3057\u307e\u3057\u305f
diff --git a/config/alfresco/messages/repoadmin-service_ja.properties b/config/alfresco/messages/repoadmin-service_ja.properties
index 289217a12d..f6265c3007 100644
--- a/config/alfresco/messages/repoadmin-service_ja.properties
+++ b/config/alfresco/messages/repoadmin-service_ja.properties
@@ -19,4 +19,4 @@ repoadmin_service.msg_resource_undeployment_failed=\u30e1\u30c3\u30bb\u30fc\u30b
 repoadmin_service.msg_resource_reload_failed=\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u30ea\u30bd\u30fc\u30b9\u306e\u518d\u8aad\u307f\u8fbc\u307f\u304c\u5931\u6557\u3057\u307e\u3057\u305f
 repoadmin_service.msg_missing_bundle_base_name=\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u30c7\u30d7\u30ed\u30a4\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3002 \u30d0\u30f3\u30c9\u30eb\u306e\u30d9\u30fc\u30b9\u540d\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
 repoadmin_service.msg_base_name_contain_underscore=\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u30c7\u30d7\u30ed\u30a4\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3002 \u30d0\u30f3\u30c9\u30eb\u306e\u30d9\u30fc\u30b9\u540d ''{0}'' \u306b\u306f\u3001 ''_'' (\u30a2\u30f3\u30c0\u30fc\u30b9\u30b3\u30a2) \u3092\u4f7f\u308f\u306a\u3044\u3067\u304f\u3060\u3055\u3044
-repoadmin_service.msg_base_name_contain_period=\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u30c7\u30d7\u30ed\u30a4\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3002 \u30d0\u30f3\u30c9\u30eb\u306e\u30d9\u30fc\u30b9\u540d ''{0}'' \u306b\u306f\u3001 ''.'' (\u30d4\u30ea\u30aa\u30c9) \u3092\u4f7f\u308f\u306a\u3044\u3067\u304f\u3060\u3055\u3044
\ No newline at end of file
+repoadmin_service.msg_base_name_contain_period=\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u30c7\u30d7\u30ed\u30a4\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3002 \u30d0\u30f3\u30c9\u30eb\u306e\u30d9\u30fc\u30b9\u540d ''{0}'' \u306b\u306f\u3001 ''.'' (\u30d4\u30ea\u30aa\u30c9) \u3092\u4f7f\u308f\u306a\u3044\u3067\u304f\u3060\u3055\u3044
diff --git a/config/alfresco/messages/slingshot_ja.properties b/config/alfresco/messages/slingshot_ja.properties
index 870dfa0717..0fc7f61802 100755
--- a/config/alfresco/messages/slingshot_ja.properties
+++ b/config/alfresco/messages/slingshot_ja.properties
@@ -1,9 +1,19 @@
 ## Slingshot Common Messages
 ## RA-11: Originally copied from Share, and everything except the
-## required role.* properties removed.
+## required role.* and hybridsync.* properties removed.
 
 ## Roles
 role.SiteManager=\u30de\u30cd\u30fc\u30b8\u30e3
 role.SiteCollaborator=\u5171\u540c\u4f5c\u696d\u8005
 role.SiteContributor=\u6295\u7a3f\u8005
 role.SiteConsumer=\u5229\u7528\u8005
+
+#Hybrid Sync Console
+hybridsync.ssd-id-header-label=\u540c\u671f ID
+hybridsync.ssd-failed-reason-header-label=\u540c\u671f\u30a8\u30e9\u30fc\u306e\u7a2e\u985e
+hybridsync.path-desc-header-label=\u5143\u306e\u30a2\u30a4\u30c6\u30e0\u306e\u5834\u6240
+hybridsync.sync-creator-header-label=\u540c\u671f\u306e\u4f5c\u6210\u8005
+hybridsync.cloud-user-header-label=Alfresco in the Cloud \u30e6\u30fc\u30b6\u30fc
+hybridsync.remote-tenant-id-header-label=Alfresco in the Cloud \u30cd\u30c3\u30c8\u30ef\u30fc\u30af
+hybridsync.target-folder-node-ref-header-label=Alfresco in the Cloud \u306e\u540c\u671f\u5148
+hybridsync.actions-header-label=\u30a2\u30af\u30b7\u30e7\u30f3
diff --git a/config/alfresco/messages/smartfolder-model_ja.properties b/config/alfresco/messages/smartfolder-model_ja.properties
index 416c6c001f..6fcb87b588 100644
--- a/config/alfresco/messages/smartfolder-model_ja.properties
+++ b/config/alfresco/messages/smartfolder-model_ja.properties
@@ -8,23 +8,23 @@ smf_smartFolder.type.smf_smartFolderTemplate.description=\u30b9\u30de\u30fc\u30c
 smf_smartFolder.aspect.smf_smartFolder.title=\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0
 smf_smartFolder.aspect.smf_smartFolder.description=\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u306e\u30b3\u30f3\u30c6\u30ca\u30ce\u30fc\u30c9
 
-smf_smartFolder.aspect.smf_smartFolderChild.title=\u5b50\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0 
+smf_smartFolder.aspect.smf_smartFolderChild.title=\u5b50\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0
 smf_smartFolder.aspect.smf_smartFolderChild.description=\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u306e\u30b3\u30f3\u30c6\u30ca\u30ce\u30fc\u30c9\u306b\u5165\u3063\u3066\u3044\u308b\u30ce\u30fc\u30c9
 
-smf_smartFolder.aspect.smf_virtualization.title=\u30b3\u30f3\u30c6\u30ca\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0 
+smf_smartFolder.aspect.smf_virtualization.title=\u30b3\u30f3\u30c6\u30ca\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0
 smf_smartFolder.aspect.smf_virtualization.description=\u30b3\u30f3\u30c6\u30ca\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0
 
-smf_smartFolder.aspect.smf_customConfigSmartFolder.title=\u30ab\u30b9\u30bf\u30e0\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0 
+smf_smartFolder.aspect.smf_customConfigSmartFolder.title=\u30ab\u30b9\u30bf\u30e0\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0
 smf_smartFolder.aspect.smf_customConfigSmartFolder.description=\u30ab\u30b9\u30bf\u30e0\u306e\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0
 smf_smartFolder.property.smf_custom-template-association.title=\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
 smf_smartFolder.property.smf_custom-template-association.description=\u30ab\u30b9\u30bf\u30e0\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u95a2\u9023\u4ed8\u3051
 
-smf_smartFolder.aspect.smf_systemConfigSmartFolder.title=\u30b7\u30b9\u30c6\u30e0\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0 
-smf_smartFolder.aspect.smf_systemConfigSmartFolder.description=\u30b7\u30b9\u30c6\u30e0\u306e\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0  
+smf_smartFolder.aspect.smf_systemConfigSmartFolder.title=\u30b7\u30b9\u30c6\u30e0\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0
+smf_smartFolder.aspect.smf_systemConfigSmartFolder.description=\u30b7\u30b9\u30c6\u30e0\u306e\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0
 smf_smartFolder.property.smf_system-template-location.title=\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
 smf_smartFolder.property.smf_system-template-location.description=\u30b7\u30b9\u30c6\u30e0\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u5834\u6240
 
 smf_smartFolder.type.smf_download.title=\u4e00\u6642\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u30a2\u30b9\u30da\u30af\u30c8
 smf_smartFolder.type.smf_download.description=\u4e00\u6642\u7684\u306a\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u30b3\u30f3\u30c6\u30ca
 
-smf_smartFolder.nullSystemTemplate.message=\u30b7\u30b9\u30c6\u30e0\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
\ No newline at end of file
+smf_smartFolder.nullSystemTemplate.message=\u30b7\u30b9\u30c6\u30e0\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
diff --git a/config/alfresco/messages/templates-messages_ja.properties b/config/alfresco/messages/templates-messages_ja.properties
index 86921a3db7..5047bb8f20 100755
--- a/config/alfresco/messages/templates-messages_ja.properties
+++ b/config/alfresco/messages/templates-messages_ja.properties
@@ -83,4 +83,11 @@ templates.invite-email-add-direct.html.detail={1} {0} \u3055\u3093\u304c\u3001\u
 templates.invite-email-add-direct.html.navigate={0} \u3078\u79fb\u52d5\u3059\u308b
 templates.invite-email-add-direct.html.closing=<br />Alfresco {0}
 templates.invite-email-add-direct.html.leave=<span>\u3053\u306e\u30b5\u30a4\u30c8\u304b\u3089\u306e\u8131\u9000\u3092\u5e0c\u671b\u3055\u308c\u308b\u5834\u5408\u306f\u3001\u4e0b\u306e\u30ea\u30f3\u30af\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002</span><br/><a href=\''{0}\''>\u30b5\u30a4\u30c8\u304b\u3089\u8131\u9000</a>
-templates.invite-email-add-direct.html.alfresco_info=Alfresco {0} \u306b\u3064\u3044\u3066\u8a73\u3057\u304f\u306f\u3001<a href=\"http://www.alfresco.com\">http://www.alfresco.com</a>\u3092\u3054\u89a7\u304f\u3060\u3055\u3044\u3002
\ No newline at end of file
+templates.invite-email-add-direct.html.alfresco_info=Alfresco {0} \u306b\u3064\u3044\u3066\u8a73\u3057\u304f\u306f\u3001<a href=\"http://www.alfresco.com\">http://www.alfresco.com</a>\u3092\u3054\u89a7\u304f\u3060\u3055\u3044\u3002
+
+#invite-email-moderated.ftl
+templates.invite-email-moderated.html.header=\u65b0\u898f\u30e6\u30fc\u30b6\u30fc\u304c ''{0}'' \u3078\u306e\u53c2\u52a0\u3092\u5e0c\u671b\u3057\u3066\u3044\u307e\u3059
+templates.invite-email-moderated.html.info={0} \u304c {2}''\u4e0a\u306e''''{1}'' \u30b5\u30a4\u30c8\u3078\u306e\u53c2\u52a0\u3092\u30ea\u30af\u30a8\u30b9\u30c8\u3057\u307e\u3057\u305f\u3002
+templates.invite-email-moderated.html.see_pending=\u4fdd\u7559\u4e2d\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u898b\u308b
+
+templates.invite-email.html.salutation_generic=\u7686\u69d8\u3001
diff --git a/config/alfresco/messages/transfer-service_ja.properties b/config/alfresco/messages/transfer-service_ja.properties
index 68b6cc4de1..f211c88b48 100755
--- a/config/alfresco/messages/transfer-service_ja.properties
+++ b/config/alfresco/messages/transfer-service_ja.properties
@@ -27,7 +27,7 @@ transfer_service.receiver.not_lock_owner=\u8ee2\u9001\u64cd\u4f5c\u3092\u5b9f\u8
 transfer_service.receiver.error_ending_transfer=\u8ee2\u9001 ({0}) \u306e\u5b8c\u4e86\u8981\u6c42\u3067\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
 transfer_service.receiver.error_staging_snapshot=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u8ee2\u9001 {0}\u7528\u306b\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u3059\u308b\u904e\u7a0b\u3067\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
 transfer_service.receiver.error_staging_content=\u30b3\u30f3\u30c6\u30f3\u30c4\u30d5\u30a1\u30a4\u30eb\u3092\u8ee2\u9001\u7528\u306b\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u3059\u308b\u904e\u7a0b\u3067\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f {0}\u3002 \u30d5\u30a1\u30a4\u30eb\u306eID\u306f {1} \u3067\u3059
-transfer_service.receiver.no_snapshot_received=\u8ee2\u9001 ({0})\u3092\u30b3\u30df\u30c3\u30c8\u3059\u308b\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u53d7\u3051\u53d6\u308a\u307e\u3057\u305f\u304c\u3001\u30de\u30c3\u30c1\u3059\u308b\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u53d7\u4fe1\u3057\u307e\u305b\u3093\u3067\u3057\u305f\u3002 
+transfer_service.receiver.no_snapshot_received=\u8ee2\u9001 ({0})\u3092\u30b3\u30df\u30c3\u30c8\u3059\u308b\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u53d7\u3051\u53d6\u308a\u307e\u3057\u305f\u304c\u3001\u30de\u30c3\u30c1\u3059\u308b\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u53d7\u4fe1\u3057\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 transfer_service.receiver.error_committing_transfer=\u8ee2\u9001 {0} \u306e\u30b3\u30df\u30c3\u30c8\u3092\u8a66\u307f\u3066\u3044\u308b\u9593\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
 transfer_service.receiver.transfer_not_found=\u8981\u6c42\u3055\u308c\u305f\u8ee2\u9001\u8a18\u9332\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f: {0}
 transfer_service.receiver.transfer_cancelled=\u8ee2\u9001\u306f\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u3066\u3044\u307e\u3059: {0}
diff --git a/config/alfresco/workflow/invitation-nominated-workflow-messages_ja.properties b/config/alfresco/workflow/invitation-nominated-workflow-messages_ja.properties
index a93effb1ef..3c597be51a 100755
--- a/config/alfresco/workflow/invitation-nominated-workflow-messages_ja.properties
+++ b/config/alfresco/workflow/invitation-nominated-workflow-messages_ja.properties
@@ -9,7 +9,7 @@ activitiInvitationNominated.workflow.description=Share\u30b5\u30a4\u30c8\u3078\u
 
 # Invite Task Definitions
 inwf_invite-workflow-model.type.inwf_inviteToSiteTask.title=\u958b\u59cb
-inwf_invite-workflow-model.type.inwf_inviteToSiteTask.description=\u63a8\u85a6\u5f0f\u62db\u5f85\u306e\u958b\u59cb 
+inwf_invite-workflow-model.type.inwf_inviteToSiteTask.description=\u63a8\u85a6\u5f0f\u62db\u5f85\u306e\u958b\u59cb
 inwf_invite-workflow-model.type.inwf_activitiInvitePendingTask.title=\u30b5\u30a4\u30c8\u3078\u306e\u53c2\u52a0\u306e\u62db\u5f85
 inwf_invite-workflow-model.type.inwf_activitiInvitePendingTask.description=\u30b5\u30a4\u30c8\u3078\u306e\u53c2\u52a0\u306e\u62db\u5f85
 inwf_invite-workflow-model.type.inwf_rejectInviteTask.title=\u30b5\u30a4\u30c8\u3078\u306e\u62db\u5f85\u306e\u5374\u4e0b