diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/App.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/App.properties
new file mode 100644
index 0000000..8fab3d3
--- /dev/null
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/App.properties
@@ -0,0 +1,70 @@
+#
+# Copyright 2017-present Open Networking Laboratory
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+
+# =======================================================================
+# | Plea to Translators:                                                |
+# | --------------------                                                |
+# |   I know you are all keen to add your own language localization     |
+# |   bundles for these files as soon as they appear in Gerrit reviews, |
+# |   but please refrain from doing so immediately, until given the     |
+# |   "green light"...                                                  |
+# |                                                                     |
+# |   The reason is, sometimes localization keys need to be renamed, or |
+# |   strings moved to other bundles, while we work out how to localize |
+# |   each UI component. If there are multiple files while a bundle is  |
+# |   "in flux", it means modifications need to be done in 4-or-more    |
+# |   places instead of just 1.                                         |
+# |                                                                     |
+# |   I promise I will mark a bundle as "ready for translation" as      |
+# |   soon as the localization work has been completed for the default  |
+# |   bundle, and the "dust has settled".                               |
+# |                                                                     |
+# |   Thank you in advance for your patience and restraint  :)          |
+# =======================================================================
+
+
+# ==========================================
+# |  WIP -- Not Yet Ready For Translation  |
+# ==========================================
+
+# Text that appears in the navigation panel
+nav_item_app=Applications
+
+# View title
+title_apps=Applications
+
+# Control button tooltips
+tt_ctl_upload=Upload an application (.oar file)
+tt_ctl_activate=Activate selected application
+tt_ctl_deactivate=Deactivate selected application
+tt_ctl_uninstall=Uninstall selected application
+
+# Quick-Help panel
+qh_hint_click=Select a row to show application details
+qh_hint_scroll_down=See more applications
+
+# App details panel
+dp_features=Features
+dp_required_apps=Required Apps
+dp_permissions=Permissions
+
+# App dialog panel
+dlg_confirm_action=Confirm Action
+
+dlg_warn_deactivate=Deactivating or uninstalling this component \
+  can have serious negative consequences!
+dlg_warn_own_risk=** DO SO AT YOUR OWN RISK **
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Cluster.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Cluster.properties
index 1ae723c..c6fd954 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Cluster.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Cluster.properties
@@ -14,8 +14,14 @@
 # limitations under the License.
 #
 #
+# Cluster view specific text
+
+# Text that appears in the navigation panel
+nav_item_cluster=Cluster Nodes
+
+# View title
 title_cluster_nodes=Cluster Nodes
 
-k_esc_hint=Close the details panel
-k_click_hint=Select a row to show cluster node details
-k_scroll_down_hint=See available cluster nodes
+# Quick-Help panel
+qh_hint_click=Select a row to show cluster node details
+qh_hint_scroll_down=See available cluster nodes
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Cluster_it.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Cluster_it.properties
index 5dacee1..7534174 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Cluster_it.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Cluster_it.properties
@@ -14,8 +14,14 @@
 # limitations under the License.
 #
 #
+# Cluster view specific text
+
+# Text that appears in the navigation panel
+nav_item_cluster=Nodi del Cluster
+
+# View title
 title_cluster_nodes=Nodi del Cluster
 
-k_esc_hint=Chiude il pannello dei dettagli
-k_click_hint=Seleziona una riga per mostrare i dettagli del nodo
-k_scroll_down_hint=Mostra i nodi del cluster disponibili
+# Quick-Help panel
+qh_hint_click=Seleziona una riga per mostrare i dettagli del nodo
+qh_hint_scroll_down=Mostra i nodi del cluster disponibili
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Cluster_ko.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Cluster_ko.properties
index b0f5186..22fd98a 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Cluster_ko.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Cluster_ko.properties
@@ -14,8 +14,14 @@
 # limitations under the License.
 #
 #
+# Cluster view specific text
+
+# Text that appears in the navigation panel
+nav_item_cluster=클러스터 노드
+
+# View title
 title_cluster_nodes=클러스터 노드
 
-k_esc_hint=상세 패널 닫기
-k_click_hint=행을 선택하여 클러스터 노드 세부 정보 표시
-k_scroll_down_hint=가용한 클러스터 노드 보기
\ No newline at end of file
+# Quick-Help panel
+qh_hint_click=행을 선택하여 클러스터 노드 세부 정보 표시
+qh_hint_scroll_down=가용한 클러스터 노드 보기
\ No newline at end of file
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Cluster_zh_CN.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Cluster_zh_CN.properties
index cd41bb7..8fceec6 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Cluster_zh_CN.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Cluster_zh_CN.properties
@@ -14,8 +14,14 @@
 # limitations under the License.
 #
 #
+# Cluster view specific text
+
+# Text that appears in the navigation panel
+nav_item_cluster=集群节点
+
+# View title
 title_cluster_nodes=集群节点
 
-k_esc_hint=关闭详细信息面板
-k_click_hint=选择一行以显示集群节点详细信息
-k_scroll_down_hint=查看可用的集群节点
+# Quick-Help panel
+qh_hint_click=选择一行以显示集群节点详细信息
+qh_hint_scroll_down=查看可用的集群节点