Merge branch 'master' into feature_ui_metadata

Conflicts:
	hawkbit-ui/src/main/resources/messages.properties
This commit is contained in:
gah6kor
2016-07-19 16:38:52 +02:00
14 changed files with 347 additions and 321 deletions

View File

@@ -437,6 +437,14 @@ header.distributionset = Distribution set
header.numberofgroups = No. of groups
header.detail.status = Detail status
header.total.targets = Total targets
header.type = Type
header.swmodules = SwModules
header.migrations.step=IsRequiredMigrationStep
header.action=Actions
header.action.run=Run
header.action.pause=Pause
header.action.update=Edit
header.rolloutgroup.installed.percentage = % Finished
header.rolloutgroup.threshold.error = Error threshold