Merge branch 'master' into MECS-1454_Search_filter_improvements

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

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

@@ -123,11 +123,18 @@ label.combobox.type  = Select Type
 label.combobox.tag = Select Tag
 label.choose.tag = Choose Tag to update
 label.choose.tag.color = Choose Tag Color
+<<<<<<< HEAD
 label.filter = Filter:
 label.target.filter.count = Total Targets:
 label.target.filtered.total = Total filtered targets :
 label.filter.selected = Selected:
 label.filter.shown = Shown:
+=======
+label.filter = Filter : 
+label.target.filter.count = Total Targets : 
+label.filter.selected = Selected : 
+label.filter.shown = Shown : 
+>>>>>>> refs/heads/master
 label.filter.targets = Filtered targets :
 label.filter.status = Status,
 label.filter.tags = Tags,
@@ -420,6 +427,10 @@ header.assigned.ds = Assigned DS
 header.installed.ds = Installed DS
 header.target.status = Status
 header.target.tags = Tags
+header.distributionset = Distribution set
+header.numberofgroups = No. of groups
+header.detail.status = Detail status
+header.total.targets = Total targets 
 
 distribution.details.header = Distribution set
 target.details.header = Target
@@ -434,5 +445,42 @@ combo.type.tag.name = Type tag name
 label.yes = Yes
 label.no = No
 
+#rollout - start
+header.distributionset = Distribution set
+header.numberofgroups = No. of groups
+header.detail.status = Detail status
+
+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
+rollout.group.label.target.truncated = {0} targets has been truncated in the list due the target size limit of {1}
+
+
+prompt.number.of.groups = Number of groups
+prompt.tigger.thresold = Trigger threshold
+prompt.error.threshold = Error threshold
+prompt.distribution.set = Distribution set
+caption.configure.rollout = Configure rollout
+caption.update.rollout = Update rollout
+prompt.target.filter = Custom target filter
+message.rollout.nonzero.group.number = Number of groups must be greater than zero
+message.rollout.max.group.number = Number of groups must not be greater than 500
+message.rollout.duplicate.check = Rollout [ {0} ] must be unique, entered value already exists.
+message.correct.invalid.value = Please correct invalid values
+message.enter.number = Please enter number
+message.rollout.field.value.range = Value should be in range {0} to {1}
+message.rollout.started = Rollout {0} started successfully
+message.rollout.paused = Rollout {0} paused successfully
+message.rollout.resumed = Rollout {0} resumed successfully
+message.rollout.noofgroups.or.targetfilter.missing = Please enter number of groups and select target filter
+message.rollouts = Rollouts
+label.target.per.group = Targets per group :
+message.dist.already.assigned = Distribution {0} is already assigned to target
+message.error.creating.rollout = Server error. Error creating rollout. Please contact the administrator
+message.error.starting.rollout = Server error. Error starting rollout. Please contact the administrator
+#rollout - end
+
 #Menu
 menu.title = Software Provisioning