diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action.properties
index ef0932e..8c8f603 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action.properties
@@ -21,3 +21,5 @@
 resume=Resume
 stop=Stop
 uninstall=Uninstall
+activate=Activate
+deactivate=Deactivate
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action_it.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action_it.properties
index 458db47..6cbd120 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action_it.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action_it.properties
@@ -21,3 +21,5 @@
 resume=Riprendi
 stop=Ferma
 uninstall=Disinstalla
+#activate=
+#deactivate=
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action_ko.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action_ko.properties
index a687261..eb06012 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action_ko.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action_ko.properties
@@ -21,3 +21,5 @@
 resume=재개
 stop=정지
 uninstall=삭제
+#activate=
+#deactivate=
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action_zh_CN.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action_zh_CN.properties
index 7019e53..16b4d97 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action_zh_CN.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action_zh_CN.properties
@@ -21,3 +21,5 @@
 resume=恢复
 stop=停止
 uninstall=卸载
+#activate=
+#deactivate=
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props.properties
index 420e8ea..897afa6 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props.properties
@@ -15,11 +15,20 @@
 #
 #
 
-type=Type
-vendor=Vendor
-chassis_id=Chassis ID
+# Typically used as table column headers or property labels
 
+chassis_id=Chassis ID
 hw_version=H/W Version
 sw_version=S/W Version
-
 serial_number=Serial #
+app_id=App ID
+
+type=Type
+vendor=Vendor
+icon=Icon
+title=Title
+state=State
+category=Category
+version=Version
+origin=Origin
+role=Role
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props_it.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props_it.properties
index 397de07..d0f9747 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props_it.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props_it.properties
@@ -15,11 +15,20 @@
 #
 #
 
-type=Categoria
-vendor=Produttore
-chassis_id=Chassis ID
+# Typically used as table column headers or property labels
 
+chassis_id=Chassis ID
 hw_version=Versione Hardware
 sw_version=Versione Software
-
 serial_number=Numero Seriale
+#app_id=
+
+type=Categoria
+vendor=Produttore
+#icon=
+#title=
+#state=
+#category=
+#version=
+#origin=
+#role=
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props_ko.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props_ko.properties
index a47edbe..4fa873d 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props_ko.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props_ko.properties
@@ -15,11 +15,20 @@
 #
 #
 
-type=종류
-vendor=벤더
-chassis_id=Chassis ID
+# Typically used as table column headers or property labels
 
+chassis_id=Chassis ID
 hw_version=하드웨어 버전
 sw_version=소프트웨어 버전
+serial_number=시리얼 번호
+#app_id=
 
-serial_number=시리얼 번호
\ No newline at end of file
+type=종류
+vendor=벤더
+#icon=
+#title=
+#state=
+#category=
+#version=
+#origin=
+#role=
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props_zh_CN.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props_zh_CN.properties
index 5fd8e87..21cbc67 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props_zh_CN.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props_zh_CN.properties
@@ -15,11 +15,20 @@
 #
 #
 
-type=类型
-vendor=供应商
-chassis_id=框架 标识号
+# Typically used as table column headers or property labels
 
+chassis_id=框架 标识号
 hw_version=硬件版本
 sw_version=软件版本
+serial_number=序列号
+#app_id=
 
-serial_number=序列号
\ No newline at end of file
+type=类型
+vendor=供应商
+#icon=
+#title=
+#state=
+#category=
+#version=
+#origin=
+#role=
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui.properties
index dd0cbc7..09b8973 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui.properties
@@ -14,9 +14,14 @@
 # limitations under the License.
 #
 #
+
+# Common button text
 ok=OK
 cancel=Cancel
 
-# --- key binding and user gesture descriptions
+# Gesture text
 click=click
-scroll_down=scroll down
\ No newline at end of file
+scroll_down=scroll down
+
+# Common control button tooltips
+tt_ctl_auto_refresh=Toggle auto refresh
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui_it.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui_it.properties
index adbf38f..29ebb5a 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui_it.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui_it.properties
@@ -14,9 +14,14 @@
 # limitations under the License.
 #
 #
+
+# Common button text
 ok=OK
 cancel=Annulla
 
-# --- key binding and user gesture descriptions
+# Gesture text
 click=click
-scroll_down=scorri verso il basso
\ No newline at end of file
+scroll_down=scorri verso il basso
+
+# Common control button tooltips
+#tt_ctl_auto_refresh=
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui_ko.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui_ko.properties
index 57f7fd8..a04753d 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui_ko.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui_ko.properties
@@ -14,9 +14,14 @@
 # limitations under the License.
 #
 #
+
+# Common button text
 ok=승인
 cancel=취소
 
-# --- key binding and user gesture descriptions
+# Gesture text
 click=클릭
-scroll_down=아래로 스크롤
\ No newline at end of file
+scroll_down=아래로 스크롤
+
+# Common control button tooltips
+#tt_ctl_auto_refresh=
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui_zh_CN.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui_zh_CN.properties
index 777c861..107ef07 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui_zh_CN.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui_zh_CN.properties
@@ -14,9 +14,14 @@
 # limitations under the License.
 #
 #
+
+# Common button text
 ok=确定
 cancel=取消
 
-# --- key binding and user gesture descriptions
+# Gesture text
 click=点击
-scroll_down=向下滚动
\ No newline at end of file
+scroll_down=向下滚动
+
+# Common control button tooltips
+#tt_ctl_auto_refresh=