? remove-auto-t-236535-3.patch
? simpletest
? simpletest-remove-auto-t-236535-4.patch
? simpletest-remove-auto-t-236535-6.patch
? simpletest_1.0.1beta2.tar.gz
Index: drupal_test_case.php
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/drupal_test_case.php,v
retrieving revision 1.59
diff -u -p -r1.59 drupal_test_case.php
--- drupal_test_case.php	22 Mar 2008 00:31:33 -0000	1.59
+++ drupal_test_case.php	22 Mar 2008 00:53:43 -0000
@@ -673,7 +673,7 @@ class DrupalTestCase extends UnitTestCas
         $curl_options = array(CURLOPT_URL => $url_target);
         $ret = $this->curlExec($curl_options);
       }
-      $this->assertTrue($ret, ' [browser] clicked link '. t($label) . " ($url_target) from $url_before");
+      $this->assertTrue($ret, " [browser] clicked link $label ($url_target) from $url_before");
     }
     return $ret;
   }
Index: tests/functional/aggregator.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/aggregator.test,v
retrieving revision 1.1
diff -u -p -r1.1 aggregator.test
--- tests/functional/aggregator.test	17 Mar 2008 21:26:55 -0000	1.1
+++ tests/functional/aggregator.test	22 Mar 2008 00:53:43 -0000
@@ -18,7 +18,7 @@ class DrupalAggregatorTestCase extends D
    */  
   function createFeed() {
     $edit = $this->getFeedEditArray();
-    $this->drupalPost('admin/content/aggregator/add/feed', $edit, 'Save');
+    $this->drupalPost('admin/content/aggregator/add/feed', $edit, t('Save'));
     $feed = db_fetch_object(db_query("SELECT *  FROM {aggregator_feed} WHERE title = '%s' AND url='%s'", $edit['title'], $edit['url'])); 
     $this->assertTrue(!empty($feed), 'The feed exists');
     return $feed;
@@ -74,7 +74,7 @@ class DrupalAggregatorTestCase extends D
    * @param object $feed - feed object with valid fid
    */
   function removeFeedItems($feed) {
-    $this->drupalPost('admin/content/aggregator/remove/' . $feed->fid, array(), 'Remove items');
+    $this->drupalPost('admin/content/aggregator/remove/' . $feed->fid, array(), t('Remove items'));
   }
 
   /**
@@ -133,7 +133,7 @@ class UpdateFeedTestCase extends DrupalA
     $edit = $this->getFeedEditArray();
     $edit['refresh'] =  1800; // change refresh value
 
-    $this->drupalPost('admin/content/aggregator/edit/feed/'. $feed->fid, $edit, 'Save');
+    $this->drupalPost('admin/content/aggregator/edit/feed/'. $feed->fid, $edit, t('Save'));
     $this->assertWantedRaw(t('The feed %name has been updated.', array('%name' => $edit['title'])), t('The feed %name has been updated.', array('%name' => $edit['title'])));
     $this->assertEqual($this->getUrl(), url('admin/content/aggregator/', array('absolute' => TRUE)));
     $this->assertTrue($this->uniqueFeed($edit['title'], $edit['url']), 'The feed is unique.');
@@ -156,7 +156,7 @@ class RemoveFeedTestCase extends DrupalA
 
   function testRemoveFeed() {
     $feed = $this->createFeed();
-    $this->drupalPost('admin/content/aggregator/edit/feed/'.$feed->fid, array(), 'Delete');
+    $this->drupalPost('admin/content/aggregator/edit/feed/'.$feed->fid, array(), t('Delete'));
     $this->assertWantedRaw(t('The feed %name has been deleted.', array('%name' => $feed->title)), t('The feed %name has been added.', array('%name' => $feed->title)));
     $this->drupalGet('aggregator/sources/'. $feed->fid);
     $this->assertResponse(404);
Index: tests/functional/block.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/block.test,v
retrieving revision 1.3
diff -u -p -r1.3 block.test
--- tests/functional/block.test	16 Mar 2008 23:30:55 -0000	1.3
+++ tests/functional/block.test	22 Mar 2008 00:53:43 -0000
@@ -30,7 +30,7 @@ class BlockModuleTestCase extends Drupal
     $box['info'] = $this->randomName(8);
     $box['title'] = $this->randomName(8);
     $box['body'] = $this->randomName(32);
-    $this->drupalPost('admin/build/block/add', $box, 'Save block');
+    $this->drupalPost('admin/build/block/add', $box, t('Save block'));
 
     // Confirm that the box has been created, and then query the created bid.
     $this->assertText(t('The block has been created.'), 'Box successfully created.');
@@ -43,7 +43,7 @@ class BlockModuleTestCase extends Drupal
     // TODO: Implement full region checking
     $edit = array();
     $edit['block_'. $bid .'[region]'] = 'left';
-    $this->drupalPost('admin/build/block', $edit, 'Save blocks');
+    $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
 
     // Confirm that the box was moved to the proper region
     $this->assertText(t('The block settings have been updated.'), 'Box successfully moved to left region.');
@@ -52,7 +52,7 @@ class BlockModuleTestCase extends Drupal
     $this->assertText(t($box['title']), 'Box successfully being displayed on the page.');
 
     // Delete the created box & verify that it's been deleted and no longer appearing on the page
-    $this->drupalPost('admin/build/block/delete/'. $bid, array(), 'Delete');
+    $this->drupalPost('admin/build/block/delete/'. $bid, array(), t('Delete'));
     $this->assertWantedRaw(t('The block %title has been removed.', array('%title' => $box['info'])), 'Box successfully deleted.');
     $this->assertNoText(t($box['title']), 'Box no longer appears on page.');
   }
@@ -68,7 +68,7 @@ class BlockModuleTestCase extends Drupal
     $block['title'] = $this->randomName(8);
 
     // Set block title to confirm that interface works and override any custom titles.
-    $this->drupalPost('admin/build/block/configure/'. $block['module'] .'/'. $block['delta'], array('title' => $block['title']), 'Save block');
+    $this->drupalPost('admin/build/block/configure/'. $block['module'] .'/'. $block['delta'], array('title' => $block['title']), t('Save block'));
     $this->assertText(t('The block configuration has been saved.'), 'Block title set.');
     $bid = db_result(db_query("SELECT bid FROM {blocks} WHERE module = '%s' AND delta = %d", array($block['module'], $block['delta'])));
 
@@ -78,7 +78,7 @@ class BlockModuleTestCase extends Drupal
     // Set the created block to a specific region
     $edit = array();
     $edit[$block['module'] .'_'. $block['delta'] .'[region]'] = 'left';
-    $this->drupalPost('admin/build/block', $edit, 'Save blocks');
+    $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
 
     // Confirm that the block was moved to the proper region
     // TODO: Implement full region checking
@@ -90,7 +90,7 @@ class BlockModuleTestCase extends Drupal
     // Set the block to the disabled region
     $edit = array();
     $edit[$block['module'] .'_'. $block['delta'] .'[region]'] = '-1';
-    $this->drupalPost('admin/build/block', $edit, 'Save blocks');
+    $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
 
     // Confirm that the block was moved to the proper region
     $this->assertText(t('The block settings have been updated.'), 'Block successfully move to disabled region.');
@@ -99,10 +99,10 @@ class BlockModuleTestCase extends Drupal
     // For convenience of developers, put the navigation block back.
     $edit = array();
     $edit[$block['module'] .'_'. $block['delta'] .'[region]'] = 'left';
-    $this->drupalPost('admin/build/block', $edit, 'Save blocks');
+    $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
     $this->assertText(t('The block settings have been updated.'), 'Block successfully move to disabled region.');
 
-    $this->drupalPost('admin/build/block/configure/'. $block['module'] .'/'. $block['delta'], array('title' => 'Navigation'), 'Save block');
+    $this->drupalPost('admin/build/block/configure/'. $block['module'] .'/'. $block['delta'], array('title' => 'Navigation'), t('Save block'));
     $this->assertText(t('The block configuration has been saved.'), 'Block title set.');
   }
 }
Index: tests/functional/blogapi.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/blogapi.test,v
retrieving revision 1.2
diff -u -p -r1.2 blogapi.test
--- tests/functional/blogapi.test	16 Mar 2008 23:30:55 -0000	1.2
+++ tests/functional/blogapi.test	22 Mar 2008 00:53:43 -0000
@@ -108,8 +108,8 @@ class BlogAPIModuleTestCase extends Drup
     // Remove taxonmy vocab.
     $this->drupalLoginUser($admin_user);
     
-    $this->drupalPost('admin/content/taxonomy/edit/vocabulary/'. $vid, array(), 'Delete');
-    $this->drupalPost(NULL, array(), 'Delete');
+    $this->drupalPost('admin/content/taxonomy/edit/vocabulary/'. $vid, array(), t('Delete'));
+    $this->drupalPost(NULL, array(), t('Delete'));
     $this->assertWantedRaw(t('Deleted vocabulary %vocab.', array('%vocab' => 'simpletest_vocab')), 'Removed vocabulary.');
   }
   
@@ -122,7 +122,7 @@ class BlogAPIModuleTestCase extends Drup
     $edit = array();
     $edit['name'] = $vocab;
     $edit['nodes[blog]'] = TRUE;
-    $this->drupalPost('admin/content/taxonomy/add/vocabulary', $edit, 'Save');
+    $this->drupalPost('admin/content/taxonomy/add/vocabulary', $edit, t('Save'));
     $this->assertWantedRaw(t('Created new vocabulary %vocab.', array('%vocab' => $edit['name'])), 'Taxonomy vocabulary added.');
     
     $vocab_arr = taxonomy_get_vocabularies();
@@ -147,7 +147,7 @@ class BlogAPIModuleTestCase extends Drup
   function add_term($vid, $term) {
     $edit = array();
     $edit['name'] = $term;
-    $this->drupalPost('admin/content/taxonomy/'. $vid .'/add/term', $edit, 'Save');
+    $this->drupalPost('admin/content/taxonomy/'. $vid .'/add/term', $edit, t('Save'));
     $this->assertWantedRaw(t('Created new term %term.', array('%term' => $edit['name'])), 'Taxonomy term added.');
     
     $tree = taxonomy_get_tree($vid);
Index: tests/functional/book.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/book.test,v
retrieving revision 1.2
diff -u -p -r1.2 book.test
--- tests/functional/book.test	16 Mar 2008 23:30:55 -0000	1.2
+++ tests/functional/book.test	22 Mar 2008 00:53:43 -0000
@@ -126,13 +126,13 @@ class BookModuleTestCase extends DrupalT
     $edit['book[bid]'] = $book_nid;
     
     if ($parent !== NULL) {
-      $this->drupalPost('node/add/book', $edit, 'Change book (update list of parents)');
+      $this->drupalPost('node/add/book', $edit, t('Change book (update list of parents)'));
       
       $edit['book[plid]'] = $parent;
-      $this->drupalPost(NULL, $edit, 'Save');
+      $this->drupalPost(NULL, $edit, t('Save'));
     }
     else
-      $this->drupalPost('node/add/book', $edit, 'Save');
+      $this->drupalPost('node/add/book', $edit, t('Save'));
     
     // check to make sure the book node was created
     $node = node_load(array('title' => $edit['title']));
Index: tests/functional/comment.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/comment.test,v
retrieving revision 1.5
diff -u -p -r1.5 comment.test
--- tests/functional/comment.test	21 Mar 2008 23:29:49 -0000	1.5
+++ tests/functional/comment.test	22 Mar 2008 00:53:44 -0000
@@ -220,9 +220,9 @@ class CommentModuleTestCase extends Drup
     if ($preview) {
       $this->assertFieldById('edit-comment');
       $this->assertNoPattern('/(input)(.*?)(value="Save")/', 'Save button not found.'); // Preview required so no save button should be found.
-      $this->drupalPost(NULL, $edit, 'Preview');
+      $this->drupalPost(NULL, $edit, t('Preview'));
     }
-    $this->drupalPost(NULL, array(), 'Save');
+    $this->drupalPost(NULL, array(), t('Save'));
 
     $match = array();
     // Get comment ID
@@ -265,7 +265,7 @@ class CommentModuleTestCase extends Drup
    * @param object $comment Comment to delete.
    */
   function delete_comment($comment) {
-    $this->drupalPost('comment/delete/'. $comment->id, array(), 'Delete');
+    $this->drupalPost('comment/delete/'. $comment->id, array(), t('Delete'));
     $this->assertWantedText(t('The comment and all its replies have been deleted.'), 'Comment deleted.');
   }
 
@@ -328,7 +328,7 @@ class CommentModuleTestCase extends Drup
     $edit['1[access comments]'] = $enabled;
     $edit['1[post comments]'] = $enabled;
     $edit['1[post comments without approval]'] = $without_approval;
-    $this->drupalPost('admin/user/permissions', $edit, 'Save permissions');
+    $this->drupalPost('admin/user/permissions', $edit, t('Save permissions'));
     $this->assertText(t('The changes have been saved.'), 'Anonymous user comments '. ($enabled ? 'enabled' : 'disabled') .'.');
   }
 
@@ -352,10 +352,10 @@ class CommentModuleTestCase extends Drup
     $edit = array();
     $edit['operation'] = $operation;
     $edit['comments['. $comment->id .']'] = TRUE;
-    $this->drupalPost('admin/content/comment'. ($approval ? '/approval' : ''), $edit, 'Update');
+    $this->drupalPost('admin/content/comment'. ($approval ? '/approval' : ''), $edit, t('Update'));
 
     if ($operation == 'delete') {
-      $this->drupalPost(NULL, array(), 'Delete comments');
+      $this->drupalPost(NULL, array(), t('Delete comments'));
       $this->assertText(t('The comments have been deleted.'), 'Operation "'. $operation .'" was performed on comment.');
     }
     else {
Index: tests/functional/contact.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/contact.test,v
retrieving revision 1.3
diff -u -p -r1.3 contact.test
--- tests/functional/contact.test	21 Mar 2008 23:29:49 -0000	1.3
+++ tests/functional/contact.test	22 Mar 2008 00:53:44 -0000
@@ -32,7 +32,7 @@ class ContactModuleTestCase extends Drup
     $edit['contact_form_information'] = $this->randomName(100);
     $edit['contact_hourly_threshold'] = 3;
     $edit['contact_default_status'] = TRUE;
-    $this->drupalPost('admin/build/contact/settings', $edit, 'Save configuration');
+    $this->drupalPost('admin/build/contact/settings', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), 'Setting successfully saved.');
 
     $this->reload_variables();
@@ -121,7 +121,7 @@ class ContactModuleTestCase extends Drup
     // Enable the personal contact form.
     $edit = array();
     $edit['contact_default_status'] = TRUE;
