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': '', 'label.vlan': '', 'label.vlan.id': '', +'label.vlan.only': '', 'label.vlan.range': '', 'label.vxlan': '', 'label.vxlan.id': '', @@ -974,7 +975,6 @@ $.extend(dictionary, { 'label.ipv4.dns2': '', 'label.ipv6.dns1': '', 'label.ipv6.dns2': '', -'label.vlan.id': '', 'label.protocol.number': '', 'label.edit.acl.rule': '', '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; }