Fixed label capitalization

The CSS text-transform sometimes produces incorrect capitalization,
so the code has been modified to use translated labels that already
contain the correct capitalization.

Ticket #1424

25 files changed, 28 insertions, 28 deletions

diff --git a/ipalib/plugins/automount.py b/ipalib/plugins/automount.py
index dcfa03559..ce30be7ec 100644
--- a/ipalib/plugins/automount.py
+++ b/ipalib/plugins/automount.py
@@ -188,7 +188,7 @@ class automountlocation(LDAPObject):
     object_class = ['nscontainer']
     default_attributes = ['cn']
     label = _('Automount Locations')
-    label_singular = _('automount location')
+    label_singular = _('Automount Location')
 
     takes_params = (
         Str('cn',
@@ -513,7 +513,7 @@ class automountmap(LDAPObject):
     )
 
     label = _('Automount Maps')
-    label_singular = _('automount map')
+    label_singular = _('Automount Map')
 
 api.register(automountmap)
 
@@ -605,7 +605,7 @@ class automountkey(LDAPObject):
 
     num_parents = 2
     label = _('Automount Keys')
-    label_singular = _('automount key')
+    label_singular = _('Automount Key')
     already_exists_msg = _('The key,info pair must be unique. A key named %(key)s with info %(info)s already exists')
     key_already_exists_msg = _('key named %(key)s already exists')
     object_not_found_msg = _('The automount key %(key)s with info %(info)s does not exist')
diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py
index 87a9fbed3..8d58422bd 100644
--- a/ipalib/plugins/baseldap.py
+++ b/ipalib/plugins/baseldap.py
@@ -280,7 +280,7 @@ class LDAPObject(Object):
         ),
     }
     label = _('Entry')
-    label_singular = _('entry')
+    label_singular = _('Entry')
 
     container_not_found_msg = _('container entry (%(container)s) not found')
     parent_not_found_msg = _('%(parent)s: %(oname)s not found')
diff --git a/ipalib/plugins/config.py b/ipalib/plugins/config.py
index 82b8e8994..b973e43bc 100644
--- a/ipalib/plugins/config.py
+++ b/ipalib/plugins/config.py
@@ -90,7 +90,7 @@ class config(LDAPObject):
     ]
 
     label = _('Configuration')
