Merge branch 'sila-ui' into dynamic-info-ui

2 files changed, 30 insertions, 4 deletions

diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index d7a26493..5823bed4 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -129,7 +129,9 @@
     "certificates": "@:appPageTitle.certificates",
     "virtualMedia": "@:appPageTitle.virtualMedia",
     "power": "@:appPageTitle.power",
-    "keyClear": "@:appPageTitle.keyClear"
+    "keyClear": "@:appPageTitle.keyClear",
+    "staticInfo": "Static Information",
+    "fans": "@:appPageTitle.fans"
   },
   "appPageTitle": {
     "changePassword": "Change password",
@@ -139,6 +141,7 @@
     "dumps": "Dumps",
     "eventLogs": "Event logs",
     "factoryReset": "Factory reset",
+    "fans": "Fans",
     "firmware": "Firmware",
     "inventory": "Inventory and LEDs",
     "kvm": "KVM",
@@ -158,7 +161,8 @@
     "serverPowerOperations": "Server power operations",
     "certificates": "Certificates",
     "virtualMedia": "Virtual media",
-    "keyClear": "Key clear"
+    "keyClear": "Key clear",
+    "specification": "Specification"
   },
   "pageChangePassword": {
     "changePassword": "Change password",
@@ -812,6 +816,15 @@
       "upperCritical": "Upper critical"
     }
   },
+  "pageFans": {
+    "installedFans": "Installed Fans",
+    "table": {
+      "name": "Name",
+      "health": "Health",
+      "type": "Type",
+      "currentValue": "Current Speed, rpm"
+    }
+  },
   "pageSerialOverLan": {
     "alert": {
       "disconnectedAlertMessage" : "System must be powered on to connect"
diff --git a/src/locales/ru-RU.json b/src/locales/ru-RU.json
index d7427dda..ccc54844 100644
--- a/src/locales/ru-RU.json
+++ b/src/locales/ru-RU.json
@@ -133,7 +133,9 @@
     "certificates": "@:appPageTitle.certificates",
     "virtualMedia": "@:appPageTitle.virtualMedia",
     "power": "@:appPageTitle.power",
-    "keyClear": "@:appPageTitle.keyClear"
+    "keyClear": "@:appPageTitle.keyClear",
+    "staticInfo": "Статическая информация",
+    "fans": "@:appPageTitle.fans"
   },
   "appPageTitle": {
     "changePassword": "Изменить пароль",
@@ -143,6 +145,7 @@
     "dumps": "Дампы",
     "eventLogs": "Журнал событий",
     "factoryReset": "Сброс до заводских настроек",
+    "fans": "Вентиляторы",
     "firmware": "Встроенное ПО",
     "inventory": "Перечень оборудования и LED",
     "kvm": "KVM",
@@ -163,7 +166,8 @@
     "serverPowerOperations": "Управление питанием сервера",
     "certificates": "Сертификаты",
     "virtualMedia": "Виртуальные носители",
-    "keyClear": "Удаление ключей"
+    "keyClear": "Удаление ключей",
+    "specification": "Характеристики"
   },
   "pageChangePassword": {
     "changePassword": "Изменить пароль",
@@ -818,6 +822,15 @@
       "upperCritical": "Макс. крит. значение"
     }
   },
+  "pageFans": {
+    "installedFans": "Установленные вентиляторы",
+    "table": {
+      "name": "Имя",
+      "health": "Состояние",
+      "type": "Тип устройства",
+      "currentValue": "Текущая скорость, об/мин"
+    }
+  },
   "pageSerialOverLan": {
     "alert": {
       "disconnectedAlertMessage" : "Система должна быть включена для соединения"