-    $this->drupalPost('admin/build/contact/settings', $edit, 'Save configuration');
+    $this->drupalPost('admin/build/contact/settings', $edit, it('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), 'Setting successfully saved.');
 
     // Reload variables.
@@ -140,7 +140,7 @@ class ContactModuleTestCase extends Drup
     $edit = array();
     $edit['subject'] = $this->randomName(16);
     $edit['message'] = $this->randomName(64);
-    $this->drupalPost(NULL, $edit, 'Send e-mail');
+    $this->drupalPost(NULL, $edit, t('Send e-mail'));
     $this->assertText(t('The message has been sent.'), 'Message sent.');
 
     $this->drupalGet('logout');
@@ -150,7 +150,7 @@ class ContactModuleTestCase extends Drup
     // Disable the personal contact form.
     $edit = array();
     $edit['contact_default_status'] = FALSE;
-    $this->drupalPost('admin/build/contact/settings', $edit, 'Save configuration');
+    $this->drupalPost('admin/build/contact/settings', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), 'Setting successfully saved.');
 
     // Reload variables.
@@ -181,7 +181,7 @@ class ContactModuleTestCase extends Drup
     $edit['recipients'] = $recipients;
     $edit['reply'] = $reply;
     $edit['selected'] = ($selected ? '1' : '0');
-    $this->drupalPost('admin/build/contact/add', $edit, 'Save');
+    $this->drupalPost('admin/build/contact/add', $edit, t('Save'));
   }
 
   /**
@@ -200,7 +200,7 @@ class ContactModuleTestCase extends Drup
     $edit['subject'] = $subject;
     $edit['cid'] = $cid;
     $edit['message'] = $message;
-    $this->drupalPost('contact', $edit, 'Send e-mail');
+    $this->drupalPost('contact', $edit, t('Send e-mail'));
   }
 
   /**
@@ -210,7 +210,7 @@ class ContactModuleTestCase extends Drup
     $categories = $this->get_categories();
     foreach ($categories as $category) {
       $category_name = db_result(db_query('SELECT category FROM {contact} WHERE cid = %d', array($category)));
-      $this->drupalPost('admin/build/contact/delete/'. $category, array(), 'Delete');
+      $this->drupalPost('admin/build/contact/delete/'. $category, array(), t('Delete'));
       $this->assertWantedRaw(t('Category %category has been deleted.', array('%category' => $category_name)), 'Category deleted sucessfully.');
     }
   }
@@ -248,7 +248,7 @@ class ContactModuleTestCase extends Drup
       $edit[$rid .'['. $name .']'] = $value;
     }
 
-    $this->drupalPost('admin/user/permissions', $edit, 'Save permissions');
+    $this->drupalPost('admin/user/permissions', $edit, t('Save permissions'));
     $this->assertText(t('The changes have been saved.'), ' [permission] Saved changes.');
   }
 
Index: tests/functional/filter.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/filter.test,v
retrieving revision 1.2
diff -u -p -r1.2 filter.test
--- tests/functional/filter.test	16 Mar 2008 23:30:55 -0000	1.2
+++ tests/functional/filter.test	22 Mar 2008 00:53:44 -0000
@@ -36,7 +36,7 @@ class FilterModuleTestCase extends Drupa
     // Change default filter.
     $edit = array();
     $edit['default'] = $full;
-    $this->drupalPost('admin/settings/filters', $edit, $version_seven ? 'Save changes' : 'Set default format');
+    $this->drupalPost('admin/settings/filters', $edit, t('Save changes'));
     $this->assertText(t('Default format updated.'), 'Default filter updated successfully.');
 
     $this->assertNoUnwantedRaw('admin/settings/filters/delete/'. $full, 'Delete link not found.');
@@ -44,7 +44,7 @@ class FilterModuleTestCase extends Drupa
     // Add an additional tag.
     $edit = array();
     $edit['allowed_html_1'] = '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>'.' <quote>'; // Adding <quote> tag.
-    $this->drupalPost('admin/settings/filters/'. $filtered .'/configure', $edit, 'Save configuration');
+    $this->drupalPost('admin/settings/filters/'. $filtered .'/configure', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), 'Allowed HTML tag added.');
 
     $this->assertWantedRaw(htmlentities($edit['allowed_html_1']), 'Tag displayed.');
@@ -56,7 +56,7 @@ class FilterModuleTestCase extends Drupa
     $edit = array();
     $edit['weights[filter/'. $second_filter .']'] = 1;
     $edit['weights[filter/'. $first_filter .']'] = 2;
-    $this->drupalPost('admin/settings/filters/'. $filtered .'/order', $edit, 'Save configuration');
+    $this->drupalPost('admin/settings/filters/'. $filtered .'/order', $edit, t('Save configuration'));
     $this->assertText(t('The filter ordering has been saved.'), 'Order saved successfully.');
     
     $result = db_query('SELECT * FROM {filters} WHERE format = %d ORDER BY weight ASC', $filtered);
@@ -74,7 +74,7 @@ class FilterModuleTestCase extends Drupa
     $edit['roles[2]'] = TRUE;
     $edit['filters[filter/'. $second_filter .']'] = TRUE;
     $edit['filters[filter/'. $first_filter .']'] = TRUE;
-    $this->drupalPost('admin/settings/filters/add', $edit, 'Save configuration');
+    $this->drupalPost('admin/settings/filters/add', $edit, t('Save configuration'));
     $this->assertWantedRaw(t('Added input format %format.', array('%format' => $edit['name'])), 'New filter created.');
 
     $format = $this->get_filter($edit['name']);
@@ -90,14 +90,14 @@ class FilterModuleTestCase extends Drupa
       $this->assert_checkbox('filters\[filter\/'. $first_filter .'\]', 'Url filter found.');
 
       // Delete new filter.
-      $this->drupalPost('admin/settings/filters/delete/'. $format->format, array(), 'Delete');
+      $this->drupalPost('admin/settings/filters/delete/'. $format->format, array(), t('Delete'));
       $this->assertWantedRaw(t('Deleted input format %format.', array('%format' => $edit['name'])), 'Format successfully deleted.');
     }
 
     // Change default filter back.
     $edit = array();
     $edit['default'] = $filtered;
-    $this->drupalPost('admin/settings/filters', $edit, $version_seven ? 'Save changes' : 'Set default format');
+    $this->drupalPost('admin/settings/filters', $edit, t('Save changes'));
     $this->assertText(t('Default format updated.'), 'Default filter updated successfully.');
 
     $this->assertNoUnwantedRaw('admin/settings/filters/delete/'. $filtered, 'Delete link not found.');
@@ -105,7 +105,7 @@ class FilterModuleTestCase extends Drupa
     // Allow authenticated users on full HTML.
     $edit = array();
     $edit['roles[2]'] = TRUE;
-    $this->drupalPost('admin/settings/filters/'. $full, $edit, 'Save configuration');
+    $this->drupalPost('admin/settings/filters/'. $full, $edit, t('Save configuration'));
     $this->assertText(t('The input format settings have been updated.'), 'Full HTML format successfully updated.');
 
     // Switch user.
@@ -123,7 +123,7 @@ class FilterModuleTestCase extends Drupa
     $edit['title'] = $this->randomName();
     $edit['body'] = $body .'<random>'. $extra_text .'</random>';
     $edit['format'] = $filtered;
-    $this->drupalPost('node/add/page', $edit, ($version_five ? 'Submit' : 'Save'));
+    $this->drupalPost('node/add/page', $edit, t('Save'));
     $message = ($version_five ? t('Your %post has been created.', array('%post' => 'Page')) : t('Page %title has been created.', array('%title' => $edit['title'])));
     $this->assertWantedRaw($message, 'Filtered node created.');
 
@@ -141,20 +141,20 @@ class FilterModuleTestCase extends Drupa
     // Allowed tags
     $edit = array();
     $edit['allowed_html_1'] = '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>';
-    $this->drupalPost('admin/settings/filters/'. $filtered .'/configure', $edit, 'Save configuration');
+    $this->drupalPost('admin/settings/filters/'. $filtered .'/configure', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), 'Changes reverted.');
 
     // Full HTML
     $edit = array();
     $edit['roles[2]'] = FALSE;
-    $this->drupalPost('admin/settings/filters/'. $full, $edit, 'Save configuration');
+    $this->drupalPost('admin/settings/filters/'. $full, $edit, t('Save configuration'));
     $this->assertText(t('The input format settings have been updated.'), 'Full HTML format successfully reverted.');
 
     // Filter order
     $edit = array();
     $edit['weights[filter/'. $second_filter .']'] = 2;
     $edit['weights[filter/'. $first_filter .']'] = 1;
-    $this->drupalPost('admin/settings/filters/'. $filtered .'/order', $edit, 'Save configuration');
+    $this->drupalPost('admin/settings/filters/'. $filtered .'/order', $edit, t('Save configuration'));
     $this->assertText(t('The filter ordering has been saved.'), 'Order successfully reverted.');
   }
 
Index: tests/functional/forum.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/forum.test,v
retrieving revision 1.4
diff -u -p -r1.4 forum.test
--- tests/functional/forum.test	21 Mar 2008 23:29:49 -0000	1.4
+++ tests/functional/forum.test	22 Mar 2008 00:53:44 -0000
@@ -31,7 +31,7 @@ class DrupalForumTestCase extends Drupal
     );
 
     // Double check that the page says it has created the container
-    $this->drupalPost('admin/content/forum/add/container', $edit, 'Save');
+    $this->drupalPost('admin/content/forum/add/container', $edit, t('Save'));
     $type = t('forum container');
     $this->assertWantedRaw(t('Created new @type %term.', array('%term' => $title, '@type' => $type)), t('New forum container has been created'));
 
@@ -57,7 +57,7 @@ class DrupalForumTestCase extends Drupal
     );
 
     // Double check that the page says it has created the forum
-    $this->drupalPost('admin/content/forum/add/forum', $edit, 'Save');
+    $this->drupalPost('admin/content/forum/add/forum', $edit, t('Save'));
     $type = t('forum');
     $this->assertWantedRaw(t('Created new @type %term.', array('%term' => $title, '@type' => $type)), t('New forum has been created'));
 
@@ -143,7 +143,7 @@ class EditForumTaxonomyTest extends Drup
     );
 
     // Double check that the page says it has edited the vocabulary
-    $this->drupalPost('admin/content/taxonomy/edit/vocabulary/'. $vid, $edit, 'Save');
+    $this->drupalPost('admin/content/taxonomy/edit/vocabulary/'. $vid, $edit, t('Save'));
     $this->assertWantedRaw(t('Updated vocabulary %name.', array('%name' => $title)), t('Vocabulary has been edited'));
 
     // Grab the newly edited vocabulary
@@ -192,7 +192,7 @@ class AddTopicToForum extends DrupalForu
     );
 
     // Double check that the page says it has created the topic
-    $this->drupalPost('node/add/forum/'. $forum['tid'], $edit, 'Save');
+    $this->drupalPost('node/add/forum/'. $forum['tid'], $edit, t('Save'));
     $type = t('Forum topic');
     $this->assertWantedRaw(t('@type %term has been created.', array('%term' => $title, '@type' => $type)), t('New forum topic has been created'));
     $this->assertNoUnwantedRaw(t('The item %term is only a container for forums.', array('%term' => $forum['name'])), t('No error message shown'));
@@ -235,7 +235,7 @@ class AddTopicToForum extends DrupalForu
     );
 
     // Double check that the page says it hasn't created the topic
-    $this->drupalPost('node/add/forum/'. $container['tid'], $edit, 'Save');
+    $this->drupalPost('node/add/forum/'. $container['tid'], $edit, t('Save'));
     $type = t('Forum topic');
     $this->assertNoUnwantedRaw(t('@type %term has been created.', array('%term' => $title, '@type' => $type)), t('No "new forum has been created" message'));
     $this->assertWantedRaw(t('The item %term is only a container for forums.', array('%term' => $container['name'])), t('Error message shown'));
@@ -273,7 +273,7 @@ class AddTopicToForum extends DrupalForu
     );
 
     // Double check that the page says it has created the topic
-    $this->drupalPost('node/add/forum/'. $forum1['tid'], $edit, 'Save');
+    $this->drupalPost('node/add/forum/'. $forum1['tid'], $edit, t('Save'));
     $type = t('Forum topic');
     $this->assertWantedRaw(t('@type %term has been created.', array('%term' => $title, '@type' => $type)), t('New forum topic has been created'));
     $this->assertNoUnwantedRaw(t('The item %term is only a container for forums.', array('%term' => $forum1['name'])), t('No error message shown'));
@@ -290,7 +290,7 @@ class AddTopicToForum extends DrupalForu
 
     // Double check that the page says it has updated the topic
     // Also, double check that the new forum name is there and not the old
-    $this->drupalPost('node/'. $new_topic->nid .'/edit', $edit, 'Save');
+    $this->drupalPost('node/'. $new_topic->nid .'/edit', $edit, t('Save'));
     $type = t('Forum topic');
     $this->assertWantedRaw(t('@type %term has been updated.', array('%term' => $title, '@type' => $type)), t('Topic has been moved'));
     $this->assertWantedRaw($forum2['name'], t('New forum name is present'));
@@ -330,7 +330,7 @@ class AddTopicToForum extends DrupalForu
     );
 
     // Double check that the page says it has created the topic
-    $this->drupalPost('node/add/forum/'. $forum1['tid'], $edit, 'Save');
+    $this->drupalPost('node/add/forum/'. $forum1['tid'], $edit, t('Save'));
     $type = t('Forum topic');
     $this->assertWantedRaw(t('@type %term has been created.', array('%term' => $title, '@type' => $type)), t('New forum topic has been created'));
     $this->assertNoUnwantedRaw(t('The item %term is only a container for forums.', array('%term' => $forum1['name'])), t('No error message shown'));
@@ -347,7 +347,7 @@ class AddTopicToForum extends DrupalForu
 
     // Double check that the page says it has updated the topic
     // Also, double check that the new forum name is there and not the old
-    $this->drupalPost('node/'. $new_topic->nid .'/edit', $edit, 'Save');
+    $this->drupalPost('node/'. $new_topic->nid .'/edit', $edit, t('Save'));
     $type = t('Forum topic');
     $this->assertWantedRaw(t('@type %term has been updated.', array('%term' => $title, '@type' => $type)), t('Topic has been moved'));
     $this->assertWantedRaw($forum2['name'], t('New forum name is present'));
Index: tests/functional/locale.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/locale.test,v
retrieving revision 1.3
diff -u -p -r1.3 locale.test
--- tests/functional/locale.test	16 Mar 2008 23:30:55 -0000	1.3
+++ tests/functional/locale.test	22 Mar 2008 00:53:44 -0000
@@ -49,7 +49,7 @@ class LocaleModuleTest extends DrupalTes
       'prefix' => $prefix,
       'direction' => '0',
     );
-    $this->drupalPost('admin/settings/language/add', $edit, 'Add custom language');
+    $this->drupalPost('admin/settings/language/add', $edit, t('Add custom language'));
     // Add string.
     t($name, array(), $langcode);
     // Reset locale cache.
@@ -70,7 +70,7 @@ class LocaleModuleTest extends DrupalTes
       'translation' => 'all',
       'group' => 'all',
     );
-    $this->drupalPost('admin/build/translate/search', $search, 'Search');
+    $this->drupalPost('admin/build/translate/search', $search, t('Search'));
     // assertText seems to remove the input field where $name always could be
     // found, so this is not a false assert. See how assertNoText succeeds
     // later.
@@ -78,7 +78,7 @@ class LocaleModuleTest extends DrupalTes
     $this->assertWantedRaw($language_indicator, 'Name is untranslated');
     // It's presumed that this is the only result. Given the random name, it's
     // reasonable.
-    $this->clickLink('edit');
+    $this->clickLink(t('edit'));
     // We save the lid from the path.
     $lid = preg_replace('/\D/', '', substr($this->getUrl(), strlen($base_url)));
     // No t() here, it's surely not translated yet.
@@ -86,10 +86,10 @@ class LocaleModuleTest extends DrupalTes
     $edit = array (
       "translations[$langcode]" => $translation,
     );
-    $this->drupalPost(NULL, $edit, 'Save translations');
+    $this->drupalPost(NULL, $edit, t('Save translations'));
     $this->assertText(t('The string has been saved.'), 'The string has been saved.');
     $this->assertTrue($name != $translation && t($name, array(), $langcode) == $translation, 't() works');
-    $this->drupalPost('admin/build/translate/search', $search, 'Search');
+    $this->drupalPost('admin/build/translate/search', $search, t('Search'));
     // The indicator should not be here.
     $this->assertNoUnwantedRaw($language_indicator, 'String is translated');
     $this->drupalGet('logout');
@@ -98,7 +98,7 @@ class LocaleModuleTest extends DrupalTes
     $this->drupalLoginUser($admin_user);
     $path = 'admin/settings/language/delete/'. $langcode;
     // This a confirm form, we do not need any fields changed.
-    $this->drupalPost($path, array(), 'Delete');
+    $this->drupalPost($path, array(), t('Delete'));
     // We need raw here because %locale will add HTML.
     $this->assertWantedRaw(t('The language %locale has been removed.', array('%locale' => $name)), 'The test language has been removed.');
     // Reload to remove $name.
@@ -112,7 +112,7 @@ class LocaleModuleTest extends DrupalTes
     $this->drupalLoginUser($translate_user);
     $this->drupalGet('admin/build/translate/delete/'. $lid);
     $this->assertText(t('The string has been removed.'), 'The string has been removed message.');
-    $this->drupalPost('admin/build/translate/search', $search, 'Search');
+    $this->drupalPost('admin/build/translate/search', $search, t('Search'));
     $this->assertNoText($name, 'Search now can not find the name');
   }
 }
Index: tests/functional/menu.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/menu.test,v
retrieving revision 1.2
diff -u -p -r1.2 menu.test
--- tests/functional/menu.test	16 Mar 2008 23:30:55 -0000	1.2
+++ tests/functional/menu.test	22 Mar 2008 00:53:46 -0000
@@ -54,7 +54,7 @@ class MenuModuleTestCase extends  Drupal
    * Delete a menu link using the menu module UI.
    */
   function uiDeleteLink($mlid) {
-    $this->drupalPost("admin/build/menu/item/". $mlid ."/delete", array(), "Confirm");
+    $this->drupalPost("admin/build/menu/item/$mlid/delete", array(), t('Confirm'));
   }
   /**
    * Create a menu link using the menu module UI.
@@ -72,7 +72,7 @@ class MenuModuleTestCase extends  Drupal
       'menu[weight]' => '0',
     );
 
-    $this->drupalPost("admin/build/menu-customize/". $menu_name ."/add", $edit, "Save");
+    $this->drupalPost("admin/build/menu-customize/$menu_name/add", $edit, t('Save'));
     $out = $this->drupalGet("admin/build/menu-customize/$menu_name");
     $this->assertText($title, 'Link created');
     $mlid = db_result(db_query("SELECT mlid FROM {menu_links} WHERE link_title = '%s'", $title));
@@ -116,7 +116,7 @@ class MenuModuleCustomMenuTest extends M
       'description' => '',
       'title' =>  $title,
     );
-    $this->drupalPost("admin/build/menu/add", $edit, "Save");
+    $this->drupalPost('admin/build/menu/add', $edit, t('Save'));
 
     $name = 'menu-' .$name;
     $this->drupalGet('admin/build/menu');
@@ -126,7 +126,7 @@ class MenuModuleCustomMenuTest extends M
     $link1 = menu_link_load($mlid1);
     $this->assertTrue((bool)$link1, '1st link created and loaded');
 
-    $this->drupalPost("admin/build/menu-customize/". $name ."/delete", array(), "Delete");
+    $this->drupalPost("admin/build/menu-customize/$name/delete", array(), t('Delete'));
     $this->assertFalse(menu_load($name), 'Custom menu deleted');
     $this->assertFalse(menu_link_load($mlid1), '1st link deleted with menu');
   }
@@ -159,18 +159,18 @@ class MenuModuleEnable extends DrupalTes
     $web_user = $this->drupalCreateUserRolePerm(array('administer menu'));
     $this->drupalLoginUser($web_user);
     $this->drupalGet('admin/build/menu-customize/navigation');
-    $this->clickLink('edit', 0);
+    $this->clickLink(t('edit'), 0);
     $url = $this->getUrl();
     preg_match('/\d+/', $url, $matches);
     $item = menu_link_load($matches[0]);
     $hidden = $item['hidden'];
     $edit['menu[enabled]'] = $hidden ? 1 : FALSE;
     $this->assertTrue(TRUE,  $hidden ? 'Disabled item found' : 'Enabled item found');
-    $this->drupalPost('admin/build/menu/item/'. $item['mlid'] .'/edit', $edit, 'Save');
+    $this->drupalPost('admin/build/menu/item/'. $item['mlid'] .'/edit', $edit, t('Save'));
     $item = menu_link_load($item['mlid']);
     $this->assertTrue($item['hidden'] != $hidden, $item['hidden'] ? 'Item is now disabled' : 'Item is now enabled');
     $edit['menu[enabled]'] = $hidden ? FALSE : 1;
-    $this->drupalPost('admin/build/menu/item/'. $item['mlid'] .'/edit', $edit, 'Save');
+    $this->drupalPost('admin/build/menu/item/'. $item['mlid'] .'/edit', $edit, t('Save'));
     $item = menu_link_load($item['mlid']);
     $this->assertTrue($item['hidden'] == $hidden, $item['hidden'] ? 'Item is disabled again' : 'Item is now enabled again');
   }
@@ -220,13 +220,13 @@ class MenuModuleReset extends DrupalTest
       $item = db_fetch_array(db_query('SELECT * FROM {menu_links} WHERE mlid = %d', $mlid));
       $edit['menu[link_title]'] = $this->randomName(16);
       $path = 'admin/build/menu/item/'. $mlid;
-      $this->drupalPost($path .'/edit', $edit, 'Save');
+      $this->drupalPost("$path/edit", $edit, t('Save'));
       $new_title = db_result(db_query('SELECT link_title FROM {menu_links} WHERE mlid = %d', $mlid));
       $this->assertTrue($new_title == $edit['menu[link_title]'], 'Edit succesful');
       $this->assertFalse($item['link_title'] == $new_title, 'Item changed' );
       $reset_path = $path .'/reset';
       $this->assertWantedRaw($reset_path, 'Reset link found');
-      $this->drupalPost($reset_path, array(), 'Reset');
+      $this->drupalPost($reset_path, array(), t('Reset'));
       $reset_title = db_result(db_query('SELECT link_title FROM {menu_links} WHERE mlid = %d', $mlid));
       $this->assertFalse($edit['menu[link_title]'] == $reset_title, 'Item reset');
       $this->assertText(t('The menu item was reset to its default settings.'), 'Reset message');
@@ -268,7 +268,7 @@ class MenuModuleInvalidPath extends Drup
         'menu[link_path]' => $invalid_path,
         'menu[link_title]' => 'title',
       );
-      $this->drupalPost("admin/build/menu-customize/navigation/add", $edit, "Save");
+      $this->drupalPost('admin/build/menu-customize/navigation/add', $edit, t('Save'));
       $this->assertWantedRaw(t("The path '@path' is either invalid or you do not have access to it.", array('@path' => $invalid_path)), 'Invalid path failed');
     }
   }
Index: tests/functional/node.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/node.test,v
retrieving revision 1.4
diff -u -p -r1.4 node.test
--- tests/functional/node.test	21 Mar 2008 23:29:49 -0000	1.4
+++ tests/functional/node.test	22 Mar 2008 00:53:46 -0000
@@ -80,7 +80,7 @@ class NodeRevisionsTest extends DrupalTe
 
     $test_user = $this->drupalCreateUserRolePerm(array('revert revisions', 'edit any page content'));
     $this->drupalLoginUser($test_user);
-    $this->drupalPost("node/$node->nid/revisions/$vid/revert", array(), 'Revert');
+    $this->drupalPost("node/$node->nid/revisions/$vid/revert", array(), t('Revert'));
     $newnode = node_load($node->nid);
     $this->assertTrue(($text == $newnode->body), 'Check to make sure reversions occur properly');
 
@@ -95,7 +95,7 @@ class NodeRevisionsTest extends DrupalTe
 
     $test_user = $this->drupalCreateUserRolePerm(array('delete revisions', 'delete any page content'));
     $this->drupalLoginUser($test_user);
-    $this->drupalPost("node/$node->nid/revisions/$vid/delete", array(), 'Delete');
+    $this->drupalPost("node/$node->nid/revisions/$vid/delete", array(), t('Delete'));
     $this->assertTrue(db_result(db_query('SELECT COUNT(vid) FROM {node_revisions} WHERE nid = %d and VID = %d', $node->nid, $vid)) == 0, 'Check to make sure revisions delete properly');    $this->cleanup($node->nid);
 
     $this->cleanup($node->nid);
@@ -282,12 +282,12 @@ class StoryEditTest extends DrupalTestCa
 	);
 
     //Create the page to edit
-    $this->drupalPost('node/add/story', $edit, 'Save');
+    $this->drupalPost('node/add/story', $edit, t('Save'));
 
     $node = node_load(array('title' => $edit['title']));
     $this->assertNotNull($node, 'Node found in database');
 
-    $this->clickLink('Edit');
+    $this->clickLink(t('Edit'));
     $editurl = url("node/$node->nid/edit", array('absolute' => true));
     $acturl = $this->getURL();
     $this->assertEqual($editurl, $acturl);
@@ -303,7 +303,7 @@ class StoryEditTest extends DrupalTestCa
 
 
     //edit the content of the page
-    $this->drupalPost("node/$node->nid/edit", $edit, 'Save');
+    $this->drupalPost("node/$node->nid/edit", $edit, t('Save'));
 
     $this->assertWantedText(t($edit['title']), 'Hello, the random title');
     $this->assertWantedText(t($edit['body']), 'test is over, the body\'s still there');
@@ -330,7 +330,7 @@ class StoryPreviewTest extends DrupalTes
       'title'=>'!SimpleTest! title' . $this->randomName(20),
       'body'=>'!SimpleTest! body' . $this->randomName(200),
     );
-    $this->drupalPost('node/add/story', $edit, 'Preview');
+    $this->drupalPost('node/add/story', $edit, t('Preview'));
 
     $this->assertWantedText(t('Preview'), 'Preview text is here');
     $this->assertWantedText(t($edit['title']), 'Hello, the random title');
@@ -366,7 +366,7 @@ class PageCreationTest extends  DrupalTe
     $edit = array();
     $edit['title']    = '!SimpleTest test node! ' . $this->randomName(10);
     $edit['body']     = '!SimpleTest test body! ' . $this->randomName(32) . ' ' . $this->randomName(32);
-    $this->drupalPost('node/add/page', $edit, 'Save');
+    $this->drupalPost('node/add/page', $edit, t('Save'));
 
     $this->assertWantedRaw(t('!post %title has been created.', array ('!post' => 'Page', '%title' => $edit['title'])), 'Page created');
 
Index: tests/functional/path.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/path.test,v
retrieving revision 1.4
diff -u -p -r1.4 path.test
--- tests/functional/path.test	21 Mar 2008 23:29:49 -0000	1.4
+++ tests/functional/path.test	22 Mar 2008 00:53:46 -0000
@@ -34,7 +34,7 @@ class PathModuleTestCase extends DrupalT
     $edit = array();
     $edit['src'] = 'node/' . $node1->nid;
     $edit['dst'] = $this->randomName(8);
-    $this->drupalPost('admin/build/path/add', $edit, 'Create new alias');
+    $this->drupalPost('admin/build/path/add', $edit, t('Create new alias'));
 
     // confirm that the alias works
     $this->drupalGet($edit['dst']);
@@ -45,7 +45,7 @@ class PathModuleTestCase extends DrupalT
 
     $previous = $edit['dst'];
     $edit['dst'] = $this->randomName(8);
-    $this->drupalPost('admin/build/path/edit/' . $pid, $edit, 'Update alias');
+    $this->drupalPost('admin/build/path/edit/' . $pid, $edit, t('Update alias'));
 
     // confirm that the alias works
     $this->drupalGet($edit['dst']);
@@ -62,13 +62,13 @@ class PathModuleTestCase extends DrupalT
     // set alias to second test node
     $edit['src'] = 'node/' . $node2->nid;
     // leave $edit['dst'] the same
-    $this->drupalPost('admin/build/path/add', $edit, 'Create new alias');
+    $this->drupalPost('admin/build/path/add', $edit, t('Create new alias'));
 
     // confirm that the alias didn't make a duplicate
     $this->assertWantedRaw(t('The alias %alias is already in use in this language.', array('%alias' => $edit['dst'])), 'Attempt to move alias was rejected.');
 
     // delete alias
-    $this->drupalPost('admin/build/path/delete/' . $pid, array(), 'Confirm');
+    $this->drupalPost('admin/build/path/delete/' . $pid, array(), t('Confirm'));
 
     // confirm that the alias no longer works
     $this->drupalGet($edit['dst']);
@@ -85,7 +85,7 @@ class PathModuleTestCase extends DrupalT
     // create alias
     $edit = array();
     $edit['path'] = $this->randomName(8);
-    $this->drupalPost('node/' . $node1->nid . '/edit', $edit, 'Save');
+    $this->drupalPost('node/' . $node1->nid . '/edit', $edit, t('Save'));
 
     // confirm that the alias works
     $this->drupalGet($edit['path']);
@@ -94,7 +94,7 @@ class PathModuleTestCase extends DrupalT
     // change alias
     $previous = $edit['path'];
     $edit['path'] = $this->randomName(8);
-    $this->drupalPost('node/' . $node1->nid . '/edit', $edit, 'Save');
+    $this->drupalPost('node/' . $node1->nid . '/edit', $edit, t('Save'));
 
     // confirm that the alias works
     $this->drupalGet($edit['path']);
@@ -110,13 +110,13 @@ class PathModuleTestCase extends DrupalT
 
     // set alias to second test node
     // leave $edit['path'] the same
-    $this->drupalPost('node/' . $node2->nid . '/edit', $edit, 'Save');
+    $this->drupalPost('node/' . $node2->nid . '/edit', $edit, t('Save'));
 
     // confirm that the alias didn't make a duplicate
     $this->assertText(t('The path is already in use.'), 'Attempt to moved alias was rejected.');
 
     // delete alias
-    $this->drupalPost('node/' . $node1->nid . '/edit', array('path' => ''), 'Save');
+    $this->drupalPost('node/' . $node1->nid . '/edit', array('path' => ''), t('Save'));
 
     // confirm that the alias no longer works
     $this->drupalGet($edit['path']);
@@ -133,7 +133,7 @@ class PathModuleTestCase extends DrupalT
     $edit = array();
     $edit['title'] = '!SimpleTest test node! ' . $this->randomName(10);
     $edit['body'] = '!SimpleTest test body! ' . $this->randomName(32) . ' ' . $this->randomName(32);
-    $this->drupalPost('node/add/page', $edit, 'Save');
+    $this->drupalPost('node/add/page', $edit, t('Save'));
 
     // check to make sure the node was created
     $node = node_load(array('title' => $edit['title']));
Index: tests/functional/poll.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/poll.test,v
retrieving revision 1.4
diff -u -p -r1.4 poll.test
--- tests/functional/poll.test	21 Mar 2008 23:29:49 -0000	1.4
+++ tests/functional/poll.test	22 Mar 2008 00:53:46 -0000
@@ -13,7 +13,7 @@ class PollTests extends DrupalTestCase {
       'choice[0][chtext]' => 'choice 1',
       'choice[1][chtext]' => 'choice 2',
     );
-    $this->drupalPost('node/add/poll', $edit, 'More choices');
+    $this->drupalPost('node/add/poll', $edit, t('More choices'));
     $edit = array(
       'title' => $title,
       'choice[0][chtext]' => 'choice 1',
@@ -25,14 +25,14 @@ class PollTests extends DrupalTestCase {
       'choice[6][chtext]' => 'choice 7',
     );
     if ($standalone) {
-      $this->drupalPost(NULL, $edit, 'Preview');
+      $this->drupalPost(NULL, $edit, t('Preview'));
       for ($i = 0; $i <= 6; $i++) {
         $bar = theme('poll_bar', $edit['choice['. $i .'][chtext]'], NULL, 0, FALSE, FALSE);
         $this->assertTrue($bar, "bar $i is themed");
         $this->assertWantedRaw($bar, "bar $i found in preview");
       }
     }
-    $this->drupalPost(NULL, $edit, 'Save');
+    $this->drupalPost(NULL, $edit, t('Save'));
     $node = node_load(array('title' => $title));
     $this->nid = $node->nid;
     $this->assertWantedRaw(t('@type %title has been created.', array('@type' => node_get_types('name', 'poll'), '%title' => $title)), 'Poll has been created.');
@@ -85,7 +85,7 @@ class PollVoteTest extends PollTests {
     $edit = array (
       'choice' => '1',
     );
-    $this->drupalPost('node/'. $this->nid, $edit, 'Vote');
+    $this->drupalPost('node/'. $this->nid, $edit, t('Vote'));
     $this->assertText('Your vote was recorded.', 'Your vote was recorded.');
     $this->drupalGet("node/$this->nid/votes");
     $this->assertText(t('This table lists all the recorded votes for this poll. If anonymous users are allowed to vote, they will be identified by the IP address of the computer they used when they voted.'), 'Vote table text.');
Index: tests/functional/profile.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/profile.test,v
retrieving revision 1.4
diff -u -p -r1.4 profile.test
--- tests/functional/profile.test	21 Mar 2008 23:29:49 -0000	1.4
+++ tests/functional/profile.test	22 Mar 2008 00:53:46 -0000
@@ -57,7 +57,7 @@ class ProfileModuleTestSingle extends Dr
     $user = user_save('', array('name' => $name, 'pass' => $pass, 'init' => $mail, 'mail' => $mail, 'roles' => $edit['roles'], 'status' => 1));
     //log in
     $edit = array('name' => $name, 'pass' => $pass);
-    $this->drupalPost('user', $edit, 'Log in');
+    $this->drupalPost('user', $edit, t('Log in'));
 
     //wartosci
     $my_category = 'Simpletest';
@@ -70,7 +70,7 @@ class ProfileModuleTestSingle extends Dr
                   'name' => $form_name,
                   'explanation' => $explanation,
                   );
-    $this->drupalPost('admin/user/profile/add/textfield', $edit, 'Save field',0);
+    $this->drupalPost('admin/user/profile/add/textfield', $edit, t('Save field'), 0);
     $fid = db_result(db_query('SELECT fid FROM {profile_fields} WHERE title = "%s"', $title));
     $single_field = array('title' => $title, 'form_name' => $form_name, 'explanation' => $explanation);
 
@@ -89,7 +89,7 @@ class ProfileModuleTestSingle extends Dr
     $edit = array();
     $checking = array();
     $edit[$form_name] = $this->randomName(20);
-    $this->drupalPost("user/". $user->uid. "/edit/$my_category", $edit, 'Save' , 0);
+    $this->drupalPost("user/". $user->uid. "/edit/$my_category", $edit, t('Save') , 0);
     $this->drupalGet("user/". $user->uid);
 
     // checking profile page
@@ -97,11 +97,11 @@ class ProfileModuleTestSingle extends Dr
     $this->assertWantedText($title, "Checking $title");
     // update field
     $new_title = $this->randomName(20);
-    $this->drupalPost("admin/user/profile/edit/$fid", array('title' => $new_title), 'Save field' , 0);
+    $this->drupalPost("admin/user/profile/edit/$fid", array('title' => $new_title), t('Save field') , 0);
     $this->drupalGet("admin/user/profile");
     $this->assertWantedText($new_title, "Checking updated field");
     // deleting field
-    $this->drupalPost("admin/user/profile/delete/$fid", array(), 'Delete' , 0);
+    $this->drupalPost("admin/user/profile/delete/$fid", array(), t('Delete'), 0);
     $this->drupalGet("admin/user/profile");
     $this->assertNoUnwantedText($new_title, "Checking deleted field $title");
 
@@ -175,7 +175,7 @@ class ProfileModuleTestTextarea extends 
     $user = user_save('', array('name' => $name, 'pass' => $pass, 'init' => $mail, 'mail' => $mail, 'roles' => $edit['roles'], 'status' => 1));
     //log in
     $edit = array('name' => $name, 'pass' => $pass);
-    $this->drupalPost('user', $edit, 'Log in',0 );
+    $this->drupalPost('user', $edit, t('Log in'), 0 );
 
     //wartosci
     $my_category = 'Simpletest';
@@ -184,7 +184,7 @@ class ProfileModuleTestTextarea extends 
     $form_name = 'profile_' . $title;
     $explanation = $this->randomName(50);
     $edit = array('category' => $my_category, 'title' => $title, 'name' => $form_name, 'explanation' => $explanation);
-    $this->drupalPost("admin/user/profile/add/textarea", $edit, 'Save field' , 0);
+    $this->drupalPost("admin/user/profile/add/textarea", $edit, t('Save field'), 0);
     $fid = db_result(db_query('SELECT fid FROM {profile_fields} WHERE title = "%s"', $title));
     $single_field = array('title' => $title, 'form_name' => $form_name, 'explanation' => $explanation);
 
@@ -203,7 +203,7 @@ class ProfileModuleTestTextarea extends 
     $edit = array();
     $checking = array();
     $edit[$form_name] = $this->randomName(20);
-    $this->drupalPost("user/". $user->uid. "/edit/$my_category", $edit, 'Save' , 0);
+    $this->drupalPost("user/". $user->uid. "/edit/$my_category", $edit, t('Save'), 0);
     $this->drupalGet("user/". $user->uid);
 
     // checking profile page
@@ -211,11 +211,11 @@ class ProfileModuleTestTextarea extends 
     $this->assertWantedText($title, "Checking $title");
     // update field
     $new_title = $this->randomName(20);
-    $this->drupalPost("admin/user/profile/edit/$fid", array('title' => $new_title), 'Save field' , 0);
+    $this->drupalPost("admin/user/profile/edit/$fid", array('title' => $new_title), t('Save field'), 0);
     $this->drupalGet("admin/user/profile");
     $this->assertWantedText($new_title, "Checking updated field");
     // deleting field
-    $this->drupalPost("admin/user/profile/delete/$fid", array(), 'Delete' , 0);
+    $this->drupalPost("admin/user/profile/delete/$fid", array(), t('Delete'), 0);
     $this->drupalGet("admin/user/profile");
     $this->assertNoUnwantedText($new_title, "Checking deleted field $title");
 
@@ -289,7 +289,7 @@ class ProfileModuleTestFreelist extends 
     $user = user_save('', array('name' => $name, 'pass' => $pass, 'init' => $mail, 'mail' => $mail, 'roles' => $edit['roles'], 'status' => 1));
     //log in
     $edit = array('name' => $name, 'pass' => $pass);
-    $this->drupalPost('user', $edit, 'Log in',0 );
+    $this->drupalPost('user', $edit, t('Log in'), 0 );
 
     //wartosci
     $my_category = 'Simpletest';
@@ -298,7 +298,7 @@ class ProfileModuleTestFreelist extends 
     $form_name = 'profile_' . $title;
     $explanation = $this->randomName(50);
     $edit = array('category' => $my_category, 'title' => $title, 'name' => $form_name, 'explanation' => $explanation);
-    $this->drupalPost("admin/user/profile/add/list", $edit, 'Save field' , 0);
+    $this->drupalPost("admin/user/profile/add/list", $edit, t('Save field'), 0);
     $fid = db_result(db_query('SELECT fid FROM {profile_fields} WHERE title = "%s"', $title));
     $single_field = array('title' => $title, 'form_name' => $form_name, 'explanation' => $explanation);
 
@@ -317,7 +317,7 @@ class ProfileModuleTestFreelist extends 
     $edit = array();
     $checking = array();
     $edit[$form_name] = $this->randomName(20);
-    $this->drupalPost("user/". $user->uid. "/edit/$my_category", $edit, 'Save' , 0);
+    $this->drupalPost("user/". $user->uid. "/edit/$my_category", $edit, t('Save'), 0);
     $this->drupalGet("user/". $user->uid);
 
     // checking profile page
@@ -325,11 +325,11 @@ class ProfileModuleTestFreelist extends 
     $this->assertWantedText($title, "Checking $title");
     // update field
     $new_title = $this->randomName(20);
-    $this->drupalPost("admin/user/profile/edit/$fid", array('title' => $new_title), 'Save field' , 0);
+    $this->drupalPost("admin/user/profile/edit/$fid", array('title' => $new_title), t('Save field'), 0);
     $this->drupalGet("admin/user/profile");
     $this->assertWantedText($new_title, "Checking updated field");
     // deleting field
-    $this->drupalPost("admin/user/profile/delete/$fid", array(), 'Delete' , 0);
+    $this->drupalPost("admin/user/profile/delete/$fid", array(), t('Delete'), 0);
     $this->drupalGet("admin/user/profile");
     $this->assertNoUnwantedText($new_title, "Checking deleted field $title");
 
@@ -404,7 +404,7 @@ class ProfileModuleTestCheckbox extends 
     $user = user_save('', array('name' => $name, 'pass' => $pass, 'init' => $mail, 'mail' => $mail, 'roles' => $edit['roles'], 'status' => 1));
     //log in
     $edit = array('name' => $name, 'pass' => $pass);
-    $this->drupalPost('user', $edit, 'Log in',0 );
+    $this->drupalPost('user', $edit, t('Log in'), 0);
 
     //wartosci
     $my_category = 'Simpletest';
@@ -413,7 +413,7 @@ class ProfileModuleTestCheckbox extends 
     $form_name = 'profile_' . $title;
     $explanation = $this->randomName(50);
     $edit = array('category' => $my_category, 'title' => $title, 'name' => $form_name, 'explanation' => $explanation);
-    $this->drupalPost("admin/user/profile/add/checkbox", $edit, 'Save field' , 0);
+    $this->drupalPost("admin/user/profile/add/checkbox", $edit, t('Save field'), 0);
     $fid = db_result(db_query('SELECT fid FROM {profile_fields} WHERE title = "%s"', $title));
     $single_field = array('title' => $title, 'form_name' => $form_name, 'explanation' => $explanation);
 
@@ -432,18 +432,18 @@ class ProfileModuleTestCheckbox extends 
     $edit = array();
     $checking = array();
     $edit[$form_name] = 1;
-    $this->drupalPost("user/". $user->uid. "/edit/$my_category", $edit, 'Save' , 0);
+    $this->drupalPost("user/". $user->uid. "/edit/$my_category", $edit, t('Save'), 0);
     $this->drupalGet("user/". $user->uid);
     // checking profile page
     $this->assertWantedText($title, "Checking checkbox");
     $this->assertWantedText($title, "Checking $title");
     // update field
     $new_title = $this->randomName(10);
-    $this->drupalPost("admin/user/profile/edit/$fid", array('title' => $new_title), 'Save field' , 0);
+    $this->drupalPost("admin/user/profile/edit/$fid", array('title' => $new_title), t('Save field'), 0);
     $this->drupalGet("admin/user/profile");
     $this->assertWantedText($new_title, "Checking updated field");
     // deleting field
-    $this->drupalPost("admin/user/profile/delete/$fid", array(), 'Delete' , 0);
+    $this->drupalPost("admin/user/profile/delete/$fid", array(), t('Delete'), 0);
     $this->drupalGet("admin/user/profile");
     $this->assertNoUnwantedText($new_title, "Checking deleted field $title");
 
@@ -517,7 +517,7 @@ class ProfileModuleTestUrl extends Drupa
     $user = user_save('', array('name' => $name, 'pass' => $pass, 'init' => $mail, 'mail' => $mail, 'roles' => $edit['roles'], 'status' => 1));
     //log in
     $edit = array('name' => $name, 'pass' => $pass);
-    $this->drupalPost('user', $edit, 'Log in',0 );
+    $this->drupalPost('user', $edit, t('Log in'), 0);
 
     //wartosci
     $my_category = 'Simpletest';
@@ -526,7 +526,7 @@ class ProfileModuleTestUrl extends Drupa
     $form_name = 'profile_' . $title;
     $explanation = $this->randomName(50);
     $edit = array('category' => $my_category, 'title' => $title, 'name' => $form_name, 'explanation' => $explanation);
-    $this->drupalPost("admin/user/profile/add/url", $edit, 'Save field' , 0);
+    $this->drupalPost("admin/user/profile/add/url", $edit, t('Save field'), 0);
     $fid = db_result(db_query("SELECT fid FROM {profile_fields} WHERE title = '%s'", $title));
     $single_field = array('title' => $title, 'form_name' => $form_name, 'explanation' => $explanation);
 
@@ -545,7 +545,7 @@ class ProfileModuleTestUrl extends Drupa
     $edit = array();
     $checking = array();
     $edit[$form_name] = 'http://www.' . $this->randomName(10). '.org';
-    $this->drupalPost("user/". $user->uid. "/edit/$my_category", $edit, 'Save' , 0);
+    $this->drupalPost("user/". $user->uid. "/edit/$my_category", $edit, t('Save'), 0);
     $this->drupalGet("user/". $user->uid);
 
     // checking profile page
@@ -553,11 +553,11 @@ class ProfileModuleTestUrl extends Drupa
     $this->assertWantedText($title, "Checking $title");
     // update field
     $new_title = $this->randomName(20);
-    $this->drupalPost("admin/user/profile/edit/$fid", array('title' => $new_title), 'Save field' , 0);
+    $this->drupalPost("admin/user/profile/edit/$fid", array('title' => $new_title), t('Save field'), 0);
     $this->drupalGet("admin/user/profile");
     $this->assertWantedText($new_title, "Checking updated field");
     // deleting field
-    $this->drupalPost("admin/user/profile/delete/$fid", array(), 'Delete' , 0);
+    $this->drupalPost("admin/user/profile/delete/$fid", array(), t('Delete'), 0);
     $this->drupalGet("admin/user/profile");
     $this->assertNoUnwantedText($new_title, "Checking deleted field $title");
 
@@ -631,7 +631,7 @@ class ProfileModuleTestSelection extends
     $user = user_save('', array('name' => $name, 'pass' => $pass, 'init' => $mail, 'mail' => $mail, 'roles' => $edit['roles'], 'status' => 1));
     //log in
     $edit = array('name' => $name, 'pass' => $pass);
-    $this->drupalPost('user', $edit, 'Log in',0 );
+    $this->drupalPost('user', $edit, t('Log in'), 0);
 
     //wartosci
     $my_category = 'Simpletest';
@@ -643,7 +643,7 @@ class ProfileModuleTestSelection extends
     for($i = 0; $i < 3; $i++)
       $options .= $this->randomName(8) . "\n";
     $edit = array('category' => $my_category, 'title' => $title, 'name' => $form_name, 'explanation' => $explanation, 'options' => $options);
-    $this->drupalPost("admin/user/profile/add/selection", $edit, 'Save field' , 0);
+    $this->drupalPost("admin/user/profile/add/selection", $edit, t('Save field'), 0);
     $fid = db_result(db_query("SELECT fid FROM {profile_fields} WHERE title = '%s'", $title));
     $single_field = array('title' => $title, 'form_name' => $form_name, 'explanation' => $explanation);
 
@@ -668,7 +668,7 @@ class ProfileModuleTestSelection extends
     $element = rand(0,2);
     $key = $form_name;
     $edit[$key] = rtrim($op_tab[$element]);
-    $this->drupalPost("user/". $user->uid. "/edit/$my_category", $edit, 'Save' , 0);
+    $this->drupalPost("user/". $user->uid. "/edit/$my_category", $edit, t('Save'), 0);
     $this->drupalGet("user/". $user->uid);
 
     // checking profile page
@@ -676,11 +676,11 @@ class ProfileModuleTestSelection extends
     $this->assertWantedText($title, "Checking $title");
     // update field
     $new_title = $this->randomName(20);
-    $this->drupalPost("admin/user/profile/edit/$fid", array('title' => $new_title), 'Save field' , 0);
+    $this->drupalPost("admin/user/profile/edit/$fid", array('title' => $new_title), t('Save field'), 0);
     $this->drupalGet("admin/user/profile");
     $this->assertWantedText($new_title, "Checking updated field");
     // deleting field
-    $this->drupalPost("admin/user/profile/delete/$fid", array(), 'Delete' , 0);
+    $this->drupalPost("admin/user/profile/delete/$fid", array(), t('Delete'), 0);
     $this->drupalGet("admin/user/profile");
     $this->assertNoUnwantedText($new_title, "Checking deleted field $title");
 
@@ -756,7 +756,7 @@ class ProfileModuleTestDate extends Drup
     $user = user_save('', array('name' => $name, 'pass' => $pass, 'init' => $mail, 'mail' => $mail, 'roles' => $edit['roles'], 'status' => 1));
     //log in
     $edit = array('name' => $name, 'pass' => $pass);
-    $this->drupalPost('user', $edit, 'Log in',0 );
+    $this->drupalPost('user', $edit, t('Log in'), 0);
 
     //wartosci
     $my_category = 'Simpletest';
@@ -768,7 +768,7 @@ class ProfileModuleTestDate extends Drup
     for($i = 0; $i < 3; $i++)
       $options .= $this->randomName(8) . "\n";*/
     $edit = array('category' => $my_category, 'title' => $title, 'name' => $form_name, 'explanation' => $explanation);
