diff --git a/Source/Source.FilterAPI.php b/Source/Source.FilterAPI.php
index b297c91..5531450 100644
--- a/Source/Source.FilterAPI.php
+++ b/Source/Source.FilterAPI.php
@@ -353,7 +353,7 @@
 	$t_result = db_query_bound( $t_query );
 
 	echo '<select name="repo_id[]" multiple="multiple" size="6">',
-		'<option value="">[Any]</option>';
+		'<option value="">', plugin_lang_get( 'select_any' ), '</option>';
 
 	while( $t_row = db_fetch_array( $t_result ) ) {
 		echo '<option value="', (int)$t_row['id'],
@@ -378,7 +378,7 @@
 	$t_result = db_query_bound( $t_query );
 
 	echo '<select name="repo_type[]" multiple="multiple" size="6">',
-		'<option value="">[Any]</option>';
+		'<option value="">', plugin_lang_get( 'select_any' ), '</option>';
 
 	while( $t_row = db_fetch_array( $t_result ) ) {
 		if ( !isset( $t_types[ $t_row['type'] ] ) ) {
@@ -406,7 +406,7 @@
 	$t_result = db_query_bound( $t_query );
 
 	echo '<select name="branch[]" multiple="multiple" size="6">',
-		'<option value="">[Any]</option>';
+		'<option value="">', plugin_lang_get( 'select_any' ), '</option>';
 
 	while( $t_row = db_fetch_array( $t_result ) ) {
 		if ( is_blank( $t_row['branch'] ) ) { continue; }
@@ -431,7 +431,7 @@
 	$t_result = db_query_bound( $t_query );
 
 	echo '<select name="file_action[]" multiple="multiple" size="6">',
-		'<option value="">[Any]</option>';
+		'<option value="">', plugin_lang_get( 'select_any' ), '</option>';
 
 	while( $t_row = db_fetch_array( $t_result ) ) {
 		echo '<option value="', string_attribute( $t_row['action'] ),
@@ -456,7 +456,7 @@
 	$t_result = db_query_bound( $t_query );
 
 	echo '<select name="author">',
-		'<option value="">[Any]</option>';
+		'<option value="">', plugin_lang_get( 'select_any' ), '</option>';
 
 	while( $t_row = db_fetch_array( $t_result ) ) {
 		echo '<option value="', string_attribute( $t_row['author'] ),
@@ -482,7 +482,7 @@
 	$t_result = db_query_bound( $t_query );
 
 	echo '<select name="user_id">',
-		'<option value="">[Any]</option>';
+		'<option value="">', plugin_lang_get( 'select_any' ), '</option>';
 
 	while( $t_row = db_fetch_array( $t_result ) ) {
 		echo '<option value="', (int) $t_row['user_id'],
diff --git a/Source/lang/strings_english.txt b/Source/lang/strings_english.txt
index fd1aea8..9faadfe 100644
--- a/Source/lang/strings_english.txt
+++ b/Source/lang/strings_english.txt
@@ -26,10 +26,18 @@
 
 $s_plugin_Source_name = 'Name';
 $s_plugin_Source_type = 'Type';
+$s_plugin_Source_branch = 'Branch';
+$s_plugin_Source_action = 'Action';
 $s_plugin_Source_author = 'Author';
+$s_plugin_Source_username = 'Username';
 $s_plugin_Source_timestamp = 'Timestamp';
 $s_plugin_Source_url = 'URL';
 $s_plugin_Source_info = 'Extra Info';
+$s_plugin_Source_revision = 'Revision';
+$s_plugin_Source_date_begin = 'Beginning Date';
+$s_plugin_Source_date_end = 'Ending Date';
+$s_plugin_Source_message = 'Message';
+$s_plugin_Source_filename = 'Filename';
 
 $s_plugin_Source_issue = 'Issue';
 $s_plugin_Source_issues = 'Issues';
@@ -42,7 +50,11 @@
 $s_plugin_Source_update = 'Update';
 $s_plugin_Source_delete = 'Delete';
 $s_plugin_Source_search = 'Search';
+$s_plugin_Source_modify_search = 'Modify Search';
+$s_plugin_Source_new_search = 'New Search';
+$s_plugin_Source_permalink = 'Permalink';
 $s_plugin_Source_select_one = '(Select one)';
+$s_plugin_Source_select_any = '[any]';
 
 $s_plugin_Source_back = 'Back to Index';
 $s_plugin_Source_import_full = 'Import Everything';
diff --git a/Source/pages/search.php b/Source/pages/search.php
index deceb17..2b4c6b1 100644
--- a/Source/pages/search.php
+++ b/Source/pages/search.php
@@ -35,9 +35,10 @@
 <td class="form-title"><?php echo plugin_lang_get( 'search' ), ' ', plugin_lang_get( 'changesets' ) ?></td>
 <td class="right" colspan="2">
 <?php
-print_bracket_link( plugin_page( 'search' ) . $t_permalink, "Permalink" );
-print_bracket_link( plugin_page( 'search_page' ) . $t_permalink, "Modify Search" );
-print_bracket_link( plugin_page( 'search_page' ), "New Search" );
+print_bracket_link( plugin_page( 'search' ) . $t_permalink, plugin_lang_get( 'permalink' ) );
+print_bracket_link( plugin_page( 'search_page' ) . $t_permalink, plugin_lang_get( 'modify_search' ) );
+print_bracket_link( plugin_page( 'search_page' ), plugin_lang_get( 'new_search' ) );
+print_bracket_link( plugin_page( 'index' ), plugin_lang_get( 'back' ) );
 ?>
 </td>
 </tr>
@@ -53,8 +54,8 @@
 <tr class="row-1">
 <td class="category" width="25%" rowspan="<?php echo $t_rows ?>">
 	<strong><?php echo string_display( $t_repo->name ), ' ', event_signal( 'EVENT_SOURCE_SHOW_CHANGESET', array( $t_repo, $t_changeset ) ) ?></strong><br/>
-	<span class="small"><?php echo "Timestamp: ", $t_changeset->timestamp ?></span><br/>
-	<span class="small"><?php echo "Author: ", $t_changeset->author ?></span>
+	<span class="small"><?php echo plugin_lang_get( 'timestamp' ), ': ', $t_changeset->timestamp ?></span><br/>
+	<span class="small"><?php echo plugin_lang_get( 'author' ), ': ', $t_changeset->author ?></span>
 </td>
 <td colspan="2"><?php echo string_display_links( $t_changeset->message ) ?></td>
 </tr>
diff --git a/Source/pages/search_page.php b/Source/pages/search_page.php
index 75d1f86..e9fe0d4 100644
--- a/Source/pages/search_page.php
+++ b/Source/pages/search_page.php
@@ -34,16 +34,16 @@
 <td class="form-title" colspan="2"><?php echo plugin_lang_get( 'search' ), ' ', plugin_lang_get( 'changesets' ) ?></td>
 <td class="right" colspan="5">
 <?php
-print_bracket_link( plugin_page( 'search_page' ), 'New Search' );
-print_bracket_link( plugin_page( 'index' ), 'Back to Index' );
+print_bracket_link( plugin_page( 'search_page' ), plugin_lang_get( 'new_search' ) );
+print_bracket_link( plugin_page( 'index' ), plugin_lang_get( 'back' ) );
 ?>
 </tr>
 
 <tr class="row-category">
-<td>Source Control</td>
-<td>Repositories</td>
-<td>Branches</td>
-<td>Action</td>
+<td><?php echo plugin_lang_get( 'type' ) ?></td>
+<td><?php echo plugin_lang_get( 'repository' ) ?></td>
+<td><?php echo plugin_lang_get( 'branch' ) ?></td>
+<td><?php echo plugin_lang_get( 'action' ) ?></td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
@@ -56,10 +56,10 @@
 <tr class="spacer"><td></td></tr>
 
 <tr class="row-category">
-<td>Username</td>
-<td>Author</td>
-<td>Revision</td>
-<td>Bug #'s</td>
+<td><?php echo plugin_lang_get( 'username' ) ?></td>
+<td><?php echo plugin_lang_get( 'author' ) ?></td>
+<td><?php echo plugin_lang_get( 'revision' ) ?></td>
+<td><?php echo plugin_lang_get( 'issue' ) ?></td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
@@ -84,17 +84,17 @@
 <tr class="spacer"><td></td></tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category">Message</td>
+<td class="category"><?php echo plugin_lang_get( 'message' ) ?></td>
 <td colspan="6"><input name="message" size="40" value="<?php echo string_attribute( $t_filter->filters['c.message']->value ) ?>"/></td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category">Filenames</td>
+<td class="category"><?php echo plugin_lang_get( 'filename' ) ?></td>
 <td colspan="6"><input name="filename" size="40" value="<?php echo string_attribute( $t_filter->filters['f.filename']->value ) ?>"/></td>
 </tr>
 
 <tr>
-<td class="center" colspan="7"><input type="submit"/></td>
+<td class="center" colspan="7"><input type="submit" value="<?php echo plugin_lang_get( 'search' ) ?>"/></td>
 </tr>
 
 </table>