Commit 42fa1887 authored by Romain Bioteau's avatar Romain Bioteau
Browse files

Merge remote-tracking branch 'origin/release-7.1.5' into 7.1.x

Conflicts:
	bundles/plugins/org.bonitasoft.studio.common/src/org/bonitasoft/studio/common/ProductVersion.java
parents 003acb23 b5cad454
......@@ -15,8 +15,8 @@ hideValidStatusAction=\u6709\u52b9\u306a\u5909\u66f4\u3092\u975e\u8868\u793a
hideReviewedAction=\u30ec\u30d3\u30e5\u30fc\u6e08\u307f\u5909\u66f4\u3092\u975e\u8868\u793a
description=\u8aac\u660e
okStatusTooltip=\u30a2\u30af\u30b7\u30e7\u30f3\u306f\u5fc5\u8981\u3042\u308a\u307e\u305b\u3093\u3002
warningStatusTooltip=\u30ec\u30d3\u30e5\u30fc\u304c\u5fc5\u8981\u3067\u3059\: \u5b9a\u7fa9\u30d1\u30cd\u30eb\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
errorStatusTooltip=\u30a2\u30af\u30b7\u30e7\u30f3\u304c\u5fc5\u8981\u3067\u3059\: \u5b9a\u7fa9\u30d1\u30cd\u30eb\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
warningStatusTooltip=\u30ec\u30d3\u30e5\u30fc\u304c\u5fc5\u8981\u3067\u3059\: \u8aac\u660e\u30d1\u30cd\u30eb\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
errorStatusTooltip=\u30a2\u30af\u30b7\u30e7\u30f3\u304c\u5fc5\u8981\u3067\u3059\: \u8aac\u660e\u30d1\u30cd\u30eb\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
yes=\u306f\u3044
no=\u3044\u3044\u3048
noActionRequired=\u30a2\u30af\u30b7\u30e7\u30f3\u306f\u5fc5\u8981\u3042\u308a\u307e\u305b\u3093\u3002
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment