diff options
| author | rvelices <rv-github@modusoptimus.com> | 2010-05-27 20:28:43 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2010-05-27 20:28:43 +0000 |
| commit | f0d6ec33ce231f77077ba6535ca8312286f9a40b (patch) | |
| tree | 471c42102ac8688b561858c6258c27b7ff3763f3 /language/fr_FR/admin.lang.php | |
| parent | 50cd8ed52300a8613971f0d9bc0e66f4ca293b7b (diff) | |
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
Diffstat (limited to 'language/fr_FR/admin.lang.php')
| -rw-r--r-- | language/fr_FR/admin.lang.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index a47178f75..06186c2c7 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -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'; -?> +?>
\ No newline at end of file |