100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Merge remote-tracking branch 'remotes/origin/master' into new-asset-groups
Rich Turner393f45d11a30
diff --cc deployment/manager/shared/locales/de/or.jsonindex 458700f24,03390c2f0..af4c1cd36--- a/deployment/manager/shared/locales/de/or.json+++ b/deployment/manager/shared/locales/de/or.json@@@ -109,7 -107,11 +109,11 @@@"history": "Historie","attributes": "Attribute","info": "Info",- "logs":"Logs",- "chooseLanguage":"Choose language",- "addRemoveAttributes":"Add/remove attributes"- "logs":"Protokolle",- "choose_lang":"Sprache wählen",++ "logs": "Protokolle",++ "chooseLanguage": "Choose language",+ "attributeValueType": {+ "PERCENTAGE": "%.2f",+ "NUMBER": "%.0f",+ "TEMPERATURE": "%.1f"+ }}diff --cc deployment/manager/shared/locales/en/or.jsonindex 23bd87650,2be7ff56e..b3291a1d8--- a/deployment/manager/shared/locales/en/or.json+++ b/deployment/manager/shared/locales/en/or.json@@@ -171,6 -169,10 +171,11 @@@"reset": "Reset","noLongerMatches": "No longer matches","logs":"Logs",- "chooseLang":"Choose language",- "addRemoveAttributes":"Add/remove attributes"- "choose_lang":"Choose language",++ "chooseLang": "Choose language",++ "addRemoveAttributes": "Add/remove attributes",+ "attributeValueType": {+ "PERCENTAGE": "%.2f",+ "NUMBER": "%.0f",+ "TEMPERATURE": "%.1f"+ }}diff --cc deployment/manager/shared/locales/es/or.jsonindex a81aa0edd,0afc02973..4ea8f23df--- a/deployment/manager/shared/locales/es/or.json+++ b/deployment/manager/shared/locales/es/or.json@@@ -107,7 -107,11 +107,11 @@@"history": "Historia","attributes": "Atributos","info": "Informacion",- "logs":"Logs",- "chooseLanguage":"Choose language",- "addRemoveAttributes":"Add/remove attributes"+ "logs":"Registros",- "choose_lang":"Elige lengua",++ "chooseLanguage": "Elige lengua",+ "attributeValueType": {+ "PERCENTAGE": "%.2f",+ "NUMBER": "%.0f",+ "TEMPERATURE": "%.1f"+ }}diff --cc deployment/manager/shared/locales/fr/or.jsonindex a65fdef8f,2f4e5783a..e9cd51527--- a/deployment/manager/shared/locales/fr/or.json+++ b/deployment/manager/shared/locales/fr/or.json@@@ -107,7 -107,11 +107,12 @@@"history": "Historique","attributes": "Attributs","info": "Info",- "logs":"Logs",- "chooseLanguage":"Choose language",- "addRemoveAttributes":"Add/remove attributes"- "logs":"Journaux",- "choose_lang":"Choisissez la langue",++ "logs": "Journaux",++ "chooseLanguage": "Choisissez la langue",++ "addRemoveAttributes": "Add/remove attributes",+ "attributeValueType": {+ "PERCENTAGE": "%.2f",+ "NUMBER": "%.0f",+ "TEMPERATURE": "%.1f"+ }}diff --cc deployment/manager/shared/locales/nl/or.jsonindex 6598c1430,ee887b1ae..b36249d65--- a/deployment/manager/shared/locales/nl/or.json+++ b/deployment/manager/shared/locales/nl/or.json@@@ -169,8 -167,12 +169,12 @@@"oncePerDay": "Max. 1x per dag","oncePerWeek": "Max. 1x per week","reset": "Reset",-- "noLongerMatches": "Niet meer geldig",-- "logs":"Logs",- "chooseLanguage":"Kies een taal",- "addRemoveAttributes":"Attributen toevoegen/verwijderen"- "choose_lang":"Kies een taal",++ "logs": "Logs",++ "chooseLanguage": "Kies een taal",++ "addRemoveAttributes": "Attributen toevoegen/verwijderen",+ "attributeValueType": {+ "PERCENTAGE": "%.2f",+ "NUMBER": "%.0f",+ "TEMPERATURE": "%.1f"+ }}