merge r2061 from branch 1.7 to trunk

feature 719 : Split purge history link into Purge summary and Purge details.
- add a confirmation box when purging history

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

2 files changed, 5 insertions, 2 deletions

diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index d73c92c5e..444b7ff1a 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -367,7 +367,8 @@ $lang['permuser_info'] = 'Only private categories are listed. Private/Public cat
 $lang['private'] = 'private';
 $lang['properties'] = 'Properties';
 $lang['public'] = 'public';
-$lang['purge history'] = 'purge history';
+$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';
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index 6a47b6398..466bdfd10 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -367,7 +367,9 @@ $lang['permuser_info'] = 'Seules les catégories privées sont listées.';
 $lang['private'] = 'privé';
 $lang['properties'] = 'Propriétés';
 $lang['public'] = 'public';
-$lang['purge history'] = 'purger l\'historique';
+$lang['purge history'] = '';
+$lang['purge history detail'] = 'purger le detail de l\'historique';
+$lang['purge history summary'] = 'purger le sommaire de l\'historique';
 $lang['purge never used notification feeds'] = 'purger les flux de notification jamais utilisés';
 $lang['purge sessions'] = 'purger les sessions';
 $lang['randomly represented'] = 'représentant au hasard';