diff --git a/Source/lang/strings_english.txt b/Source/lang/strings_english.txt
index 8ba661d..c53d96f 100644
--- a/Source/lang/strings_english.txt
+++ b/Source/lang/strings_english.txt
@@ -57,6 +57,13 @@
 $s_plugin_Source_pending = 'Pending';
 $s_plugin_Source_na = 'N/A';
 
+$s_plugin_Source_create_repository = 'Create Repository';
+$s_plugin_Source_manage_repository = 'Manage Repository';
+$s_plugin_Source_update_repository = 'Update Repository';
+$s_plugin_Source_delete_repository = 'Delete Repository';
+$s_plugin_Source_update_configuration = 'Update Configuration';
+$s_plugin_Source_search_changesets = 'Search Changesets';
+
 $s_plugin_Source_back = 'Back to Index';
 $s_plugin_Source_back_repo = 'Back to Repository';
 $s_plugin_Source_import_full = 'Import Everything';
diff --git a/Source/pages/index.php b/Source/pages/index.php
index a53ec38..9c811a0 100644
--- a/Source/pages/index.php
+++ b/Source/pages/index.php
@@ -73,7 +73,7 @@
 <table class="width50" align="center" cellspacing="1">
 
 <tr>
-<td class="form-title" colspan="2"><?php echo plugin_lang_get( 'create' ), ' ', plugin_lang_get( 'repository' ) ?></td>
+<td class="form-title" colspan="2"><?php echo plugin_lang_get( 'create_repository' ) ?></td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
@@ -94,7 +94,7 @@
 </tr>
 
 <tr>
-<td class="center" colspan="2"><input type="submit" value="<?php echo plugin_lang_get( 'create' ), ' ', plugin_lang_get( 'repository' ) ?>"/></td>
+<td class="center" colspan="2"><input type="submit" value="<?php echo plugin_lang_get( 'create_repository' ) ?>"/></td>
 </tr>
 
 </table>
diff --git a/Source/pages/manage_config_page.php b/Source/pages/manage_config_page.php
index 14f8f7d..9208c02 100644
--- a/Source/pages/manage_config_page.php
+++ b/Source/pages/manage_config_page.php
@@ -163,7 +163,7 @@
 ?>
 
 <tr>
-<td class="center" colspan="2"><input type="submit" value="<?php echo plugin_lang_get( 'update' ), ' ', plugin_lang_get( 'configuration' ) ?>"/></td>
+<td class="center" colspan="2"><input type="submit" value="<?php echo plugin_lang_get( 'update_configuration' ) ?>"/></td>
 </tr>
 
 </table>
diff --git a/Source/pages/repo_delete.php b/Source/pages/repo_delete.php
index 1ef0fef..d2c2c5f 100644
--- a/Source/pages/repo_delete.php
+++ b/Source/pages/repo_delete.php
@@ -10,7 +10,7 @@
 
 $t_repo = SourceRepo::load( $f_repo_id );
 
-helper_ensure_confirmed( sprintf( plugin_lang_get( 'ensure_delete' ), $t_repo->name ), plugin_lang_get( 'delete' ), ' ', plugin_lang_get( 'repository' ) );
+helper_ensure_confirmed( sprintf( plugin_lang_get( 'ensure_delete' ), $t_repo->name ), plugin_lang_get( 'delete_repository' ) );
 
 SourceRepo::delete( $t_repo->id );
 
diff --git a/Source/pages/repo_manage_page.php b/Source/pages/repo_manage_page.php
index 73c491a..53b1b33 100644
--- a/Source/pages/repo_manage_page.php
+++ b/Source/pages/repo_manage_page.php
@@ -37,7 +37,7 @@
 <table class="width75" align="center" cellspacing="1">
 
 <tr>
