merge r6402 from trunk

removed unnecessary language key (Controversy) and potential sql fatal error in admin photo rating page

git-svn-id: http://piwigo.org/svn/branches/2.1@6403 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2010-05-27 20:28:43 +00:00
parent 50cd8ed523
commit f0d6ec33ce
21 changed files with 3 additions and 25 deletions
+1 -2
View File
@@ -71,7 +71,6 @@ $lang['Category elements associated to the following categories: %s'] = "Les él
$lang['Check for upgrade failed for unknown reasons.'] = "La vérification de la dernière version sur le serveur a échouée pour une raison inconnue.";
$lang['Check for upgrade'] = "Dernière version ?";
$lang['Comments for all'] = "Commentaires pour tous";
$lang['Controversy'] = "Conflit";
$lang['Current name'] = "Nom courant";
$lang['Database'] = "Base de données";
$lang['Deactivate'] = "Désactiver";
@@ -773,4 +772,4 @@ $lang['Add another set of photos'] = 'Ajouter d\'autres photos';
$lang['Order of menubar items has been updated successfully.'] = 'L\'ordre des éléments du menu a été mis à jour avec succès.';
$lang['This theme was not designed to be directly activated'] = 'Ce thème n\'est pas conçu pour être activé directement';
$lang['Pending Comments'] = 'Commentaires en attente';
?>
?>