From ec6395c91169af249bd31d8eb06e103413cff749 Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Thu, 12 Jul 2007 00:06:16 +0000
Subject: - merge -r2063 from branch-1_7 to trunk - admin language and help
 file correction

git-svn-id: http://piwigo.org/svn/trunk@2064 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 language/en_UK.iso-8859-1/admin.lang.php        |  4 ++--
 language/en_UK.iso-8859-1/help/maintenance.html | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'language/en_UK.iso-8859-1')

diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 444b7ff1a..067a49330 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -367,8 +367,6 @@ $lang['permuser_info'] = 'Only private categories are listed. Private/Public cat
 $lang['private'] = 'private';
 $lang['properties'] = 'Properties';
 $lang['public'] = 'public';
-$lang['purge history detail'] = 'purge history detail';
-$lang['purge history summary'] = 'purge history summary';
 $lang['purge never used notification feeds'] = 'purge never used notification feeds';
 $lang['purge sessions'] = 'purge sessions';
 $lang['randomly represented'] = 'randomly represented';
@@ -618,4 +616,6 @@ $lang['Thumbnails'] = 'Thumbnails';
 $lang['Guest cannot be deleted'] = 'Guest cannot be deleted';
 $lang['Default user cannot be deleted'] = 'Default user cannot be deleted';
 $lang['obligatory_user_mail_address'] = 'Mail address is obligatory for all users';
+$lang['purge history detail'] = 'purge history detail';
+$lang['purge history summary'] = 'purge history summary';
 ?>
diff --git a/language/en_UK.iso-8859-1/help/maintenance.html b/language/en_UK.iso-8859-1/help/maintenance.html
index 84238d3d7..a8571dae2 100644
--- a/language/en_UK.iso-8859-1/help/maintenance.html
+++ b/language/en_UK.iso-8859-1/help/maintenance.html
@@ -25,18 +25,22 @@ information from database make you save disk space.</p>
   single picture (through <span class="pwgScreen">Picture</span> for
   example).</li>
 
-  <li><strong>Purge history:</strong> Delete all lines from
+  <li><strong>Repair and optimize database:</strong>
+  For each table, re-odrer, repair and optimize operations are done.
+  </li>
+</ul>
+
+<ul>
+  <li><strong>Purge history detail:</strong> Delete all lines from
   <code>history</code> table. Screen <span class="pwgScreen">Administration,
   Specials, History</span> shows no informations anymore on past
   history. <em>Warning</em>: all data will be lost and there is no way to
   get informations back.</li>
 
+  <li><strong>Purge history summary:</strong> Delete all the summary information about visit history. This summary is calculated from the history detail.</li>
+
   <li><strong>Purge sessions:</strong> Delete expired user sessions.</li>
 
   <li><strong>Purge never used notification feeds</strong></li>
 
-  <li><strong>Repair and optimize database:</strong>
-  For each table, re-odrer, repair and optimize operations are done.
-  </li>
-
 </ul>
-- 
cgit v1.2.3