diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 797683de6c6..2d321fee91b 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -11,6 +11,7 @@ label.secondary.storage.vm=Secondary storage VM label.add.netScaler.device=Add Netscaler device label.add.F5.device=Add F5 device label.add.SRX.device=Add SRX device +label.account.and.security.group=Account, Security group #new labels (end) ************************************************************************************************ diff --git a/ui/index.jsp b/ui/index.jsp index 889b872906e..fab77e2bfb0 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -2931,6 +2931,7 @@ dictionary = { 'label.secondary.storage.vm' : '', 'label.add.netScaler.device': '', 'label.add.F5.device': '', -'label.add.SRX.device': '' +'label.add.SRX.device': '', +'label.account.and.security.group': '' }; diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 8dfa6ff36f4..30d934b681d 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -2587,7 +2587,7 @@ 'cidr': { edit: true, label: 'CIDR', isHidden: true }, 'accountname': { edit: true, - label: _l('label.account') + ', ' + _l('label.security.group'), + label: 'label.account.and.security.group', isHidden: true, range: ['accountname', 'securitygroup'] }, @@ -2767,7 +2767,7 @@ 'cidr': { edit: true, label: 'CIDR', isHidden: true }, 'accountname': { edit: true, - label: _l('label.account') + ', ' + _l('label.security.group'), + label: 'label.account.and.security.group', isHidden: true, range: ['accountname', 'securitygroup'] },