-    $this->drupalPost("admin/user/profile/add/date", $edit, 'Save field' , 0);
+    $this->drupalPost("admin/user/profile/add/date", $edit, t('Save field'), 0);
     $fid = db_result(db_query("SELECT fid FROM {profile_fields} WHERE title = '%s'", $title));
     $single_field = array('title' => $title, 'form_name' => $form_name, 'explanation' => $explanation);
 
@@ -797,7 +797,7 @@ class ProfileModuleTestDate extends Drup
                        'M' => map_month(1),
                        'Y' => 1983);
     $data = strtr($format, $replace);
-    $this->drupalPost("user/". $user->uid. "/edit/$my_category", $edit, 'Save' , 0);
+    $this->drupalPost("user/". $user->uid. "/edit/$my_category", $edit, t('Save'), 0);
     $this->drupalGet("user/". $user->uid);
 
     // checking profile page
@@ -805,11 +805,11 @@ class ProfileModuleTestDate extends Drup
     $this->assertWantedText($title, "Checking $title");
     // update field
     $new_title = $this->randomName(20);
-    $this->drupalPost("admin/user/profile/edit/$fid", array('title' => $new_title), 'Save field' , 0);
+    $this->drupalPost("admin/user/profile/edit/$fid", array('title' => $new_title), t('Save field'), 0);
     $this->drupalGet("admin/user/profile");
     $this->assertWantedText($new_title, "Checking updated field");
     // deleting field
