Resolved Issue ID 0000447:

  o Fix Incorrect Tag Translations 

Merge BSF r1451:1452 into branch-1_6


git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1453 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 6 insertions, 6 deletions

diff --git a/admin/include/functions.php b/admin/include/functions.php
index 47745a5a7..d84e66073 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -1756,7 +1756,7 @@ function tag_id_from_tag_name($tag_name)
     $tag_name = mysql_escape_string($tag_name);
   }
 
-  // does the tag already exist?
+  // does the tag already exists?
   $query = '
 SELECT id
   FROM '.TAGS_TABLE.'
diff --git a/admin/tags.php b/admin/tags.php
index 8f3ca5bee..21000de98 100644
--- a/admin/tags.php
+++ b/admin/tags.php
@@ -78,7 +78,7 @@ SELECT id, name
         array_push(
           $page['errors'],
           sprintf(
-            l10n('Tag "%s" already exist'),
+            l10n('Tag "%s" already exists'),
             $tag_name
             )
           );
@@ -158,7 +158,7 @@ if (isset($_POST['add']) and !empty($_POST['add_tag']))
     $tag_name = mysql_escape_string($_POST['add_tag']);
   }
 
-  // does the tag already exist?
+  // does the tag already exists?
   $query = '
 SELECT id
   FROM '.TAGS_TABLE.'
@@ -192,7 +192,7 @@ SELECT id
     array_push(
       $page['errors'],
       sprintf(
-        l10n('Tag "%s" already exist'),
+        l10n('Tag "%s" already exists'),
         $tag_name
         )
       );
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 88355bdc3..35dc7dd0b 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -159,6 +159,7 @@ $lang['Status'] = 'Status';
 $lang['Storage category'] = 'Storage category';
 $lang['Submit'] = 'Submit';
 $lang['Sum of rates'] = 'Sum of rates';
+$lang['Tag "%s" already exists'] = 'Tag "%s" already exists';
 $lang['Tag "%s" was added'] = 'Tag "%s" was added';
 $lang['Tag selection'] = 'Tag selection';
 $lang['Take selected elements out of caddie'] = 'Take selected elements out of caddie';
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index 0032c307e..7c8017725 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -159,9 +159,8 @@ $lang['Status'] = 'Statut';
 $lang['Storage category'] = 'Catégorie de stockage';
 $lang['Submit'] = 'Valider';
 $lang['Sum of rates'] = 'Somme des notes';
-$lang['Tag "%s" already exist'] = 'Le tag "%s" existe déjà';
+$lang['Tag "%s" already exists'] = 'Le tag "%s" existe déjà';
 $lang['Tag "%s" was added'] = 'Le tag "%s" a été ajouté';
-$lang['Tag "%s" was added'] = 'Tag "%s" was added';
 $lang['Tag selection'] = 'Sélection de tags';
 $lang['Take selected elements out of caddie'] = 'Sortir les éléments sélectionnés du panier';
 $lang['The %d following tags were deleted : %s'] = 'The %d following tags were deleted : %s';