Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt	(revision 7707)
@@ -184,5 +184,5 @@
 We can edit user bob:
 
-  >>> browser.getControl("manage", index=0).click()
+  >>> browser.getControl("Manage", index=0).click()
   >>> browser.getControl("Save", index=0).click()
   >>> browser.getControl("Cancel", index=0).click()
@@ -218,5 +218,5 @@
 
   >>> browser.open('http://localhost/myuniversity/users')
-  >>> browser.getControl("delete").click()
+  >>> browser.getControl("Remove").click()
   >>> 'User account bob successfully deleted' in browser.contents
   True
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py	(revision 7707)
@@ -152,4 +152,5 @@
     label = _(u'Login')
     camefrom = None
+    login_button = label
 
     def update(self, SUBMIT=None, camefrom=None):
@@ -384,4 +385,6 @@
     grok.name('index')
     label = _('Portal Users')
+    manage_button = _(u'Manage')
+    delete_button = _(u'Remove')
 
     def update(self, userid=None, adduser=None, manage=None, delete=None):
@@ -587,4 +590,5 @@
     label = _(u"Search Academic Section")
     pnav = 1
+    search_button = _(u'Search')
 
     def update(self, *args, **kw):
@@ -648,5 +652,5 @@
         return view.widgets['frontpage']()
 
-    @action('Save', style='primary')
+    @action(_('Save'), style='primary')
     def save(self, **data):
         self.applyData(self.context, **data)
@@ -1371,5 +1375,5 @@
         return
 
-    @action('Save', style='primary')
+    @action(_('Save'), style='primary')
     def save(self, **data):
         self.applyData(self.context, **data)
@@ -1623,5 +1627,5 @@
         self.redirect(self.url(self.context, u'@@manage')+'?tab2')
 
-    @action('Cancel', validator=NullValidator)
+    @action(_('Cancel'), validator=NullValidator)
     def cancel(self, **data):
         self.redirect(self.url(self.context))
@@ -1765,5 +1769,5 @@
         return super(CertificateManageFormPage, self).update()
 
-    @action('Save', style='primary')
+    @action(_('Save'), style='primary')
     def save(self, **data):
         self.applyData(self.context, **data)
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentpage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentpage.pt	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentpage.pt	(revision 7707)
@@ -1,3 +1,3 @@
-<ul  i18n:domain="waeup.sirp" class="tabs" data-tabs="tabs">
+<ul i18n:domain="waeup.sirp" class="tabs" data-tabs="tabs">
   <li class="active"><a href="#tab-1">
    <span i18n:translate="">Courses</span></a>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultymanagepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultymanagepage.pt	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultymanagepage.pt	(revision 7707)
@@ -1,17 +1,18 @@
-<form action="." tal:attributes="action request/URL" method="POST" enctype="multipart/form-data">
+<form action="." tal:attributes="action request/URL"
+  i18n:domain="waeup.sirp" method="POST" enctype="multipart/form-data">
   <ul class="tabs" data-tabs="tabs">
     <li tal:attributes="class view/tab1">
     <a href="#tab-1">
-      <span>Settings
+      <span i18n:translate="">Settings
       </span></a>
     </li>
     <li tal:attributes="class view/tab2">
     <a href="#tab-2">
-      <span tal:content="view/subunits">Contents
+      <span tal:content="view/subunits">CONTENTS
       </span> </a>
     </li>
     <li tal:attributes="class view/tab3">
     <a href="#tab-3">
-      <span i18n:translate="local_roles" >Local Roles
+      <span i18n:translate="">Local Roles
       </span></a>
     </li>
@@ -26,5 +27,5 @@
                 <span tal:condition="widget/required">*
                 </span>
-                <span tal:content="widget/label">label
+                <span tal:content="widget/label">LABEL
                 </span>:
               </td>
@@ -34,9 +35,9 @@
                 </span>
                 <tal:error tal:condition="widget/error">
-                  <span tal:replace="structure widget/error">error
+                  <span tal:replace="structure widget/error">ERROR
                   </span>
                 </tal:error>
                 <tal:hint tal:condition="widget/hint">
-                  <span tal:content="structure widget/hint">hint
+                  <span tal:content="structure widget/hint">HINT
                   </span>
                 </tal:hint> </td>
@@ -53,5 +54,5 @@
     </div>
     <div id="tab-2" tal:attributes="class view/tab2">
-      <h3 tal:content="view/subunits">Departments</h3>
+      <h3 tal:content="view/subunits">DEPARTMENTS</h3>
       <table>
         <thead>
@@ -59,7 +60,7 @@
             <th>&nbsp;
             </th>
-            <th>Code
+            <th i18n:translate="">Code
             </th>
-            <th>Title
+            <th i18n:translate="">Title
             </th>
           </tr>
@@ -89,9 +90,9 @@
             <th>&nbsp;
             </th>
-            <th>User Id
+            <th i18n:translate="">User Id
             </th>
-            <th>Name
+            <th i18n:translate="">Name
             </th>
-            <th>Local Role
+            <th i18n:translate="">Local Role
             </th>
           </tr>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultypage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultypage.pt	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultypage.pt	(revision 7707)
@@ -6,6 +6,6 @@
   <thead>
     <tr>
-      <th i18n:translate="code">Code</th>
-      <th i18n:translate="title">Title</th>
+      <th i18n:translate="">Code</th>
+      <th i18n:translate="">Title</th>
     </tr>
   </thead>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/loginpage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/loginpage.pt	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/loginpage.pt	(revision 7707)
@@ -1,7 +1,7 @@
-<form method="post">
+<form i18n:domain="waeup.sirp" method="post">
   <table id="login" class="form-table" summary="Table for entering login information">
     <tbody>
       <tr>
-        <td class="fieldname">
+        <td i18n:translate="" class="fieldname">
           User Name or Id:
         </td>
@@ -11,5 +11,5 @@
       </tr>
       <tr>
-        <td class="fieldname">
+        <td i18n:translate="" class="fieldname">
           Password:
         </td>
@@ -22,5 +22,5 @@
         <td>&nbsp;</td>
         <td>
-          <font color="red"> Notice: User names, Ids and passwords are case sensitive.</font>
+          <font  i18n:translate="" color="red"> Notice: User names, Ids and passwords are case sensitive.</font>
         </td>
       </tr>
@@ -28,20 +28,20 @@
   </table>
   <input type="hidden" name="camefrom"   tal:attributes="value view/camefrom" />
-  <input class="btn primary" type="submit" name="SUBMIT" value="Login" />
+  <input class="btn primary" type="submit" name="SUBMIT"
+    tal:attributes="value view/login_button" />
 
 
   <br /><br /><br />
 
-  <p>Don't forget to logout or exit your browser when you're done.
-  If you are having trouble logging in, make sure to enable  cookies in your web browser.
+  <p  i18n:translate="login_trouble1">Don't forget to logout or exit your browser when you're done.
+    If you are having trouble logging in, make sure to enable  cookies in your web browser.
   </p>
-  <p>You don't have an account because you are a fresh student, or your student record has just been created?
-  Acquire a Password Access Code (PWD) and inititialize your student account
-  <strong><a href  ="setpassword"> here</a></strong>.
-  </p> <p> Or simply forgot your student id or password? Then request a new password
-  <strong><a href  ="changepw"> here</a></strong>.
+  <p i18n:translate="login_trouble2">
+    You don't have an account because you are a fresh student, or your student record has just been created?
+    Acquire a Password Access Code (PWD) and inititialize your student account
+    <strong><a href  ="setpassword"> here</a></strong>.
   </p>
-
-
-
+  <p i18n:translate="login_trouble3"> Or simply forgot your student id or password? Then request a new password
+    <strong><a href="changepw"> here</a></strong>.
+  </p>
 </form>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/myrolespage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/myrolespage.pt	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/myrolespage.pt	(revision 7707)
@@ -1,4 +1,5 @@
-<h3 i18n:translate="my_portal_roles">My Portal Roles:</h3>
-<table class="form-table">
+<h3 i18n:domain="waeup.sirp"
+    i18n:translate="">My Portal Roles:</h3>
+<table i18n:domain="waeup.sirp" class="form-table">
 <tr tal:repeat="role view/getSiteRoles">
     <td>
@@ -8,8 +9,10 @@
 </table>
 
-<h3 i18n:translate="my_local_roles">My Local Roles:</h3>
+<h3 i18n:domain="waeup.sirp"
+    i18n:translate="">My Local Roles:</h3>
 <table class="form-table">
   <tr tal:repeat="role view/getLocalRoles">
-    <td valign="top" ><span tal:content="role" >ROLE</span>:</td>
+    <td valign="top" >
+      <span tal:content="role">ROLE</span>:</td>
     <td>
       <span tal:repeat="object python:view.getLocalRoles[role]">
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/notfound.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/notfound.pt	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/notfound.pt	(revision 7707)
@@ -1,14 +1,15 @@
-<h2>
-  The page you are trying to access is not available
+<h2 i18n:domain="waeup.sirp" i18n:translate="">
+  The page you are trying to access is not available.
 </h2>
 
-<div><b>Please note the following:</b></div>
-<div>
+<div i18n:domain="waeup.sirp">
+  <b i18n:translate="">Please note the following:</b></div>
+<div i18n:domain="waeup.sirp">
   <ol class="list">
-    <li>
-      You might have misspelled the URL
+    <li i18n:translate="">
+      You might have misspelled the URL.
     </li>
-    <li>
-        You might be trying to access a non-existing page
+    <li i18n:translate="">
+        You might be trying to access a non-existing page.
     </li>
   </ol>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/searchpage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/searchpage.pt	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/searchpage.pt	(revision 7707)
@@ -2,15 +2,16 @@
   <input type="text" name="query"
 	 tal:attributes="value view/query" />
-    <input class="btn primary" type="submit" name="SUBMIT" value="Search" />
+    <input class="btn primary" type="submit" name="SUBMIT"
+      tal:attributes="value view/search_button"/>
 </form>
 <br />
-<span tal:condition="view/hitlist">
-    <h3>Search Results</h3>
+<span  i18n:domain="waeup.sirp" tal:condition="view/hitlist">
+    <h3 i18n:translate="">Search Results</h3>
     <table class="display dataTable">
         <thead>
             <tr>
-                <th>Code</th>
-                <th>Title</th>
-                <th>Type</th>
+                <th i18n:translate="">Code</th>
+                <th i18n:translate="">Title</th>
+                <th i18n:translate="">Type</th>
             </tr>
         </thead>
@@ -19,11 +20,11 @@
             <td>
                 <a href="" tal:attributes="href item/url"
-                           tal:content="item/code">Code</a>
+                           tal:content="item/code">CODE</a>
             </td>
             <td tal:content="item/title">
-                Title
+                TITLE
             </td>
             <td tal:content="item/type">
-                Type
+                TTYPE
             </td>
             </tr>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/showstudentspage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/showstudentspage.pt	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/showstudentspage.pt	(revision 7707)
@@ -1,10 +1,11 @@
-<table class="display dataTable">
+<table i18n:domain="waeup.sirp" class="display dataTable">
   <thead>
 	<tr>
-	  <th>Student Id</th><th>Fullname</th>
-    <th>Status</th>
-    <th>Certificate</th>
-    <th>Current Session</th>
-    <th>Current Level</th>
+	  <th i18n:translate="">Student Id</th>
+    <th i18n:translate="">Fullname</th>
+    <th i18n:translate="">Status</th>
+    <th i18n:translate="">Certificate</th>
+    <th i18n:translate="">Current Session</th>
+    <th i18n:translate="">Current Level</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 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/staffsitelayout.pt	(revision 7707)
@@ -20,5 +20,5 @@
           <a class="brand" href="#"
               tal:attributes="href python: view.url(layout.site)"
-              tal:content="layout/getAppAcronym">Acronym</a>
+              tal:content="layout/getAppAcronym">ACRONYM</a>
           <ul class="nav">
             <tal:primary_nav content="structure provider:primary_nav" />
@@ -34,10 +34,12 @@
             <a href="#" i18n:translate=""
                tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
-                Contact
+               Contact
             </a>
             </li>
             <li tal:condition="layout/isAuthenticated">
             <a href="#" i18n:translate=""
-               tal:attributes="href python: view.url(context, '@@logout')">Logout</a>
+               tal:attributes="href python: view.url(context, '@@logout')">
+               Logout
+            </a>
             </li>
           </ul>
@@ -54,10 +56,13 @@
             tal:condition="python: layout.isAuthenticated()"
             tal:content="structure provider:breadcrumbs" />
-      <span tal:condition="layout/getStudentName" class="wfstatus">
-            Student Id:
-          <span tal:replace="python:context.getStudent().student_id">Id
+      <span
+        tal:condition="layout/getStudentName" class="wfstatus">
+          <span i18n:translate="">Student Id:</span>
+          <span tal:replace="python:context.getStudent().student_id">
+            ID
           </span>&nbsp;&nbsp;
-          State:
-          <span tal:replace="python:context.getStudent().translated_state">State
+          <span i18n:translate="">State:</span>
+          <span tal:replace="python:context.getStudent().translated_state">
+            STATE
           </span>
       </span>
@@ -68,5 +73,5 @@
         <div class="well">
           <div tal:condition="layout/getStudentName">
-            <h5 tal:content="layout/getStudentName">Student name</h5>
+            <h5 tal:content="layout/getStudentName">STUDENTNAME</h5>
             <ul>
               <tal:left content="structure provider:left_studentmanage" />
@@ -74,5 +79,5 @@
           </div>
           <div tal:condition="layout/isAuthenticated">
-            <h5 tal:content="layout/getUserTitle">Username</h5>
+            <h5 tal:content="layout/getUserTitle">USERNAME</h5>
             <ul>
               <tal:left content="structure provider:left" />
@@ -94,16 +99,18 @@
           tal:define="status view/status|nothing"
           tal:condition="status">
-          Form Status:
+          <span i18n:translate="">
+            Form Status:
+          </span>
           <span tal:content="view/status">
-            Form status summary
+            FORM STATUS SUMMARY
           </span>
         </div>
         <h1 tal:condition="view/label|nothing"
-            tal:content="view/label">Label</h1>
+            tal:content="view/label">LABEL</h1>
         <div tal:content="structure view/content"> THE CONTENT
         </div>
         <div class="footer">
-          <p class="pull-right"><a href="#">Back to top</a></p>
-          <p>
+          <p class="pull-right"><a i18n:translate="" href="#">Back to top</a></p>
+          <p i18n:translate="">
             Student Information and Registration Portal<br />
             Copyright &copy; WAeUP Group, 2008-2012
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/studentsitelayout.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/studentsitelayout.pt	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/studentsitelayout.pt	(revision 7707)
@@ -24,5 +24,5 @@
           <a class="brand" href="#"
               tal:attributes="href python: view.url(layout.site)"
-              tal:content="layout/getAppAcronym">Acronym</a>
+              tal:content="layout/getAppAcronym">ACRONYM</a>
           <ul class="nav">
               <tal:primary_nav content="structure provider:primary_nav" />
@@ -44,5 +44,7 @@
             <li tal:condition="layout/isAuthenticated">
             <a href="#" i18n:translate=""
-               tal:attributes="href python: view.url(context, '@@logout')">Logout</a>
+               tal:attributes="href python: view.url(context, '@@logout')">
+               Logout
+            </a>
             </li>
           </ul>
@@ -61,8 +63,10 @@
               tal:content="structure provider:breadcrumbs" />
         <span tal:condition="layout/getStudentName" class="wfstatus">
-            <span tal:replace="python:context.getStudent().student_id">Id
+            <span tal:replace="python:context.getStudent().student_id">
+              Id
             </span>
             |
-            <span tal:replace="python:context.getStudent().translated_state">State
+            <span tal:replace="python:context.getStudent().translated_state">
+              State
             </span>
         </span>
@@ -80,15 +84,19 @@
           tal:define="status view/status|nothing"
           tal:condition="status">
-          Form Status:
+          <span i18n:translate="">
+            Form Status:
+          </span>
           <span tal:content="view/status">
-            Form status summary
+            FORM STATUS SUMMARY
           </span>
         </div>
         <h1 tal:condition="view/label|nothing"
             tal:content="view/label">Label</h1>
-        <div tal:content="structure view/content"> THE CONTENT
+        <div tal:content="structure view/content">
+          THE CONTENT
         </div>
         <div class="footer">
-          <p>
+          <p class="pull-right"><a i18n:translate="" href="#">Back to top</a></p>
+          <p i18n:translate="">
             Student Information and Registration Portal<br />
             Copyright &copy; WAeUP Group, 2008-2012
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/subobjectlist.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/subobjectlist.pt	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/subobjectlist.pt	(revision 7707)
@@ -2,6 +2,5 @@
   <thead>
     <tr tal:repeat="viewlet viewletmanager/viewlets">
-      <th tal:replace="structure viewlet/render">
-	viewlet
+      <th tal:replace="structure viewlet/render">viewlet
       </th>
     </tr>
@@ -10,8 +9,6 @@
     <tr tal:repeat="row viewletmanager/rows">
       <td tal:repeat="viewlet row">
-	<div tal:replace="structure viewlet/render">
-	  viewlet
-	</div>
-      </td>
+        <div tal:replace="structure viewlet/render">viewlet
+        </div></td>
     </tr>
   </tbody>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/usereditformpage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/usereditformpage.pt	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/usereditformpage.pt	(revision 7707)
@@ -1,4 +1,4 @@
 <form action="." tal:attributes="action request/URL" method="post"
-      enctype="multipart/form-data">
+      i18n:domain="waeup.sirp" enctype="multipart/form-data">
 
   <table class="form-table">
@@ -8,5 +8,5 @@
           <td class="fieldname">
             <span tal:condition="widget/required">*</span>
-            <span tal:content="widget/label">label</span>:
+            <span tal:content="widget/label">LABEL</span>:
           </td>
           <td>
@@ -15,8 +15,8 @@
             </span>
             <tal:error tal:condition="widget/error">
-              <span tal:replace="structure widget/error">error</span>
+              <span tal:replace="structure widget/error">ERROR</span>
             </tal:error>
             <tal:hint tal:condition="widget/hint">
-              <span tal:content="structure widget/hint">hint</span>
+              <span tal:content="structure widget/hint">HINT</span>
             </tal:hint>
           </td>
@@ -24,5 +24,5 @@
       </tal:block>
       <tr>
-        <td class="fieldname">Password:</td>
+        <td i18n:translate="" class="fieldname">Password:</td>
         <td>
           <input name="password" type="password"  />
@@ -30,5 +30,5 @@
       </tr>
       <tr>
-        <td class="fieldname">Retype password:</td>
+        <td i18n:translate="" class="fieldname">Retype password:</td>
         <td>
           <input name="control_password" type="password" />
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/userscontainerpage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/userscontainerpage.pt	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/userscontainerpage.pt	(revision 7707)
@@ -1,9 +1,9 @@
-<table>
+<table i18n:domain="waeup.sirp">
   <thead>
     <tr>
-      <th>User ID</th>
-      <th>Name</th>
-      <th>Portal Roles</th>
-      <th>Local Roles</th>
+      <th i18n:translate="">User ID</th>
+      <th i18n:translate="">Name</th>
+      <th i18n:translate="">Portal Roles</th>
+      <th i18n:translate="">Local Roles</th>
       <th></th>
     </tr>
@@ -11,6 +11,6 @@
   <tbody>
     <tr tal:repeat="account context/values">
-      <td tal:content="account/name">User name</td>
-      <td tal:content="account/title">Title</td>
+      <td tal:content="account/name">USERNAME</td>
+      <td tal:content="account/title">TITLE</td>
       <td tal:content="structure python:view.getSiteRoles(account)">SITE ROLES</td>
       <td tal:content="structure python:view.getLocalRoles(account)">LOCAL ROLES</td>
@@ -19,6 +19,8 @@
           <input type="hidden" name="userid"
            tal:attributes="value account/name"/>
-            <input class="btn" type="submit" name="manage" value="manage" />
-            <input class="btn" type="submit" name="delete" value="delete" />
+            <input class="btn" type="submit" name="manage"
+              tal:attributes="value view/manage_button" />
+            <input class="btn" type="submit" name="delete"
+              tal:attributes="value view/delete_button" />
         </form>
       </td>
Index: main/waeup.sirp/trunk/src/waeup/sirp/locales/de/LC_MESSAGES/waeup.sirp.po
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/locales/de/LC_MESSAGES/waeup.sirp.po	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/locales/de/LC_MESSAGES/waeup.sirp.po	(revision 7707)
@@ -15,6 +15,6 @@
 msgstr ""
 "Project-Id-Version: WAeUP.SIRP\n"
-"POT-Creation-Date: Sun Feb 26 17:19:06 2012\n"
-"PO-Revision-Date: 2012-02-26 17:19+0100\n"
+"POT-Creation-Date: Mon Feb 27 09:31:07 2012\n"
+"PO-Revision-Date: 2012-02-27 09:32+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
 "Language-Team: WAeUP Germany <henrik@waeup.org>\n"
@@ -194,5 +194,5 @@
 
 #: waeup/sirp/browser/breadcrumbs.py:123
-#: waeup/sirp/browser/pages.py:308
+#: waeup/sirp/browser/pages.py:309
 msgid "Administration"
 msgstr "Verwaltung"
@@ -205,5 +205,5 @@
 
 #: waeup/sirp/browser/breadcrumbs.py:148
-#: waeup/sirp/browser/pages.py:385
+#: waeup/sirp/browser/pages.py:386
 #: waeup/sirp/browser/viewlets.py:365
 #: waeup/sirp/browser/viewlets.py:666
@@ -212,6 +212,6 @@
 
 #: waeup/sirp/browser/breadcrumbs.py:155
-#: waeup/sirp/browser/pages.py:744
-#: waeup/sirp/browser/pages.py:1136
+#: waeup/sirp/browser/pages.py:748
+#: waeup/sirp/browser/pages.py:1140
 #: waeup/sirp/browser/viewlets.py:383
 #: waeup/sirp/browser/viewlets.py:675
@@ -223,7 +223,7 @@
 msgstr "Startseite"
 
-#: waeup/sirp/browser/pages.py:1012
+#: waeup/sirp/browser/pages.py:1016
 msgid "Edit headers or replace imported file!"
-msgstr "Bearbeiten Sie die Spaltenüberschrift oder tauschen Sie die  Importdatei aus."
+msgstr "Bearbeiten Sie die Spaltenüberschrift oder tauschen Sie die Importdatei aus."
 
 #. Default: ""
@@ -232,31 +232,31 @@
 msgstr "Lokale Rolle erfolgreich entfernt: ${a}"
 
-#: waeup/sirp/browser/pages.py:1059
+#: waeup/sirp/browser/pages.py:1063
 msgid "View processing log"
 msgstr "Betrache Logdatei"
 
-#: waeup/sirp/browser/pages.py:1060
+#: waeup/sirp/browser/pages.py:1064
 msgid "Back to data center"
 msgstr "Zurück zum Datenzentrum"
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1104
+#: waeup/sirp/browser/pages.py:1108
 msgid "Processing of ${a} rows failed."
 msgstr "Bearbeitung von ${a} Zeilen fehlgeschlagen."
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1106
+#: waeup/sirp/browser/pages.py:1110
 msgid "Successfully processed ${a} rows."
 msgstr "${a} Zeilen erfolgreich verarbeitet."
 
-#: waeup/sirp/browser/pages.py:1114
+#: waeup/sirp/browser/pages.py:1118
 msgid "Show logfiles"
 msgstr "Zeige Logdateien"
 