-    $this->drupalPost("admin/user/profile/delete/$fid", array(), 'Delete' , 0);
+    $this->drupalPost("admin/user/profile/delete/$fid", array(), t('Delete'), 0);
     $this->drupalGet("admin/user/profile");
     $this->assertNoUnwantedText($new_title, "Checking deleted field $title");
 
@@ -886,7 +886,7 @@ class ProfileModuleTest2 extends DrupalT
     $user = user_save('', array('name' => $name, 'pass' => $pass, 'init' => $mail, 'mail' => $mail, 'roles' => $edit['roles'], 'status' => 1));
     //log in
     $edit = array('name' => $name, 'pass' => $pass);
-    $this->drupalPost('user', $edit, 'Log in', 0);
+    $this->drupalPost('user', $edit, t('Log in'), 0);
     //wartosci
     $my_category = $this->randomName(10);
     //single line textfield
@@ -895,7 +895,7 @@ class ProfileModuleTest2 extends DrupalT
     // weight
     $weight = 3;
     $edit = array('category' => $my_category, 'title' => $title, 'name' => $form_name, 'weight' => $weight, 'required' => 1);
-    $this->drupalPost("admin/user/profile/add/textfield", $edit, 'Save field', 0);
+    $this->drupalPost("admin/user/profile/add/textfield", $edit, t('Save field'), 0);
     $fid = db_result(db_query('SELECT fid FROM {profile_fields} WHERE title = "%s"', $title));
     $sfield1 = array('fid'=> $fid, 'title' => $title);
     //second one line textfield
