7 files changed, 11 insertions, 13 deletions

diff --git a/install/ui/src/freeipa/automount.js b/install/ui/src/freeipa/automount.js
index 389bb7aef..202bac1c1 100644
--- a/install/ui/src/freeipa/automount.js
+++ b/install/ui/src/freeipa/automount.js
@@ -135,13 +135,11 @@ IPA.automount.map_entity = function(spec) {
                     fields: [
                         {
                             name: 'key',
-                            label: IPA.get_command_option(
-                                'automountmap_add_indirect', 'key').label
+                            label: '@mc-opt:automountmap_add_indirect:key:label'
                         },
                         {
                             name: 'parentmap',
-                            label: IPA.get_command_option(
-                                'automountmap_add_indirect', 'parentmap').label
+                            label: '@mc-opt:automountmap_add_indirect:parentmap:label'
                         }
                     ]
                 }
diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js
index 503cb129f..5fa6a6578 100644
--- a/install/ui/src/freeipa/dns.js
+++ b/install/ui/src/freeipa/dns.js
@@ -319,7 +319,7 @@ IPA.dns.zone_entity = function(spec) {
                         {
                             $type: 'force_dnszone_add_checkbox',
                             name: 'force',
-                            metadata: IPA.get_command_option('dnszone_add', 'force')
+                            metadata: '@mc-opt:dnszone_add:force'
                         }
                     ]
                 }
diff --git a/install/ui/src/freeipa/entitle.js b/install/ui/src/freeipa/entitle.js
index 6612d1a8b..03ac0c82c 100644
--- a/install/ui/src/freeipa/entitle.js
+++ b/install/ui/src/freeipa/entitle.js
@@ -50,7 +50,7 @@ IPA.entitle.entity = function(spec) {
                     fields: [
                         {
                             name: 'uuid',
-                            label: IPA.get_command_option('entitle_register', 'ipaentitlementid').label,
+                            label: '@mc-opt:entitle_register:ipaentitlementid:label',
                             read_only: true
                         },
                         {
@@ -124,13 +124,13 @@ IPA.entitle.entity = function(spec) {
                 },
                 {
                     name: 'password',
-                    label: IPA.get_command_option('entitle_register', 'password').label,
+                    label: '@mc-opt:entitle_register:password:label',
                     $type: 'password'
                 }
 /* currently not supported
                 , {
                     name: 'ipaentitlementid',
-                    label: IPA.get_command_option('entitle_register', 'ipaentitlementid').label
+                    label: '@mc-opt:entitle_register:ipaentitlementid:label'
                 }
 */
             ]
diff --git a/install/ui/src/freeipa/group.js b/install/ui/src/freeipa/group.js
index 85663886d..a3297bd3a 100644
--- a/install/ui/src/freeipa/group.js
+++ b/install/ui/src/freeipa/group.js
@@ -117,7 +117,7 @@ IPA.group.entity = function(spec) {
             columns: [
                 {
                     name: 'ipaexternalmember',
-                    label: IPA.get_command_option('group_add_member', 'ipaexternalmember').label
+                    label: '@mc-opt:group_add_member:ipaexternalmember:label'
                 }
             ]
 
diff --git a/install/ui/src/freeipa/host.js b/install/ui/src/freeipa/host.js
index 3292e1c7a..3eb54c70c 100644
--- a/install/ui/src/freeipa/host.js
+++ b/install/ui/src/freeipa/host.js
@@ -233,12 +233,12 @@ IPA.host.entity = function(spec) {
                         {
                             name: 'ip_address',
                             validators: [ 'ip_address' ],
-                            metadata: IPA.get_command_option('host_add', 'ip_address')
+                            metadata: '@mc-opt:host_add:ip_address'
                         },
                         {
                             $type: 'force_host_add_checkbox',
                             name: 'force',
-                            metadata: IPA.get_command_option('host_add', 'force')
+                            metadata: '@mc-opt:host_add:force'
                         }
                     ]
                 }
diff --git a/install/ui/src/freeipa/service.js b/install/ui/src/freeipa/service.js
index 22a88dfba..1d6043901 100644
--- a/install/ui/src/freeipa/service.js
+++ b/install/ui/src/freeipa/service.js
@@ -214,7 +214,7 @@ IPA.service.entity = function(spec) {
                         {
                             $type: 'checkbox',
                             name: 'force',
-                            metadata: IPA.get_command_option('service_add', 'force')
+                            metadata: '@mc-opt:service_add:force'
                         }
                     ]
                 }
diff --git a/install/ui/src/freeipa/sudo.js b/install/ui/src/freeipa/sudo.js
index ff8732a02..9cbd345af 100644
--- a/install/ui/src/freeipa/sudo.js
+++ b/install/ui/src/freeipa/sudo.js
@@ -680,7 +680,7 @@ IPA.sudo.options_section = function(spec) {
 
         that.table.create_column({
             name: 'ipasudoopt',
-            label: IPA.get_command_option('sudorule_add_option', 'ipasudoopt').label,
+            label: '@mc-opt:sudorule_add_option:ipasudoopt:label',
             entity: that.entity,
             primary_key: true
         });