From bd7f8c0ba2e5686c25152de220f645dc39a72ccd Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Fri, 2 Sep 2011 08:37:21 +0000
Subject: feature 1078 added: ability to merge tags

git-svn-id: http://piwigo.org/svn/trunk@12032 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 language/en_UK/admin.lang.php | 8 ++++++++
 language/fr_FR/admin.lang.php | 8 ++++++++
 2 files changed, 16 insertions(+)

(limited to 'language')

diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 8273d5e05..7047bb990 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -849,4 +849,12 @@ $lang['Manage Permissions'] = 'Manage Permissions';
 $lang['Photo %s of %s'] = 'Photo %s of %s';
 $lang['show details'] = 'show details';
 $lang['hide details'] = 'hide details';
+$lang['Merge tags'] = 'Merge tags';
+$lang['Select the destination tag'] = 'Select the destination tag';
+$lang['(this tag will be deleted)'] = '(this tag will be deleted)';
+$lang['Confirm merge'] = 'Confirm merge';
+$lang['Merge selected tags'] = 'Merge selected tags';
+$lang['No destination tag selected'] = 'No destination tag selected';
+$lang['Tags <em>%s</em> merged into tag <em>%s</em>'] = 'Tags <em>%s</em> merged into tag <em>%s</em>';
+$lang['Select at least two tags for merging'] = 'Select at least two tags for merging';
 ?>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index c450b5dea..4f619b1b7 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -858,4 +858,12 @@ $lang['Manage Permissions'] = 'Gérer les permissions';
 $lang['Photo %s of %s'] = 'Photo %s sur %s';
 $lang['show details'] = 'montrer les détails';
 $lang['hide details'] = 'cacher les détails';
+$lang['Merge tags'] = 'Fusionner les tags';
+$lang['Select the destination tag'] = 'Sélectionnez le tag de destination';
+$lang['(this tag will be deleted)'] = '(ce tag sera supprimé)';
+$lang['Confirm merge'] = 'Confirmez la fusion';
+$lang['Merge selected tags'] = 'Fusionner les tags sélectionnés';
+$lang['No destination tag selected'] = 'Vous n\'avez pas sélectionné de tag de destination';
+$lang['Tags <em>%s</em> merged into tag <em>%s</em>'] = 'Les tags <em>%s</em> ont été fusionnés dans le tag <em>%s</em>';
+$lang['Select at least two tags for merging'] = 'Sélectionnez au moins deux tags pour la fusion';
 ?>
\ No newline at end of file
-- 
cgit v1.2.3