@@ -904,7 +904,7 @@ class ProfileModuleTest2 extends DrupalT
     // weight
     $weight = -2;
     $edit = array('category' => $my_category, 'title' => $title, 'name' => $form_name, 'weight' => $weight, 'register' => 1, 'required' => 1);
-    $this->drupalPost("admin/user/profile/add/textfield", $edit, 'Save field', 0);
+    $this->drupalPost("admin/user/profile/add/textfield", $edit, t('Save field'), 0);
     $fid = db_result(db_query('SELECT fid FROM {profile_fields} WHERE title = "%s"', $title));
     $sfield2 = array('fid'=> $fid, 'title' => $title);
     // checking
@@ -927,12 +927,12 @@ class ProfileModuleTest2 extends DrupalT
     $fmail = "$fname@drupaltest.example.com";
     $edit = array('name' => $fname,
                'mail' => $fmail);
-    $this->drupalPost('user/register', $edit, 'Create new account', 0);
+    $this->drupalPost('user/register', $edit, t('Create new account'), 0);
     //$key = t('The field %field is required.', array('%field' => $title));
     //$this->assertWantedText($key, 'Checking error message');
     //log in
     $edit = array('name' => $name, 'pass' => $pass);
-    $this->drupalPost('user', $edit, 'Log in', 0);
+    $this->drupalPost('user', $edit, t('Log in'), 0);
     // TITLE
     //selection
     $title =  $this->randomName(10);
@@ -942,7 +942,7 @@ class ProfileModuleTest2 extends DrupalT
     for($i = 0; $i < 3; $i++)
       $options .= $this->randomName(8) . "\n";
     $edit = array('category' => $my_category, 'title' => $title, 'name' => $form_name, 'page' => $page_title, 'options' => $options);
-    $this->drupalPost("admin/user/profile/add/selection", $edit, 'Save field', 0);
+    $this->drupalPost("admin/user/profile/add/selection", $edit, t('Save field'), 0);
     $fid = db_result(db_query('SELECT fid FROM {profile_fields} WHERE title = "%s"', $title));
     $element = rand(0,2);
     $op_tab = explode("\n", $options,3);
@@ -956,7 +956,7 @@ class ProfileModuleTest2 extends DrupalT
     $delete_fields[] = $fid;
 
     foreach($delete_fields as $delfid) {
-      $this->drupalPost("admin/user/profile/delete/".$delfid, array(), 'Delete', 0 );
+      $this->drupalPost("admin/user/profile/delete/".$delfid, array(), t('Delete'), 0 );
     }
     // delete test user and roles
     if ($user->uid > 0) {
Index: tests/functional/system.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/system.test,v
retrieving revision 1.4
diff -u -p -r1.4 system.test
--- tests/functional/system.test	21 Mar 2008 23:29:49 -0000	1.4
+++ tests/functional/system.test	22 Mar 2008 00:53:46 -0000
@@ -60,7 +60,7 @@ class EnableCoreModuleTest extends Drupa
       $edit['status['. $module .']'] = $module;
     }
 