-#: waeup/sirp/browser/pages.py:1116
+#: waeup/sirp/browser/pages.py:1120
 msgid "Back to Data Center"
 msgstr "Zurück zum Datenzentrum"
 
-#: waeup/sirp/browser/pages.py:1117
+#: waeup/sirp/browser/pages.py:1121
 msgid "Show"
 msgstr "Zeige"
@@ -266,75 +266,75 @@
 msgstr "Nichts ausgewählt."
 
-#: waeup/sirp/browser/pages.py:1158
+#: waeup/sirp/browser/pages.py:1162
 msgid "Edit data center settings"
 msgstr "Bearbeite Einstellungen des Datenzentrums"
 
-#: waeup/sirp/browser/pages.py:1178
+#: waeup/sirp/browser/pages.py:1182
 msgid "File already existed (not copied):"
 msgstr "Datei existiert (nicht kopiert):"
 
-#: waeup/sirp/browser/pages.py:1180
+#: waeup/sirp/browser/pages.py:1184
 msgid "Given storage path cannot be used."
 msgstr "Der Datenpfad kann nicht verwendet werden."
 
-#: waeup/sirp/browser/pages.py:1181
+#: waeup/sirp/browser/pages.py:1185
 msgid "Error:"
 msgstr "Fehler:"
 
-#: waeup/sirp/browser/pages.py:1184
+#: waeup/sirp/browser/pages.py:1188
 msgid "New storage path succefully set."
 msgstr "Neuen Datenpfad erfolgreich gesetzt."
 
-#: waeup/sirp/browser/pages.py:1244
+#: waeup/sirp/browser/pages.py:1248
 msgid "Academic Section"
 msgstr "Akademie"
 
-#: waeup/sirp/browser/pages.py:1256
-#: waeup/sirp/browser/pages.py:1272
-#: waeup/sirp/browser/pages.py:1289
+#: waeup/sirp/browser/pages.py:1260
+#: waeup/sirp/browser/pages.py:1276
 #: waeup/sirp/browser/pages.py:1293
+#: waeup/sirp/browser/pages.py:1297
 msgid "Add faculty"
-msgstr "Füge Fakultät hinzu"
-
-#: waeup/sirp/browser/pages.py:1257
+msgstr "Fakultät hinzufügen"
+
+#: waeup/sirp/browser/pages.py:1261
 msgid "Faculties"
 msgstr "Fakultäten"
 
-#: waeup/sirp/browser/pages.py:1261
+#: waeup/sirp/browser/pages.py:1265
 #: waeup/sirp/browser/viewlets.py:431
 msgid "Manage academic section"
 msgstr "Bearbeite Akademie"
 
-#: waeup/sirp/browser/pages.py:1300
+#: waeup/sirp/browser/pages.py:1304
 msgid "The faculty code chosen already exists."
 msgstr "Das Fakultätskürzel existiert bereits."
 
-#: waeup/sirp/browser/pages.py:1321
-#: waeup/sirp/browser/pages.py:1331
+#: waeup/sirp/browser/pages.py:1325
+#: waeup/sirp/browser/pages.py:1335
 msgid "Departments"
 msgstr "Departments"
 
-#: waeup/sirp/browser/pages.py:1333
-#: waeup/sirp/browser/pages.py:1384
-#: waeup/sirp/browser/pages.py:1403
+#: waeup/sirp/browser/pages.py:1337
+#: waeup/sirp/browser/pages.py:1388
 #: waeup/sirp/browser/pages.py:1407
+#: waeup/sirp/browser/pages.py:1411
 msgid "Add department"
-msgstr "Füge Department hinzu"
-
-#: waeup/sirp/browser/pages.py:1334
+msgstr "Department hinzufügen"
+
+#: waeup/sirp/browser/pages.py:1338
+#: waeup/sirp/browser/pages.py:1397
+#: waeup/sirp/browser/pages.py:1507
+#: waeup/sirp/browser/pages.py:1593
+#: waeup/sirp/browser/pages.py:1753
+#: waeup/sirp/browser/pages.py:1810
+msgid "Remove selected local roles"
+msgstr "Ausgewählte lokale Rollen löschen"
+
+#: waeup/sirp/browser/pages.py:1339
 #: waeup/sirp/browser/pages.py:1393
-#: waeup/sirp/browser/pages.py:1503
+#: waeup/sirp/browser/pages.py:1508
 #: waeup/sirp/browser/pages.py:1589
-#: waeup/sirp/browser/pages.py:1749
+#: waeup/sirp/browser/pages.py:1754
 #: waeup/sirp/browser/pages.py:1806
-msgid "Remove selected local roles"
-msgstr "Ausgewählte lokale Rollen  löschen"
-
-#: waeup/sirp/browser/pages.py:1335
-#: waeup/sirp/browser/pages.py:1389
-#: waeup/sirp/browser/pages.py:1504
-#: waeup/sirp/browser/pages.py:1585
-#: waeup/sirp/browser/pages.py:1750
-#: waeup/sirp/browser/pages.py:1802
 msgid "Add local role"
 msgstr "Lokale Rolle hinzufügen"
@@ -345,60 +345,60 @@
 msgstr "Erfolgreich entfernt: ${a}"
 
-#: waeup/sirp/browser/pages.py:1341
+#: waeup/sirp/browser/pages.py:1345
 #: waeup/sirp/browser/viewlets.py:447
 msgid "Manage faculty"
 msgstr "Bearbeite Fakultät"
 
-#: waeup/sirp/browser/pages.py:1376
-#: waeup/sirp/browser/pages.py:1698
-#: waeup/sirp/browser/pages.py:1770
-#: waeup/sirp/browser/pages.py:1882
+#: waeup/sirp/browser/pages.py:1380
+#: waeup/sirp/browser/pages.py:1702
+#: waeup/sirp/browser/pages.py:1774
+#: waeup/sirp/browser/pages.py:1886
 msgid "Form has been saved."
 msgstr "Das Formular wurde gespeichert."
 
-#: waeup/sirp/browser/pages.py:1414
+#: waeup/sirp/browser/pages.py:1418
 msgid "The code chosen already exists in this faculty."
 msgstr "Das Kürzel existiert bereits in dieser Fakultät."
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1417
+#: waeup/sirp/browser/pages.py:1421
 msgid "Department ${a} added."
 msgstr "Department ${a} hinzugefügt."
 
-#: waeup/sirp/browser/pages.py:1434
+#: waeup/sirp/browser/pages.py:1438
 msgid "Courses and Certificates"
 msgstr "Kurse und Zertifikate"
 
-#: waeup/sirp/browser/pages.py:1464
-#: waeup/sirp/browser/pages.py:1483
+#: waeup/sirp/browser/pages.py:1468
+#: waeup/sirp/browser/pages.py:1487
 #: waeup/sirp/students/viewlets.py:466
 msgid "Students"
 msgstr "Studenten"
 
-#: waeup/sirp/browser/pages.py:1500
-#: waeup/sirp/browser/pages.py:1558
+#: waeup/sirp/browser/pages.py:1504
+#: waeup/sirp/browser/pages.py:1562
 msgid "Remove selected courses"
-msgstr "Ausgewählte Kurse  löschen"
-
-#: waeup/sirp/browser/pages.py:1500
-#: waeup/sirp/browser/pages.py:1570
-#: waeup/sirp/browser/pages.py:1599
+msgstr "Ausgewählte Kurse löschen"
+
+#: waeup/sirp/browser/pages.py:1504
+#: waeup/sirp/browser/pages.py:1574
 #: waeup/sirp/browser/pages.py:1603
+#: waeup/sirp/browser/pages.py:1607
 msgid "Add course"
 msgstr "Kurs hinzufügen"
 
-#: waeup/sirp/browser/pages.py:1501
-#: waeup/sirp/browser/pages.py:1564
+#: waeup/sirp/browser/pages.py:1505
+#: waeup/sirp/browser/pages.py:1568
 msgid "Remove selected certificates"
 msgstr "Ausgewählte Zertifikate löschen"
 
-#: waeup/sirp/browser/pages.py:1501
-#: waeup/sirp/browser/pages.py:1575
-#: waeup/sirp/browser/pages.py:1636
+#: waeup/sirp/browser/pages.py:1505
+#: waeup/sirp/browser/pages.py:1579
 #: waeup/sirp/browser/pages.py:1640
+#: waeup/sirp/browser/pages.py:1644
 msgid "Add certificate"
-msgstr "Füge Zertifikat hinzu."
-
-#: waeup/sirp/browser/pages.py:1510
+msgstr "Zertifikat hinzufügen"
+
+#: waeup/sirp/browser/pages.py:1514
 #: waeup/sirp/browser/viewlets.py:454
 msgid "Manage department"
@@ -412,108 +412,122 @@
 msgstr "Einloggen"
 
-#: waeup/sirp/browser/pages.py:159
+#: waeup/sirp/browser/pages.py:160
 msgid "You logged in."
 msgstr "Sie sind jetzt eingeloggt."
 
-#: waeup/sirp/browser/pages.py:1615
+#: waeup/sirp/browser/pages.py:1619
 msgid "A course with same code already exists: "
 msgstr "Ein Kurs mit gleichem Kürzel existiert bereits:"
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1621
+#: waeup/sirp/browser/pages.py:1625
 msgid "Course ${a} successfully created."
 msgstr "Kurs ${a} erfolgreich erzeugt."
 
-#: waeup/sirp/browser/pages.py:1652
+#: waeup/sirp/browser/pages.py:1656
 msgid "A certificate with same code already exists: "
 msgstr "Ein Zertifikat mit gleichem Kürzel existiert bereits:"
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1658
+#: waeup/sirp/browser/pages.py:1662
 msgid "Certificate ${a} successfully created."
 msgstr "Zertifikat ${a} erfolgreich erzeugt."
 
-#: waeup/sirp/browser/pages.py:1690
+#: waeup/sirp/browser/pages.py:1694
 #: waeup/sirp/browser/viewlets.py:471
 msgid "Edit course"
 msgstr "Bearbeite Kurs"
 
-#: waeup/sirp/browser/pages.py:1740
+#: waeup/sirp/browser/pages.py:1744
 msgid "Edit certificate"
 msgstr "Bearbeite Zertifikat"
 
-#: waeup/sirp/browser/pages.py:1747
-#: waeup/sirp/browser/pages.py:1778
-#: waeup/sirp/browser/pages.py:1819
-#: waeup/sirp/browser/pages.py:1821
+#: waeup/sirp/browser/pages.py:1751
+#: waeup/sirp/browser/pages.py:1782
+#: waeup/sirp/browser/pages.py:1823
+#: waeup/sirp/browser/pages.py:1825
 msgid "Add course referrer"
-msgstr "Füge Kursreferenz hinzu"
-
-#: waeup/sirp/browser/pages.py:1748
-#: waeup/sirp/browser/pages.py:1773
+msgstr "Kursreferenz hinzufügen"
+
+#: waeup/sirp/browser/pages.py:1752
+#: waeup/sirp/browser/pages.py:1777
 msgid "Remove selected course referrers"
 msgstr "Lösche ausgewählte Kursreferenzen"
 
-#: waeup/sirp/browser/pages.py:1754
+#: waeup/sirp/browser/pages.py:1758
 #: waeup/sirp/browser/viewlets.py:478
 msgid "Manage certificate"
 msgstr "Bearbeite Zertifikat"
 
-#: waeup/sirp/browser/pages.py:177
+#: waeup/sirp/browser/pages.py:178
 msgid "You entered wrong credentials."
 msgstr "Sie haben falsche Zugangsdaten eingegeben."
 
-#: waeup/sirp/browser/pages.py:1826
+#: waeup/sirp/browser/pages.py:1830
 msgid "The chosen course referrer is already part of this certificate."
 msgstr "Die ausgewählte Kursreferenz ist bereits Teil des Zertifikates."
 
-#: waeup/sirp/browser/pages.py:1867
+#. Default: ""
+#: waeup/sirp/browser/pages.py:1834
+msgid "Course referrer ${a}_${b} added."
+msgstr "Kursreferent ${a}_${b} hinzugefügt."
+
+#: waeup/sirp/browser/pages.py:1871
 #: waeup/sirp/browser/viewlets.py:495
 msgid "Edit course referrer"
 msgstr "Bearbeite Kursreferenz"
 
-#: waeup/sirp/browser/pages.py:1870
+#: waeup/sirp/browser/pages.py:1874
 msgid "Save and return"
 msgstr "Speichen und zurück"
 
-#: waeup/sirp/browser/pages.py:191
+#: waeup/sirp/browser/pages.py:192
 msgid "You have been logged out. Thanks for using WAeUP SIRP!"
 msgstr "Sie wurden ausgeloggt. Danke dass Sie WAeUP Kofa benutzt haben."
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:227
+#: waeup/sirp/browser/pages.py:228
 msgid "Contact ${a}"
 msgstr "Kontaktiere ${a}"
 
-#: waeup/sirp/browser/pages.py:233
-#: waeup/sirp/browser/pages.py:516
+#: waeup/sirp/browser/pages.py:234
+#: waeup/sirp/browser/pages.py:519
 msgid "Send message now"
 msgstr "Jetzt senden"
 
-#: waeup/sirp/browser/pages.py:252
-#: waeup/sirp/browser/pages.py:271
-#: waeup/sirp/browser/pages.py:533
+#: waeup/sirp/browser/pages.py:253
+#: waeup/sirp/browser/pages.py:272
+#: waeup/sirp/browser/pages.py:536
 msgid "Your message has been sent."
 msgstr "Ihre Nachricht wurde verschickt."
 
-#: waeup/sirp/browser/pages.py:262
+#: waeup/sirp/browser/pages.py:263
 msgid "Send now"
 msgstr "Sende jetzt"
 
-#: waeup/sirp/browser/pages.py:273
+#: waeup/sirp/browser/pages.py:274
 msgid "A smtp server error occurred."
 msgstr "Es trat ein smtp-Serverfehler auf."
 
-#: waeup/sirp/browser/pages.py:298
+#: waeup/sirp/browser/pages.py:299
 msgid "<h1>Welcome to WAeUP.SIRP</h1>"
 msgstr "<h1>Willkommen bei WAeUP.SIRP</h1>"
 
-#. Default: ""
-#: waeup/sirp/browser/pages.py:392
+#: waeup/sirp/browser/pages.py:387
+msgid "Manage"
+msgstr "Bearbeiten"
+
+#: waeup/sirp/browser/pages.py:388
+#: waeup/sirp/browser/viewlets.py:177
+msgid "Remove"
+msgstr "Entfernen"
+
+#. Default: ""
+#: waeup/sirp/browser/pages.py:395
 msgid "User account ${a} successfully deleted."
 msgstr "Benutzerkonto ${a} erfolgreich gelöscht."
 
-#: waeup/sirp/browser/pages.py:423
-#: waeup/sirp/browser/pages.py:425
+#: waeup/sirp/browser/pages.py:426
+#: waeup/sirp/browser/pages.py:428
 #: waeup/sirp/browser/viewlets.py:505
 msgid "Add user"
@@ -521,150 +535,159 @@
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:447
+#: waeup/sirp/browser/pages.py:450
 msgid "User account ${a} successfully added."
 msgstr "Benutzerkonto ${a} erfolgreich hinzugefügt."
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:466
+#: waeup/sirp/browser/pages.py:469
 msgid "Edit user ${a}"
 msgstr "Bearbeite Benutzer"
 
-#: waeup/sirp/browser/pages.py:473
-#: waeup/sirp/browser/pages.py:627
-#: waeup/sirp/browser/pages.py:724
-#: waeup/sirp/browser/pages.py:1160
-#: waeup/sirp/browser/pages.py:1332
-#: waeup/sirp/browser/pages.py:1499
-#: waeup/sirp/browser/pages.py:1552
-#: waeup/sirp/browser/pages.py:1695
-#: waeup/sirp/browser/pages.py:1746
+#: waeup/sirp/browser/pages.py:476
+#: waeup/sirp/browser/pages.py:631
+#: waeup/sirp/browser/pages.py:654
+#: waeup/sirp/browser/pages.py:728
+#: waeup/sirp/browser/pages.py:1164
+#: waeup/sirp/browser/pages.py:1336
+#: waeup/sirp/browser/pages.py:1377
+#: waeup/sirp/browser/pages.py:1503
+#: waeup/sirp/browser/pages.py:1556
+#: waeup/sirp/browser/pages.py:1699
+#: waeup/sirp/browser/pages.py:1750
+#: waeup/sirp/browser/pages.py:1771
 msgid "Save"
 msgstr "Speichern"
 
-#: waeup/sirp/browser/pages.py:497
+#: waeup/sirp/browser/pages.py:500
 msgid "User settings have been saved."
 msgstr "Benutzereinstellungen wurden gespeichert."
 
-#: waeup/sirp/browser/pages.py:500
-#: waeup/sirp/browser/pages.py:704
-#: waeup/sirp/browser/pages.py:731
-#: waeup/sirp/browser/pages.py:754
-#: waeup/sirp/browser/pages.py:801
-#: waeup/sirp/browser/pages.py:831
-#: waeup/sirp/browser/pages.py:951
-#: waeup/sirp/browser/pages.py:1162
-#: waeup/sirp/browser/pages.py:1256
-#: waeup/sirp/browser/pages.py:1277
-#: waeup/sirp/browser/pages.py:1304
-#: waeup/sirp/browser/pages.py:1332
-#: waeup/sirp/browser/pages.py:1333
-#: waeup/sirp/browser/pages.py:1379
-#: waeup/sirp/browser/pages.py:1420
-#: waeup/sirp/browser/pages.py:1499
-#: waeup/sirp/browser/pages.py:1500
-#: waeup/sirp/browser/pages.py:1502
-#: waeup/sirp/browser/pages.py:1580
-#: waeup/sirp/browser/pages.py:1663
-#: waeup/sirp/browser/pages.py:1707
-#: waeup/sirp/browser/pages.py:1746
-#: waeup/sirp/browser/pages.py:1748
-#: waeup/sirp/browser/pages.py:1783
-#: waeup/sirp/browser/pages.py:1834
-#: waeup/sirp/browser/pages.py:1886
+#: waeup/sirp/browser/pages.py:503
+#: waeup/sirp/browser/pages.py:708
+#: waeup/sirp/browser/pages.py:735
+#: waeup/sirp/browser/pages.py:758
+#: waeup/sirp/browser/pages.py:805
+#: waeup/sirp/browser/pages.py:835
+#: waeup/sirp/browser/pages.py:955
+#: waeup/sirp/browser/pages.py:1166
+#: waeup/sirp/browser/pages.py:1260
+#: waeup/sirp/browser/pages.py:1281
+#: waeup/sirp/browser/pages.py:1308
+#: waeup/sirp/browser/pages.py:1336
+#: waeup/sirp/browser/pages.py:1337
+#: waeup/sirp/browser/pages.py:1383
+#: waeup/sirp/browser/pages.py:1424
+#: waeup/sirp/browser/pages.py:1503
+#: waeup/sirp/browser/pages.py:1504
+#: waeup/sirp/browser/pages.py:1506
+#: waeup/sirp/browser/pages.py:1584
+#: waeup/sirp/browser/pages.py:1629
+#: waeup/sirp/browser/pages.py:1667
+#: waeup/sirp/browser/pages.py:1711
+#: waeup/sirp/browser/pages.py:1750
+#: waeup/sirp/browser/pages.py:1752
+#: waeup/sirp/browser/pages.py:1787
+#: waeup/sirp/browser/pages.py:1838
+#: waeup/sirp/browser/pages.py:1890
 msgid "Cancel"
 msgstr "Abbruch"
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:514
+#: waeup/sirp/browser/pages.py:517
 msgid "Send message to ${a}"
 msgstr "Sende Nachricht an ${a}"
 
-#: waeup/sirp/browser/pages.py:543
+#: waeup/sirp/browser/pages.py:546
 #: waeup/sirp/browser/viewlets.py:390
 msgid "My Preferences"
 msgstr "Meine Präferenzen"
 
-#: waeup/sirp/browser/pages.py:556
+#: waeup/sirp/browser/pages.py:559
 #: waeup/sirp/browser/viewlets.py:405
 msgid "My Roles"
 msgstr "Meine Rollen"
 
-#: waeup/sirp/browser/pages.py:587
+#: waeup/sirp/browser/pages.py:590
 msgid "Search Academic Section"
 msgstr "Durchsuche Akademie"
 
-#: waeup/sirp/browser/pages.py:613
+#: waeup/sirp/browser/pages.py:592
+#: waeup/sirp/browser/viewlets.py:187
+msgid "Search"
+msgstr "Suche"
+
+#: waeup/sirp/browser/pages.py:617
 msgid "View portal configuration"
 msgstr "Betrachte Portal-Konfiguration"
 
-#: waeup/sirp/browser/pages.py:626
+#: waeup/sirp/browser/pages.py:630
 msgid "Edit portal configuration"
 msgstr "Bearbeite Portalkonfiguration"
 
-#: waeup/sirp/browser/pages.py:627
-#: waeup/sirp/browser/pages.py:676
+#: waeup/sirp/browser/pages.py:631
+#: waeup/sirp/browser/pages.py:680
 msgid "Update plugins"
 msgstr "Aktualisiere Plugins"
 
-#: waeup/sirp/browser/pages.py:629
-#: waeup/sirp/browser/pages.py:657
-#: waeup/sirp/browser/pages.py:688
+#: waeup/sirp/browser/pages.py:633
+#: waeup/sirp/browser/pages.py:661
+#: waeup/sirp/browser/pages.py:692
 msgid "Add session configuration"
-msgstr "Füge Session-Konfiguration hinzu"
-
-#: waeup/sirp/browser/pages.py:630
-#: waeup/sirp/browser/pages.py:671
-#: waeup/sirp/browser/pages.py:1256
-#: waeup/sirp/browser/pages.py:1267
-#: waeup/sirp/browser/pages.py:1333
-#: waeup/sirp/browser/pages.py:1368
+msgstr "Session-Konfiguration hinzufügen"
+
+#: waeup/sirp/browser/pages.py:634
+#: waeup/sirp/browser/pages.py:675
+#: waeup/sirp/browser/pages.py:1260
+#: waeup/sirp/browser/pages.py:1271
+#: waeup/sirp/browser/pages.py:1337
+#: waeup/sirp/browser/pages.py:1372
 msgid "Remove selected"
 msgstr "Ausgewählte Objekte löschen"
 
-#: waeup/sirp/browser/pages.py:654
-#: waeup/sirp/browser/pages.py:727
+#: waeup/sirp/browser/pages.py:658
+#: waeup/sirp/browser/pages.py:731
 msgid "Settings have been saved."
 msgstr "Einstellungen wurden gespeichert."
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:668
+#: waeup/sirp/browser/pages.py:672
 msgid "Session ${a} Configuration"
 msgstr "Session ${a}-Konfiguration"
 
-#: waeup/sirp/browser/pages.py:679
+#: waeup/sirp/browser/pages.py:683
 msgid "Plugins were updated. See log file for details."
 msgstr "Plugins wurden aktualisiert, siehe Logdatei."
 
-#: waeup/sirp/browser/pages.py:692
+#: waeup/sirp/browser/pages.py:696
 msgid "Add Session Configuration"
-msgstr "Füge Session-Konfiguration hinzu"
-
-#: waeup/sirp/browser/pages.py:699
+msgstr "Session-Konfiguration hinzufügen"
+
+#: waeup/sirp/browser/pages.py:703
 msgid "The session chosen already exists."
 msgstr "Die Session existiert bereits."
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:721
+#: waeup/sirp/browser/pages.py:725
 msgid "Edit academic session ${a} configuration"
 msgstr "Bearbeite Session ${a}-Konfiguration"
 
