Index: /extensions/AMenuManager/admin.php
===================================================================
--- /extensions/AMenuManager/admin.php	(revision 15366)
+++ /extensions/AMenuManager/admin.php	(revision 15366)
@@ -0,0 +1,42 @@
+<?php
+/* -----------------------------------------------------------------------------
+  Plugin     : Advanced Menu Manager
+  Author     : Grum
+    email    : grum@piwigo.org
+    website  : http://photos.grum.dnsalias.com
+    PWG user : http://forum.phpwebgallery.net/profile.php?id=3706
+
+    << May the Little SpaceFrog be with you ! >>
+  ------------------------------------------------------------------------------
+  See main.inc.php for release information
+
+  --------------------------------------------------------------------------- */
+
+if (!defined('PHPWG_ROOT_PATH')) { die('Hacking attempt!'); }
+
+global $prefixeTable;
+
+load_language('plugin.lang', AMM_PATH);
+
+$main_plugin_object = get_plugin_data($plugin_id);
+
+if(CommonPlugin::checkGPCRelease(AMM_GPC_NEEDED))
+{
+  AMM_root::checkPluginRelease();
+
+  include(AMM_PATH."amm_aip.class.inc.php");
+  $plugin_ai = new AMM_AIP($prefixeTable, $main_plugin_object->getFileLocation());
+}
+else
+{
+  /*
+   * plugin was upgraded, but GPC was not
+   * display a page to inform user to upgrade GPC
+   */
+  include(AMM_PATH."amm_aip_release.class.inc.php");
+  $plugin_ai = new AMM_AIPRelease($prefixeTable, $main_plugin_object->getFileLocation());
+}
+
+$plugin_ai->manage();
+
+?>
Index: /extensions/AMenuManager/admin/amm_linksconfig.tpl
===================================================================
--- /extensions/AMenuManager/admin/amm_linksconfig.tpl	(revision 15365)
+++ /extensions/AMenuManager/admin/amm_linksconfig.tpl	(revision 15366)
@@ -53,10 +53,4 @@
         </td>
       </tr>
-      <tr>
-        <td></td>
-        <td style="font-size:80%;">
-          <a style="cursor:pointer;" onclick="$('#iamm_links_title').inputText('doTranslation');">{'g002_translate'|@translate}</a>
-        </td>
-      </tr>
 
     </table>
Index: /extensions/AMenuManager/admin/amm_personalised.tpl
===================================================================
--- /extensions/AMenuManager/admin/amm_personalised.tpl	(revision 15365)
+++ /extensions/AMenuManager/admin/amm_personalised.tpl	(revision 15366)
@@ -118,5 +118,4 @@
       <td>
         <div id="iamm_personalised_title"></div>
-        <a style="cursor:pointer;font-size:80%;"  onclick="$('#iamm_personalised_title').inputText('doTranslation');">{'g002_translate'|@translate}</a>
       </td>
     </tr>
Index: /extensions/AMenuManager/admin/amm_personalisedlist_edit.tpl
===================================================================
--- /extensions/AMenuManager/admin/amm_personalisedlist_edit.tpl	(revision 15365)
+++ /extensions/AMenuManager/admin/amm_personalisedlist_edit.tpl	(revision 15366)
@@ -36,12 +36,4 @@
     var obj=document.getElementById(input_id);
     objhidden[objnames.indexOf(input_id)][objlang.options.selectedIndex].value = obj.value;
-  }
-
-  function do_translation()
-  {
-    var inputid = document.getElementById('iamm_personalised_title');
-    var tolang = objlang.options[objlang.options.selectedIndex].value.substr(0,2);
-
-    google_translate(inputid.value, '{/literal}{$datas.fromlang}{literal}', tolang, inputid, 'value', apply_changes, inputid.id);
   }
 
@@ -120,10 +112,4 @@
         </td>
       </tr>
-      <tr>
-        <td></td>
-        <td style="font-size:80%;">
-          <a style="cursor:pointer;" onclick="do_translation()">{'g002_translate'|@translate}</a>
-        </td>
-      </tr>
 
       <tr>
Index: /extensions/AMenuManager/admin/amm_randompicconfig.tpl
===================================================================
--- /extensions/AMenuManager/admin/amm_randompicconfig.tpl	(revision 15365)
+++ /extensions/AMenuManager/admin/amm_randompicconfig.tpl	(revision 15366)
@@ -92,11 +92,4 @@
 
       <tr>
-        <td></td>
-        <td style="font-size:80%;" colspan="2">
-          <a style="cursor:pointer;" onclick="$('#iamm_randompicture_title').inputText('doTranslation');">{'g002_translate'|@translate}</a>
-        </td>
-      </tr>
-
-      <tr>
         <td>{'g002_setting_randompic_height'|@translate}</td>
         <td>
Index: /extensions/AMenuManager/admin/amm_sections.tpl
===================================================================
--- /extensions/AMenuManager/admin/amm_sections.tpl	(revision 15365)
+++ /extensions/AMenuManager/admin/amm_sections.tpl	(revision 15366)
@@ -1,4 +1,7 @@
-{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
-{combine_script id="jquery.ui.sortable" path="themes/default/js/ui/minified/jquery.ui.sortable.min.js"}
+{combine_script id="jquery.ui" require='jquery' path="themes/default/js/ui/jquery.ui.core.js"}
+{combine_script id="jquery.ui.widget" require='jquery.ui' path="themes/default/js/ui/jquery.ui.widget.js"}
+{combine_script id="jquery.ui.mouse" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.mouse.js"}
+{combine_script id="jquery.ui.position" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.position.js"}
+
 
 <div id="containerMenu">
Index: tensions/AMenuManager/admin/plugin_admin.php
===================================================================
--- /extensions/AMenuManager/admin/plugin_admin.php	(revision 15365)
+++ 	(revision )
@@ -1,42 +1,0 @@
-<?php
-/* -----------------------------------------------------------------------------
-  Plugin     : Advanced Menu Manager
-  Author     : Grum
-    email    : grum@piwigo.org
-    website  : http://photos.grum.dnsalias.com
-    PWG user : http://forum.phpwebgallery.net/profile.php?id=3706
-
-    << May the Little SpaceFrog be with you ! >>
-  ------------------------------------------------------------------------------
-  See main.inc.php for release information
-
-  --------------------------------------------------------------------------- */
-
-if (!defined('PHPWG_ROOT_PATH')) { die('Hacking attempt!'); }
-
-global $prefixeTable;
-
-load_language('plugin.lang', AMM_PATH);
-
-$main_plugin_object = get_plugin_data($plugin_id);
-
-if(CommonPlugin::checkGPCRelease(AMM_GPC_NEEDED))
-{
-  AMM_root::checkPluginRelease();
-
-  include(AMM_PATH."amm_aip.class.inc.php");
-  $plugin_ai = new AMM_AIP($prefixeTable, $main_plugin_object->getFileLocation());
-}
-else
-{
-  /*
-   * plugin was upgraded, but GPC was not
-   * display a page to inform user to upgrade GPC
-   */
-  include(AMM_PATH."amm_aip_release.class.inc.php");
-  $plugin_ai = new AMM_AIPRelease($prefixeTable, $main_plugin_object->getFileLocation());
-}
-
-$plugin_ai->manage();
-
-?>
Index: /extensions/AMenuManager/amm_aim.class.inc.php
===================================================================
--- /extensions/AMenuManager/amm_aim.class.inc.php	(revision 15365)
+++ /extensions/AMenuManager/amm_aim.class.inc.php	(revision 15366)
@@ -40,5 +40,5 @@
     global $template;
 
-    $template->append('footer_elements', "<script>$(document).ready(function () { $('li a[href=\"".$template->get_template_vars('U_CONFIG_MENUBAR')."\"]').attr('href', '".$this->getAdminLink()."&amp;fAMM_tabsheet=setmenu&amp;fAMM_page=position'); });</script>");
+    $template->append('footer_elements', "<script>$(document).ready(function () { $('li a[href=\"".$template->get_template_vars('U_CONFIG_MENUBAR')."\"]').attr('href', '".$this->getAdminLink()."-setmenu/position'); });</script>");
   }
 
Index: /extensions/AMenuManager/amm_aip.class.inc.php
===================================================================
--- /extensions/AMenuManager/amm_aip.class.inc.php	(revision 15365)
+++ /extensions/AMenuManager/amm_aip.class.inc.php	(revision 15366)
@@ -24,5 +24,4 @@
 class AMM_AIP extends AMM_root
 {
-  protected $googleTranslate;
   protected $tabsheet;
   protected $blocksId=array('menu' => 'Menu', 'special' => 'Specials');
@@ -39,17 +38,17 @@
     $this->tabsheet->add('setmenu',
                           l10n('g002_setmenu'),
-                          $this->getAdminLink().'&amp;fAMM_tabsheet=setmenu');
+                          $this->getAdminLink().'-setmenu');
     $this->tabsheet->add('links',
                           l10n('g002_addlinks'),
-                          $this->getAdminLink().'&amp;fAMM_tabsheet=links');
+                          $this->getAdminLink().'-links');
     $this->tabsheet->add('randompict',
                           l10n('g002_randompict'),
-                          $this->getAdminLink().'&amp;fAMM_tabsheet=randompict');
+                          $this->getAdminLink().'-randompict');
     $this->tabsheet->add('personnalblock',
                           l10n('g002_personnalblock'),
-                          $this->getAdminLink().'&amp;fAMM_tabsheet=personnalblock');
+                          $this->getAdminLink().'-personnalblock');
     $this->tabsheet->add('album',
                           l10n('g002_album'),
-                          $this->getAdminLink().'&amp;fAMM_tabsheet=album');
+                          $this->getAdminLink().'-album');
     $this->css = new GPCCss(dirname($this->getFileLocation()).'/'.$this->getPluginNameFiles().".css");
   }
@@ -67,5 +66,5 @@
     $this->initRequest();
 
-    $this->tabsheet->select($_REQUEST['fAMM_tabsheet']);
+    $this->tabsheet->select($_GET['tab']);
     $this->tabsheet->assign();
     $selected_tab=$this->tabsheet->get_selected();
@@ -73,5 +72,5 @@
 
     $template_plugin["AMM_VERSION"] = "<i>".$this->getPluginName()."</i> ".l10n('g002_version').AMM_VERSION;
-    $template_plugin["AMM_PAGE"] = $_REQUEST['fAMM_tabsheet'];
+    $template_plugin["AMM_PAGE"] = $_GET['tab'];
     $template_plugin["PATH"] = AMM_PATH;
 
