--- smeserver-trac-0.4/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/trac.pm.add2general	2008-04-26 09:18:47.000000000 -0600
+++ smeserver-trac-0.4/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/trac.pm	2008-04-26 09:14:48.000000000 -0600
@@ -129,18 +129,18 @@
 	my $q = $fm->{cgi};
 
 	# Setup the various localised text field for the trac project table
-	my $name        = $fm->localise('TRAC_TABLE_HEADER_NAME');
-	my $description = $fm->localise('TRAC_TABLE_HEADER_DESCRIPTION');
-	my $domains     = $fm->localise('TRAC_TABLE_HEADER_DOMAINS');
-	my $repository  = $fm->localise('TRAC_TABLE_HEADER_REPOSITORY');
-	my $path        = $fm->localise('TRAC_TABLE_HEADER_PATH');
-	my $access      = $fm->localise('TRAC_TABLE_HEADER_ACCESS');
-	my $action_h    = $fm->localise('TRAC_TABLE_HEADER_ACTION');
-	my $view        = $fm->localise('TRAC_ACTION_VIEW');
-	my $modify      = $fm->localise('TRAC_ACTION_MODIFY');
-	my $remove      = $fm->localise('TRAC_ACTION_REMOVE');
-	my $backup      = $fm->localise('TRAC_ACTION_BACKUP');
-	my $restore     = $fm->localise('TRAC_ACTION_RESTORE');
+	my $name        = $fm->localise('NAME');
+	my $description = $fm->localise('DESCRIPTION');
+	my $domains     = $fm->localise('DOMAINS');
+	my $repository  = $fm->localise('REPOSITORY');
+	my $path        = $fm->localise('PATH');
+	my $access      = $fm->localise('DESCRIPTION');
+	my $action_h    = $fm->localise('ACTION');
+	my $view        = $fm->localise('VIEW');
+	my $modify      = $fm->localise('MODIFY');
+	my $remove      = $fm->localise('REMOVE');
+	my $backup      = $fm->localise('BACKUP');
+	my $restore     = $fm->localise('RESTORE');
 
 	print $q->start_table({-class => 'sme-noborder'}), "\n";
 
@@ -417,7 +417,7 @@
 		$out .=     "      <td colspan=2>" . $fm->localise('TRAC_FIELD_DOMAINS_DESCRIPTION') . "</td>";
 		$out .=     "    </tr>\n";
 		$out .=     "    <tr>\n";
-		$out .=     "      <td class=\"sme-noborders-label\">" . $fm->localise('TRAC_FIELD_DOMAINS') . "</td>\n";
+		$out .=     "      <td class=\"sme-noborders-label\">" . $fm->localise('DOMAINS') . "</td>\n";
 		$out .=     "      <td>\n";
 		$out .=     "        <table border='0' cellspacing='0' cellpadding='0'>\n";
 		$out .=     "          <tr>\n";
@@ -454,7 +454,7 @@
 		$out .=     "      <td colspan=2>" . $fm->localise('TRAC_FIELD_DOMAIN_DESCRIPTION') . "</td>";
 		$out .=     "    </tr>\n";
 		$out .=     "    <tr>\n";
-		$out .=     "      <td class=\"sme-noborders-label\">" . $fm->localise('TRAC_FIELD_DOMAIN') . "</td>\n";
+		$out .=     "      <td class=\"sme-noborders-label\">" . $fm->localise('DOMAIN') . "</td>\n";
 		$out .=     "      <td><input type=\"hidden\" name=\"tracDomains\" value=\"" . $domainname . "\">";
 		$out .=                $domainname . "</td>\n";
 		$out .=     "    </tr>\n";
--- smeserver-trac-0.4/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/trac.add2general	2008-04-26 09:18:47.000000000 -0600
+++ smeserver-trac-0.4/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/trac	2008-04-26 09:14:48.000000000 -0600
@@ -129,20 +129,6 @@
 	</entry>
 
 	<entry>
-		<base>TRAC_FIELD_PROJECT_DESCRIPTION</base>
-		<trans>
-			Description
-		</trans>
-	</entry>
-
-	<entry>
-		<base>TRAC_FIELD_DOMAIN</base>
-		<trans>
-			Domain
-		</trans>
-	</entry>
-
-	<entry>
 		<base>TRAC_FIELD_DOMAIN_DESCRIPTION</base>
 		<trans>
 			When you have more than one domain configured on this server, you can
