[trunk] - language - update en_UK - English - Thanks to mixedbredie - step 2 - feature:2320

git-svn-id: http://piwigo.org/svn/trunk@12285 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 27 insertions, 53 deletions

diff --git a/language/en_UK/help/group_list.html b/language/en_UK/help/group_list.html
index d74705a60..eeae61d4c 100644
--- a/language/en_UK/help/group_list.html
+++ b/language/en_UK/help/group_list.html
@@ -1,6 +1,6 @@
 <h2>Groups list</h2>
 
-<p>This is the place where you can manage groups.</p>
+<p>This is the place where you manage groups.</p>
 
 <h3>Add a group</h3>
 
@@ -8,15 +8,15 @@
 
 <h3>Groups list</h3>
 
-<p>For each element, the list allows to:</p>
+<p>For each group the following actions can be applied:</p>
 
 
 <ul>
-  <li>go to the members list</li>
-  <li>go to the permissions management screen</li>
+  <li>go to user management (Admin &raquo; Users &raquo; Manage)</li>
+  <li>go to permissions management screen to grant or deny access to private albums.</li>
   <li>delete the group (requires a confirmation)</li>
   <li>toggle status "default" (requires a confirmation)</li>
 </ul>
 
 <h3>Default groups</h3>
-<p>Default groups are groups that are automatically associated to each new user upon registration or creation by an administrator.</p>
\ No newline at end of file
+<p>Default groups are groups that are automatically associated to each new user upon registration or creation by an administrator.</p>
diff --git a/language/en_UK/help/history.html b/language/en_UK/help/history.html
index 43743010e..701b2de10 100644
--- a/language/en_UK/help/history.html
+++ b/language/en_UK/help/history.html
@@ -1,44 +1,22 @@
 <h2>History</h2>
 
-<p>On these screens, you can monitor your gallery visits history
-according to the options you have chosen in - Administration &raquo; Configuration &raquo; Options &raquo; History index.</p>
+<p>On these screens, you can monitor your gallery visits history according to the options you have chosen in: Administration &raquo; Configuration &raquo; Options &raquo; History</p>
 	
 <h3>Statistics</h3>
 <ul>
-  <p>If you have chosen to record the(<span
-class="pwgScreen">index.php</span> and <span
-class="pwgScreen">picture.php</span>) visited pages in the table <code>history</code>, 
-you can monitor them from this tab.</p>
-	
+  <p>If you have chosen to record the pages visited (<span class="pwgScreen">index.php</span> and <span class="pwgScreen">picture.php</span>), you can monitor them from this tab.</p>
 	<li><strong>Global statistics</strong>: visits per year. </li>
-	
 	<li><strong>Yearly statistics</strong>: visits per month in the selected year .</li>
-	
 	<li><strong>Monthly statistics</strong>: visits per days in the selected month .</li>
-	
 	<li><strong>Daily statistics</strong>: visits per hours in the selected day.</li>
-	
 </ul>
 
 <h3>Search</h3>
 <ul>
-  <p>If you have chosen to record the (<span
-class="pwgScreen">index.php</span> and <span
-class="pwgScreen">picture.php</span>) pages visited in the table <code>history. </code>, you can browse the details of the visited pages from this tab, 
-with the help of different filters.</p>
- 
-	<li><strong>Filter per date</strong> : choose the date range you want
-	to observe the activity.</li>
-	
-	<li><strong>Filter per type of element</strong> : choose the type 
-	of element you want to observe the activity.</li>
-	
-	<li><strong>Filter per user</strong> : choose the user you want to 
-	observe the activity.</li>
-	
-	<li><strong>Filter per name of the file</strong> : choose the file name 
-	you	want to observe the activity.</li>
-	
-	<li><strong>Filter per image identifier</strong> : choose the image identifier 
-	you want to observe the activity.</li>
+  <p>If you have chosen to record the pages visited (<span class="pwgScreen">index.php</span> and <span class="pwgScreen">picture.php</span>), you can browse the details  from this tab with the help of different filters.</p>
+	<li><strong>Filter by date:</strong> select the date range to search by setting start and end dates.</li>
+	<li><strong>Filter by type of element:</strong> select the type of element for statistics on that element.</li>
+	<li><strong>Filter by user:</strong> select the user for statistics on that user.</li>
+	<li><strong>Filter by image identifier:</strong> select the image identifier for statistics on that image.</li>
+	<li><strong>Filter by name of the file:</strong> select the file name for statistics on that file..</li>
 </ul>
\ No newline at end of file
diff --git a/language/en_UK/help/notification_by_mail.html b/language/en_UK/help/notification_by_mail.html
index 0dee0c076..da9ac2a97 100644
--- a/language/en_UK/help/notification_by_mail.html
+++ b/language/en_UK/help/notification_by_mail.html
@@ -1,15 +1,15 @@
-<h2>Notification by mail</h2>
+<h2>Notification By Mail (NBM)</h2>
 
-<p>This screen allows to configure and manage email to users, to notify them of changes to your site.</p>
+<p>Configure and manage email notifications to users notifying them of changes to your site.</p>
 
-<p>This screen comprises 3 tabs:</p>
+<p>This screen comprises three tabs:</p>
 
-<h3>Parameters</h3>
-<p>Available only for webmasters, this tab sets parameters of the notification by mail.</p>
+<h3>Settings</h3>
+<p>Available only for webmasters, this tab sets the notification by mail parameters.</p>
 
 <h3>Subscribe</h3>
-<p>Available only for webmasters, this tab manages users subscription/unsubscription to email notifications.</p>
+<p>Available only for webmasters, this tab manages a user's subscription to email notifications.  Add users to the subscribed box for them to receive notifications by mail.</p>
 
-<h3>Envoi</h3>
-<p>Available only for webmasters and administrators, this tab allows to send mails to notify of changes.</p>
+<h3>Send</h3>
+<p>Available only for webmasters and administrators, this tab allows administrators to send notification emails to subscribed users.</p>
 
diff --git a/language/en_UK/help/user_list.html b/language/en_UK/help/user_list.html
index f991f3abb..371facf87 100644
--- a/language/en_UK/help/user_list.html
+++ b/language/en_UK/help/user_list.html
@@ -1,27 +1,23 @@
 <h2>Users list</h2>
 
-<p>This is the place for managing registered users properties, except permissions that are managed from other screens.</p>
+<p>This is where you manage the users of your Piwigo gallery.</p>
 
 <h3>Add a user</h3>
 
-<p>Administrator can add users manually.</p>
+<p>An administrator can add users manually.  For each user create a username, a password and submit a valid email address.</p>
 
 <h3>Users list</h3>
 
-<p>The list can be filtered on username (use * as wildcard), group or
-status. It can be ordered by registration date or username, in ascending
-or descending order.</p>
+<p>The list of existing users can be filtered on username (use * as wildcard), group or status. It can be ordered by registration date or username, in ascending or descending order.</p>
 
 <p>This screen allows the management of several users at once, using different actions:</p>
 
 <ul>
-
   <li>delete users (requires confirmation)</li>
-  <li>change status</li>
+  <li>change the status of the user</li>
   <li>associate or dissociate from groups</li>
   <li>modify display properties</li>
-  <li>modify additional properties</li>
-
+  <li>modify additional preferences</li>
 </ul>
 
-<p>The target is the selected users (by default) or all users as displayed in the filtered list.</p>
+<p>The target is the selected user (by default) or all users as displayed in the filtered list.</p>
\ No newline at end of file