-#: waeup/sirp/browser/pages.py:751
+#: waeup/sirp/browser/pages.py:755
 msgid "Upload file"
 msgstr "Datei hochladen"
 
-#: waeup/sirp/browser/pages.py:753
+#: waeup/sirp/browser/pages.py:757
 msgid "Upload"
 msgstr "Hochladen"
 
-#: waeup/sirp/browser/pages.py:799
-#: waeup/sirp/browser/pages.py:829
-#: waeup/sirp/browser/pages.py:949
-#: waeup/sirp/browser/pages.py:1057
+#: waeup/sirp/browser/pages.py:803
+#: waeup/sirp/browser/pages.py:833
+#: waeup/sirp/browser/pages.py:953
+#: waeup/sirp/browser/pages.py:1061
 msgid "Process CSV file"
 msgstr "Verarbeite CSF-Datei"
 
-#: waeup/sirp/browser/pages.py:813
-#: waeup/sirp/browser/pages.py:914
-#: waeup/sirp/browser/pages.py:1033
+#: waeup/sirp/browser/pages.py:817
+#: waeup/sirp/browser/pages.py:918
+#: waeup/sirp/browser/pages.py:1037
 msgid "Import aborted."
 msgstr "Import abgebrochen."
@@ -674,38 +697,38 @@
 msgstr "Keine lokalen Rollen ausgewählt."
 
-#: waeup/sirp/browser/pages.py:832
+#: waeup/sirp/browser/pages.py:836
 msgid "Back to step 1"
 msgstr "Zurück zu Schritt 1"
 
-#: waeup/sirp/browser/pages.py:833
+#: waeup/sirp/browser/pages.py:837
 msgid "Proceed to step 3"
 msgstr "Gehe zu Schritt 3"
 
-#: waeup/sirp/browser/pages.py:893
+#: waeup/sirp/browser/pages.py:897
 msgid "Double headers: each column name may only appear once. "
 msgstr "Doppelte Spaltenüberschrift"
 
-#: waeup/sirp/browser/pages.py:901
+#: waeup/sirp/browser/pages.py:905
 msgid "Replace imported file!"
 msgstr "Tauschen Sie die Importdatei aus!"
 
-#: waeup/sirp/browser/pages.py:926
+#: waeup/sirp/browser/pages.py:930
 msgid "Update mode only!"
 msgstr "Nur Aktualisierungsmodus!"
 
-#: waeup/sirp/browser/pages.py:952
-#: waeup/sirp/browser/pages.py:1161
+#: waeup/sirp/browser/pages.py:956
+#: waeup/sirp/browser/pages.py:1165
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: waeup/sirp/browser/pages.py:953
+#: waeup/sirp/browser/pages.py:957
 msgid "Set headerfields"
 msgstr "Setze Spaltenüberschrift"
 
-#: waeup/sirp/browser/pages.py:954
+#: waeup/sirp/browser/pages.py:958
 msgid "Back to step 2"
 msgstr "Zurück zu Schritt 2"
 
-#: waeup/sirp/browser/pages.py:955
+#: waeup/sirp/browser/pages.py:959
 msgid "Perform import"
 msgstr "Führe Import duch"
@@ -734,20 +757,4 @@
 msgid "Code:"
 msgstr "Kürzel:"
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:106
-msgid "User Id"
-msgstr "Benutzer Id"
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:110
-msgid "Local Role"
-msgstr "Lokale Rolle"
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:5
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:7
-msgid "Local Roles"
-msgstr "Lokale Rollen"
 
 #: waeup/sirp/browser/templates/certificatepage.pt:22
@@ -758,9 +765,4 @@
 
 #: waeup/sirp/browser/templates/certificatepage.pt:28
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:48
-msgid "Level"
-msgstr "Studienjahr"
-
-#: waeup/sirp/browser/templates/certificatepage.pt:28
 #: waeup/sirp/browser/templates/certificatemanagepage.pt:49
 msgid "Semester"
@@ -772,14 +774,4 @@
 msgstr "Kursreferenz"
 
-#: waeup/sirp/browser/templates/certificatepage.pt:29
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
-msgid "Course"
-msgstr "Kurs"
-
-#: waeup/sirp/browser/templates/certificatepage.pt:30
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
-msgid "Title"
-msgstr "Titel"
-
 #: waeup/sirp/browser/templates/certificatepage.pt:30
 #: waeup/sirp/browser/templates/certificatemanagepage.pt:51
@@ -790,9 +782,4 @@
 msgid "Site Settings"
 msgstr "Einstellungen"
-
-#: waeup/sirp/browser/templates/configurationmanagepage.pt:52
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:108
-msgid "Name"
-msgstr "Name"
 
 #: waeup/sirp/browser/templates/configurationmanagepage.pt:8
@@ -918,8 +905,46 @@
 msgstr "Hochgeladen"
 
-#. Default: "Local Roles"
-#: waeup/sirp/browser/templates/facultymanagepage.pt:15
-msgid "local_roles"
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:10
+#: waeup/sirp/browser/templates/departmentpage.pt:3
+msgid "Courses"
+msgstr "Kurse"
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:118
+#: waeup/sirp/browser/templates/facultymanagepage.pt:92
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:106
+msgid "User Id"
+msgstr "Benutzer Id"
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:120
+#: waeup/sirp/browser/templates/userscontainerpage.pt:5
+#: waeup/sirp/browser/templates/facultymanagepage.pt:94
+#: waeup/sirp/browser/templates/configurationmanagepage.pt:52
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:108
+msgid "Name"
+msgstr "Name"
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:122
+#: waeup/sirp/browser/templates/facultymanagepage.pt:96
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:110
+msgid "Local Role"
+msgstr "Lokale Rolle"
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:13
+#: waeup/sirp/browser/templates/departmentpage.pt:6
+msgid "Certificates"
+msgstr "Zertifikate"
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:16
+#: waeup/sirp/browser/templates/userscontainerpage.pt:7
+#: waeup/sirp/browser/templates/facultymanagepage.pt:16
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:7
+msgid "Local Roles"
 msgstr "Lokale Rollen"
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:6
+#: waeup/sirp/browser/templates/facultymanagepage.pt:6
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:5
+msgid "Settings"
+msgstr "Einstellungen"
 
 #: waeup/sirp/browser/templates/facultypage.pt:1
@@ -927,23 +952,102 @@
 msgstr "Es existieren bisher keine Unterobjekte."
 
-#. Default: "Code"
-#: waeup/sirp/browser/templates/facultypage.pt:8
-msgid "code"
-msgstr "Kürzel"
-
-#. Default: "Title"
-#: waeup/sirp/browser/templates/facultypage.pt:9
-msgid "title"
-msgstr "Titel"
-
-#. Default: "My Portal Roles:"
+#: waeup/sirp/browser/templates/loginpage.pt:13
+#: waeup/sirp/browser/templates/usereditformpage.pt:26
+msgid "Password:"
+msgstr "Passwort:"
+
+#: waeup/sirp/browser/templates/loginpage.pt:24
+msgid "Notice: User names, Ids and passwords are case sensitive."
+msgstr "Groß- / Kleinschreibung (beachten)! "
+
+#. Default: "Don't forget to logout or exit your browser when you're done. If you are having trouble logging in, make sure to enable cookies in your web browser."
+#: waeup/sirp/browser/templates/loginpage.pt:36
+msgid "login_trouble1"
+msgstr "Vergessen Sie nicht, sich vor dem Verlassen des Portals auszuloggen. Wenn Sie Probleme beim Einloggen haben, stellen Sie zunächst sicher, dass Cookies im Browser aktiviert sind."
+
+#. Default: "You don't have an account because you are a fresh student, or your student record has just been created? Acquire a Password Access Code (PWD) and inititialize your student account <strong><a href=\"setpassword\"> here</a></strong>."
+#: waeup/sirp/browser/templates/loginpage.pt:39
+msgid "login_trouble2"
+msgstr "Wenn Sie ein neuer Student sind und noch kein Benutzerkonto haben, oder Ihr Datensatz gerade frisch  erzeugt wurde, erwerben Sie bitte einen PWD-Zugangscode und initialisieren Sie Ihr Benutzerkonto <strong><a href=\"setpassword\"> hier</a></strong>."
+
+#. Default: "Or simply forgot your student id or password? Then request a new password <strong><a href=\"changepw\"> here</a></strong>."
+#: waeup/sirp/browser/templates/loginpage.pt:44
+msgid "login_trouble3"
+msgstr "Oder haben Sie Ihre Sudenten Id und/oder Ihr Passwort vergessen? Dann beantragen Sie <strong><a href=\"changepw\">hier</a></strong> ein neues Passwort."
+
+#: waeup/sirp/browser/templates/loginpage.pt:5
+msgid "User Name or Id:"
+msgstr "Benutzername oder Id:"
+
 #: waeup/sirp/browser/templates/myrolespage.pt:1
-msgid "my_portal_roles"
+msgid "My Portal Roles:"
 msgstr "Meine portalweiten Rollen:"
 
-#. Default: "My Local Roles:"
-#: waeup/sirp/browser/templates/myrolespage.pt:10
-msgid "my_local_roles"
+#: waeup/sirp/browser/templates/myrolespage.pt:11
+msgid "My Local Roles:"
 msgstr "Meine lokalen Rollen:"
+
+#: waeup/sirp/browser/templates/notfound.pt:1
+msgid "The page you are trying to access is not available."
+msgstr "Diese Seite steht nicht zur Verfügung."
+
+#: waeup/sirp/browser/templates/notfound.pt:12
+msgid "You might be trying to access a non-existing page."
+msgstr "Sie versuchen eine nicht existierende Seite aufzurufen."
+
+#: waeup/sirp/browser/templates/notfound.pt:6
+msgid "Please note the following:"
+msgstr "Bitte beachten Sie:"
+
+#: waeup/sirp/browser/templates/notfound.pt:9
+msgid "You might have misspelled the URL."
+msgstr "Sie haben möglicherweise die URL falsch eingetragen."
+
+#: waeup/sirp/browser/templates/searchpage.pt:15
+msgid "Type"
+msgstr "Typ"
+
+#: waeup/sirp/browser/templates/searchpage.pt:9
+msgid "Search Results"
+msgstr "Suchergebnisse"
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:4
+msgid "Student Id"
+msgstr "Studenten Id"
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:5
+msgid "Fullname"
+msgstr "Vollständiger Name"
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:6
+msgid "Status"
+msgstr "Status"
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:7
+msgid "Certificate"
+msgstr "Zertifikat"
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:8
+msgid "Current Session"
+msgstr "Aktuelle Session"
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:9
+msgid "Current Level"
+msgstr "Aktuelles Studienjahr"
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:101
+#: waeup/sirp/browser/templates/studentsitelayout.pt:86
+msgid "Form Status:"
+msgstr "Formularstatus:"
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:113
+#: waeup/sirp/browser/templates/studentsitelayout.pt:99
+msgid "Back to top"
+msgstr "Zurück zum Anfang"
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:114
+#: waeup/sirp/browser/templates/studentsitelayout.pt:100
+msgid "Student Information and Registration Portal<br /> Copyright &copy; WAeUP Group, 2008-2012"
+msgstr "Studenten Informations- and Registrierungsportal<br /> Copyright &copy; WAeUP Group, 2008-2012"
 
 #: waeup/sirp/browser/templates/staffsitelayout.pt:34
@@ -957,15 +1061,27 @@
 msgstr "Ausloggen"
 
+#: waeup/sirp/browser/templates/staffsitelayout.pt:60
+msgid "Student Id:"
+msgstr "Studenten Id:"
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:64
+msgid "State:"
+msgstr "Status:"
+
+#: waeup/sirp/browser/templates/usereditformpage.pt:32
+msgid "Retype password:"
+msgstr "Wiederhole Passwort:"
+
+#: waeup/sirp/browser/templates/userscontainerpage.pt:4
+msgid "User ID"
+msgstr "Benutzername (Id)"
+
+#: waeup/sirp/browser/templates/userscontainerpage.pt:6
+msgid "Portal Roles"
+msgstr "Portalweite Rollen:"
+
 #: waeup/sirp/browser/viewlets.py:167
 msgid "Add"
-msgstr "Füge hinzu"
-
-#: waeup/sirp/browser/viewlets.py:177
-msgid "Remove"
-msgstr "Entferne"
-
-#: waeup/sirp/browser/viewlets.py:187
-msgid "Search"
-msgstr "Suche"
+msgstr "Hinzufügen"
 
 #: waeup/sirp/browser/viewlets.py:373
@@ -1225,8 +1341,119 @@
 msgstr "Student zurückgesetzt auf 'eingeschrieben'"
 
-#. Default: "Name of faculty"
+#: waeup/sirp/university/interfaces.py:146
+msgid "Title of course"
+msgstr "Titel des Kurses"
+
+#: waeup/sirp/university/interfaces.py:152
+msgid "Credits"
+msgstr "Credits"
+
+#: waeup/sirp/university/interfaces.py:158
+msgid "Passmark"
+msgstr "Passmark"
+
+#: waeup/sirp/university/interfaces.py:164
+msgid "Semester/Term"
+msgstr "Semester/Term"
+
+#: waeup/sirp/university/interfaces.py:180
+msgid "Enter unique course code which will become part of the URL."
+msgstr "Geben Sie ein eindeutiges Kürzel ein, das dann Teil der URL sein wird."
+
+#: waeup/sirp/university/interfaces.py:199
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:62
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:91
+#: waeup/sirp/browser/templates/facultypage.pt:9
+#: waeup/sirp/browser/templates/departmentpage.pt:16
+#: waeup/sirp/browser/templates/departmentpage.pt:40
+#: waeup/sirp/browser/templates/searchpage.pt:14
+#: waeup/sirp/browser/templates/certificatepage.pt:30
+#: waeup/sirp/browser/templates/facultymanagepage.pt:64
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
+msgid "Title"
+msgstr "Titel"
+
+#: waeup/sirp/university/interfaces.py:205
+msgid "Study Mode"
+msgstr "Studienmodus"
+
+#: waeup/sirp/university/interfaces.py:212
+msgid "Start Level"
+msgstr "Einstiegslevel"
+
+#: waeup/sirp/university/interfaces.py:219
+msgid "End Level"
+msgstr "Endlevel"
+
+#: waeup/sirp/university/interfaces.py:226
+msgid "Application Category"
+msgstr "Antragskategorie"
+
+#: waeup/sirp/university/interfaces.py:243
+msgid "Enter unique certificate code which will become part of the URL."
+msgstr "Geben Sie ein eindeutiges Kürzel ein, das dann Teil der URL sein wird."
+
+#: waeup/sirp/university/interfaces.py:264
+msgid "Course Referrer"
+msgstr "Kursreferenz"
+
+#: waeup/sirp/university/interfaces.py:270
+#: waeup/sirp/browser/templates/certificatepage.pt:28
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:48
+msgid "Level"
+msgstr "Studienjahr"
+
+#: waeup/sirp/university/interfaces.py:277
+msgid "Is mandatory course (not elective)"
+msgstr "Pflichtkurs"
+
+#: waeup/sirp/university/interfaces.py:299
+#: waeup/sirp/browser/templates/certificatepage.pt:29
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
+msgid "Course"
+msgstr "Kurs"
+
+#: waeup/sirp/university/interfaces.py:38
+#: waeup/sirp/university/interfaces.py:66
+#: waeup/sirp/university/interfaces.py:86
+#: waeup/sirp/university/interfaces.py:117
+#: waeup/sirp/university/interfaces.py:139
+#: waeup/sirp/university/interfaces.py:179
+#: waeup/sirp/university/interfaces.py:192
+#: waeup/sirp/university/interfaces.py:241
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:60
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:89
+#: waeup/sirp/browser/templates/facultypage.pt:8
+#: waeup/sirp/browser/templates/departmentpage.pt:15
+#: waeup/sirp/browser/templates/departmentpage.pt:39
+#: waeup/sirp/browser/templates/searchpage.pt:13
+#: waeup/sirp/browser/templates/facultymanagepage.pt:62
+msgid "Code"
+msgstr "Kürzel"
+
 #: waeup/sirp/university/interfaces.py:45
-msgid "name_of_faculty"
+msgid "Name of faculty"
 msgstr "Name der Fakultät"
+
+#: waeup/sirp/university/interfaces.py:46
+#: waeup/sirp/university/interfaces.py:94
+#: waeup/sirp/university/interfaces.py:147
+#: waeup/sirp/university/interfaces.py:200
+msgid "Unnamed"
+msgstr "Unbenannt"
+
+#: waeup/sirp/university/interfaces.py:51
+#: waeup/sirp/university/interfaces.py:99
+msgid "Name prefix"
+msgstr "Prefix"
+
+#: waeup/sirp/university/interfaces.py:67
+#: waeup/sirp/university/interfaces.py:118
+msgid "This code will become part of the URL."
+msgstr "Dieses Kürzel wird Teil der URL sein."
+
+#: waeup/sirp/university/interfaces.py:93
+msgid "Name of department"
+msgstr "Name des Departments"
 
 #: waeup/sirp/university/vocabularies.py:28
@@ -1266,13 +1493,2 @@
 msgstr "8. Studienjahr"
 
-#~ msgid "User account ${a} edited: ${b}"
-#~ msgstr "Benutzerkonto ${a} bearbeitet: ${b}"
-
-#~ msgid "3rd spillover"
-#~ msgstr "3. Nachholjahr"
-
-#~ msgid "1st spillover"
-#~ msgstr "1. Nachholjahr"
-
-#~ msgid "2nd spillover"
-#~ msgstr "2. Nachholjahr"
Index: main/waeup.sirp/trunk/src/waeup/sirp/locales/fr/LC_MESSAGES/waeup.sirp.po
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/locales/fr/LC_MESSAGES/waeup.sirp.po	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/locales/fr/LC_MESSAGES/waeup.sirp.po	(revision 7707)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.SIRP\n"
-"POT-Creation-Date: Sun Feb 26 17:19:06 2012\n"
+"POT-Creation-Date: Mon Feb 27 09:31:07 2012\n"
 "PO-Revision-Date: 2012-02-22 11:28+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -181,5 +181,5 @@
 msgstr ""
 
-#: waeup/sirp/browser/breadcrumbs.py:123 waeup/sirp/browser/pages.py:308
+#: waeup/sirp/browser/breadcrumbs.py:123 waeup/sirp/browser/pages.py:309
 msgid "Administration"
 msgstr ""
@@ -190,11 +190,11 @@
 msgstr ""
 
-#: waeup/sirp/browser/breadcrumbs.py:148 waeup/sirp/browser/pages.py:385
+#: waeup/sirp/browser/breadcrumbs.py:148 waeup/sirp/browser/pages.py:386
 #: waeup/sirp/browser/viewlets.py:365 waeup/sirp/browser/viewlets.py:666
 msgid "Portal Users"
 msgstr ""
 
-#: waeup/sirp/browser/breadcrumbs.py:155 waeup/sirp/browser/pages.py:744
-#: waeup/sirp/browser/pages.py:1136 waeup/sirp/browser/viewlets.py:383
+#: waeup/sirp/browser/breadcrumbs.py:155 waeup/sirp/browser/pages.py:748
+#: waeup/sirp/browser/pages.py:1140 waeup/sirp/browser/viewlets.py:383
 #: waeup/sirp/browser/viewlets.py:675
 msgid "Data Center"
@@ -205,5 +205,5 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1012
+#: waeup/sirp/browser/pages.py:1016
 msgid "Edit headers or replace imported file!"
 msgstr ""
@@ -214,31 +214,31 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1059
+#: waeup/sirp/browser/pages.py:1063
 msgid "View processing log"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1060
+#: waeup/sirp/browser/pages.py:1064
 msgid "Back to data center"
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1104
+#: waeup/sirp/browser/pages.py:1108
 msgid "Processing of ${a} rows failed."
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1106
+#: waeup/sirp/browser/pages.py:1110
 msgid "Successfully processed ${a} rows."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1114
+#: waeup/sirp/browser/pages.py:1118
 msgid "Show logfiles"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1116
+#: waeup/sirp/browser/pages.py:1120
 msgid "Back to Data Center"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1117
+#: waeup/sirp/browser/pages.py:1121
 msgid "Show"
 msgstr ""
@@ -248,63 +248,63 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1158
+#: waeup/sirp/browser/pages.py:1162
 msgid "Edit data center settings"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1178
+#: waeup/sirp/browser/pages.py:1182
 msgid "File already existed (not copied):"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1180
+#: waeup/sirp/browser/pages.py:1184
 msgid "Given storage path cannot be used."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1181
+#: waeup/sirp/browser/pages.py:1185
 msgid "Error:"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1184
+#: waeup/sirp/browser/pages.py:1188
 msgid "New storage path succefully set."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1244
+#: waeup/sirp/browser/pages.py:1248
 msgid "Academic Section"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1256 waeup/sirp/browser/pages.py:1272
-#: waeup/sirp/browser/pages.py:1289 waeup/sirp/browser/pages.py:1293
+#: waeup/sirp/browser/pages.py:1260 waeup/sirp/browser/pages.py:1276
+#: waeup/sirp/browser/pages.py:1293 waeup/sirp/browser/pages.py:1297
 msgid "Add faculty"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1257
+#: waeup/sirp/browser/pages.py:1261
 msgid "Faculties"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1261 waeup/sirp/browser/viewlets.py:431
+#: waeup/sirp/browser/pages.py:1265 waeup/sirp/browser/viewlets.py:431
 msgid "Manage academic section"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1300
+#: waeup/sirp/browser/pages.py:1304
 msgid "The faculty code chosen already exists."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1321 waeup/sirp/browser/pages.py:1331
+#: waeup/sirp/browser/pages.py:1325 waeup/sirp/browser/pages.py:1335
 msgid "Departments"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1333 waeup/sirp/browser/pages.py:1384
-#: waeup/sirp/browser/pages.py:1403 waeup/sirp/browser/pages.py:1407
+#: waeup/sirp/browser/pages.py:1337 waeup/sirp/browser/pages.py:1388
+#: waeup/sirp/browser/pages.py:1407 waeup/sirp/browser/pages.py:1411
 msgid "Add department"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1334 waeup/sirp/browser/pages.py:1393
-#: waeup/sirp/browser/pages.py:1503 waeup/sirp/browser/pages.py:1589
-#: waeup/sirp/browser/pages.py:1749 waeup/sirp/browser/pages.py:1806
+#: waeup/sirp/browser/pages.py:1338 waeup/sirp/browser/pages.py:1397
+#: waeup/sirp/browser/pages.py:1507 waeup/sirp/browser/pages.py:1593
+#: waeup/sirp/browser/pages.py:1753 waeup/sirp/browser/pages.py:1810
 msgid "Remove selected local roles"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1335 waeup/sirp/browser/pages.py:1389
-#: waeup/sirp/browser/pages.py:1504 waeup/sirp/browser/pages.py:1585
-#: waeup/sirp/browser/pages.py:1750 waeup/sirp/browser/pages.py:1802
+#: waeup/sirp/browser/pages.py:1339 waeup/sirp/browser/pages.py:1393
+#: waeup/sirp/browser/pages.py:1508 waeup/sirp/browser/pages.py:1589
+#: waeup/sirp/browser/pages.py:1754 waeup/sirp/browser/pages.py:1806
 msgid "Add local role"
 msgstr ""
@@ -315,50 +315,50 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1341 waeup/sirp/browser/viewlets.py:447
+#: waeup/sirp/browser/pages.py:1345 waeup/sirp/browser/viewlets.py:447
 msgid "Manage faculty"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1376 waeup/sirp/browser/pages.py:1698
