Fixed entity labels.

The entity labels in the following locations have been fixed:
 - search facet title: plural
 - details facet title: singular
 - association facet title: singular
 - breadcrumb: plural
 - adder dialog title: singular
 - deleter dialog title: plural

Some entity labels have been changed into the correct plural form.
Unused file install/ui/test/data/i18n_messages.json has been removed.

Ticket #1249
Ticket #1387

8 files changed, 11 insertions, 35 deletions

diff --git a/ipalib/plugins/delegation.py b/ipalib/plugins/delegation.py
index 07f602be7..ad6106a4b 100644
--- a/ipalib/plugins/delegation.py
+++ b/ipalib/plugins/delegation.py
@@ -99,7 +99,7 @@ class delegation(Object):
     bindable = False
     object_name = 'delegation',
     object_name_plural = 'delegation',
-    label = _('Delegation')
+    label = _('Delegations')
     label_singular = _('delegation')
 
     takes_params = (
diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py
index d5cffe46d..2bba446d0 100644
--- a/ipalib/plugins/dns.py
+++ b/ipalib/plugins/dns.py
@@ -282,7 +282,7 @@ class dnszone(LDAPObject):
         'idnssoaserial', 'idnssoarefresh', 'idnssoaretry', 'idnssoaexpire',
         'idnssoaminimum'
     ] + _record_attributes
