简柏林 / thingskit · Commits

Commit a77cefddd038e28f76c131d4303090515f06bff2

Authored by Vladyslav_Prykhodko
2 parents caa7b8f4 aa7c946c

Merge remote-tracking branch 'upstream/master'

Inline Side-by-side
Showing 7 changed files with 9 additions and 6 deletions
1 1 {
2 2 "name": "thingsboard-js-executor",
3 3 "private": true,
4   - "version": "2.5.0",
  4 + "version": "2.4.3",
5 5 "description": "ThingsBoard JavaScript Executor Microservice",
6 6 "main": "server.js",
7 7 "bin": "server.js",
... ...
1 1 {
2 2 "name": "thingsboard-web-ui",
3 3 "private": true,
4   - "version": "2.5.0",
  4 + "version": "2.4.3",
5 5 "description": "ThingsBoard Web UI Microservice",
6 6 "main": "server.js",
7 7 "bin": "server.js",
... ...
1 1 {
2 2 "name": "thingsboard",
3 3 "private": true,
4   - "version": "2.5.0",
  4 + "version": "2.4.3",
5 5 "description": "ThingsBoard UI",
6 6 "licenses": [
7 7 {
... ...
... ... @@ -44,7 +44,7 @@
44 44 <ng-md-icon size="16" icon="alpha-a-circle-outline"></ng-md-icon>
45 45 </span>
46 46 <span ng-show="item.type==types.dataKeyType.entityField">
47   - <md-tooltip>{{'datakey.entityField' | translate }}</md-tooltip>
  47 + <md-tooltip>{{'datakey.entity-field' | translate }}</md-tooltip>
48 48 <ng-md-icon size="16" icon="alpha-e-circle-outline"></ng-md-icon>
49 49 </span>
50 50 <span ng-show="item.type==types.dataKeyType.timeseries">
... ... @@ -65,7 +65,7 @@
65 65 <ng-md-icon size="16" icon="alpha-a-circle-outline" ng-click="createKey($event, types.dataKeyType.attribute, '#datakey_chips')"></ng-md-icon>
66 66 </span>
67 67 <span ng-show="widgetType == types.widgetType.latest.value">
68   - <md-tooltip>{{'datakey.entityField' | translate }}</md-tooltip>
  68 + <md-tooltip>{{'datakey.entity-field' | translate }}</md-tooltip>
69 69 <ng-md-icon size="16" icon="alpha-e-circle-outline" ng-click="createKey($event, types.dataKeyType.entityField, '#datakey_chips')"></ng-md-icon>
70 70 </span>
71 71 <span>
... ... @@ -91,7 +91,7 @@
91 91 <ng-md-icon size="20" icon="alpha-a-circle-outline"></ng-md-icon>
92 92 </span>
93 93 <span ng-show="$chip.type==types.dataKeyType.entityField">
94   - <md-tooltip>{{'datakey.entityField' | translate }}</md-tooltip>
  94 + <md-tooltip>{{'datakey.entity-field' | translate }}</md-tooltip>
95 95 <ng-md-icon size="20" icon="alpha-e-circle-outline"></ng-md-icon>
96 96 </span>
97 97 <span ng-show="$chip.type==types.dataKeyType.timeseries">
... ...
... ... @@ -583,6 +583,7 @@
583 583 "configuration": "Data key configuration",
584 584 "timeseries": "Timeseries",
585 585 "attributes": "Attributes",
  586 + "entity-field": "Entity field",
586 587 "alarm": "Alarm fields",
587 588 "timeseries-required": "Entity timeseries are required.",
588 589 "timeseries-or-attributes-required": "Entity timeseries/attributes are required.",
... ...
... ... @@ -583,6 +583,7 @@
583 583 "configuration": "Конфигурация ключа данных",
584 584 "timeseries": "Телеметрия",
585 585 "attributes": "Атрибуты",
  586 + "entity-field": "Поле объекта",
586 587 "alarm": "Параметры оповещения",
587 588 "timeseries-required": "Телеметрия объекта обязательна.",
588 589 "timeseries-or-attributes-required": "Телеметрия/атрибуты обязательны.",
... ...
... ... @@ -699,6 +699,7 @@
699 699 "configuration": "Конфігурація ключа даних",
700 700 "timeseries": "Телеметрія",
701 701 "attributes": "Атрибути",
  702 + "entity-field": "Поле сутності",
702 703 "alarm": "Поля сигнала тривоги",
703 704 "timeseries-required": "Необхідно вказати Телеметрія.",
704 705 "timeseries-or-attributes-required": "Необхідно вказати телеметрію/атрибути.",
... ...