diff --git a/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/cloudview/index.html b/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/cloudview/index.html
index dcdfda5028..772ebf670d 100644
--- a/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/cloudview/index.html
+++ b/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/cloudview/index.html
@@ -5,8 +5,7 @@
 {% block content %}
   <div id="page_description">
     <h2 class="page_heading">Cloud View</h2>
-		<p>View servers that participate in your cloud.  See statistics about
-		running services and served objects.</p>
+		<p>{% trans "View servers that participate in your cloud.  See statistics about running services and served objects." %}</p>
   </div>
           
 
diff --git a/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/index.html b/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/index.html
index 46f2e0ec30..3e69a6a508 100644
--- a/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/index.html
+++ b/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/index.html
@@ -4,36 +4,32 @@
 <h2 class="page_heading">NASA Nebula System Panel</h2>
 
 <div class="block">
-  <h3 class="half-heading">Manage Instances</h3>
-	<p>View all running instances other than VPNs. Schedule instances for
-	reboot or termination. Download logs.</p>
+  <h3 class="half-heading">{% trans "Manage Instances</h3>
+	<p>{% trans "View all running instances other than VPNs. Schedule instances for	reboot or termination. Download logs." %}</p>
   <a class="more" href="{% url syspanel_instances %}" >Manage Instances &rarr;</a>
 </div>
 
 <div class="block">
   <h3 class="half-heading">Manage Volumes</h3>
-  <p>View all volumes. See size, status, and mount point. Detach and destroy volumes.</p>
+  <p>{% trans "View all volumes. See size, status, and mount point. Detach and destroy volumes." %}</p>
   <a class="more" href="{% url syspanel_volumes %}" >Manage Volumes &rarr;</a>
 </div>
 
 <div class="block">
   <h3 class="half-heading">Manage VPN</h3>
-	<p>View all projects VPN status. Schedule launch, termination, and reboot.
-	Send credentials.</p>
+	<p>{% trans "View all projects VPN status. Schedule launch, termination, and reboot. Send credentials." %}</p>
   <a class="more" href="{% url syspanel_vpns %}" >Manage VPN &rarr;</a>
 </div>
 
 <div class="block">
   <h3 class="half-heading">Cloud View</h3>
-	<p>View servers that participate in your cloud.  See statistics about
-	running services and served objects.</p>
+	<p>{% trans "View servers that participate in your cloud.  See statistics about	running services and served objects." %}</p>
   <a class="more" href="{% url syspanel_cloudview %}" >Cloud View &rarr;</a>
 </div>
 
 <div class="block">
   <h3 class="half-heading">Security</h3>
-	<p>Perform operations to deal with rogue users, limit or prevent compromise,
-	and deal with external threats.</p>
+	<p>{% trans "Perform operations to deal with rogue users, limit or prevent compromise, and deal with external threats." %}</p>
   <a class="more" href="{% url syspanel_security %}" >Security &rarr;</a>
 </div>
 
diff --git a/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/instances/index.html b/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/instances/index.html
index 3a624782a8..9c36ebe41d 100644
--- a/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/instances/index.html
+++ b/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/instances/index.html
@@ -19,9 +19,8 @@
 
 {% block content %}
   <div id="page_description">
-    <h2 class="page_heading">Manage Instances</h2>
-		<p>View all running instances other than VPNs. Schedule instances for
-		reboot or termination. Download logs.</p>
+    <h2 class="page_heading">{% trans "Manage Instances" %}</h2>
+		<p>{% trans "View all running instances other than VPNs. Schedule instances for reboot or termination. Download logs." %}</p>
   </div>
   <div class="message">
     {% if status == "success" %}
@@ -33,7 +32,7 @@
     {% endif %}
   </div>
 	<div class="refresh">
-		<a href="{% url syspanel_instances %}">Refresh List</a>
+		<a href="{% url syspanel_instances %}">{% trans "Refresh List" %}</a>
 	</div>
   <table>
     <tr>
@@ -63,7 +62,7 @@
           <a href="{% url syspanel_instance_terminate instance.id %}">Terminate</a> |
 					<a href="{% url syspanel_instance_restart instance.id %}">Restart</a> |
           <a href="{% url syspanel_instance_console instance.id %}">Nova Log</a> |
-          <a href="logs_console.txt">Console Log</a>
+          <a href="logs_console.txt">{% trans "Console Log" %}</a>
         </td>
       </tr>
       
diff --git a/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/security/disable_project_credentials.html b/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/security/disable_project_credentials.html
index 6943007237..b5dd593f6f 100644
--- a/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/security/disable_project_credentials.html
+++ b/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/security/disable_project_credentials.html
@@ -5,15 +5,15 @@
 {% block content %}
   <h2 class="page_heading">{{project}} Disabled</h2>
 
-  <p>
+  <p>{%blocktrans%}
     If a user's credentials were comprimised, you will need to use 
     `nova-manage user revoke USERNAME`, and the restart all VPNs for projects
-    they are a member of.
+    they are a member of. {%endblocktrans%}
   </p>
 
-  <p>
+  <p>{%blocktrans%}
     The VPN for {{project}} is currently offline.  You can turn it back on
-    using <a href="{% url syspanel_vpns %}">VPN overview</a>.
+    using {%endblocktrans%}<a href="{% url syspanel_vpns %}">VPN overview</a>.
   </p>
   
 {% endblock %}
diff --git a/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/security/index.html b/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/security/index.html
index f9e3de358d..23e2f52863 100644
--- a/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/security/index.html
+++ b/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/security/index.html
@@ -3,15 +3,15 @@
 {% block breadcrumb %}{{ block.super }}<li><a href="{% url syspanel_security %}">Security</a></li>{% endblock %}
 
 {% block content %}
-  <h2 class="page_heading">Security</h2>
+  <h2 class="page_heading">{% trans "Security" %}</h2>
   
-  <h2>Use the following tools to secure the cloud during a security event</h2>
+  <h2>{% trans "Use the following tools to secure the cloud during a security event" %}</h2>
   
   <div id="scenerios">
     <div class="scenerio">
       <div class="description">
-        <p><strong>Scenario:</strong> Project account credentials have been compromised.</p>
-        <p><strong>Action:</strong> Disable the user or project. This should invalidate the credentials, also deny the specific port assigned to the user.</p>
+        <p>{% trans "<strong>Scenario:</strong> Project account credentials have been compromised." %}</p>
+        <p>{% trans "<strong>Action:</strong> Disable the user or project. This should invalidate the credentials, also deny the specific port assigned to the user." %}</p>
       </div>
 
       <form id="disable_project_credentials" action="{% url syspanel_security_disable_project_credentials %}" method="post" accept-charset="utf-8">
@@ -30,8 +30,8 @@
 
     <div class="scenerio">
       <div class="description">
-        <p><strong>Scenario:</strong> The issue pin points to be coming in from a specific external ip or ip range.</p> 
-        <p><strong>Action:</strong> Block the IP or IP range. This should manipulate ip tables to block the ip or ip range.</p>
+        <p>{% trans "<strong>Scenario:</strong> The issue pin points to be coming in from a specific external ip or ip range." %}</p> 
+        <p>{% trans "<strong>Action:</strong> Block the IP or IP range. This should manipulate ip tables to block the ip or ip range." %}</p>
       </div>
 
         <form id="disable_ip_range" action="{% url syspanel_security_disable_ip_range %}" method="post" accept-charset="utf-8">
@@ -51,8 +51,8 @@
 
     <div class="scenerio">
       <div class="description">
-        <p><strong>Scenario:</strong> Issues affecting multiple public entry points or could not determine to be a specific one.</p> 
-        <p><strong>Action:</strong> Disable all public IPs on all VMs. This should unplumb the device the public ip was on.</p>
+        <p>{% trans "<strong>Scenario:</strong> Issues affecting multiple public entry points or could not determine to be a specific one." %}</p> 
+        <p>{% trans "<strong>Action:</strong> Disable all public IPs on all VMs. This should unplumb the device the public ip was on." %}</p>
       </div>
 
       <form action="{% url syspanel_security_disable_public_ips %}" method="post" accept-charset="utf-8">
@@ -65,8 +65,8 @@
 
     <div class="scenerio">
       <div class="description">
-        <p><strong>Scenario:</strong> Issue related to VPN service affecting multiple customers.</p> 
-        <p><strong>Action:</strong> Disable VPN service. This should turn off the VPN ip.</p>
+        <p>{% trans "<strong>Scenario:</strong> Issue related to VPN service affecting multiple customers." %}</p> 
+        <p>{% trans "<strong>Action:</strong> Disable VPN service. This should turn off the VPN ip." %}</p>
       </div>
 
       <form action="{% url syspanel_security_disable_vpn %}" method="post" accept-charset="utf-8">
diff --git a/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/volumes/index.html b/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/volumes/index.html
index e360352d22..1c782fb756 100644
--- a/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/volumes/index.html
+++ b/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/volumes/index.html
@@ -19,8 +19,8 @@
 
 {% block content %}
   <div id="page_description">
-    <h2 class="page_heading">Manage Volumes</h2>
-		<p>View all volumes. See size, status, and mount point. Detach and destroy volumes.</p>
+    <h2 class="page_heading">{% trans "Manage Volumes" %}</h2>
+		<p>{% trans "View all volumes. See size, status, and mount point. Detach and destroy volumes." %}</p>
   </div>
 
   <table>
diff --git a/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/vpns/index.html b/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/vpns/index.html
index 5a1e729b04..77673a646a 100644
--- a/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/vpns/index.html
+++ b/django-nova-syspanel/src/django_nova_syspanel/templates/django_nova_syspanel/vpns/index.html
@@ -20,9 +20,8 @@
 
 {% block content %}
   <div id="page_description">
-    <h2 class="page_heading">Manage VPNs</h2>
-		<p>View all projects VPN status. Schedule launch, termination, and reboot.
-		Send credentials.</p>
+    <h2 class="page_heading">{% trans "Manage VPNs" %}</h2>
+		<p>{% trans "View all projects VPN status. Schedule launch, termination, and reboot. Send credentials." %}</p>
   </div>
   <div class="message">
     {% if status == "success" %}