merge r6675 from branch 2.1 to trunk

complement to r6657: having a new key for the admin menu is a good thing but
the "Menu Management" label is not coherent with other admin menu labels.
Furthermore, all languages already have the word "Menu" in common.lang.php, no
need to display an english "Menu Management" if the translation is missing.



git-svn-id: http://piwigo.org/svn/trunk@6676 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2010-07-10 20:05:24 +00:00
commit cfa17aece5
21 changed files with 34 additions and 20 deletions

View file

@ -769,6 +769,5 @@ $lang['Failed to write file to disk'] = 'Failed to write file to disk';
$lang['File upload stopped by extension'] = 'File upload stopped by extension';
$lang['Unknown upload error'] = 'Unknown upload error';
$lang['Error on file "%s" : %s'] = 'Error on file "%s" : %s';
$lang['Menu Management'] = 'Menu Management';
?>
$lang['Menu Management'] = 'Menus';
?>