@@ -80,8 +79,8 @@
 
 
-    switch($_REQUEST['fAMM_tabsheet'])
+    switch($_GET['tab'])
     {
       case 'links':
-        $this->displayLinksPage($_REQUEST['fAMM_page']);
+        $this->displayLinksPage($_REQUEST['t']);
         break;
 
@@ -95,5 +94,5 @@
 
       case 'setmenu':
-        $this->displayBlocksPage($_REQUEST['fAMM_page']);
+        $this->displayBlocksPage($_REQUEST['t']);
         break;
 
@@ -126,13 +125,17 @@
   {
     //initialise $REQUEST values if not defined
-    if(!array_key_exists('fAMM_tabsheet', $_REQUEST)) $_REQUEST['fAMM_tabsheet']='setmenu';
-
-    if(!($_REQUEST['fAMM_tabsheet']=='links' or
-         $_REQUEST['fAMM_tabsheet']=='randompict' or
-         $_REQUEST['fAMM_tabsheet']=='personnalblock' or
-         $_REQUEST['fAMM_tabsheet']=='setmenu' or
-         $_REQUEST['fAMM_tabsheet']=='album'
+    if(!array_key_exists('tab', $_GET)) $_GET['tab']='setmenu';
+
+    $tmp=explode('/', $_GET['tab'].'/');
+    $_GET['tab']=$tmp[0];
+    $_REQUEST['t']=$tmp[1];
+
+    if(!($_GET['tab']=='links' or
+         $_GET['tab']=='randompict' or
+         $_GET['tab']=='personnalblock' or
+         $_GET['tab']=='setmenu' or
+         $_GET['tab']=='album'
         )
-      ) $_REQUEST['fAMM_tabsheet']='setmenu';
+      ) $_GET['tab']='setmenu';
 
 
@@ -140,12 +143,12 @@
      * checks for links page
      */
-    if($_REQUEST['fAMM_tabsheet']=='links')
-    {
-      if(!isset($_REQUEST['fAMM_page'])) $_REQUEST['fAMM_page']='links';
-
-      if(!($_REQUEST['fAMM_page']=='links' or
-           $_REQUEST['fAMM_page']=='config'
+    if($_GET['tab']=='links')
+    {
+      if(!isset($_REQUEST['t'])) $_REQUEST['t']='links';
+
+      if(!($_REQUEST['t']=='links' or
+           $_REQUEST['t']=='config'
           )
-        ) $_REQUEST['fAMM_page']='config';
+        ) $_REQUEST['t']='config';
     }
 
@@ -154,12 +157,12 @@
      * checks for blocks menu page
      */
-    if($_REQUEST['fAMM_tabsheet']=='setmenu')
-    {
-      if(!isset($_REQUEST['fAMM_page'])) $_REQUEST['fAMM_page']='position';
-
-      if(!($_REQUEST['fAMM_page']=='position' or
-           $_REQUEST['fAMM_page']=='blocksContent'
+    if($_GET['tab']=='setmenu')
+    {
+      if(!isset($_REQUEST['t'])) $_REQUEST['t']='position';
+
+      if(!($_REQUEST['t']=='position' or
+           $_REQUEST['t']=='blocksContent'
           )
-        ) $_REQUEST['fAMM_page']='position';
+        ) $_REQUEST['t']='position';
     }
 
@@ -174,7 +177,10 @@
     global $template, $user;
 
-    GPCCore::addHeaderJS('jquery.ui', 'themes/default/js/ui/minified/jquery.ui.core.min.js', array('jquery'));
-    GPCCore::addHeaderJS('jquery.ui.sortable', 'themes/default/js/ui/minified/jquery.ui.sortable.min.js', array('jquery.ui'));
-    GPCCore::addHeaderJS('jquery.ui.dialog', 'themes/default/js/ui/minified/jquery.ui.dialog.min.js', array('jquery.ui'));
+    GPCCore::addHeaderJS('jquery.ui', 'themes/default/js/ui/jquery.ui.core.js', array('jquery'));
+    GPCCore::addHeaderJS('jquery.ui.widget', 'themes/default/js/ui/jquery.ui.widget.js', array('jquery'));
+    GPCCore::addHeaderJS('jquery.ui.mouse', 'themes/default/js/ui/jquery.ui.mouse.js', array('jquery.ui.widget'));
+    GPCCore::addHeaderJS('jquery.ui.position', 'themes/default/js/ui/jquery.ui.position.js', array('jquery.ui.widget'));
+    GPCCore::addHeaderJS('jquery.ui.sortable', 'themes/default/js/ui/jquery.ui.sortable.js', array('jquery.ui.widget'));
+    GPCCore::addHeaderJS('jquery.ui.dialog', 'themes/default/js/ui/jquery.ui.dialog.js', array('jquery.ui.widget'));
 
     $template->set_filename('body_page',
@@ -185,8 +191,8 @@
     $linksTabsheet->add('links',
                           l10n('g002_setting_link_links'),
-                          $this->getAdminLink().'&amp;fAMM_tabsheet=links&amp;fAMM_page=links');
+                          $this->getAdminLink().'-links/links');
     $linksTabsheet->add('config',
                           l10n('g002_configlinks'),
-                          $this->getAdminLink().'&amp;fAMM_tabsheet=links&amp;fAMM_page=config');
+                          $this->getAdminLink().'-links/config');
     $linksTabsheet->assign();
 
@@ -212,9 +218,13 @@
     global $template, $user;
 
-    GPCCore::addHeaderJS('jquery.ui', 'themes/default/js/ui/minified/jquery.ui.core.min.js', array('jquery'));
-    GPCCore::addHeaderJS('jquery.ui.slider', 'themes/default/js/ui/minified/jquery.ui.slider.min.js');
-    GPCCore::addHeaderJS('gpc.categorySelector', 'plugins/GrumPluginClasses/js/ui.categorySelector'.GPCCore::getMinified().'.js', array('jquery.ui'));
-    GPCCore::addUI('inputList,inputText,inputRadio,categorySelector,googleTranslate');
-    GPCCore::addHeaderJS('amm.rpc', 'plugins/AMenuManager/js/amm_randomPictConfig'.GPCCore::getMinified().'.js', array('jquery', 'gpc.inputList', 'gpc.inputText', 'gpc.inputRadio', 'gpc.categorySelector', 'gpc.googleTranslate'));
+    GPCCore::addHeaderJS('jquery.ui', 'themes/default/js/ui/jquery.ui.core.js', array('jquery'));
+    GPCCore::addHeaderJS('jquery.ui.widget', 'themes/default/js/ui/jquery.ui.widget.js', array('jquery'));
+    GPCCore::addHeaderJS('jquery.ui.mouse', 'themes/default/js/ui/jquery.ui.mouse.js', array('jquery'));
+    GPCCore::addHeaderJS('jquery.ui.position', 'themes/default/js/ui/jquery.ui.position.js', array('jquery'));
+    GPCCore::addHeaderJS('jquery.ui.sortable', 'themes/default/js/ui/jquery.ui.sortable.js', array('jquery.ui.widget'));
+    GPCCore::addHeaderJS('jquery.ui.dialog', 'themes/default/js/ui/jquery.ui.dialog.js', array('jquery.ui.widget'));
+    GPCCore::addHeaderJS('jquery.ui.slider', 'themes/default/js/ui/jquery.ui.slider.js', array('jquery.ui.widget'));
+    GPCCore::addUI('inputList,inputText,inputRadio,categorySelector');
+    GPCCore::addHeaderJS('amm.rpc', 'plugins/AMenuManager/js/amm_randomPictConfig.js', array('jquery', 'gpc.inputList', 'gpc.inputText', 'gpc.inputRadio', 'gpc.categorySelector'));
 
     $template->set_filename('body_page',
@@ -256,8 +266,12 @@
     global $template, $user;
 
-    GPCCore::addHeaderJS('jquery.ui', 'themes/default/js/ui/minified/jquery.ui.core.min.js', array('jquery'));
-    GPCCore::addHeaderJS('jquery.ui.dialog', 'themes/default/js/ui/minified/jquery.ui.dialog.min.js', array('jquery'));
-    GPCCore::addUI('inputList,inputText,inputRadio,googleTranslate');
-    GPCCore::addHeaderJS('amm.upbm', 'plugins/AMenuManager/js/amm_personalisedBlocks'.GPCCore::getMinified().'.js', array('jquery', 'gpc.inputList', 'gpc.inputText', 'gpc.inputRadio', 'gpc.googleTranslate'));
+    GPCCore::addHeaderJS('jquery.ui', 'themes/default/js/ui/jquery.ui.core.js', array('jquery'));
+    GPCCore::addHeaderJS('jquery.ui.widget', 'themes/default/js/ui/jquery.ui.widget.js', array('jquery.ui'));
+    GPCCore::addHeaderJS('jquery.ui.mouse', 'themes/default/js/ui/jquery.ui.mouse.js', array('jquery.ui.widget'));
+    GPCCore::addHeaderJS('jquery.ui.position', 'themes/default/js/ui/jquery.ui.position.js', array('jquery.ui.widget'));
+    GPCCore::addHeaderJS('jquery.ui.sortable', 'themes/default/js/ui/jquery.ui.sortable.js', array('jquery.ui.widget'));
+    GPCCore::addHeaderJS('jquery.ui.dialog', 'themes/default/js/ui/jquery.ui.dialog.js', array('jquery.ui.widget'));
+    GPCCore::addUI('inputList,inputText,inputRadio');
+    GPCCore::addHeaderJS('amm.upbm', 'plugins/AMenuManager/js/amm_personalisedBlocks.js', array('jquery', 'gpc.inputList', 'gpc.inputText', 'gpc.inputRadio'));
 
 
@@ -284,8 +298,11 @@
     global $template, $conf;
 
-    GPCCore::addHeaderJS('jquery.ui', 'themes/default/js/ui/minified/jquery.ui.core.min.js', array('jquery'));
-    GPCCore::addHeaderJS('jquery.ui.sortable', 'themes/default/js/ui/minified/jquery.ui.sortable.min.js', array('jquery.ui'));
+    GPCCore::addHeaderJS('jquery.ui', 'themes/default/js/ui/jquery.ui.core.js', array('jquery'));
+    GPCCore::addHeaderJS('jquery.ui.widget', 'themes/default/js/ui/jquery.ui.widget.js', array('jquery'));
+    GPCCore::addHeaderJS('jquery.ui.mouse', 'themes/default/js/ui/jquery.ui.mouse.js', array('jquery.ui.widget'));
+    GPCCore::addHeaderJS('jquery.ui.position', 'themes/default/js/ui/jquery.ui.position.js', array('jquery.ui.widget'));
+    GPCCore::addHeaderJS('jquery.ui.sortable', 'themes/default/js/ui/jquery.ui.sortable.js', array('jquery.ui.widget'));
     GPCCore::addUI('inputList');
-    GPCCore::addHeaderJS('amm.cbm', 'plugins/AMenuManager/js/amm_blocks'.GPCCore::getMinified().'.js', array('jquery', 'jquery.ui.sortable', 'gpc.inputList'));
+    GPCCore::addHeaderJS('amm.cbm', 'plugins/AMenuManager/js/amm_blocks.js', array('jquery', 'jquery.ui.sortable', 'gpc.inputList'));
 
     $template->set_filename('body_page',
@@ -349,8 +366,6 @@
     global $template, $user;
 
-    GPCCore::addHeaderCSS('gpc.categorySelector', 'plugins/GrumPluginClasses/css/categorySelector_'.$template->get_themeconf('name').'.css');
-    GPCCore::addHeaderJS('jquery.ui', 'themes/default/js/ui/minified/jquery.ui.core.min.js', array('jquery'));
-    GPCCore::addHeaderJS('gpc.categorySelector', 'plugins/GrumPluginClasses/js/ui.categorySelector'.GPCCore::getMinified().'.js', array('jquery.ui'));
-    GPCCore::addHeaderJS('amm.ac', 'plugins/AMenuManager/js/amm_albumConfig'.GPCCore::getMinified().'.js', array('jquery','gpc.categorySelector'));
+    GPCCore::addUI('categorySelector');
+    GPCCore::addHeaderJS('amm.ac', 'plugins/AMenuManager/js/amm_albumConfig.js', array('jquery','gpc.categorySelector'));
 
     $template->set_filename('body_page',
@@ -382,5 +397,5 @@
 
     GPCCore::addUI('inputList,inputRadio,inputText,inputCheckbox');
-    GPCCore::addHeaderJS('amm.ulm', 'plugins/AMenuManager/js/amm_links'.GPCCore::getMinified().'.js', array('jquery', 'gpc.inputList', 'gpc.inputText', 'gpc.inputRadio', 'gpc.inputCheckbox'));
+    GPCCore::addHeaderJS('amm.ulm', 'plugins/AMenuManager/js/amm_links.js', array('jquery', 'gpc.inputList', 'gpc.inputText', 'gpc.inputRadio', 'gpc.inputCheckbox'));
 
     $template->set_filename('sheet_page',
@@ -430,6 +445,6 @@
     global $template, $user;
 
-    GPCCore::addUI('inputList,inputRadio,inputText,googleTranslate');
-    GPCCore::addHeaderJS('amm.ulc', 'plugins/AMenuManager/js/amm_linksConfig'.GPCCore::getMinified().'.js', array('jquery', 'gpc.inputList', 'gpc.inputText', 'gpc.inputRadio', 'gpc.googleTranslate'));
+    GPCCore::addUI('inputList,inputRadio,inputText');
+    GPCCore::addHeaderJS('amm.ulc', 'plugins/AMenuManager/js/amm_linksConfig.js', array('jquery', 'gpc.inputList', 'gpc.inputText', 'gpc.inputRadio'));
 
     $template->set_filename('sheet_page',
Index: /extensions/AMenuManager/amm_pip.class.inc.php
===================================================================
--- /extensions/AMenuManager/amm_pip.class.inc.php	(revision 15365)
+++ /extensions/AMenuManager/amm_pip.class.inc.php	(revision 15366)
@@ -84,5 +84,5 @@
     {
       GPCCore::addHeaderJS('jquery', 'themes/default/js/jquery.min.js');
-      GPCCore::addHeaderJS('amm.randomPictPublic', 'plugins/AMenuManager/js/amm_randomPictPublic'.GPCCore::getMinified().'.js', array('jquery'));
+      GPCCore::addHeaderJS('amm.randomPictPublic', 'plugins/AMenuManager/js/amm_randomPictPublic.js', array('jquery'));
 
       $block->set_title(base64_decode($this->config['amm_randompicture_title'][$user['language']]));
@@ -385,5 +385,4 @@
    *  'comment'   => (String)
    *  'path'      => (String)
-   *  'tn_ext'    => (String)
    *  'catId'     => (String)
    *  'name'      => (String)
@@ -402,5 +401,5 @@
     $sql=array();
 
-    $sql['select']="SELECT i.id as image_id, i.file as image_file, i.comment, i.path, i.tn_ext, c.id as catid, c.name, c.permalink, RAND() as rndvalue, i.name as imgname ";
+    $sql['select']="SELECT i.id as image_id, i.file as image_file, i.comment, i.path, c.id as catid, c.name, c.permalink, RAND() as rndvalue, i.name as imgname ";
     $sql['from']="FROM ".CATEGORIES_TABLE." c, ".IMAGES_TABLE." i, ".IMAGE_CATEGORY_TABLE." ic ";
     $sql['where']="WHERE c.id = ic.category_id
@@ -447,5 +446,5 @@
 
         $row['link']=make_picture_url($row);
-        $row['thumb']=get_thumbnail_url($row);
+        $row['thumb']=DerivativeImage::thumb_url(array('id'=>$row['image_id'], 'path'=>$row['path']));
 
         $returned[]=$row;
Index: /extensions/AMenuManager/amm_version.inc.php
===================================================================
--- /extensions/AMenuManager/amm_version.inc.php	(revision 15365)
+++ /extensions/AMenuManager/amm_version.inc.php	(revision 15366)
@@ -15,6 +15,6 @@
   if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-  define('AMM_VERSION',  '3.1.4');
-  define('AMM_VERSION2', '03.01.04');
-  define('AMM_GPC_NEEDED', '3.5.1');
+  define('AMM_VERSION',  '3.2.0');
+  define('AMM_VERSION2', '03.02.00');
+  define('AMM_GPC_NEEDED', '3.5.2');
 ?>
Index: tensions/AMenuManager/js/amm_albumConfig.min.js
===================================================================
--- /extensions/AMenuManager/js/amm_albumConfig.min.js	(revision 15365)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* file: amm_albumConfig.js - v1.0.0 | minified on 2011/01/28 with http://jscompress.com/ */
-function albumConfig(opt,keys,token,initValues)
-{var options={ajaxUrl:'plugins/AMenuManager/amm_ajax.php'},translatedKeys={},properties={token:token},submit=function()
-{if(!checkValidity())return(false);displayProcessing(true);var datas={selectCat:$("#iamm_album_selectedCat").categorySelector('value')};$.ajax({type:"POST",url:options.ajaxUrl,async:true,data:{ajaxfct:"admin.album.setConfig",token:properties.token,datas:datas},success:function(msg)
-{displayProcessing(false);returned=msg.split('!');if(returned[0]=='OK')
-{$('#iConfigState').html(returned[1]).removeClass('errors').addClass('infos').css('display','block');}
-else
-{$('#iConfigState').html(returned[1]).removeClass('infos').addClass('errors').css('display','block');}}});},checkValidity=function()
-{$('.error').removeClass('error');ok=true;return(ok);},displayProcessing=function(visible)
-{if(visible)
-{$('#iBDProcessing').css("display","block");}
-else
-{$('#iBDProcessing').css("display","none");}},init=function(initValues)
-{$('#iamm_album_selectedCat').categorySelector({serverUrl:'plugins/GrumPluginClasses/gpc_ajax.php',listMaxWidth:650,listMaxHeight:550,userMode:'public',galleryRoot:false,displayStatus:false,filter:'all',multiple:true,load:function(event)
-{$(this).categorySelector('collapse',':all').categorySelector('value',initValues.selectCat);},change:function(){$('#iConfigState').hide();}});};$.extend(options,opt);$.extend(translatedKeys,keys);this.submit=function(){submit();};init(initValues);}
Index: tensions/AMenuManager/js/amm_blocks.min.js
===================================================================
--- /extensions/AMenuManager/js/amm_blocks.min.js	(revision 15365)
+++ 	(revision )
@@ -1,32 +1,0 @@
-/* file: amm_blocks.js - v1.0.0 | minified on 2011/01/28 with http://jscompress.com/ */
-function coreBlocks(opt,keys,token,initValues)
-{var options={ajaxUrl:'plugins/AMenuManager/amm_ajax.php'},translatedKeys={g002_ok:'g002_ok',g002_cancel:'g002_cancel',g002_loading:'g002_loading',g002_editoflink:'g002_editoflink',g002_createoflink:'g002_createoflink'},properties={id:'',token:token,resetValues:{'piwigo':[],'cancel':[]}},displayTabContent=function(tab)
-{switch(tab)
-{case'position':$('#containerPos').css('display','block');$('#containerMenu').css('display','none');break;case'blocksContent':$('#containerPos').css('display','none');$('#containerMenu').css('display','block');break;}}
-reset=function(mode)
-{$('#iConfigState').hide();for(var i=0;i<properties.resetValues[mode].length;i++)
-{var access=resetValues[mode][i].visibility.split('/'),accessUsers=access[0].split(','),accessGroup=access[1].split(',');$("#menu_"+resetValues[mode][i].block).get(0).appendChild($("#i"+resetValues[mode][i].id).get(0));$("#i"+resetValues[mode][i].id).find('input.visibilityUser').each(function()
-{$(this).attr('checked',$.inArray($(this).attr('value'),accessUsers)==-1);});$("#i"+resetValues[mode][i].id).find('input.visibilityGroup').each(function()
-{$(this).attr('checked',$.inArray($(this).attr('value'),accessGroup)==-1);});}},submit=function()
-{if(!checkValidity())return(false);displayProcessing(true);var datas={menuItems:{},blocks:{}},order=0;$('#containerMenu ul.categoryUl li.categoryLi').each(function()
-{var visibilityUser=[]
-visibilityGroup=[];$(this).find('input.visibilityUser:not(:checked)').each(function()
-{visibilityUser.push($(this).attr('value'));});$(this).find('input.visibilityGroup:not(:checked)').each(function()
-{visibilityGroup.push($(this).attr('value'));});datas.menuItems[this.id.substr(1)]={order:order,container:$(this).parent().parent().attr('id').substr(14),visibilityUser:visibilityUser,visibilityGroup:visibilityGroup};order++;});order=0;$('ul.menuUl li.menuListItem').each(function()
-{var id=$(this).attr('blockid'),visibilityUser=$(this).find('div.menuListUsers').inputList('value'),visibilityGroup=$(this).find('div.menuListGroups').inputList('value');datas.blocks[id]={id:id,order:order,users:visibilityUser,groups:visibilityGroup};order++;});$.ajax({type:"POST",url:options.ajaxUrl,async:true,data:{ajaxfct:"admin.coreBlocks.setConfig",token:properties.token,datas:datas},success:function(msg)
-{displayProcessing(false);returned=msg.split('!');if(returned[0]=='OK')
-{properties.resetValues.cancel=[];for(var id in datas.items)
-{properties.resetValues.cancel.push({id:id,block:datas.items[id].container,order:datas.items[id].order,visibility:datas.items[id].visibility});}
-$('#iConfigState').html(returned[1]).removeClass('errors').addClass('infos').css('display','block');}
-else
-{$('#iConfigState').html(returned[1]).removeClass('infos').addClass('errors').css('display','block');}}});},checkValidity=function()
-{$('.error').removeClass('error');ok=true;return(ok);},displayProcessing=function(visible)
-{if(visible)
-{$('#iBDProcessing').css("display","block");}
-else
-{$('#iBDProcessing').css("display","none");}},init=function(initValues)
-{properties.resetValues=initValues.resetValues;$("#containerMenu").sortable({connectWith:'.connectedSortable',cursor:'move',opacity:0.6,items:'li:not(.menuItemDisabled)',tolerance:'pointer',start:function()
-{$('#iConfigState').hide();}});$('#containerMenu ul.categoryUl li.categoryLi img.visibilitySwitch').bind('click',function()
-{$('#'+$(this).parent().parent().attr('id')+'_visibility').toggle();$('#iConfigState').hide();});$("ul.menuUl").sortable({connectWith:'.connectedSortable',axis:"y",cursor:'move',opacity:0.6,items:'li.connectedSortable',tolerance:'pointer',start:function()
-{$('#iConfigState').hide();}});$('ul.menuUl li div.menuListUsers, ul.menuUl li div.menuListGroups').inputList({listMaxHeight:300,multiple:true,popupMode:'mouseout',returnMode:'notSelected',change:function()
-{$('#iConfigState').hide();}}).inputList('value',':invert');displayTabContent(initValues.tab);};this.reset=function(mode){reset(mode);};this.submit=function(){submit();};this.displayTabContent=function(tab){displayTabContent(tab);};init(initValues);}
Index: tensions/AMenuManager/js/amm_links.min.js
===================================================================
--- /extensions/AMenuManager/js/amm_links.min.js	(revision 15365)
+++ 	(revision )
@@ -1,40 +1,0 @@
-/* file: amm_links.js - v1.0.0 | minified on 2011/01/28 with http://jscompress.com/ */
-function userLinksManage(opt,keys,token)
-{var options={ajaxUrl:'plugins/AMenuManager/amm_ajax.php'},translatedKeys={g002_ok:'g002_ok',g002_cancel:'g002_cancel',g002_loading:'g002_loading',g002_editoflink:'g002_editoflink',g002_createoflink:'g002_createoflink'},properties={id:'',token:token},load=function()
-{$("#iList table.littlefont").sortable('destroy');$('#iList').html("<br>"+translatedKeys.g002_loading+"<br><img src='./plugins/GrumPluginClasses/icons/processing.gif'>");$.ajax({type:"POST",url:options.ajaxUrl,async:true,data:{ajaxfct:"admin.links.list"},success:function(msg)
-{$("#iList").html(msg);$('#iListOrderButtons').css("display",'none');$("#iList").sortable({connectWith:'.connectedSortable',axis:"y",cursor:'move',opacity:0.6,items:'li',tolerance:'pointer',update:function(){$('#iListOrderButtons').css("display",'block');}});}});},edit=function(linkId)
-{properties.id=linkId;$('#iDialogEdit').dialog('option','title',(linkId=='')?translatedKeys.g002_createoflink:translatedKeys.g002_editoflink).dialog("open");},remove=function(linkId)
-{properties.id=linkId;$.ajax({type:"POST",url:options.ajaxUrl,async:true,data:{ajaxfct:"admin.links.delete",id:properties.id,token:properties.token},success:function(msg)
-{load();}});},checkValidity=function()
-{$('.error').removeClass('error');ok=true;if($('#iamm_label').inputText('value')=='')
-{$('#iamm_label').inputText('isValid',false);ok=false;}
-if($('#iamm_url').inputText('value')=='')
-{$('#iamm_url').inputText('isValid',false);ok=false;}
-return(ok);},updateDialog=function(items)
-{if(items=='')
-{$('#iamm_label').inputText('value','');$('#iamm_url').inputText('value','');$('#iamm_icon').inputList('value',':first');$('#iamm_mode').inputList('value',':first');$('#iamm_visible').inputRadio('value','y');$('#iamm_access_users').inputCheckbox('value',':all');$('#iamm_access_groups').inputCheckbox('value',':all');}
-else
-{tmp=$.parseJSON(items);$('#iamm_label').inputText('value',tmp.label);$('#iamm_url').inputText('value',tmp.url);$('#iamm_icon').inputList('value',tmp.icon);$('#iamm_mode').inputList('value',tmp.mode);$('#iamm_visible').inputRadio('value',tmp.visible);$('#iamm_access_users').inputCheckbox('value','',tmp.accessUsers);$('#iamm_access_users').inputCheckbox('value',':invert');$('#iamm_access_groups').inputCheckbox('value','',tmp.accessGroups);$('#iamm_access_groups').inputCheckbox('value',':invert');}},doUpdateOrder=function()
-{var datas={links:[]},order=0;$('#iList li.connectedSortable').each(function()
-{datas.links.push({id:$(this).attr('linkId'),order:order});order++;});$.ajax({type:"POST",url:options.ajaxUrl,async:true,data:{ajaxfct:"admin.links.order",token:properties.token,datas:datas},success:function(msg)
-{displayProcessing(false);returned=msg.split('!');if(returned[0]=='OK')
-{$('#iListOrderButtons').css("display",'none');}
-else
-{$('#'+returned[0]).addClass('error');alert(returned[1]);}}});},doUpdate=function()
-{displayProcessing(true);var datas={label:$('#iamm_label').inputText('value'),url:$('#iamm_url').inputText('value'),icon:$('#iamm_icon').inputList('value'),mode:$('#iamm_mode').inputList('value'),visible:$('#iamm_visible').inputRadio('value'),accessUsers:$('#iamm_access_users').inputCheckbox('value'),accessGroups:$('#iamm_access_groups').inputCheckbox('value')};$.ajax({type:"POST",url:options.ajaxUrl,async:true,data:{ajaxfct:"admin.links.set",id:properties.id,token:properties.token,datas:datas},success:function(msg)
-{displayProcessing(false);if(msg.match(/^[0-9]+$/i)!=null)
-{$('#iDialogEdit').dialog("close");load();}
-else
-{returned=msg.split('!');$('#'+returned[0]).addClass('error');alert(returned[1]);}}});},displayProcessing=function(visible)
-{if(visible)
-{$('#iBDProcessing').css("display","block");}
-else
-{$('#iBDProcessing').css("display","none");}},init=function()
-{var buttons={};buttons[translatedKeys.g002_ok]=function()
-{if(checkValidity())doUpdate();};buttons[translatedKeys.g002_cancel]=function()
-{$('#iDialogEdit').dialog("close");};$('#iDialogEdit').dialog({autoOpen:false,width:600,height:400,modal:true,dialogClass:'gcBgTabSheet gcBorder',title:'',buttons:buttons}).bind('dialogopen',function()
-{if(properties.id!='')
-{displayProcessing(true);$.ajax({type:"POST",url:options.ajaxUrl,async:true,data:{ajaxfct:"admin.links.get",id:properties.id},success:function(msg)
-{updateDialog(msg);displayProcessing(false);}});}
-else
-{updateDialog('');}});$('#iamm_label').inputText({displayChar:50,maxChar:50});$('#iamm_url').inputText({displayChar:50,maxChar:255});$('#iamm_icon').inputList({listMaxWidth:250,colsWidth:[22,200],colsCss:['iconColImg','iconColText'],popupMode:'mouseout'});$('#iamm_mode').inputList({popupMode:'mouseout'});$('#iamm_visible').inputRadio();$('#iamm_access_users').inputCheckbox({returnMode:'notSelected'});$('#iamm_access_groups').inputCheckbox({returnMode:'notSelected'});load();};$.extend(options,opt);$.extend(translatedKeys,keys);this.load=function(){load();};this.edit=function(linkId){edit(linkId);};this.remove=function(linkId){remove(linkId);};this.doUpdateOrder=function(){doUpdateOrder();};init();}
Index: tensions/AMenuManager/js/amm_linksConfig.min.js
===================================================================
--- /extensions/AMenuManager/js/amm_linksConfig.min.js	(revision 15365)
+++ 	(revision )
@@ -1,16 +1,0 @@
-/* file: amm_linksConfig.js - v1.0.0 | minified on 2011/01/28 with http://jscompress.com/ */
-function userLinksConfig(opt,keys,token,initValues)
-{var options={ajaxUrl:'plugins/AMenuManager/amm_ajax.php'},translatedKeys={},properties={token:token},submit=function()
-{if(!checkValidity())return(false);displayProcessing(true);var datas={title:[],showIcons:$('#iamm_links_show_icons').inputRadio('value')};list=$('#iamm_links_title').inputText('languagesValues');for(var id in list)
-{datas.title.push({id:id,value:list[id]});}
-$.ajax({type:"POST",url:options.ajaxUrl,async:true,data:{ajaxfct:"admin.links.setConfig",token:properties.token,datas:datas},success:function(msg)
-{displayProcessing(false);returned=msg.split('!');if(returned[0]=='OK')
-{$('#iConfigState').html(returned[1]).removeClass('errors').addClass('infos').css('display','block');}
-else
-{$('#iConfigState').html(returned[1]).removeClass('infos').addClass('errors').css('display','block');}}});},checkValidity=function()
-{$('.error').removeClass('error');ok=true;return(ok);},displayProcessing=function(visible)
-{if(visible)
-{$('#iBDProcessing').css("display","block");}
-else
-{$('#iBDProcessing').css("display","none");}},init=function(initValues)
-{$('#iamm_links_show_icons').inputRadio();$('#iamm_links_show_icons').inputRadio('value',initValues.showIcons);$('#islang').inputList({popupMode:'mouseout'});$('#iamm_links_title').inputText({languages:initValues.langs,languagesValues:initValues.titles,currentLanguage:initValues.userLang,languageSelector:'islang',displayChar:40});$('#islang').inputList('value',initValues.userLang);};$.extend(options,opt);$.extend(translatedKeys,keys);this.submit=function(){submit();};init(initValues);}
Index: tensions/AMenuManager/js/amm_personalisedBlocks.min.js
===================================================================
--- /extensions/AMenuManager/js/amm_personalisedBlocks.min.js	(revision 15365)
+++ 	(revision )
@@ -1,34 +1,0 @@
-/* file: amm_personalisedBlocks.js - v1.0.2 | minified on 2011/04/10 with http://jscompress.com/ */
-function userPersonnalisedBlockManage(opt,keys,token,initValues)
-{var options={ajaxUrl:'plugins/AMenuManager/amm_ajax.php'},translatedKeys={g002_ok:'g002_ok',g002_cancel:'g002_cancel',g002_loading:'g002_loading',g002_editofpersonalised:'g002_editofpersonalised',g002_createofpersonalised:'g002_createofpersonalised'},properties={id:'',token:token},load=function()
-{$('#iList').html("<br>"+translatedKeys.g002_loading+"<br><img src='./plugins/GrumPluginClasses/icons/processing.gif'>");$.ajax({type:"POST",url:options.ajaxUrl,async:true,data:{ajaxfct:"admin.blocks.list"},success:function(msg)
-{$("#iList").html(msg);}});},edit=function(blockId)
-{properties.id=blockId;$('#iDialogEdit').dialog('option','title',(blockId=='')?translatedKeys.g002_createofpersonalised:translatedKeys.g002_editofpersonalised).dialog("open");},remove=function(blockId)
-{properties.id=blockId;$.ajax({type:"POST",url:options.ajaxUrl,async:true,data:{ajaxfct:"admin.blocks.delete",id:properties.id,token:properties.token},success:function(msg)
-{load();}});},checkValidity=function()
-{$('.error').removeClass('error');ok=true;return(ok);},updateDialog=function(items)
-{if(items=='')
-{$('#iamm_personalised_nfo').inputText('value','');$('#iamm_personalised_title').inputText('value','').inputText('languagesValues',':clear');$('#iamm_personalised_content').inputText('value','').inputText('languagesValues',':clear');$('#iamm_personalised_visible').inputRadio('value','y');}
-else
-{var tmp=$.parseJSON(items),titles={},contents={};for(var lang in tmp.langs)
-{titles[lang]=tmp.langs[lang].title;contents[lang]=tmp.langs[lang].content;}
-$('#iamm_personalised_nfo').inputText('value',tmp.nfo);$('#iamm_personalised_title').inputText('languagesValues',':clear').inputText('languagesValues',titles);$('#iamm_personalised_content').inputText('languagesValues',':clear').inputText('languagesValues',contents);$('#iamm_personalised_visible').inputRadio('value',tmp.visible);}},doUpdate=function()
-{displayProcessing(true);var langs=[],titles=$('#iamm_personalised_title').inputText('languagesValues'),contents=$('#iamm_personalised_content').inputText('languagesValues');for(var lang in titles)
-{langs.push({lang:lang,title:titles[lang],content:contents[lang]});}
-var datas={nfo:$('#iamm_personalised_nfo').inputText('value'),visible:$('#iamm_personalised_visible').inputRadio('value'),langs:langs};$.ajax({type:"POST",url:options.ajaxUrl,async:true,data:{ajaxfct:"admin.blocks.set",id:properties.id,token:properties.token,datas:datas},success:function(msg)
-{displayProcessing(false);if(msg.match(/^[0-9]+$/i)!=null)
-{$('#iDialogEdit').dialog("close");load();}
-else
-{returned=msg.split('!');$('#'+returned[0]).addClass('error');alert(returned[1]);}}});},displayProcessing=function(visible)
-{if(visible)
-{$('#iBDProcessing').css("display","block");}
-else
-{$('#iBDProcessing').css("display","none");}},init=function(initValues)
-{var buttons={};buttons[translatedKeys.g002_ok]=function()
-{if(checkValidity())doUpdate();};buttons[translatedKeys.g002_cancel]=function()
-{$('#iDialogEdit').dialog("close");};$('#iDialogEdit').dialog({autoOpen:false,width:800,height:480,modal:true,dialogClass:'gcBgTabSheet gcBorder',title:'',buttons:buttons}).bind('dialogopen',function()
-{if(properties.id!='')
-{displayProcessing(true);$.ajax({type:"POST",url:options.ajaxUrl,async:true,data:{ajaxfct:"admin.blocks.get",id:properties.id},success:function(msg)
-{updateDialog(msg);displayProcessing(false);}});}
-else
-{updateDialog('');}});$('#islang').inputList({popupMode:'mouseout',listMaxHeight:300});$('#iamm_personalised_nfo').inputText({displayChar:75,maxChar:255});$('#iamm_personalised_title').inputText({displayChar:75,maxChar:255,languages:initValues.langs,currentLanguage:initValues.userLang,languageSelector:'islang'});$('#iamm_personalised_content').inputText({multilines:true,displayChar:70,numRows:13,languages:initValues.langs,currentLanguage:initValues.userLang,languageSelector:'islang'});$('#islang').inputList('value',initValues.userLang);$('#iamm_personalised_visible').inputRadio();load();};$.extend(options,opt);$.extend(translatedKeys,keys);this.load=function(){load();};this.edit=function(linkId){edit(linkId);};this.remove=function(linkId){remove(linkId);};init(initValues);}
Index: tensions/AMenuManager/js/amm_randomPictConfig.min.js
===================================================================
--- /extensions/AMenuManager/js/amm_randomPictConfig.min.js	(revision 15365)
+++ 	(revision )
@@ -1,27 +1,0 @@
-/* file: amm_randomPictConfig.js - v1.0.0 | minified on 2011/01/28 with http://jscompress.com/ */
-function randomPictConfig(opt,keys,token,initValues)
-{var options={ajaxUrl:'plugins/AMenuManager/amm_ajax.php'},translatedKeys={g002_setting_randompic_periodicchange_deactivated:'g002_setting_randompic_periodicchange_deactivated',g002_setting_randompic_height_auto:'g002_setting_randompic_height_auto'},properties={token:token},submit=function()
-{if(!checkValidity())return(false);displayProcessing(true);var datas={blockTitles:[],blockHeight:$("#iamm_rp_height_slider").slider('option','value'),infosName:$("#iamm_randompicture_showname").inputList('value'),infosComment:$("#iamm_randompicture_showcomment").inputList('value'),freqDelay:$("#iamm_rp_pc_slider").slider('option','value')==99?0:$("#iamm_rp_pc_slider").slider('option','value'),selectMode:$("#iamm_randompicture_selectedMode").inputRadio('value'),selectCat:$("#iamm_randompicture_selectedCat").categorySelector('value')};list=$('#iamm_randompicture_title').inputText('languagesValues');for(var id in list)
-{datas.blockTitles.push({id:id,value:list[id]});}
-$.ajax({type:"POST",url:options.ajaxUrl,async:true,data:{ajaxfct:"admin.randomPict.setConfig",token:properties.token,datas:datas},success:function(msg)
-{displayProcessing(false);returned=msg.split('!');if(returned[0]=='OK')
-{$('#iConfigState').html(returned[1]).removeClass('errors').addClass('infos').css('display','block');}
-else
-{$('#iConfigState').html(returned[1]).removeClass('infos').addClass('errors').css('display','block');}}});},checkValidity=function()
-{$('.error').removeClass('error');ok=true;$("#iamm_randompicture_selectedCat").categorySelector('isValid',true);if($("#iamm_randompicture_selectedMode").inputRadio('value')=='c'&&$("#iamm_randompicture_selectedCat").categorySelector('value').length==0)
-{ok=false;$("#iamm_randompicture_selectedCat").categorySelector('isValid',false);}
-return(ok);},displayProcessing=function(visible)
-{if(visible)
-{$('#iBDProcessing').css("display","block");}
-else
-{$('#iBDProcessing').css("display","none");}},init=function(initValues)
-{$('#iamm_randompicture_selectedMode').inputRadio({change:function(){$('#iConfigState').hide();}});$('#iamm_randompicture_selectedMode').inputRadio('value',initValues.selectMode);$('#iamm_randompicture_selectedCat').categorySelector({serverUrl:'plugins/GrumPluginClasses/gpc_ajax.php',listMaxWidth:650,listMaxHeight:550,userMode:'public',galleryRoot:false,displayStatus:false,filter:'all',multiple:true,load:function(event)
-{$(this).categorySelector('collapse',':all').categorySelector('value',initValues.selectCat);},change:function(){$('#iConfigState').hide();}});$('#iamm_randompicture_showname').inputList({colsWidth:[300],popupMode:'mouseout',change:function(){$('#iConfigState').hide();}}).inputList('value',initValues.infosName);$('#iamm_randompicture_showcomment').inputList({colsWidth:[300],popupMode:'mouseout',change:function(){$('#iConfigState').hide();}}).inputList('value',initValues.infosComment);$('#islang').inputList({popupMode:'mouseout',change:function(){$('#iConfigState').hide();}});$('#iamm_randompicture_title').inputText({languages:initValues.langs,languagesValues:initValues.blockTitles,currentLanguage:initValues.userLang,languageSelector:'islang',displayChar:50,maxChar:255,change:function(){$('#iConfigState').hide();}});$('#islang').inputList('value',initValues.userLang);formatDelay(initValues.freqDelay);$("#iamm_rp_pc_slider").slider({min:0,max:60000,step:50,value:initValues.freqDelay,slide:function(event,ui){formatDelay(ui.value);},change:function(){$('#iConfigState').hide();}});$("#iamm_rp_pc_slider a").addClass('gcBgInput');formatHeight(initValues.blockHeight);$("#iamm_rp_height_slider").slider({min:99,max:300,steps:1,value:initValues.blockHeight,slide:function(event,ui){formatHeight(ui.value);},change:function(){$('#iConfigState').hide();}});$("#iamm_rp_height_slider a").addClass('gcBgInput');},formatDelay=function(delay)
-{$("#iamm_randompicture_periodicchange").val(delay);if(delay==0)
-{$("#iamm_rp_pc_display").html(translatedKeys.g002_setting_randompic_periodicchange_deactivated);}
-else
-{$("#iamm_rp_pc_display").html((delay/1000).toFixed(2)+"s");}},formatHeight=function(height)
-{var vheight=(height==99)?0:height;$("#iamm_randompicture_height").val(vheight);if(vheight==0)
-{$("#iamm_rp_height_display").html(translatedKeys.g002_setting_randompic_height_auto);}
-else
-{$("#iamm_rp_height_display").html(vheight+"px");}};$.extend(options,opt);$.extend(translatedKeys,keys);this.submit=function(){submit();};init(initValues);}
Index: tensions/AMenuManager/js/amm_randomPictPublic.min.js
===================================================================
--- /extensions/AMenuManager/js/amm_randomPictPublic.min.js	(revision 15365)
+++ 	(revision )
@@ -1,18 +1,0 @@
-/* file: amm_randomPictPublic.js - v1.0.1 | minified on 2011/05/24 with http://jscompress.com/ */
-function randomPict(opt)
-{var options={fixedHeight:0,pictures:[],showName:'n',showComment:'n',delay:0},properties={vIntervalID:0,vCurrentPict:0,nameDOM:'',commentDOM:'',img:new Image()},init=function(opt)
-{$.extend(options,opt);switch(options.showName)
-{case'o':properties.nameDOM='iammRPicNameO';break;case'u':properties.nameDOM='iammRPicNameU';break;}
-switch(options.showComment)
-{case'o':properties.commentDOM='iammRPicCommentO';break;case'u':properties.commentDOM='iammRPicCommentU';break;}
-if(properties.nameDOM!='')$('#'+properties.nameDOM).css('display','block');if(properties.commentDOM!='')$('#'+properties.commentDOM).css('display','block');if(options.delay>0)properties.vIntervalID=window.setInterval(getNextPicture,options.delay);if(options.fixedHeight>0)$('#irandompicinner').css('height',options.fixedHeight+'px');preloadImages();},preloadImages=function()
-{$(properties.img).bind('load',function()
-{properties.vCurrentPict++;if(properties.vCurrentPict>=options.pictures.length)
-{properties.vCurrentPict=-1;getNextPicture();}
-else
-{properties.img.src=options.pictures[properties.vCurrentPict].thumb;}});properties.img.src=options.pictures[properties.vCurrentPict].thumb;},computePositionTop=function()
-{$("#iamm_ill0").css({top:($('#irandompicinner').innerHeight()-$("#iamm_ill0").innerHeight())/2});},getNextPicture=function()
-{properties.vCurrentPict++;if(properties.vCurrentPict>=options.pictures.length)properties.vCurrentPict=0;$('#iamm_ill0').fadeTo(200,0,function()
-{if(properties.nameDOM!='')$('#'+properties.nameDOM).html(options.pictures[properties.vCurrentPict].name);if(properties.commentDOM!='')$('#'+properties.commentDOM).html(options.pictures[properties.vCurrentPict].comment);$('#iammRPicLink').attr('href',options.pictures[properties.vCurrentPict].link);$('#iammRPicImg').attr('src',options.pictures[properties.vCurrentPict].thumb);computePositionTop();$('#iamm_ill0').fadeTo(200,1);});};init(opt);}
-$(document).ready(function()
-{var rPict;if(typeof randomPictOpt!=='undefined'){rPict=new randomPict(randomPictOpt);}else{$('#mbAMM_randompict').remove();}});
Index: /extensions/AMenuManager/language/ar_SA/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/ar_SA/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/ar_SA/plugin.lang.php	(revision 15366)
@@ -56,6 +56,4 @@
 $lang['g002_name'] = 'لاصق';
 
-$lang['g002_translate'] = 'ترجم بواسطة جوجل';
-
 $lang['g002_configrandompic'] = 'اعدادات الصورة العشوائية';
 $lang['g002_setting_randompic_aboutpicture'] = 'المعلومات المعروضة';
@@ -100,22 +98,3 @@
 $lang['g002_click_to_manage_rights'] = "تنطيم الحقوق";
 
-$lang['g002_accessibility'] = 'امكانية الوصول';
-$lang['g002_config_not_saved'] = 'التكوينات غير محفوظة';
-$lang['g002_loading'] = 'تحميل ..';
-$lang['g002_ok'] = 'موافق';
-$lang['g002_plugin'] = 'إضافة';
-$lang['g002_reset_order'] = 'امسح الطلب';
-$lang['g002_selectedpict'] = 'الصور المحددة';
-$lang['g002_selected_all_gallery'] = 'جميع الألبومات';
-$lang['g002_selected_categories'] = 'جميع الألبومات المحدده';
-$lang['g002_selected_favorites_wm'] = 'الصورة المفضلة لمدير المعرض';
-$lang['g002_setting_core_blocks_content'] = 'محتوى قائمة ’ القائمة الرئيسية ’ و ’ خاص ’ .';
-$lang['g002_valid_order'] = 'نفذ الأمر';
-$lang['g002_album2menu'] = 'الألبومات المحولة إلى قائمة';
-$lang['g002_album_nfo'] = 'السماح بتحويل واحد أو أكثر من ألبوم إلى القائمة';
-$lang['g002_album'] = 'ألبوم  &rArr; قائمة';
-$lang['g002_setting_albums_menus'] = 'تحويل ألبوم إلى قائمة';
-$lang['g002_setting_blocks_position'] = 'الرؤية وترتيب للقوائم';
-$lang['gmaps_gpc_not_up_to_date'] = 'من الضروري تفعيل الاضافة  <i>Grum Plugin Classes</i> اصدار %s .
-حالياً الاصدار %s مثبت ،  الرجاء تحديث اصدار  الاضافة  <i>Grum Plugin Classes</i>. ';
 ?>
Index: /extensions/AMenuManager/language/ca_ES/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/ca_ES/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/ca_ES/plugin.lang.php	(revision 15366)
@@ -110,5 +110,4 @@
 $lang['g002_show_u'] = 'Mostra sota la imatge';
 $lang['g002_title'] = 'Títol';
-$lang['g002_translate'] = 'Traduir amb el traductor de Google';
 $lang['g002_url'] = 'URL';
 $lang['g002_valid_order'] = 'Ordenar';
Index: /extensions/AMenuManager/language/cs_CZ/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/cs_CZ/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/cs_CZ/plugin.lang.php	(revision 15366)
@@ -55,6 +55,4 @@
 $lang['g002_sectionid'] = 'Identifikátor';
 $lang['g002_name'] = 'Popisek';
-
-$lang['g002_translate'] = 'Přeložit pomocí Google Translate';
 
 $lang['g002_configrandompic'] = 'Náhodný obrázek nastaevní';
@@ -119,5 +117,5 @@
 $lang['g002_album2menu'] = "Přeměnit album na menu";
 $lang['g002_album'] = "Album &rArr; menu";
-$lang['g002_setting_albums_menus'] = "Alba ke konvertování na menu"; 
+$lang['g002_setting_albums_menus'] = "Alba ke konvertování na menu";
 $lang['gmaps_gpc_not_up_to_date']= "Tohle je nezbytné pokud je nainstalován <i>Grum Plugin Classes</i> ver. %s.
 Aktuálně je nainstalována verze  %s : prosím aktualizujte plugin <i>Grum Plugin Classes</i> na novou verzi.";
Index: /extensions/AMenuManager/language/de_DE/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/de_DE/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/de_DE/plugin.lang.php	(revision 15366)
@@ -56,6 +56,4 @@
 $lang['g002_name'] = 'Wortlaut';
 
-$lang['g002_translate'] = 'Übersetzen mit Google Translate';
-
 $lang['g002_configrandompic'] = 'Konfiguration des Zufallsbild';
 $lang['g002_setting_randompic_aboutpicture'] = 'Angezeigt Daten';
@@ -94,20 +92,20 @@
 
 $lang['g002_ok'] = "OK";
-$lang['g002_config_saved'] = "Einstellungen wurden gespeichert"; 
-$lang['g002_config_not_saved'] = "Einstellungen wurden nicht gespeichert"; 
-$lang['g002_selected_all_gallery'] = "Alle Alben"; 
-$lang['g002_selected_favorites_wm'] = "Die Favoriten des Webmasters"; 
-$lang['g002_selected_categories'] = "Alle ausgewählten Alben"; 
-$lang['g002_loading'] = "Laden..."; 
-$lang['g002_valid_order'] = "Befehl anwenden"; 
-$lang['g002_reset_order'] = "Befehl zurücksetzen"; 
-$lang['g002_accessibility'] = "Zugänglichkeit"; 
-$lang['g002_setting_core_blocks_content'] = "Inhalt der Menüs 'Menu' & 'Specials'"; 
-$lang['g002_setting_blocks_position'] = "Sichtbarkeit und Reihenfolge für die Menüs "; 
-$lang['g002_plugin'] = "Plug-In"; 
-$lang['g002_selectedpict'] = "Ausgewählte Bilder"; 
-$lang['g002_album_nfo'] = 'Die Konvertierung eines oder mehrere Alben in einem Menü erlauben'; 
-$lang['g002_album2menu'] = "Konvertierter Album zum Menü"; 
-$lang['g002_album'] = "Album &rArr; Menü"; 
+$lang['g002_config_saved'] = "Einstellungen wurden gespeichert";
+$lang['g002_config_not_saved'] = "Einstellungen wurden nicht gespeichert";
+$lang['g002_selected_all_gallery'] = "Alle Alben";
+$lang['g002_selected_favorites_wm'] = "Die Favoriten des Webmasters";
+$lang['g002_selected_categories'] = "Alle ausgewählten Alben";
+$lang['g002_loading'] = "Laden...";
+$lang['g002_valid_order'] = "Befehl anwenden";
+$lang['g002_reset_order'] = "Befehl zurücksetzen";
+$lang['g002_accessibility'] = "Zugänglichkeit";
+$lang['g002_setting_core_blocks_content'] = "Inhalt der Menüs 'Menu' & 'Specials'";
+$lang['g002_setting_blocks_position'] = "Sichtbarkeit und Reihenfolge für die Menüs ";
+$lang['g002_plugin'] = "Plug-In";
+$lang['g002_selectedpict'] = "Ausgewählte Bilder";
+$lang['g002_album_nfo'] = 'Die Konvertierung eines oder mehrere Alben in einem Menü erlauben';
+$lang['g002_album2menu'] = "Konvertierter Album zum Menü";
+$lang['g002_album'] = "Album &rArr; Menü";
 $lang['g002_setting_albums_menus'] = "Zu konvertierenden Alben in Menüs.";
 $lang['gmaps_gpc_not_up_to_date']="Es ist für den Plug-In notwendig, dass <i>Grum Plugin Classes</i> mit der Version %s installiert ist.
@@ -115,8 +113,3 @@
 
 
-$lang['g002_apply_changes'] = 'Änderungen anwenden';
-$lang['g002_cancel'] = 'Abbrechen';
-$lang['g002_click_to_manage_rights'] = 'Rechteverwaltung';
-$lang['g002_piwigo_default'] = 'Piwigo Standard-Sortierung';
-$lang['g002_adviser_not_allowed'] = 'Ein Berater darf keine Änderungen vornehmen';
 ?>
Index: /extensions/AMenuManager/language/el_GR/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/el_GR/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/el_GR/plugin.lang.php	(revision 15366)
@@ -109,5 +109,4 @@
 $lang['g002_title_page'] = 'Διαχείρισης Προηγμένου Μενού';
 $lang['g002_title'] = 'Τίτλος';
-$lang['g002_translate'] = 'Μετάφραση με το Google Translate';
 $lang['g002_url'] = 'URL';
 $lang['g002_valid_order'] = 'Εφαρμογή ταξυνόμησης';
Index: /extensions/AMenuManager/language/en_UK/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/en_UK/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/en_UK/plugin.lang.php	(revision 15366)
@@ -56,6 +56,4 @@
 $lang['g002_name'] = 'Label';
 
-$lang['g002_translate'] = 'Translate with Google Translate';
-
 $lang['g002_configrandompic'] = 'Random picture settings';
 $lang['g002_setting_randompic_aboutpicture'] = 'Displayed datas';
@@ -64,5 +62,5 @@
 $lang['g002_show_n'] = 'No';
 $lang['g002_show_o'] = 'Display over the picture';
-$lang['g002_show_u'] = 'Display under the picture';
+$lang['g002_show_u'] = 'Display under thpicture';
 
 $lang['g002_personalisedlist'] = "Liste of personalised blocks";
Index: /extensions/AMenuManager/language/es_ES/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/es_ES/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/es_ES/plugin.lang.php	(revision 15366)
@@ -55,6 +55,4 @@
 $lang['g002_sectionid'] = 'Identificador';
 $lang['g002_name'] = 'Redacción';
-
-$lang['g002_translate'] = 'Traducir con Google Translate';
 
 $lang['g002_configrandompic'] = 'Configuración de la imagen aleatoria';
@@ -121,5 +119,5 @@
 $lang['g002_setting_albums_menus'] = "Álbum a convertir en menú";
 $lang['g002_gpc_not_up_to_date']="Es necesario que el plugin <i>Grum Plugin Classes</i> versión %ª se encuentre instalado.
-Actualmente está instalada la versión %s: gracias por proceder a la actualización de la versión del plugin <i>Grum Plugin Classes</i>."; 
+Actualmente está instalada la versión %s: gracias por proceder a la actualización de la versión del plugin <i>Grum Plugin Classes</i>.";
 
 ?>
Index: /extensions/AMenuManager/language/fr_FR/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/fr_FR/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/fr_FR/plugin.lang.php	(revision 15366)
@@ -1,4 +1,5 @@
 <?php
 
+$lang['To install this plugin, you need to install Grum Plugin Classes %s before'] = 'Pour installer ce plugin, vous devez au préalable, installer le plugin Grum Plugin Classes %s';
 
 $lang['g002_title_page'] = 'Gestion avancée du menu';
@@ -54,6 +55,4 @@
 $lang['g002_sectionid'] = 'Identifiant';
 $lang['g002_name'] = 'Libellé';
-
-$lang['g002_translate'] = 'Traduire avec Google Translate';
 
 $lang['g002_setting_randompic_aboutpicture'] = 'Données affichées';
@@ -118,7 +117,13 @@
 $lang['g002_album'] = "Album &rArr; menu";
 $lang['g002_setting_albums_menus'] = "Album à convertir en menu";
+$lang['g002_gpc_not_up_to_date']="Il est nécessaire que le plugin <i>Grum Plugin Classes</i> version %s soit installé.
+Actuellement, la version %s est installée : merci de procéder à la mise à jour de version du plugin <i>Grum Plugin Classes</i>.";
 
-$lang['gmaps_gpc_not_up_to_date'] = 'Le plugin <i>Grum Plugin Classes</i> version %s doit être installé. Actuellement, vous disposez de la version %s : Veuillez mettre à jour le plugin <i>Grum Plugin Classes</i>.';
-$lang['Grum Plugin Classes is not installed'] = 'Le plugin <b>Grum Plugin Classes</b> n\'est pas installé';
-$lang['g002_configrandompic'] = 'Réglages de l\'image au hasard';
+
+/* --- removed keys ---
+$lang['g002_configrandompic'] = 'Configuration de l\'image aléatoire';
+
+*/
+
+
 ?>
Index: /extensions/AMenuManager/language/hr_HR/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/hr_HR/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/hr_HR/plugin.lang.php	(revision 15366)
@@ -56,6 +56,4 @@
 $lang['g002_name'] = 'Naziv';
 
-$lang['g002_translate'] = 'Prevedi sa Google Translate';
-
 $lang['g002_configrandompic'] = 'Postavke slučajno odabrane slike';
 $lang['g002_setting_randompic_aboutpicture'] = 'Prikazani podaci';
Index: /extensions/AMenuManager/language/hu_HU/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/hu_HU/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/hu_HU/plugin.lang.php	(revision 15366)
@@ -1,3 +1,2 @@
-<?php
 
 $lang['g002_title_page'] = 'Speciális menükezelő';
@@ -53,6 +52,4 @@
 $lang['g002_name'] = 'Címke';
 
-$lang['g002_translate'] = 'Fordítás a Google Translate használatával';
-
 $lang['g002_configrandompic'] = 'Véletlen kép beállításai';
 $lang['g002_setting_randompic_aboutpicture'] = 'Egyéb jellemzők megjelenítése';
@@ -89,4 +86,5 @@
 $lang['gmaps_gpc_not_up_to_date'] = 'A bővítmény használatához szükség van a <i>Grum Plugin Classes</i> %s változatának telepítésére.
 Jelenleg a %s változat van telepítve. Lépjen tovább és frissítse a <i>Grum Plugin Classes</i> bővítményt.';
+Jelenleg a %s változat van telepítve. Lépj tovább és frissítsd a <i>Grum Plugin Classes</i> bővítményt.";
 
 ?>
Index: /extensions/AMenuManager/language/it_IT/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/it_IT/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/it_IT/plugin.lang.php	(revision 15366)
@@ -56,6 +56,4 @@
 $lang['g002_name'] = 'Etichetta';
 
-$lang['g002_translate'] = 'Tradurre con Google Translate';
-
 $lang['g002_configrandompic'] = 'Configurazione del\'immagine aleatoria';
 $lang['g002_setting_randompic_aboutpicture'] = 'Dati visualizzati';
@@ -101,21 +99,21 @@
 
 $lang['g002_ok'] = "OK";
-$lang['g002_config_saved'] = "Configurazione salvata"; 
-$lang['g002_config_not_saved'] = "Configurazione non salvata"; 
-$lang['g002_selected_all_gallery'] = "Tutti gli album"; 
+$lang['g002_config_saved'] = "Configurazione salvata";
+$lang['g002_config_not_saved'] = "Configurazione non salvata";
+$lang['g002_selected_all_gallery'] = "Tutti gli album";
 $lang['g002_selected_favorites_wm'] = "Le immagini preferite del webmaster";
 
-$lang['g002_selected_categories'] = "Tutti gli album selezionati"; 
-$lang['g002_loading'] = "carica..."; 
-$lang['g002_valid_order'] = "Applicare l'ordine"; 
-$lang['g002_reset_order'] = "Resettare l'ordine"; 
-$lang['g002_accessibility'] = "Accessibilità"; 
-$lang['g002_setting_core_blocks_content'] = "Contenuto per i menu 'Menu' & 'Speciale'"; 
-$lang['g002_setting_blocks_position'] = "Visibilità e ordine dei menu "; 
+$lang['g002_selected_categories'] = "Tutti gli album selezionati";
+$lang['g002_loading'] = "carica...";
+$lang['g002_valid_order'] = "Applicare l'ordine";
+$lang['g002_reset_order'] = "Resettare l'ordine";
+$lang['g002_accessibility'] = "Accessibilità";
+$lang['g002_setting_core_blocks_content'] = "Contenuto per i menu 'Menu' & 'Speciale'";
+$lang['g002_setting_blocks_position'] = "Visibilità e ordine dei menu ";
 $lang['g002_plugin'] = "Plug-in";
-$lang['g002_selectedpict'] = "Immagini selezionate"; 
-$lang['g002_album_nfo'] = 'Autorizzare la conversione di uno o più album in un  menu '; 
-$lang['g002_album2menu'] = "Convertire album in menu"; 
-$lang['g002_album'] = "Album &rArr; menu"; 
+$lang['g002_selectedpict'] = "Immagini selezionate";
+$lang['g002_album_nfo'] = 'Autorizzare la conversione di uno o più album in un  menu ';
+$lang['g002_album2menu'] = "Convertire album in menu";
+$lang['g002_album'] = "Album &rArr; menu";
 $lang['g002_setting_albums_menus'] = "Album da convertire in menu";
 $lang['gmaps_gpc_not_up_to_date']= "È necessario per il funzionamento del plug-in che <i>Grum Plugin Classes</i> con la versione %s sia installata.
Index: /extensions/AMenuManager/language/lv_LV/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/lv_LV/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/lv_LV/plugin.lang.php	(revision 15366)
@@ -55,6 +55,4 @@
 $lang['g002_sectionid'] = 'Identifikators';
 $lang['g002_name'] = 'Uzraksts';
-
-$lang['g002_translate'] = 'Tulkot ar Google Translate';
 
 $lang['g002_configrandompic'] = 'Gadījuma attēla iestatījumi';
@@ -117,5 +115,5 @@
 $lang['g002_album2menu'] = "Izvēlnē konvertētais albūms";
 $lang['g002_album'] = "Albūma &rArr; izvēlne";
-$lang['g002_setting_albums_menus'] = "Albūmi, ko konvertēt izvēlnē"; 
+$lang['g002_setting_albums_menus'] = "Albūmi, ko konvertēt izvēlnē";
 
 ?>
Index: /extensions/AMenuManager/language/nl_NL/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/nl_NL/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/nl_NL/plugin.lang.php	(revision 15366)
@@ -55,6 +55,4 @@
 $lang['g002_sectionid'] = 'Identifier';
 $lang['g002_name'] = 'Label';
-
-$lang['g002_translate'] = 'Vertaal met Google Vertalen';
 
 $lang['g002_configrandompic'] = 'Instellingen van de willekeurige afbeelding';
Index: /extensions/AMenuManager/language/no_NO/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/no_NO/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/no_NO/plugin.lang.php	(revision 15366)
@@ -55,6 +55,4 @@
 $lang['g002_sectionid'] = 'Identifiser';
 $lang['g002_name'] = 'Etikett';
-
-$lang['g002_translate'] = 'Oversett med Google Translate';
 
 $lang['g002_configrandompic'] = 'Tilfelsig bilde instillinger';
@@ -119,5 +117,3 @@
 $lang['g002_setting_albums_menus'] = "Album å konvertere til meny";
 
-$lang['gmaps_gpc_not_up_to_date'] = 'Det er nødvendig for tillegget <i>Grum Plugin Classes</i> versjon %s er installert.
-Versjon %s er nå installert: vennligst oppdater tillegget <i>Grum Plugin Classes</i>.';
 ?>
Index: /extensions/AMenuManager/language/pl_PL/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/pl_PL/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/pl_PL/plugin.lang.php	(revision 15366)
@@ -52,6 +52,4 @@
 $lang['g002_sectionid'] = 'Identyfikator';
 $lang['g002_name'] = 'Nazwa';
-
-$lang['g002_translate'] = 'Przetłumacz Translatorem Google';
 
 $lang['g002_configrandompic'] = 'Ustawienia losowych obrazów';
@@ -115,5 +113,3 @@
 $lang['gmaps_gpc_not_up_to_date'] = 'Do działania wtyczki potrzebna jest <i>Grum Plugin Classes</i> wersja %s Obecnie zainstalowana jest wersja %s: proszę zaktualizować wersję wtyczki <i>Grum Plugin Classes</i>.';
 
-$lang['g002_nolinks'] = 'Brak linków';
-$lang['g002_setmenu'] = 'Zarządzanie menu';
 ?>
Index: /extensions/AMenuManager/language/pt_PT/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/pt_PT/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/pt_PT/plugin.lang.php	(revision 15366)
@@ -55,6 +55,4 @@
 $lang['g002_sectionid'] = 'Identificador';
 $lang['g002_name'] = 'Etiqueta';
-
-$lang['g002_translate'] = 'Traduzir com o Google Tradutor';
 
 $lang['g002_configrandompic'] = 'Configurar Imagem Aleatória';
Index: /extensions/AMenuManager/language/ru_RU/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/ru_RU/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/ru_RU/plugin.lang.php	(revision 15366)
@@ -1,100 +1,98 @@
 <?php
 
-$lang['Grum Plugin Classes is not installed'] = 'Плагин <b>Grum Plugin Classes</b> не установлен'; 
+$lang['Grum Plugin Classes is not installed'] = 'Плагин <b>Grum Plugin Classes</b> не установлен';
 
-$lang['g002_title_page'] = 'Advanced Menu Management'; 
-$lang['g002_version'] = 'r'; 
+$lang['g002_title_page'] = 'Advanced Menu Management';
+$lang['g002_version'] = 'r';
 
-$lang['g002_error_invalid_ajax_call'] = "Ошибка вызова функции!"; 
+$lang['g002_error_invalid_ajax_call'] = "Ошибка вызова функции!";
 
-$lang['g002_setmenu'] = 'Настройка Меню'; 
-$lang['g002_addlinks'] = 'Ссылки'; 
-$lang['g002_randompict'] = 'Случайная картинка'; 
-$lang['g002_personnalblock'] = 'Индивидуальное меню'; 
+$lang['g002_setmenu'] = 'Настройка Меню';
+$lang['g002_addlinks'] = 'Ссылки';
+$lang['g002_randompict'] = 'Случайная картинка';
+$lang['g002_personnalblock'] = 'Индивидуальное меню';
 
-$lang['g002_setmenu_nfo'] = 'Настройка отображения блоков меню'; 
-$lang['g002_addlinks_nfo'] = 'Блок меню позволяет отобразить список ссылок'; 
-$lang['g002_randompict_nfo'] = 'Блок меню позволяет отобразить случайную картинку из галереи'; 
-$lang['g002_personnalblock_nfo'] = 'Отображает персонализированный блок в меню'; 
+$lang['g002_setmenu_nfo'] = 'Настройка отображения блоков меню';
+$lang['g002_addlinks_nfo'] = 'Блок меню позволяет отобразить список ссылок';
+$lang['g002_randompict_nfo'] = 'Блок меню позволяет отобразить случайную картинку из галереи';
+$lang['g002_personnalblock_nfo'] = 'Отображает персонализированный блок в меню';
 
 
-$lang['g002_mode_new_window'] = 'в новом окне'; 
-$lang['g002_mode_current_window'] = 'в текущем окне'; 
-$lang['g002_addlink'] = 'Добавить ссылку'; 
-$lang['g002_label'] = 'Надпись'; 
-$lang['g002_url'] = 'URL'; 
-$lang['g002_mode'] = 'Открывать ссылку'; 
-$lang['g002_icon'] = 'Отображаемая картинка'; 
-$lang['g002_visible'] = 'Показать'; 
-$lang['g002_linkslist'] = "Список ссылок"; 
-$lang['g002_confirm_delete_link'] = "Удалить ссылку?"; 
-$lang['g002_nolinks'] = 'Нет ссылок'; 
-$lang['g002_link'] = 'ссылка'; 
-$lang['g002_links'] = 'ссылки'; 
+$lang['g002_mode_new_window'] = 'в новом окне';
+$lang['g002_mode_current_window'] = 'в текущем окне';
+$lang['g002_addlink'] = 'Добавить ссылку';
+$lang['g002_label'] = 'Надпись';
+$lang['g002_url'] = 'URL';
+$lang['g002_mode'] = 'Открывать ссылку';
+$lang['g002_icon'] = 'Отображаемая картинка';
+$lang['g002_visible'] = 'Показать';
+$lang['g002_linkslist'] = "Список ссылок";
+$lang['g002_confirm_delete_link'] = "Удалить ссылку?";
+$lang['g002_nolinks'] = 'Нет ссылок';
+$lang['g002_link'] = 'ссылка';
+$lang['g002_links'] = 'ссылки';
 
-$lang['g002_createoflink'] = 'Добавить ссылку'; 
-$lang['g002_editoflink'] = 'Редактировать ссылку'; 
-$lang['g002_createthelink'] = 'Добавить ссылку'; 
-$lang['g002_editthelink'] = 'Редактировать ссылку'; 
+$lang['g002_createoflink'] = 'Добавить ссылку';
+$lang['g002_editoflink'] = 'Редактировать ссылку';
+$lang['g002_createthelink'] = 'Добавить ссылку';
+$lang['g002_editthelink'] = 'Редактировать ссылку';
 
-$lang['g002_configlinks'] = 'Настройка ссылок'; 
-$lang['g002_setting_link_links']='Ссылки'; 
-$lang['g002_setting_link_show_icon'] = 'Показать отображаемую картинку ссылок'; 
+$lang['g002_configlinks'] = 'Настройка ссылок';
+$lang['g002_setting_link_links']='Ссылки';
+$lang['g002_setting_link_show_icon'] = 'Показать отображаемую картинку ссылок';
 
-$lang['g002_setting_block_menu'] = 'Объединение меню'; 
-$lang['g002_setting_block_active'] = 'Показать блок в меню'; 
-$lang['g002_setting_block_title'] = 'Заголовок блока'; 
-$lang['g002_apply'] = 'Применить'; 
+$lang['g002_setting_block_menu'] = 'Объединение меню';
+$lang['g002_setting_block_active'] = 'Показать блок в меню';
+$lang['g002_setting_block_title'] = 'Заголовок блока';
+$lang['g002_apply'] = 'Применить';
 
-$lang['g002_sectionslist'] = 'Блоки меню'; 
+$lang['g002_sectionslist'] = 'Блоки меню';
 
-$lang['g002_yesno_y'] = 'Да'; 
-$lang['g002_yesno_n'] = 'Нет'; 
+$lang['g002_yesno_y'] = 'Да';
+$lang['g002_yesno_n'] = 'Нет';
 
-$lang['g002_owner'] = 'Владелец'; 
-$lang['g002_sectionid'] = 'Идентификатор'; 
-$lang['g002_name'] = 'Надпись'; 
+$lang['g002_owner'] = 'Владелец';
+$lang['g002_sectionid'] = 'Идентификатор';
+$lang['g002_name'] = 'Надпись';
 
-$lang['g002_translate'] = 'Перевести с помощью Google Translate'; 
+$lang['g002_configrandompic'] = 'Настройка случайной картинки';
+$lang['g002_setting_randompic_aboutpicture'] = 'Отображаемые даты';
+$lang['g002_setting_randompic_showname'] = 'Показать название картинки';
+$lang['g002_setting_randompic_showcomment'] = 'Показать комментарии к картинке';
+$lang['g002_show_n'] = 'Нет';
+$lang['g002_show_o'] = 'Отобразить над картинкой';
+$lang['g002_show_u'] = 'Отобразить под картинкой';
 
-$lang['g002_configrandompic'] = 'Настройка случайной картинки'; 
-$lang['g002_setting_randompic_aboutpicture'] = 'Отображаемые даты'; 
-$lang['g002_setting_randompic_showname'] = 'Показать название картинки'; 
-$lang['g002_setting_randompic_showcomment'] = 'Показать комментарии к картинке'; 
-$lang['g002_show_n'] = 'Нет'; 
-$lang['g002_show_o'] = 'Отобразить над картинкой'; 
-$lang['g002_show_u'] = 'Отобразить под картинкой'; 
+$lang['g002_personalisedlist'] = "Список индивидуальных блоков";
+$lang['g002_notitle'] = '[Без названия]';
+$lang['g002_title'] = 'Название';
+$lang['g002_sections'] = 'блоки';
+$lang['g002_section'] = 'блок';
+$lang['g002_nosections'] = 'Нет блоков';
+$lang['g002_addsection'] = 'Добавить новый блок';
+$lang['g002_createofpersonalised'] = 'Создать новый индивидуальный блок';
+$lang['g002_editofpersonalised'] = 'Изменить индивидуальный блок';
+$lang['g002_setting_block_langchoice'] = 'Выбрать язык';
+$lang['g002_setting_personalised_content'] = 'Содержание блока';
+$lang['g002_setting_personalised_properties'] = 'Свойства';
+$lang['g002_setting_personalised_nfo'] = 'Описание';
 
-$lang['g002_personalisedlist'] = "Список индивидуальных блоков"; 
-$lang['g002_notitle'] = '[Без названия]'; 
-$lang['g002_title'] = 'Название'; 
-$lang['g002_sections'] = 'блоки'; 
-$lang['g002_section'] = 'блок'; 
-$lang['g002_nosections'] = 'Нет блоков'; 
-$lang['g002_addsection'] = 'Добавить новый блок'; 
-$lang['g002_createofpersonalised'] = 'Создать новый индивидуальный блок'; 
-$lang['g002_editofpersonalised'] = 'Изменить индивидуальный блок'; 
-$lang['g002_setting_block_langchoice'] = 'Выбрать язык'; 
-$lang['g002_setting_personalised_content'] = 'Содержание блока'; 
-$lang['g002_setting_personalised_properties'] = 'Свойства'; 
-$lang['g002_setting_personalised_nfo'] = 'Описание'; 
+$lang['g002_all_languages'] = "Все языки";
 
-$lang['g002_all_languages'] = "Все языки"; 
+$lang['g002_modmenu'] = 'блок \'меню\'';
+$lang['g002_modspecial'] = 'блок \'специальный\'';
+$lang['g002_labelmenu'] = 'Ярлык меню';
 
-$lang['g002_modmenu'] = 'блок \'меню\''; 
-$lang['g002_modspecial'] = 'блок \'специальный\''; 
-$lang['g002_labelmenu'] = 'Ярлык меню'; 
+$lang['g002_setting_randompic_periodicchange'] = "Периодичность смены изображений";
+$lang['g002_setting_randompic_periodicchange_delay'] = "Задержка";
+$lang['g002_setting_randompic_periodicchange_deactivated'] = "Невозможно";
+$lang['g002_setting_randompic_height'] = "Высота блока меню";
+$lang['g002_setting_randompic_height_auto'] = "Автоматически";
 
-$lang['g002_setting_randompic_periodicchange'] = "Периодичность смены изображений"; 
-$lang['g002_setting_randompic_periodicchange_delay'] = "Задержка"; 
-$lang['g002_setting_randompic_periodicchange_deactivated'] = "Невозможно"; 
-$lang['g002_setting_randompic_height'] = "Высота блока меню"; 
-$lang['g002_setting_randompic_height_auto'] = "Автоматически"; 
-
-// v2.1.3 
-$lang['g002_cancel'] = "Отмена"; 
-$lang['g002_piwigo_default'] = "Сортировка по умолчанию Piwigo"; 
-$lang['g002_apply_changes'] = "Применить изменения"; 
-$lang['g002_config_saved'] = "Конфигурация сохранена"; 
+// v2.1.3
+$lang['g002_cancel'] = "Отмена";
+$lang['g002_piwigo_default'] = "Сортировка по умолчанию Piwigo";
+$lang['g002_apply_changes'] = "Применить изменения";
+$lang['g002_config_saved'] = "Конфигурация сохранена";
 $lang['g002_adviser_not_allowed'] = "Консультант не уполномочен совершать изменения";
 $lang['g002_click_to_manage_rights'] = "Управление правами";
@@ -111,4 +109,5 @@
 $lang['g002_valid_order'] = "Применить сортировку";
 $lang['g002_reset_order'] = "Отменить сортировку";
+$lang['g 002_accessibility'] = "Доступность";
 $lang['g002_setting_core_blocks_content'] = "Содержимое пунктов 'Меню' & 'Спец функции'";
 $lang['g002_setting_blocks_position'] = "Видимость и порядок пунктов меню";
@@ -119,7 +118,6 @@
 $lang['g002_album'] = "Альбом ⇒ меню";
 $lang['g002_setting_albums_menus'] = "Альбомы для преобразования в меню";
-$lang['gmaps_gpc_not_up_to_date'] = 'Плагин <i>Grum Plugin Classes</i> версия %s. 
-На данный момент установлена версия %s: обновите Вашу версию плагина <i>Grum Plugin Classes</i>.';
+$lang['gmaps_gpc_not_up_to_date']="Плагин <i>Grum Plugin Classes</i> версия %s.
+На данный момент установлена версия %s: обновите Вашу версию плагина <i>Grum Plugin Classes</i>.";
 
-$lang['g002_accessibility'] = 'Доступность';
 ?>
Index: /extensions/AMenuManager/language/sk_SK/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/sk_SK/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/sk_SK/plugin.lang.php	(revision 15366)
@@ -55,6 +55,4 @@
 $lang['g002_sectionid'] = 'Identifikátor';
 $lang['g002_name'] = 'Označenie';
-
-$lang['g002_translate'] = 'Preložiť s prekladačom Google';
 
 $lang['g002_configrandompic'] = 'Nastavenie náhodných fotografií';
@@ -121,5 +119,5 @@
 $lang['g002_setting_albums_menus'] = "Albumy na konvertovanie do menu";
 $lang['gmaps_gpc_not_up_to_date']="Pre doplnok je potrebné mať inštalovaný <i>Grum Plugin Classes</i> verzie %s.
-Momentálne je inštalovaná verzia %s: urobte update na novú verziu doplnku <i>Grum Plugin Classes</i>."; 
+Momentálne je inštalovaná verzia %s: urobte update na novú verziu doplnku <i>Grum Plugin Classes</i>.";
 
 ?>
Index: /extensions/AMenuManager/language/sv_SE/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/sv_SE/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/sv_SE/plugin.lang.php	(revision 15366)
@@ -56,6 +56,4 @@
 $lang['g002_name'] = 'Etikett';
 
-$lang['g002_translate'] = 'Översätt med Google Translate';
-
 $lang['g002_configrandompic'] = 'Inställningar slumpvisa bilder';
 $lang['g002_setting_randompic_aboutpicture'] = 'Visad information';
@@ -78,5 +76,5 @@
 $lang['g002_setting_personalised_content'] = 'Blockinnehåll';
 $lang['g002_setting_personalised_properties'] = 'Egenskaper';
-$lang['g002_setting_personalised_nfo'] = 'Beskrivning'; 
+$lang['g002_setting_personalised_nfo'] = 'Beskrivning';
 
 $lang['g002_all_languages'] = 'Alla språk';
@@ -106,5 +104,5 @@
 $lang['g002_selected_all_gallery'] = 'Alla album';
 $lang['g002_selected_favorites_wm'] = 'Webmaster\'s favoritbilder';
-$lang['g002_selected_categories'] = 'Alla valda album'; 
+$lang['g002_selected_categories'] = 'Alla valda album';
 $lang['g002_loading'] = 'Laddar...';
 $lang['g002_valid_order'] = 'Appliceringsordning';
Index: /extensions/AMenuManager/language/uk_UA/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/uk_UA/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/uk_UA/plugin.lang.php	(revision 15366)
@@ -108,5 +108,4 @@
 $lang['g002_title'] = 'Назва';
 $lang['g002_title_page'] = 'Розширене управління меню';
-$lang['g002_translate'] = 'Перекласти з Google Translate';
 $lang['g002_url'] = 'URL';
 $lang['g002_valid_order'] = 'Застосувати порядок';
Index: /extensions/AMenuManager/language/zh_CN/plugin.lang.php
===================================================================
--- /extensions/AMenuManager/language/zh_CN/plugin.lang.php	(revision 15365)
+++ /extensions/AMenuManager/language/zh_CN/plugin.lang.php	(revision 15366)
@@ -56,6 +56,4 @@
 $lang['g002_name'] = '标签';
 
-$lang['g002_translate'] = '翻译与谷歌翻译';
-
 $lang['g002_configrandompic'] = '随机图片设置';
 $lang['g002_setting_randompic_aboutpicture'] = '随机图片拥有者评论显示设置';
@@ -102,22 +100,22 @@
 
 // v3.0.0
-$lang['g002_ok'] = "确定"; 
-$lang['g002_config_saved'] = "配置已保存"; 
-$lang['g002_config_not_saved'] = "配置不能保存"; 
-$lang['g002_selected_all_gallery'] = "全部相册"; 
-$lang['g002_selected_favorites_wm'] = "站长的喜爱图片"; 
-$lang['g002_selected_categories'] = "全部选择的相册"; 
-$lang['g002_loading'] = "加载中..."; 
-$lang['g002_valid_order'] = "应用排序"; 
-$lang['g002_reset_order'] = "重置排序"; 
-$lang['g002_accessibility'] = "可访问性"; 
-$lang['g002_setting_core_blocks_content'] = "'菜单' 和 '特殊' 菜单内容"; 
-$lang['g002_setting_blocks_position'] = "菜单的可见性和排序 "; 
-$lang['g002_plugin'] = "插件"; 
-$lang['g002_selectedpict'] = "已选择的图片"; 
-$lang['g002_album_nfo'] = '允许将一个或多个相册转换成菜单'; 
-$lang['g002_album2menu'] = "已将相册转换成菜单"; 
-$lang['g002_album'] = "相册 &rArr; 菜单"; 
-$lang['g002_setting_albums_menus'] = "相册转换成菜单"; 
+$lang['g002_ok'] = "确定";
+$lang['g002_config_saved'] = "配置已保存";
+$lang['g002_config_not_saved'] = "配置不能保存";
+$lang['g002_selected_all_gallery'] = "全部相册";
+$lang['g002_selected_favorites_wm'] = "站长的喜爱图片";
+$lang['g002_selected_categories'] = "全部选择的相册";
+$lang['g002_loading'] = "加载中...";
+$lang['g002_valid_order'] = "应用排序";
+$lang['g002_reset_order'] = "重置排序";
+$lang['g002_accessibility'] = "可访问性";
+$lang['g002_setting_core_blocks_content'] = "'菜单' 和 '特殊' 菜单内容";
+$lang['g002_setting_blocks_position'] = "菜单的可见性和排序 ";
+$lang['g002_plugin'] = "插件";
+$lang['g002_selectedpict'] = "已选择的图片";
+$lang['g002_album_nfo'] = '允许将一个或多个相册转换成菜单';
+$lang['g002_album2menu'] = "已将相册转换成菜单";
+$lang['g002_album'] = "相册 &rArr; 菜单";
+$lang['g002_setting_albums_menus'] = "相册转换成菜单";
 $lang['gmaps_gpc_not_up_to_date']="插件所必须的<i>Grum插件类</i>版本 %s 已安装。现在版本 %s 已安装：请进行插件<i>Grum插件类</i>的版本升级.";
 
Index: /extensions/AMenuManager/main.inc.php
===================================================================
--- /extensions/AMenuManager/main.inc.php	(revision 15365)
+++ /extensions/AMenuManager/main.inc.php	(revision 15366)
@@ -2,5 +2,5 @@
 /*
 Plugin Name: Advanced Menu Manager
-Version: 3.1.4
+Version: 3.2.0
 Description: Gestion avancée du menu / Advanced management of menu
 Plugin URI: http://piwigo.org
@@ -208,4 +208,9 @@
 |         |            |   . Incompatibility with other plugin managing the menu
 |         |            |     content
+|         |            |
+| 3.2.0   | 2012/05/27 | * mantis: bug 2642
+|         |            |   . Compatibility with Piwigo 2.4
+|         |            |
+|         |            |
 |         |            |
 |         |            |
