Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultypage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultypage.pt	(revision 7669)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultypage.pt	(revision 7674)
@@ -1,11 +1,11 @@
-<div tal:condition="python: not len(context.keys())">
+<div i18n:domain="waeup.sirp" i18n:translate="" tal:condition="python: not len(context.keys())">
 There no subobjects registered yet.
 </div>
 
-<table>
+<table i18n:domain="waeup.sirp">
   <thead>
     <tr>
-      <th>Code</th>
-      <th>Title</th>
+      <th i18n:translate="code">Code</th>
+      <th i18n:translate="title">Title</th>
     </tr>
   </thead>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/staffsitelayout.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/staffsitelayout.pt	(revision 7669)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/staffsitelayout.pt	(revision 7674)
@@ -1,7 +1,4 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      i18n:domain="waeup.sirp"
-      xml:lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" i18n:domain="waeup.sirp">
   <head>
     <title>WAeUP - your way up
@@ -29,5 +26,5 @@
           <ul class="nav secondary-nav">
             <li tal:condition="not: layout/isAuthenticated">
-            <a href="#" i18n:translate="login"
+            <a href="#" i18n:translate=""
                 tal:attributes="href python: view.url(layout.site, 'login')">
                 Login
@@ -35,12 +32,18 @@
             </li>
             <li tal:condition="layout/isAuthenticated">
-            <a href="#" tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
+            <a href="#" i18n:translate=""
+               tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
                 Contact
             </a>
             </li>
             <li tal:condition="layout/isAuthenticated">
-            <a href="#" tal:attributes="href python: view.url(context, '@@logout')">Logout</a>
+            <a href="#" i18n:translate=""
+               tal:attributes="href python: view.url(context, '@@logout')">Logout</a>
             </li>
           </ul>
+          <span class="language">
+            <tal:languages
+                  tal:content="structure provider:languages" /> |
+          </span>
         </div>
       </div>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/studentsitelayout.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/studentsitelayout.pt	(revision 7669)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/studentsitelayout.pt	(revision 7674)
@@ -1,7 +1,4 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      i18n:domain="waeup.sirp"
-      xml:lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" i18n:domain="waeup.sirp">
   <head>
     <title>WAeUP - your way up
@@ -34,20 +31,28 @@
           <ul class="nav secondary-nav">
             <li tal:condition="not: layout/isAuthenticated">
-            <a href="#" tal:attributes="href python: view.url(layout.site, 'login')">
+            <a href="#" i18n:translate=""
+               tal:attributes="href python: view.url(layout.site, 'login')">
                 Login
             </a>
             </li>
             <li tal:condition="layout/isAuthenticated">
-            <a href="#" tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
+            <a href="#" i18n:translate=""
+               tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
                 Contact
             </a>
             </li>
             <li tal:condition="layout/isAuthenticated">
-            <a href="#" tal:attributes="href python: view.url(context, '@@logout')">Logout</a>
+            <a href="#" i18n:translate=""
+               tal:attributes="href python: view.url(context, '@@logout')">Logout</a>
             </li>
           </ul>
+          <span class="language">
+            <tal:languages
+                  tal:content="structure provider:languages" /> |
+          </span>
         </div>
       </div>
     </div>
+
     <div class="container">
       <ul class="student-info-bar" tal:condition="layout/isAuthenticated">