-#: waeup/sirp/browser/pages.py:1770 waeup/sirp/browser/pages.py:1882
+#: waeup/sirp/browser/pages.py:1380 waeup/sirp/browser/pages.py:1702
+#: waeup/sirp/browser/pages.py:1774 waeup/sirp/browser/pages.py:1886
 msgid "Form has been saved."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1414
+#: waeup/sirp/browser/pages.py:1418
 msgid "The code chosen already exists in this faculty."
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1417
+#: waeup/sirp/browser/pages.py:1421
 msgid "Department ${a} added."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1434
+#: waeup/sirp/browser/pages.py:1438
 msgid "Courses and Certificates"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1464 waeup/sirp/browser/pages.py:1483
+#: waeup/sirp/browser/pages.py:1468 waeup/sirp/browser/pages.py:1487
 #: waeup/sirp/students/viewlets.py:466
 msgid "Students"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1500 waeup/sirp/browser/pages.py:1558
+#: waeup/sirp/browser/pages.py:1504 waeup/sirp/browser/pages.py:1562
 msgid "Remove selected courses"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1500 waeup/sirp/browser/pages.py:1570
-#: waeup/sirp/browser/pages.py:1599 waeup/sirp/browser/pages.py:1603
+#: waeup/sirp/browser/pages.py:1504 waeup/sirp/browser/pages.py:1574
+#: waeup/sirp/browser/pages.py:1603 waeup/sirp/browser/pages.py:1607
 msgid "Add course"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1501 waeup/sirp/browser/pages.py:1564
+#: waeup/sirp/browser/pages.py:1505 waeup/sirp/browser/pages.py:1568
 msgid "Remove selected certificates"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1501 waeup/sirp/browser/pages.py:1575
-#: waeup/sirp/browser/pages.py:1636 waeup/sirp/browser/pages.py:1640
+#: waeup/sirp/browser/pages.py:1505 waeup/sirp/browser/pages.py:1579
+#: waeup/sirp/browser/pages.py:1640 waeup/sirp/browser/pages.py:1644
 msgid "Add certificate"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1510 waeup/sirp/browser/viewlets.py:454
+#: waeup/sirp/browser/pages.py:1514 waeup/sirp/browser/viewlets.py:454
 msgid "Manage department"
 msgstr ""
@@ -370,99 +370,112 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:159
+#: waeup/sirp/browser/pages.py:160
 msgid "You logged in."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1615
+#: waeup/sirp/browser/pages.py:1619
 msgid "A course with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1621
+#: waeup/sirp/browser/pages.py:1625
 msgid "Course ${a} successfully created."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1652
+#: waeup/sirp/browser/pages.py:1656
 msgid "A certificate with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1658
+#: waeup/sirp/browser/pages.py:1662
 msgid "Certificate ${a} successfully created."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1690 waeup/sirp/browser/viewlets.py:471
+#: waeup/sirp/browser/pages.py:1694 waeup/sirp/browser/viewlets.py:471
 msgid "Edit course"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1740
+#: waeup/sirp/browser/pages.py:1744
 msgid "Edit certificate"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1747 waeup/sirp/browser/pages.py:1778
-#: waeup/sirp/browser/pages.py:1819 waeup/sirp/browser/pages.py:1821
+#: waeup/sirp/browser/pages.py:1751 waeup/sirp/browser/pages.py:1782
+#: waeup/sirp/browser/pages.py:1823 waeup/sirp/browser/pages.py:1825
 msgid "Add course referrer"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1748 waeup/sirp/browser/pages.py:1773
+#: waeup/sirp/browser/pages.py:1752 waeup/sirp/browser/pages.py:1777
 msgid "Remove selected course referrers"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1754 waeup/sirp/browser/viewlets.py:478
+#: waeup/sirp/browser/pages.py:1758 waeup/sirp/browser/viewlets.py:478
 msgid "Manage certificate"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:177
+#: waeup/sirp/browser/pages.py:178
 msgid "You entered wrong credentials."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1826
+#: waeup/sirp/browser/pages.py:1830
 msgid "The chosen course referrer is already part of this certificate."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1867 waeup/sirp/browser/viewlets.py:495
+#. Default: ""
+#: waeup/sirp/browser/pages.py:1834
+msgid "Course referrer ${a}_${b} added."
+msgstr ""
+
+#: waeup/sirp/browser/pages.py:1871 waeup/sirp/browser/viewlets.py:495
 msgid "Edit course referrer"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1870
+#: waeup/sirp/browser/pages.py:1874
 msgid "Save and return"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:191
+#: waeup/sirp/browser/pages.py:192
 msgid "You have been logged out. Thanks for using WAeUP SIRP!"
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:227
+#: waeup/sirp/browser/pages.py:228
 msgid "Contact ${a}"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:233 waeup/sirp/browser/pages.py:516
+#: waeup/sirp/browser/pages.py:234 waeup/sirp/browser/pages.py:519
 msgid "Send message now"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:252 waeup/sirp/browser/pages.py:271
-#: waeup/sirp/browser/pages.py:533
+#: waeup/sirp/browser/pages.py:253 waeup/sirp/browser/pages.py:272
+#: waeup/sirp/browser/pages.py:536
 msgid "Your message has been sent."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:262
+#: waeup/sirp/browser/pages.py:263
 msgid "Send now"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:273
+#: waeup/sirp/browser/pages.py:274
 msgid "A smtp server error occurred."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:298
+#: waeup/sirp/browser/pages.py:299
 msgid "<h1>Welcome to WAeUP.SIRP</h1>"
 msgstr ""
 
-#. Default: ""
-#: waeup/sirp/browser/pages.py:392
+#: waeup/sirp/browser/pages.py:387
+msgid "Manage"
+msgstr ""
+
+#: waeup/sirp/browser/pages.py:388 waeup/sirp/browser/viewlets.py:177
+msgid "Remove"
+msgstr ""
+
+#. Default: ""
+#: waeup/sirp/browser/pages.py:395
 msgid "User account ${a} successfully deleted."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:423 waeup/sirp/browser/pages.py:425
+#: waeup/sirp/browser/pages.py:426 waeup/sirp/browser/pages.py:428
 #: waeup/sirp/browser/viewlets.py:505
 msgid "Add user"
@@ -470,122 +483,128 @@
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:447
+#: waeup/sirp/browser/pages.py:450
 msgid "User account ${a} successfully added."
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:466
+#: waeup/sirp/browser/pages.py:469
 msgid "Edit user ${a}"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:473 waeup/sirp/browser/pages.py:627
-#: waeup/sirp/browser/pages.py:724 waeup/sirp/browser/pages.py:1160
-#: waeup/sirp/browser/pages.py:1332 waeup/sirp/browser/pages.py:1499
-#: waeup/sirp/browser/pages.py:1552 waeup/sirp/browser/pages.py:1695
-#: waeup/sirp/browser/pages.py:1746
+#: waeup/sirp/browser/pages.py:476 waeup/sirp/browser/pages.py:631
+#: waeup/sirp/browser/pages.py:654 waeup/sirp/browser/pages.py:728
+#: waeup/sirp/browser/pages.py:1164 waeup/sirp/browser/pages.py:1336
+#: waeup/sirp/browser/pages.py:1377 waeup/sirp/browser/pages.py:1503
+#: waeup/sirp/browser/pages.py:1556 waeup/sirp/browser/pages.py:1699
+#: waeup/sirp/browser/pages.py:1750 waeup/sirp/browser/pages.py:1771
 msgid "Save"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:497
+#: waeup/sirp/browser/pages.py:500
 msgid "User settings have been saved."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:500 waeup/sirp/browser/pages.py:704
-#: waeup/sirp/browser/pages.py:731 waeup/sirp/browser/pages.py:754
-#: waeup/sirp/browser/pages.py:801 waeup/sirp/browser/pages.py:831
-#: waeup/sirp/browser/pages.py:951 waeup/sirp/browser/pages.py:1162
-#: waeup/sirp/browser/pages.py:1256 waeup/sirp/browser/pages.py:1277
-#: waeup/sirp/browser/pages.py:1304 waeup/sirp/browser/pages.py:1332
-#: waeup/sirp/browser/pages.py:1333 waeup/sirp/browser/pages.py:1379
-#: waeup/sirp/browser/pages.py:1420 waeup/sirp/browser/pages.py:1499
-#: waeup/sirp/browser/pages.py:1500 waeup/sirp/browser/pages.py:1502
-#: waeup/sirp/browser/pages.py:1580 waeup/sirp/browser/pages.py:1663
-#: waeup/sirp/browser/pages.py:1707 waeup/sirp/browser/pages.py:1746
-#: waeup/sirp/browser/pages.py:1748 waeup/sirp/browser/pages.py:1783
-#: waeup/sirp/browser/pages.py:1834 waeup/sirp/browser/pages.py:1886
+#: waeup/sirp/browser/pages.py:503 waeup/sirp/browser/pages.py:708
+#: waeup/sirp/browser/pages.py:735 waeup/sirp/browser/pages.py:758
+#: waeup/sirp/browser/pages.py:805 waeup/sirp/browser/pages.py:835
+#: waeup/sirp/browser/pages.py:955 waeup/sirp/browser/pages.py:1166
+#: waeup/sirp/browser/pages.py:1260 waeup/sirp/browser/pages.py:1281
+#: waeup/sirp/browser/pages.py:1308 waeup/sirp/browser/pages.py:1336
+#: waeup/sirp/browser/pages.py:1337 waeup/sirp/browser/pages.py:1383
+#: waeup/sirp/browser/pages.py:1424 waeup/sirp/browser/pages.py:1503
+#: waeup/sirp/browser/pages.py:1504 waeup/sirp/browser/pages.py:1506
+#: waeup/sirp/browser/pages.py:1584 waeup/sirp/browser/pages.py:1629
+#: waeup/sirp/browser/pages.py:1667 waeup/sirp/browser/pages.py:1711
+#: waeup/sirp/browser/pages.py:1750 waeup/sirp/browser/pages.py:1752
+#: waeup/sirp/browser/pages.py:1787 waeup/sirp/browser/pages.py:1838
+#: waeup/sirp/browser/pages.py:1890
 msgid "Cancel"
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:514
+#: waeup/sirp/browser/pages.py:517
 msgid "Send message to ${a}"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:543 waeup/sirp/browser/viewlets.py:390
+#: waeup/sirp/browser/pages.py:546 waeup/sirp/browser/viewlets.py:390
 msgid "My Preferences"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:556 waeup/sirp/browser/viewlets.py:405
+#: waeup/sirp/browser/pages.py:559 waeup/sirp/browser/viewlets.py:405
 msgid "My Roles"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:587
+#: waeup/sirp/browser/pages.py:590
 msgid "Search Academic Section"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:613
+#: waeup/sirp/browser/pages.py:592 waeup/sirp/browser/viewlets.py:187
+msgid "Search"
+msgstr ""
+
+#: waeup/sirp/browser/pages.py:617
 msgid "View portal configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:626
+#: waeup/sirp/browser/pages.py:630
 msgid "Edit portal configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:627 waeup/sirp/browser/pages.py:676
+#: waeup/sirp/browser/pages.py:631 waeup/sirp/browser/pages.py:680
 msgid "Update plugins"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:629 waeup/sirp/browser/pages.py:657
-#: waeup/sirp/browser/pages.py:688
+#: waeup/sirp/browser/pages.py:633 waeup/sirp/browser/pages.py:661
+#: waeup/sirp/browser/pages.py:692
 msgid "Add session configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:630 waeup/sirp/browser/pages.py:671
-#: waeup/sirp/browser/pages.py:1256 waeup/sirp/browser/pages.py:1267
-#: waeup/sirp/browser/pages.py:1333 waeup/sirp/browser/pages.py:1368
+#: waeup/sirp/browser/pages.py:634 waeup/sirp/browser/pages.py:675
+#: waeup/sirp/browser/pages.py:1260 waeup/sirp/browser/pages.py:1271
+#: waeup/sirp/browser/pages.py:1337 waeup/sirp/browser/pages.py:1372
 msgid "Remove selected"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:654 waeup/sirp/browser/pages.py:727
+#: waeup/sirp/browser/pages.py:658 waeup/sirp/browser/pages.py:731
 msgid "Settings have been saved."
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:668
+#: waeup/sirp/browser/pages.py:672
 msgid "Session ${a} Configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:679
+#: waeup/sirp/browser/pages.py:683
 msgid "Plugins were updated. See log file for details."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:692
+#: waeup/sirp/browser/pages.py:696
 msgid "Add Session Configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:699
+#: waeup/sirp/browser/pages.py:703
 msgid "The session chosen already exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:721
+#: waeup/sirp/browser/pages.py:725
 msgid "Edit academic session ${a} configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:751
+#: waeup/sirp/browser/pages.py:755
 msgid "Upload file"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:753
+#: waeup/sirp/browser/pages.py:757
 msgid "Upload"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:799 waeup/sirp/browser/pages.py:829
-#: waeup/sirp/browser/pages.py:949 waeup/sirp/browser/pages.py:1057
+#: waeup/sirp/browser/pages.py:803 waeup/sirp/browser/pages.py:833
+#: waeup/sirp/browser/pages.py:953 waeup/sirp/browser/pages.py:1061
 msgid "Process CSV file"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:813 waeup/sirp/browser/pages.py:914
-#: waeup/sirp/browser/pages.py:1033
+#: waeup/sirp/browser/pages.py:817 waeup/sirp/browser/pages.py:918
+#: waeup/sirp/browser/pages.py:1037
 msgid "Import aborted."
 msgstr ""
@@ -595,37 +614,37 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:832
+#: waeup/sirp/browser/pages.py:836
 msgid "Back to step 1"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:833
+#: waeup/sirp/browser/pages.py:837
 msgid "Proceed to step 3"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:893
+#: waeup/sirp/browser/pages.py:897
 msgid "Double headers: each column name may only appear once. "
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:901
+#: waeup/sirp/browser/pages.py:905
 msgid "Replace imported file!"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:926
+#: waeup/sirp/browser/pages.py:930
 msgid "Update mode only!"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:952 waeup/sirp/browser/pages.py:1161
+#: waeup/sirp/browser/pages.py:956 waeup/sirp/browser/pages.py:1165
 msgid "Reset"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:953
+#: waeup/sirp/browser/pages.py:957
 msgid "Set headerfields"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:954
+#: waeup/sirp/browser/pages.py:958
 msgid "Back to step 2"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:955
+#: waeup/sirp/browser/pages.py:959
 msgid "Perform import"
 msgstr ""
@@ -653,20 +672,4 @@
 #: waeup/sirp/browser/templates/certificatecoursepage.pt:6
 msgid "Code:"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:106
-msgid "User Id"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:110
-msgid "Local Role"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:5
-msgid "Settings"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:7
-msgid "Local Roles"
 msgstr ""
 
@@ -678,9 +681,4 @@
 
 #: waeup/sirp/browser/templates/certificatepage.pt:28
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:48
-msgid "Level"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatepage.pt:28
 #: waeup/sirp/browser/templates/certificatemanagepage.pt:49
 msgid "Semester"
@@ -692,14 +690,4 @@
 msgstr ""
 
-#: waeup/sirp/browser/templates/certificatepage.pt:29
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
-msgid "Course"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatepage.pt:30
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
-msgid "Title"
-msgstr ""
-
 #: waeup/sirp/browser/templates/certificatepage.pt:30
 #: waeup/sirp/browser/templates/certificatemanagepage.pt:51
@@ -709,9 +697,4 @@
 #: waeup/sirp/browser/templates/configurationmanagepage.pt:5
 msgid "Site Settings"
-msgstr ""
-
-#: waeup/sirp/browser/templates/configurationmanagepage.pt:52
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:108
-msgid "Name"
 msgstr ""
 
@@ -844,7 +827,45 @@
 msgstr ""
 
-#. Default: "Local Roles"
-#: waeup/sirp/browser/templates/facultymanagepage.pt:15
-msgid "local_roles"
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:10
+#: waeup/sirp/browser/templates/departmentpage.pt:3
+msgid "Courses"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:118
+#: waeup/sirp/browser/templates/facultymanagepage.pt:92
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:106
+msgid "User Id"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:120
+#: waeup/sirp/browser/templates/userscontainerpage.pt:5
+#: waeup/sirp/browser/templates/facultymanagepage.pt:94
+#: waeup/sirp/browser/templates/configurationmanagepage.pt:52
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:108
+msgid "Name"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:122
+#: waeup/sirp/browser/templates/facultymanagepage.pt:96
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:110
+msgid "Local Role"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:13
+#: waeup/sirp/browser/templates/departmentpage.pt:6
+msgid "Certificates"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:16
+#: waeup/sirp/browser/templates/userscontainerpage.pt:7
+#: waeup/sirp/browser/templates/facultymanagepage.pt:16
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:7
+msgid "Local Roles"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:6
+#: waeup/sirp/browser/templates/facultymanagepage.pt:6
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:5
+msgid "Settings"
 msgstr ""
 
@@ -853,22 +874,103 @@
 msgstr ""
 
-#. Default: "Code"
-#: waeup/sirp/browser/templates/facultypage.pt:8
-msgid "code"
-msgstr ""
-
-#. Default: "Title"
-#: waeup/sirp/browser/templates/facultypage.pt:9
-msgid "title"
-msgstr ""
-
-#. Default: "My Portal Roles:"
+#: waeup/sirp/browser/templates/loginpage.pt:13
+#: waeup/sirp/browser/templates/usereditformpage.pt:26
+msgid "Password:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/loginpage.pt:24
+msgid "Notice: User names, Ids and passwords are case sensitive."
+msgstr ""
+
+#. Default: "Don't forget to logout or exit your browser when you're done. If you are having trouble logging in, make sure to enable cookies in your web browser."
+#: waeup/sirp/browser/templates/loginpage.pt:36
+msgid "login_trouble1"
+msgstr ""
+
+#. Default: "You don't have an account because you are a fresh student, or your student record has just been created? Acquire a Password Access Code (PWD) and inititialize your student account <strong><a href=\"setpassword\"> here</a></strong>."
+#: waeup/sirp/browser/templates/loginpage.pt:39
+msgid "login_trouble2"
+msgstr ""
+
+#. Default: "Or simply forgot your student id or password? Then request a new password <strong><a href=\"changepw\"> here</a></strong>."
+#: waeup/sirp/browser/templates/loginpage.pt:44
+msgid "login_trouble3"
+msgstr ""
+
+#: waeup/sirp/browser/templates/loginpage.pt:5
+msgid "User Name or Id:"
+msgstr ""
+
 #: waeup/sirp/browser/templates/myrolespage.pt:1
-msgid "my_portal_roles"
-msgstr ""
-
-#. Default: "My Local Roles:"
-#: waeup/sirp/browser/templates/myrolespage.pt:10
-msgid "my_local_roles"
+msgid "My Portal Roles:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/myrolespage.pt:11
+msgid "My Local Roles:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/notfound.pt:1
+msgid "The page you are trying to access is not available."
+msgstr ""
+
+#: waeup/sirp/browser/templates/notfound.pt:12
+msgid "You might be trying to access a non-existing page."
+msgstr ""
+
+#: waeup/sirp/browser/templates/notfound.pt:6
+msgid "Please note the following:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/notfound.pt:9
+msgid "You might have misspelled the URL."
+msgstr ""
+
+#: waeup/sirp/browser/templates/searchpage.pt:15
+msgid "Type"
+msgstr ""
+
+#: waeup/sirp/browser/templates/searchpage.pt:9
+msgid "Search Results"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:4
+msgid "Student Id"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:5
+msgid "Fullname"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:6
+msgid "Status"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:7
+msgid "Certificate"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:8
+msgid "Current Session"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:9
+msgid "Current Level"
+msgstr ""
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:101
+#: waeup/sirp/browser/templates/studentsitelayout.pt:86
+msgid "Form Status:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:113
+#: waeup/sirp/browser/templates/studentsitelayout.pt:99
+msgid "Back to top"
+msgstr ""
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:114
+#: waeup/sirp/browser/templates/studentsitelayout.pt:100
+msgid ""
+"Student Information and Registration Portal<br /> Copyright &copy; WAeUP "
+"Group, 2008-2012"
 msgstr ""
 
@@ -883,14 +985,26 @@
 msgstr ""
 
+#: waeup/sirp/browser/templates/staffsitelayout.pt:60
+msgid "Student Id:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:64
+msgid "State:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/usereditformpage.pt:32
+msgid "Retype password:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/userscontainerpage.pt:4
+msgid "User ID"
+msgstr ""
+
+#: waeup/sirp/browser/templates/userscontainerpage.pt:6
+msgid "Portal Roles"
+msgstr ""
+
 #: waeup/sirp/browser/viewlets.py:167
 msgid "Add"
-msgstr ""
-
-#: waeup/sirp/browser/viewlets.py:177
-msgid "Remove"
-msgstr ""
-
-#: waeup/sirp/browser/viewlets.py:187
-msgid "Search"
 msgstr ""
 
@@ -1142,7 +1256,118 @@
 msgstr ""
 
-#. Default: "Name of faculty"
+#: waeup/sirp/university/interfaces.py:146
+msgid "Title of course"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:152
+msgid "Credits"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:158
+msgid "Passmark"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:164
+msgid "Semester/Term"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:180
+msgid "Enter unique course code which will become part of the URL."
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:199
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:62
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:91
+#: waeup/sirp/browser/templates/facultypage.pt:9
+#: waeup/sirp/browser/templates/departmentpage.pt:16
+#: waeup/sirp/browser/templates/departmentpage.pt:40
+#: waeup/sirp/browser/templates/searchpage.pt:14
+#: waeup/sirp/browser/templates/certificatepage.pt:30
+#: waeup/sirp/browser/templates/facultymanagepage.pt:64
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
+msgid "Title"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:205
+msgid "Study Mode"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:212
+msgid "Start Level"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:219
+msgid "End Level"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:226
+msgid "Application Category"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:243
+msgid "Enter unique certificate code which will become part of the URL."
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:264
+msgid "Course Referrer"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:270
+#: waeup/sirp/browser/templates/certificatepage.pt:28
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:48
+msgid "Level"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:277
+msgid "Is mandatory course (not elective)"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:299
+#: waeup/sirp/browser/templates/certificatepage.pt:29
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
+msgid "Course"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:38
+#: waeup/sirp/university/interfaces.py:66
+#: waeup/sirp/university/interfaces.py:86
+#: waeup/sirp/university/interfaces.py:117
+#: waeup/sirp/university/interfaces.py:139
+#: waeup/sirp/university/interfaces.py:179
+#: waeup/sirp/university/interfaces.py:192
+#: waeup/sirp/university/interfaces.py:241
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:60
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:89
+#: waeup/sirp/browser/templates/facultypage.pt:8
+#: waeup/sirp/browser/templates/departmentpage.pt:15
+#: waeup/sirp/browser/templates/departmentpage.pt:39
+#: waeup/sirp/browser/templates/searchpage.pt:13
+#: waeup/sirp/browser/templates/facultymanagepage.pt:62
+msgid "Code"
+msgstr ""
+
 #: waeup/sirp/university/interfaces.py:45
-msgid "name_of_faculty"
+msgid "Name of faculty"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:46
+#: waeup/sirp/university/interfaces.py:94
+#: waeup/sirp/university/interfaces.py:147
+#: waeup/sirp/university/interfaces.py:200
+msgid "Unnamed"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:51
+#: waeup/sirp/university/interfaces.py:99
+msgid "Name prefix"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:67
+#: waeup/sirp/university/interfaces.py:118
+msgid "This code will become part of the URL."
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:93
+msgid "Name of department"
 msgstr ""
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/locales/ha/LC_MESSAGES/waeup.sirp.po
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/locales/ha/LC_MESSAGES/waeup.sirp.po	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/locales/ha/LC_MESSAGES/waeup.sirp.po	(revision 7707)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.SIRP\n"
-"POT-Creation-Date: Sun Feb 26 17:19:06 2012\n"
+"POT-Creation-Date: Mon Feb 27 09:31:07 2012\n"
 "PO-Revision-Date: 2012-02-22 11:28+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -181,5 +181,5 @@
 msgstr ""
 
