From eb506a3f7743a91b81105b6e17c4405e12306e0a Mon Sep 17 00:00:00 2001
From: Stanislav Levin <slev@altlinux.org>
Date: Oct 03 2018 11:14:52 +0000
Subject: Add title to 'add' dialog for 'association_table' widget of Hosts entity


To improve translation quality the title of 'Add' dialog,
which is initialized within details table of the entity, should be
specified explicitly in the spec and should be an entire sentence.

Fixes: https://pagure.io/freeipa/issue/7712
Fixes: https://pagure.io/freeipa/issue/7714
Reviewed-By: Serhii Tsymbaliuk <stsymbal@redhat.com>

---

diff --git a/install/ui/src/freeipa/host.js b/install/ui/src/freeipa/host.js
index eda42e0..492cf3d 100644
--- a/install/ui/src/freeipa/host.js
+++ b/install/ui/src/freeipa/host.js
@@ -201,7 +201,7 @@ return {
                             flags: ['w_if_no_aci'],
                             add_method: 'allow_retrieve_keytab',
                             remove_method: 'disallow_retrieve_keytab',
-                            add_title: '@i18n:keytab.add_retrive',
+                            add_title: '@i18n:keytab.add_users_retrieve',
                             remove_title: '@i18n:keytab.remove_users_retrieve',
                             columns: [
                                 {
@@ -218,7 +218,7 @@ return {
                             flags: ['w_if_no_aci'],
                             add_method: 'allow_retrieve_keytab',
                             remove_method: 'disallow_retrieve_keytab',
-                            add_title: '@i18n:keytab.add_retrive',
+                            add_title: '@i18n:keytab.add_groups_retrieve',
                             remove_title: '@i18n:keytab.remove_groups_retrieve',
                             columns: [
                                 {
@@ -235,7 +235,7 @@ return {
                             flags: ['w_if_no_aci'],
                             add_method: 'allow_retrieve_keytab',
                             remove_method: 'disallow_retrieve_keytab',
-                            add_title: '@i18n:keytab.add_retrive',
+                            add_title: '@i18n:keytab.add_hosts_retrieve',
                             remove_title: '@i18n:keytab.remove_hosts_retrieve',
                             columns: [
                                 {
@@ -252,7 +252,7 @@ return {
                             flags: ['w_if_no_aci'],
                             add_method: 'allow_retrieve_keytab',
                             remove_method: 'disallow_retrieve_keytab',
-                            add_title: '@i18n:keytab.add_retrive',
+                            add_title: '@i18n:keytab.add_hostgroups_retrieve',
                             remove_title: '@i18n:keytab.remove_hostgroups_retrieve',
                             columns: [
                                 {
@@ -276,7 +276,7 @@ return {
                             flags: ['w_if_no_aci'],
                             add_method: 'allow_create_keytab',
                             remove_method: 'disallow_create_keytab',
-                            add_title: '@i18n:keytab.add_create',
+                            add_title: '@i18n:keytab.add_users_create',
                             remove_title: '@i18n:keytab.remove_users_create',
                             columns: [
                                 {
@@ -293,7 +293,7 @@ return {
                             flags: ['w_if_no_aci'],
                             add_method: 'allow_create_keytab',
                             remove_method: 'disallow_create_keytab',
-                            add_title: '@i18n:keytab.add_create',
+                            add_title: '@i18n:keytab.add_groups_create',
                             remove_title: '@i18n:keytab.remove_groups_create',
                             columns: [
                                 {
@@ -310,7 +310,7 @@ return {
                             flags: ['w_if_no_aci'],
                             add_method: 'allow_create_keytab',
                             remove_method: 'disallow_create_keytab',
-                            add_title: '@i18n:keytab.add_create',
+                            add_title: '@i18n:keytab.add_hosts_create',
                             remove_title: '@i18n:keytab.remove_hosts_create',
                             columns: [
                                 {
@@ -327,7 +327,7 @@ return {
                             flags: ['w_if_no_aci'],
                             add_method: 'allow_create_keytab',
                             remove_method: 'disallow_create_keytab',
-                            add_title: '@i18n:keytab.add_create',
+                            add_title: '@i18n:keytab.add_hostgroups_create',
                             remove_title: '@i18n:keytab.remove_hostgroups_create',
                             columns: [
                                 {
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 5328af7..05631f0 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -306,8 +306,30 @@ class i18n_messages(Command):
         },
         "false": _("False"),
         "keytab": {
-            "add_create": _("Allow ${other_entity} to create keytab of ${primary_key}"),
-            "add_retrive": _("Allow ${other_entity} to retrieve keytab of ${primary_key}"),
+            "add_groups_create": _(
+                "Allow user groups to create keytab of '${primary_key}'"
+            ),
+            "add_groups_retrieve": _(
+                "Allow user groups to retrieve keytab of '${primary_key}'"
+            ),
+            "add_hostgroups_create": _(
+                "Allow host groups to create keytab of '${primary_key}'"
+            ),
+            "add_hostgroups_retrieve": _(
+                "Allow host groups to retrieve keytab of '${primary_key}'"
+            ),
+            "add_hosts_create": _(
+                "Allow hosts to create keytab of '${primary_key}'"
+            ),
+            "add_hosts_retrieve": _(
+                "Allow hosts to retrieve keytab of '${primary_key}'"
+            ),
+            "add_users_create": _(
+                "Allow users to create keytab of '${primary_key}'"
+            ),
+            "add_users_retrieve": _(
+                "Allow users to retrieve keytab of '${primary_key}'"
+            ),
             "allowed_to_create": _("Allowed to create keytab"),
             "allowed_to_retrieve": _("Allowed to retrieve keytab"),
             "remove_groups_create": _(