Merge branch 'master' into feature_ui_metadata

Conflicts:
	hawkbit-ui/src/main/resources/messages.properties

hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/rollout.scss

@@ -52,6 +52,10 @@
 		opacity: 0.5;
 	}
 	
+	.action-type-padding{
+		padding: 0 0px !important;
+	}
+	
 	.rollout-caption-links{
 		font-weight: 400;
   		height: 25px ;

hawkbit-ui/src/main/resources/messages.properties

@@ -14,7 +14,6 @@
 # Button names prefix with - button
 button.save = Save
 button.delete = Delete
-button.discard = Discard
 button.discard.all = Discard All
 button.delete.all = Delete All
 button.assign.all = Save Assign

hawkbit-ui/src/main/resources/messages_de.properties

@@ -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

hawkbit-ui/src/main/resources/messages_en.properties

@@ -434,11 +434,21 @@ 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
 header.rolloutgroup.threshold = Trigger threshold
 
+
+
 header.rolloutgroup.target.date = Date and time
 header.rolloutgroup.target.message = Messages