-#: waeup/sirp/browser/breadcrumbs.py:123 waeup/sirp/browser/pages.py:308
+#: waeup/sirp/browser/breadcrumbs.py:123 waeup/sirp/browser/pages.py:309
 msgid "Administration"
 msgstr ""
@@ -190,11 +190,11 @@
 msgstr ""
 
-#: waeup/sirp/browser/breadcrumbs.py:148 waeup/sirp/browser/pages.py:385
+#: waeup/sirp/browser/breadcrumbs.py:148 waeup/sirp/browser/pages.py:386
 #: waeup/sirp/browser/viewlets.py:365 waeup/sirp/browser/viewlets.py:666
 msgid "Portal Users"
 msgstr ""
 
-#: waeup/sirp/browser/breadcrumbs.py:155 waeup/sirp/browser/pages.py:744
-#: waeup/sirp/browser/pages.py:1136 waeup/sirp/browser/viewlets.py:383
+#: waeup/sirp/browser/breadcrumbs.py:155 waeup/sirp/browser/pages.py:748
+#: waeup/sirp/browser/pages.py:1140 waeup/sirp/browser/viewlets.py:383
 #: waeup/sirp/browser/viewlets.py:675
 msgid "Data Center"
@@ -205,5 +205,5 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1012
+#: waeup/sirp/browser/pages.py:1016
 msgid "Edit headers or replace imported file!"
 msgstr ""
@@ -214,31 +214,31 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1059
+#: waeup/sirp/browser/pages.py:1063
 msgid "View processing log"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1060
+#: waeup/sirp/browser/pages.py:1064
 msgid "Back to data center"
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1104
+#: waeup/sirp/browser/pages.py:1108
 msgid "Processing of ${a} rows failed."
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1106
+#: waeup/sirp/browser/pages.py:1110
 msgid "Successfully processed ${a} rows."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1114
+#: waeup/sirp/browser/pages.py:1118
 msgid "Show logfiles"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1116
+#: waeup/sirp/browser/pages.py:1120
 msgid "Back to Data Center"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1117
+#: waeup/sirp/browser/pages.py:1121
 msgid "Show"
 msgstr ""
@@ -248,63 +248,63 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1158
+#: waeup/sirp/browser/pages.py:1162
 msgid "Edit data center settings"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1178
+#: waeup/sirp/browser/pages.py:1182
 msgid "File already existed (not copied):"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1180
+#: waeup/sirp/browser/pages.py:1184
 msgid "Given storage path cannot be used."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1181
+#: waeup/sirp/browser/pages.py:1185
 msgid "Error:"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1184
+#: waeup/sirp/browser/pages.py:1188
 msgid "New storage path succefully set."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1244
+#: waeup/sirp/browser/pages.py:1248
 msgid "Academic Section"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1256 waeup/sirp/browser/pages.py:1272
-#: waeup/sirp/browser/pages.py:1289 waeup/sirp/browser/pages.py:1293
+#: waeup/sirp/browser/pages.py:1260 waeup/sirp/browser/pages.py:1276
+#: waeup/sirp/browser/pages.py:1293 waeup/sirp/browser/pages.py:1297
 msgid "Add faculty"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1257
+#: waeup/sirp/browser/pages.py:1261
 msgid "Faculties"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1261 waeup/sirp/browser/viewlets.py:431
+#: waeup/sirp/browser/pages.py:1265 waeup/sirp/browser/viewlets.py:431
 msgid "Manage academic section"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1300
+#: waeup/sirp/browser/pages.py:1304
 msgid "The faculty code chosen already exists."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1321 waeup/sirp/browser/pages.py:1331
+#: waeup/sirp/browser/pages.py:1325 waeup/sirp/browser/pages.py:1335
 msgid "Departments"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1333 waeup/sirp/browser/pages.py:1384
-#: waeup/sirp/browser/pages.py:1403 waeup/sirp/browser/pages.py:1407
+#: waeup/sirp/browser/pages.py:1337 waeup/sirp/browser/pages.py:1388
+#: waeup/sirp/browser/pages.py:1407 waeup/sirp/browser/pages.py:1411
 msgid "Add department"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1334 waeup/sirp/browser/pages.py:1393
-#: waeup/sirp/browser/pages.py:1503 waeup/sirp/browser/pages.py:1589
-#: waeup/sirp/browser/pages.py:1749 waeup/sirp/browser/pages.py:1806
+#: waeup/sirp/browser/pages.py:1338 waeup/sirp/browser/pages.py:1397
+#: waeup/sirp/browser/pages.py:1507 waeup/sirp/browser/pages.py:1593
+#: waeup/sirp/browser/pages.py:1753 waeup/sirp/browser/pages.py:1810
 msgid "Remove selected local roles"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1335 waeup/sirp/browser/pages.py:1389
-#: waeup/sirp/browser/pages.py:1504 waeup/sirp/browser/pages.py:1585
-#: waeup/sirp/browser/pages.py:1750 waeup/sirp/browser/pages.py:1802
+#: waeup/sirp/browser/pages.py:1339 waeup/sirp/browser/pages.py:1393
+#: waeup/sirp/browser/pages.py:1508 waeup/sirp/browser/pages.py:1589
+#: waeup/sirp/browser/pages.py:1754 waeup/sirp/browser/pages.py:1806
 msgid "Add local role"
 msgstr ""
@@ -315,50 +315,50 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1341 waeup/sirp/browser/viewlets.py:447
+#: waeup/sirp/browser/pages.py:1345 waeup/sirp/browser/viewlets.py:447
 msgid "Manage faculty"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1376 waeup/sirp/browser/pages.py:1698
-#: waeup/sirp/browser/pages.py:1770 waeup/sirp/browser/pages.py:1882
+#: waeup/sirp/browser/pages.py:1380 waeup/sirp/browser/pages.py:1702
+#: waeup/sirp/browser/pages.py:1774 waeup/sirp/browser/pages.py:1886
 msgid "Form has been saved."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1414
+#: waeup/sirp/browser/pages.py:1418
 msgid "The code chosen already exists in this faculty."
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1417
+#: waeup/sirp/browser/pages.py:1421
 msgid "Department ${a} added."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1434
+#: waeup/sirp/browser/pages.py:1438
 msgid "Courses and Certificates"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1464 waeup/sirp/browser/pages.py:1483
+#: waeup/sirp/browser/pages.py:1468 waeup/sirp/browser/pages.py:1487
 #: waeup/sirp/students/viewlets.py:466
 msgid "Students"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1500 waeup/sirp/browser/pages.py:1558
+#: waeup/sirp/browser/pages.py:1504 waeup/sirp/browser/pages.py:1562
 msgid "Remove selected courses"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1500 waeup/sirp/browser/pages.py:1570
-#: waeup/sirp/browser/pages.py:1599 waeup/sirp/browser/pages.py:1603
+#: waeup/sirp/browser/pages.py:1504 waeup/sirp/browser/pages.py:1574
+#: waeup/sirp/browser/pages.py:1603 waeup/sirp/browser/pages.py:1607
 msgid "Add course"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1501 waeup/sirp/browser/pages.py:1564
+#: waeup/sirp/browser/pages.py:1505 waeup/sirp/browser/pages.py:1568
 msgid "Remove selected certificates"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1501 waeup/sirp/browser/pages.py:1575
-#: waeup/sirp/browser/pages.py:1636 waeup/sirp/browser/pages.py:1640
+#: waeup/sirp/browser/pages.py:1505 waeup/sirp/browser/pages.py:1579
+#: waeup/sirp/browser/pages.py:1640 waeup/sirp/browser/pages.py:1644
 msgid "Add certificate"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1510 waeup/sirp/browser/viewlets.py:454
+#: waeup/sirp/browser/pages.py:1514 waeup/sirp/browser/viewlets.py:454
 msgid "Manage department"
 msgstr ""
@@ -370,99 +370,112 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:159
+#: waeup/sirp/browser/pages.py:160
 msgid "You logged in."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1615
+#: waeup/sirp/browser/pages.py:1619
 msgid "A course with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1621
+#: waeup/sirp/browser/pages.py:1625
 msgid "Course ${a} successfully created."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1652
+#: waeup/sirp/browser/pages.py:1656
 msgid "A certificate with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1658
+#: waeup/sirp/browser/pages.py:1662
 msgid "Certificate ${a} successfully created."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1690 waeup/sirp/browser/viewlets.py:471
+#: waeup/sirp/browser/pages.py:1694 waeup/sirp/browser/viewlets.py:471
 msgid "Edit course"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1740
+#: waeup/sirp/browser/pages.py:1744
 msgid "Edit certificate"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1747 waeup/sirp/browser/pages.py:1778
-#: waeup/sirp/browser/pages.py:1819 waeup/sirp/browser/pages.py:1821
+#: waeup/sirp/browser/pages.py:1751 waeup/sirp/browser/pages.py:1782
+#: waeup/sirp/browser/pages.py:1823 waeup/sirp/browser/pages.py:1825
 msgid "Add course referrer"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1748 waeup/sirp/browser/pages.py:1773
+#: waeup/sirp/browser/pages.py:1752 waeup/sirp/browser/pages.py:1777
 msgid "Remove selected course referrers"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1754 waeup/sirp/browser/viewlets.py:478
+#: waeup/sirp/browser/pages.py:1758 waeup/sirp/browser/viewlets.py:478
 msgid "Manage certificate"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:177
+#: waeup/sirp/browser/pages.py:178
 msgid "You entered wrong credentials."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1826
+#: waeup/sirp/browser/pages.py:1830
 msgid "The chosen course referrer is already part of this certificate."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1867 waeup/sirp/browser/viewlets.py:495
+#. Default: ""
+#: waeup/sirp/browser/pages.py:1834
+msgid "Course referrer ${a}_${b} added."
+msgstr ""
+
+#: waeup/sirp/browser/pages.py:1871 waeup/sirp/browser/viewlets.py:495
 msgid "Edit course referrer"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1870
+#: waeup/sirp/browser/pages.py:1874
 msgid "Save and return"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:191
+#: waeup/sirp/browser/pages.py:192
 msgid "You have been logged out. Thanks for using WAeUP SIRP!"
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:227
+#: waeup/sirp/browser/pages.py:228
 msgid "Contact ${a}"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:233 waeup/sirp/browser/pages.py:516
+#: waeup/sirp/browser/pages.py:234 waeup/sirp/browser/pages.py:519
 msgid "Send message now"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:252 waeup/sirp/browser/pages.py:271
-#: waeup/sirp/browser/pages.py:533
+#: waeup/sirp/browser/pages.py:253 waeup/sirp/browser/pages.py:272
+#: waeup/sirp/browser/pages.py:536
 msgid "Your message has been sent."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:262
+#: waeup/sirp/browser/pages.py:263
 msgid "Send now"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:273
+#: waeup/sirp/browser/pages.py:274
 msgid "A smtp server error occurred."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:298
+#: waeup/sirp/browser/pages.py:299
 msgid "<h1>Welcome to WAeUP.SIRP</h1>"
 msgstr ""
 
-#. Default: ""
-#: waeup/sirp/browser/pages.py:392
+#: waeup/sirp/browser/pages.py:387
+msgid "Manage"
+msgstr ""
+
+#: waeup/sirp/browser/pages.py:388 waeup/sirp/browser/viewlets.py:177
+msgid "Remove"
+msgstr ""
+
+#. Default: ""
+#: waeup/sirp/browser/pages.py:395
 msgid "User account ${a} successfully deleted."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:423 waeup/sirp/browser/pages.py:425
+#: waeup/sirp/browser/pages.py:426 waeup/sirp/browser/pages.py:428
 #: waeup/sirp/browser/viewlets.py:505
 msgid "Add user"
@@ -470,122 +483,128 @@
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:447
+#: waeup/sirp/browser/pages.py:450
 msgid "User account ${a} successfully added."
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:466
+#: waeup/sirp/browser/pages.py:469
 msgid "Edit user ${a}"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:473 waeup/sirp/browser/pages.py:627
-#: waeup/sirp/browser/pages.py:724 waeup/sirp/browser/pages.py:1160
-#: waeup/sirp/browser/pages.py:1332 waeup/sirp/browser/pages.py:1499
-#: waeup/sirp/browser/pages.py:1552 waeup/sirp/browser/pages.py:1695
-#: waeup/sirp/browser/pages.py:1746
+#: waeup/sirp/browser/pages.py:476 waeup/sirp/browser/pages.py:631
+#: waeup/sirp/browser/pages.py:654 waeup/sirp/browser/pages.py:728
+#: waeup/sirp/browser/pages.py:1164 waeup/sirp/browser/pages.py:1336
+#: waeup/sirp/browser/pages.py:1377 waeup/sirp/browser/pages.py:1503
+#: waeup/sirp/browser/pages.py:1556 waeup/sirp/browser/pages.py:1699
+#: waeup/sirp/browser/pages.py:1750 waeup/sirp/browser/pages.py:1771
 msgid "Save"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:497
+#: waeup/sirp/browser/pages.py:500
 msgid "User settings have been saved."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:500 waeup/sirp/browser/pages.py:704
-#: waeup/sirp/browser/pages.py:731 waeup/sirp/browser/pages.py:754
-#: waeup/sirp/browser/pages.py:801 waeup/sirp/browser/pages.py:831
-#: waeup/sirp/browser/pages.py:951 waeup/sirp/browser/pages.py:1162
-#: waeup/sirp/browser/pages.py:1256 waeup/sirp/browser/pages.py:1277
-#: waeup/sirp/browser/pages.py:1304 waeup/sirp/browser/pages.py:1332
-#: waeup/sirp/browser/pages.py:1333 waeup/sirp/browser/pages.py:1379
-#: waeup/sirp/browser/pages.py:1420 waeup/sirp/browser/pages.py:1499
-#: waeup/sirp/browser/pages.py:1500 waeup/sirp/browser/pages.py:1502
-#: waeup/sirp/browser/pages.py:1580 waeup/sirp/browser/pages.py:1663
-#: waeup/sirp/browser/pages.py:1707 waeup/sirp/browser/pages.py:1746
-#: waeup/sirp/browser/pages.py:1748 waeup/sirp/browser/pages.py:1783
-#: waeup/sirp/browser/pages.py:1834 waeup/sirp/browser/pages.py:1886
+#: waeup/sirp/browser/pages.py:503 waeup/sirp/browser/pages.py:708
+#: waeup/sirp/browser/pages.py:735 waeup/sirp/browser/pages.py:758
+#: waeup/sirp/browser/pages.py:805 waeup/sirp/browser/pages.py:835
+#: waeup/sirp/browser/pages.py:955 waeup/sirp/browser/pages.py:1166
+#: waeup/sirp/browser/pages.py:1260 waeup/sirp/browser/pages.py:1281
+#: waeup/sirp/browser/pages.py:1308 waeup/sirp/browser/pages.py:1336
+#: waeup/sirp/browser/pages.py:1337 waeup/sirp/browser/pages.py:1383
+#: waeup/sirp/browser/pages.py:1424 waeup/sirp/browser/pages.py:1503
+#: waeup/sirp/browser/pages.py:1504 waeup/sirp/browser/pages.py:1506
+#: waeup/sirp/browser/pages.py:1584 waeup/sirp/browser/pages.py:1629
+#: waeup/sirp/browser/pages.py:1667 waeup/sirp/browser/pages.py:1711
+#: waeup/sirp/browser/pages.py:1750 waeup/sirp/browser/pages.py:1752
+#: waeup/sirp/browser/pages.py:1787 waeup/sirp/browser/pages.py:1838
+#: waeup/sirp/browser/pages.py:1890
 msgid "Cancel"
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:514
+#: waeup/sirp/browser/pages.py:517
 msgid "Send message to ${a}"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:543 waeup/sirp/browser/viewlets.py:390
+#: waeup/sirp/browser/pages.py:546 waeup/sirp/browser/viewlets.py:390
 msgid "My Preferences"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:556 waeup/sirp/browser/viewlets.py:405
+#: waeup/sirp/browser/pages.py:559 waeup/sirp/browser/viewlets.py:405
 msgid "My Roles"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:587
+#: waeup/sirp/browser/pages.py:590
 msgid "Search Academic Section"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:613
+#: waeup/sirp/browser/pages.py:592 waeup/sirp/browser/viewlets.py:187
+msgid "Search"
+msgstr ""
+
+#: waeup/sirp/browser/pages.py:617
 msgid "View portal configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:626
+#: waeup/sirp/browser/pages.py:630
 msgid "Edit portal configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:627 waeup/sirp/browser/pages.py:676
+#: waeup/sirp/browser/pages.py:631 waeup/sirp/browser/pages.py:680
 msgid "Update plugins"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:629 waeup/sirp/browser/pages.py:657
-#: waeup/sirp/browser/pages.py:688
+#: waeup/sirp/browser/pages.py:633 waeup/sirp/browser/pages.py:661
+#: waeup/sirp/browser/pages.py:692
 msgid "Add session configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:630 waeup/sirp/browser/pages.py:671
-#: waeup/sirp/browser/pages.py:1256 waeup/sirp/browser/pages.py:1267
-#: waeup/sirp/browser/pages.py:1333 waeup/sirp/browser/pages.py:1368
+#: waeup/sirp/browser/pages.py:634 waeup/sirp/browser/pages.py:675
+#: waeup/sirp/browser/pages.py:1260 waeup/sirp/browser/pages.py:1271
+#: waeup/sirp/browser/pages.py:1337 waeup/sirp/browser/pages.py:1372
 msgid "Remove selected"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:654 waeup/sirp/browser/pages.py:727
+#: waeup/sirp/browser/pages.py:658 waeup/sirp/browser/pages.py:731
 msgid "Settings have been saved."
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:668
+#: waeup/sirp/browser/pages.py:672
 msgid "Session ${a} Configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:679
+#: waeup/sirp/browser/pages.py:683
 msgid "Plugins were updated. See log file for details."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:692
+#: waeup/sirp/browser/pages.py:696
 msgid "Add Session Configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:699
+#: waeup/sirp/browser/pages.py:703
 msgid "The session chosen already exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:721
+#: waeup/sirp/browser/pages.py:725
 msgid "Edit academic session ${a} configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:751
+#: waeup/sirp/browser/pages.py:755
 msgid "Upload file"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:753
+#: waeup/sirp/browser/pages.py:757
 msgid "Upload"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:799 waeup/sirp/browser/pages.py:829
-#: waeup/sirp/browser/pages.py:949 waeup/sirp/browser/pages.py:1057
+#: waeup/sirp/browser/pages.py:803 waeup/sirp/browser/pages.py:833
+#: waeup/sirp/browser/pages.py:953 waeup/sirp/browser/pages.py:1061
 msgid "Process CSV file"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:813 waeup/sirp/browser/pages.py:914
-#: waeup/sirp/browser/pages.py:1033
+#: waeup/sirp/browser/pages.py:817 waeup/sirp/browser/pages.py:918
+#: waeup/sirp/browser/pages.py:1037
 msgid "Import aborted."
 msgstr ""
@@ -595,37 +614,37 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:832
+#: waeup/sirp/browser/pages.py:836
 msgid "Back to step 1"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:833
+#: waeup/sirp/browser/pages.py:837
 msgid "Proceed to step 3"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:893
+#: waeup/sirp/browser/pages.py:897
 msgid "Double headers: each column name may only appear once. "
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:901
+#: waeup/sirp/browser/pages.py:905
 msgid "Replace imported file!"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:926
+#: waeup/sirp/browser/pages.py:930
 msgid "Update mode only!"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:952 waeup/sirp/browser/pages.py:1161
+#: waeup/sirp/browser/pages.py:956 waeup/sirp/browser/pages.py:1165
 msgid "Reset"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:953
+#: waeup/sirp/browser/pages.py:957
 msgid "Set headerfields"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:954
+#: waeup/sirp/browser/pages.py:958
 msgid "Back to step 2"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:955
+#: waeup/sirp/browser/pages.py:959
 msgid "Perform import"
 msgstr ""
@@ -653,20 +672,4 @@
 #: waeup/sirp/browser/templates/certificatecoursepage.pt:6
 msgid "Code:"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:106
-msgid "User Id"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:110
-msgid "Local Role"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:5
-msgid "Settings"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:7
-msgid "Local Roles"
 msgstr ""
 
@@ -678,9 +681,4 @@
 
 #: waeup/sirp/browser/templates/certificatepage.pt:28
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:48
-msgid "Level"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatepage.pt:28
 #: waeup/sirp/browser/templates/certificatemanagepage.pt:49
 msgid "Semester"
@@ -692,14 +690,4 @@
 msgstr ""
 
-#: waeup/sirp/browser/templates/certificatepage.pt:29
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
-msgid "Course"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatepage.pt:30
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
-msgid "Title"
-msgstr ""
-
 #: waeup/sirp/browser/templates/certificatepage.pt:30
 #: waeup/sirp/browser/templates/certificatemanagepage.pt:51
@@ -709,9 +697,4 @@
 #: waeup/sirp/browser/templates/configurationmanagepage.pt:5
 msgid "Site Settings"
-msgstr ""
-
-#: waeup/sirp/browser/templates/configurationmanagepage.pt:52
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:108
-msgid "Name"
 msgstr ""
 
@@ -844,7 +827,45 @@
 msgstr ""
 
-#. Default: "Local Roles"
-#: waeup/sirp/browser/templates/facultymanagepage.pt:15
-msgid "local_roles"
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:10
+#: waeup/sirp/browser/templates/departmentpage.pt:3
+msgid "Courses"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:118
+#: waeup/sirp/browser/templates/facultymanagepage.pt:92
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:106
+msgid "User Id"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:120
+#: waeup/sirp/browser/templates/userscontainerpage.pt:5
+#: waeup/sirp/browser/templates/facultymanagepage.pt:94
+#: waeup/sirp/browser/templates/configurationmanagepage.pt:52
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:108
+msgid "Name"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:122
+#: waeup/sirp/browser/templates/facultymanagepage.pt:96
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:110
+msgid "Local Role"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:13
+#: waeup/sirp/browser/templates/departmentpage.pt:6
+msgid "Certificates"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:16
+#: waeup/sirp/browser/templates/userscontainerpage.pt:7
+#: waeup/sirp/browser/templates/facultymanagepage.pt:16
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:7
+msgid "Local Roles"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:6
+#: waeup/sirp/browser/templates/facultymanagepage.pt:6
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:5
+msgid "Settings"
 msgstr ""
 
@@ -853,22 +874,103 @@
 msgstr ""
 
