diff --git a/misc/drupal.css b/misc/drupal.css
index 160c7a7049ee14b04ffc7c0560c0d32a9d505bd7..2724f0c992fbdaa0d9da79c9ee0dc22836cb0627 100644
--- a/misc/drupal.css
+++ b/misc/drupal.css
@@ -34,7 +34,7 @@ th                        { text-align: left; padding-right: 1em; border-bottom:
                             padding: 1px; margin: 0; font-size: 0.8em; }
 
 .container-inline div     { display: inline; }
-.container-inline div input { margin: 0; }
+.container-inline .form-submit { margin: 0; }
 
 .form-item .description   { font-size: 0.85em; }
 .form-item .title         { font-weight: bold; margin-top: 1.1em; margin-bottom: 1px; }
diff --git a/modules/forum.module b/modules/forum.module
index cb6b158863174877fd2e39d2c6ce250f2f935f61..24c5fb6213704d05ad34b69ebd73ef2a45e10393 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -36,19 +36,19 @@ function forum_settings() {
     }
 
     if ($voc) {
-      $output .= form_textarea("Explanation or submission guidelines", "forum_help", variable_get("forum_help", ""), 70, 5, t("This text will be displayed at the top of the forum submission form.  Useful for helping or instructing your users."));
-      $output .= form_select("Forum vocabulary", "forum_nav_vocabulary", variable_get("forum_nav_vocabulary", ""), $vocs, t("The taxonomy vocabulary that will be used as the navigation tree."));
-      $output .= _taxonomy_term_select("Containers", "forum_containers", variable_get("forum_containers", array()), variable_get("forum_nav_vocabulary", ""), t("You can choose forums which will not have topics, but will be just containers for other forums."), 1, t("<none>"));
+      $output .= form_textarea(t("Explanation or submission guidelines"), "forum_help", variable_get("forum_help", ""), 70, 5, t("This text will be displayed at the top of the forum submission form.  Useful for helping or instructing your users."));
+      $output .= form_select(t("Forum vocabulary"), "forum_nav_vocabulary", variable_get("forum_nav_vocabulary", ""), $vocs, t("The taxonomy vocabulary that will be used as the navigation tree."));
+      $output .= _taxonomy_term_select(t("Containers"), "forum_containers", variable_get("forum_containers", array()), variable_get("forum_nav_vocabulary", ""), t("You can choose forums which will not have topics, but will be just containers for other forums."), 1, t("<none>"));
 
-      $output .= form_textfield("Topic icons path", "forum_topic_icon_path", variable_get("forum_topic_icon_path", ""), 30, 255, "The path to the topic icons.  Leave blank to disable icons.");
-      $output .= form_textfield("Folder icons path", "forum_folder_icon_path", variable_get("forum_folder_icon_path", ""), 30, 255, "The path to the <b>default</b>, <b>hot</b>, <b>new</b>, <b>hot & new</b>, and <b>closed</b> folder icons.  Leave blank to disable icons.");
+      $output .= form_textfield(t("Topic icons path"), "forum_topic_icon_path", variable_get("forum_topic_icon_path", ""), 30, 255, t("The path to the topic icons.  Leave blank to disable icons."));
+      $output .= form_textfield(t("Folder icons path"), "forum_folder_icon_path", variable_get("forum_folder_icon_path", ""), 30, 255,t( "The path to the <b>default</b>, <b>hot</b>, <b>new</b>, <b>hot & new</b>, and <b>closed</b> folder icons.  Leave blank to disable icons."));
       $number = array(5 => 5, 10 => 10, 15 => 15, 20 => 20, 25 => 25, 30 => 30, 35 => 35, 40 => 40, 50 => 50, 60 => 60, 80 => 80, 100 => 100, 10000=>10000);
-      $output .= form_select("Hot topic threshold", "forum_hot_topic", variable_get("forum_hot_topic", 15), $number, "The number of posts a topic must have to be considered <b>hot</b>.");
+      $output .= form_select(t("Hot topic threshold"), "forum_hot_topic", variable_get("forum_hot_topic", 15), $number, t("The number of posts a topic must have to be considered <b>hot</b>."));
       $number = array(10 => 10, 25 => 25, 50 => 50, 75 => 75, 100 => 100);
-      $output .= form_select("Topics per page", "forum_per_page", variable_get("forum_per_page", 25), $number, "The default number of topics displayed per page; links to browse older messages are automatically being displayed.");
-      $forder = array(1 => "Date - newest first", 2 => "Date - oldest first", 3 => "Posts - most active first", 4=> "Posts - least active first");
-      $output .= form_select("Default order", "forum_order", variable_get("forum_order", 1), $forder, "The default display order for topics.");
-      $output .= form_textfield("Number of topics in block", "forum_block_num", variable_get("forum_block_num", "5"), 5, 5, "The number of topics in the <b>Forum topics</b>-block.  To enable the block, click ". l("here", "admin/block") .".");
+      $output .= form_select(t("Topics per page"), "forum_per_page", variable_get("forum_per_page", 25), $number, t("The default number of topics displayed per page; links to browse older messages are automatically being displayed."));
+      $forder = array(1 => t("Date - newest first"), 2 => t("Date - oldest first"), 3 => t("Posts - most active first"), 4=> t("Posts - least active first"));
+      $output .= form_select(t("Default order"), "forum_order", variable_get("forum_order", 1), $forder, t("The default display order for topics."));
+      $output .= form_textfield(t("Number of topics in block"), "forum_block_num", variable_get("forum_block_num", "5"), 5, 5, t("The number of topics in the <b>Forum topics</b>-block.  To enable the block, click ". l("here", "admin/block") ."."));
     }
     else {
       $output .= _forum_message_taxonomy();
@@ -199,7 +199,7 @@ function forum_form(&$node, &$help, &$error) {
   // outputs the compose guidelines
   $help = variable_get("forum_help", "");
 
-  $output .= _taxonomy_term_select("Forum", "tid", $tid, variable_get("forum_nav_vocabulary", ""), "", 0, "", variable_get("forum_containers", array()));
+  $output .= _taxonomy_term_select(t("Forum"), "tid", $tid, variable_get("forum_nav_vocabulary", ""), "", 0, "", variable_get("forum_containers", array()));
 
   if ($node->nid) {
     // if editing, give option to leave shadows
@@ -286,7 +286,7 @@ function _forum_last_reply($nid) {
 
 function _forum_format($topic) {
   if ($topic) {
-    return "<small>". format_date($topic->timestamp, "small")."<br />".t("by")." ". format_name($topic) ."</small>";
+    return "<small>". t("%date<br />by %author", array("%date" => format_date($topic->timestamp, "small"), "%author" => format_name($topic))) ."</small>";
   }
   else {
     return message_na();
@@ -457,7 +457,7 @@ function forum_page() {
   if (user_access("access content")) {
     if (module_exist("taxonomy")) {
       $tid = arg(1);
-      if ($op == "Update settings" && $user->uid) {
+      if ($op == t("Update settings") && $user->uid) {
         $user = user_save($user, array("sortby" => $sortby, "forum_per_page" => $forum_per_page));
       }
 
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index cb6b158863174877fd2e39d2c6ce250f2f935f61..24c5fb6213704d05ad34b69ebd73ef2a45e10393 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -36,19 +36,19 @@ function forum_settings() {
     }
 
     if ($voc) {
-      $output .= form_textarea("Explanation or submission guidelines", "forum_help", variable_get("forum_help", ""), 70, 5, t("This text will be displayed at the top of the forum submission form.  Useful for helping or instructing your users."));
-      $output .= form_select("Forum vocabulary", "forum_nav_vocabulary", variable_get("forum_nav_vocabulary", ""), $vocs, t("The taxonomy vocabulary that will be used as the navigation tree."));
-      $output .= _taxonomy_term_select("Containers", "forum_containers", variable_get("forum_containers", array()), variable_get("forum_nav_vocabulary", ""), t("You can choose forums which will not have topics, but will be just containers for other forums."), 1, t("<none>"));
+      $output .= form_textarea(t("Explanation or submission guidelines"), "forum_help", variable_get("forum_help", ""), 70, 5, t("This text will be displayed at the top of the forum submission form.  Useful for helping or instructing your users."));
+      $output .= form_select(t("Forum vocabulary"), "forum_nav_vocabulary", variable_get("forum_nav_vocabulary", ""), $vocs, t("The taxonomy vocabulary that will be used as the navigation tree."));
+      $output .= _taxonomy_term_select(t("Containers"), "forum_containers", variable_get("forum_containers", array()), variable_get("forum_nav_vocabulary", ""), t("You can choose forums which will not have topics, but will be just containers for other forums."), 1, t("<none>"));
 
-      $output .= form_textfield("Topic icons path", "forum_topic_icon_path", variable_get("forum_topic_icon_path", ""), 30, 255, "The path to the topic icons.  Leave blank to disable icons.");
-      $output .= form_textfield("Folder icons path", "forum_folder_icon_path", variable_get("forum_folder_icon_path", ""), 30, 255, "The path to the <b>default</b>, <b>hot</b>, <b>new</b>, <b>hot & new</b>, and <b>closed</b> folder icons.  Leave blank to disable icons.");
+      $output .= form_textfield(t("Topic icons path"), "forum_topic_icon_path", variable_get("forum_topic_icon_path", ""), 30, 255, t("The path to the topic icons.  Leave blank to disable icons."));
+      $output .= form_textfield(t("Folder icons path"), "forum_folder_icon_path", variable_get("forum_folder_icon_path", ""), 30, 255,t( "The path to the <b>default</b>, <b>hot</b>, <b>new</b>, <b>hot & new</b>, and <b>closed</b> folder icons.  Leave blank to disable icons."));
       $number = array(5 => 5, 10 => 10, 15 => 15, 20 => 20, 25 => 25, 30 => 30, 35 => 35, 40 => 40, 50 => 50, 60 => 60, 80 => 80, 100 => 100, 10000=>10000);
-      $output .= form_select("Hot topic threshold", "forum_hot_topic", variable_get("forum_hot_topic", 15), $number, "The number of posts a topic must have to be considered <b>hot</b>.");
+      $output .= form_select(t("Hot topic threshold"), "forum_hot_topic", variable_get("forum_hot_topic", 15), $number, t("The number of posts a topic must have to be considered <b>hot</b>."));
       $number = array(10 => 10, 25 => 25, 50 => 50, 75 => 75, 100 => 100);
-      $output .= form_select("Topics per page", "forum_per_page", variable_get("forum_per_page", 25), $number, "The default number of topics displayed per page; links to browse older messages are automatically being displayed.");
-      $forder = array(1 => "Date - newest first", 2 => "Date - oldest first", 3 => "Posts - most active first", 4=> "Posts - least active first");
-      $output .= form_select("Default order", "forum_order", variable_get("forum_order", 1), $forder, "The default display order for topics.");
-      $output .= form_textfield("Number of topics in block", "forum_block_num", variable_get("forum_block_num", "5"), 5, 5, "The number of topics in the <b>Forum topics</b>-block.  To enable the block, click ". l("here", "admin/block") .".");
+      $output .= form_select(t("Topics per page"), "forum_per_page", variable_get("forum_per_page", 25), $number, t("The default number of topics displayed per page; links to browse older messages are automatically being displayed."));
+      $forder = array(1 => t("Date - newest first"), 2 => t("Date - oldest first"), 3 => t("Posts - most active first"), 4=> t("Posts - least active first"));
+      $output .= form_select(t("Default order"), "forum_order", variable_get("forum_order", 1), $forder, t("The default display order for topics."));
+      $output .= form_textfield(t("Number of topics in block"), "forum_block_num", variable_get("forum_block_num", "5"), 5, 5, t("The number of topics in the <b>Forum topics</b>-block.  To enable the block, click ". l("here", "admin/block") ."."));
     }
     else {
       $output .= _forum_message_taxonomy();
@@ -199,7 +199,7 @@ function forum_form(&$node, &$help, &$error) {
   // outputs the compose guidelines
   $help = variable_get("forum_help", "");
 
-  $output .= _taxonomy_term_select("Forum", "tid", $tid, variable_get("forum_nav_vocabulary", ""), "", 0, "", variable_get("forum_containers", array()));
+  $output .= _taxonomy_term_select(t("Forum"), "tid", $tid, variable_get("forum_nav_vocabulary", ""), "", 0, "", variable_get("forum_containers", array()));
 
   if ($node->nid) {
     // if editing, give option to leave shadows
@@ -286,7 +286,7 @@ function _forum_last_reply($nid) {
 
 function _forum_format($topic) {
   if ($topic) {
-    return "<small>". format_date($topic->timestamp, "small")."<br />".t("by")." ". format_name($topic) ."</small>";
+    return "<small>". t("%date<br />by %author", array("%date" => format_date($topic->timestamp, "small"), "%author" => format_name($topic))) ."</small>";
   }
   else {
     return message_na();
@@ -457,7 +457,7 @@ function forum_page() {
   if (user_access("access content")) {
     if (module_exist("taxonomy")) {
       $tid = arg(1);
-      if ($op == "Update settings" && $user->uid) {
+      if ($op == t("Update settings") && $user->uid) {
         $user = user_save($user, array("sortby" => $sortby, "forum_per_page" => $forum_per_page));
       }
 
diff --git a/modules/node.module b/modules/node.module
index de4dc46be8e8cfdc406d6e86d87a8e0dc61033cc..a8e59ce5374b16cd57c6c6b3e1d3b65a0a2039a3 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -1064,7 +1064,7 @@ function node_form($edit, $error = NULL) {
   ** Add the default fields:
   */
   $output .= "<div class=\"standard\">";
-  $output .= form_textfield(t("Title"), "title", $edit->title, 60, 64, $error["title"]);
+  $output .= form_textfield(t("Title"), "title", $edit->title, 60, 128, $error["title"]);
 
   /*
   ** Add the node specific fields:
diff --git a/modules/node/node.module b/modules/node/node.module
index de4dc46be8e8cfdc406d6e86d87a8e0dc61033cc..a8e59ce5374b16cd57c6c6b3e1d3b65a0a2039a3 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1064,7 +1064,7 @@ function node_form($edit, $error = NULL) {
   ** Add the default fields:
   */
   $output .= "<div class=\"standard\">";
-  $output .= form_textfield(t("Title"), "title", $edit->title, 60, 64, $error["title"]);
+  $output .= form_textfield(t("Title"), "title", $edit->title, 60, 128, $error["title"]);
 
   /*
   ** Add the node specific fields:
diff --git a/modules/user.module b/modules/user.module
index 4f3387e9f6d1675ac44e88074b719cb6fe5336cd..8c78ee76a95f4f87cf5852c77528338676074b24 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -919,7 +919,7 @@ function user_register($edit = array()) {
     }
   }
   $output .= form_submit(t("Create new account"));
-  $items[] = l(t("E-mail new password"), "user/password");
+  $items[] = l(t("Request new password"), "user/password");
   $items[] = l(t("Log in"), "user/login");
   $output .= theme("theme_item_list", $items);
 
@@ -1110,11 +1110,11 @@ function user_view($uid = 0) {
   else {
     $output = user_login();
     theme("header");
-    theme("box", t("Log in"), $output);
+    theme("box", t("User login"), $output);
     if (variable_get("user_register", 1)) {
       theme("box", t("Create new user account"), user_register());
     }
-    theme("box", t("E-mail new password"), user_pass());
+    theme("box", t("Request new password"), user_pass());
     theme("footer");
   }
 }
diff --git a/modules/user/user.module b/modules/user/user.module
index 4f3387e9f6d1675ac44e88074b719cb6fe5336cd..8c78ee76a95f4f87cf5852c77528338676074b24 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -919,7 +919,7 @@ function user_register($edit = array()) {
     }
   }
   $output .= form_submit(t("Create new account"));
-  $items[] = l(t("E-mail new password"), "user/password");
+  $items[] = l(t("Request new password"), "user/password");
   $items[] = l(t("Log in"), "user/login");
   $output .= theme("theme_item_list", $items);
 
@@ -1110,11 +1110,11 @@ function user_view($uid = 0) {
   else {
     $output = user_login();
     theme("header");
-    theme("box", t("Log in"), $output);
+    theme("box", t("User login"), $output);
     if (variable_get("user_register", 1)) {
       theme("box", t("Create new user account"), user_register());
     }
-    theme("box", t("E-mail new password"), user_pass());
+    theme("box", t("Request new password"), user_pass());
     theme("footer");
   }
 }