@@ -152,13 +138,6 @@
 	</entry>
 
 	<entry>
-		<base>TRAC_FIELD_DOMAINS</base>
-		<trans>
-			Domains
-		</trans>
-	</entry>
-
-	<entry>
 		<base>TRAC_FIELD_DOMAINS_DESCRIPTION</base>
 		<trans>
 			There are multiple domains configured on this server. You can select
@@ -241,90 +220,29 @@
 	</entry>
 
 	<entry>
-		<base>TRAC_TABLE_HEADER_NAME</base>
-		<trans>
-			Name
-		</trans>
-	</entry>
-
-	<entry>
-		<base>TRAC_TABLE_HEADER_DESCRIPTION</base>
-		<trans>
-			Description
-		</trans>
-	</entry>
-
-	<entry>
-		<base>TRAC_TABLE_HEADER_DOMAINS</base>
-		<trans>
-			Domains
-		</trans>
-	</entry>
-
-	<entry>
-		<base>TRAC_TABLE_HEADER_REPOSITORY</base>
+		<base>REPOSITORY</base>
 		<trans>
 			Repository
 		</trans>
 	</entry>
 
 	<entry>
-		<base>TRAC_TABLE_HEADER_PATH</base>
+		<base>PATH</base>
 		<trans>
 			Path
 		</trans>
 	</entry>
 
 	<entry>
-		<base>TRAC_TABLE_HEADER_ACCESS</base>
-		<trans>
-			Access
-		</trans>
-	</entry>
 
 	<entry>
-		<base>TRAC_TABLE_HEADER_ACTION</base>
-		<trans>
-			Action
-		</trans>
-	</entry>
-
-	<entry>
-		<base>TRAC_ACTION_VIEW</base>
+		<base>VIEW</base>
 		<trans>
 			View Trac Project
 		</trans>
 	</entry>
 
 	<entry>
-		<base>TRAC_ACTION_MODIFY</base>
-		<trans>
-			Modify
-		</trans>
-	</entry>
-
-	<entry>
-		<base>TRAC_ACTION_REMOVE</base>
-		<trans>
-			Remove
-		</trans>
-	</entry>
-
-	<entry>
-		<base>TRAC_ACTION_BACKUP</base>
-		<trans>
-			Backup
-		</trans>
-	</entry>
-
-	<entry>
-		<base>TRAC_ACTION_RESTORE</base>
-		<trans>
-			Restore
-		</trans>
-	</entry>
-
-	<entry>
 		<base>ERROR_WHILE_CREATING_TRAC_PROJECT</base>
 		<trans>
 			An error occurred while creating the Trac project environment.
@@ -364,13 +282,6 @@
 	</entry>
 
 	<entry>
-		<base>DESCRIPTION_ERROR</base>
-		<trans>
-			Unexpected characters in description.
-		</trans>
-	</entry>
-
-	<entry>
 		<base>NO_DOMAINS</base>
 		<trans>
 			There are no domains selected for the Trac project environment. 
@@ -481,15 +392,5 @@
 		<trans>Local Network Only</trans>
 	</entry>
 
-	<entry>
-		<base>YES</base>
-		<trans>Yes</trans>
-	</entry>
-
-	<entry>
-		<base>NO</base>
-		<trans>No</trans>
-	</entry>
-
 </lexicon>
 
--- smeserver-trac-0.4/root/etc/e-smith/web/functions/trac.add2general	2008-04-26 09:18:47.000000000 -0600
+++ smeserver-trac-0.4/root/etc/e-smith/web/functions/trac	2008-04-26 09:14:48.000000000 -0600
@@ -103,7 +103,7 @@
 			type="text"
 			id="tracDescription"
 			validation="validate_description">
-			<label>TRAC_FIELD_PROJECT_DESCRIPTION</label>
+			<label>DESCRIPTION</label>
 		</field>
 
 		<field
@@ -168,7 +168,7 @@
 			type="text"
 			id="tracDescription"
 			validation="validate_description">
-			<label>TRAC_FIELD_PROJECT_DESCRIPTION</label>
+			<label>DESCRIPTION</label>
 		</field>