Skip to content
  • adrien's avatar
    Merge branch 'master' of git@github.com:bonitasoft/bonita-studio-sp.git · baa5a1d8
    adrien authored
    into release-7.12.0
    
    Conflicts:
    	community/bundles/plugins/org.bonitasoft.studio.actors/messages_ja.properties
    	community/bundles/plugins/org.bonitasoft.studio.actors/messages_pt_BR.properties
    	community/bundles/plugins/org.bonitasoft.studio.actors/src/org/bonitasoft/studio/actors/ui/wizard/page/UsersWizardPage.java
    	community/bundles/plugins/org.bonitasoft.studio.application/messages_ja.properties
    	community/bundles/plugins/org.bonitasoft.studio.businessobject/messages.properties
    	community/bundles/plugins/org.bonitasoft.studio.businessobject/messages_es.properties
    	community/bundles/plugins/org.bonitasoft.studio.businessobject/messages_fr.properties
    	community/bundles/plugins/org.bonitasoft.studio.businessobject/messages_ja.properties
    	community/bundles/plugins/org.bonitasoft.studio.businessobject/messages_pt_BR.properties
    	community/bundles/plugins/org.bonitasoft.studio.businessobject/src/org/bonitasoft/studio/businessobject/i18n/Messages.java
    	community/bundles/plugins/org.bonitasoft.studio.common.repository/messages_ja.properties
    	community/bundles/plugins/org.bonitasoft.studio.common.repository/messages_pt_BR.properties
    	community/bundles/plugins/org.bonitasoft.studio.common/messages_ja.properties
    	community/bundles/plugins/org.bonitasoft.studio.configuration/messages_ja.properties
    	community/bundles/plugins/org.bonitasoft.studio.connectors.model.edit/messages_ja.properties
    	community/bundles/plugins/org.bonitasoft.studio.connectors.model.edit/messages_pt_BR.properties
    	community/bundles/plugins/org.bonitasoft.studio.designer/messages_ja.properties
    	community/bundles/plugins/org.bonitasoft.studio.designer/plugin_ja.properties
    	community/bundles/plugins/org.bonitasoft.studio.diagram.custom/messages_ja.properties
    	community/bundles/plugins/org.bonitasoft.studio.engine/messages_ja.properties
    	community/bundles/plugins/org.bonitasoft.studio.engine/messages_pt_BR.properties
    	community/bundles/plugins/org.bonitasoft.studio.engine/plugin_ja.properties
    	community/bundles/plugins/org.bonitasoft.studio.groovy.ui/messages_ja.properties
    	community/bundles/plugins/org.bonitasoft.studio.importer.bos/src/org/bonitasoft/studio/importer/bos/handler/ImportBosHandler.java
    	community/bundles/plugins/org.bonitasoft.studio.importer.bos/src/org/bonitasoft/studio/importer/bos/wizard/ImportBosArchiveControlSupplier.java
    	community/bundles/plugins/org.bonitasoft.studio.importer/messages_ja.properties
    	community/bundles/plugins/org.bonitasoft.studio.la/messages_ja.properties
    	community/bundles/plugins/org.bonitasoft.studio.la/plugin_ja.properties
    	community/bundles/plugins/org.bonitasoft.studio.validation/messages_ja.properties
    	subscription/bundles/plugins/org.bonitasoft.studio.application.ex/messages_ja.properties
    	subscription/bundles/plugins/org.bonitasoft.studio.configuration.ex/messages_ja.properties
    	subscription/bundles/plugins/org.bonitasoft.studio.configuration.ex/plugin_ja.properties
    	subscription/bundles/plugins/org.bonitasoft.studio.connector.wizard.uipath/messages_pt_BR.properties
    	subscription/bundles/plugins/org.bonitasoft.studio.engine.ex/messages_ja.properties
    	subscription/bundles/plugins/org.bonitasoft.studio.intro.ex/messages_ja.properties
    	subscription/bundles/plugins/org.bonitasoft.studio.rest.api.extension/messages_ja.properties
    	subscription/bundles/plugins/org.bonitasoft.studio.rest.api.extension/plugin_ja.properties
    	subscription/bundles/plugins/org.bonitasoft.studio.team/messages_ja.properties
    	subscription/bundles/plugins/org.bonitasoft.studio.team/plugin_ja.properties
    baa5a1d8