feature 2810: for duplicates filter, add "date & time" (checked by default) and "width & height" as options.

Change algorithm for a single SQL query with GROUP_CONCAT instead of 2 queries.


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

2 files changed, 9 insertions, 1 deletions

diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index f7992360a..be8b3b1a5 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -976,4 +976,8 @@ $lang['Open user details'] = 'Open user details';
 $lang['Close user details'] = 'Close user details';
 $lang['Empty caddie'] = 'Empty caddie';
 $lang['between %s and %s MB'] = 'between %s and %s MB';
+$lang['based on'] = 'based on';
+$lang['file name'] = 'file name';
+$lang['date & time'] = 'date & time';
+$lang['width & height'] = 'width & height';
 ?>
\ No newline at end of file
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index c21414665..28ae9229d 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -977,4 +977,8 @@ $lang['Allow users to add a link to their website'] = 'Autoriser les utilisateur
 $lang['Impossible to deactivate the default theme.'] = 'Impossible de désactiver le thème par défaut.';
 $lang['Empty caddie'] = 'Vider le panier';
 $lang['The settings for the guest are from the %s user'] = 'Les préféreces des invités sont celles de l\'utilisateur %s';
-$lang['between %s and %s MB'] = 'entre %s et %s Mo';
\ No newline at end of file
+$lang['between %s and %s MB'] = 'entre %s et %s Mo';
+$lang['based on'] = 'basé sur';
+$lang['file name'] = 'nom de fichier';
+$lang['date & time'] = 'date et heure';
+$lang['width & height'] = 'largeur et hauteur';