lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

MECS-145_Minor_improvements_in_search_filter_New

Browse Source 
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
This commit is contained in:
venu1278
2016-02-05 19:21:27 +05:30
parent a9b36c0fc7
commit def0a00cf6
4 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hawkbit-ui/src/main/resources/messages.properties
View File

@@ -123,18 +123,15 @@ 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,

3
hawkbit-ui/src/main/resources/messages_de.properties
View File

@@ -122,18 +122,15 @@ 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.status = Status,
label.filter.tags = Tags,
label.filter.text = Search Text

3
hawkbit-ui/src/main/resources/messages_en.properties
View File

@@ -122,19 +122,16 @@ 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.targets = Filtered targets :
=======
label.filter = Filter :
label.target.filter.count = Total Targets :
label.filter.selected = Selected :
label.filter.shown = Shown :
>>>>>>> refs/heads/master
label.filter.status = Status,
label.filter.tags = Tags,
label.filter.text = Search Text