Merge and resolve conflict

ui-ngx/src/assets/locale/locale.constant-en_US.json

@@ -2670,9 +2670,9 @@
     },
     "notification": {
         "action-button": "Action button",
-        "add-notification-target": "Add notification target",
+        "add-notification-target": "Add notification recipient",
         "add-notification-template": "Add notification template",
-        "add-target": "Add target",
+        "add-target": "Add recipient",
         "add-template": "Add template",
         "at-least-one-should-be-selected": "At least one should be selected",
         "all": "All",
@@ -2682,12 +2682,12 @@
         "compose": "Compose",
         "add-rule": "Add rule",
         "copy-notification-template": "Copy notification template",
-        "create-target": "Create target",
+        "create-target": "Create recipient",
         "created-time": "Created time",
         "delete-request-text": "Be careful, after the confirmation the notification request will become unrecoverable.",
         "delete-request-title": "Are you sure you want to delete the notification request?",
-        "delete-target-text": "Be careful, after the confirmation the notification target will become unrecoverable.",
+        "delete-target-text": "Be careful, after the confirmation the notification recipient will become unrecoverable.",
-        "delete-target-title": "Are you sure you want to delete the notification target '{{targetName}}'?",
+        "delete-target-title": "Are you sure you want to delete the notification recipient '{{targetName}}'?",
         "delete-template-text": "Be careful, after the confirmation the notification template will become unrecoverable.",
         "delete-template-title": "Are you sure you want to delete the notification template '{{templateName}}'?",
         "delivery-method": "Delivery method",
@@ -2701,7 +2701,7 @@
         "delete-rule-text": "Be careful, after the confirmation the notification rule will become unrecoverable.",
         "delete-rule-title": "Are you sure you want to delete the notification rule '{{ruleName}}'?",
         "description": "Description",
-        "edit-notification-target": "Edit notification target",
+        "edit-notification-target": "Edit notification recipient",
         "edit-notification-template": "Edit notification template",
         "email-settings": "Email settings",
         "get-customer-id-from-originator": "Get Customer id from originator",
@@ -2718,10 +2718,10 @@
         "no-notification-request": "No notification request",
         "no-notification-templates": "No notification templates",
         "no-notifications-yet": "No notifications yet",
-        "no-targets-notification": "No targets notification",
+        "no-targets-notification": "No recipients notification",
         "notification": "Notification",
         "notification-center": "Notification center",
-        "notification-target": "Notification target",
+        "notification-target": "Notification recipient",
         "recipients-count": "{ count, plural, 1 {1 Recipient} other {# Recipients} }",
         "requet-status": {
             "processing": "Processing",
@@ -2733,7 +2733,7 @@
         "rule": "Rule",
         "rules": "Rules",
         "search-notification": "Search notification",
-        "search-targets": "Search targets",
+        "search-targets": "Search recipients",
         "search-templates": "Search templates",
         "search-rules": "Search rules",
         "send-notification": "Send notification",
@@ -2745,7 +2745,7 @@
         "status": "Status",
         "subject": "Subject",
         "subject-required": "Subject is required",
-        "target": "Target",
+        "target": "Recipient",
         "target-name": "Name",
         "target-name-required": "Name is required",
         "target-type": {
@@ -2754,8 +2754,8 @@
             "type": "Type",
             "user-list": "User list"
         },
-        "targets": "Targets",
+        "targets": "Recipients",
-        "targets-required": "Targets is required",
+        "targets-required": "Recipients is required",
         "recipient": "Recipient",
         "template": "Template",
         "template-required": "Template is required",
@@ -2767,8 +2767,8 @@
         "text": "Text",
         "type": "Type",
         "unread": "Unread",
-        "view-all": "View al;",
+        "view-all": "View all",
-        "web-settings": "Web settings",
+        "web-settings": "Web settings"
         "rule-name": "Rule name",
         "rule-name-required": "Name is required",
         "template-name": "Template name",