1 files changed, 37 insertions, 42 deletions

diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py
index 397eb0b72..5f6949a0f 100644
--- a/ipalib/plugins/dns.py
+++ b/ipalib/plugins/dns.py
@@ -115,56 +115,57 @@ class dns(Object):
     takes_params = (
         Str('idnsname',
             cli_name='name',
-            doc='zone name (FQDN)',
+            label=_('Zone'),
+            doc=_('Zone name (FQDN)'),
             normalizer=lambda value: value.lower(),
             primary_key=True,
         ),
         Str('idnssoamname',
             cli_name='name_server',
-            doc='authoritative name server',
+            label=_('Authoritative name server'),
         ),
         Str('idnssoarname',
             cli_name='admin_email',
-            doc='administrator e-mail address',
+            label=_('administrator e-mail address'),
             default_from=lambda idnsname: 'root.%s' % idnsname,
             normalizer=lambda value: value.replace('@', '.'),
         ),
         Int('idnssoaserial?',
             cli_name='serial',
-            doc='SOA serial',
+            label=_('SOA serial'),
         ),
         Int('idnssoarefresh?',
             cli_name='refresh',
-            doc='SOA refresh',
+            label=_('SOA refresh'),
         ),
         Int('idnssoaretry?',
             cli_name='retry',
-            doc='SOA retry',
+            label=_('SOA retry'),
         ),
         Int('idnssoaexpire?',
             cli_name='expire',
-            doc='SOA expire',
+            label=_('SOA expire'),
         ),
         Int('idnssoaminimum?',
             cli_name='minimum',
-            doc='SOA minimum',
+            label=_('SOA minimum'),
         ),
         Int('dnsttl?',
             cli_name='ttl',
-            doc='SOA time to live',
+            label=_('SOA time to live'),
         ),
         StrEnum('dnsclass?',
             cli_name='class',
-            doc='SOA class',
+            label=_('SOA class'),
             values=_record_classes,
         ),
         Flag('idnsallowdynupdate',
             cli_name='allow_dynupdate',
-            doc='allow dynamic update?',
+            label=_('allow dynamic update?'),
         ),
         Str('idnsupdatepolicy?',
             cli_name='update_policy',
-            doc='BIND update policy',
+            label=_('BIND update policy'),
         ),
     )
 
@@ -389,7 +390,7 @@ class dns_enable(Command):
     takes_args = (
         Str('zone',
             cli_name='zone',
-            doc='zone name',
+            label=_('Zone name'),
             normalizer=lambda value: value.lower(),
         ),
     )
@@ -423,8 +424,7 @@ class dns_disable(Command):
     """
     takes_args = (
         Str('zone',
-            cli_name='zone',
-            doc='zone name',
+            label=_('Zone name'),
             normalizer=lambda value: value.lower(),
         ),
     )
@@ -456,38 +456,37 @@ class dns_add_rr(Command):
     """
     Add new DNS resource record.
     """
+
     takes_args = (
         Str('zone',
-            cli_name='zone',
-            doc='zone name',
+            label=_('Zone name'),
             normalizer=lambda value: value.lower(),
         ),
         Str('idnsname',
             cli_name='resource',
-            doc='resource name',
+            label=_('resource name'),
             default_from=lambda zone: zone.lower(),
             attribute=True,
         ),
         StrEnum('type',
-            cli_name='type',
-            doc='record type',
+            label=_('Record type'),
             values=_record_types,
         ),
         Str('data',
-            cli_name='data',
-            doc='type-specific data',
+            label=_('Data'),
+            doc=_('Type-specific data'),
         ),
     )
 
     takes_options = (
         Int('dnsttl?',
             cli_name='ttl',
-            doc='time to live',
+            label=_('Time to live'),
             attribute=True,
         ),
         StrEnum('dnsclass?',
             cli_name='class',
-            doc='class',
+            label=_('Class'),
             values=_record_classes,
             attribute=True,
         ),
@@ -572,26 +571,25 @@ class dns_del_rr(Command):
     """
     Delete DNS resource record.
     """
+
     takes_args = (
         Str('zone',
-            cli_name='zone',
-            doc='zone name',
+            label=_('Zone name'),
             normalizer=lambda value: value.lower(),
         ),
         Str('idnsname',
             cli_name='resource',
-            doc='resource name',
+            label=_('Resource name'),
             default_from=lambda zone: zone.lower(),
             attribute=True,
         ),
         StrEnum('type',
-            cli_name='type',
-            doc='record type',
+            label=_('Record type'),
             values=_record_types,
         ),
         Str('data',
-            cli_name='data',
-            doc='type-specific data',
+            label=_('Data'),
+            doc=_('Type-specific data'),
         ),
     )
 
@@ -661,30 +659,27 @@ class dns_find_rr(Command):
     """
     takes_args = (
         Str('zone',
-            cli_name='zone',
-            doc='zone name',
+            label=_('Zone name'),
             normalizer=lambda value: value.lower(),
         ),
         Str('criteria?',
             cli_name='criteria',
-            doc='search criteria',
+            label=_('Search criteria'),
         ),
     )
 
     takes_options = (
         Str('idnsname?',
             cli_name='resource',
-            doc='resource name',
+            label=_('Resource name'),
             default_from=lambda zone: zone.lower(),
         ),
         StrEnum('type?',
-            cli_name='type',
-            doc='record type',
+            label=_('Record type'),
             values=_record_types,
         ),
         Str('data?',
-            cli_name='data',
-            doc='type-specific data',
+            label=_('type-specific data'),
         ),
     )
 
@@ -785,15 +780,15 @@ class dns_show_rr(Command):
     """
     Show existing DNS resource records.
     """
+
     takes_args = (
         Str('zone',
-            cli_name='zone',
-            doc='zone name',
+            label=_('Zone name'),
             normalizer=lambda value: value.lower(),
         ),
         Str('idnsname',
             cli_name='resource',
-            doc='resource name',
+            label=_('Resource name'),
             normalizer=lambda value: value.lower(),
         ),
     )