diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm
index 03ba392f3..8c8e6087c 100644
--- a/lib/WebGUI/Asset/Template.pm
+++ b/lib/WebGUI/Asset/Template.pm
@@ -78,7 +78,7 @@ sub _execute {
 		return $t->output;
 	} else {
 		WebGUI::ErrorHandler::warn("Error in template. ".$@);
-		return WebGUI::International::get(848).$@;
+		return WebGUI::International::get('template error', 'Template').$@;
 	}
 }
 
@@ -142,23 +142,23 @@ sub getEditForm {
 		$tabform->getTab("properties")->combo(
 			-name=>"namespace",
 			-options=>$namespaces,
-			-label=>"Namespace",
+			-label=>WebGUI::International::get('namespace','Template'),
 			-value=>[$session{form}{namespace}] 
 			);
 	} else {
 		$tabform->getTab("meta")->readOnly(
-			-label=>"Namespace",
+			-label=>WebGUI::International::get('namespace','Template'),
 			-value=>$self->getValue("namespace")
 			);	
 	}
 	$tabform->getTab("display")->yesNo(
 		-name=>"showInForms",
 		-value=>$self->getValue("showInForms"),
-		-label=>"Show in forms?"
+		-label=>WebGUI::International::get('show in forms', 'Template'),
 		);
         $tabform->getTab("properties")->codearea(
 		-name=>"template",
-		-label=>WebGUI::International::get(504),
+		-label=>WebGUI::International::get('template', 'Template'),
 		-value=>$self->getValue("template")
 		);
 	return $tabform;
@@ -321,7 +321,7 @@ sub www_edit {
         my $self = shift;
         return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->getAdminConsole->setHelp("template add/edit");
-        return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get(507));
+        return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('edit template', 'Template'));
 }
 
 
diff --git a/lib/WebGUI/i18n/English/Template.pm b/lib/WebGUI/i18n/English/Template.pm
new file mode 100644
index 000000000..78b4cd4a2
--- /dev/null
+++ b/lib/WebGUI/i18n/English/Template.pm
@@ -0,0 +1,36 @@
+package WebGUI::i18n::English::Template;
+
+our $I18N = {
+	'namespace' => {
+		message => q|Namespace|,
+		context => q|label for Template Add/Edit Form|,
+		lastUpdated => 1107391021,
+	},
+
+	'show in forms' => {
+		message => q|Show in Forms?|,
+		context => q|label for Template Add/Edit Form|,
+		lastUpdated => 1107391135,
+	},
+
+	'template' => {
+		message => q|Template|,
+		context => q|label for Template Add/Edit Form|,
+		lastUpdated => 1107391162,
+	},
+
+	'edit template' => {
+		message => q|Edit Template|,
+		context => q|label for Template AdminConsole form|,
+		lastUpdated => 1107391263,
+	},
+
+	'template error' => {
+		message => q|There is a syntax error in this template. Please correct.|,
+		context => q|Error when executing template|,
+		lastUpdated => 1107391368,
+	},
+
+};
+
+1;