-#. Default: "Code"
-#: waeup/sirp/browser/templates/facultypage.pt:8
-msgid "code"
-msgstr ""
-
-#. Default: "Title"
-#: waeup/sirp/browser/templates/facultypage.pt:9
-msgid "title"
-msgstr ""
-
-#. Default: "My Portal Roles:"
+#: waeup/sirp/browser/templates/loginpage.pt:13
+#: waeup/sirp/browser/templates/usereditformpage.pt:26
+msgid "Password:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/loginpage.pt:24
+msgid "Notice: User names, Ids and passwords are case sensitive."
+msgstr ""
+
+#. Default: "Don't forget to logout or exit your browser when you're done. If you are having trouble logging in, make sure to enable cookies in your web browser."
+#: waeup/sirp/browser/templates/loginpage.pt:36
+msgid "login_trouble1"
+msgstr ""
+
+#. Default: "You don't have an account because you are a fresh student, or your student record has just been created? Acquire a Password Access Code (PWD) and inititialize your student account <strong><a href=\"setpassword\"> here</a></strong>."
+#: waeup/sirp/browser/templates/loginpage.pt:39
+msgid "login_trouble2"
+msgstr ""
+
+#. Default: "Or simply forgot your student id or password? Then request a new password <strong><a href=\"changepw\"> here</a></strong>."
+#: waeup/sirp/browser/templates/loginpage.pt:44
+msgid "login_trouble3"
+msgstr ""
+
+#: waeup/sirp/browser/templates/loginpage.pt:5
+msgid "User Name or Id:"
+msgstr ""
+
 #: waeup/sirp/browser/templates/myrolespage.pt:1
-msgid "my_portal_roles"
-msgstr ""
-
-#. Default: "My Local Roles:"
-#: waeup/sirp/browser/templates/myrolespage.pt:10
-msgid "my_local_roles"
+msgid "My Portal Roles:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/myrolespage.pt:11
+msgid "My Local Roles:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/notfound.pt:1
+msgid "The page you are trying to access is not available."
+msgstr ""
+
+#: waeup/sirp/browser/templates/notfound.pt:12
+msgid "You might be trying to access a non-existing page."
+msgstr ""
+
+#: waeup/sirp/browser/templates/notfound.pt:6
+msgid "Please note the following:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/notfound.pt:9
+msgid "You might have misspelled the URL."
+msgstr ""
+
+#: waeup/sirp/browser/templates/searchpage.pt:15
+msgid "Type"
+msgstr ""
+
+#: waeup/sirp/browser/templates/searchpage.pt:9
+msgid "Search Results"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:4
+msgid "Student Id"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:5
+msgid "Fullname"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:6
+msgid "Status"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:7
+msgid "Certificate"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:8
+msgid "Current Session"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:9
+msgid "Current Level"
+msgstr ""
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:101
+#: waeup/sirp/browser/templates/studentsitelayout.pt:86
+msgid "Form Status:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:113
+#: waeup/sirp/browser/templates/studentsitelayout.pt:99
+msgid "Back to top"
+msgstr ""
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:114
+#: waeup/sirp/browser/templates/studentsitelayout.pt:100
+msgid ""
+"Student Information and Registration Portal<br /> Copyright &copy; WAeUP "
+"Group, 2008-2012"
 msgstr ""
 
@@ -883,14 +985,26 @@
 msgstr ""
 
+#: waeup/sirp/browser/templates/staffsitelayout.pt:60
+msgid "Student Id:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:64
+msgid "State:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/usereditformpage.pt:32
+msgid "Retype password:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/userscontainerpage.pt:4
+msgid "User ID"
+msgstr ""
+
+#: waeup/sirp/browser/templates/userscontainerpage.pt:6
+msgid "Portal Roles"
+msgstr ""
+
 #: waeup/sirp/browser/viewlets.py:167
 msgid "Add"
-msgstr ""
-
-#: waeup/sirp/browser/viewlets.py:177
-msgid "Remove"
-msgstr ""
-
-#: waeup/sirp/browser/viewlets.py:187
-msgid "Search"
 msgstr ""
 
@@ -1142,7 +1256,118 @@
 msgstr ""
 
-#. Default: "Name of faculty"
+#: waeup/sirp/university/interfaces.py:146
+msgid "Title of course"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:152
+msgid "Credits"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:158
+msgid "Passmark"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:164
+msgid "Semester/Term"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:180
+msgid "Enter unique course code which will become part of the URL."
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:199
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:62
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:91
+#: waeup/sirp/browser/templates/facultypage.pt:9
+#: waeup/sirp/browser/templates/departmentpage.pt:16
+#: waeup/sirp/browser/templates/departmentpage.pt:40
+#: waeup/sirp/browser/templates/searchpage.pt:14
+#: waeup/sirp/browser/templates/certificatepage.pt:30
+#: waeup/sirp/browser/templates/facultymanagepage.pt:64
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
+msgid "Title"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:205
+msgid "Study Mode"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:212
+msgid "Start Level"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:219
+msgid "End Level"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:226
+msgid "Application Category"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:243
+msgid "Enter unique certificate code which will become part of the URL."
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:264
+msgid "Course Referrer"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:270
+#: waeup/sirp/browser/templates/certificatepage.pt:28
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:48
+msgid "Level"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:277
+msgid "Is mandatory course (not elective)"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:299
+#: waeup/sirp/browser/templates/certificatepage.pt:29
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
+msgid "Course"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:38
+#: waeup/sirp/university/interfaces.py:66
+#: waeup/sirp/university/interfaces.py:86
+#: waeup/sirp/university/interfaces.py:117
+#: waeup/sirp/university/interfaces.py:139
+#: waeup/sirp/university/interfaces.py:179
+#: waeup/sirp/university/interfaces.py:192
+#: waeup/sirp/university/interfaces.py:241
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:60
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:89
+#: waeup/sirp/browser/templates/facultypage.pt:8
+#: waeup/sirp/browser/templates/departmentpage.pt:15
+#: waeup/sirp/browser/templates/departmentpage.pt:39
+#: waeup/sirp/browser/templates/searchpage.pt:13
+#: waeup/sirp/browser/templates/facultymanagepage.pt:62
+msgid "Code"
+msgstr ""
+
 #: waeup/sirp/university/interfaces.py:45
-msgid "name_of_faculty"
+msgid "Name of faculty"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:46
+#: waeup/sirp/university/interfaces.py:94
+#: waeup/sirp/university/interfaces.py:147
+#: waeup/sirp/university/interfaces.py:200
+msgid "Unnamed"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:51
+#: waeup/sirp/university/interfaces.py:99
+msgid "Name prefix"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:67
+#: waeup/sirp/university/interfaces.py:118
+msgid "This code will become part of the URL."
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:93
+msgid "Name of department"
 msgstr ""
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/locales/waeup.sirp.pot
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/locales/waeup.sirp.pot	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/locales/waeup.sirp.pot	(revision 7707)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sun Feb 26 17:21:06 2012\n"
+"POT-Creation-Date: Mon Feb 27 09:31:07 2012\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -190,5 +190,5 @@
 
 #: waeup/sirp/browser/breadcrumbs.py:123
-#: waeup/sirp/browser/pages.py:308
+#: waeup/sirp/browser/pages.py:309
 msgid "Administration"
 msgstr ""
@@ -201,5 +201,5 @@
 
 #: waeup/sirp/browser/breadcrumbs.py:148
-#: waeup/sirp/browser/pages.py:385
+#: waeup/sirp/browser/pages.py:386
 #: waeup/sirp/browser/viewlets.py:365
 #: waeup/sirp/browser/viewlets.py:666
@@ -208,6 +208,6 @@
 
 #: waeup/sirp/browser/breadcrumbs.py:155
-#: waeup/sirp/browser/pages.py:744
-#: waeup/sirp/browser/pages.py:1136
+#: waeup/sirp/browser/pages.py:748
+#: waeup/sirp/browser/pages.py:1140
 #: waeup/sirp/browser/viewlets.py:383
 #: waeup/sirp/browser/viewlets.py:675
@@ -219,5 +219,5 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1012
+#: waeup/sirp/browser/pages.py:1016
 msgid "Edit headers or replace imported file!"
 msgstr ""
@@ -228,31 +228,31 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1059
+#: waeup/sirp/browser/pages.py:1063
 msgid "View processing log"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1060
+#: waeup/sirp/browser/pages.py:1064
 msgid "Back to data center"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1104
+#: waeup/sirp/browser/pages.py:1108
 #. Default: ""
 msgid "Processing of ${a} rows failed."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1106
+#: waeup/sirp/browser/pages.py:1110
 #. Default: ""
 msgid "Successfully processed ${a} rows."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1114
+#: waeup/sirp/browser/pages.py:1118
 msgid "Show logfiles"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1116
+#: waeup/sirp/browser/pages.py:1120
 msgid "Back to Data Center"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1117
+#: waeup/sirp/browser/pages.py:1121
 msgid "Show"
 msgstr ""
@@ -262,75 +262,75 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1158
+#: waeup/sirp/browser/pages.py:1162
 msgid "Edit data center settings"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1178
+#: waeup/sirp/browser/pages.py:1182
 msgid "File already existed (not copied):"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1180
+#: waeup/sirp/browser/pages.py:1184
 msgid "Given storage path cannot be used."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1181
+#: waeup/sirp/browser/pages.py:1185
 msgid "Error:"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1184
+#: waeup/sirp/browser/pages.py:1188
 msgid "New storage path succefully set."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1244
+#: waeup/sirp/browser/pages.py:1248
 msgid "Academic Section"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1256
-#: waeup/sirp/browser/pages.py:1272
-#: waeup/sirp/browser/pages.py:1289
+#: waeup/sirp/browser/pages.py:1260
+#: waeup/sirp/browser/pages.py:1276
 #: waeup/sirp/browser/pages.py:1293
+#: waeup/sirp/browser/pages.py:1297
 msgid "Add faculty"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1257
+#: waeup/sirp/browser/pages.py:1261
 msgid "Faculties"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1261
+#: waeup/sirp/browser/pages.py:1265
 #: waeup/sirp/browser/viewlets.py:431
 msgid "Manage academic section"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1300
+#: waeup/sirp/browser/pages.py:1304
 msgid "The faculty code chosen already exists."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1321
-#: waeup/sirp/browser/pages.py:1331
+#: waeup/sirp/browser/pages.py:1325
+#: waeup/sirp/browser/pages.py:1335
 msgid "Departments"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1333
-#: waeup/sirp/browser/pages.py:1384
-#: waeup/sirp/browser/pages.py:1403
+#: waeup/sirp/browser/pages.py:1337
+#: waeup/sirp/browser/pages.py:1388
 #: waeup/sirp/browser/pages.py:1407
+#: waeup/sirp/browser/pages.py:1411
 msgid "Add department"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1334
+#: waeup/sirp/browser/pages.py:1338
+#: waeup/sirp/browser/pages.py:1397
+#: waeup/sirp/browser/pages.py:1507
+#: waeup/sirp/browser/pages.py:1593
+#: waeup/sirp/browser/pages.py:1753
+#: waeup/sirp/browser/pages.py:1810
+msgid "Remove selected local roles"
+msgstr ""
+
+#: waeup/sirp/browser/pages.py:1339
 #: waeup/sirp/browser/pages.py:1393
-#: waeup/sirp/browser/pages.py:1503
+#: waeup/sirp/browser/pages.py:1508
 #: waeup/sirp/browser/pages.py:1589
-#: waeup/sirp/browser/pages.py:1749
+#: waeup/sirp/browser/pages.py:1754
 #: waeup/sirp/browser/pages.py:1806
-msgid "Remove selected local roles"
-msgstr ""
-
-#: waeup/sirp/browser/pages.py:1335
-#: waeup/sirp/browser/pages.py:1389
-#: waeup/sirp/browser/pages.py:1504
-#: waeup/sirp/browser/pages.py:1585
-#: waeup/sirp/browser/pages.py:1750
-#: waeup/sirp/browser/pages.py:1802
 msgid "Add local role"
 msgstr ""
@@ -341,60 +341,60 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1341
+#: waeup/sirp/browser/pages.py:1345
 #: waeup/sirp/browser/viewlets.py:447
 msgid "Manage faculty"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1376
-#: waeup/sirp/browser/pages.py:1698
-#: waeup/sirp/browser/pages.py:1770
-#: waeup/sirp/browser/pages.py:1882
+#: waeup/sirp/browser/pages.py:1380
+#: waeup/sirp/browser/pages.py:1702
+#: waeup/sirp/browser/pages.py:1774
+#: waeup/sirp/browser/pages.py:1886
 msgid "Form has been saved."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1414
+#: waeup/sirp/browser/pages.py:1418
 msgid "The code chosen already exists in this faculty."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1417
+#: waeup/sirp/browser/pages.py:1421
 #. Default: ""
 msgid "Department ${a} added."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1434
+#: waeup/sirp/browser/pages.py:1438
 msgid "Courses and Certificates"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1464
-#: waeup/sirp/browser/pages.py:1483
+#: waeup/sirp/browser/pages.py:1468
+#: waeup/sirp/browser/pages.py:1487
 #: waeup/sirp/students/viewlets.py:466
 msgid "Students"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1500
-#: waeup/sirp/browser/pages.py:1558
+#: waeup/sirp/browser/pages.py:1504
+#: waeup/sirp/browser/pages.py:1562
 msgid "Remove selected courses"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1500
-#: waeup/sirp/browser/pages.py:1570
-#: waeup/sirp/browser/pages.py:1599
+#: waeup/sirp/browser/pages.py:1504
+#: waeup/sirp/browser/pages.py:1574
 #: waeup/sirp/browser/pages.py:1603
+#: waeup/sirp/browser/pages.py:1607
 msgid "Add course"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1501
-#: waeup/sirp/browser/pages.py:1564
+#: waeup/sirp/browser/pages.py:1505
+#: waeup/sirp/browser/pages.py:1568
 msgid "Remove selected certificates"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1501
-#: waeup/sirp/browser/pages.py:1575
-#: waeup/sirp/browser/pages.py:1636
+#: waeup/sirp/browser/pages.py:1505
+#: waeup/sirp/browser/pages.py:1579
 #: waeup/sirp/browser/pages.py:1640
+#: waeup/sirp/browser/pages.py:1644
 msgid "Add certificate"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1510
+#: waeup/sirp/browser/pages.py:1514
 #: waeup/sirp/browser/viewlets.py:454
 msgid "Manage department"
@@ -408,259 +408,282 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:159
+#: waeup/sirp/browser/pages.py:160
 msgid "You logged in."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1615
+#: waeup/sirp/browser/pages.py:1619
 msgid "A course with same code already exists: "
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1621
+#: waeup/sirp/browser/pages.py:1625
 #. Default: ""
 msgid "Course ${a} successfully created."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1652
+#: waeup/sirp/browser/pages.py:1656
 msgid "A certificate with same code already exists: "
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1658
+#: waeup/sirp/browser/pages.py:1662
 #. Default: ""
 msgid "Certificate ${a} successfully created."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1690
+#: waeup/sirp/browser/pages.py:1694
 #: waeup/sirp/browser/viewlets.py:471
 msgid "Edit course"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1740
+#: waeup/sirp/browser/pages.py:1744
 msgid "Edit certificate"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1747
-#: waeup/sirp/browser/pages.py:1778
-#: waeup/sirp/browser/pages.py:1819
-#: waeup/sirp/browser/pages.py:1821
+#: waeup/sirp/browser/pages.py:1751
+#: waeup/sirp/browser/pages.py:1782
+#: waeup/sirp/browser/pages.py:1823
+#: waeup/sirp/browser/pages.py:1825
 msgid "Add course referrer"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1748
-#: waeup/sirp/browser/pages.py:1773
+#: waeup/sirp/browser/pages.py:1752
+#: waeup/sirp/browser/pages.py:1777
 msgid "Remove selected course referrers"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1754
+#: waeup/sirp/browser/pages.py:1758
 #: waeup/sirp/browser/viewlets.py:478
 msgid "Manage certificate"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:177
+#: waeup/sirp/browser/pages.py:178
 msgid "You entered wrong credentials."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1826
+#: waeup/sirp/browser/pages.py:1830
 msgid "The chosen course referrer is already part of this certificate."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1867
+#: waeup/sirp/browser/pages.py:1834
+#. Default: ""
+msgid "Course referrer ${a}_${b} added."
+msgstr ""
+
+#: waeup/sirp/browser/pages.py:1871
 #: waeup/sirp/browser/viewlets.py:495
 msgid "Edit course referrer"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1870
+#: waeup/sirp/browser/pages.py:1874
 msgid "Save and return"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:191
+#: waeup/sirp/browser/pages.py:192
 msgid "You have been logged out. Thanks for using WAeUP SIRP!"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:227
+#: waeup/sirp/browser/pages.py:228
 #. Default: ""
 msgid "Contact ${a}"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:233
-#: waeup/sirp/browser/pages.py:516
+#: waeup/sirp/browser/pages.py:234
+#: waeup/sirp/browser/pages.py:519
 msgid "Send message now"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:252
-#: waeup/sirp/browser/pages.py:271
-#: waeup/sirp/browser/pages.py:533
+#: waeup/sirp/browser/pages.py:253
+#: waeup/sirp/browser/pages.py:272
+#: waeup/sirp/browser/pages.py:536
 msgid "Your message has been sent."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:262
+#: waeup/sirp/browser/pages.py:263
 msgid "Send now"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:273
+#: waeup/sirp/browser/pages.py:274
 msgid "A smtp server error occurred."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:298
+#: waeup/sirp/browser/pages.py:299
 msgid "<h1>Welcome to WAeUP.SIRP</h1>"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:392
+#: waeup/sirp/browser/pages.py:387
+msgid "Manage"
+msgstr ""
+
+#: waeup/sirp/browser/pages.py:388
+#: waeup/sirp/browser/viewlets.py:177
+msgid "Remove"
+msgstr ""
+
+#: waeup/sirp/browser/pages.py:395
 #. Default: ""
 msgid "User account ${a} successfully deleted."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:423
-#: waeup/sirp/browser/pages.py:425
+#: waeup/sirp/browser/pages.py:426
+#: waeup/sirp/browser/pages.py:428
 #: waeup/sirp/browser/viewlets.py:505
 msgid "Add user"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:447
+#: waeup/sirp/browser/pages.py:450
 #. Default: ""
 msgid "User account ${a} successfully added."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:466
+#: waeup/sirp/browser/pages.py:469
 #. Default: ""
 msgid "Edit user ${a}"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:473
-#: waeup/sirp/browser/pages.py:627
-#: waeup/sirp/browser/pages.py:724
-#: waeup/sirp/browser/pages.py:1160
-#: waeup/sirp/browser/pages.py:1332
-#: waeup/sirp/browser/pages.py:1499
-#: waeup/sirp/browser/pages.py:1552
-#: waeup/sirp/browser/pages.py:1695
-#: waeup/sirp/browser/pages.py:1746
+#: waeup/sirp/browser/pages.py:476
+#: waeup/sirp/browser/pages.py:631
+#: waeup/sirp/browser/pages.py:654
+#: waeup/sirp/browser/pages.py:728
+#: waeup/sirp/browser/pages.py:1164
+#: waeup/sirp/browser/pages.py:1336
+#: waeup/sirp/browser/pages.py:1377
+#: waeup/sirp/browser/pages.py:1503
+#: waeup/sirp/browser/pages.py:1556
+#: waeup/sirp/browser/pages.py:1699
+#: waeup/sirp/browser/pages.py:1750
+#: waeup/sirp/browser/pages.py:1771
 msgid "Save"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:497
+#: waeup/sirp/browser/pages.py:500
 msgid "User settings have been saved."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:500
-#: waeup/sirp/browser/pages.py:704
-#: waeup/sirp/browser/pages.py:731
-#: waeup/sirp/browser/pages.py:754
-#: waeup/sirp/browser/pages.py:801
-#: waeup/sirp/browser/pages.py:831
-#: waeup/sirp/browser/pages.py:951
-#: waeup/sirp/browser/pages.py:1162
-#: waeup/sirp/browser/pages.py:1256
-#: waeup/sirp/browser/pages.py:1277
-#: waeup/sirp/browser/pages.py:1304
-#: waeup/sirp/browser/pages.py:1332
-#: waeup/sirp/browser/pages.py:1333
-#: waeup/sirp/browser/pages.py:1379
-#: waeup/sirp/browser/pages.py:1420
-#: waeup/sirp/browser/pages.py:1499
-#: waeup/sirp/browser/pages.py:1500
-#: waeup/sirp/browser/pages.py:1502
-#: waeup/sirp/browser/pages.py:1580
-#: waeup/sirp/browser/pages.py:1663
-#: waeup/sirp/browser/pages.py:1707
-#: waeup/sirp/browser/pages.py:1746
-#: waeup/sirp/browser/pages.py:1748
-#: waeup/sirp/browser/pages.py:1783
-#: waeup/sirp/browser/pages.py:1834
-#: waeup/sirp/browser/pages.py:1886
+#: waeup/sirp/browser/pages.py:503
+#: waeup/sirp/browser/pages.py:708
+#: waeup/sirp/browser/pages.py:735
+#: waeup/sirp/browser/pages.py:758
+#: waeup/sirp/browser/pages.py:805
+#: waeup/sirp/browser/pages.py:835
+#: waeup/sirp/browser/pages.py:955
+#: waeup/sirp/browser/pages.py:1166
+#: waeup/sirp/browser/pages.py:1260
+#: waeup/sirp/browser/pages.py:1281
+#: waeup/sirp/browser/pages.py:1308
+#: waeup/sirp/browser/pages.py:1336
+#: waeup/sirp/browser/pages.py:1337
+#: waeup/sirp/browser/pages.py:1383
+#: waeup/sirp/browser/pages.py:1424
+#: waeup/sirp/browser/pages.py:1503
+#: waeup/sirp/browser/pages.py:1504
+#: waeup/sirp/browser/pages.py:1506
+#: waeup/sirp/browser/pages.py:1584
+#: waeup/sirp/browser/pages.py:1629
+#: waeup/sirp/browser/pages.py:1667
+#: waeup/sirp/browser/pages.py:1711
+#: waeup/sirp/browser/pages.py:1750
+#: waeup/sirp/browser/pages.py:1752
+#: waeup/sirp/browser/pages.py:1787
+#: waeup/sirp/browser/pages.py:1838
+#: waeup/sirp/browser/pages.py:1890
 msgid "Cancel"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:514
+#: waeup/sirp/browser/pages.py:517
 #. Default: ""
 msgid "Send message to ${a}"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:543
+#: waeup/sirp/browser/pages.py:546
 #: waeup/sirp/browser/viewlets.py:390
 msgid "My Preferences"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:556
+#: waeup/sirp/browser/pages.py:559
 #: waeup/sirp/browser/viewlets.py:405
 msgid "My Roles"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:587
+#: waeup/sirp/browser/pages.py:590
 msgid "Search Academic Section"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:613
+#: waeup/sirp/browser/pages.py:592
+#: waeup/sirp/browser/viewlets.py:187
+msgid "Search"
+msgstr ""
+
+#: waeup/sirp/browser/pages.py:617
 msgid "View portal configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:626
+#: waeup/sirp/browser/pages.py:630
 msgid "Edit portal configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:627
-#: waeup/sirp/browser/pages.py:676
+#: waeup/sirp/browser/pages.py:631
+#: waeup/sirp/browser/pages.py:680
 msgid "Update plugins"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:629
-#: waeup/sirp/browser/pages.py:657
-#: waeup/sirp/browser/pages.py:688
+#: waeup/sirp/browser/pages.py:633
+#: waeup/sirp/browser/pages.py:661
+#: waeup/sirp/browser/pages.py:692
 msgid "Add session configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:630
-#: waeup/sirp/browser/pages.py:671
-#: waeup/sirp/browser/pages.py:1256
-#: waeup/sirp/browser/pages.py:1267
-#: waeup/sirp/browser/pages.py:1333
-#: waeup/sirp/browser/pages.py:1368
+#: waeup/sirp/browser/pages.py:634
+#: waeup/sirp/browser/pages.py:675
+#: waeup/sirp/browser/pages.py:1260
+#: waeup/sirp/browser/pages.py:1271
+#: waeup/sirp/browser/pages.py:1337
+#: waeup/sirp/browser/pages.py:1372
 msgid "Remove selected"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:654