-<td class="form-title" colspan="2"><?php echo plugin_lang_get( 'manage' ), ' ', plugin_lang_get( 'repository' ) ?></td>
+<td class="form-title" colspan="2"><?php echo plugin_lang_get( 'manage_repository' ) ?></td>
 <td class="right">
 <?php
 	print_bracket_link( plugin_page( 'list' ) . "&id=$f_repo_id", plugin_lang_get( 'browse' ) );
@@ -80,11 +80,11 @@
 <tr>
 <td colspan="2">
 <form action="<?php echo plugin_page( 'repo_update_page' ) . '&id=' . $t_repo->id ?>" method="post">
-	<input type="submit" value="<?php echo plugin_lang_get( 'update' ), ' ', plugin_lang_get( 'repository' ) ?>"/>
+	<input type="submit" value="<?php echo plugin_lang_get( 'update_repository' ) ?>"/>
 </form>
 <form action="<?php echo plugin_page( 'repo_delete' ) . '&id=' . $t_repo->id ?>" method="post">
 	<?php echo form_security_field( 'plugin_Source_repo_delete' ) ?>
-	<input type="submit" value="<?php echo plugin_lang_get( 'delete' ), ' ', plugin_lang_get( 'repository' ) ?>"/>
+	<input type="submit" value="<?php echo plugin_lang_get( 'delete_repository' ) ?>"/>
 </form>
 </td>
 <td class="right">
diff --git a/Source/pages/repo_update_page.php b/Source/pages/repo_update_page.php
index 9cc2095..35b5861 100644
--- a/Source/pages/repo_update_page.php
+++ b/Source/pages/repo_update_page.php
@@ -22,7 +22,7 @@
 <table class="width60" align="center" cellspacing="1">
 
 <tr>
-<td class="form-title"><?php echo plugin_lang_get( 'update' ), ' ', plugin_lang_get( 'repository' ) ?></td>
+<td class="form-title"><?php echo plugin_lang_get( 'update_repository' ) ?></td>
 <td class="right"><?php print_bracket_link( plugin_page( 'repo_manage_page' ) . '&id=' . $t_repo->id, "Back to Repository" ) ?></td>
 </tr>
 
@@ -44,7 +44,7 @@
 <?php $t_vcs->update_repo_form( $t_repo ) ?>
 
 <tr>
-<td class="center" colspan="2"><input type="submit" value="<?php echo  plugin_lang_get( 'update' ), ' ', plugin_lang_get( 'repository' ) ?>"/></td>
+<td class="center" colspan="2"><input type="submit" value="<?php echo  plugin_lang_get( 'update_repository' ) ?>"/></td>
 </tr>
 
 </table>
diff --git a/Source/pages/search.php b/Source/pages/search.php
index ca7f151..130dfae 100644
--- a/Source/pages/search.php
+++ b/Source/pages/search.php
@@ -26,7 +26,7 @@
 <table class="width100" align="center" cellspacing="1">
 
 <tr>
-<td class="form-title" colspan="2"><?php echo plugin_lang_get( 'search' ), ' ', plugin_lang_get( 'changesets' ) ?></td>
+<td class="form-title" colspan="2"><?php echo plugin_lang_get( 'search_changesets' ) ?></td>
 <td class="right" colspan="2">
 <?php
 print_bracket_link( plugin_page( 'search' ) . $t_permalink, plugin_lang_get( 'permalink' ) );
diff --git a/Source/pages/search_page.php b/Source/pages/search_page.php
index 880a391..9867903 100644
--- a/Source/pages/search_page.php
+++ b/Source/pages/search_page.php
@@ -27,7 +27,7 @@
 <table class="width75 SourceFilters" align="center" cellspacing="1">
 
 <tr>
-<td class="form-title" colspan="2"><?php echo plugin_lang_get( 'search' ), ' ', plugin_lang_get( 'changesets' ) ?></td>
+<td class="form-title" colspan="2"><?php echo plugin_lang_get( 'search_changesets' ) ?></td>
 <td class="right" colspan="5">
 <?php
 print_bracket_link( plugin_page( 'search_page' ), plugin_lang_get( 'new_search' ) );