Commit 560a3469 authored by Romain Bioteau's avatar Romain Bioteau

Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	community/bundles/plugins/org.bonitasoft.studio.actors/plugin_pt_BR.properties
	community/bundles/plugins/org.bonitasoft.studio.engine/messages_pt_BR.properties
	community/bundles/plugins/org.bonitasoft.studio.groovy.ui/messages_fr.properties
	community/bundles/plugins/org.bonitasoft.studio.ui/messages_es.properties
	community/bundles/plugins/org.bonitasoft.studio.ui/messages_fr.properties
	community/bundles/plugins/org.bonitasoft.studio.ui/messages_ja.properties
	community/bundles/plugins/org.bonitasoft.studio.ui/messages_pt_BR.properties
	subscription/bundles/plugins/org.bonitasoft.studio.configuration.ex/messages_es.properties
	subscription/bundles/plugins/org.bonitasoft.studio.configuration.ex/messages_fr.properties
	subscription/bundles/plugins/org.bonitasoft.studio.configuration.ex/messages_ja.properties
	subscription/bundles/plugins/org.bonitasoft.studio.configuration.ex/messages_pt_BR.properties
	subscription/bundles/plugins/org.bonitasoft.studio.configuration.ex/plugin_es.properties
	subscription/bundles/plugins/org.bonitasoft.studio.configuration.ex/plugin_fr.properties
	subscription/bundles/plugins/org.bonitasoft.studio.configuration.ex/plugin_ja.properties
	subscription/bundles/plugins/org.bonitasoft.studio.configuration.ex/plugin_pt_BR.properties
parents 5fba3317 417ce659
......@@ -34,3 +34,4 @@ newFilterDefMenu=Definici\u00f3n de filtro de actor...
newOrganizationLabel=Organizaci\u00f3n...
setAsActiveOrganization=Set as active organization
......@@ -34,3 +34,4 @@ newFilterDefMenu=D\u00e9finition de filtre d'acteur ...
newOrganizationLabel=Organisation ...
setAsActiveOrganization=Set as active organization
......@@ -34,3 +34,4 @@ newFilterDefMenu=Actor filter definition...
newOrganizationLabel=Organization...
setAsActiveOrganization=Set as active organization
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