diff --git a/modules/node.module b/modules/node.module
index 0fe2c461b6812572186cbb1530b3c43334b62a93..3ca150e0f41f55311253995c9a5121988751cc56 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -1581,23 +1581,23 @@ function node_page() {
 
     switch ($op) {
       case "add":
-        theme("box", t("Submit $name"), node_add(arg(2)));
+        theme("box", t("Submit %name", array("%name" => $name)), node_add(arg(2)));
         break;
       case "edit":
-        theme("box", t("Edit $name"), node_edit(arg(2)));
+        theme("box", t("Edit %name", array("%name" => $name)), node_edit(arg(2)));
         break;
       case "view":
         print node_show($node, arg(3));
         break;
       case t("Preview"):
         $edit = node_validate($edit, $error);
-        theme("box", t("Preview $name"), node_preview($edit, $error));
+        theme("box", t("Preview %name", array("%name" => $name)), node_preview($edit, $error));
         break;
       case t("Submit"):
-        theme("box", t("Submit $name"), node_submit($edit));
+        theme("box", t("Submit %name", array("%name" => $name)), node_submit($edit));
         break;
       case t("Delete"):
-        theme("box", t("Delete $name"), node_delete($edit));
+        theme("box", t("Delete %name", array("%name" => $name)), node_delete($edit));
         break;
       default:
         $result = pager_query("SELECT nid, type FROM {node} WHERE promote = '1' AND status = '1' ORDER BY static DESC, created DESC", variable_get("default_nodes_main", 10));
diff --git a/modules/node/node.module b/modules/node/node.module
index 0fe2c461b6812572186cbb1530b3c43334b62a93..3ca150e0f41f55311253995c9a5121988751cc56 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1581,23 +1581,23 @@ function node_page() {
 
     switch ($op) {
       case "add":
-        theme("box", t("Submit $name"), node_add(arg(2)));
+        theme("box", t("Submit %name", array("%name" => $name)), node_add(arg(2)));
         break;
       case "edit":
-        theme("box", t("Edit $name"), node_edit(arg(2)));
+        theme("box", t("Edit %name", array("%name" => $name)), node_edit(arg(2)));
         break;
       case "view":
         print node_show($node, arg(3));
         break;
       case t("Preview"):
         $edit = node_validate($edit, $error);
-        theme("box", t("Preview $name"), node_preview($edit, $error));
+        theme("box", t("Preview %name", array("%name" => $name)), node_preview($edit, $error));
         break;
       case t("Submit"):
-        theme("box", t("Submit $name"), node_submit($edit));
+        theme("box", t("Submit %name", array("%name" => $name)), node_submit($edit));
         break;
       case t("Delete"):
-        theme("box", t("Delete $name"), node_delete($edit));
+        theme("box", t("Delete %name", array("%name" => $name)), node_delete($edit));
         break;
       default:
         $result = pager_query("SELECT nid, type FROM {node} WHERE promote = '1' AND status = '1' ORDER BY static DESC, created DESC", variable_get("default_nodes_main", 10));
diff --git a/modules/poll.module b/modules/poll.module
index de68cb451d49810191c2c11513d9703b1e1402ba..1d4680a617ec761209a072d4b29f3758a20b4378 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -122,7 +122,7 @@ function poll_form(&$node, &$help, &$error) {
   $output .= form_submit(t("Preview")) ."<br /><br /><br />";
 
   for ($a = 0; $a < $node->choices; $a++) {
-    $output .= form_textfield(t("Choice") ." ". ($a + 1), "choice][$a", $node->choice[$a], 50, 127, $error["choice][$a"]);
+    $output .= form_textfield(t("Choice %n", array("%n" => ($a + 1))), "choice][$a", $node->choice[$a], 50, 127, $error["choice][$a"]);
     if ($admin) {
       $output .= form_textfield(t("Votes for choice %n", array("%n" => ($a + 1))), "chvotes][$a", $node->chvotes[$a] ? $node->chvotes[$a] : 0, 7, 7, $error["chvotes][$a"]);
     }
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index de68cb451d49810191c2c11513d9703b1e1402ba..1d4680a617ec761209a072d4b29f3758a20b4378 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -122,7 +122,7 @@ function poll_form(&$node, &$help, &$error) {
   $output .= form_submit(t("Preview")) ."<br /><br /><br />";
 
   for ($a = 0; $a < $node->choices; $a++) {
-    $output .= form_textfield(t("Choice") ." ". ($a + 1), "choice][$a", $node->choice[$a], 50, 127, $error["choice][$a"]);
+    $output .= form_textfield(t("Choice %n", array("%n" => ($a + 1))), "choice][$a", $node->choice[$a], 50, 127, $error["choice][$a"]);
     if ($admin) {
       $output .= form_textfield(t("Votes for choice %n", array("%n" => ($a + 1))), "chvotes][$a", $node->chvotes[$a] ? $node->chvotes[$a] : 0, 7, 7, $error["chvotes][$a"]);
     }
diff --git a/modules/system.module b/modules/system.module
index 50fe8b3747a7e520f1a65b1cf86a8e92617fd941..4d956df11d990b1abc77749bac9f6ac00a86778f 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -101,12 +101,12 @@ function system_view_general() {
 
   // cron:
   $output .= "<h3>". t("Cron settings") ."</h3>\n";
-  $output .= form_select(t("Cron support"), "cron", variable_get("cron", 1), array(t("Disabled"), t("Enabled")), t("Enable or disable cron support.  Enable this setting if you have set up a cron job.  Check the ". l("cron documentation", "admin/system/help#cron") ." for information on setting up a cron job."));
+  $output .= form_select(t("Cron support"), "cron", variable_get("cron", 1), array(t("Disabled"), t("Enabled")), t("Enable or disable cron support.  Enable this setting if you have set up a cron job.  Check the %documentation for information on setting up a cron job.", array("%documentation" => l(t("cron documentation"), "admin/system/help#cron"))));
   $output .= "<hr />\n";
 
   // caching:
   $output .= "<h3>". t("Cache settings") ."</h3>\n";
-  $output .= form_select(t("Cache support"), "cache", variable_get("cache", 0), array(t("Disabled"), t("Enabled")), t("Enable or disable the caching of rendered pages.  When caching is enabled, Drupal will flush the cache when required to make sure updates take effect immediately.   Check the ". l("cache documentation", "admin/system/help#cache") ." for information on Drupal's cache system."));
+  $output .= form_select(t("Cache support"), "cache", variable_get("cache", 0), array(t("Disabled"), t("Enabled")), t("Enable or disable the caching of rendered pages.  When caching is enabled, Drupal will flush the cache when required to make sure updates take effect immediately.  Check the %documentation for information on Drupal's cache system.", array("%documentation" => l(t("cache documentation"), "admin/system/help#cache"))));
   $output .= "<hr />\n";
 
 
diff --git a/modules/system/system.module b/modules/system/system.module
index 50fe8b3747a7e520f1a65b1cf86a8e92617fd941..4d956df11d990b1abc77749bac9f6ac00a86778f 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -101,12 +101,12 @@ function system_view_general() {
 
   // cron:
   $output .= "<h3>". t("Cron settings") ."</h3>\n";
-  $output .= form_select(t("Cron support"), "cron", variable_get("cron", 1), array(t("Disabled"), t("Enabled")), t("Enable or disable cron support.  Enable this setting if you have set up a cron job.  Check the ". l("cron documentation", "admin/system/help#cron") ." for information on setting up a cron job."));
+  $output .= form_select(t("Cron support"), "cron", variable_get("cron", 1), array(t("Disabled"), t("Enabled")), t("Enable or disable cron support.  Enable this setting if you have set up a cron job.  Check the %documentation for information on setting up a cron job.", array("%documentation" => l(t("cron documentation"), "admin/system/help#cron"))));
   $output .= "<hr />\n";
 
   // caching:
   $output .= "<h3>". t("Cache settings") ."</h3>\n";
-  $output .= form_select(t("Cache support"), "cache", variable_get("cache", 0), array(t("Disabled"), t("Enabled")), t("Enable or disable the caching of rendered pages.  When caching is enabled, Drupal will flush the cache when required to make sure updates take effect immediately.   Check the ". l("cache documentation", "admin/system/help#cache") ." for information on Drupal's cache system."));
+  $output .= form_select(t("Cache support"), "cache", variable_get("cache", 0), array(t("Disabled"), t("Enabled")), t("Enable or disable the caching of rendered pages.  When caching is enabled, Drupal will flush the cache when required to make sure updates take effect immediately.  Check the %documentation for information on Drupal's cache system.", array("%documentation" => l(t("cache documentation"), "admin/system/help#cache"))));
   $output .= "<hr />\n";