diff --git a/admin/app/translations.js b/admin/app/translations.js index 04b37e08..c37a090e 100644 --- a/admin/app/translations.js +++ b/admin/app/translations.js @@ -30,7 +30,8 @@ function config($translateProvider) { ONPEAK: 'On-peak', OFFPEAK: 'Off-peak', MIDPEAK: 'Mid-peak' - } + }, + QR_CODE: 'QR Code' }, FDD: { ID: 'ID', @@ -1015,7 +1016,8 @@ function config($translateProvider) { ONPEAK: '峰', OFFPEAK: '谷', MIDPEAK: '平' - } + }, + QR_CODE:"二维码" }, FDD: { ID: 'ID', @@ -2007,7 +2009,8 @@ function config($translateProvider) { ONPEAK: 'Gipfel', OFFPEAK: 'Senke', MIDPEAK: 'Niveau' - } + }, + QR_CODE: 'QR Code' }, FDD: { ID: 'ID', @@ -2491,8 +2494,7 @@ function config($translateProvider) { MASTER_METER: 'Überlegenes Messgerät', SELECT_MASTER_METER: 'Wählen Sie das übergeordnete Messgerät aus', TREE_VIEW: 'Baumsicht', - CHILD_METERS: 'Unterer Füllstandsmesser', - QR_CODE: 'QR Code' + CHILD_METERS: 'Unterer Füllstandsmesser' }, SENSOR: { ADD_SENSOR: 'Sensor hinzufügen', diff --git a/admin/views/settings/combinedequipment/combinedequipment.model.html b/admin/views/settings/combinedequipment/combinedequipment.model.html index 420c5299..f437994f 100644 --- a/admin/views/settings/combinedequipment/combinedequipment.model.html +++ b/admin/views/settings/combinedequipment/combinedequipment.model.html @@ -49,6 +49,13 @@ +