-    label_singular = _('configuration')
+    label_singular = _('Configuration')
 
     takes_params = (
         Int('ipamaxusernamelength?',
diff --git a/ipalib/plugins/delegation.py b/ipalib/plugins/delegation.py
index 0327b1dab..bb0431e88 100644
--- a/ipalib/plugins/delegation.py
+++ b/ipalib/plugins/delegation.py
@@ -100,7 +100,7 @@ class delegation(Object):
     object_name = _('delegation')
     object_name_plural = _('delegations')
     label = _('Delegations')
-    label_singular = _('delegation')
+    label_singular = _('Delegation')
 
     takes_params = (
         Str('aciname',
diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py
index e7a0a05a3..2928a9000 100644
--- a/ipalib/plugins/dns.py
+++ b/ipalib/plugins/dns.py
@@ -286,7 +286,7 @@ class dnszone(LDAPObject):
         'idnssoaminimum'
     ] + _record_attributes
     label = _('DNS Zones')
-    label_singular = _('DNS zone')
+    label_singular = _('DNS Zone')
 
     takes_params = (
         Str('idnsname',
@@ -544,7 +544,7 @@ class dnsrecord(LDAPObject):
     default_attributes = _record_attributes + ['idnsname']
 
     label = _('DNS Resource Records')
-    label_singular = _('DNS resource record')
+    label_singular = _('DNS Resource Record')
 
     takes_params = (
         Str('idnsname',
diff --git a/ipalib/plugins/entitle.py b/ipalib/plugins/entitle.py
index 03b6f02f0..74ee874b7 100644
--- a/ipalib/plugins/entitle.py
+++ b/ipalib/plugins/entitle.py
@@ -187,7 +187,7 @@ class entitle(LDAPObject):
     uuid_attribute = 'ipaentitlementid'
 
     label = _('Entitlements')
-    label_singular = _('entitlement')
+    label_singular = _('Entitlement')
 
     """
     def get_dn(self, *keys, **kwargs):
diff --git a/ipalib/plugins/group.py b/ipalib/plugins/group.py
index 819d8c832..3298b2bd3 100644
--- a/ipalib/plugins/group.py
+++ b/ipalib/plugins/group.py
@@ -98,7 +98,7 @@ class group(LDAPObject):
     rdnattr = 'cn'
 
     label = _('User Groups')
-    label_singular = _('user group')
+    label_singular = _('User Group')
 
     takes_params = (
         Str('cn',
diff --git a/ipalib/plugins/hbacrule.py b/ipalib/plugins/hbacrule.py
index b4398b85b..2488b1d91 100644
--- a/ipalib/plugins/hbacrule.py
+++ b/ipalib/plugins/hbacrule.py
@@ -124,7 +124,7 @@ class hbacrule(LDAPObject):
     }
 
     label = _('HBAC Rules')
-    label_singular = _('HBAC rule')
+    label_singular = _('HBAC Rule')
 
     takes_params = (
         Str('cn',
diff --git a/ipalib/plugins/hbacsvc.py b/ipalib/plugins/hbacsvc.py
index 552bd1acf..7ba1bf6bd 100644
--- a/ipalib/plugins/hbacsvc.py
+++ b/ipalib/plugins/hbacsvc.py
@@ -59,7 +59,7 @@ class hbacsvc(LDAPObject):
     uuid_attribute = 'ipauniqueid'
 
     label = _('HBAC Services')
-    label_singular = _('HBAC service')
+    label_singular = _('HBAC Service')
 
     takes_params = (
         Str('cn',
diff --git a/ipalib/plugins/hbacsvcgroup.py b/ipalib/plugins/hbacsvcgroup.py
index 609958343..12db5f341 100644
--- a/ipalib/plugins/hbacsvcgroup.py
+++ b/ipalib/plugins/hbacsvcgroup.py
@@ -62,7 +62,7 @@ class hbacsvcgroup(LDAPObject):
     }
 
     label = _('HBAC Service Groups')
-    label_singular = _('HBAC service group')
+    label_singular = _('HBAC Service Group')
 
     takes_params = (
         Str('cn',
diff --git a/ipalib/plugins/host.py b/ipalib/plugins/host.py
index 37d906d48..5cd1056ec 100644
--- a/ipalib/plugins/host.py
+++ b/ipalib/plugins/host.py
@@ -244,7 +244,7 @@ class host(LDAPObject):
     }
 
     label = _('Hosts')
-    label_singular = _('host')
+    label_singular = _('Host')
 
     takes_params = (
         Str('fqdn', validate_host,
diff --git a/ipalib/plugins/hostgroup.py b/ipalib/plugins/hostgroup.py
index 5b231316a..11ed66376 100644
--- a/ipalib/plugins/hostgroup.py
+++ b/ipalib/plugins/hostgroup.py
@@ -71,7 +71,7 @@ class hostgroup(LDAPObject):
     }
 
     label = _('Host Groups')
-    label_singular = _('host group')
+    label_singular = _('Host Group')
 
     takes_params = (
         Str('cn',
diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py
index e580df8e4..6f279834a 100644
--- a/ipalib/plugins/internal.py
+++ b/ipalib/plugins/internal.py
@@ -348,7 +348,7 @@ class i18n_messages(Command):
             "dirty_message":_("This page has unsaved changes. Please save or revert."),
             "dirty_title":_("Dirty"),
             "hide_already_enrolled":_("Hide already enrolled."),
-            "remove_empty":_("Select ${entity} to be removed."),
+            "remove_empty":_("Select entries to be removed."),
             "remove_title":_("Remove ${entity}"),
             "prospective":_("Prospective"),
             },
diff --git a/ipalib/plugins/krbtpolicy.py b/ipalib/plugins/krbtpolicy.py
index e24b5447e..f16353d06 100644
--- a/ipalib/plugins/krbtpolicy.py
+++ b/ipalib/plugins/krbtpolicy.py
@@ -77,7 +77,7 @@ class krbtpolicy(LDAPObject):
     limit_object_classes = ['krbticketpolicyaux']
 
     label=_('Kerberos Ticket Policy')
-    label_singular = _('Kerberos ticket policy')
+    label_singular = _('Kerberos Ticket Policy')
 
     takes_params = (
         Str('uid?',
diff --git a/ipalib/plugins/netgroup.py b/ipalib/plugins/netgroup.py
index 65949a822..b0c3b652a 100644
--- a/ipalib/plugins/netgroup.py
+++ b/ipalib/plugins/netgroup.py
@@ -96,7 +96,7 @@ class netgroup(LDAPObject):
     }
 
     label = _('Netgroups')
-    label_singular = _('netgroup')
+    label_singular = _('Netgroup')
 
     takes_params = (
         Str('cn',
diff --git a/ipalib/plugins/permission.py b/ipalib/plugins/permission.py
index 4f37790df..75adc9174 100644
--- a/ipalib/plugins/permission.py
+++ b/ipalib/plugins/permission.py
@@ -105,7 +105,7 @@ class permission(LDAPObject):
     rdnattr='cn'
 
     label = _('Permissions')
-    label_singular = _('permission')
+    label_singular = _('Permission')
 
     takes_params = (
         Str('cn',
diff --git a/ipalib/plugins/privilege.py b/ipalib/plugins/privilege.py
index d1a63ace5..6365ab9b6 100644
--- a/ipalib/plugins/privilege.py
+++ b/ipalib/plugins/privilege.py
@@ -63,7 +63,7 @@ class privilege(LDAPObject):
     rdnattr='cn'
 
     label = _('Privileges')
-    label_singular = _('privilege')
+    label_singular = _('Privilege')
 
     takes_params = (
         Str('cn',
diff --git a/ipalib/plugins/pwpolicy.py b/ipalib/plugins/pwpolicy.py
index 673f2ebf1..b2a9436fe 100644
--- a/ipalib/plugins/pwpolicy.py
+++ b/ipalib/plugins/pwpolicy.py
@@ -217,7 +217,7 @@ class pwpolicy(LDAPObject):
         )
 
     label = _('Password Policies')
-    label_singular = _('password policy')
+    label_singular = _('Password Policy')
 
     takes_params = (
         Str('cn?',
diff --git a/ipalib/plugins/role.py b/ipalib/plugins/role.py
index 365ee8372..c7e2f16c9 100644
--- a/ipalib/plugins/role.py
+++ b/ipalib/plugins/role.py
@@ -79,7 +79,7 @@ class role(LDAPObject):
     rdnattr='cn'
 
     label = _('Roles')
-    label_singular = _('role')
+    label_singular = _('Role')
 
     takes_params = (
         Str('cn',
diff --git a/ipalib/plugins/selfservice.py b/ipalib/plugins/selfservice.py
index 47650e039..61530987c 100644
--- a/ipalib/plugins/selfservice.py
+++ b/ipalib/plugins/selfservice.py
@@ -73,7 +73,7 @@ class selfservice(Object):
     object_name = _('self service permission')
     object_name_plural = _('self service permissions')
     label = _('Self Service Permissions')
-    label_singular = _('self service permission')
+    label_singular = _('Self Service Permission')
 
     takes_params = (
         Str('aciname',
diff --git a/ipalib/plugins/service.py b/ipalib/plugins/service.py
index 2fda56942..11970f401 100644
--- a/ipalib/plugins/service.py
+++ b/ipalib/plugins/service.py
@@ -218,7 +218,7 @@ class service(LDAPObject):
     }
 
     label = _('Services')
-    label_singular = _('service')
+    label_singular = _('Service')
 
     takes_params = (
         Str('krbprincipalname', validate_principal,
diff --git a/ipalib/plugins/sudocmd.py b/ipalib/plugins/sudocmd.py
index 2da041e0a..da78f0ec5 100644
--- a/ipalib/plugins/sudocmd.py
+++ b/ipalib/plugins/sudocmd.py
@@ -62,7 +62,7 @@ class sudocmd(LDAPObject):
     }
     uuid_attribute = 'ipauniqueid'
     label = _('Sudo Commands')
-    label_singular = _('sudo command')
+    label_singular = _('Sudo Command')
 
     takes_params = (
         Str('sudocmd',
diff --git a/ipalib/plugins/sudocmdgroup.py b/ipalib/plugins/sudocmdgroup.py
index fe7d670c8..e613f4657 100644
--- a/ipalib/plugins/sudocmdgroup.py
+++ b/ipalib/plugins/sudocmdgroup.py
@@ -63,7 +63,7 @@ class sudocmdgroup(LDAPObject):
     }
 
     label = _('Sudo Command Groups')
-    label_singular = _('sudo command group')
+    label_singular = _('Sudo Command Group')
 
     takes_params = (
         Str('cn',
diff --git a/ipalib/plugins/sudorule.py b/ipalib/plugins/sudorule.py
index c1bbfb62c..a1d05a815 100644
--- a/ipalib/plugins/sudorule.py
+++ b/ipalib/plugins/sudorule.py
@@ -66,7 +66,7 @@ class sudorule(LDAPObject):
     }
 
     label = _('Sudo Rules')
-    label_singular = _('sudo rule')
+    label_singular = _('Sudo Rule')
 
     takes_params = (
         Str('cn',
diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py
index f0ee8f5b8..e6060c0f3 100644
--- a/ipalib/plugins/user.py
+++ b/ipalib/plugins/user.py
@@ -114,8 +114,8 @@ class user(LDAPObject):
     rdnattr = 'uid'
     bindable = True
 
-    label_singular = _('user')
     label = _('Users')
+    label_singular = _('User')
 
     takes_params = (
         Str('uid',