diff --git a/Source/MantisSourcePlugin.class.php b/Source/MantisSourcePlugin.class.php
index d0d076e..ea6b5f9 100644
--- a/Source/MantisSourcePlugin.class.php
+++ b/Source/MantisSourcePlugin.class.php
@@ -70,8 +70,8 @@
  */
 class SourceGenericPlugin extends MantisSourcePlugin {
 	function register() {
-		$this->name = lang_get( 'plugin_Source_title' );
-		$this->version = lang_get( 'plugin_Source_version' );
+		$this->name = plugin_lang_get( 'title', 'Source' );
+		$this->version = plugin_lang_get( 'version', 'Source' );
 	}
 
 	function get_types( $p_event ) {
diff --git a/Source/Source.php b/Source/Source.php
index 066294c..73ba38b 100644
--- a/Source/Source.php
+++ b/Source/Source.php
@@ -19,10 +19,10 @@
  */ 
 class SourcePlugin extends MantisPlugin {
 	function register() {
-		$this->name = lang_get( 'plugin_Source_title' );
-		$this->description = lang_get( 'plugin_Source_description' );
+		$this->name = plugin_lang_get( 'title' );
+		$this->description = plugin_lang_get( 'description' );
 
-		$this->version = lang_get( 'plugin_Source_version' );
+		$this->version = plugin_lang_get( 'version' );
 		$this->requires = array(
 			'MantisCore' => '1.2.0',
 		);
diff --git a/Source/SourceIntegration.php b/Source/SourceIntegration.php
index 77495a7..80426fc 100644
--- a/Source/SourceIntegration.php
+++ b/Source/SourceIntegration.php
@@ -13,8 +13,8 @@
 
 final class SourceIntegrationPlugin extends MantisPlugin {
 	function register() {
-		$this->name = lang_get( 'plugin_Source_title' );
-		$this->version = lang_get( 'plugin_Source_version' );
+		$this->name = plugin_lang_get( 'title', 'Source' );
+		$this->version = plugin_lang_get( 'version', 'Source' );
 	}
 
 	function hooks() {
@@ -28,7 +28,7 @@
 
 	function menu_main() {
 		$t_page = plugin_page( 'index', false, 'Source' );
-		$t_repos = lang_get( 'plugin_Source_repositories' );
+		$t_repos = plugin_lang_get( 'repositories', 'Source' );
 		return "<a href=\"$t_page\">$t_repos</a>";
 	}
 
@@ -50,7 +50,7 @@
 <table class="width100" cellspacing="1">
 
 <tr>
-	<td class="form-title"><?php collapse_icon( 'Source' ); echo lang_get( 'plugin_Source_related_changesets' ) ?></td>
+	<td class="form-title"><?php collapse_icon( 'Source' ); echo plugin_lang_get( 'related_changesets', 'Source' ) ?></td>
 </tr>
 
 		<?php
@@ -62,18 +62,18 @@
 <tr <?php echo helper_alternate_class() ?>>
 <td class="category" colspan="3" rowspan="<?php echo count( $t_changeset->files ) + 1 ?>">
 	<?php echo string_display( event_signal( 'EVENT_SOURCE_SHOW_CHANGESET', array( $t_repo, $t_changeset ) ) ) ?>
-	<br/><span class="small"><?php echo lang_get( 'plugin_Source_author' ), ': ', string_display_line( $t_changeset->author ) ?></span>
-	<br/><span class="small"><?php echo lang_get( 'plugin_Source_timestamp' ), ': ', string_display_line( $t_changeset->timestamp ) ?></span>
-	<br/><span class="small"><?php print_bracket_link( event_signal( 'EVENT_SOURCE_URL_REPO', array( $t_repo, $t_changeset ) ), lang_get( 'plugin_Source_browse' ) ) ?>
-		<?php print_bracket_link( event_signal( 'EVENT_SOURCE_URL_CHANGESET', array( $t_repo, $t_changeset ) ), lang_get( 'plugin_Source_changeset' ) ) ?></span>
+	<br/><span class="small"><?php echo plugin_lang_get( 'author', 'Source' ), ': ', string_display_line( $t_changeset->author ) ?></span>
+	<br/><span class="small"><?php echo plugin_lang_get( 'timestamp', 'Source' ), ': ', string_display_line( $t_changeset->timestamp ) ?></span>
+	<br/><span class="small"><?php print_bracket_link( event_signal( 'EVENT_SOURCE_URL_REPO', array( $t_repo, $t_changeset ) ), plugin_lang_get( 'browse', 'Source' ) ) ?>
+		<?php print_bracket_link( event_signal( 'EVENT_SOURCE_URL_CHANGESET', array( $t_repo, $t_changeset ) ), plugin_lang_get( 'changeset', 'Source' ) ) ?></span>
 </td>
 
 		<?php foreach ( $t_changeset->files as $t_file ) {
 			echo ( $t_first ? '' : '<tr ' . helper_alternate_class() . '>' ); ?>
 <td><?php echo string_display_line( event_signal( 'EVENT_SOURCE_SHOW_FILE', array( $t_repo, $t_changeset, $t_file ) ) ) ?></td>
 <td class="center">
-	<?php print_bracket_link( event_signal( 'EVENT_SOURCE_URL_FILE_DIFF', array( $t_repo, $t_changeset, $t_file ) ), lang_get( 'plugin_Source_diff' ) ) ?>
-	<?php print_bracket_link( event_signal( 'EVENT_SOURCE_URL_FILE', array( $t_repo, $t_changeset, $t_file ) ), lang_get( 'plugin_Source_file' ) ) ?>
+	<?php print_bracket_link( event_signal( 'EVENT_SOURCE_URL_FILE_DIFF', array( $t_repo, $t_changeset, $t_file ) ), plugin_lang_get( 'diff', 'Source' ) ) ?>
+	<?php print_bracket_link( event_signal( 'EVENT_SOURCE_URL_FILE', array( $t_repo, $t_changeset, $t_file ) ), plugin_lang_get( 'file', 'Source' ) ) ?>
 </td>
 </tr>
 
@@ -94,7 +94,7 @@
 <table class="width100" cellspacing="1">
 
 <tr>
-	<td class="form-title"><?php collapse_icon( 'Source' ); echo lang_get( 'plugin_Source_related_changesets' ) ?></td>
+	<td class="form-title"><?php collapse_icon( 'Source' ); echo plugin_lang_get( 'related_changesets', 'Source' ) ?></td>
 </tr>
 
 </table>
diff --git a/Source/pages/checkin.php b/Source/pages/checkin.php
index ba0764e..5f97113 100644
--- a/Source/pages/checkin.php
+++ b/Source/pages/checkin.php
@@ -60,7 +60,7 @@
 
 # Not validated by this point gets the boot!
 if ( !$t_valid ) {
-	die( lang_get( 'plugin_Source_invalid_checkin_url' ) );
+	die( plugin_lang_get( 'invalid_checkin_url' ) );
 }
 
 # Let plugins try to intepret POST data before we do
@@ -80,7 +80,7 @@
 
 # Repo not found
 if ( is_null( $t_repo ) ) {
-	die( lang_get( 'plugin_Source_invalid_repo' ) );
+	die( plugin_lang_get( 'invalid_repo' ) );
 }
 
 # Let the plugins handle commit data
@@ -88,7 +88,7 @@
 
 # Changesets couldn't be loaded apparently
 if ( is_null( $t_changesets ) ) {
-	die( lang_get( 'plugin_Source_invalid_changeset' ) );
+	die( plugin_lang_get( 'invalid_changeset' ) );
 }
 
 # Save all changesets found by the check-in
diff --git a/Source/pages/index.php b/Source/pages/index.php
index 02bbde1..4c1abe5 100644
--- a/Source/pages/index.php
+++ b/Source/pages/index.php
@@ -17,7 +17,7 @@
 $t_types = SourceTypes();
 $t_repos = SourceRepo::load_all();
 
-html_page_top1( lang_get( 'plugin_Source_title' ) );
+html_page_top1( plugin_lang_get( 'title' ) );
 html_page_top2();
 ?>
 
@@ -25,16 +25,16 @@
 <table class="width75" align="center" cellspacing="1">
 
 <tr>
-<td class="form-title" colspan="2"><?php echo lang_get( 'plugin_Source_repositories' ) ?></td>
+<td class="form-title" colspan="2"><?php echo plugin_lang_get( 'repositories' ) ?></td>
 </tr>
 
 <tr class="row-category">
-<td width="30%"><?php echo lang_get( 'plugin_Source_repository' ) ?></td>
-<td width="15%"><?php echo lang_get( 'plugin_Source_type' ) ?></td>
-<td width="10%"><?php echo lang_get( 'plugin_Source_changesets' ) ?></td>
-<td width="10%"><?php echo lang_get( 'plugin_Source_files' ) ?></td>
-<td width="10%"><?php echo lang_get( 'plugin_Source_issues' ) ?></td>
-<td width="25%"><?php echo lang_get( 'plugin_Source_actions' ) ?></td>
+<td width="30%"><?php echo plugin_lang_get( 'repository' ) ?></td>
+<td width="15%"><?php echo plugin_lang_get( 'type' ) ?></td>
+<td width="10%"><?php echo plugin_lang_get( 'changesets' ) ?></td>
+<td width="10%"><?php echo plugin_lang_get( 'files' ) ?></td>
+<td width="10%"><?php echo plugin_lang_get( 'issues' ) ?></td>
+<td width="25%"><?php echo plugin_lang_get( 'actions' ) ?></td>
 </tr>
 
 <?php foreach( $t_repos as $t_repo ) {
@@ -47,12 +47,12 @@
 <td class="right"><?php echo $t_stats['bugs'] ?></td>
 <td class="center">
 <?php 
-	print_bracket_link( event_signal( 'EVENT_SOURCE_URL_REPO', $t_repo ), lang_get( 'plugin_Source_browse' ) );
+	print_bracket_link( event_signal( 'EVENT_SOURCE_URL_REPO', $t_repo ), plugin_lang_get( 'browse' ) );
 	if ( $t_can_manage ) {
 		if ( preg_match( '/^Import \d+-\d+\d+/', $t_repo->name ) ) {
-			print_bracket_link( plugin_page( 'repo_delete' ) . '&id=' . $t_repo->id, lang_get( 'plugin_Source_delete' ) );
+			print_bracket_link( plugin_page( 'repo_delete' ) . '&id=' . $t_repo->id, plugin_lang_get( 'delete' ) );
 		}
-		print_bracket_link( plugin_page( 'repo_manage_page' ) . '&id=' . $t_repo->id, lang_get( 'plugin_Source_manage' ) );
+		print_bracket_link( plugin_page( 'repo_manage_page' ) . '&id=' . $t_repo->id, plugin_lang_get( 'manage' ) );
 	}
 ?>
 </td>
@@ -67,19 +67,19 @@
 <table class="width50" align="center" cellspacing="1">
 
 <tr>
-<td class="form-title" colspan="2"><?php echo lang_get( 'plugin_Source_create' ), ' ', lang_get( 'plugin_Source_repository' ) ?></td>
+<td class="form-title" colspan="2"><?php echo plugin_lang_get( 'create' ), ' ', plugin_lang_get( 'repository' ) ?></td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category"><?php echo lang_get( 'plugin_Source_name' ) ?></td>
+<td class="category"><?php echo plugin_lang_get( 'name' ) ?></td>
 <td><input name="repo_name" maxlength="128" size="40"/></td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category"><?php echo lang_get( 'plugin_Source_type' ) ?></td>
+<td class="category"><?php echo plugin_lang_get( 'type' ) ?></td>
 <td>
 <select name="repo_type">
-	<option value=""><?php echo lang_get( 'plugin_Source_select_one' ) ?></option>
+	<option value=""><?php echo plugin_lang_get( 'select_one' ) ?></option>
 <?php foreach( $t_types as $t_type => $t_type_name ) { ?>
 	<option value="<?php echo $t_type ?>"><?php echo string_display( $t_type_name ) ?></option>
 <?php } ?>
@@ -88,7 +88,7 @@
 </tr>
 
 <tr>
-<td class="center" colspan="2"><input type="submit" value="<?php echo lang_get( 'plugin_Source_create' ), ' ', lang_get( 'plugin_Source_repository' ) ?>"/></td>
+<td class="center" colspan="2"><input type="submit" value="<?php echo plugin_lang_get( 'create' ), ' ', plugin_lang_get( 'repository' ) ?>"/></td>
 </tr>
 
 </table>
diff --git a/Source/pages/manage_config_page.php b/Source/pages/manage_config_page.php
index 3e8c48f..64dc530 100644
--- a/Source/pages/manage_config_page.php
+++ b/Source/pages/manage_config_page.php
@@ -14,7 +14,7 @@
 auth_reauthenticate();
 access_ensure_global_level( plugin_config_get( 'manage_threshold' ) );
 
-html_page_top1( lang_get( 'plugin_Source_title' ) );
+html_page_top1( plugin_lang_get( 'title' ) );
 html_page_top2();
 
 print_manage_menu();
@@ -28,46 +28,46 @@
 <table class="width60" align="center" cellspacing="1">
 
 <tr>
-<td class="form-title" colspan="2"><?php echo lang_get( 'plugin_Source_title' ), ': ', lang_get( 'plugin_Source_configuration' ) ?></td>
+<td class="form-title" colspan="2"><?php echo plugin_lang_get( 'title' ), ': ', plugin_lang_get( 'configuration' ) ?></td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category"><?php echo lang_get( 'plugin_Source_view_threshold' ) ?></td>
+<td class="category"><?php echo plugin_lang_get( 'view_threshold' ) ?></td>
 <td><select name="view_threshold"><?php print_enum_string_option_list( 'access_levels', plugin_config_get( 'view_threshold' ) ) ?></select></td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category"><?php echo lang_get( 'plugin_Source_manage_threshold' ) ?></td>
+<td class="category"><?php echo plugin_lang_get( 'manage_threshold' ) ?></td>
 <td><select name="manage_threshold"><?php print_enum_string_option_list( 'access_levels', plugin_config_get( 'manage_threshold' ) ) ?></select></td>
 </tr>
 
 <tr><td class="spacer"></td></tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category"><?php echo lang_get( 'plugin_Source_buglink_regex_1' ) ?></td>
+<td class="category"><?php echo plugin_lang_get( 'buglink_regex_1' ) ?></td>
 <td>
 	<input name="buglink_regex_1" size="50" maxlength="500" value="<?php echo string_attribute( plugin_config_get( 'buglink_regex_1' ) ) ?>"/>
-	<br/><label><input name="buglink_reset_1" type="checkbox"/><span class="small"><?php echo lang_get( 'plugin_Source_reset' ) ?></span></label>
+	<br/><label><input name="buglink_reset_1" type="checkbox"/><span class="small"><?php echo plugin_lang_get( 'reset' ) ?></span></label>
 </td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category"><?php echo lang_get( 'plugin_Source_buglink_regex_2' ) ?></td>
+<td class="category"><?php echo plugin_lang_get( 'buglink_regex_2' ) ?></td>
 <td>
 	<input name="buglink_regex_2" size="50" maxlength="500" value="<?php echo string_attribute( plugin_config_get( 'buglink_regex_2' ) ) ?>"/>
-	<br/><label><input name="buglink_reset_2" type="checkbox"/><span class="small"><?php echo lang_get( 'plugin_Source_reset' ) ?></span></label>
+	<br/><label><input name="buglink_reset_2" type="checkbox"/><span class="small"><?php echo plugin_lang_get( 'reset' ) ?></span></label>
 </td>
 </tr>
 
 <tr><td class="spacer"></td></tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category"><?php echo lang_get( 'plugin_Source_allow_remote_checkin' ) ?></td>
+<td class="category"><?php echo plugin_lang_get( 'allow_remote_checkin' ) ?></td>
 <td><input name="remote_checkin" type="checkbox" <?php echo (ON == $t_remote_checkin ? 'checked="checked"' : '') ?>></td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category"><?php echo lang_get( 'plugin_Source_remote_checkin_urls' ) ?></td>
+<td class="category"><?php echo plugin_lang_get( 'remote_checkin_urls' ) ?></td>
 <td><textarea name="checkin_urls" rows="8" cols="50"><?php
 foreach( $t_checkin_urls as $t_ip ) {
 	echo string_textarea( $t_ip ),"\n";
@@ -76,7 +76,7 @@
 </tr>
 
 <tr>
-<td class="center" colspan="2"><input type="submit" value="<?php echo lang_get( 'plugin_Source_update' ), ' ', lang_get( 'plugin_Source_configuration' ) ?>"/></td>
+<td class="center" colspan="2"><input type="submit" value="<?php echo plugin_lang_get( 'update' ), ' ', plugin_lang_get( 'configuration' ) ?>"/></td>
 </tr>
 
 </table>
diff --git a/Source/pages/repo_delete.php b/Source/pages/repo_delete.php
index a122e54..538643c 100644
--- a/Source/pages/repo_delete.php
+++ b/Source/pages/repo_delete.php
@@ -17,7 +17,7 @@
 
 $t_repo = SourceRepo::load( $f_repo_id );
 
-helper_ensure_confirmed( sprintf( lang_get( 'plugin_Source_ensure_delete' ), $t_repo->name ), lang_get( 'plugin_Source_delete' ), ' ', lang_get( 'plugin_Source_repository' ) );
+helper_ensure_confirmed( sprintf( plugin_lang_get( 'ensure_delete' ), $t_repo->name ), plugin_lang_get( 'delete' ), ' ', plugin_lang_get( 'repository' ) );
 
 SourceRepo::delete( $t_repo->id );
 
diff --git a/Source/pages/repo_import.php b/Source/pages/repo_import.php
index 2f46a1d..8185fba 100644
--- a/Source/pages/repo_import.php
+++ b/Source/pages/repo_import.php
@@ -17,7 +17,7 @@
 
 $t_repo = SourceRepo::load( $f_repo_id );
 
-helper_ensure_confirmed( lang_get( 'plugin_Source_ensure_import' ), lang_get( 'plugin_Source_import_data' ) );
+helper_ensure_confirmed( plugin_lang_get( 'ensure_import' ), plugin_lang_get( 'import_data' ) );
 helper_begin_long_process();
 
 html_page_top1();
diff --git a/Source/pages/repo_manage_page.php b/Source/pages/repo_manage_page.php
index 037d79a..817494f 100644
--- a/Source/pages/repo_manage_page.php
+++ b/Source/pages/repo_manage_page.php
@@ -18,7 +18,7 @@
 $t_repo = SourceRepo::load( $f_repo_id );
 $t_type = SourceType($t_repo->type);
 
-html_page_top1( lang_get( 'plugin_Source_title' ) );
+html_page_top1( plugin_lang_get( 'title' ) );
 html_page_top2();
 ?>
 
@@ -26,27 +26,27 @@
 <table class="width50" align="center" cellspacing="1">
 
 <tr>
-<td class="form-title" colspan="2"><?php echo lang_get( 'plugin_Source_manage' ), ' ', lang_get( 'plugin_Source_repository' ) ?></td>
-<td class="right"><?php print_bracket_link( plugin_page( 'index' ), lang_get( 'plugin_Source_back' ) ) ?></td>
+<td class="form-title" colspan="2"><?php echo plugin_lang_get( 'manage' ), ' ', plugin_lang_get( 'repository' ) ?></td>
+<td class="right"><?php print_bracket_link( plugin_page( 'index' ), plugin_lang_get( 'back' ) ) ?></td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category"><?php echo lang_get( 'plugin_Source_name' ) ?></td>
+<td class="category"><?php echo plugin_lang_get( 'name' ) ?></td>
 <td colspan="2"><?php echo string_display( $t_repo->name ) ?></td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category"><?php echo lang_get( 'plugin_Source_type' ) ?></td>
+<td class="category"><?php echo plugin_lang_get( 'type' ) ?></td>
 <td colspan="2"><?php echo string_display( $t_type ) ?></td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category"><?php echo lang_get( 'plugin_Source_url' ) ?></td>
+<td class="category"><?php echo plugin_lang_get( 'url' ) ?></td>
 <td colspan="2"><?php echo string_display( $t_repo->url ) ?></td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category"><?php echo lang_get( 'plugin_Source_info' ) ?></td>
+<td class="category"><?php echo plugin_lang_get( 'info' ) ?></td>
 <td colspan="2"><pre><?php
 foreach( $t_repo->info as $t_key => $t_value ) {
 	echo string_display( $t_key . ' => ' );
@@ -63,11 +63,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 lang_get( 'plugin_Source_update' ), ' ', lang_get( 'plugin_Source_repository' ) ?>"/></form>
-<form action="<?php echo plugin_page( 'repo_delete' ) . '&id=' . $t_repo->id ?>" method="post"><input type="submit" value="<?php echo lang_get( 'plugin_Source_delete' ), ' ', lang_get( 'plugin_Source_repository' ) ?>"/></form>
+<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' ) ?>"/></form>
+<form action="<?php echo plugin_page( 'repo_delete' ) . '&id=' . $t_repo->id ?>" method="post"><input type="submit" value="<?php echo plugin_lang_get( 'delete' ), ' ', plugin_lang_get( 'repository' ) ?>"/></form>
 </td>
 <td class="right">
-<form action="<?php echo plugin_page( 'repo_import' ) . '&id=' . $t_repo->id ?>" method="post"><input type="submit" value="<?php echo lang_get( 'plugin_Source_import_data' ) ?>"/></form>
+<form action="<?php echo plugin_page( 'repo_import' ) . '&id=' . $t_repo->id ?>" method="post"><input type="submit" value="<?php echo plugin_lang_get( 'import_data' ) ?>"/></form>
 </td>
 </tr>
 
diff --git a/Source/pages/repo_update_page.php b/Source/pages/repo_update_page.php
index c1b8ded..9993742 100644
--- a/Source/pages/repo_update_page.php
+++ b/Source/pages/repo_update_page.php
@@ -18,7 +18,7 @@
 $t_repo = SourceRepo::load( $f_repo_id );
 $t_type = SourceType($t_repo->type);
 
-html_page_top1( lang_get( 'plugin_Source_title' ) );
+html_page_top1( plugin_lang_get( 'title' ) );
 html_page_top2();
 ?>
 
@@ -28,29 +28,29 @@
 <table class="width50" align="center" cellspacing="1">
 
 <tr>
-<td class="form-title"><?php echo lang_get( 'plugin_Source_update' ), ' ', lang_get( 'plugin_Source_repository' ) ?></td>
+<td class="form-title"><?php echo plugin_lang_get( 'update' ), ' ', plugin_lang_get( 'repository' ) ?></td>
 <td class="right"><?php print_bracket_link( plugin_page( 'repo_manage_page' ) . '&id=' . $t_repo->id, "Back to Repository" ) ?></td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category"><?php echo lang_get( 'plugin_Source_name' ) ?></td>
+<td class="category"><?php echo plugin_lang_get( 'name' ) ?></td>
 <td><input name="repo_name" maxlength="128" size="40" value="<?php echo string_attribute( $t_repo->name ) ?>"/></td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category"><?php echo lang_get( 'plugin_Source_type' ) ?></td>
+<td class="category"><?php echo plugin_lang_get( 'type' ) ?></td>
 <td><?php echo string_display( $t_type ) ?></td>
 </tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category"><?php echo lang_get( 'plugin_Source_url' ) ?></td>
+<td class="category"><?php echo plugin_lang_get( 'url' ) ?></td>
 <td><input name="repo_url" maxlength="250" size="40" value="<?php echo string_attribute( $t_repo->url ) ?>"/></td>
 </tr>
 
 <?php event_signal( 'EVENT_SOURCE_UPDATE_REPO_FORM', array( $t_repo ) ) ?>
 
 <tr>
-<td class="center" colspan="2"><input type="submit" value="<?php echo  lang_get( 'plugin_Source_update' ), ' ', lang_get( 'plugin_Source_repository' ) ?>"/></td>
+<td class="center" colspan="2"><input type="submit" value="<?php echo  plugin_lang_get( 'update' ), ' ', plugin_lang_get( 'repository' ) ?>"/></td>
 </tr>
 
 </table>