From 5eef3a883eaf0b95a4ba3c8e2bcab099471e588f Mon Sep 17 00:00:00 2001
From: root <stremovsky@gmail.com>
Date: Thu, 4 Feb 2021 12:21:16 +0000
Subject: [PATCH] Rewrite messages

---
 ui/site/admin-audit.html             | 2 +-
 ui/site/admin-privacy-settings.html  | 2 +-
 ui/site/admin-view-requests.html     | 6 +++---
 ui/site/login.html                   | 2 +-
 ui/site/user-audit.html              | 4 ++--
 ui/site/user-consent-management.html | 4 ++--
 ui/site/user-profile.html            | 6 +++---
 ui/site/user-requests.html           | 6 +++---
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ui/site/admin-audit.html b/ui/site/admin-audit.html
index 120e945..7a08d7e 100644
--- a/ui/site/admin-audit.html
+++ b/ui/site/admin-audit.html
@@ -186,7 +186,7 @@ if (conf["custom_css_link"]) {
       </div>
       <div class="bigblock">
         <h4>Admin activity history</h4>
-        <p id="msg">All profile operations and changes.</p>
+        <p id="msg">A list of all operations with user profiles.</p>
         <table id="table" class="table">
           <thead>
             <tr>
diff --git a/ui/site/admin-privacy-settings.html b/ui/site/admin-privacy-settings.html
index 9c560fd..5c39aad 100644
--- a/ui/site/admin-privacy-settings.html
+++ b/ui/site/admin-privacy-settings.html
@@ -601,7 +601,7 @@ h4 {display:inline-block; }
           <thead>
             <tr>
               <th scope="col-4" class="w-25" data-field="activity" data-formatter="displayActivity">Processing operation</th>
-			  <th scope="col-3" class="w-25" data-field="briefs" data-formatter="displayLegalBasis">Legal Basis</th>
+			  <th scope="col-3" class="w-25" data-field="briefs" data-formatter="displayLegalBasis">Legal basis</th>
               <th scope="col-3" class="w-25" data-field="fulldesc" data-formatter="displayDescription">Description</th>
               <th scope="col-2" data-field="rtoken" data-formatter="displayProcessingActions">Actions</th>
             </tr>
diff --git a/ui/site/admin-view-requests.html b/ui/site/admin-view-requests.html
index 19ce850..1838ee0 100644
--- a/ui/site/admin-view-requests.html
+++ b/ui/site/admin-view-requests.html
@@ -252,13 +252,13 @@ textarea {min-height:auto;}
       </div>
       <div class="bigblock">
         <h4>User requests</h4>
-        <p id="msg">All open requests listed below.</p>
+        <p id="msg">A list of all user outstanding requests.</p>
         <table id="table" class="table">
           <thead>
             <tr>
-              <th scope="col-4" data-field="action" data-formatter="displayActivity">Event name</th>
+              <th scope="col-4" data-field="action" data-formatter="displayActivity">Request name</th>
               <th scope="col-2" data-field="when" data-formatter="dateFormat">Time</th>
-              <th scope="col-2" data-field="token" data-formatter="displayTargetObject">User Token</th>
+              <th scope="col-2" data-field="token" data-formatter="displayTargetObject">User token</th>
               <th scope="col-2" data-field="status">Status</th>
               <th scope="col-2" data-field="rtoken" data-formatter="displayDrillDownLink">Actions</th>
             </tr>
diff --git a/ui/site/login.html b/ui/site/login.html
index 88cc9a5..ffcbff2 100644
--- a/ui/site/login.html
+++ b/ui/site/login.html
@@ -42,7 +42,7 @@ if (conf["custom_css_link"]) {
         <div class="row">
             <div class="bigblock">
                 <h4>Verification step</h4>
-                <p>Enter the code you received by email or SMS</p>
+                <p>Enter the code you received by email or by SMS</p>
                 <form id="loginform">
                     <div class="form-group"><label class="text-normal text-dark">Enter code</label>
                         <input id="codevalue" autocomplete="off" type="login" class="form-control" placeholder="Enter..."></div>
diff --git a/ui/site/user-audit.html b/ui/site/user-audit.html
index 183062b..e48578b 100644
--- a/ui/site/user-audit.html
+++ b/ui/site/user-audit.html
@@ -189,8 +189,8 @@ if (conf["custom_css_link"]) {
         </nav>
       </div>
       <div class="bigblock">
-        <h4>Profile activity history</h4>
-        <p id="msg">All profile operations and changes.</p>
+        <h4>User profile activity</h4>
+        <p id="msg">A list of all operations with the profile records.</p>
         <table id="table" class="table">
           <thead>
             <tr>
diff --git a/ui/site/user-consent-management.html b/ui/site/user-consent-management.html
index 71ab796..2a3a335 100644
--- a/ui/site/user-consent-management.html
+++ b/ui/site/user-consent-management.html
@@ -48,8 +48,8 @@ if (conf["custom_css_link"]) {
                 </nav>
             </div>
             <div class="bigblock">
-                <h4>Privacy portal</h4>
-                <p id="msg">Manage all your consents in one screen. You can easily give or withdraw consent.</p>
+                <h4>My agreements</h4>
+                <p id="msg">Manage all your agreements in one screen. You can easily give or withdraw consent.</p>
                 <div id="data"></div>
             </div>
         </div>
diff --git a/ui/site/user-profile.html b/ui/site/user-profile.html
index 3320177..600f2bd 100644
--- a/ui/site/user-profile.html
+++ b/ui/site/user-profile.html
@@ -60,7 +60,7 @@ if (conf["custom_css_link"]) {
                         <button onclick="return forgetme();" class="btn btn-warning">Forget me</button>
                     </div>
                 </div>
-                <p id="msg">Click on a field to edit, when finished click Save.</p>
+                <p id="msg">Click on a field to edit. When done click on "Save".</p>
 		<div id='status-message'></div>
                 <div id="jsoneditor" style="width:100%;height:300px;overflow:auto;"></div>
                 <pre id="data"></pre>
@@ -92,7 +92,7 @@ if (conf["custom_css_link"]) {
         var editor;
         function forgetme() {
             var heading = "Confirm action";
-            var question = "Are you sure? This can not be undone.";
+            var question = "Are you sure? This operation can not be undone.";
             var cancelButtonTxt = "Close popup";
             var okButtonTxt = "Forget me!";
             var confirmModal =
@@ -131,7 +131,7 @@ if (conf["custom_css_link"]) {
                 if (xhr.status === 200) {
                     var data = JSON.parse(xhr.responseText);
                     if (data.status == "ok" && data.result && data.result == "request-created") {
-                        showAlert("Admin request created to cancel your account.");
+                        showAlert("Admin request created to remove your account.");
                     } else if (data.status == "ok" && data.result && data.result == "request-exists") {
                         showAlert("Similar request already exists for Admin approval.");
                     } else {
diff --git a/ui/site/user-requests.html b/ui/site/user-requests.html
index 6192625..93c4469 100644
--- a/ui/site/user-requests.html
+++ b/ui/site/user-requests.html
@@ -199,12 +199,12 @@
         </nav>
       </div>
       <div class="bigblock">
-        <h4>User requests</h4>
-        <p id="msg">All your requests listed below.</p>
+        <h4>My requests</h4>
+        <p id="msg">A list of all your requests.</p>
         <table id="table" class="table">
           <thead>
             <tr>
-              <th scope="col-4" data-field="action" data-formatter="displayActivity">Event Name</th>
+              <th scope="col-4" data-field="action" data-formatter="displayActivity">Request name</th>
               <th scope="col-2" data-field="when" data-formatter="dateFormat">Time</th>
               <th scope="col-2" data-field="status">Status</th>
 	      <th scope="col-2" data-field="reason">Info</th>