- Committed Goba's translation fixes.

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));

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));

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"]);
     }

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"]);
     }

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";
 
 

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";