• Romain Bioteau's avatar
    Merge remote-tracking branch 'origin/master' into dev · 560a3469
    Romain Bioteau authored
    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
    560a3469
plugin_ja.properties 1.59 KB