Index: views_ui.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/views_ui.module,v
retrieving revision 1.105
diff -u -p -r1.105 views_ui.module
--- views_ui.module	30 Sep 2008 18:52:15 -0000	1.105
+++ views_ui.module	3 Oct 2008 21:06:19 -0000
@@ -262,7 +262,7 @@ function views_ui_check_lock($view) {
  */
 function views_ui_cache_set(&$view) {
   if (!empty($view->locked)) {
-    drupal_set_message('Changes cannot be made to a locked view.', 'error');
+    drupal_set_message(t('Changes cannot be made to a locked view.'), 'error');
     return;
   }
   views_include('cache');
Index: includes/admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/admin.inc,v
retrieving revision 1.137
diff -u -p -r1.137 admin.inc
--- includes/admin.inc	2 Oct 2008 22:55:23 -0000	1.137
+++ includes/admin.inc	3 Oct 2008 21:06:22 -0000
@@ -365,7 +365,7 @@ function views_ui_preview($js, $view) {
           if ($queries) {
             $queries .= "\n";
           }
-          $queries .= t('[@time ms] ', array('@time' => intval($query[1] * 100000) / 100)) . $query[0];
+          $queries .= t('[@time ms]', array('@time' => intval($query[1] * 100000) / 100)) . ' ' . $query[0];
         }
 
         $rows[] = array('<strong>' . t('Other queries') . '</strong>', '<pre>' . $queries . '</pre>');
@@ -668,7 +668,7 @@ function views_ui_break_lock_confirm(&$f
 function views_ui_break_lock_confirm_submit(&$form, &$form_state) {
   db_query("DELETE FROM {views_object_cache} WHERE obj = 'view' AND name = '%s'", $form_state['view']->name);
   $form_state['redirect'] = 'admin/build/views/edit/' . $form_state['view']->name;
-  drupal_set_message('The lock has been broken and you may now edit this view.');
+  drupal_set_message(t('The lock has been broken and you may now edit this view.'));
 }
 
 /**
@@ -1164,9 +1164,9 @@ function template_preprocess_views_ui_ed
     return;
   }
 
-  $vars['rearrange'] = l('<span>' . t('Rearrange') . '</span>', "admin/build/views/nojs/rearrange/$view->name/$display->id/$type", array('attributes' => array('class' => 'views-button-rearrange views-ajax-link', 'title' => t('Rearrange')), 'html' => true));
+  $vars['rearrange'] = '<span>' . l(t('Rearrange'), "admin/build/views/nojs/rearrange/$view->name/$display->id/$type", array('attributes' => array('class' => 'views-button-rearrange views-ajax-link', 'title' => t('Rearrange')), 'html' => true)) . '</span>';
 
-  $vars['add'] = l('<span>' . t('Add') . '</span>', "admin/build/views/nojs/add-item/$view->name/$display->id/$type", array('attributes' => array('class' => 'views-button-add views-ajax-link', 'title' => t('Add')), 'html' => true));
+  $vars['add'] = '<span>' . l(t('Add'), "admin/build/views/nojs/add-item/$view->name/$display->id/$type", array('attributes' => array('class' => 'views-button-add views-ajax-link', 'title' => t('Add')), 'html' => true)) . '</span>';
 
   if (!$display->handler->is_default_display()) {
     if (!$display->handler->is_defaulted($types[$type]['plural'])) {
@@ -1223,7 +1223,7 @@ function template_preprocess_views_ui_ed
     $fields[$id]['info'] = $handler->admin_summary();
 
     if ($handler->has_extra_options()) {
-      $fields[$id]['links'] = l('<span>' . t('Settings') . '</span>', "admin/build/views/nojs/config-item-extra/$view->name/$display->id/$type/$id", array('attributes' => array('class' => 'views-button-configure views-ajax-link', 'title' => t('Settings')), 'html' => true));
+      $fields[$id]['links'] = '<span>' . l(t('Settings'), "admin/build/views/nojs/config-item-extra/$view->name/$display->id/$type/$id", array('attributes' => array('class' => 'views-button-configure views-ajax-link', 'title' => t('Settings')), 'html' => true)) . '</span>';
     }
 
     if ($handler->needs_style_plugin()) {
@@ -1232,10 +1232,10 @@ function template_preprocess_views_ui_ed
       $pid = $id . '-style-plugin';
 
       if (!empty($style_plugin['uses options'])) {
-        $fields[$pid]['links'] = l('<span>' . t('Change settings for this style') . '</span>', "admin/build/views/nojs/config-style/$view->name/$display->id/$type/$id", array('attributes' => array('class' => 'views-button-configure views-ajax-link', 'title' => t('Settings')), 'html' => true));
+        $fields[$pid]['links'] = '<span>' . l(t('Change settings for this style'), "admin/build/views/nojs/config-style/$view->name/$display->id/$type/$id", array('attributes' => array('class' => 'views-button-configure views-ajax-link', 'title' => t('Settings')), 'html' => true)) . '</span>';
       }
 
-      $fields[$pid]['title'] = t(' &nbsp; Style: !style', array('!style' => l($style_title, "admin/build/views/nojs/change-style/$view->name/$display->id/$type/$id", array('attributes' => array('class' => 'views-ajax-link')))));
+      $fields[$pid]['title'] = ' ' . t('&nbsp; Style: !style', array('!style' => l($style_title, "admin/build/views/nojs/change-style/$view->name/$display->id/$type/$id", array('attributes' => array('class' => 'views-ajax-link')))));
       $fields[$pid]['class'] = views_ui_item_css($display->id . '-' . $type . '-' . $pid);
       if (!empty($view->changed_sections[$display->id . '-' . $type . '-' . $pid])) {
         $fields[$pid]['changed'] = TRUE;
@@ -2093,7 +2093,7 @@ function theme_views_ui_rearrange_form($
       $row[] = drupal_render($form[$id]['name']);
       $form[$id]['weight']['#attributes']['class'] = 'weight';
       $row[] = drupal_render($form[$id]['weight']);
-      $row[] = drupal_render($form[$id]['removed']) . l('<span>' . t('Remove') . '</span>', 'javascript:void()', array('attributes' => array('id' => 'views-remove-link-' . $id, 'class' => 'views-button-remove views-remove-link', 'alt' => t('Remove this item'), 'title' => t('Remove this item')), 'html' => true));
+      $row[] = drupal_render($form[$id]['removed']) . '<span>' . l(t('Remove'), 'javascript:void()', array('attributes' => array('id' => 'views-remove-link-' . $id, 'class' => 'views-button-remove views-remove-link', 'alt' => t('Remove this item'), 'title' => t('Remove this item')), 'html' => true)) . '</span>';
 
       $rows[] = array('data' => $row, 'class' => 'draggable', 'id' => 'views-row-' . $id);
     }
