Commit 527bc5e2c293f18204be1d2667ecb370efadd7a1

Authored by Igor Kulikov
2 parents 0dde6233 ac952914

Merge branch 'master' of github.com:thingsboard/thingsboard

@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 </section> 51 </section>
52 </ng-template> 52 </ng-template>
53 </mat-tab> 53 </mat-tab>
54 - <mat-tab label="{{ 'device-profile.lwm2m.bootstrap-tab' | translate }}"> 54 + <mat-tab label="{{ 'device-profile.lwm2m.servers' | translate }}">
55 <ng-template matTabContent> 55 <ng-template matTabContent>
56 <section [formGroup]="lwm2mDeviceProfileFormGroup"> 56 <section [formGroup]="lwm2mDeviceProfileFormGroup">
57 <div class="mat-padding"> 57 <div class="mat-padding">
@@ -1234,7 +1234,6 @@ @@ -1234,7 +1234,6 @@
1234 "required": " value is required.", 1234 "required": " value is required.",
1235 "mode": "Security config mode", 1235 "mode": "Security config mode",
1236 "pattern_hex_dec": "{ count, plural, 0 {must be hex decimal format} other {must be # characters} }", 1236 "pattern_hex_dec": "{ count, plural, 0 {must be hex decimal format} other {must be # characters} }",
1237 - "bootstrap-tab": "Bootstrap",  
1238 "servers": "Servers", 1237 "servers": "Servers",
1239 "short-id": "Short ID", 1238 "short-id": "Short ID",
1240 "short-id-tip": "Short Server ID", 1239 "short-id-tip": "Short Server ID",