-    label = _('DNS')
+    label = _('DNS Zones')
     label_singular = _('DNS zone')
 
     takes_params = (
@@ -521,7 +521,7 @@ class dnsrecord(LDAPObject):
     object_class = ['top', 'idnsrecord']
     default_attributes = _record_attributes + ['idnsname']
 
-    label = _('DNS resource record')
+    label = _('DNS Resource Records')
     label_singular = _('DNS resource record')
 
     takes_params = (
diff --git a/ipalib/plugins/hbacrule.py b/ipalib/plugins/hbacrule.py
index 531d2d90f..3eff396fc 100644
--- a/ipalib/plugins/hbacrule.py
+++ b/ipalib/plugins/hbacrule.py
@@ -123,7 +123,7 @@ class hbacrule(LDAPObject):
         'memberservice': ['hbacsvc', 'hbacsvcgroup'],
     }
 
-    label = _('HBAC Rule')
+    label = _('HBAC Rules')
     label_singular = _('HBAC rule')
 
     takes_params = (
diff --git a/ipalib/plugins/hbacsvcgroup.py b/ipalib/plugins/hbacsvcgroup.py
index 1685f9115..4823a8b37 100644
--- a/ipalib/plugins/hbacsvcgroup.py
+++ b/ipalib/plugins/hbacsvcgroup.py
@@ -61,7 +61,7 @@ class hbacsvcgroup(LDAPObject):
         'member': ['hbacsvc'],
     }
 
-    label = _('HBAC service Groups')
+    label = _('HBAC Service Groups')
     label_singular = _('HBAC service group')
 
     takes_params = (
diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py
index 78c5a8480..06f07dbd8 100644
--- a/ipalib/plugins/internal.py
+++ b/ipalib/plugins/internal.py
@@ -99,14 +99,11 @@ class i18n_messages(Command):
                 "attribute":_("Attribute"),
                 },
             "automountlocation": {
-                "add":_("Add Automount Location"),
                 "identity":_("Automount Location Settings")
                 },
             "automountmap": {
-                "add":_("Add Automount Map")
                 },
             "automountkey": {
-                "add":_("Add Automount Key")
                 },
             "cert": {
                 "unspecified":_("Unspecified"),
@@ -152,26 +149,21 @@ class i18n_messages(Command):
                 "cn":_("Name"),
                 },
             "delegation": {
-                "add":_("Add Delegation"),
                 },
             "dnszone": {
-                "add":_("Add DNS Zone"),
                 "identity":_("DNS Zone Settings"),
                 },
             "dnsrecord": {
-                "add":_("Add DNS Resource Record"),
                 "resource":_("Resource"),
                 "type":_("Type"),
                 "data":_("Data"),
                 "title":_("Records for DNS Zone"),
                 },
             "group": {
-                "add":_("Add Group"),
                 "details":_("Group Settings"),
                 "posix":_("Is this a POSIX group?"),
                 },
             "hbacrule": {
-                "add":_("Add HBAC Rule"),
                 "active":_("Active"),
                 "allow":_("Allow"),
                 "deny":_("Deny"),
@@ -189,14 +181,11 @@ class i18n_messages(Command):
                 "sourcehost":_("From"),
                 },
             "hbacsvc": {
-                "add":_("Add HBAC Service"),
                 },
             "hbacsvcgroup": {
-                "add":_("Add HBAC Service Group"),
                 "services":_("Services"),
                 },
             "host": {
-                "add":_("Add Host"),
                 "certificate":_("Host Certificate"),
                 "cn":_("Host Name"),
                 "details":_("Host Settings"),
@@ -216,18 +205,15 @@ class i18n_messages(Command):
                 "unprovision":_("Unprovision"),
                 },
             "hostgroup": {
-                "add":_("Add Host Group"),
                 "identity":_("Host Group Settings"),
                 },
             "krbtpolicy": {
                 "identity":_("Kerberos ticket policy"),
                 },
             "netgroup": {
-                "add":_("Add Netgroup"),
                 "identity":_("Netgroup Settings"),
                 },
             "permission": {
-                "add":_("Add Permission"),
                 "identity":_("Identity"),
                 "rights":_("Rights"),
                 "target":_("Target"),
@@ -238,22 +224,17 @@ class i18n_messages(Command):
                 "invalid_target":_("Permission with invalid target specification"),
                 },
             "privilege": {
-                "add":_("Add Privilege"),
                 "identity":_("Privilege Settings"),
                 },
             "pwpolicy": {
-                "add":_("Add Password Policy"),
                 "identity":_("Password Policy"),
                 },
             "role": {
-                "add":_("Add Role"),
                 "identity":_("Role Settings"),
                 },
             "selfservice": {
-                "add":_("Add Self Service Definition"),
                 },
             "service": {
-                "add":_("Add Service"),
                 "certificate":_("Service Certificate"),
                 "details":_("Service Settings"),
                 "host":_("Host Name"),
@@ -268,15 +249,12 @@ class i18n_messages(Command):
                 "unprovision":_("Unprovision"),
                 },
             "sudocmd": {
-                "add":_("Add Sudo Command"),
                 "groups":_("Groups"),
                 },
             "sudocmdgroup": {
-                "add":_("Add Sudo Command Group"),
                 "commands":_("Commands"),
                 },
             "sudorule": {
-                "add":_("Add Sudo Rule"),
                 "active":_("Active"),
                 "inactive":_("Inactive"),
                 "allow":_("Allow"),
@@ -297,7 +275,6 @@ class i18n_messages(Command):
                 "external":_("External"),
                 },
             "user": {
-                "add":_("Add User"),
                 "account":_("Account Settings"),
                 "contact":_("Contact Settings"),
                 "mailing":_("Mailing Address"),
@@ -321,7 +298,6 @@ class i18n_messages(Command):
             "add_and_edit":_("Add and Edit"),
             "add_and_close":_("Add and Close"),
             "add_many":_("Add Many"),
-            "back_to_list":_("Back to List"),
             "cancel": _("Cancel"),
             "close": _("Close"),
             "enroll":_("Enroll"),
@@ -338,12 +314,13 @@ class i18n_messages(Command):
             "view":_("View"),
             },
         "dialogs":{
+            "add_title":_("Add ${entity}"),
             "available":_("Available"),
             "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_title":_("Remove ${entity}."),
+            "remove_title":_("Remove ${entity}"),
             "prospective":_("Prospective"),
             },
         "facet_groups":{
@@ -373,6 +350,7 @@ class i18n_messages(Command):
             "to_top":_("Back to Top")
             },
         "tabs": {
+            "dns":_("DNS"),
             "identity":_("Identity"),
             "policy":_("Policy"),
             "audit": _("Audit"),
@@ -384,8 +362,6 @@ class i18n_messages(Command):
             },
         "association":{
             "add":_("Add ${other_entity} into ${entity} ${primary_key}"),
-            "member":_("${other_entity} enrolled in ${entity} ${primary_key}"),
-            "memberof":_("${entity} ${primary_key} is enrolled in the following ${other_entity}"),
             "remove":_("Remove ${other_entity} from ${entity} ${primary_key}"),
             },
         "widget":{
diff --git a/ipalib/plugins/pwpolicy.py b/ipalib/plugins/pwpolicy.py
index fc1f7015f..db1671365 100644
--- a/ipalib/plugins/pwpolicy.py
+++ b/ipalib/plugins/pwpolicy.py
@@ -216,7 +216,7 @@ class pwpolicy(LDAPObject):
             ),
         )
 
-    label = _('Password Policy')
+    label = _('Password Policies')
     label_singular = _('password policy')
 
     takes_params = (
diff --git a/ipalib/plugins/role.py b/ipalib/plugins/role.py
index dc6341ac4..cdbe5130a 100644
--- a/ipalib/plugins/role.py
+++ b/ipalib/plugins/role.py
@@ -78,7 +78,7 @@ class role(LDAPObject):
     }
     rdnattr='cn'
 
-    label = _('Role')
+    label = _('Roles')
     label_singular = _('role')
 
     takes_params = (
diff --git a/ipalib/plugins/sudorule.py b/ipalib/plugins/sudorule.py
index 1f0775783..a85e943f8 100644
--- a/ipalib/plugins/sudorule.py
+++ b/ipalib/plugins/sudorule.py
@@ -65,7 +65,7 @@ class sudorule(LDAPObject):
         'ipasudorunasgroup': ['group'],
     }
 
-    label = _('Sudo Rule')
+    label = _('Sudo Rules')
     label_singular = _('sudo rule')
 
     takes_params = (