merge r6656 from trunK

Fix: 'Menu Management' in admin



git-svn-id: http://piwigo.org/svn/branches/2.1@6657 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 7 insertions, 2 deletions

diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl
index 5ec46d4e6..39c8f7c9d 100644
--- a/admin/themes/default/template/admin.tpl
+++ b/admin/themes/default/template/admin.tpl
@@ -89,7 +89,7 @@ jQuery().ready(function(){ldelim}
     <dd>
       <ul>
         <li><a href="{$U_CONFIG_GENERAL}">{'Options'|@translate}</a></li>
-        <li><a href="{$U_CONFIG_MENUBAR}">{'Menu'|@translate}</a></li>
+        <li><a href="{$U_CONFIG_MENUBAR}">{'Menu Management'|@translate}</a></li>
         <li><a href="{$U_CONFIG_EXTENTS}">{'Templates'|@translate}</a></li>
         <li><a href="{$U_CONFIG_LANGUAGES}">{'Languages'|@translate}</a></li>
         <li><a href="{$U_CONFIG_THEMES}">{'Themes'|@translate}</a></li>
diff --git a/admin/themes/default/template/menubar.tpl b/admin/themes/default/template/menubar.tpl
index ccc0f2e69..751d5de83 100644
--- a/admin/themes/default/template/menubar.tpl
+++ b/admin/themes/default/template/menubar.tpl
@@ -30,7 +30,7 @@
 </script>
 
 <div class="titrePage">
-  <h2>Menubar</h2>
+  <h2>{'Menu Management'|translate}</h2>
 </div>
 
 <form id="menuOrdering" action="{$F_ACTION}" method="post">
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 3796878b8..5535bfea9 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -770,4 +770,6 @@ $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';
 ?>
\ No newline at end of file
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index d72566eca..740aa994c 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -774,4 +774,7 @@ $lang['Failed to write file to disk'] = 'Échec à l\'écriture du fichier sur l
 $lang['File upload stopped by extension'] = 'Le transfert du fichier a été arrêté par une extension';
 $lang['Unknown upload error'] = 'Erreur inconnue survenue lors du transfert';
 $lang['Error on file "%s" : %s'] = 'Erreur sur le fichier "%s" : %s';
+?>
+
+$lang['Menu Management'] = 'Gestion des menus';
 ?>
\ No newline at end of file