Index: modules/locale/locale.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.admin.inc,v
retrieving revision 1.21
diff -u -p -r1.21 locale.admin.inc
--- modules/locale/locale.admin.inc	21 Nov 2010 09:53:05 -0000	1.21
+++ modules/locale/locale.admin.inc	26 Nov 2010 19:47:15 -0000
@@ -32,6 +32,8 @@ function locale_languages_overview_form(
       '#title_display' => 'invisible',
       '#default_value' => $language->weight,
       '#attributes' => array('class' => array('language-order-weight')),
+      '#title_display' => 'invisible',
+      '#title' => t('Weight for @title', array('@title' => $language->name)),
     );
     $form['name'][$langcode] = array('#markup' => check_plain($language->name));
     $form['native'][$langcode] = array('#markup' => check_plain($language->native));
@@ -77,9 +79,14 @@ function theme_locale_languages_overview
       if ($key == $default->language) {
         $form['enabled'][$key]['#attributes']['disabled'] = 'disabled';
       }
+      $title = drupal_render($form['name'][$key]);
+      $form['enabled'][$key]['#title'] = t('Enable @title', array('@title' => $title));
+      $form['enabled'][$key]['#title_display'] = 'invisible';
+      $form['site_default'][$key]['#title'] = t('Set @title as default', array('@title' => $title));
+      $form['site_default'][$key]['#title_display'] = 'invisible';
       $rows[] = array(
         'data' => array(
-          '<strong>' . drupal_render($form['name'][$key]) . '</strong>',
+          '<strong>' . $title . '</strong>',
           drupal_render($form['native'][$key]),
           check_plain($key),
           drupal_render($form['direction'][$key]),
@@ -568,20 +575,21 @@ function _locale_languages_configure_for
 
     if (isset($types[$type])) {
       $table_form['#language_providers'][$id] = $provider;
+      $provider_name = check_plain($provider['name']);
 
       $table_form['weight'][$id] = array(
         '#type' => 'weight',
-        '#title' => t('Weight for @title', array('@title' => $provider['name'])),
+        '#title' => t('Weight for @title language detection method', array('@title' => drupal_strtolower($provider_name))),
         '#title_display' => 'invisible',
         '#default_value' => $weight,
         '#attributes' => array('class' => array("language-provider-weight-$type")),
       );
 
-      $table_form['title'][$id] = array('#markup' => check_plain($provider['name']));
+      $table_form['title'][$id] = array('#markup' => $provider_name);
 
       $table_form['enabled'][$id] = array(
         '#type' => 'checkbox',
-        '#title' => t('@title language provider', array('@title' => $provider['name'])),
+        '#title' => t('Enable @title language detection method', array('@title' => drupal_strtolower($provider_name))),
         '#title_display' => 'invisible',
         '#default_value' => $enabled,
       );