diff --git a/cloud_browser/templates/cloud_browser/_breadcrumbs.html b/cloud_browser/templates/cloud_browser/_breadcrumbs.html
index febcd7c..50636e0 100644
--- a/cloud_browser/templates/cloud_browser/_breadcrumbs.html
+++ b/cloud_browser/templates/cloud_browser/_breadcrumbs.html
@@ -4,11 +4,13 @@
 ###############################################################################
 {% endcomment %}
 
+{% load i18n %}
+
 {% block cloud_browser_breadcrumbs %}
   ( <a class="cloud-browser-breadcrumb-link"
-       href="{% url "cloud_browser_browser" '' %}">Home</a> )
+       href="{% url 'cloud_browser_browser' '' %}">{% trans 'Home' %}</a> )
   {% for crumb_path, crumb in breadcrumbs %}
     &raquo; <a class="cloud-browser-breadcrumb-link"
-     href="{% url "cloud_browser_browser" crumb_path %}">{{ crumb }}</a>
+     href="{% url 'cloud_browser_browser' crumb_path %}">{{ crumb }}</a>
   {% endfor %}
 {% endblock %}
diff --git a/cloud_browser/templates/cloud_browser/_browser.html b/cloud_browser/templates/cloud_browser/_browser.html
index 60b3b94..529edb1 100644
--- a/cloud_browser/templates/cloud_browser/_browser.html
+++ b/cloud_browser/templates/cloud_browser/_browser.html
@@ -4,19 +4,20 @@
 ###############################################################################
 {% endcomment %}
 
+{% load i18n %}
 {% load cloud_browser_extras %}
 
 {% block cloud_browser_content %}
 <div id="cloud-browser-all" class="cloud-browser-defaults">
 <div id="cloud-browser-containers">
-<h2>Containers</h2>
+<h2>{% trans 'Containers' %}</h2>
 <ul>
 {% for cont in containers %}
   {% if cont == container %}
   <li class="cb-selected">{{ cont.name|truncatechars:22 }}</li>
   {% else %}
   <li>
-    <a href="{% url "cloud_browser_browser" cont.name|urlencode %}"
+    <a href="{% url 'cloud_browser_browser' cont.name|urlencode %}"
        title="{{ cont.name }}">{{ cont.name|truncatechars:22 }}</a>
   </li>
   {% endif %}
@@ -25,17 +26,17 @@ <h2>Containers</h2>
 </div>
 
 <div id="cloud-browser-objects">
-<h2>Objects</h2>
+<h2>{% trans 'Objects' %}</h2>
 {% if objects %}
 <table id="cloud-browser-objects-table">
   <thead>
     <tr>
       <th style="width: 16px;">&nbsp;</th>
-      <th>Name</th>
-      <th>Content Type</th>
-      <th>Encoding</th>
-      <th>Size (Bytes)</th>
-      <th>Date</th>
+      <th>{% trans 'Name' %}</th>
+      <th>{% trans 'Content Type' %}</th>
+      <th>{% trans 'Encoding' %}</th>
+      <th>{% trans 'Size (Bytes)' %}</th>
+      <th>{% trans 'Date' %}</th>
     </tr>
   </thead>
   <tbody>
@@ -47,10 +48,10 @@ <h2>Objects</h2>
             <td><img src="{% cloud_browser_media_url 'img/tango/16x16/mimetypes/text-x-generic.png' %}" /></td>
         {% endif %}
         {% if obj.is_file %}
-        <td><a href="{% url "cloud_browser_document" obj.path|urlencode %}"
+        <td><a href="{% url 'cloud_browser_document' obj.path|urlencode %}"
             >{{ obj.basename }}</a></td>
         {% else %}
-        <td><a href="{% url "cloud_browser_browser" obj.path|urlencode %}"
+        <td><a href="{% url 'cloud_browser_browser' obj.path|urlencode %}"
                class="cloud-browser-document-link"
             >{{ obj.basename }}</a></td>
         {% endif %}
@@ -82,13 +83,13 @@ <h2>Objects</h2>
       <td colspan="6">
         {% if marker_part %}
         <form id="cloud-browser-next" class="cloud-browser-form"
-          action="{% url "cloud_browser_browser" path|urlencode %}" method="post">
+          action="{% url 'cloud_browser_browser' path|urlencode %}" method="post">
           {% csrf_token %}
-          Next
+          {% trans 'Next' %}
           <input name="limit" type="text" size="5"
               onkeypress="CloudBrowser.submitOnEnter(event, 'cloud-browser-next');"
               value="{{ limit }}"/>
