*** menu.admin.inc	07 Jun 2009 04:30:13 +0200	1.49
--- menu.admin.inc	27 Jun 2009 12:20:25 +0200
***************
*** 657,672 ****
  function menu_configure() {
    $form['intro'] = array(
      '#type' => 'item',
!     '#markup' => t('The menu module allows on-the-fly creation of menu links in the content authoring forms. The following option sets the default menu in which a new link will be added.'),
    );

    $menu_options = menu_get_menus();
    $form['menu_default_node_menu'] = array(
      '#type' => 'select',
!     '#title' => t('Default menu for content'),
      '#default_value' => 'main-menu',
      '#options' => $menu_options,
-     '#description' => t('Choose the menu to be the default in the menu options in the content authoring form.'),
    );

    $main = variable_get('menu_main_links_source', 'main-menu');
--- 657,671 ----
  function menu_configure() {
    $form['intro'] = array(
      '#type' => 'item',
!     '#markup' => t('<p>When you create new content, you can immediately place them in a menu.  You can set the default menu for such new content here.<br/>You can also choose what menu will be your main or secondary links. Themes usually put the main links at the top and the secondary links in a footer or in the sidebar.</p>'),
    );

    $menu_options = menu_get_menus();
    $form['menu_default_node_menu'] = array(
      '#type' => 'select',
!     '#title' => t('Default menu for new content'),
      '#default_value' => 'main-menu',
      '#options' => $menu_options,
    );

    $main = variable_get('menu_main_links_source', 'main-menu');
***************
*** 677,683 ****
      '#default_value' => 'main-menu',
      '#options' => $main_options,
      '#tree' => FALSE,
!     '#description' => t('Select what should be displayed as the Main links (typically at the top of the page).'),
    );

    $secondary_options = array_merge($menu_options, array('' => t('No Secondary links')));
--- 676,682 ----
      '#default_value' => 'main-menu',
      '#options' => $main_options,
      '#tree' => FALSE,
!     '#description' => t('Select what menu should be displayed as the Main links (typically at the top of the page).'),
    );

    $secondary_options = array_merge($menu_options, array('' => t('No Secondary links')));
***************
*** 687,693 ****
      '#default_value' => 'user-menu',
      '#options' => $secondary_options,
      '#tree' => FALSE,
!     '#description' => t("Select the source for the Secondary links. An advanced option allows you to use the same source for both Main links (currently %main) and Secondary links: if your source menu has two levels of hierarchy, the top level menu links will appear in the Main links, and the children of the active link will appear in the Secondary links." , array('%main' => $main_options[$main])),
    );

    return system_settings_form($form, TRUE);
--- 686,697 ----
      '#default_value' => 'user-menu',
      '#options' => $secondary_options,
      '#tree' => FALSE,
!     '#description' => t("Select what menu should be displaysed as the Secondary links (typically in the footer or sidebar of the page)." , array('%main' => $main_options[$main])),
!   );
!
!   $form['advanced_option'] = array(
!     '#type' => 'item',
!     '#markup' => t('<p>Advanced option: some themes can display a submenu under the main menu. If your theme supports this and you want to use this option, select the same menu for the main and secondary links.</p>'),
    );

    return system_settings_form($form, TRUE);