-    $this->drupalPost('admin/build/modules/list/confirm', $edit, 'Save configuration');
+    $this->drupalPost('admin/build/modules/list/confirm', $edit, t('Save configuration'));
     $this->assertWantedRaw(t('The configuration options have been saved.'), t('Ensure that the module status has been updated'));
 
     // Now, we check the tables for each module
@@ -121,7 +121,7 @@ class EnableModuleWithoutDependencyTest 
       'status[forum]' => 'forum',
     );
 
-    $this->drupalPost('admin/build/modules/list/confirm', $edit, 'Save configuration');
+    $this->drupalPost('admin/build/modules/list/confirm', $edit, t('Save configuration'));
     $this->assertWantedRaw(t('Some required modules must be enabled'), t('Make sure the dependency error is shown'));
 
     $this->assertFalse(module_exists('forum'), t('Check to make sure that the module has not somehow become enabled'));
@@ -200,7 +200,7 @@ class DisableUninstallCoreModuleTest ext
         $edit['status['. $module .']'] = $module;
       }
 
-      $this->drupalPost('admin/build/modules/list/confirm', $edit, 'Save configuration');
+      $this->drupalPost('admin/build/modules/list/confirm', $edit, t('Save configuration'));
       $this->assertWantedRaw(t('The configuration options have been saved.'), t('Ensure that the module status has been updated'));
     }
 
@@ -214,7 +214,7 @@ class DisableUninstallCoreModuleTest ext
         $edit['uninstall['. $module .']'] = $module;
     }
 
-    $this->drupalPost('admin/build/modules/uninstall/confirm', $edit, 'Uninstall');
+    $this->drupalPost('admin/build/modules/uninstall/confirm', $edit, t('Uninstall'));
     // We need to confirm this by clicking again
     $this->drupalPost(NULL, array(), t('Uninstall'));
     $this->assertWantedRaw(t('The selected modules have been uninstalled.'), 'Check to ensure that the modules have been removed');
Index: tests/functional/taxonomy.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/taxonomy.test,v
retrieving revision 1.4
diff -u -p -r1.4 taxonomy.test
--- tests/functional/taxonomy.test	21 Mar 2008 23:29:49 -0000	1.4
+++ tests/functional/taxonomy.test	22 Mar 2008 00:53:47 -0000
@@ -291,7 +291,7 @@ class TaxonomyTestNodeApi extends Drupal
 
     // multiple slect box was failing through drupalPost. Use raw POST instead
     // Failing because they were being sent/handled wrong (earnest.berry@gmail.com <Souvent22>)
-    $this->drupalPost('node/add/story', $edit, 'Save');
+    $this->drupalPost('node/add/story', $edit, t('Save'));
 
     $patternArray['body text'] = $body;
     $patternArray['title'] = $title;
@@ -332,7 +332,7 @@ class TaxonomyTestNodeApi extends Drupal
 
     $edit = array('title' => $title, 'body' => $body, "taxonomy[$vid][]" => $parent);
 
-    $this->drupalPost('node/'. $node->nid .'/edit', $edit, 'Save');
+    $this->drupalPost('node/'. $node->nid .'/edit', $edit, t('Save'));
 
     // TODO Do a MUCH better check here of the information msg
     $patternArray['information message'] = 'been updated';
@@ -348,7 +348,7 @@ class TaxonomyTestNodeApi extends Drupal
     }
 
     // delete node through browser
-    $this->drupalPost('node/'. $node->nid .'/delete', array(), 'Delete' );
+    $this->drupalPost('node/'. $node->nid .'/delete', array(), t('Delete'));
     // checking after delete
     $this->drupalGet("node/".$node->nid);
     $this->assertNoUnwantedText($termname, "Checking if node exists");
Index: tests/functional/translation.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/translation.test,v
retrieving revision 1.3
diff -u -p -r1.3 translation.test
--- tests/functional/translation.test	21 Mar 2008 23:29:49 -0000	1.3
+++ tests/functional/translation.test	22 Mar 2008 00:53:47 -0000
@@ -32,7 +32,7 @@ class TranslationModuleTestCase extends 
     $this->add_language('es');
 
     // Set story content type to use multilingual support with translation.
-    $this->drupalPost('admin/content/node-type/story', array('language_content_type' => "2"), 'Save content type');
+    $this->drupalPost('admin/content/node-type/story', array('language_content_type' => "2"), t('Save content type'));
     $this->assertWantedRaw(t('The content type %type has been updated.', array('%type' => 'Story')), 'Story content type has been updated.');
 
     $this->drupalGet('logout');
@@ -50,7 +50,7 @@ class TranslationModuleTestCase extends 
     $edit = array();
     $edit['body'] = 'Node body. Additional Text.';
     $edit['translation[retranslate]'] = TRUE;
-    $this->drupalPost('node/'. $node->nid .'/edit', $edit, 'Save');
+    $this->drupalPost('node/'. $node->nid .'/edit', $edit, t('Save'));
     $this->assertWantedRaw(t('Story %title has been updated.', array('%title' => $node_title)), 'Original node updated.');
 
     // Check to make sure that interface shows translation as outdated
@@ -61,7 +61,7 @@ class TranslationModuleTestCase extends 
     $edit = array();
     $edit['body'] = 'Nodo cuerpo. Texto adicional.';
     $edit['translation[status]'] = FALSE;
-    $this->drupalPost('node/'. $node_trans->nid .'/edit', $edit, 'Save');
+    $this->drupalPost('node/'. $node_trans->nid .'/edit', $edit, t('Save'));
     $this->assertWantedRaw(t('Story %title has been updated.', array('%title' => $node_trans_title)), 'Translated node updated.');
   }
 
@@ -79,7 +79,7 @@ class TranslationModuleTestCase extends 
       // Doesn't have language installed so add it.
       $edit = array();
       $edit['langcode'] = $language_code;
-      $this->drupalPost('admin/settings/language/add', $edit, 'Add language');
+      $this->drupalPost('admin/settings/language/add', $edit, t('Add language'));
 
       $languages = language_list('language', TRUE); // make sure not using cached version
       $this->assertTrue(array_key_exists($language_code, $languages), 'Language was installed successfully.');
@@ -91,7 +91,7 @@ class TranslationModuleTestCase extends 
     else {
       // Ensure that it is enabled.
       $this->assertTrue(true, 'Language ['. $language_code .'] already installed.');
-      $this->drupalPost(NULL, array('enabled['. $language_code .']' => TRUE), 'Save configuration');
+      $this->drupalPost(NULL, array('enabled['. $language_code .']' => TRUE), t('Save configuration'));
 
       $this->assertWantedRaw(t('Configuration saved.'), 'Language successfully enabled.');
     }
@@ -111,7 +111,7 @@ class TranslationModuleTestCase extends 
     $edit['title'] = $title;
     $edit['body'] = $body;
     $edit['language'] = $language;
-    $this->drupalPost('node/add/story', $edit, 'Save');
+    $this->drupalPost('node/add/story', $edit, t('Save'));
 
     $this->assertWantedRaw(t('Story %title has been created.', array('%title' => $edit['title'])), 'Story created.');
 
@@ -137,7 +137,7 @@ class TranslationModuleTestCase extends 
     $edit['title'] = $title;
     $edit['body'] = $body;
 
-    $this->drupalPost(NULL, $edit, 'Save');
+    $this->drupalPost(NULL, $edit, t('Save'));
 
     $this->assertWantedRaw(t('Story %title has been created.', array('%title' => $edit['title'])), 'Translation created.');
 
Index: tests/functional/trigger.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/trigger.test,v
retrieving revision 1.3
diff -u -p -r1.3 trigger.test
--- tests/functional/trigger.test	16 Mar 2008 23:30:55 -0000	1.3
+++ tests/functional/trigger.test	22 Mar 2008 00:53:47 -0000
@@ -1,70 +1,70 @@
-<?php
+<?php
 // $Id: trigger.test,v 1.3 2008/03/16 23:30:55 boombatower Exp $
-
-class ActionsContentTest extends  DrupalTestCase {
-  var $_cleanup_roles = array();
-  var $_cleanup_users = array();
-  
-  /**
-   * Implementation of get_info() for information
-   */
-  function get_info() {
-    return array(
-      'name' => t('Actions content'),
-      'description' => t('Perform various tests with content actions.') ,
-      'group' => 'Actions',
-    );
-  }
-
-  /**
-   * Various tests, all in one function to assure they happen in the right order.
-   */
-  function testActionsContent() {
-    global $user;
-
-    $this->drupalModuleEnable('trigger');
-
-    $content_actions = array('node_publish_action', 'node_unpublish_action', 'node_make_sticky_action', 'node_make_unsticky_action', 'node_promote_action', 'node_unpromote_action');
-
-    $hash = md5('node_publish_action');
-
-    $not_clean = db_result(db_query("SELECT COUNT(*) FROM {trigger_assignments} WHERE aid IN ('". implode("','", $content_actions) ."')"));
-    $this->assertFalse($not_clean, t('Actions were already assigned to the trigger. Unassign all content triggers before attempting to run again.'));
-
-    if ($not_clean) {
-      return;
-    }
-    
-    // Test 1: Assign an action to a trigger, then pull the trigger, and make sure the actions fire. (Wow, those metaphors work out nicely).
-
-    $test_user = $this->drupalCreateUserRolePerm(array('administer actions', 'create page content'));
-    $this->drupalLoginUser($test_user);
-
-    // Set action id to "publish post".
-    $edit = array('aid' => $hash);
-    $this->drupalPost('admin/build/trigger/node', $edit, 'Assign');
-
-    // Create an unpublished node.
-    $node = $this->drupalCreateNode(array('status' => 0));
-    // Node should be published automatically.
-    $loaded_node = node_load($node->nid);
-    $this->assertTrue($loaded_node->status == 1, t('Check to make sure the node is automatically published'));
-
-    // Leave action assigned for next test
-
-    // Test 2: There should be an error when the action is assigned to the trigger twice.
-
-    $edit = array('aid' => $hash);
-    $this->drupalPost('admin/build/trigger/node', $edit, 'Assign');
-    $this->assertWantedRaw(t('The action you chose is already assigned to that trigger.'), t('Check to make sure an error occurs when assigning an action to a trigger twice.'));
-
-    // Test 3: The action should be able to be unassigned from a trigger.
-
-    // This effectively cleans up as well.
-    $this->drupalPost('admin/build/trigger/unassign/nodeapi/presave/'. $hash, array(), 'Unassign');
-    $this->assertWantedRaw(t('Action %action has been unassigned.', array('%action' => 'Publish post')), t('Check to make sure action can be unassigned from trigger.'));
-
-    $assigned = db_result(db_query("SELECT COUNT(*) FROM {trigger_assignments} WHERE aid IN ('". implode("','", $content_actions) ."')"));
-    $this->assertFalse($assigned, t('Check to make sure unassign worked properly at the database level.'));
-  }
-}
+
+class ActionsContentTest extends  DrupalTestCase {
+  var $_cleanup_roles = array();
+  var $_cleanup_users = array();
+  
+  /**
+   * Implementation of get_info() for information
+   */
+  function get_info() {
+    return array(
+      'name' => t('Actions content'),
+      'description' => t('Perform various tests with content actions.') ,
+      'group' => 'Actions',
+    );
+  }
+
+  /**
+   * Various tests, all in one function to assure they happen in the right order.
+   */
+  function testActionsContent() {
+    global $user;
+
+    $this->drupalModuleEnable('trigger');
+
+    $content_actions = array('node_publish_action', 'node_unpublish_action', 'node_make_sticky_action', 'node_make_unsticky_action', 'node_promote_action', 'node_unpromote_action');
+
+    $hash = md5('node_publish_action');
+
+    $not_clean = db_result(db_query("SELECT COUNT(*) FROM {trigger_assignments} WHERE aid IN ('". implode("','", $content_actions) ."')"));
+    $this->assertFalse($not_clean, t('Actions were already assigned to the trigger. Unassign all content triggers before attempting to run again.'));
+
+    if ($not_clean) {
+      return;
+    }
+    
+    // Test 1: Assign an action to a trigger, then pull the trigger, and make sure the actions fire. (Wow, those metaphors work out nicely).
+
+    $test_user = $this->drupalCreateUserRolePerm(array('administer actions', 'create page content'));
+    $this->drupalLoginUser($test_user);
+
+    // Set action id to "publish post".
+    $edit = array('aid' => $hash);
+    $this->drupalPost('admin/build/trigger/node', $edit, t('Assign'));
+
+    // Create an unpublished node.
+    $node = $this->drupalCreateNode(array('status' => 0));
+    // Node should be published automatically.
+    $loaded_node = node_load($node->nid);
+    $this->assertTrue($loaded_node->status == 1, t('Check to make sure the node is automatically published'));
+
+    // Leave action assigned for next test
+
+    // Test 2: There should be an error when the action is assigned to the trigger twice.
+
+    $edit = array('aid' => $hash);
+    $this->drupalPost('admin/build/trigger/node', $edit, t('Assign'));
+    $this->assertWantedRaw(t('The action you chose is already assigned to that trigger.'), t('Check to make sure an error occurs when assigning an action to a trigger twice.'));
+
+    // Test 3: The action should be able to be unassigned from a trigger.
+
+    // This effectively cleans up as well.
+    $this->drupalPost('admin/build/trigger/unassign/nodeapi/presave/'. $hash, array(), t('Unassign'));
+    $this->assertWantedRaw(t('Action %action has been unassigned.', array('%action' => 'Publish post')), t('Check to make sure action can be unassigned from trigger.'));
+
+    $assigned = db_result(db_query("SELECT COUNT(*) FROM {trigger_assignments} WHERE aid IN ('". implode("','", $content_actions) ."')"));
+    $this->assertFalse($assigned, t('Check to make sure unassign worked properly at the database level.'));
+  }
+}
Index: tests/functional/upload.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/upload.test,v
retrieving revision 1.5
diff -u -p -r1.5 upload.test
--- tests/functional/upload.test	21 Mar 2008 23:29:49 -0000	1.5
+++ tests/functional/upload.test	22 Mar 2008 00:53:48 -0000
@@ -34,7 +34,7 @@ class upload_module_test_case extends Dr
     $edit['upload_extensions_default'] = 'jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp';
     $edit['upload_uploadsize_default'] = '1';
     $edit['upload_usersize_default'] = '1';
