diff --git a/contexts/node.inc b/contexts/node.inc
index 54b96ad1f484a88fa653403e0c91fb035eae10e1..3f00a2054623c2bfc67eb1b3e2458a799cc756fd 100644
--- a/contexts/node.inc
+++ b/contexts/node.inc
@@ -95,7 +95,7 @@ function panels_context_node_settings_form($conf, $external = FALSE) {
   if (!empty($conf['nid'])) {
     $info = db_fetch_object(db_query("SELECT * FROM {node} n WHERE n.nid = %d", $conf['nid']));
     if ($info) {
-      $link = l("'$info->title' [node id: $info->nid]", "node/$info->nid", array('target' => '_blank', 'title' => t('Open in new window')));
+      $link = l(t("'%title' [node id %nid]", array('%title' => $info->title, '%nid' => $info->nid)), "node/$info->nid", array('target' => '_blank', 'title' => t('Open in new window')));
       $form['node']['#description'] = t('Currently set to !link', array('!link' => $link));
     }
   }
diff --git a/contexts/node_edit_form.inc b/contexts/node_edit_form.inc
index b479ec83aa8cdddd37b64b278d931bf7f930bdb6..5ac7eeffd006da326ffa39632f378242196559e5 100644
--- a/contexts/node_edit_form.inc
+++ b/contexts/node_edit_form.inc
@@ -87,7 +87,7 @@ function panels_context_node_edit_form_settings_form($conf, $external = FALSE) {
   if (!empty($conf['nid'])) {
     $info = db_fetch_object(db_query("SELECT * FROM {node} WHERE nid = %d", $conf['nid']));
     if ($info) {
-      $link = l("'$info->title' [node id: $info->nid]", "node/$info->nid", array('target' => '_blank', 'title' => t('Open in new window')));
+      $link = l(t("'%title' [node id %nid]", array('%title' => $info->title, '%nid' => $info->nid)), "node/$info->nid", array('target' => '_blank', 'title' => t('Open in new window')));
       $form['node']['#description'] = t('Currently set to !link', array('!link' => $link));
     }
   }
diff --git a/includes/display-layout-settings.inc b/includes/display-layout-settings.inc
index 44c7a965c7ce5790195b73950ca2523717fb8159..82a9cbb198cd3f85de40b62e95beac9f096915a0 100644
--- a/includes/display-layout-settings.inc
+++ b/includes/display-layout-settings.inc
@@ -94,7 +94,7 @@ function panels_edit_layout_settings_form(&$form_state) {
     );
 
     if (isset($title) && is_string($title)) {
-      $form['display_title']['title']['#description'] .= t(" If you leave this field blank, then the default title, '@title', will be used instead.", array('@title' => $title));
+      $form['display_title']['title']['#description'] .= " " . t("If you leave this field blank, then the default title, '@title', will be used instead.", array('@title' => $title));
     }
   }
 
@@ -279,7 +279,7 @@ function panels_edit_layout_settings_form_submit($form, &$form_state) {
   $display->panel_settings = $form_state['values']['panel_settings'];
 
   panels_save_display($display);
-  drupal_set_message("Your layout settings have been saved.");
+  drupal_set_message(t("Your layout settings have been saved."));
 }
 
 // ------------------------------------------------------------------
diff --git a/panels.install b/panels.install
index cc0cd7d4d0bee004b675b02cb3e0c320f4ab45a0..106bef53066e5e04dfea9f267d50b7061c1251d8 100644
--- a/panels.install
+++ b/panels.install
@@ -138,9 +138,9 @@ function panels_schema_1() {
  */
 function panels_install() {
   db_query("UPDATE {system} SET weight = 10 WHERE name = 'panels'");
-  drupal_set_message(t('Please keep in mind that this is an Alpha release of Panels for Drupal 6, and is NOT intended for use on production sites.'));
-  drupal_set_message(t('Additionally, the upgrade path from Drupal 5 has NOT been resolved, and should not be attempted.'));
-  drupal_set_message(t('Bug reports are encouraged, especially when they come with patches! The !link has details on filing issues.', array('!link' => l('Panels project page', 'http://drupal.org/project/panels'))));
+  drupal_set_message(st('Please keep in mind that this is an Alpha release of Panels for Drupal 6, and is NOT intended for use on production sites.'));
+  drupal_set_message(st('Additionally, the upgrade path from Drupal 5 has NOT been resolved, and should not be attempted.'));
+  drupal_set_message(st('Bug reports are encouraged, especially when they come with patches! The <a href="@link">Panels project page</a> has details on filing issues.', array('@link' => 'http://drupal.org/project/panels')));
   drupal_install_schema('panels');
 }
 
diff --git a/panels_mini/panels_mini.admin.inc b/panels_mini/panels_mini.admin.inc
index aa30491438f1b360d006cf1646633133e12f7deb..8e81036b46174abd6dc58ae3ceec8269ff9b2d67 100644
--- a/panels_mini/panels_mini.admin.inc
+++ b/panels_mini/panels_mini.admin.inc
@@ -371,7 +371,7 @@ function panels_mini_add_page($layout = NULL) {
   $panel_mini->name = '';
   $panel_mini->category = '';
 
-  drupal_set_title('Add mini panel');
+  drupal_set_title(t('Add mini panel'));
   return panels_mini_edit($panel_mini);
 }
 
diff --git a/panels_mini/panels_mini.module b/panels_mini/panels_mini.module
index 4f2e4a42979c8ec3a3131e1a6fc1b3fead9b5cb3..4b2cabc04b4e15c8683775075889dac7d6f3714d 100644
--- a/panels_mini/panels_mini.module
+++ b/panels_mini/panels_mini.module
@@ -91,7 +91,7 @@ function panels_mini_content_types() {
       'icon' => 'icon_contrib_block.png',
       'path' => panels_get_path("content_types/block"),
       'description' => filter_xss_admin($mini->title),
-      'category' => array(t(!empty($mini->category) ? $mini->category : 'Mini panel'), -8),
+      'category' => array(!empty($mini->category) ? filter_xss_admin($mini->category) : t('Mini panel'), -8),
     );
     if (!empty($mini->requiredcontexts)) {
       $types[$mini->name]['required context'] = array();
diff --git a/panels_page/panels_page.admin.inc b/panels_page/panels_page.admin.inc
index 0ab82466cff0c9cc36506adc24127415a9798201..539097e68241c481fd10701e2d9c61515da3b57f 100644
--- a/panels_page/panels_page.admin.inc
+++ b/panels_page/panels_page.admin.inc
@@ -608,7 +608,7 @@ function panels_page_export_page(&$form_state, $panel_page) {
   $code = panels_page_export($panel_page);
   $lines = substr_count($code, "\n");
   $form = array('output' => array(
-    '#title' => t("Export of '@title' ", array('@title' => $panel_page->title)),
+    '#title' => t("Export of '@title'", array('@title' => $panel_page->title)),
     '#type' => 'textarea',
     '#default_value' => $code,
     '#rows' => $lines,
@@ -889,8 +889,8 @@ function panels_page_admin_view(&$form_state) {
   if ($args_missing = max($required_args - count($args), 0)) {
     $value = $url;
     $description = format_plural($args_missing,
-      t('1 argument is missing to generate a valid URL.'),
-      t('%count arguments are missing to generate a valid URL.', array('%count' => $args_missing))
+      '1 argument is missing to generate a valid URL.',
+      '@count arguments are missing to generate a valid URL.'
     );
   }
   else {