From 177c19036760cfc0f3d757648cd97b90d652e48b Mon Sep 17 00:00:00 2001
From: Pierre-Luc Dion <pdion891@apache.org>
Date: Thu, 19 Feb 2015 22:12:32 -0500
Subject: [PATCH] CLOUDSTACK-8188: missing labe:label.password.reset.confirm.
 removed duplicate label.vlan.id from dictionary2.jsp removed duplicate
 label.vlan from message.properties

---
 client/WEB-INF/classes/resources/messages.properties | 2 +-
 ui/dictionary2.jsp                                   | 2 +-
 ui/scripts/instances.js                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 39c12301a99..71721f6192d 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1504,7 +1504,7 @@ label.autoscale=AutoScale
 label.health.check=Health Check
 label.public.load.balancer.provider=Public Load Balancer Provider
 label.add.isolated.network=Add Isolated Network
-label.vlan=VLAN
+label.vlan.only=VLAN
 label.secondary.isolated.vlan.id=Secondary Isolated VLAN ID
 label.ipv4.netmask=IPv4 Netmask
 label.custom=Custom
diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp
index c999bb8212c..df0e18c8578 100644
--- a/ui/dictionary2.jsp
+++ b/ui/dictionary2.jsp
@@ -213,6 +213,7 @@ $.extend(dictionary, {
 'label.virtual.routers': '<fmt:message key="label.virtual.routers" />',
 'label.vlan': '<fmt:message key="label.vlan" />',
 'label.vlan.id': '<fmt:message key="label.vlan.id" />',
+'label.vlan.only': '<fmt:message key="label.vlan.only" />',
 'label.vlan.range': '<fmt:message key="label.vlan.range" />',
 'label.vxlan': '<fmt:message key="label.vxlan" />',
 'label.vxlan.id': '<fmt:message key="label.vxlan.id" />',
@@ -974,7 +975,6 @@ $.extend(dictionary, {
 'label.ipv4.dns2': '<fmt:message key="label.ipv4.dns2" />',
 'label.ipv6.dns1': '<fmt:message key="label.ipv6.dns1" />',
 'label.ipv6.dns2': '<fmt:message key="label.ipv6.dns2" />',
-'label.vlan.id': '<fmt:message key="label.vlan.id" />',
 'label.protocol.number': '<fmt:message key="label.protocol.number" />',
 'label.edit.acl.rule': '<fmt:message key="label.edit.acl.rule" />',
 'label.source.ip.address': '<fmt:message key="label.source.ip.address" />',
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 4ff1bff8236..eb30ee0e3c9 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -717,7 +717,7 @@
                             },
                             complete: function(args) {
                             	if (args.password != null && args.password.length > 0)
-                                    return 'label.password.reset.confirm' + args.password;
+                                    return _l('label.password.reset.confirm') + args.password;
                             	else
                             		return null;
                             }