-    $this->drupalPost('admin/settings/uploads', $edit, 'Save configuration');
+    $this->drupalPost('admin/settings/uploads', $edit, t('Save configuration'));
     $this->assertText('The configuration options have been saved.', 'Upload setting saved.');
 
     $this->drupalGet('logout');
@@ -60,7 +60,7 @@ class upload_module_test_case extends Dr
       // Rename file.
       $edit = array();
       $edit['files['. $upload->fid .'][description]'] = $new_name = substr($upload->description, 1);
-      $this->drupalPost('node/'. $node->nid .'/edit', $edit, 'Save');
+      $this->drupalPost('node/'. $node->nid .'/edit', $edit, t('Save'));
       $this->assertWantedRaw(t('Page %title has been updated.', array('%title' => $node->title)), 'File renamed successfully.');
 
       $this->assertText($new_name, $new_name .' found on node.');
@@ -69,7 +69,7 @@ class upload_module_test_case extends Dr
       // Delete a file.
       $edit = array();
       $edit['files['. $upload->fid .'][remove]'] = TRUE;
-      $this->drupalPost('node/'. $node->nid .'/edit', $edit, 'Save');
+      $this->drupalPost('node/'. $node->nid .'/edit', $edit, t('Save'));
       $this->assertWantedRaw(t('Page %title has been updated.', array('%title' => $node->title)), 'File deleted successfully.');
 
       $this->assertNoText($new_name, $new_name .' not found on node.');
@@ -90,7 +90,7 @@ class upload_module_test_case extends Dr
   function upload_file($node, $filename) {
     $edit = array();
     $edit['files[upload]'] = $this->get_file_path($filename);
-    $this->drupalPost('node/'. $node->nid .'/edit', $edit, 'Save');
+    $this->drupalPost('node/'. $node->nid .'/edit', $edit, t('Save'));
     $this->assertWantedRaw(t('Page %title has been updated.', array('%title' => $node->title)), 'File attached successfully.');
   }
 
@@ -155,7 +155,7 @@ class UploadPictureTests extends DrupalT
     // not a image
     $img_path = realpath(drupal_get_path('module', 'simpletest'). "/tests/functional/upload.test");
     $edit = array('files[picture_upload]' => $img_path);
-    $this->drupalPost('user/'.$user->uid.'/edit', $edit, 'Save' );
+    $this->drupalPost('user/'.$user->uid.'/edit', $edit, t('Save'));
     $this->assertWantedRaw(t('The selected file %file could not be uploaded. Only JPEG, PNG and GIF images are allowed.', array('%file' => 'upload.test')), 'The uploaded file was not an image.');
     variable_set('user_pictures', $old_pic_set);
 
@@ -201,7 +201,7 @@ class UploadPictureTests extends DrupalT
 
         // TEST:
         $edit = array('picture' => $img_path);
-        $this->drupalPost('user/'.$user->uid.'/edit', $edit, 'Save' );
+        $this->drupalPost('user/'.$user->uid.'/edit', $edit, t('Save'));
         $file_dir = variable_get('file_directory_path', 'files');
         $picture_dir = variable_get('user_picture_path', 'pictures');
         $pic_path = $file_dir .'/'.$picture_dir .'/picture-'.$user->uid.'.jpg';
@@ -257,7 +257,7 @@ class UploadPictureTests extends DrupalT
 
         // TEST:
         $edit = array('picture' => $img_path);
-        $this->drupalPost('user/'.$user->uid.'/edit', $edit, 'Save' );
+        $this->drupalPost('user/'.$user->uid.'/edit', $edit, t('Save'));
         $file_dir = variable_get('file_directory_path', 'files');
         $picture_dir = variable_get('user_picture_path', 'pictures');
         $pic_path = $file_dir .'/'.$picture_dir .'/picture-'.$user->uid.'.jpg';
@@ -310,7 +310,7 @@ class UploadPictureTests extends DrupalT
 
         // TEST:
         $edit = array('picture' => $img_path);
-        $this->drupalPost('user/'.$user->uid.'/edit', $edit, 'Save' );
+        $this->drupalPost('user/'.$user->uid.'/edit', $edit, t('Save'));
         $text = t('The uploaded image is too large; the maximum dimensions are %dimensions pixels.', array('%dimensions' => variable_get('user_picture_dimensions', '85x85')));
         $this->assertWantedText($text, 'Checking response on invalid image (dimensions).');
 
@@ -359,7 +359,7 @@ class UploadPictureTests extends DrupalT
         variable_set('user_picture_file_size', $test_size);
 
         $edit = array('picture' => $img_path);
-        $this->drupalPost('user/'.$user->uid.'/edit', $edit, 'Save' );
+        $this->drupalPost('user/'.$user->uid.'/edit', $edit, t('Save'));
         $text = t('The uploaded image is too large; the maximum file size is %size kB.', array('%size' => variable_get('user_picture_file_size', '30')));
         $this->assertWantedText($text, 'Checking response on invalid image size.');
 
@@ -407,7 +407,7 @@ class UploadPictureTests extends DrupalT
 
       // TEST:
       $edit = array('files[picture_upload]' => $img_path);
-      $this->drupalPost('user/'.$user->uid.'/edit', $edit, 'Save' );
+      $this->drupalPost('user/'.$user->uid.'/edit', $edit, t('Save'));
       $picture_dir = variable_get('user_picture_path', 'pictures');
       $pic_path = file_directory_path() .'/'.$picture_dir .'/picture-'.$user->uid.'.jpg';
 
Index: tests/functional/user.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/simpletest/tests/functional/user.test,v
retrieving revision 1.4
diff -u -p -r1.4 user.test
--- tests/functional/user.test	21 Mar 2008 23:29:49 -0000	1.4
+++ tests/functional/user.test	22 Mar 2008 00:53:48 -0000
@@ -21,7 +21,7 @@ class UserRegistrationTest extends Drupa
     $mail = "$name@example.com";
     $edit = array('name' => $name,
                   'mail' => $mail);
-    $this->drupalPost('user/register', $edit, 'Create new account');
+    $this->drupalPost('user/register', $edit, t('Create new account'));
 
     $this->assertText(t('Your password and further instructions have been sent to your e-mail address.'), 'Your password and further instructions ... found');
     $this->assertNoText(t('The name %name has been denied access.', array('%name' => $name)), 'not denied access');
@@ -52,7 +52,7 @@ class UserRegistrationTest extends Drupa
 
     /* We try to login with a wrong password */
     $login_edit = array('name' => $name, 'pass' => 'foo');
-    $this->drupalPost('user', $login_edit, 'Log in');
+    $this->drupalPost('user', $login_edit, t('Log in'));
     $this->assertText(t('Sorry, unrecognized username or password. Have you forgotten your password?'), 'Test for failed Login');
     $url = user_pass_reset_url($user);
     /* TODO: find a better way, we currently have to do it that way, see user.module line 1041. */
@@ -80,12 +80,12 @@ class UserRegistrationTest extends Drupa
     $this->assertEqual($user->pass, md5($new_pass), 'Correct password in database');
 
     /* logout */
-    $this->clickLink('Log out');
+    $this->clickLink(t('Log out'));
     $this->assertNoText($user->name, 'Logged out');
 
     /* login again */
     $login_edit['pass'] = $new_pass;
-    $this->drupalPost('user', $login_edit, 'Log in');
+    $this->drupalPost('user', $login_edit, t('Log in'));
 
     $pname = $user->name;
 
@@ -194,7 +194,7 @@ class UserAccessTest extends DrupalTestC
     $edit = array('name' => $name,
                   'mail' => $mail);
 
-    $this->drupalPost('user/register', $edit, 'Create new account');
+    $this->drupalPost('user/register', $edit, t('Create new account'));
 
     $this->assertNoUnWantedText(t('Your password and further instructions have been sent to your e-mail address.'), 'blocked user: Your password and further instructions - not found');
     $this->assertText(t('The name @name has been denied access.', array('@name' => $name)), 'blocked user: denied access - found');
@@ -207,7 +207,7 @@ class UserAccessTest extends DrupalTestC
 
     /* We need new cookies */
     unset($this->ch);
-    $this->drupalPost('user/register', $edit, 'Create new account');
+    $this->drupalPost('user/register', $edit, t('Create new account'));
 
     $this->assertText(t('Your password and further instructions have been sent to your e-mail address.'), 'access user: Your password and further instructions - found');
     $this->assertNoText(t('The name @name has been denied access.', array('@name' => $name)), 'access user: denied access - not found');
@@ -246,7 +246,7 @@ class UserDeleteTest extends DrupalTestC
     $mail = "$name@example.com";
     $edit = array('name' => $name,
                   'mail' => $mail);
-    $this->drupalPost('user/register', $edit, 'Create new account');
+    $this->drupalPost('user/register', $edit, t('Create new account'));
     $user_to_delete = user_load($edit);
     $uid = $user_to_delete->uid;
     $web_user = $this->drupalCreateUserRolePerm(array('administer users'));