-          after
+          {% trans 'after' %}
           <input name="marker_part" type="text"
               size="{% widthratio marker_part|length 40 40 %}"
               onkeypress="CloudBrowser.submitOnEnter(event, 'cloud-browser-next');"
@@ -107,12 +108,11 @@ <h2>Objects</h2>
 {% else %}
     {% if container %}
         <div class="cloud-browser-empty" colspan="6">
-            No objects found in &ldquo;{{ path }}.&rdquo;
+            {% blocktrans %}No objects found in &ldquo;{{ path }}.&rdquo;{% endblocktrans %}
         </div>
     {% else %}
         <div class="cloud-browser-empty" colspan="6">
-            No container selected. Please click on a container to list
-            object contents.
+            {% trans 'No container selected. Please click on a container to list object contents.' %}
         </div>
     {% endif %}
 {% endif %}
diff --git a/cloud_browser/templates/cloud_browser/admin/base.html b/cloud_browser/templates/cloud_browser/admin/base.html
index 3265639..97a530e 100644
--- a/cloud_browser/templates/cloud_browser/admin/base.html
+++ b/cloud_browser/templates/cloud_browser/admin/base.html
@@ -6,6 +6,8 @@
 ###############################################################################
 {% endcomment %}
 
+{% load i18n %}
+
 {% block extrastyle %}
   {{ block.super }}
   {% block cloud_browser_template_head %}{% endblock %}
@@ -13,8 +15,8 @@
 
 {% block breadcrumbs %}
   <div class="breadcrumbs">
-    <a href="/">Home</a> &raquo;
-    <a href="{% url "cloud_browser_index" %}">Cloud Browser</a> &raquo;
+    <a href="/">{% trans 'Home' %}</a> &raquo;
+    <a href="{% url 'cloud_browser_index' %}">{% trans 'Cloud Browser' %}</a> &raquo;
     {% block cloud_browser_breadcrumbs %}
       {% include "cloud_browser/_breadcrumbs.html" %}
     {% endblock %}
diff --git a/cloud_browser/templates/cloud_browser/admin/browser.html b/cloud_browser/templates/cloud_browser/admin/browser.html
index 617eabe..c0fa2d5 100644
--- a/cloud_browser/templates/cloud_browser/admin/browser.html
+++ b/cloud_browser/templates/cloud_browser/admin/browser.html
@@ -7,6 +7,7 @@
 # Admin version (for integration in Django admin area).
 ###############################################################################
 {% endcomment %}
+
 {% load static %}
 {% load cloud_browser_extras %}
 
@@ -20,9 +21,9 @@
 {% block cloud_browser_template_head %}
 {# Use jQuery from Admin #}
 <script type="text/javascript" 
-        src={% static "admin/js/jquery.js" %}></script>
+        src="{% static 'admin/js/jquery.js' %}"></script>
 <script type="text/javascript" 
-        src={% static "admin/js/jquery.init.js" %}></script>
+        src="{% static 'admin/js/jquery.init.js' %}"></script>
 
 <link rel="stylesheet" type="text/css"
     href="{% cloud_browser_media_url 'css/cloud-browser.css' %}" />
diff --git a/cloud_browser/templates/cloud_browser/browser.html b/cloud_browser/templates/cloud_browser/browser.html
index 4d3ea53..8fd2e48 100644
--- a/cloud_browser/templates/cloud_browser/browser.html
+++ b/cloud_browser/templates/cloud_browser/browser.html
@@ -6,10 +6,11 @@
 ###############################################################################
 {% endcomment %}
 
+{% load i18n %}
 {% load cloud_browser_extras %}
 
 {% block title %}
-Cloud Browser - {{ path }}
+{% blocktrans %}Cloud Browser - {{ path }}{% endblocktrans %}
 {% endblock %}
 
 {% block cloud_browser_breadcrumbs %}
diff --git a/cloud_browser/templatetags/cloud_browser_extras.py b/cloud_browser/templatetags/cloud_browser_extras.py
index ba49c57..b8e45d0 100644
--- a/cloud_browser/templatetags/cloud_browser_extras.py
+++ b/cloud_browser/templatetags/cloud_browser_extras.py
@@ -53,7 +53,7 @@ def cloud_browser_media_url(_, token):
     For example::
 
         <link rel="stylesheet" type="text/css"
-            href="{% cloud_browser_media_url "css/cloud-browser.css" %}" />
+            href="{% cloud_browser_media_url 'css/cloud-browser.css' %}" />
     """
     bits = token.split_contents()
     if len(bits) != 2: