diff --git a/.bzrignore b/.bzrignore
index 30edc19ee..cdd771722 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -5,6 +5,7 @@ django-openstack/downloads/
 django-openstack/eggs/
 django-openstack/parts/
 django-openstack/src/django_nova.egg-info
+django-openstack/src/django_openstack.egg-info
 django-nova-syspanel/src/django_nova_syspanel.egg-info
 openstack-dashboard/.dashboard-venv
 openstack-dashboard/local/dashboard_openstack.sqlite3
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 772ebf670..2b21af339 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
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load i18n %}
 
 {% block breadcrumb %}{{ block.super }}<li><a href="{% url syspanel_cloudview %}">Cloud View</a></li>{% endblock %}
 
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 3e69a6a50..6c5d16d41 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
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load i18n %}
 
 {% block content %}
 <h2 class="page_heading">NASA Nebula System Panel</h2>
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 9c36ebe41..5a7c1cd18 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
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load i18n %}
 
 {% block headerjs %}
 
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 b5dd593f6..38d495b3c 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
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load i18n %}
 
 {% block breadcrumb %}{{ block.super }}<li><a href="{% url syspanel_security %}">Security</a></li>{% 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 23e2f5286..4f0b182d4 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
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load i18n %}
 
 {% block breadcrumb %}{{ block.super }}<li><a href="{% url syspanel_security %}">Security</a></li>{% endblock %}
 
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 1c782fb75..8fc153796 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
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load i18n %}
 
 {% block headerjs %}
 
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 77673a646..a716eadaa 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
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load i18n %}
 
 {% block headerjs %}
 
diff --git a/django-openstack/src/django_openstack/templates/admin/django_openstack/nova/project/delete_project.html b/django-openstack/src/django_openstack/templates/admin/django_openstack/nova/project/delete_project.html
index 083d9b19a..0fe626dc4 100644
--- a/django-openstack/src/django_openstack/templates/admin/django_openstack/nova/project/delete_project.html
+++ b/django-openstack/src/django_openstack/templates/admin/django_openstack/nova/project/delete_project.html
@@ -1,4 +1,5 @@
 {% extends "admin/change_list.html" %}
+{% load i18n %}
 
 {% block extrastyle %}
     {{block.super}}
diff --git a/django-openstack/src/django_openstack/templates/admin/django_openstack/nova/project/delete_project_user.html b/django-openstack/src/django_openstack/templates/admin/django_openstack/nova/project/delete_project_user.html
index 9c1048a77..96bd7e518 100644
--- a/django-openstack/src/django_openstack/templates/admin/django_openstack/nova/project/delete_project_user.html
+++ b/django-openstack/src/django_openstack/templates/admin/django_openstack/nova/project/delete_project_user.html
@@ -1,4 +1,5 @@
 {% extends "admin/change_list.html" %}
+{% load i18n %}
 
 {% block extrastyle %}
     {{block.super}}
diff --git a/django-openstack/src/django_openstack/templates/admin/django_openstack/nova/project/project_user.html b/django-openstack/src/django_openstack/templates/admin/django_openstack/nova/project/project_user.html
index c9fea000a..5fa80eb31 100644
--- a/django-openstack/src/django_openstack/templates/admin/django_openstack/nova/project/project_user.html
+++ b/django-openstack/src/django_openstack/templates/admin/django_openstack/nova/project/project_user.html
@@ -1,5 +1,5 @@
 {% extends "admin/django_openstack/nova/project/base_projects.html" %}
-{% load admin_modify adminmedia %}
+{% load admin_modify adminmedia i18n %}
 
 {% block extrahead %}
 {{ block.super }}
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/credentials/expired.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/credentials/expired.html
index 806a491ce..342ac585b 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/credentials/expired.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/credentials/expired.html
@@ -1,4 +1,4 @@
-{% load django_openstack_tags %}
+{% load django_openstack_tags i18n %}
 <!DOCTYPE html>
 <html lang="en" xml:lang="en">
   <head>
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/images/_list.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/images/_list.html
index 118a6c34b..1e57d9675 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/images/_list.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/images/_list.html
@@ -1,3 +1,4 @@
+{% load i18n %}
     <h3 class="image_list_heading"> {{ heading }} </h3>
     {% if images %}
     <table id="image_launch">
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/images/base.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/images/base.html
index c6e5c7c54..68d999636 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/images/base.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/images/base.html
@@ -1,5 +1,4 @@
 {% extends "django_openstack/nova/base.html" %}
-{% load i18n %}
 {% load sidebar_tags %}
 
 {% block nav_projects %}
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/images/edit.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/images/edit.html
index 8509ad290..d90ec407a 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/images/edit.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/images/edit.html
@@ -1,4 +1,5 @@
 {% extends "django_openstack/nova/images/base.html" %}
+{% load i18n %}
 
 {% block title %} - Cloud Computing{% endblock %}
 
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/images/index.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/images/index.html
index ef7da8374..acdedbb5e 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/images/index.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/images/index.html
@@ -1,6 +1,7 @@
 {% extends "django_openstack/nova/images/base.html" %}
+{% load i18n %}
 
-{% block title %} - Launch an Image" %}{% endblock %}
+{% block title %} - {% trans "Launch an Image" %}{% endblock %}
 
 {% block headerjs %}
 <script type="text/javascript" src="/media/django_openstack/js/jquery.form.js"></script>
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/images/launch.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/images/launch.html
index 28b29ecf9..a16c19ddf 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/images/launch.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/images/launch.html
@@ -1,4 +1,5 @@
 {% extends "django_openstack/nova/images/base.html" %}
+{% load i18n %}
 
 {% block title %} - Cloud Computing{% endblock %}
 
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/_instances_list.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/_instances_list.html
index 63973ef03..4b20bd51c 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/_instances_list.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/_instances_list.html
@@ -1,3 +1,4 @@
+{% load i18n %}
       {% if instances %}
       <table style="width: 100%">
         <tr>
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/detail_list.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/detail_list.html
index d8d839b35..fe17a257c 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/detail_list.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/detail_list.html
@@ -1,4 +1,5 @@
 {% extends "django_openstack/nova/instances/base.html" %}
+{% load i18n %}
 
 {% block title %} - Cloud Computing{% endblock %}
 
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/edit.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/edit.html
index 3cf4a05d9..5ba9879d5 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/edit.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/edit.html
@@ -1,4 +1,5 @@
 {% extends "django_openstack/nova/instances/base.html" %}
+{% load i18n %}
 
 {% block title %} - Cloud Computing{% endblock %}
 
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/index.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/index.html
index b1f9c1300..32caa398e 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/index.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/index.html
@@ -1,4 +1,5 @@
 {% extends "django_openstack/nova/instances/base.html" %}
+{% load i18n %}
 
 {% block title %} - {{ project.projectname|capfirst }} Instances{% endblock %}
 {% block pageclass %}instances{% endblock %}
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/performance.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/performance.html
index 0632ca5dc..b746c803b 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/performance.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/instances/performance.html
@@ -1,4 +1,5 @@
 {% extends "django_openstack/nova/instances/base.html" %}
+{% load i18n %}
 
 {% block title %} - Cloud Computing{% endblock %}
 
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/keypairs/_list.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/keypairs/_list.html
index 8ae0a8af7..65563bf41 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/keypairs/_list.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/keypairs/_list.html
@@ -1,3 +1,4 @@
+{% load i18n %}
         {% if keypairs %}
         <table style="width: 100%">
           <tr>
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/keypairs/index.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/keypairs/index.html
index c1e5e45cb..196f61a5f 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/keypairs/index.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/keypairs/index.html
@@ -1,4 +1,5 @@
 {% extends "django_openstack/nova/keypairs/base.html" %}
+{% load i18n %}
 
 {% block title %} - Cloud Computing{% endblock %}
 
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/projects/edit_user.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/projects/edit_user.html
index 3365b3872..d572ea899 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/projects/edit_user.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/projects/edit_user.html
@@ -1,4 +1,5 @@
 {% extends "django_openstack/nova/base.html" %}
+{% load i18n %}
 {% block title %} - {{ project.projectname|capfirst }} Overview{% endblock %}
 {% block pageclass %}overview{% endblock %}
 
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/projects/index.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/projects/index.html
index 70529f494..a7a415b42 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/projects/index.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/projects/index.html
@@ -1,4 +1,5 @@
 {% extends "django_openstack/nova/base.html" %}
+{% load i18n %}
 {% block title %} - {{ project.projectname|capfirst }} Overview{% endblock %}
 {% block pageclass %}overview{% endblock %}
 
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/projects/manage.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/projects/manage.html
index f89a80f57..96df332a8 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/projects/manage.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/projects/manage.html
@@ -1,4 +1,5 @@
 {% extends "django_openstack/nova/base.html" %}
+{% load i18n %}
 {% block title %} - {{ project.projectname|capfirst }} Overview{% endblock %}
 {% block pageclass %}overview{% endblock %}
 
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/securitygroups/detail.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/securitygroups/detail.html
index 3b73544bc..f90360fac 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/securitygroups/detail.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/securitygroups/detail.html
@@ -1,4 +1,5 @@
 {% extends "django_openstack/nova/securitygroups/base.html" %}
+{% load i18n %}
 
 {% block title %} - Cloud Computing{% endblock %}
 
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/securitygroups/index.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/securitygroups/index.html
index 65087a267..9bce5cddb 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/securitygroups/index.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/securitygroups/index.html
@@ -1,4 +1,5 @@
 {% extends "django_openstack/nova/securitygroups/base.html" %}
+{% load i18n %}
 
 {% block title %} - Cloud Computing{% endblock %}
 
diff --git a/django-openstack/src/django_openstack/templates/django_openstack/nova/volumes/index.html b/django-openstack/src/django_openstack/templates/django_openstack/nova/volumes/index.html
index 34e0ebfc7..90c7b65d4 100644
--- a/django-openstack/src/django_openstack/templates/django_openstack/nova/volumes/index.html
+++ b/django-openstack/src/django_openstack/templates/django_openstack/nova/volumes/index.html
@@ -1,4 +1,5 @@
 {% extends "django_openstack/nova/volumes/base.html" %}