-#: waeup/sirp/browser/pages.py:727
+#: waeup/sirp/browser/pages.py:658
+#: waeup/sirp/browser/pages.py:731
 msgid "Settings have been saved."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:668
+#: waeup/sirp/browser/pages.py:672
 #. Default: ""
 msgid "Session ${a} Configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:679
+#: waeup/sirp/browser/pages.py:683
 msgid "Plugins were updated. See log file for details."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:692
+#: waeup/sirp/browser/pages.py:696
 msgid "Add Session Configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:699
+#: waeup/sirp/browser/pages.py:703
 msgid "The session chosen already exists."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:721
+#: waeup/sirp/browser/pages.py:725
 #. Default: ""
 msgid "Edit academic session ${a} configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:751
+#: waeup/sirp/browser/pages.py:755
 msgid "Upload file"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:753
+#: waeup/sirp/browser/pages.py:757
 msgid "Upload"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:799
-#: waeup/sirp/browser/pages.py:829
-#: waeup/sirp/browser/pages.py:949
-#: waeup/sirp/browser/pages.py:1057
+#: waeup/sirp/browser/pages.py:803
+#: waeup/sirp/browser/pages.py:833
+#: waeup/sirp/browser/pages.py:953
+#: waeup/sirp/browser/pages.py:1061
 msgid "Process CSV file"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:813
-#: waeup/sirp/browser/pages.py:914
-#: waeup/sirp/browser/pages.py:1033
+#: waeup/sirp/browser/pages.py:817
+#: waeup/sirp/browser/pages.py:918
+#: waeup/sirp/browser/pages.py:1037
 msgid "Import aborted."
 msgstr ""
@@ -670,38 +693,38 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:832
+#: waeup/sirp/browser/pages.py:836
 msgid "Back to step 1"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:833
+#: waeup/sirp/browser/pages.py:837
 msgid "Proceed to step 3"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:893
+#: waeup/sirp/browser/pages.py:897
 msgid "Double headers: each column name may only appear once. "
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:901
+#: waeup/sirp/browser/pages.py:905
 msgid "Replace imported file!"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:926
+#: waeup/sirp/browser/pages.py:930
 msgid "Update mode only!"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:952
-#: waeup/sirp/browser/pages.py:1161
+#: waeup/sirp/browser/pages.py:956
+#: waeup/sirp/browser/pages.py:1165
 msgid "Reset"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:953
+#: waeup/sirp/browser/pages.py:957
 msgid "Set headerfields"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:954
+#: waeup/sirp/browser/pages.py:958
 msgid "Back to step 2"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:955
+#: waeup/sirp/browser/pages.py:959
 msgid "Perform import"
 msgstr ""
@@ -729,20 +752,4 @@
 #: waeup/sirp/browser/templates/certificatecoursepage.pt:6
 msgid "Code:"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:106
-msgid "User Id"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:110
-msgid "Local Role"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:5
-msgid "Settings"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:7
-msgid "Local Roles"
 msgstr ""
 
@@ -754,9 +761,4 @@
 
 #: waeup/sirp/browser/templates/certificatepage.pt:28
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:48
-msgid "Level"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatepage.pt:28
 #: waeup/sirp/browser/templates/certificatemanagepage.pt:49
 msgid "Semester"
@@ -768,14 +770,4 @@
 msgstr ""
 
-#: waeup/sirp/browser/templates/certificatepage.pt:29
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
-msgid "Course"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatepage.pt:30
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
-msgid "Title"
-msgstr ""
-
 #: waeup/sirp/browser/templates/certificatepage.pt:30
 #: waeup/sirp/browser/templates/certificatemanagepage.pt:51
@@ -785,9 +777,4 @@
 #: waeup/sirp/browser/templates/configurationmanagepage.pt:5
 msgid "Site Settings"
-msgstr ""
-
-#: waeup/sirp/browser/templates/configurationmanagepage.pt:52
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:108
-msgid "Name"
 msgstr ""
 
@@ -914,7 +901,45 @@
 msgstr ""
 
-#: waeup/sirp/browser/templates/facultymanagepage.pt:15
-#. Default: "Local Roles"
-msgid "local_roles"
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:10
+#: waeup/sirp/browser/templates/departmentpage.pt:3
+msgid "Courses"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:118
+#: waeup/sirp/browser/templates/facultymanagepage.pt:92
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:106
+msgid "User Id"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:120
+#: waeup/sirp/browser/templates/userscontainerpage.pt:5
+#: waeup/sirp/browser/templates/facultymanagepage.pt:94
+#: waeup/sirp/browser/templates/configurationmanagepage.pt:52
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:108
+msgid "Name"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:122
+#: waeup/sirp/browser/templates/facultymanagepage.pt:96
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:110
+msgid "Local Role"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:13
+#: waeup/sirp/browser/templates/departmentpage.pt:6
+msgid "Certificates"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:16
+#: waeup/sirp/browser/templates/userscontainerpage.pt:7
+#: waeup/sirp/browser/templates/facultymanagepage.pt:16
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:7
+msgid "Local Roles"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:6
+#: waeup/sirp/browser/templates/facultymanagepage.pt:6
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:5
+msgid "Settings"
 msgstr ""
 
@@ -923,22 +948,101 @@
 msgstr ""
 
-#: waeup/sirp/browser/templates/facultypage.pt:8
-#. Default: "Code"
-msgid "code"
-msgstr ""
-
-#: waeup/sirp/browser/templates/facultypage.pt:9
-#. Default: "Title"
-msgid "title"
+#: waeup/sirp/browser/templates/loginpage.pt:13
+#: waeup/sirp/browser/templates/usereditformpage.pt:26
+msgid "Password:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/loginpage.pt:24
+msgid "Notice: User names, Ids and passwords are case sensitive."
+msgstr ""
+
+#: waeup/sirp/browser/templates/loginpage.pt:36
+#. Default: "Don't forget to logout or exit your browser when you're done. If you are having trouble logging in, make sure to enable cookies in your web browser."
+msgid "login_trouble1"
+msgstr ""
+
+#: waeup/sirp/browser/templates/loginpage.pt:39
+#. Default: "You don't have an account because you are a fresh student, or your student record has just been created? Acquire a Password Access Code (PWD) and inititialize your student account <strong><a href=\"setpassword\"> here</a></strong>."
+msgid "login_trouble2"
+msgstr ""
+
+#: waeup/sirp/browser/templates/loginpage.pt:44
+#. Default: "Or simply forgot your student id or password? Then request a new password <strong><a href=\"changepw\"> here</a></strong>."
+msgid "login_trouble3"
+msgstr ""
+
+#: waeup/sirp/browser/templates/loginpage.pt:5
+msgid "User Name or Id:"
 msgstr ""
 
 #: waeup/sirp/browser/templates/myrolespage.pt:1
-#. Default: "My Portal Roles:"
-msgid "my_portal_roles"
-msgstr ""
-
-#: waeup/sirp/browser/templates/myrolespage.pt:10
-#. Default: "My Local Roles:"
-msgid "my_local_roles"
+msgid "My Portal Roles:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/myrolespage.pt:11
+msgid "My Local Roles:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/notfound.pt:1
+msgid "The page you are trying to access is not available."
+msgstr ""
+
+#: waeup/sirp/browser/templates/notfound.pt:12
+msgid "You might be trying to access a non-existing page."
+msgstr ""
+
+#: waeup/sirp/browser/templates/notfound.pt:6
+msgid "Please note the following:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/notfound.pt:9
+msgid "You might have misspelled the URL."
+msgstr ""
+
+#: waeup/sirp/browser/templates/searchpage.pt:15
+msgid "Type"
+msgstr ""
+
+#: waeup/sirp/browser/templates/searchpage.pt:9
+msgid "Search Results"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:4
+msgid "Student Id"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:5
+msgid "Fullname"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:6
+msgid "Status"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:7
+msgid "Certificate"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:8
+msgid "Current Session"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:9
+msgid "Current Level"
+msgstr ""
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:101
+#: waeup/sirp/browser/templates/studentsitelayout.pt:86
+msgid "Form Status:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:113
+#: waeup/sirp/browser/templates/studentsitelayout.pt:99
+msgid "Back to top"
+msgstr ""
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:114
+#: waeup/sirp/browser/templates/studentsitelayout.pt:100
+msgid "Student Information and Registration Portal<br /> Copyright &copy; WAeUP Group, 2008-2012"
 msgstr ""
 
@@ -953,14 +1057,26 @@
 msgstr ""
 
+#: waeup/sirp/browser/templates/staffsitelayout.pt:60
+msgid "Student Id:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:64
+msgid "State:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/usereditformpage.pt:32
+msgid "Retype password:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/userscontainerpage.pt:4
+msgid "User ID"
+msgstr ""
+
+#: waeup/sirp/browser/templates/userscontainerpage.pt:6
+msgid "Portal Roles"
+msgstr ""
+
 #: waeup/sirp/browser/viewlets.py:167
 msgid "Add"
-msgstr ""
-
-#: waeup/sirp/browser/viewlets.py:177
-msgid "Remove"
-msgstr ""
-
-#: waeup/sirp/browser/viewlets.py:187
-msgid "Search"
 msgstr ""
 
@@ -1221,7 +1337,118 @@
 msgstr ""
 
+#: waeup/sirp/university/interfaces.py:146
+msgid "Title of course"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:152
+msgid "Credits"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:158
+msgid "Passmark"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:164
+msgid "Semester/Term"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:180
+msgid "Enter unique course code which will become part of the URL."
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:199
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:62
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:91
+#: waeup/sirp/browser/templates/facultypage.pt:9
+#: waeup/sirp/browser/templates/departmentpage.pt:16
+#: waeup/sirp/browser/templates/departmentpage.pt:40
+#: waeup/sirp/browser/templates/searchpage.pt:14
+#: waeup/sirp/browser/templates/certificatepage.pt:30
+#: waeup/sirp/browser/templates/facultymanagepage.pt:64
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
+msgid "Title"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:205
+msgid "Study Mode"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:212
+msgid "Start Level"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:219
+msgid "End Level"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:226
+msgid "Application Category"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:243
+msgid "Enter unique certificate code which will become part of the URL."
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:264
+msgid "Course Referrer"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:270
+#: waeup/sirp/browser/templates/certificatepage.pt:28
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:48
+msgid "Level"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:277
+msgid "Is mandatory course (not elective)"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:299
+#: waeup/sirp/browser/templates/certificatepage.pt:29
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
+msgid "Course"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:38
+#: waeup/sirp/university/interfaces.py:66
+#: waeup/sirp/university/interfaces.py:86
+#: waeup/sirp/university/interfaces.py:117
+#: waeup/sirp/university/interfaces.py:139
+#: waeup/sirp/university/interfaces.py:179
+#: waeup/sirp/university/interfaces.py:192
+#: waeup/sirp/university/interfaces.py:241
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:60
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:89
+#: waeup/sirp/browser/templates/facultypage.pt:8
+#: waeup/sirp/browser/templates/departmentpage.pt:15
+#: waeup/sirp/browser/templates/departmentpage.pt:39
+#: waeup/sirp/browser/templates/searchpage.pt:13
+#: waeup/sirp/browser/templates/facultymanagepage.pt:62
+msgid "Code"
+msgstr ""
+
 #: waeup/sirp/university/interfaces.py:45
-#. Default: "Name of faculty"
-msgid "name_of_faculty"
+msgid "Name of faculty"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:46
+#: waeup/sirp/university/interfaces.py:94
+#: waeup/sirp/university/interfaces.py:147
+#: waeup/sirp/university/interfaces.py:200
+msgid "Unnamed"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:51
+#: waeup/sirp/university/interfaces.py:99
+msgid "Name prefix"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:67
+#: waeup/sirp/university/interfaces.py:118
+msgid "This code will become part of the URL."
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:93
+msgid "Name of department"
 msgstr ""
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/locales/yo/LC_MESSAGES/waeup.sirp.po
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/locales/yo/LC_MESSAGES/waeup.sirp.po	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/locales/yo/LC_MESSAGES/waeup.sirp.po	(revision 7707)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.SIRP\n"
-"POT-Creation-Date: Sun Feb 26 17:19:06 2012\n"
+"POT-Creation-Date: Mon Feb 27 09:31:07 2012\n"
 "PO-Revision-Date: 2012-02-22 11:28+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -181,5 +181,5 @@
 msgstr ""
 
-#: waeup/sirp/browser/breadcrumbs.py:123 waeup/sirp/browser/pages.py:308
+#: waeup/sirp/browser/breadcrumbs.py:123 waeup/sirp/browser/pages.py:309
 msgid "Administration"
 msgstr ""
@@ -190,11 +190,11 @@
 msgstr ""
 
-#: waeup/sirp/browser/breadcrumbs.py:148 waeup/sirp/browser/pages.py:385
+#: waeup/sirp/browser/breadcrumbs.py:148 waeup/sirp/browser/pages.py:386
 #: waeup/sirp/browser/viewlets.py:365 waeup/sirp/browser/viewlets.py:666
 msgid "Portal Users"
 msgstr ""
 
-#: waeup/sirp/browser/breadcrumbs.py:155 waeup/sirp/browser/pages.py:744
-#: waeup/sirp/browser/pages.py:1136 waeup/sirp/browser/viewlets.py:383
+#: waeup/sirp/browser/breadcrumbs.py:155 waeup/sirp/browser/pages.py:748
+#: waeup/sirp/browser/pages.py:1140 waeup/sirp/browser/viewlets.py:383
 #: waeup/sirp/browser/viewlets.py:675
 msgid "Data Center"
@@ -205,5 +205,5 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1012
+#: waeup/sirp/browser/pages.py:1016
 msgid "Edit headers or replace imported file!"
 msgstr ""
@@ -214,31 +214,31 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1059
+#: waeup/sirp/browser/pages.py:1063
 msgid "View processing log"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1060
+#: waeup/sirp/browser/pages.py:1064
 msgid "Back to data center"
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1104
+#: waeup/sirp/browser/pages.py:1108
 msgid "Processing of ${a} rows failed."
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1106
+#: waeup/sirp/browser/pages.py:1110
 msgid "Successfully processed ${a} rows."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1114
+#: waeup/sirp/browser/pages.py:1118
 msgid "Show logfiles"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1116
+#: waeup/sirp/browser/pages.py:1120
 msgid "Back to Data Center"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1117
+#: waeup/sirp/browser/pages.py:1121
 msgid "Show"
 msgstr ""
@@ -248,63 +248,63 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1158
+#: waeup/sirp/browser/pages.py:1162
 msgid "Edit data center settings"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1178
+#: waeup/sirp/browser/pages.py:1182
 msgid "File already existed (not copied):"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1180
+#: waeup/sirp/browser/pages.py:1184
 msgid "Given storage path cannot be used."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1181
+#: waeup/sirp/browser/pages.py:1185
 msgid "Error:"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1184
+#: waeup/sirp/browser/pages.py:1188
 msgid "New storage path succefully set."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1244
+#: waeup/sirp/browser/pages.py:1248
 msgid "Academic Section"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1256 waeup/sirp/browser/pages.py:1272
-#: waeup/sirp/browser/pages.py:1289 waeup/sirp/browser/pages.py:1293
+#: waeup/sirp/browser/pages.py:1260 waeup/sirp/browser/pages.py:1276
+#: waeup/sirp/browser/pages.py:1293 waeup/sirp/browser/pages.py:1297
 msgid "Add faculty"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1257
+#: waeup/sirp/browser/pages.py:1261
 msgid "Faculties"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1261 waeup/sirp/browser/viewlets.py:431
+#: waeup/sirp/browser/pages.py:1265 waeup/sirp/browser/viewlets.py:431
 msgid "Manage academic section"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1300
+#: waeup/sirp/browser/pages.py:1304
 msgid "The faculty code chosen already exists."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1321 waeup/sirp/browser/pages.py:1331
+#: waeup/sirp/browser/pages.py:1325 waeup/sirp/browser/pages.py:1335
 msgid "Departments"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1333 waeup/sirp/browser/pages.py:1384
-#: waeup/sirp/browser/pages.py:1403 waeup/sirp/browser/pages.py:1407
+#: waeup/sirp/browser/pages.py:1337 waeup/sirp/browser/pages.py:1388
+#: waeup/sirp/browser/pages.py:1407 waeup/sirp/browser/pages.py:1411
 msgid "Add department"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1334 waeup/sirp/browser/pages.py:1393
-#: waeup/sirp/browser/pages.py:1503 waeup/sirp/browser/pages.py:1589
-#: waeup/sirp/browser/pages.py:1749 waeup/sirp/browser/pages.py:1806
+#: waeup/sirp/browser/pages.py:1338 waeup/sirp/browser/pages.py:1397
+#: waeup/sirp/browser/pages.py:1507 waeup/sirp/browser/pages.py:1593
+#: waeup/sirp/browser/pages.py:1753 waeup/sirp/browser/pages.py:1810
 msgid "Remove selected local roles"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1335 waeup/sirp/browser/pages.py:1389
-#: waeup/sirp/browser/pages.py:1504 waeup/sirp/browser/pages.py:1585
-#: waeup/sirp/browser/pages.py:1750 waeup/sirp/browser/pages.py:1802
+#: waeup/sirp/browser/pages.py:1339 waeup/sirp/browser/pages.py:1393
+#: waeup/sirp/browser/pages.py:1508 waeup/sirp/browser/pages.py:1589
+#: waeup/sirp/browser/pages.py:1754 waeup/sirp/browser/pages.py:1806
 msgid "Add local role"
 msgstr ""
@@ -315,50 +315,50 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1341 waeup/sirp/browser/viewlets.py:447
+#: waeup/sirp/browser/pages.py:1345 waeup/sirp/browser/viewlets.py:447
 msgid "Manage faculty"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1376 waeup/sirp/browser/pages.py:1698
-#: waeup/sirp/browser/pages.py:1770 waeup/sirp/browser/pages.py:1882
+#: waeup/sirp/browser/pages.py:1380 waeup/sirp/browser/pages.py:1702
+#: waeup/sirp/browser/pages.py:1774 waeup/sirp/browser/pages.py:1886
 msgid "Form has been saved."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1414
+#: waeup/sirp/browser/pages.py:1418
 msgid "The code chosen already exists in this faculty."
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1417
+#: waeup/sirp/browser/pages.py:1421
 msgid "Department ${a} added."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1434
+#: waeup/sirp/browser/pages.py:1438
 msgid "Courses and Certificates"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1464 waeup/sirp/browser/pages.py:1483
+#: waeup/sirp/browser/pages.py:1468 waeup/sirp/browser/pages.py:1487
 #: waeup/sirp/students/viewlets.py:466
 msgid "Students"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1500 waeup/sirp/browser/pages.py:1558
+#: waeup/sirp/browser/pages.py:1504 waeup/sirp/browser/pages.py:1562
 msgid "Remove selected courses"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1500 waeup/sirp/browser/pages.py:1570
-#: waeup/sirp/browser/pages.py:1599 waeup/sirp/browser/pages.py:1603
+#: waeup/sirp/browser/pages.py:1504 waeup/sirp/browser/pages.py:1574
+#: waeup/sirp/browser/pages.py:1603 waeup/sirp/browser/pages.py:1607
 msgid "Add course"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1501 waeup/sirp/browser/pages.py:1564
+#: waeup/sirp/browser/pages.py:1505 waeup/sirp/browser/pages.py:1568
 msgid "Remove selected certificates"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1501 waeup/sirp/browser/pages.py:1575
-#: waeup/sirp/browser/pages.py:1636 waeup/sirp/browser/pages.py:1640
+#: waeup/sirp/browser/pages.py:1505 waeup/sirp/browser/pages.py:1579
+#: waeup/sirp/browser/pages.py:1640 waeup/sirp/browser/pages.py:1644
 msgid "Add certificate"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1510 waeup/sirp/browser/viewlets.py:454
+#: waeup/sirp/browser/pages.py:1514 waeup/sirp/browser/viewlets.py:454
 msgid "Manage department"
 msgstr ""
@@ -370,99 +370,112 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:159
+#: waeup/sirp/browser/pages.py:160
 msgid "You logged in."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1615
+#: waeup/sirp/browser/pages.py:1619
 msgid "A course with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1621
+#: waeup/sirp/browser/pages.py:1625
 msgid "Course ${a} successfully created."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1652
+#: waeup/sirp/browser/pages.py:1656
 msgid "A certificate with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:1658
+#: waeup/sirp/browser/pages.py:1662
 msgid "Certificate ${a} successfully created."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1690 waeup/sirp/browser/viewlets.py:471
+#: waeup/sirp/browser/pages.py:1694 waeup/sirp/browser/viewlets.py:471
 msgid "Edit course"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1740
+#: waeup/sirp/browser/pages.py:1744
 msgid "Edit certificate"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1747 waeup/sirp/browser/pages.py:1778
-#: waeup/sirp/browser/pages.py:1819 waeup/sirp/browser/pages.py:1821
+#: waeup/sirp/browser/pages.py:1751 waeup/sirp/browser/pages.py:1782
+#: waeup/sirp/browser/pages.py:1823 waeup/sirp/browser/pages.py:1825
 msgid "Add course referrer"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1748 waeup/sirp/browser/pages.py:1773
+#: waeup/sirp/browser/pages.py:1752 waeup/sirp/browser/pages.py:1777
 msgid "Remove selected course referrers"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1754 waeup/sirp/browser/viewlets.py:478
+#: waeup/sirp/browser/pages.py:1758 waeup/sirp/browser/viewlets.py:478
 msgid "Manage certificate"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:177
+#: waeup/sirp/browser/pages.py:178
 msgid "You entered wrong credentials."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1826
+#: waeup/sirp/browser/pages.py:1830
 msgid "The chosen course referrer is already part of this certificate."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1867 waeup/sirp/browser/viewlets.py:495
+#. Default: ""
+#: waeup/sirp/browser/pages.py:1834
+msgid "Course referrer ${a}_${b} added."
+msgstr ""
+
+#: waeup/sirp/browser/pages.py:1871 waeup/sirp/browser/viewlets.py:495
 msgid "Edit course referrer"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:1870
+#: waeup/sirp/browser/pages.py:1874
 msgid "Save and return"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:191
+#: waeup/sirp/browser/pages.py:192
 msgid "You have been logged out. Thanks for using WAeUP SIRP!"
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:227
+#: waeup/sirp/browser/pages.py:228
 msgid "Contact ${a}"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:233 waeup/sirp/browser/pages.py:516
+#: waeup/sirp/browser/pages.py:234 waeup/sirp/browser/pages.py:519
 msgid "Send message now"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:252 waeup/sirp/browser/pages.py:271
-#: waeup/sirp/browser/pages.py:533
+#: waeup/sirp/browser/pages.py:253 waeup/sirp/browser/pages.py:272
+#: waeup/sirp/browser/pages.py:536
 msgid "Your message has been sent."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:262
+#: waeup/sirp/browser/pages.py:263
 msgid "Send now"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:273
+#: waeup/sirp/browser/pages.py:274
 msgid "A smtp server error occurred."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:298
+#: waeup/sirp/browser/pages.py:299
 msgid "<h1>Welcome to WAeUP.SIRP</h1>"
 msgstr ""
 
-#. Default: ""
-#: waeup/sirp/browser/pages.py:392
+#: waeup/sirp/browser/pages.py:387
+msgid "Manage"
+msgstr ""
+
+#: waeup/sirp/browser/pages.py:388 waeup/sirp/browser/viewlets.py:177
+msgid "Remove"
+msgstr ""
+
+#. Default: ""
+#: waeup/sirp/browser/pages.py:395
 msgid "User account ${a} successfully deleted."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:423 waeup/sirp/browser/pages.py:425