+{% load i18n %}
 
 {% block title %} - Cloud Computing{% endblock %}
 
diff --git a/openstack-dashboard/dashboard/templates/403.html b/openstack-dashboard/dashboard/templates/403.html
index 4e209dd27..0b959ac2f 100644
--- a/openstack-dashboard/dashboard/templates/403.html
+++ b/openstack-dashboard/dashboard/templates/403.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load i18n %}
 
 {% block title %} - Forbidden{% endblock %}
 
diff --git a/openstack-dashboard/dashboard/templates/404.html b/openstack-dashboard/dashboard/templates/404.html
index 2dce7667e..b1125d8ec 100644
--- a/openstack-dashboard/dashboard/templates/404.html
+++ b/openstack-dashboard/dashboard/templates/404.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load i18n %}
 
 {% block title %} - {% trans "Page Not Found" %}{% endblock %}
 
diff --git a/openstack-dashboard/dashboard/templates/500.html b/openstack-dashboard/dashboard/templates/500.html
index 4e6ce20f9..67eae6aff 100644
--- a/openstack-dashboard/dashboard/templates/500.html
+++ b/openstack-dashboard/dashboard/templates/500.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load i18n %}
 
 {% block title %} - Internal Server Error{% endblock %}
 
diff --git a/openstack-dashboard/dashboard/templates/admin/index.html b/openstack-dashboard/dashboard/templates/admin/index.html
index 2781d091c..8ea7f4e17 100644
--- a/openstack-dashboard/dashboard/templates/admin/index.html
+++ b/openstack-dashboard/dashboard/templates/admin/index.html
@@ -1,6 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n %}
-{% load django_openstack_tags %}
+{% load django_openstack_tags i18n %}
 
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% load adminmedia %}{% admin_media_prefix %}css/dashboard.css" />{% endblock %}
 
diff --git a/openstack-dashboard/dashboard/templates/base-root.html b/openstack-dashboard/dashboard/templates/base-root.html
index fd1726063..db3393b92 100644
--- a/openstack-dashboard/dashboard/templates/base-root.html
+++ b/openstack-dashboard/dashboard/templates/base-root.html
@@ -1,5 +1,4 @@
-{% load django_openstack_tags %}
-{% load i18n %}
+{% load django_openstack_tags i18n %}
 <!DOCTYPE html>
 <html lang="en" xml:lang="en">
   <head>
diff --git a/openstack-dashboard/dashboard/templates/index.html b/openstack-dashboard/dashboard/templates/index.html
index df6b43861..da196a111 100644
--- a/openstack-dashboard/dashboard/templates/index.html
+++ b/openstack-dashboard/dashboard/templates/index.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load django_openstack_tags %}
+{% load django_openstack_tags i18n %}
 
 {% block headercss %}
 {% endblock %}
@@ -34,6 +34,15 @@
   </div>
 
   <div class="home_block">
+    <form action="/i18n/setlang/" method="post"> {% csrf_token %}
+      <select name="language">
+      {% get_language_info_list for LANGUAGES as languages %}
+      {% for language in languages %}
+        <option value="{{ language.code }}">{{ language.name_local }} ({{ language.code }})</option>
+      {% endfor %}
+      </select>
+      <input type="submit" value="Go" />
+    </form>
     <h3>OpenStack Resources</h3>
     <ul>
       <li><a href="http://openstack.org" target="_blank">OpenStack.org</a></li>
diff --git a/openstack-dashboard/dashboard/templates/permission_denied.html b/openstack-dashboard/dashboard/templates/permission_denied.html
index 10270617d..f64061f72 100644
--- a/openstack-dashboard/dashboard/templates/permission_denied.html
+++ b/openstack-dashboard/dashboard/templates/permission_denied.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load i18n %}
 
 {% block title %} - {% trans "Permission Denied"%}{% endblock %}
 
diff --git a/openstack-dashboard/dashboard/templates/unavailable.html b/openstack-dashboard/dashboard/templates/unavailable.html
index 1a34345ef..f90dc20b7 100644
--- a/openstack-dashboard/dashboard/templates/unavailable.html
+++ b/openstack-dashboard/dashboard/templates/unavailable.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load i18n %}
 
 {% block title %} - {% trans "Service Unavailable"%}{% endblock %}
 {% block pageclass %}unavailable{% endblock %}
diff --git a/openstack-dashboard/dashboard/urls.py b/openstack-dashboard/dashboard/urls.py
index f223adaeb..fffb8342b 100644
--- a/openstack-dashboard/dashboard/urls.py
+++ b/openstack-dashboard/dashboard/urls.py
@@ -31,6 +31,7 @@ admin.autodiscover()
 
 urlpatterns = patterns('',
     url(r'^$', 'dashboard.views.index', name='index'),
+    url(r'^i18n/', include('django.conf.urls.i18n')),
     url(r'^accounts/register/$',
         'registration.views.register',
         {'form_class': reg_forms.RegistrationFormUniqueEmail},