+#: waeup/sirp/browser/pages.py:426 waeup/sirp/browser/pages.py:428
 #: waeup/sirp/browser/viewlets.py:505
 msgid "Add user"
@@ -470,122 +483,128 @@
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:447
+#: waeup/sirp/browser/pages.py:450
 msgid "User account ${a} successfully added."
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:466
+#: waeup/sirp/browser/pages.py:469
 msgid "Edit user ${a}"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:473 waeup/sirp/browser/pages.py:627
-#: waeup/sirp/browser/pages.py:724 waeup/sirp/browser/pages.py:1160
-#: waeup/sirp/browser/pages.py:1332 waeup/sirp/browser/pages.py:1499
-#: waeup/sirp/browser/pages.py:1552 waeup/sirp/browser/pages.py:1695
-#: waeup/sirp/browser/pages.py:1746
+#: waeup/sirp/browser/pages.py:476 waeup/sirp/browser/pages.py:631
+#: waeup/sirp/browser/pages.py:654 waeup/sirp/browser/pages.py:728
+#: waeup/sirp/browser/pages.py:1164 waeup/sirp/browser/pages.py:1336
+#: waeup/sirp/browser/pages.py:1377 waeup/sirp/browser/pages.py:1503
+#: waeup/sirp/browser/pages.py:1556 waeup/sirp/browser/pages.py:1699
+#: waeup/sirp/browser/pages.py:1750 waeup/sirp/browser/pages.py:1771
 msgid "Save"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:497
+#: waeup/sirp/browser/pages.py:500
 msgid "User settings have been saved."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:500 waeup/sirp/browser/pages.py:704
-#: waeup/sirp/browser/pages.py:731 waeup/sirp/browser/pages.py:754
-#: waeup/sirp/browser/pages.py:801 waeup/sirp/browser/pages.py:831
-#: waeup/sirp/browser/pages.py:951 waeup/sirp/browser/pages.py:1162
-#: waeup/sirp/browser/pages.py:1256 waeup/sirp/browser/pages.py:1277
-#: waeup/sirp/browser/pages.py:1304 waeup/sirp/browser/pages.py:1332
-#: waeup/sirp/browser/pages.py:1333 waeup/sirp/browser/pages.py:1379
-#: waeup/sirp/browser/pages.py:1420 waeup/sirp/browser/pages.py:1499
-#: waeup/sirp/browser/pages.py:1500 waeup/sirp/browser/pages.py:1502
-#: waeup/sirp/browser/pages.py:1580 waeup/sirp/browser/pages.py:1663
-#: waeup/sirp/browser/pages.py:1707 waeup/sirp/browser/pages.py:1746
-#: waeup/sirp/browser/pages.py:1748 waeup/sirp/browser/pages.py:1783
-#: waeup/sirp/browser/pages.py:1834 waeup/sirp/browser/pages.py:1886
+#: waeup/sirp/browser/pages.py:503 waeup/sirp/browser/pages.py:708
+#: waeup/sirp/browser/pages.py:735 waeup/sirp/browser/pages.py:758
+#: waeup/sirp/browser/pages.py:805 waeup/sirp/browser/pages.py:835
+#: waeup/sirp/browser/pages.py:955 waeup/sirp/browser/pages.py:1166
+#: waeup/sirp/browser/pages.py:1260 waeup/sirp/browser/pages.py:1281
+#: waeup/sirp/browser/pages.py:1308 waeup/sirp/browser/pages.py:1336
+#: waeup/sirp/browser/pages.py:1337 waeup/sirp/browser/pages.py:1383
+#: waeup/sirp/browser/pages.py:1424 waeup/sirp/browser/pages.py:1503
+#: waeup/sirp/browser/pages.py:1504 waeup/sirp/browser/pages.py:1506
+#: waeup/sirp/browser/pages.py:1584 waeup/sirp/browser/pages.py:1629
+#: waeup/sirp/browser/pages.py:1667 waeup/sirp/browser/pages.py:1711
+#: waeup/sirp/browser/pages.py:1750 waeup/sirp/browser/pages.py:1752
+#: waeup/sirp/browser/pages.py:1787 waeup/sirp/browser/pages.py:1838
+#: waeup/sirp/browser/pages.py:1890
 msgid "Cancel"
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:514
+#: waeup/sirp/browser/pages.py:517
 msgid "Send message to ${a}"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:543 waeup/sirp/browser/viewlets.py:390
+#: waeup/sirp/browser/pages.py:546 waeup/sirp/browser/viewlets.py:390
 msgid "My Preferences"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:556 waeup/sirp/browser/viewlets.py:405
+#: waeup/sirp/browser/pages.py:559 waeup/sirp/browser/viewlets.py:405
 msgid "My Roles"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:587
+#: waeup/sirp/browser/pages.py:590
 msgid "Search Academic Section"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:613
+#: waeup/sirp/browser/pages.py:592 waeup/sirp/browser/viewlets.py:187
+msgid "Search"
+msgstr ""
+
+#: waeup/sirp/browser/pages.py:617
 msgid "View portal configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:626
+#: waeup/sirp/browser/pages.py:630
 msgid "Edit portal configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:627 waeup/sirp/browser/pages.py:676
+#: waeup/sirp/browser/pages.py:631 waeup/sirp/browser/pages.py:680
 msgid "Update plugins"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:629 waeup/sirp/browser/pages.py:657
-#: waeup/sirp/browser/pages.py:688
+#: waeup/sirp/browser/pages.py:633 waeup/sirp/browser/pages.py:661
+#: waeup/sirp/browser/pages.py:692
 msgid "Add session configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:630 waeup/sirp/browser/pages.py:671
-#: waeup/sirp/browser/pages.py:1256 waeup/sirp/browser/pages.py:1267
-#: waeup/sirp/browser/pages.py:1333 waeup/sirp/browser/pages.py:1368
+#: waeup/sirp/browser/pages.py:634 waeup/sirp/browser/pages.py:675
+#: waeup/sirp/browser/pages.py:1260 waeup/sirp/browser/pages.py:1271
+#: waeup/sirp/browser/pages.py:1337 waeup/sirp/browser/pages.py:1372
 msgid "Remove selected"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:654 waeup/sirp/browser/pages.py:727
+#: waeup/sirp/browser/pages.py:658 waeup/sirp/browser/pages.py:731
 msgid "Settings have been saved."
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:668
+#: waeup/sirp/browser/pages.py:672
 msgid "Session ${a} Configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:679
+#: waeup/sirp/browser/pages.py:683
 msgid "Plugins were updated. See log file for details."
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:692
+#: waeup/sirp/browser/pages.py:696
 msgid "Add Session Configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:699
+#: waeup/sirp/browser/pages.py:703
 msgid "The session chosen already exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/sirp/browser/pages.py:721
+#: waeup/sirp/browser/pages.py:725
 msgid "Edit academic session ${a} configuration"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:751
+#: waeup/sirp/browser/pages.py:755
 msgid "Upload file"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:753
+#: waeup/sirp/browser/pages.py:757
 msgid "Upload"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:799 waeup/sirp/browser/pages.py:829
-#: waeup/sirp/browser/pages.py:949 waeup/sirp/browser/pages.py:1057
+#: waeup/sirp/browser/pages.py:803 waeup/sirp/browser/pages.py:833
+#: waeup/sirp/browser/pages.py:953 waeup/sirp/browser/pages.py:1061
 msgid "Process CSV file"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:813 waeup/sirp/browser/pages.py:914
-#: waeup/sirp/browser/pages.py:1033
+#: waeup/sirp/browser/pages.py:817 waeup/sirp/browser/pages.py:918
+#: waeup/sirp/browser/pages.py:1037
 msgid "Import aborted."
 msgstr ""
@@ -595,37 +614,37 @@
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:832
+#: waeup/sirp/browser/pages.py:836
 msgid "Back to step 1"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:833
+#: waeup/sirp/browser/pages.py:837
 msgid "Proceed to step 3"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:893
+#: waeup/sirp/browser/pages.py:897
 msgid "Double headers: each column name may only appear once. "
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:901
+#: waeup/sirp/browser/pages.py:905
 msgid "Replace imported file!"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:926
+#: waeup/sirp/browser/pages.py:930
 msgid "Update mode only!"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:952 waeup/sirp/browser/pages.py:1161
+#: waeup/sirp/browser/pages.py:956 waeup/sirp/browser/pages.py:1165
 msgid "Reset"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:953
+#: waeup/sirp/browser/pages.py:957
 msgid "Set headerfields"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:954
+#: waeup/sirp/browser/pages.py:958
 msgid "Back to step 2"
 msgstr ""
 
-#: waeup/sirp/browser/pages.py:955
+#: waeup/sirp/browser/pages.py:959
 msgid "Perform import"
 msgstr ""
@@ -653,20 +672,4 @@
 #: waeup/sirp/browser/templates/certificatecoursepage.pt:6
 msgid "Code:"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:106
-msgid "User Id"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:110
-msgid "Local Role"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:5
-msgid "Settings"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:7
-msgid "Local Roles"
 msgstr ""
 
@@ -678,9 +681,4 @@
 
 #: waeup/sirp/browser/templates/certificatepage.pt:28
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:48
-msgid "Level"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatepage.pt:28
 #: waeup/sirp/browser/templates/certificatemanagepage.pt:49
 msgid "Semester"
@@ -692,14 +690,4 @@
 msgstr ""
 
-#: waeup/sirp/browser/templates/certificatepage.pt:29
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
-msgid "Course"
-msgstr ""
-
-#: waeup/sirp/browser/templates/certificatepage.pt:30
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
-msgid "Title"
-msgstr ""
-
 #: waeup/sirp/browser/templates/certificatepage.pt:30
 #: waeup/sirp/browser/templates/certificatemanagepage.pt:51
@@ -709,9 +697,4 @@
 #: waeup/sirp/browser/templates/configurationmanagepage.pt:5
 msgid "Site Settings"
-msgstr ""
-
-#: waeup/sirp/browser/templates/configurationmanagepage.pt:52
-#: waeup/sirp/browser/templates/certificatemanagepage.pt:108
-msgid "Name"
 msgstr ""
 
@@ -844,7 +827,45 @@
 msgstr ""
 
-#. Default: "Local Roles"
-#: waeup/sirp/browser/templates/facultymanagepage.pt:15
-msgid "local_roles"
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:10
+#: waeup/sirp/browser/templates/departmentpage.pt:3
+msgid "Courses"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:118
+#: waeup/sirp/browser/templates/facultymanagepage.pt:92
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:106
+msgid "User Id"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:120
+#: waeup/sirp/browser/templates/userscontainerpage.pt:5
+#: waeup/sirp/browser/templates/facultymanagepage.pt:94
+#: waeup/sirp/browser/templates/configurationmanagepage.pt:52
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:108
+msgid "Name"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:122
+#: waeup/sirp/browser/templates/facultymanagepage.pt:96
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:110
+msgid "Local Role"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:13
+#: waeup/sirp/browser/templates/departmentpage.pt:6
+msgid "Certificates"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:16
+#: waeup/sirp/browser/templates/userscontainerpage.pt:7
+#: waeup/sirp/browser/templates/facultymanagepage.pt:16
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:7
+msgid "Local Roles"
+msgstr ""
+
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:6
+#: waeup/sirp/browser/templates/facultymanagepage.pt:6
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:5
+msgid "Settings"
 msgstr ""
 
@@ -853,22 +874,103 @@
 msgstr ""
 
-#. Default: "Code"
-#: waeup/sirp/browser/templates/facultypage.pt:8
-msgid "code"
-msgstr ""
-
-#. Default: "Title"
-#: waeup/sirp/browser/templates/facultypage.pt:9
-msgid "title"
-msgstr ""
-
-#. Default: "My Portal Roles:"
+#: waeup/sirp/browser/templates/loginpage.pt:13
+#: waeup/sirp/browser/templates/usereditformpage.pt:26
+msgid "Password:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/loginpage.pt:24
+msgid "Notice: User names, Ids and passwords are case sensitive."
+msgstr ""
+
+#. Default: "Don't forget to logout or exit your browser when you're done. If you are having trouble logging in, make sure to enable cookies in your web browser."
+#: waeup/sirp/browser/templates/loginpage.pt:36
+msgid "login_trouble1"
+msgstr ""
+
+#. Default: "You don't have an account because you are a fresh student, or your student record has just been created? Acquire a Password Access Code (PWD) and inititialize your student account <strong><a href=\"setpassword\"> here</a></strong>."
+#: waeup/sirp/browser/templates/loginpage.pt:39
+msgid "login_trouble2"
+msgstr ""
+
+#. Default: "Or simply forgot your student id or password? Then request a new password <strong><a href=\"changepw\"> here</a></strong>."
+#: waeup/sirp/browser/templates/loginpage.pt:44
+msgid "login_trouble3"
+msgstr ""
+
+#: waeup/sirp/browser/templates/loginpage.pt:5
+msgid "User Name or Id:"
+msgstr ""
+
 #: waeup/sirp/browser/templates/myrolespage.pt:1
-msgid "my_portal_roles"
-msgstr ""
-
-#. Default: "My Local Roles:"
-#: waeup/sirp/browser/templates/myrolespage.pt:10
-msgid "my_local_roles"
+msgid "My Portal Roles:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/myrolespage.pt:11
+msgid "My Local Roles:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/notfound.pt:1
+msgid "The page you are trying to access is not available."
+msgstr ""
+
+#: waeup/sirp/browser/templates/notfound.pt:12
+msgid "You might be trying to access a non-existing page."
+msgstr ""
+
+#: waeup/sirp/browser/templates/notfound.pt:6
+msgid "Please note the following:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/notfound.pt:9
+msgid "You might have misspelled the URL."
+msgstr ""
+
+#: waeup/sirp/browser/templates/searchpage.pt:15
+msgid "Type"
+msgstr ""
+
+#: waeup/sirp/browser/templates/searchpage.pt:9
+msgid "Search Results"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:4
+msgid "Student Id"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:5
+msgid "Fullname"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:6
+msgid "Status"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:7
+msgid "Certificate"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:8
+msgid "Current Session"
+msgstr ""
+
+#: waeup/sirp/browser/templates/showstudentspage.pt:9
+msgid "Current Level"
+msgstr ""
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:101
+#: waeup/sirp/browser/templates/studentsitelayout.pt:86
+msgid "Form Status:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:113
+#: waeup/sirp/browser/templates/studentsitelayout.pt:99
+msgid "Back to top"
+msgstr ""
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:114
+#: waeup/sirp/browser/templates/studentsitelayout.pt:100
+msgid ""
+"Student Information and Registration Portal<br /> Copyright &copy; WAeUP "
+"Group, 2008-2012"
 msgstr ""
 
@@ -883,14 +985,26 @@
 msgstr ""
 
+#: waeup/sirp/browser/templates/staffsitelayout.pt:60
+msgid "Student Id:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/staffsitelayout.pt:64
+msgid "State:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/usereditformpage.pt:32
+msgid "Retype password:"
+msgstr ""
+
+#: waeup/sirp/browser/templates/userscontainerpage.pt:4
+msgid "User ID"
+msgstr ""
+
+#: waeup/sirp/browser/templates/userscontainerpage.pt:6
+msgid "Portal Roles"
+msgstr ""
+
 #: waeup/sirp/browser/viewlets.py:167
 msgid "Add"
-msgstr ""
-
-#: waeup/sirp/browser/viewlets.py:177
-msgid "Remove"
-msgstr ""
-
-#: waeup/sirp/browser/viewlets.py:187
-msgid "Search"
 msgstr ""
 
@@ -1142,7 +1256,118 @@
 msgstr ""
 
-#. Default: "Name of faculty"
+#: waeup/sirp/university/interfaces.py:146
+msgid "Title of course"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:152
+msgid "Credits"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:158
+msgid "Passmark"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:164
+msgid "Semester/Term"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:180
+msgid "Enter unique course code which will become part of the URL."
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:199
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:62
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:91
+#: waeup/sirp/browser/templates/facultypage.pt:9
+#: waeup/sirp/browser/templates/departmentpage.pt:16
+#: waeup/sirp/browser/templates/departmentpage.pt:40
+#: waeup/sirp/browser/templates/searchpage.pt:14
+#: waeup/sirp/browser/templates/certificatepage.pt:30
+#: waeup/sirp/browser/templates/facultymanagepage.pt:64
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
+msgid "Title"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:205
+msgid "Study Mode"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:212
+msgid "Start Level"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:219
+msgid "End Level"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:226
+msgid "Application Category"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:243
+msgid "Enter unique certificate code which will become part of the URL."
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:264
+msgid "Course Referrer"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:270
+#: waeup/sirp/browser/templates/certificatepage.pt:28
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:48
+msgid "Level"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:277
+msgid "Is mandatory course (not elective)"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:299
+#: waeup/sirp/browser/templates/certificatepage.pt:29
+#: waeup/sirp/browser/templates/certificatemanagepage.pt:50
+msgid "Course"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:38
+#: waeup/sirp/university/interfaces.py:66
+#: waeup/sirp/university/interfaces.py:86
+#: waeup/sirp/university/interfaces.py:117
+#: waeup/sirp/university/interfaces.py:139
+#: waeup/sirp/university/interfaces.py:179
+#: waeup/sirp/university/interfaces.py:192
+#: waeup/sirp/university/interfaces.py:241
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:60
+#: waeup/sirp/browser/templates/departmentmanagepage.pt:89
+#: waeup/sirp/browser/templates/facultypage.pt:8
+#: waeup/sirp/browser/templates/departmentpage.pt:15
+#: waeup/sirp/browser/templates/departmentpage.pt:39
+#: waeup/sirp/browser/templates/searchpage.pt:13
+#: waeup/sirp/browser/templates/facultymanagepage.pt:62
+msgid "Code"
+msgstr ""
+
 #: waeup/sirp/university/interfaces.py:45
-msgid "name_of_faculty"
+msgid "Name of faculty"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:46
+#: waeup/sirp/university/interfaces.py:94
+#: waeup/sirp/university/interfaces.py:147
+#: waeup/sirp/university/interfaces.py:200
+msgid "Unnamed"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:51
+#: waeup/sirp/university/interfaces.py:99
+msgid "Name prefix"
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:67
+#: waeup/sirp/university/interfaces.py:118
+msgid "This code will become part of the URL."
+msgstr ""
+
+#: waeup/sirp/university/interfaces.py:93
+msgid "Name of department"
 msgstr ""
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/interfaces.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/interfaces.py	(revision 7706)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/interfaces.py	(revision 7707)
@@ -36,5 +36,5 @@
     """
     code = schema.TextLine(
-        title = u'Code',
+        title = _(u'Code'),
         default = u'NA',
         required = True,
@@ -43,11 +43,11 @@
 
     title = schema.TextLine(
-        title = _(u'name_of_faculty', default=u'Name of faculty'),
-        default = u'Unnamed',
+        title = _(u'Name of faculty'),
+        default = _(u'Unnamed'),
         required = True,
         )
 
     title_prefix = schema.Choice(
-        title = u'Name prefix',
+        title = _(u'Name prefix'),
         default = u'faculty',
         source = InstTypeSource(),
@@ -64,6 +64,6 @@
     """
     code = schema.TextLine(
-        title = u'Code',
-        description = u'This code will become part of the URL.',
+        title = _(u'Code'),
+        description = _(u'This code will become part of the URL.'),
         default = u'NA',
         required = True,
@@ -84,5 +84,5 @@
     """
     code = schema.TextLine(
-        title = u'Code',
+        title = _(u'Code'),
         default = u'NA',
         required = True,
@@ -91,11 +91,11 @@
 
     title = schema.TextLine(
-        title = u'Name of department',
-        default = u'Unnamed',
+        title = _(u'Name of department'),
+        default = _(u'Unnamed'),
         required = True,
         )
 
     title_prefix = schema.Choice(
-        title = u'Name prefix',
+        title = _(u'Name prefix'),
         source = InstTypeSource(),
         default = u'department',
@@ -115,6 +115,6 @@
     """
     code = schema.TextLine(
-        title = u'Code',
-        description = u'This code will become part of the URL.',
+        title = _(u'Code'),
+        description = _(u'This code will become part of the URL.'),
         default = u'NA',
         required = True,
@@ -137,5 +137,5 @@
     """
     code = schema.TextLine(
-        title = u'Code',
+        title = _(u'Code'),
         default = u'NA',
         required = True,
@@ -144,11 +144,11 @@
 
     title = schema.TextLine(
-        title = u'Title of course',
-        default = u'Unnamed',
+        title = _(u'Title of course'),
+        default = _(u'Unnamed'),
         required = True,
         )
 
     credits = schema.Int(
-        title = u'Credits',
+        title = _(u'Credits'),
         default = 0,
         required = False,
@@ -156,5 +156,5 @@
 
     passmark = schema.Int(
-        title = u'Passmark',
+        title = _(u'Passmark'),
         default = 40,
         required = False,
@@ -162,5 +162,5 @@
 
     semester = schema.Choice(
-        title = u'Semester/Term',
+        title = _(u'Semester/Term'),
         default = 9,
         source = SemesterSource(),
@@ -177,6 +177,6 @@
     """
     code = schema.TextLine(
-        title = u'Code',
-        description = u'Enter unique course code which will become part of the URL.',
+        title = _(u'Code'),
+        description = _(u'Enter unique course code which will become part of the URL.'),
         default = u'NA',
         required = True,
@@ -190,5 +190,5 @@
     """
     code = schema.TextLine(
-        title = u'Code',
+        title = _(u'Code'),
         default = u'NA',
         required = True,
@@ -197,11 +197,11 @@
 
     title = schema.TextLine(
-        title = u'Title',
-        default = u'Unnamed',
+        title = _(u'Title'),
+        default = _(u'Unnamed'),
         required = True,
         )
 
     study_mode = schema.Choice(
-        title = u'Study Mode',
+        title = _(u'Study Mode'),
         source = StudyModeSource(),
         default = u'ug_ft',
@@ -210,5 +210,5 @@
 
     start_level = schema.Choice(
-        title = u'Start Level',
+        title = _(u'Start Level'),
         vocabulary = course_levels,
         default = 100,
@@ -217,5 +217,5 @@
 
     end_level = schema.Choice(
-        title = u'End Level',
+        title = _(u'End Level'),
         vocabulary = course_levels,
         default = 500,
@@ -224,5 +224,5 @@
 
     application_category = schema.Choice(
-        title = u'Application Category',
+        title = _(u'Application Category'),
         source = AppCatSource(),
         default = u'basic',
@@ -239,7 +239,7 @@
     """
     code = schema.TextLine(
-        title = u'Code',
-        default = u'NA',
-        description = u'Enter unique certificate code which will become part of the URL.',
+        title = _(u'Code'),
+        default = u'NA',
+        description = _(u'Enter unique certificate code which will become part of the URL.'),
         required = True,
         readonly = False,
@@ -262,5 +262,5 @@
     """
     course = schema.Choice(
-        title = u'Course referrer',
+        title = _(u'Course Referrer'),
         source = CourseSource(),
         readonly = True,
@@ -268,5 +268,5 @@
 
     level = schema.Choice(
-        title = u'Level',
+        title = _(u'Level'),
         required = True,
         vocabulary = course_levels,
@@ -275,5 +275,5 @@
 
     mandatory = schema.Bool(
-        title = u'Is mandatory course (not elective)',
+        title = _(u'Is mandatory course (not elective)'),
         required = True,
         default = True,
@@ -297,5 +297,5 @@
     """
     course = schema.Choice(
-        title = u'Course',
+        title = _(u'Course'),
         source = CourseSource(),
         readonly = False,
