Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py	(revision 7827)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py	(revision 7828)
@@ -171,5 +171,5 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertFalse(
-            'Manage' in self.browser.contents)
+            'Manage ' in self.browser.contents)
         return
 
@@ -299,5 +299,5 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertFalse(
-            'Manage' in self.browser.contents)
+            'Manage ' in self.browser.contents)
         return
 
Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/staffsitelayout.pt
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/staffsitelayout.pt	(revision 7827)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/staffsitelayout.pt	(revision 7828)
@@ -111,9 +111,13 @@
         </div>
         <div class="footer">
-          <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
-          </p>
+          <div class="pull-right">
+            <a i18n:translate="" href="#">Back to top</a>
+          </div>
+          <div i18n:translate="">
+            Kofa - Student Management System
+          </div>
+          <div i18n:translate="">
+            Copyright &copy; WAeUP Group 2008-2012
+          </div>
         </div>
       </div>
Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/studentsitelayout.pt
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/studentsitelayout.pt	(revision 7827)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/studentsitelayout.pt	(revision 7828)
@@ -97,9 +97,13 @@
         </div>
         <div class="footer">
-          <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
-          </p>
+          <div class="pull-right">
+            <a i18n:translate="" href="#">Back to top</a>
+          </div>
+          <div i18n:translate="">
+            Kofa - Student Management System
+          </div>
+          <div i18n:translate="">
+            Copyright &copy; WAeUP Group 2008-2012
+          </div>
         </div>
       </div>
Index: /main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py	(revision 7827)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py	(revision 7828)
@@ -304,9 +304,9 @@
     """
     name = schema.TextLine(
-        title = u'Importer name'
+        title = _(u'Importer name')
         )
 
     mode = schema.Choice(
-        title = u'Import mode',
+        title = _(u'Import mode'),
         values = ['create', 'update', 'remove']
         )
@@ -333,5 +333,5 @@
 
     email_from = schema.ASCIILine(
-        title = u'Email Address:',
+        title = _(u'Email Address:'),
         default = None,
         required = True,
@@ -340,5 +340,5 @@
 
     email_to = schema.ASCIILine(
-        title = u'Email to:',
+        title = _(u'Email to:'),
         default = None,
         required = True,
@@ -347,13 +347,13 @@
 
     subject = schema.TextLine(
-        title = u'Subject:',
+        title = _(u'Subject:'),
         required = True,)
 
     fullname = schema.TextLine(
-        title = u'Full Name:',
+        title = _(u'Full Name:'),
         required = True,)
 
     body = schema.Text(
-        title = u'Text:',
+        title = _(u'Text:'),
         required = True,)
 
@@ -373,10 +373,10 @@
 
     email = schema.TextLine(
-        title = u'Email',
+        title = _(u'Email Address'),
         description = u'',
         required=False,)
 
     phone = schema.TextLine(
-        title = u'Phone',
+        title = _(u'Phone'),
         description = u'',
         required=False,)
@@ -386,18 +386,18 @@
     """
     name = schema.TextLine(
-        title = u'User ID',
+        title = _(u'User Id'),
         description = u'Login name of user',
         required = True,)
 
     title = schema.TextLine(
-        title = u'Full Name',
+        title = _(u'Full Name'),
         required = False,)
 
     description = schema.Text(
-        title = u'Description/Notice',
+        title = _(u'Description/Notice'),
         required = False,)
 
     email = schema.ASCIILine(
-        title = u'Email',
+        title = _(u'Email Address'),
         default = None,
         required = True,
@@ -406,5 +406,5 @@
 
     phone = schema.TextLine(
-        title = u'Phone',
+        title = _(u'Phone'),
         default = None,
         required = True,
@@ -412,5 +412,5 @@
 
     roles = schema.List(
-        title = u'Portal roles',
+        title = _(u'Portal roles'),
         value_type = schema.Choice(source=RoleSource()))
 
@@ -455,11 +455,11 @@
 
     name = schema.TextLine(
-        title = u'Name of University',
-        default = u'Sample University',
+        title = _(u'Name of University'),
+        default = _(u'Sample University'),
         required = True,
         )
 
     acronym = schema.TextLine(
-        title = u'Abbreviated Title of University',
+        title = _(u'Abbreviated Title of University'),
         default = u'WAeUP.Kofa',
         required = True,
@@ -467,5 +467,5 @@
 
     skin = schema.Choice(
-        title = u'Skin',
+        title = _(u'Skin'),
         default = u'gray waeup theme',
         vocabulary = 'waeup.kofa.browser.theming.ThemesVocabulary',
@@ -474,5 +474,5 @@
 
     frontpage = schema.Text(
-        title = u'Content in reST format',
+        title = _(u'Content in reST format'),
         required = False,
         default = default_frontpage,
@@ -486,5 +486,5 @@
 
     accommodation_session = schema.Choice(
-        title = u'Accommodation Booking Session',
+        title = _(u'Accommodation Booking Session'),
         source = academic_sessions_vocab,
         default = datetime.now().year,
@@ -494,5 +494,5 @@
 
     accommodation_states = schema.List(
-        title = u'Allowed States for Accommodation Booking',
+        title = _(u'Allowed States for Accommodation Booking'),
         value_type = schema.Choice(
             vocabulary = registration_states_vocab,
@@ -502,5 +502,5 @@
 
     name_admin = schema.TextLine(
-        title = u'Name of Administrator',
+        title = _(u'Name of Administrator'),
         default = u'Administrator',
         required = False,
@@ -508,5 +508,5 @@
 
     email_admin = schema.ASCIILine(
-        title = u'Email Address of Administrator',
+        title = _(u'Email Address of Administrator'),
         default = 'contact@waeup.org',
         required = False,
@@ -515,11 +515,11 @@
 
     email_subject = schema.TextLine(
-        title = u'Subject of Email to Administrator',
-        default = u'Kofa Contact',
+        title = _(u'Subject of Email to Administrator'),
+        default = _(u'Kofa Contact'),
         required = False,
         )
 
     smtp_mailer = schema.Choice(
-        title = u'SMTP mailer to use when sending mail',
+        title = _(u'SMTP mailer to use when sending mail'),
         vocabulary = 'Mail Delivery Names',
         default = 'No email service',
@@ -528,5 +528,5 @@
 
     captcha = schema.Choice(
-        title = u'Captcha used for public registration pages',
+        title = _(u'Captcha used for public registration pages'),
         source = CaptchaSource(),
         default = u'No captcha',
@@ -535,5 +535,5 @@
 
     carry_over = schema.Bool(
-        title = u'Carry-over Course Registration',
+        title = _(u'Carry-over Course Registration'),
         default = False,
         )
@@ -544,5 +544,5 @@
 
     academic_session = schema.Choice(
-        title = u'Academic Session',
+        title = _(u'Academic Session'),
         source = academic_sessions_vocab,
         default = None,
@@ -552,35 +552,35 @@
 
     school_fee_base = schema.Int(
-        title = u'School Fee',
+        title = _(u'School Fee'),
         default = 0,
         )
 
     surcharge_1 = schema.Int(
-        title = u'Surcharge 1',
+        title = _(u'Surcharge 1'),
         default = 0,
         )
 
     surcharge_2 = schema.Int(
-        title = u'Surcharge 2',
+        title = _(u'Surcharge 2'),
         default = 0,
         )
 
     surcharge_3 = schema.Int(
-        title = u'Surcharge 3',
+        title = _(u'Surcharge 3'),
         default = 0,
         )
 
     clearance_fee = schema.Int(
-        title = u'Clearance Fee',
+        title = _(u'Clearance Fee'),
         default = 0,
         )
 
     booking_fee = schema.Int(
-        title = u'Booking Fee',
+        title = _(u'Booking Fee'),
         default = 0,
         )
 
     acceptance_fee = schema.Int(
-        title = u'Acceptance Fee',
+        title = _(u'Acceptance Fee'),
         default = 0,
         )
@@ -596,5 +596,5 @@
 
     academic_session = schema.Choice(
-        title = u'Academic Session',
+        title = _(u'Academic Session'),
         source = academic_sessions_vocab,
         default = None,
@@ -1008,6 +1008,6 @@
     path = Path(
         title = u'Path',
-        description = u"Directory where the datacenter should store"
-                     u"files by default (adjustable in web UI).",
-        required = True,
-        )
+        description = u"Directory where the datacenter should store "
+                      u"files by default (adjustable in web UI).",
+        required = True,
+        )
Index: /main/waeup.kofa/trunk/src/waeup/kofa/locales/de/LC_MESSAGES/waeup.kofa.po
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/locales/de/LC_MESSAGES/waeup.kofa.po	(revision 7827)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/de/LC_MESSAGES/waeup.kofa.po	(revision 7828)
@@ -15,6 +15,6 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Thu Mar  8 23:29:25 2012\n"
-"PO-Revision-Date: 2012-03-08 23:30+0100\n"
+"POT-Creation-Date: Fri Mar  9 23:09:56 2012\n"
+"PO-Revision-Date: 2012-03-09 23:11+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
 "Language-Team: WAeUP Germany <henrik@waeup.org>\n"
@@ -873,4 +873,6 @@
 
 #: waeup/kofa/applicants/interfaces.py:413
+#: waeup/kofa/interfaces.py:375
+#: waeup/kofa/interfaces.py:401
 #: waeup/kofa/students/interfaces.py:490
 msgid "Email Address"
@@ -878,4 +880,6 @@
 
 #: waeup/kofa/applicants/interfaces.py:418
+#: waeup/kofa/interfaces.py:380
+#: waeup/kofa/interfaces.py:408
 #: waeup/kofa/students/interfaces.py:203
 msgid "Phone"
@@ -1786,13 +1790,4 @@
 msgid "Settings"
 msgstr "Einstellungen"
-
-#: waeup/kofa/browser/templates/departmentmanagepage.pt:97
-#: waeup/kofa/browser/templates/userscontainerpage.pt:4
-#: waeup/kofa/browser/templates/facultymanagepage.pt:71
-#: waeup/kofa/browser/templates/certificatemanagepage.pt:88
-#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:89
-#: waeup/kofa/applicants/browser_templates/applicantsrootmanagepage.pt:56
-msgid "User Id"
-msgstr "Benutzer Id"
 
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:99
@@ -1893,13 +1888,18 @@
 msgstr "Formularstatus:"
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:113
-#: waeup/kofa/browser/templates/studentsitelayout.pt:99
+#: waeup/kofa/browser/templates/staffsitelayout.pt:114
+#: waeup/kofa/browser/templates/studentsitelayout.pt:100
 msgid "Back to top"
 msgstr "Zurück zum Anfang"
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:114
-#: waeup/kofa/browser/templates/studentsitelayout.pt:100
-msgid "Student Information and Registration Portal<br /> Copyright &copy; WAeUP Group, 2008-2012"
-msgstr "Studenten-Informations- und Registrierungsportal<br /> Copyright &copy; WAeUP Group, 2008-2012"
+#: waeup/kofa/browser/templates/staffsitelayout.pt:116
+#: waeup/kofa/browser/templates/studentsitelayout.pt:102
+msgid "Kofa - Student Management System"
+msgstr "Kofa - Student Management System"
+
+#: waeup/kofa/browser/templates/staffsitelayout.pt:119
+#: waeup/kofa/browser/templates/studentsitelayout.pt:105
+msgid "Copyright &copy; WAeUP Group 2008-2012"
+msgstr "Copyright &copy; WAeUP Group 2008-2012"
 
 #: waeup/kofa/browser/templates/staffsitelayout.pt:34
@@ -2280,4 +2280,151 @@
 msgstr ""
 
+#: waeup/kofa/interfaces.py:306
+msgid "Importer name"
+msgstr "Name des Importers"
+
+#: waeup/kofa/interfaces.py:310
+msgid "Import mode"
+msgstr "Importmodus"
+
+#: waeup/kofa/interfaces.py:335
+msgid "Email Address:"
+msgstr "Emailadresse:"
+
+#: waeup/kofa/interfaces.py:342
+msgid "Email to:"
+msgstr "Email an:"
+
+#: waeup/kofa/interfaces.py:349
+msgid "Subject:"
+msgstr "Betreff:"
+
+#: waeup/kofa/interfaces.py:353
+msgid "Full Name:"
+msgstr "Vollständiger Name:"
+
+#: waeup/kofa/interfaces.py:357
+msgid "Text:"
+msgstr "Text:"
+
+#: waeup/kofa/interfaces.py:388
+#: waeup/kofa/browser/templates/departmentmanagepage.pt:97
+#: waeup/kofa/browser/templates/userscontainerpage.pt:4
+#: waeup/kofa/browser/templates/facultymanagepage.pt:71
+#: waeup/kofa/browser/templates/certificatemanagepage.pt:88
+#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:89
+#: waeup/kofa/applicants/browser_templates/applicantsrootmanagepage.pt:56
+msgid "User Id"
+msgstr "Benutzer Id"
+
+#: waeup/kofa/interfaces.py:393
+#: waeup/kofa/students/browser_templates/containerpage.pt:33
+#: waeup/kofa/students/browser_templates/containermanagepage.pt:39
+#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:44
+msgid "Full Name"
+msgstr "Vollständiger Name"
+
+#: waeup/kofa/interfaces.py:397
+msgid "Description/Notice"
+msgstr "Beschreibung/Nachricht"
+
+#: waeup/kofa/interfaces.py:414
+msgid "Portal roles"
+msgstr "Portalweite Rollen"
+
+#: waeup/kofa/interfaces.py:457
+msgid "Name of University"
+msgstr "Name der Universität"
+
+#: waeup/kofa/interfaces.py:458
+msgid "Sample University"
+msgstr "Deomo-Universität"
+
+#: waeup/kofa/interfaces.py:463
+msgid "Abbreviated Title of University"
+msgstr "Abkürzung"
+
+#: waeup/kofa/interfaces.py:469
+msgid "Skin"
+msgstr "Skin"
+
+#: waeup/kofa/interfaces.py:476
+msgid "Content in reST format"
+msgstr "Inhalt in reST-Format"
+
+#: waeup/kofa/interfaces.py:488
+msgid "Accommodation Booking Session"
+msgstr "Buchungssession"
+
+#: waeup/kofa/interfaces.py:496
+msgid "Allowed States for Accommodation Booking"
+msgstr "Erlaubte Zustände für das Buchen einer Unterbringung"
+
+#: waeup/kofa/interfaces.py:504
+msgid "Name of Administrator"
+msgstr "Name des Administrators"
+
+#: waeup/kofa/interfaces.py:510
+msgid "Email Address of Administrator"
+msgstr "Emailadresse des Administrators"
+
+#: waeup/kofa/interfaces.py:517
+msgid "Subject of Email to Administrator"
+msgstr "Betreff der Email an Administrator"
+
+#: waeup/kofa/interfaces.py:518
+msgid "Kofa Contact"
+msgstr "Kofa-Kontakt"
+
+#: waeup/kofa/interfaces.py:523
+msgid "SMTP mailer to use when sending mail"
+msgstr "SMTP Dienst"
+
+#: waeup/kofa/interfaces.py:530
+msgid "Captcha used for public registration pages"
+msgstr "Captcha für öffentliche Registrierung"
+
+#: waeup/kofa/interfaces.py:537
+msgid "Carry-over Course Registration"
+msgstr "Carry-Over-Kursregistrierung"
+
+#: waeup/kofa/interfaces.py:546
+#: waeup/kofa/interfaces.py:598
+msgid "Academic Session"
+msgstr "Akademische Session"
+
+#: waeup/kofa/interfaces.py:554
+#: waeup/kofa/payments/interfaces.py:30
+msgid "School Fee"
+msgstr "Schulgebühr"
+
+#: waeup/kofa/interfaces.py:559
+#: waeup/kofa/payments/interfaces.py:106
+msgid "Surcharge 1"
+msgstr "Zusatzgebühr 1"
+
+#: waeup/kofa/interfaces.py:564
+#: waeup/kofa/payments/interfaces.py:113
+msgid "Surcharge 2"
+msgstr "Zusatzgebühr 2"
+
+#: waeup/kofa/interfaces.py:569
+#: waeup/kofa/payments/interfaces.py:120
+msgid "Surcharge 3"
+msgstr "Zusatzgebühr 3"
+
+#: waeup/kofa/interfaces.py:574
+msgid "Clearance Fee"
+msgstr "Einschreibungsgebühr"
+
+#: waeup/kofa/interfaces.py:579
+msgid "Booking Fee"
+msgstr "Buchungsgebühr"
+
+#: waeup/kofa/interfaces.py:584
+#: waeup/kofa/payments/interfaces.py:36
+msgid "Acceptance Fee"
+msgstr "Zulassungsgebühr"
+
 #: waeup/kofa/interfaces.py:73
 msgid "clearance started"
@@ -2329,7 +2476,6 @@
 
 #: waeup/kofa/interfaces.py:94
-#, fuzzy
 msgid "Satisfactory"
-msgstr "Historie"
+msgstr ""
 
 #: waeup/kofa/interfaces.py:95
@@ -2338,7 +2484,6 @@
 
 #: waeup/kofa/interfaces.py:96
-#, fuzzy
 msgid "Fail"
-msgstr "Fehler"
+msgstr ""
 
 #: waeup/kofa/objecthistory.py:73
@@ -2346,16 +2491,4 @@
 msgstr "von"
 
-#: waeup/kofa/payments/interfaces.py:106
-msgid "Surcharge 1"
-msgstr "Zusatzgebühr 1"
-
-#: waeup/kofa/payments/interfaces.py:113
-msgid "Surcharge 2"
-msgstr "Zusatzgebühr 2"
-
-#: waeup/kofa/payments/interfaces.py:120
-msgid "Surcharge 3"
-msgstr "Zusatzgebühr 3"
-
 #: waeup/kofa/payments/interfaces.py:133
 msgid "Activation Code"
@@ -2394,8 +2527,4 @@
 msgstr "Fehler"
 
-#: waeup/kofa/payments/interfaces.py:30
-msgid "School Fee"
-msgstr "Schulgebühr"
-
 #: waeup/kofa/payments/interfaces.py:31
 msgid "Clearance"
@@ -2417,8 +2546,4 @@
 msgid "Gown"
 msgstr "Talar"
-
-#: waeup/kofa/payments/interfaces.py:36
-msgid "Acceptance Fee"
-msgstr "Zulassungsgebühr"
 
 #: waeup/kofa/payments/interfaces.py:51
@@ -3081,10 +3206,4 @@
 msgstr "Status"
 
-#: waeup/kofa/students/browser_templates/containerpage.pt:33
-#: waeup/kofa/students/browser_templates/containermanagepage.pt:39
-#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:44
-msgid "Full Name"
-msgstr "Vollständiger Name"
-
 #: waeup/kofa/students/browser_templates/containerpage.pt:5
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:5
@@ -3118,5 +3237,5 @@
 msgstr "Aktivierungs-Code:"
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/students/browser_templates/imageupload.pt:21
 #: waeup/kofa/students/browser_templates/fileupload.pt:27
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
@@ -3790,5 +3909,5 @@
 msgstr "8. Studienjahr"
 
-#: waeup/kofa/utils/utils.py:119
+#: waeup/kofa/utils/utils.py:122
 msgid ""
 "Fullname: ${a}\n"
@@ -3806,5 +3925,5 @@
 "${e}\n"
 
-#: waeup/kofa/utils/utils.py:164
+#: waeup/kofa/utils/utils.py:167
 msgid ""
 "Dear ${a},\n"
Index: /main/waeup.kofa/trunk/src/waeup/kofa/locales/en/LC_MESSAGES/waeup.kofa.po
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/locales/en/LC_MESSAGES/waeup.kofa.po	(revision 7827)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/en/LC_MESSAGES/waeup.kofa.po	(revision 7828)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Thu Mar  8 23:29:25 2012\n"
+"POT-Creation-Date: Fri Mar  9 23:09:56 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -28,44 +28,24 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: waeup/kofa/accesscodes/browser.py:100
-#: waeup/kofa/accesscodes/browser.py:113
-#: waeup/kofa/applicants/browser.py:80
-#: waeup/kofa/applicants/browser.py:130
-#: waeup/kofa/applicants/browser.py:182
-#: waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:338
-#: waeup/kofa/browser/pages.py:503
-#: waeup/kofa/browser/pages.py:708
-#: waeup/kofa/browser/pages.py:735
-#: waeup/kofa/browser/pages.py:758
-#: waeup/kofa/browser/pages.py:805
-#: waeup/kofa/browser/pages.py:835
-#: waeup/kofa/browser/pages.py:955
-#: waeup/kofa/browser/pages.py:1183
-#: waeup/kofa/browser/pages.py:1277
-#: waeup/kofa/browser/pages.py:1298
-#: waeup/kofa/browser/pages.py:1325
-#: waeup/kofa/browser/pages.py:1353
-#: waeup/kofa/browser/pages.py:1354
-#: waeup/kofa/browser/pages.py:1400
-#: waeup/kofa/browser/pages.py:1441
-#: waeup/kofa/browser/pages.py:1520
-#: waeup/kofa/browser/pages.py:1521
-#: waeup/kofa/browser/pages.py:1523
-#: waeup/kofa/browser/pages.py:1601
-#: waeup/kofa/browser/pages.py:1646
-#: waeup/kofa/browser/pages.py:1684
-#: waeup/kofa/browser/pages.py:1728
-#: waeup/kofa/browser/pages.py:1767
-#: waeup/kofa/browser/pages.py:1769
-#: waeup/kofa/browser/pages.py:1804
-#: waeup/kofa/browser/pages.py:1855
-#: waeup/kofa/browser/pages.py:1907
-#: waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:585
-#: waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:888
+#: waeup/kofa/accesscodes/browser.py:100 waeup/kofa/accesscodes/browser.py:113
+#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:130
+#: waeup/kofa/applicants/browser.py:182 waeup/kofa/applicants/browser.py:254
+#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:338
+#: waeup/kofa/browser/pages.py:503 waeup/kofa/browser/pages.py:708
+#: waeup/kofa/browser/pages.py:735 waeup/kofa/browser/pages.py:758
+#: waeup/kofa/browser/pages.py:805 waeup/kofa/browser/pages.py:835
+#: waeup/kofa/browser/pages.py:955 waeup/kofa/browser/pages.py:1183
+#: waeup/kofa/browser/pages.py:1277 waeup/kofa/browser/pages.py:1298
+#: waeup/kofa/browser/pages.py:1325 waeup/kofa/browser/pages.py:1353
+#: waeup/kofa/browser/pages.py:1354 waeup/kofa/browser/pages.py:1400
+#: waeup/kofa/browser/pages.py:1441 waeup/kofa/browser/pages.py:1520
+#: waeup/kofa/browser/pages.py:1521 waeup/kofa/browser/pages.py:1523
+#: waeup/kofa/browser/pages.py:1601 waeup/kofa/browser/pages.py:1646
+#: waeup/kofa/browser/pages.py:1684 waeup/kofa/browser/pages.py:1728
+#: waeup/kofa/browser/pages.py:1767 waeup/kofa/browser/pages.py:1769
+#: waeup/kofa/browser/pages.py:1804 waeup/kofa/browser/pages.py:1855
+#: waeup/kofa/browser/pages.py:1907 waeup/kofa/students/browser.py:584
+#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:746
+#: waeup/kofa/students/browser.py:748 waeup/kofa/students/browser.py:888
 msgid "Cancel"
 msgstr ""
@@ -105,10 +85,7 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:153
-#: waeup/kofa/browser/pages.py:592
-#: waeup/kofa/browser/pages.py:1142
-#: waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:171
-#: waeup/kofa/students/browser.py:205
+#: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:592
+#: waeup/kofa/browser/pages.py:1142 waeup/kofa/browser/viewlets.py:190
+#: waeup/kofa/students/browser.py:171 waeup/kofa/students/browser.py:205
 msgid "Search"
 msgstr ""
@@ -122,6 +99,5 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:180
-#: waeup/kofa/accesscodes/workflow.py:39
+#: waeup/kofa/accesscodes/browser.py:180 waeup/kofa/accesscodes/workflow.py:39
 msgid "disabled"
 msgstr ""
@@ -175,6 +151,5 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:46
-#: waeup/kofa/accesscodes/browser.py:206
+#: waeup/kofa/accesscodes/browser.py:46 waeup/kofa/accesscodes/browser.py:206
 #: waeup/kofa/accesscodes/browser.py:226
 msgid "Access Code Batches"
@@ -347,6 +322,5 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/workflow.py:37
-#: waeup/kofa/applicants/workflow.py:37
+#: waeup/kofa/accesscodes/workflow.py:37 waeup/kofa/applicants/workflow.py:37
 msgid "initialized"
 msgstr ""
@@ -368,6 +342,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:117
-#: waeup/kofa/applicants/browser.py:325
+#: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:325
 #: waeup/kofa/applicants/browser.py:745
 msgid "Could not delete:"
@@ -375,19 +348,16 @@
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:120
-#: waeup/kofa/applicants/browser.py:328
-#: waeup/kofa/applicants/browser.py:748
-#: waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:243
-#: waeup/kofa/students/browser.py:642
-#: waeup/kofa/students/browser.py:796
-#: waeup/kofa/students/browser.py:974
-#: waeup/kofa/students/browser.py:1184
-#: waeup/kofa/students/browser.py:1770
+#: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py:328
+#: waeup/kofa/applicants/browser.py:748 waeup/kofa/browser/pages.py:134
+#: waeup/kofa/students/browser.py:243 waeup/kofa/students/browser.py:642
+#: waeup/kofa/students/browser.py:796 waeup/kofa/students/browser.py:974
+#: waeup/kofa/students/browser.py:1184 waeup/kofa/students/browser.py:1770
 msgid "Successfully removed: ${a}"
 msgstr ""
 
 #: waeup/kofa/applicants/browser.py:169
-msgid "An applicants container for the same application type and entrance year exists already in the database."
+msgid ""
+"An applicants container for the same application type and entrance year "
+"exists already in the database."
 msgstr ""
 
@@ -396,6 +366,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:190
-#: waeup/kofa/applicants/viewlets.py:44
+#: waeup/kofa/applicants/browser.py:190 waeup/kofa/applicants/viewlets.py:44
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:12
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:36
@@ -403,58 +372,36 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:301
-#: waeup/kofa/applicants/browser.py:654
-#: waeup/kofa/applicants/browser.py:688
-#: waeup/kofa/applicants/browser.py:791
-#: waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:838
-#: waeup/kofa/browser/pages.py:476
-#: waeup/kofa/browser/pages.py:631
-#: waeup/kofa/browser/pages.py:654
-#: waeup/kofa/browser/pages.py:728
-#: waeup/kofa/browser/pages.py:1181
-#: waeup/kofa/browser/pages.py:1353
-#: waeup/kofa/browser/pages.py:1394
-#: waeup/kofa/browser/pages.py:1520
-#: waeup/kofa/browser/pages.py:1573
-#: waeup/kofa/browser/pages.py:1716
-#: waeup/kofa/browser/pages.py:1767
-#: waeup/kofa/browser/pages.py:1788
-#: waeup/kofa/hostels/browser.py:209
-#: waeup/kofa/hostels/browser.py:231
-#: waeup/kofa/hostels/browser.py:319
-#: waeup/kofa/students/browser.py:359
-#: waeup/kofa/students/browser.py:458
-#: waeup/kofa/students/browser.py:535
-#: waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:600
-#: waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:771
-#: waeup/kofa/students/browser.py:1444
-#: waeup/kofa/students/browser.py:1459
-#: waeup/kofa/students/browser.py:1574
+#: waeup/kofa/applicants/browser.py:254 waeup/kofa/applicants/browser.py:301
+#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:688
+#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:794
+#: waeup/kofa/applicants/browser.py:838 waeup/kofa/browser/pages.py:476
+#: waeup/kofa/browser/pages.py:631 waeup/kofa/browser/pages.py:654
+#: waeup/kofa/browser/pages.py:728 waeup/kofa/browser/pages.py:1181
+#: waeup/kofa/browser/pages.py:1353 waeup/kofa/browser/pages.py:1394
+#: waeup/kofa/browser/pages.py:1520 waeup/kofa/browser/pages.py:1573
+#: waeup/kofa/browser/pages.py:1716 waeup/kofa/browser/pages.py:1767
+#: waeup/kofa/browser/pages.py:1788 waeup/kofa/hostels/browser.py:209
+#: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:319
+#: waeup/kofa/students/browser.py:359 waeup/kofa/students/browser.py:458
+#: waeup/kofa/students/browser.py:535 waeup/kofa/students/browser.py:584
+#: waeup/kofa/students/browser.py:600 waeup/kofa/students/browser.py:746
+#: waeup/kofa/students/browser.py:771 waeup/kofa/students/browser.py:1444
+#: waeup/kofa/students/browser.py:1459 waeup/kofa/students/browser.py:1574
 msgid "Save"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:333
+#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:333
 #: waeup/kofa/applicants/browser.py:361
 msgid "Add applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:265
-#: waeup/kofa/applicants/viewlets.py:95
+#: waeup/kofa/applicants/browser.py:265 waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:305
-#: waeup/kofa/applicants/browser.py:717
-#: waeup/kofa/browser/pages.py:1397
-#: waeup/kofa/browser/pages.py:1719
-#: waeup/kofa/browser/pages.py:1791
-#: waeup/kofa/browser/pages.py:1903
-#: waeup/kofa/hostels/browser.py:54
-#: waeup/kofa/students/browser.py:80
+#: waeup/kofa/applicants/browser.py:305 waeup/kofa/applicants/browser.py:717
+#: waeup/kofa/browser/pages.py:1397 waeup/kofa/browser/pages.py:1719
+#: waeup/kofa/browser/pages.py:1791 waeup/kofa/browser/pages.py:1903
+#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:80
 #: waeup/kofa/students/browser.py:385
 msgid "Form has been saved."
@@ -477,11 +424,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:397
-#: waeup/kofa/students/browser.py:285
+#: waeup/kofa/applicants/browser.py:397 waeup/kofa/students/browser.py:285
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:398
-#: waeup/kofa/students/browser.py:286
+#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:286
 msgid "unset"
 msgstr ""
@@ -496,22 +441,18 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:461
-#: waeup/kofa/students/browser.py:1023
+#: waeup/kofa/applicants/browser.py:461 waeup/kofa/students/browser.py:1023
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:474
-#: waeup/kofa/students/browser.py:1037
+#: waeup/kofa/applicants/browser.py:474 waeup/kofa/students/browser.py:1037
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:501
-#: waeup/kofa/students/browser.py:1056
+#: waeup/kofa/applicants/browser.py:501 waeup/kofa/students/browser.py:1056
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:529
-#: waeup/kofa/students/browser.py:1105
+#: waeup/kofa/applicants/browser.py:529 waeup/kofa/students/browser.py:1105
 msgid "Valid callback received."
 msgstr ""
@@ -541,26 +482,19 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:654
-#: waeup/kofa/applicants/browser.py:794
+#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:794
 #: waeup/kofa/applicants/browser.py:846
 msgid "Final Submit"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655
-#: waeup/kofa/applicants/browser.py:758
-#: waeup/kofa/applicants/browser.py:792
-#: waeup/kofa/applicants/browser.py:827
+#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:758
+#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:827
 #: waeup/kofa/students/browser.py:980
 msgid "Add online payment ticket"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655
-#: waeup/kofa/applicants/browser.py:763
-#: waeup/kofa/applicants/browser.py:792
-#: waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:832
-#: waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:780
-#: waeup/kofa/students/browser.py:956
+#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:763
+#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:795
+#: waeup/kofa/applicants/browser.py:832 waeup/kofa/students/browser.py:748
+#: waeup/kofa/students/browser.py:780 waeup/kofa/students/browser.py:956
 #: waeup/kofa/students/browser.py:1752
 msgid "Remove selected tickets"
@@ -572,58 +506,40 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:685
-#: waeup/kofa/students/browser.py:356
+#: waeup/kofa/applicants/browser.py:685 waeup/kofa/students/browser.py:356
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:732
-#: waeup/kofa/students/browser.py:962
+#: waeup/kofa/applicants/browser.py:732 waeup/kofa/students/browser.py:962
 msgid "No payment selected."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:76
-#: waeup/kofa/applicants/viewlets.py:88
+#: waeup/kofa/applicants/browser.py:76 waeup/kofa/applicants/viewlets.py:88
 msgid "Manage application section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:79
-#: waeup/kofa/applicants/browser.py:105
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:308
-#: waeup/kofa/browser/pages.py:634
-#: waeup/kofa/browser/pages.py:675
-#: waeup/kofa/browser/pages.py:1277
-#: waeup/kofa/browser/pages.py:1288
-#: waeup/kofa/browser/pages.py:1354
-#: waeup/kofa/browser/pages.py:1389
-#: waeup/kofa/hostels/browser.py:131
-#: waeup/kofa/students/browser.py:206
-#: waeup/kofa/students/browser.py:1151
-#: waeup/kofa/students/browser.py:1164
+#: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:105
+#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:308
+#: waeup/kofa/browser/pages.py:634 waeup/kofa/browser/pages.py:675
+#: waeup/kofa/browser/pages.py:1277 waeup/kofa/browser/pages.py:1288
+#: waeup/kofa/browser/pages.py:1354 waeup/kofa/browser/pages.py:1389
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:206
+#: waeup/kofa/students/browser.py:1151 waeup/kofa/students/browser.py:1164
 msgid "Remove selected"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:79
-#: waeup/kofa/applicants/browser.py:125
-#: waeup/kofa/applicants/browser.py:148
-#: waeup/kofa/applicants/browser.py:160
+#: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:125
+#: waeup/kofa/applicants/browser.py:148 waeup/kofa/applicants/browser.py:160
 msgid "Add applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:805
-#: waeup/kofa/students/browser.py:88
+#: waeup/kofa/applicants/browser.py:805 waeup/kofa/students/browser.py:88
 msgid "The requested form is locked (read-only)."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:81
-#: waeup/kofa/applicants/browser.py:139
-#: waeup/kofa/applicants/browser.py:256
-#: waeup/kofa/applicants/browser.py:347
-#: waeup/kofa/browser/pages.py:1355
-#: waeup/kofa/browser/pages.py:1414
-#: waeup/kofa/browser/pages.py:1524
-#: waeup/kofa/browser/pages.py:1610
-#: waeup/kofa/browser/pages.py:1770
-#: waeup/kofa/browser/pages.py:1827
+#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:139
+#: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:347
+#: waeup/kofa/browser/pages.py:1355 waeup/kofa/browser/pages.py:1414
+#: waeup/kofa/browser/pages.py:1524 waeup/kofa/browser/pages.py:1610
+#: waeup/kofa/browser/pages.py:1770 waeup/kofa/browser/pages.py:1827
 msgid "Remove selected local roles"
 msgstr ""
@@ -633,14 +549,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:82
-#: waeup/kofa/applicants/browser.py:135
-#: waeup/kofa/applicants/browser.py:257
-#: waeup/kofa/applicants/browser.py:343
-#: waeup/kofa/browser/pages.py:1356
-#: waeup/kofa/browser/pages.py:1410
-#: waeup/kofa/browser/pages.py:1525
-#: waeup/kofa/browser/pages.py:1606
-#: waeup/kofa/browser/pages.py:1771
-#: waeup/kofa/browser/pages.py:1823
+#: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:135
+#: waeup/kofa/applicants/browser.py:257 waeup/kofa/applicants/browser.py:343
+#: waeup/kofa/browser/pages.py:1356 waeup/kofa/browser/pages.py:1410
+#: waeup/kofa/browser/pages.py:1525 waeup/kofa/browser/pages.py:1606
+#: waeup/kofa/browser/pages.py:1771 waeup/kofa/browser/pages.py:1823
 msgid "Add local role"
 msgstr ""
@@ -654,6 +565,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:858
-#: waeup/kofa/students/browser.py:1619
+#: waeup/kofa/applicants/browser.py:858 waeup/kofa/students/browser.py:1619
 msgid "This form cannot be submitted. Wrong state!"
 msgstr ""
@@ -701,5 +611,7 @@
 
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:59
-msgid "I confirm that the Passport Photograph uploaded on this form is a true picture of me."
+msgid ""
+"I confirm that the Passport Photograph uploaded on this form is a true "
+"picture of me."
 msgstr ""
 
@@ -722,5 +634,7 @@
 
 #: waeup/kofa/applicants/browser_templates/applicantregister.pt:18
-msgid "An account will be created for you and an email with your login credentials will be sent to the address provided."
+msgid ""
+"An account will be created for you and an email with your login credentials "
+"will be sent to the address provided."
 msgstr ""
 
@@ -750,6 +664,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:197
-#: waeup/kofa/students/browser.py:713
+#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:713
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -775,6 +688,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:204
-#: waeup/kofa/students/browser.py:714
+#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:714
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -871,11 +783,11 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:413
-#: waeup/kofa/students/interfaces.py:490
+#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:375
+#: waeup/kofa/interfaces.py:401 waeup/kofa/students/interfaces.py:490
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:418
-#: waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:380
+#: waeup/kofa/interfaces.py:408 waeup/kofa/students/interfaces.py:203
 msgid "Phone"
 msgstr ""
@@ -951,5 +863,7 @@
 #. Default: ""
 #: waeup/kofa/applicants/pdf.py:203
-msgid "<font size=10>Proceed to the login page of the portal and enter your new credentials: user name= ${a}, password = ${b}.</font>"
+msgid ""
+"<font size=10>Proceed to the login page of the portal and enter your new "
+"credentials: user name= ${a}, password = ${b}.</font>"
 msgstr ""
 
@@ -982,17 +896,14 @@
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:151
-#: waeup/kofa/applicants/workflow.py:99
+#: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
 #: waeup/kofa/students/browser.py:258
 msgid "Create student record"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:168
-#: waeup/kofa/students/viewlets.py:300
+#: waeup/kofa/applicants/viewlets.py:168 waeup/kofa/students/viewlets.py:300
 msgid "Download payment receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:183
-#: waeup/kofa/students/viewlets.py:315
+#: waeup/kofa/applicants/viewlets.py:183 waeup/kofa/students/viewlets.py:315
 msgid "Request callback"
 msgstr ""
@@ -1002,25 +913,19 @@
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:73
-#: waeup/kofa/students/viewlets.py:512
+#: waeup/kofa/applicants/viewlets.py:73 waeup/kofa/students/viewlets.py:512
 msgid "My Data"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:100
-#: waeup/kofa/students/workflow.py:25
+#: waeup/kofa/applicants/workflow.py:100 waeup/kofa/students/workflow.py:25
 msgid "Student record created"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:106
-#: waeup/kofa/applicants/workflow.py:113
-#: waeup/kofa/applicants/workflow.py:120
-#: waeup/kofa/applicants/workflow.py:127
+#: waeup/kofa/applicants/workflow.py:106 waeup/kofa/applicants/workflow.py:113
+#: waeup/kofa/applicants/workflow.py:120 waeup/kofa/applicants/workflow.py:127
 msgid "Reset application to started"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:107
-#: waeup/kofa/applicants/workflow.py:114
-#: waeup/kofa/applicants/workflow.py:121
-#: waeup/kofa/applicants/workflow.py:128
+#: waeup/kofa/applicants/workflow.py:107 waeup/kofa/applicants/workflow.py:114
+#: waeup/kofa/applicants/workflow.py:121 waeup/kofa/applicants/workflow.py:128
 #: waeup/kofa/applicants/workflow.py:134
 msgid "Application reset"
@@ -1043,6 +948,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:41
-#: waeup/kofa/interfaces.py:72
+#: waeup/kofa/applicants/workflow.py:41 waeup/kofa/interfaces.py:72
 msgid "admitted"
 msgstr ""
@@ -1052,6 +956,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:43
-#: waeup/kofa/interfaces.py:71
+#: waeup/kofa/applicants/workflow.py:43 waeup/kofa/interfaces.py:71
 msgid "created"
 msgstr ""
@@ -1097,11 +1000,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:85
-#: waeup/kofa/applicants/workflow.py:92
+#: waeup/kofa/applicants/workflow.py:85 waeup/kofa/applicants/workflow.py:92
 msgid "Refuse application"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:86
-#: waeup/kofa/applicants/workflow.py:93
+#: waeup/kofa/applicants/workflow.py:86 waeup/kofa/applicants/workflow.py:93
 msgid "Application refused"
 msgstr ""
@@ -1111,31 +1012,24 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:116
-#: waeup/kofa/browser/viewlets.py:615
+#: waeup/kofa/browser/breadcrumbs.py:116 waeup/kofa/browser/viewlets.py:615
 msgid "Academics"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:123
-#: waeup/kofa/browser/pages.py:309
+#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:309
 msgid "Administration"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:130
-#: waeup/kofa/browser/viewlets.py:360
+#: waeup/kofa/browser/breadcrumbs.py:130 waeup/kofa/browser/viewlets.py:360
 #: waeup/kofa/browser/viewlets.py:666
 msgid "Portal Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:148
-#: waeup/kofa/browser/pages.py:386
-#: waeup/kofa/browser/viewlets.py:375
-#: waeup/kofa/browser/viewlets.py:676
+#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:386
+#: waeup/kofa/browser/viewlets.py:375 waeup/kofa/browser/viewlets.py:676
 msgid "Portal Users"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:155
-#: waeup/kofa/browser/pages.py:748
-#: waeup/kofa/browser/pages.py:1140
-#: waeup/kofa/browser/viewlets.py:393
+#: waeup/kofa/browser/breadcrumbs.py:155 waeup/kofa/browser/pages.py:748
+#: waeup/kofa/browser/pages.py:1140 waeup/kofa/browser/viewlets.py:393
 #: waeup/kofa/browser/viewlets.py:685
 msgid "Data Center"
@@ -1185,8 +1079,6 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:113
-#: waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:287
-#: waeup/kofa/students/browser.py:230
+#: waeup/kofa/browser/pages.py:113 waeup/kofa/hostels/browser.py:256
+#: waeup/kofa/hostels/browser.py:287 waeup/kofa/students/browser.py:230
 msgid "No item selected."
 msgstr ""
@@ -1226,8 +1118,6 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1277
-#: waeup/kofa/browser/pages.py:1293
-#: waeup/kofa/browser/pages.py:1310
-#: waeup/kofa/browser/pages.py:1314
+#: waeup/kofa/browser/pages.py:1277 waeup/kofa/browser/pages.py:1293
+#: waeup/kofa/browser/pages.py:1310 waeup/kofa/browser/pages.py:1314
 msgid "Add faculty"
 msgstr ""
@@ -1237,6 +1127,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1282
-#: waeup/kofa/browser/viewlets.py:441
+#: waeup/kofa/browser/pages.py:1282 waeup/kofa/browser/viewlets.py:441
 msgid "Manage academic section"
 msgstr ""
@@ -1246,18 +1135,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1342
-#: waeup/kofa/browser/pages.py:1352
+#: waeup/kofa/browser/pages.py:1342 waeup/kofa/browser/pages.py:1352
 msgid "Departments"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1354
-#: waeup/kofa/browser/pages.py:1405
-#: waeup/kofa/browser/pages.py:1424
-#: waeup/kofa/browser/pages.py:1428
+#: waeup/kofa/browser/pages.py:1354 waeup/kofa/browser/pages.py:1405
+#: waeup/kofa/browser/pages.py:1424 waeup/kofa/browser/pages.py:1428
 msgid "Add department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1362
-#: waeup/kofa/browser/viewlets.py:457
+#: waeup/kofa/browser/pages.py:1362 waeup/kofa/browser/viewlets.py:457
 msgid "Manage faculty"
 msgstr ""
@@ -1276,13 +1161,10 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1485
-#: waeup/kofa/browser/pages.py:1504
-#: waeup/kofa/students/browser.py:96
-#: waeup/kofa/students/viewlets.py:472
+#: waeup/kofa/browser/pages.py:1485 waeup/kofa/browser/pages.py:1504
+#: waeup/kofa/students/browser.py:96 waeup/kofa/students/viewlets.py:472
 msgid "Students"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:152
-#: waeup/kofa/browser/viewlets.py:322
+#: waeup/kofa/browser/pages.py:152 waeup/kofa/browser/viewlets.py:322
 #: waeup/kofa/browser/templates/staffsitelayout.pt:28
 #: waeup/kofa/browser/templates/studentsitelayout.pt:33
@@ -1290,30 +1172,23 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1521
-#: waeup/kofa/browser/pages.py:1579
+#: waeup/kofa/browser/pages.py:1521 waeup/kofa/browser/pages.py:1579
 msgid "Remove selected courses"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1521
-#: waeup/kofa/browser/pages.py:1591
-#: waeup/kofa/browser/pages.py:1620
-#: waeup/kofa/browser/pages.py:1624
+#: waeup/kofa/browser/pages.py:1521 waeup/kofa/browser/pages.py:1591
+#: waeup/kofa/browser/pages.py:1620 waeup/kofa/browser/pages.py:1624
 msgid "Add course"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1522
-#: waeup/kofa/browser/pages.py:1585
+#: waeup/kofa/browser/pages.py:1522 waeup/kofa/browser/pages.py:1585
 msgid "Remove selected certificates"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1522
-#: waeup/kofa/browser/pages.py:1596
-#: waeup/kofa/browser/pages.py:1657
-#: waeup/kofa/browser/pages.py:1661
+#: waeup/kofa/browser/pages.py:1522 waeup/kofa/browser/pages.py:1596
+#: waeup/kofa/browser/pages.py:1657 waeup/kofa/browser/pages.py:1661
 msgid "Add certificate"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1531
-#: waeup/kofa/browser/viewlets.py:464
+#: waeup/kofa/browser/pages.py:1531 waeup/kofa/browser/viewlets.py:464
 msgid "Manage department"
 msgstr ""
@@ -1341,6 +1216,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1711
-#: waeup/kofa/browser/viewlets.py:481
+#: waeup/kofa/browser/pages.py:1711 waeup/kofa/browser/viewlets.py:481
 msgid "Edit course"
 msgstr ""
@@ -1350,18 +1224,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1768
-#: waeup/kofa/browser/pages.py:1799
-#: waeup/kofa/browser/pages.py:1840
-#: waeup/kofa/browser/pages.py:1842
+#: waeup/kofa/browser/pages.py:1768 waeup/kofa/browser/pages.py:1799
+#: waeup/kofa/browser/pages.py:1840 waeup/kofa/browser/pages.py:1842
 msgid "Add course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1769
-#: waeup/kofa/browser/pages.py:1794
+#: waeup/kofa/browser/pages.py:1769 waeup/kofa/browser/pages.py:1794
 msgid "Remove selected course referrers"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1775
-#: waeup/kofa/browser/viewlets.py:488
+#: waeup/kofa/browser/pages.py:1775 waeup/kofa/browser/viewlets.py:488
 msgid "Manage certificate"
 msgstr ""
@@ -1380,6 +1250,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1888
-#: waeup/kofa/browser/viewlets.py:505
+#: waeup/kofa/browser/pages.py:1888 waeup/kofa/browser/viewlets.py:505
 msgid "Edit course referrer"
 msgstr ""
@@ -1398,13 +1267,10 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:234
-#: waeup/kofa/browser/pages.py:519
+#: waeup/kofa/browser/pages.py:234 waeup/kofa/browser/pages.py:519
 msgid "Send message now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:253
-#: waeup/kofa/browser/pages.py:272
-#: waeup/kofa/browser/pages.py:536
-#: waeup/kofa/students/browser.py:320
+#: waeup/kofa/browser/pages.py:253 waeup/kofa/browser/pages.py:272
+#: waeup/kofa/browser/pages.py:536 waeup/kofa/students/browser.py:320
 msgid "Your message has been sent."
 msgstr ""
@@ -1422,16 +1288,12 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:387
-#: waeup/kofa/hostels/browser.py:195
-#: waeup/kofa/students/viewlets.py:163
-#: waeup/kofa/students/viewlets.py:171
-#: waeup/kofa/students/viewlets.py:226
-#: waeup/kofa/students/viewlets.py:243
+#: waeup/kofa/browser/pages.py:387 waeup/kofa/hostels/browser.py:195
+#: waeup/kofa/students/viewlets.py:163 waeup/kofa/students/viewlets.py:171
+#: waeup/kofa/students/viewlets.py:226 waeup/kofa/students/viewlets.py:243
 #: waeup/kofa/students/viewlets.py:283
 msgid "Manage"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:388
-#: waeup/kofa/browser/viewlets.py:180
+#: waeup/kofa/browser/pages.py:388 waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
 msgstr ""
@@ -1442,6 +1304,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:426
-#: waeup/kofa/browser/pages.py:428
+#: waeup/kofa/browser/pages.py:426 waeup/kofa/browser/pages.py:428
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
@@ -1463,16 +1324,13 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:517
-#: waeup/kofa/students/browser.py:301
+#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:301
 msgid "Send message to ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:546
-#: waeup/kofa/browser/viewlets.py:400
+#: waeup/kofa/browser/pages.py:546 waeup/kofa/browser/viewlets.py:400
 msgid "My Preferences"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:559
-#: waeup/kofa/browser/viewlets.py:415
+#: waeup/kofa/browser/pages.py:559 waeup/kofa/browser/viewlets.py:415
 msgid "My Roles"
 msgstr ""
@@ -1490,17 +1348,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:631
-#: waeup/kofa/browser/pages.py:680
+#: waeup/kofa/browser/pages.py:631 waeup/kofa/browser/pages.py:680
 msgid "Update plugins"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:633
-#: waeup/kofa/browser/pages.py:661
+#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:661
 #: waeup/kofa/browser/pages.py:692
 msgid "Add session configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:658
-#: waeup/kofa/browser/pages.py:731
+#: waeup/kofa/browser/pages.py:658 waeup/kofa/browser/pages.py:731
 msgid "Settings have been saved."
 msgstr ""
@@ -1536,13 +1391,10 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:803
-#: waeup/kofa/browser/pages.py:833
-#: waeup/kofa/browser/pages.py:953
-#: waeup/kofa/browser/pages.py:1061
+#: waeup/kofa/browser/pages.py:803 waeup/kofa/browser/pages.py:833
+#: waeup/kofa/browser/pages.py:953 waeup/kofa/browser/pages.py:1061
 msgid "Process CSV file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:817
-#: waeup/kofa/browser/pages.py:918
+#: waeup/kofa/browser/pages.py:817 waeup/kofa/browser/pages.py:918
 #: waeup/kofa/browser/pages.py:1037
 msgid "Import aborted."
@@ -1573,6 +1425,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:956
-#: waeup/kofa/browser/pages.py:1182
+#: waeup/kofa/browser/pages.py:956 waeup/kofa/browser/pages.py:1182
 msgid "Reset"
 msgstr ""
@@ -1652,5 +1503,7 @@
 
 #: waeup/kofa/browser/templates/datacenterimport1page.pt:2
-msgid "Using batch processing you can mass-create, mass-update, or mass-remove datasets from the database using CSV files."
+msgid ""
+"Using batch processing you can mass-create, mass-update, or mass-remove "
+"datasets from the database using CSV files."
 msgstr ""
 
@@ -1672,5 +1525,7 @@
 
 #: waeup/kofa/browser/templates/datacenterimport2page.pt:8
-msgid "Please select a file-processor and a processing-mode from the selections below."
+msgid ""
+"Please select a file-processor and a processing-mode from the selections "
+"below."
 msgstr ""
 
@@ -1745,5 +1600,7 @@
 
 #: waeup/kofa/browser/templates/datacenterpage.pt:1
-msgid "The data center helps you to manage portal data. You can upload CSV files here, which will be available for import afterwards."
+msgid ""
+"The data center helps you to manage portal data. You can upload CSV files "
+"here, which will be available for import afterwards."
 msgstr ""
 
@@ -1784,13 +1641,4 @@
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:7
 msgid "Settings"
-msgstr ""
-
-#: waeup/kofa/browser/templates/departmentmanagepage.pt:97
-#: waeup/kofa/browser/templates/userscontainerpage.pt:4
-#: waeup/kofa/browser/templates/facultymanagepage.pt:71
-#: waeup/kofa/browser/templates/certificatemanagepage.pt:88
-#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:89
-#: waeup/kofa/applicants/browser_templates/applicantsrootmanagepage.pt:56
-msgid "User Id"
 msgstr ""
 
@@ -1892,12 +1740,17 @@
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:113
-#: waeup/kofa/browser/templates/studentsitelayout.pt:99
-msgid "Back to top"
-msgstr ""
-
 #: waeup/kofa/browser/templates/staffsitelayout.pt:114
 #: waeup/kofa/browser/templates/studentsitelayout.pt:100
-msgid "Student Information and Registration Portal<br /> Copyright &copy; WAeUP Group, 2008-2012"
+msgid "Back to top"
+msgstr ""
+
+#: waeup/kofa/browser/templates/staffsitelayout.pt:116
+#: waeup/kofa/browser/templates/studentsitelayout.pt:102
+msgid "Kofa - Student Management System"
+msgstr ""
+
+#: waeup/kofa/browser/templates/staffsitelayout.pt:119
+#: waeup/kofa/browser/templates/studentsitelayout.pt:105
+msgid "Copyright &copy; WAeUP Group 2008-2012"
 msgstr ""
 
@@ -1935,6 +1788,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:383
-#: waeup/kofa/students/viewlets.py:155
+#: waeup/kofa/browser/viewlets.py:383 waeup/kofa/students/viewlets.py:155
 msgid "Send email"
 msgstr ""
@@ -1948,11 +1800,9 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:473
-#: waeup/kofa/browser/viewlets.py:497
+#: waeup/kofa/browser/viewlets.py:473 waeup/kofa/browser/viewlets.py:497
 msgid "Show students"
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:528
-#: waeup/kofa/browser/viewlets.py:536
+#: waeup/kofa/browser/viewlets.py:528 waeup/kofa/browser/viewlets.py:536
 msgid "Show batch logs"
 msgstr ""
@@ -1970,8 +1820,6 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:91
-#: waeup/kofa/browser/viewlets.py:160
-#: waeup/kofa/students/viewlets.py:218
-#: waeup/kofa/students/viewlets.py:403
+#: waeup/kofa/browser/viewlets.py:91 waeup/kofa/browser/viewlets.py:160
+#: waeup/kofa/students/viewlets.py:218 waeup/kofa/students/viewlets.py:403
 msgid "Edit"
 msgstr ""
@@ -1981,11 +1829,9 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:113
-#: waeup/kofa/hostels/browser.py:123
+#: waeup/kofa/hostels/browser.py:113 waeup/kofa/hostels/browser.py:123
 msgid "Manage accommodation section"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:145
-#: waeup/kofa/hostels/browser.py:158
+#: waeup/kofa/hostels/browser.py:145 waeup/kofa/hostels/browser.py:158
 msgid "Add hostel"
 msgstr ""
@@ -2007,16 +1853,13 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:210
-#: waeup/kofa/hostels/browser.py:236
+#: waeup/kofa/hostels/browser.py:210 waeup/kofa/hostels/browser.py:236
 msgid "Update all beds"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:211
-#: waeup/kofa/hostels/browser.py:250
+#: waeup/kofa/hostels/browser.py:211 waeup/kofa/hostels/browser.py:250
 msgid "Switch reservation of selected beds"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:212
-#: waeup/kofa/hostels/browser.py:281
+#: waeup/kofa/hostels/browser.py:212 waeup/kofa/hostels/browser.py:281
 msgid "Release selected beds"
 msgstr ""
@@ -2024,5 +1867,6 @@
 #. Default: ""
 #: waeup/kofa/hostels/browser.py:241
-msgid "${a} empty beds removed, ${b} beds added, ${c} occupied beds modified (${d})"
+msgid ""
+"${a} empty beds removed, ${b} beds added, ${c} occupied beds modified (${d})"
 msgstr ""
 
@@ -2045,6 +1889,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:68
-#: waeup/kofa/hostels/browser.py:78
+#: waeup/kofa/hostels/browser.py:68 waeup/kofa/hostels/browser.py:78
 msgid "Hostels"
 msgstr ""
@@ -2113,6 +1956,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/interfaces.py:175
-#: waeup/kofa/students/interfaces.py:427
+#: waeup/kofa/hostels/interfaces.py:175 waeup/kofa/students/interfaces.py:427
 msgid "Bed Type"
 msgstr ""
@@ -2122,6 +1964,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/interfaces.py:186
-#: waeup/kofa/hostels/interfaces.py:199
+#: waeup/kofa/hostels/interfaces.py:186 waeup/kofa/hostels/interfaces.py:199
 msgid "Owner (Student)"
 msgstr ""
@@ -2279,4 +2120,145 @@
 msgstr ""
 
+#: waeup/kofa/interfaces.py:306
+msgid "Importer name"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:310
+msgid "Import mode"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:335
+msgid "Email Address:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:342
+msgid "Email to:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:349
+msgid "Subject:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:353
+msgid "Full Name:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:357
+msgid "Text:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:388
+#: waeup/kofa/browser/templates/departmentmanagepage.pt:97
+#: waeup/kofa/browser/templates/userscontainerpage.pt:4
+#: waeup/kofa/browser/templates/facultymanagepage.pt:71
+#: waeup/kofa/browser/templates/certificatemanagepage.pt:88
+#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:89
+#: waeup/kofa/applicants/browser_templates/applicantsrootmanagepage.pt:56
+msgid "User Id"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:393
+#: waeup/kofa/students/browser_templates/containerpage.pt:33
+#: waeup/kofa/students/browser_templates/containermanagepage.pt:39
+#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:44
+msgid "Full Name"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:397
+msgid "Description/Notice"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:414
+msgid "Portal roles"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:457
+msgid "Name of University"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:458
+msgid "Sample University"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:463
+msgid "Abbreviated Title of University"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:469
+msgid "Skin"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:476
+msgid "Content in reST format"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:488
+msgid "Accommodation Booking Session"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:496
+msgid "Allowed States for Accommodation Booking"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:504
+msgid "Name of Administrator"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:510
+msgid "Email Address of Administrator"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:517
+msgid "Subject of Email to Administrator"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:518
+msgid "Kofa Contact"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:523
+msgid "SMTP mailer to use when sending mail"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:530
+msgid "Captcha used for public registration pages"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:537
+msgid "Carry-over Course Registration"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:546 waeup/kofa/interfaces.py:598
+msgid "Academic Session"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:554 waeup/kofa/payments/interfaces.py:30
+msgid "School Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:559 waeup/kofa/payments/interfaces.py:106
+msgid "Surcharge 1"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:564 waeup/kofa/payments/interfaces.py:113
+msgid "Surcharge 2"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:569 waeup/kofa/payments/interfaces.py:120
+msgid "Surcharge 3"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:574
+msgid "Clearance Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:579
+msgid "Booking Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:584 waeup/kofa/payments/interfaces.py:36
+msgid "Acceptance Fee"
+msgstr ""
+
 #: waeup/kofa/interfaces.py:73
 msgid "clearance started"
@@ -2343,16 +2325,4 @@
 msgstr ""
 
-#: waeup/kofa/payments/interfaces.py:106
-msgid "Surcharge 1"
-msgstr ""
-
-#: waeup/kofa/payments/interfaces.py:113
-msgid "Surcharge 2"
-msgstr ""
-
-#: waeup/kofa/payments/interfaces.py:120
-msgid "Surcharge 3"
-msgstr ""
-
 #: waeup/kofa/payments/interfaces.py:133
 msgid "Activation Code"
@@ -2391,8 +2361,4 @@
 msgstr ""
 
-#: waeup/kofa/payments/interfaces.py:30
-msgid "School Fee"
-msgstr ""
-
 #: waeup/kofa/payments/interfaces.py:31
 msgid "Clearance"
@@ -2413,8 +2379,4 @@
 #: waeup/kofa/payments/interfaces.py:35
 msgid "Gown"
-msgstr ""
-
-#: waeup/kofa/payments/interfaces.py:36
-msgid "Acceptance Fee"
 msgstr ""
 
@@ -2450,6 +2412,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1003
-#: waeup/kofa/students/browser.py:1225
+#: waeup/kofa/students/browser.py:1003 waeup/kofa/students/browser.py:1225
 msgid "Your current session does not match accommodation session."
 msgstr ""
@@ -2460,6 +2421,5 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1085
-#: waeup/kofa/students/browser.py:1093
+#: waeup/kofa/students/browser.py:1085 waeup/kofa/students/browser.py:1093
 #: waeup/kofa/students/browser.py:1101
 msgid "Valid callback received. ${a}"
@@ -2475,6 +2435,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:117
-#: waeup/kofa/students/viewlets.py:114
+#: waeup/kofa/students/browser.py:117 waeup/kofa/students/viewlets.py:114
 #: waeup/kofa/students/viewlets.py:534
 msgid "Study Course"
@@ -2501,6 +2460,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:123
-#: waeup/kofa/students/viewlets.py:120
+#: waeup/kofa/students/browser.py:123 waeup/kofa/students/viewlets.py:120
 #: waeup/kofa/students/viewlets.py:535
 msgid "Payments"
@@ -2511,6 +2469,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1241
-#: waeup/kofa/students/browser.py:1537
+#: waeup/kofa/students/browser.py:1241 waeup/kofa/students/browser.py:1537
 #: waeup/kofa/students/browser.py:1650
 msgid "Activation code is invalid."
@@ -2518,24 +2475,19 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1261
-#: waeup/kofa/students/browser.py:1389
+#: waeup/kofa/students/browser.py:1261 waeup/kofa/students/browser.py:1389
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1266
-#: waeup/kofa/students/browser.py:1542
+#: waeup/kofa/students/browser.py:1266 waeup/kofa/students/browser.py:1542
 #: waeup/kofa/students/browser.py:1655
 msgid "Activation code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1269
-#: waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1658
-#: waeup/kofa/students/browser.py:1917
+#: waeup/kofa/students/browser.py:1269 waeup/kofa/students/browser.py:1545
+#: waeup/kofa/students/browser.py:1658 waeup/kofa/students/browser.py:1917
 msgid "invalidated"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1274
-#: waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1274 waeup/kofa/students/browser.py:1549
 #: waeup/kofa/students/browser.py:1663
 msgid "You are not the owner of this access code."
@@ -2543,6 +2495,5 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1285
-#: waeup/kofa/students/browser.py:1403
+#: waeup/kofa/students/browser.py:1285 waeup/kofa/students/browser.py:1403
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
@@ -2574,6 +2525,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:138
-#: waeup/kofa/students/viewlets.py:126
+#: waeup/kofa/students/browser.py:138 waeup/kofa/students/viewlets.py:126
 msgid "Accommodation"
 msgstr ""
@@ -2589,11 +2539,9 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1441
-#: waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/browser.py:1441 waeup/kofa/students/viewlets.py:356
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1456
-#: waeup/kofa/students/viewlets.py:365
+#: waeup/kofa/students/browser.py:1456 waeup/kofa/students/viewlets.py:365
 msgid "Change password"
 msgstr ""
@@ -2612,6 +2560,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1497
-#: waeup/kofa/students/viewlets.py:389
+#: waeup/kofa/students/browser.py:1497 waeup/kofa/students/viewlets.py:389
 #: waeup/kofa/students/workflow.py:44
 msgid "Start clearance"
@@ -2622,6 +2569,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1518
-#: waeup/kofa/students/browser.py:1639
+#: waeup/kofa/students/browser.py:1518 waeup/kofa/students/browser.py:1639
 msgid "Wrong state"
 msgstr ""
@@ -2643,6 +2589,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1577
-#: waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1577 waeup/kofa/students/browser.py:1591
 msgid "Clearance form has been saved."
 msgstr ""
@@ -2652,6 +2597,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1600
-#: waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1600 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
@@ -2673,6 +2617,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1631
-#: waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:1631 waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr ""
@@ -2728,6 +2671,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:186
-#: waeup/kofa/students/browser.py:222
+#: waeup/kofa/students/browser.py:186 waeup/kofa/students/browser.py:222
 msgid "Empty search string"
 msgstr ""
@@ -2772,16 +2714,13 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:204
-#: waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:204 waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:228
-#: waeup/kofa/students/browser.py:1888
+#: waeup/kofa/students/browser.py:228 waeup/kofa/students/browser.py:1888
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:255
-#: waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:255 waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr ""
@@ -2796,6 +2735,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:322
-#: waeup/kofa/students/browser.py:1865
+#: waeup/kofa/students/browser.py:322 waeup/kofa/students/browser.py:1865
 msgid "An smtp server error occurred."
 msgstr ""
@@ -2810,6 +2748,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:418
-#: waeup/kofa/students/viewlets.py:104
+#: waeup/kofa/students/browser.py:418 waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
@@ -2829,6 +2766,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:475
-#: waeup/kofa/students/browser.py:499
+#: waeup/kofa/students/browser.py:475 waeup/kofa/students/browser.py:499
 msgid "Student is in wrong state."
 msgstr ""
@@ -2860,11 +2796,9 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:585
-#: waeup/kofa/students/browser.py:626
+#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:626
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:586
-#: waeup/kofa/students/browser.py:612
+#: waeup/kofa/students/browser.py:586 waeup/kofa/students/browser.py:612
 msgid "Add study level"
 msgstr ""
@@ -2874,6 +2808,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:622
-#: waeup/kofa/students/browser.py:1708
+#: waeup/kofa/students/browser.py:622 waeup/kofa/students/browser.py:1708
 msgid "This level exists."
 msgstr ""
@@ -2930,6 +2863,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:719
-#: waeup/kofa/students/interfaces.py:370
+#: waeup/kofa/students/browser.py:719 waeup/kofa/students/interfaces.py:370
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2938,10 +2870,7 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:747
-#: waeup/kofa/students/browser.py:776
-#: waeup/kofa/students/browser.py:861
-#: waeup/kofa/students/browser.py:866
-#: waeup/kofa/students/browser.py:1748
-#: waeup/kofa/students/browser.py:1798
+#: waeup/kofa/students/browser.py:747 waeup/kofa/students/browser.py:776
+#: waeup/kofa/students/browser.py:861 waeup/kofa/students/browser.py:866
+#: waeup/kofa/students/browser.py:1748 waeup/kofa/students/browser.py:1798
 msgid "Add course ticket"
 msgstr ""
@@ -2952,11 +2881,9 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:786
-#: waeup/kofa/students/browser.py:1758
+#: waeup/kofa/students/browser.py:786 waeup/kofa/students/browser.py:1758
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:810
-#: waeup/kofa/students/browser.py:832
+#: waeup/kofa/students/browser.py:810 waeup/kofa/students/browser.py:832
 msgid "This level does not correspond current level."
 msgstr ""
@@ -2966,6 +2893,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:816
-#: waeup/kofa/students/browser.py:844
+#: waeup/kofa/students/browser.py:816 waeup/kofa/students/browser.py:844
 msgid "Student is in the wrong state."
 msgstr ""
@@ -2979,12 +2905,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:881
-#: waeup/kofa/students/browser.py:1811
+#: waeup/kofa/students/browser.py:881 waeup/kofa/students/browser.py:1811
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:883
-#: waeup/kofa/students/browser.py:1813
+#: waeup/kofa/students/browser.py:883 waeup/kofa/students/browser.py:1813
 msgid "Successfully added ${a}."
 msgstr ""
@@ -3078,10 +3002,4 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/containerpage.pt:33
-#: waeup/kofa/students/browser_templates/containermanagepage.pt:39
-#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:44
-msgid "Full Name"
-msgstr ""
-
 #: waeup/kofa/students/browser_templates/containerpage.pt:5
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:5
@@ -3115,5 +3033,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/students/browser_templates/imageupload.pt:21
 #: waeup/kofa/students/browser_templates/fileupload.pt:27
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
@@ -3154,5 +3072,11 @@
 
 #: waeup/kofa/students/browser_templates/setpassword.pt:33
-msgid "<li> Acquire a password access code (PWD). </li> <li> Enter your (JAMB) registration number and the access code. </li> <li> After pressing the button, your student id will be displayed and your password set. The 10-digit part of the access code just used is your new password. </li> <li> Go to the <strong><a href=\"login\">general login page</a></strong> and enter your new credentials. </li>"
+msgid ""
+"<li> Acquire a password access code (PWD). </li> <li> Enter your (JAMB) "
+"registration number and the access code. </li> <li> After pressing the "
+"button, your student id will be displayed and your password set. The 10-"
+"digit part of the access code just used is your new password. </li> <li> Go "
+"to the <strong><a href=\"login\">general login page</a></strong> and enter "
+"your new credentials. </li>"
 msgstr ""
 
@@ -3238,12 +3162,10 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:176
-#: waeup/kofa/students/interfaces.py:255
+#: waeup/kofa/students/interfaces.py:176 waeup/kofa/students/interfaces.py:255
 #: waeup/kofa/students/interfaces.py:483
 msgid "Registration Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:183
-#: waeup/kofa/students/interfaces.py:265
+#: waeup/kofa/students/interfaces.py:183 waeup/kofa/students/interfaces.py:265
 msgid "Matriculation Number"
 msgstr ""
@@ -3304,6 +3226,5 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:337
-#: waeup/kofa/students/interfaces.py:434
+#: waeup/kofa/students/interfaces.py:337 waeup/kofa/students/interfaces.py:434
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3355,6 +3276,5 @@
 msgstr ""
 
-#: waeup/kofa/students/utils.py:280
-#: waeup/kofa/students/viewlets.py:71
+#: waeup/kofa/students/utils.py:280 waeup/kofa/students/viewlets.py:71
 #: waeup/kofa/students/viewlets.py:99
 #: waeup/kofa/students/browser_templates/basemanagepage.pt:6
@@ -3366,17 +3286,14 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:109
-#: waeup/kofa/students/viewlets.py:533
+#: waeup/kofa/students/viewlets.py:109 waeup/kofa/students/viewlets.py:533
 msgid "Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:131
-#: waeup/kofa/students/viewlets.py:537
+#: waeup/kofa/students/viewlets.py:131 waeup/kofa/students/viewlets.py:537
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:27
 msgid "History"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:179
-#: waeup/kofa/students/workflow.py:72
+#: waeup/kofa/students/viewlets.py:179 waeup/kofa/students/workflow.py:72
 msgid "Clear student"
 msgstr ""
@@ -3394,6 +3311,5 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:251
-#: waeup/kofa/students/workflow.py:128
+#: waeup/kofa/students/viewlets.py:251 waeup/kofa/students/workflow.py:128
 msgid "Validate courses"
 msgstr ""
@@ -3495,21 +3411,17 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:703
-#: waeup/kofa/students/viewlets.py:714
+#: waeup/kofa/students/viewlets.py:703 waeup/kofa/students/viewlets.py:714
 msgid "Birth Certificate"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:704
-#: waeup/kofa/students/viewlets.py:715
+#: waeup/kofa/students/viewlets.py:704 waeup/kofa/students/viewlets.py:715
 msgid "Birth Certificate Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:724
-#: waeup/kofa/students/viewlets.py:735
+#: waeup/kofa/students/viewlets.py:724 waeup/kofa/students/viewlets.py:735
 msgid "Acceptance Letter"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:725
-#: waeup/kofa/students/viewlets.py:736
+#: waeup/kofa/students/viewlets.py:725 waeup/kofa/students/viewlets.py:736
 msgid "Acceptance Letter Scan"
 msgstr ""
@@ -3573,11 +3485,9 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:121
-#: waeup/kofa/students/workflow.py:135
+#: waeup/kofa/students/workflow.py:121 waeup/kofa/students/workflow.py:135
 msgid "Reset to paid"
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:122
-#: waeup/kofa/students/workflow.py:136
+#: waeup/kofa/students/workflow.py:122 waeup/kofa/students/workflow.py:136
 msgid "Student record reset to 'paid'"
 msgstr ""
@@ -3639,11 +3549,9 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:65
-#: waeup/kofa/students/workflow.py:79
+#: waeup/kofa/students/workflow.py:65 waeup/kofa/students/workflow.py:79
 msgid "Reset to clearance"
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:66
-#: waeup/kofa/students/workflow.py:80
+#: waeup/kofa/students/workflow.py:66 waeup/kofa/students/workflow.py:80
 msgid "Student record reset to 'clearance'"
 msgstr ""
@@ -3653,11 +3561,9 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:86
-#: waeup/kofa/students/workflow.py:100
+#: waeup/kofa/students/workflow.py:86 waeup/kofa/students/workflow.py:100
 msgid "Pay school fee"
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:87
-#: waeup/kofa/students/workflow.py:101
+#: waeup/kofa/students/workflow.py:87 waeup/kofa/students/workflow.py:101
 msgid "School fee paid"
 msgstr ""
@@ -3787,5 +3693,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:119
+#: waeup/kofa/utils/utils.py:122
 msgid ""
 "Fullname: ${a}\n"
@@ -3797,5 +3703,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:164
+#: waeup/kofa/utils/utils.py:167
 msgid ""
 "Dear ${a},\n"
@@ -3825,3 +3731,2 @@
 msgid "remove-selected-items"
 msgstr ""
-
Index: /main/waeup.kofa/trunk/src/waeup/kofa/locales/fr/LC_MESSAGES/waeup.kofa.po
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/locales/fr/LC_MESSAGES/waeup.kofa.po	(revision 7827)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/fr/LC_MESSAGES/waeup.kofa.po	(revision 7828)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Thu Mar  8 23:29:25 2012\n"
+"POT-Creation-Date: Fri Mar  9 23:09:56 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -28,44 +28,24 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: waeup/kofa/accesscodes/browser.py:100
-#: waeup/kofa/accesscodes/browser.py:113
-#: waeup/kofa/applicants/browser.py:80
-#: waeup/kofa/applicants/browser.py:130
-#: waeup/kofa/applicants/browser.py:182
-#: waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:338
-#: waeup/kofa/browser/pages.py:503
-#: waeup/kofa/browser/pages.py:708
-#: waeup/kofa/browser/pages.py:735
-#: waeup/kofa/browser/pages.py:758
-#: waeup/kofa/browser/pages.py:805
-#: waeup/kofa/browser/pages.py:835
-#: waeup/kofa/browser/pages.py:955
-#: waeup/kofa/browser/pages.py:1183
-#: waeup/kofa/browser/pages.py:1277
-#: waeup/kofa/browser/pages.py:1298
-#: waeup/kofa/browser/pages.py:1325
-#: waeup/kofa/browser/pages.py:1353
-#: waeup/kofa/browser/pages.py:1354
-#: waeup/kofa/browser/pages.py:1400
-#: waeup/kofa/browser/pages.py:1441
-#: waeup/kofa/browser/pages.py:1520
-#: waeup/kofa/browser/pages.py:1521
-#: waeup/kofa/browser/pages.py:1523
-#: waeup/kofa/browser/pages.py:1601
-#: waeup/kofa/browser/pages.py:1646
-#: waeup/kofa/browser/pages.py:1684
-#: waeup/kofa/browser/pages.py:1728
-#: waeup/kofa/browser/pages.py:1767
-#: waeup/kofa/browser/pages.py:1769
-#: waeup/kofa/browser/pages.py:1804
-#: waeup/kofa/browser/pages.py:1855
-#: waeup/kofa/browser/pages.py:1907
-#: waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:585
-#: waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:888
+#: waeup/kofa/accesscodes/browser.py:100 waeup/kofa/accesscodes/browser.py:113
+#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:130
+#: waeup/kofa/applicants/browser.py:182 waeup/kofa/applicants/browser.py:254
+#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:338
+#: waeup/kofa/browser/pages.py:503 waeup/kofa/browser/pages.py:708
+#: waeup/kofa/browser/pages.py:735 waeup/kofa/browser/pages.py:758
+#: waeup/kofa/browser/pages.py:805 waeup/kofa/browser/pages.py:835
+#: waeup/kofa/browser/pages.py:955 waeup/kofa/browser/pages.py:1183
+#: waeup/kofa/browser/pages.py:1277 waeup/kofa/browser/pages.py:1298
+#: waeup/kofa/browser/pages.py:1325 waeup/kofa/browser/pages.py:1353
+#: waeup/kofa/browser/pages.py:1354 waeup/kofa/browser/pages.py:1400
+#: waeup/kofa/browser/pages.py:1441 waeup/kofa/browser/pages.py:1520
+#: waeup/kofa/browser/pages.py:1521 waeup/kofa/browser/pages.py:1523
+#: waeup/kofa/browser/pages.py:1601 waeup/kofa/browser/pages.py:1646
+#: waeup/kofa/browser/pages.py:1684 waeup/kofa/browser/pages.py:1728
+#: waeup/kofa/browser/pages.py:1767 waeup/kofa/browser/pages.py:1769
+#: waeup/kofa/browser/pages.py:1804 waeup/kofa/browser/pages.py:1855
+#: waeup/kofa/browser/pages.py:1907 waeup/kofa/students/browser.py:584
+#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:746
+#: waeup/kofa/students/browser.py:748 waeup/kofa/students/browser.py:888
 msgid "Cancel"
 msgstr ""
@@ -105,10 +85,7 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:153
-#: waeup/kofa/browser/pages.py:592
-#: waeup/kofa/browser/pages.py:1142
-#: waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:171
-#: waeup/kofa/students/browser.py:205
+#: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:592
+#: waeup/kofa/browser/pages.py:1142 waeup/kofa/browser/viewlets.py:190
+#: waeup/kofa/students/browser.py:171 waeup/kofa/students/browser.py:205
 msgid "Search"
 msgstr ""
@@ -122,6 +99,5 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:180
-#: waeup/kofa/accesscodes/workflow.py:39
+#: waeup/kofa/accesscodes/browser.py:180 waeup/kofa/accesscodes/workflow.py:39
 msgid "disabled"
 msgstr ""
@@ -175,6 +151,5 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:46
-#: waeup/kofa/accesscodes/browser.py:206
+#: waeup/kofa/accesscodes/browser.py:46 waeup/kofa/accesscodes/browser.py:206
 #: waeup/kofa/accesscodes/browser.py:226
 msgid "Access Code Batches"
@@ -347,6 +322,5 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/workflow.py:37
-#: waeup/kofa/applicants/workflow.py:37
+#: waeup/kofa/accesscodes/workflow.py:37 waeup/kofa/applicants/workflow.py:37
 msgid "initialized"
 msgstr ""
@@ -368,6 +342,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:117
-#: waeup/kofa/applicants/browser.py:325
+#: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:325
 #: waeup/kofa/applicants/browser.py:745
 msgid "Could not delete:"
@@ -375,19 +348,16 @@
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:120
-#: waeup/kofa/applicants/browser.py:328
-#: waeup/kofa/applicants/browser.py:748
-#: waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:243
-#: waeup/kofa/students/browser.py:642
-#: waeup/kofa/students/browser.py:796
-#: waeup/kofa/students/browser.py:974
-#: waeup/kofa/students/browser.py:1184
-#: waeup/kofa/students/browser.py:1770
+#: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py:328
+#: waeup/kofa/applicants/browser.py:748 waeup/kofa/browser/pages.py:134
+#: waeup/kofa/students/browser.py:243 waeup/kofa/students/browser.py:642
+#: waeup/kofa/students/browser.py:796 waeup/kofa/students/browser.py:974
+#: waeup/kofa/students/browser.py:1184 waeup/kofa/students/browser.py:1770
 msgid "Successfully removed: ${a}"
 msgstr ""
 
 #: waeup/kofa/applicants/browser.py:169
-msgid "An applicants container for the same application type and entrance year exists already in the database."
+msgid ""
+"An applicants container for the same application type and entrance year "
+"exists already in the database."
 msgstr ""
 
@@ -396,6 +366,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:190
-#: waeup/kofa/applicants/viewlets.py:44
+#: waeup/kofa/applicants/browser.py:190 waeup/kofa/applicants/viewlets.py:44
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:12
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:36
@@ -403,58 +372,36 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:301
-#: waeup/kofa/applicants/browser.py:654
-#: waeup/kofa/applicants/browser.py:688
-#: waeup/kofa/applicants/browser.py:791
-#: waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:838
-#: waeup/kofa/browser/pages.py:476
-#: waeup/kofa/browser/pages.py:631
-#: waeup/kofa/browser/pages.py:654
-#: waeup/kofa/browser/pages.py:728
-#: waeup/kofa/browser/pages.py:1181
-#: waeup/kofa/browser/pages.py:1353
-#: waeup/kofa/browser/pages.py:1394
-#: waeup/kofa/browser/pages.py:1520
-#: waeup/kofa/browser/pages.py:1573
-#: waeup/kofa/browser/pages.py:1716
-#: waeup/kofa/browser/pages.py:1767
-#: waeup/kofa/browser/pages.py:1788
-#: waeup/kofa/hostels/browser.py:209
-#: waeup/kofa/hostels/browser.py:231
-#: waeup/kofa/hostels/browser.py:319
-#: waeup/kofa/students/browser.py:359
-#: waeup/kofa/students/browser.py:458
-#: waeup/kofa/students/browser.py:535
-#: waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:600
-#: waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:771
-#: waeup/kofa/students/browser.py:1444
-#: waeup/kofa/students/browser.py:1459
-#: waeup/kofa/students/browser.py:1574
+#: waeup/kofa/applicants/browser.py:254 waeup/kofa/applicants/browser.py:301
+#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:688
+#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:794
+#: waeup/kofa/applicants/browser.py:838 waeup/kofa/browser/pages.py:476
+#: waeup/kofa/browser/pages.py:631 waeup/kofa/browser/pages.py:654
+#: waeup/kofa/browser/pages.py:728 waeup/kofa/browser/pages.py:1181
+#: waeup/kofa/browser/pages.py:1353 waeup/kofa/browser/pages.py:1394
+#: waeup/kofa/browser/pages.py:1520 waeup/kofa/browser/pages.py:1573
+#: waeup/kofa/browser/pages.py:1716 waeup/kofa/browser/pages.py:1767
+#: waeup/kofa/browser/pages.py:1788 waeup/kofa/hostels/browser.py:209
+#: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:319
+#: waeup/kofa/students/browser.py:359 waeup/kofa/students/browser.py:458
+#: waeup/kofa/students/browser.py:535 waeup/kofa/students/browser.py:584
+#: waeup/kofa/students/browser.py:600 waeup/kofa/students/browser.py:746
+#: waeup/kofa/students/browser.py:771 waeup/kofa/students/browser.py:1444
+#: waeup/kofa/students/browser.py:1459 waeup/kofa/students/browser.py:1574
 msgid "Save"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:333
+#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:333
 #: waeup/kofa/applicants/browser.py:361
 msgid "Add applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:265
-#: waeup/kofa/applicants/viewlets.py:95
+#: waeup/kofa/applicants/browser.py:265 waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:305
-#: waeup/kofa/applicants/browser.py:717
-#: waeup/kofa/browser/pages.py:1397
-#: waeup/kofa/browser/pages.py:1719
-#: waeup/kofa/browser/pages.py:1791
-#: waeup/kofa/browser/pages.py:1903
-#: waeup/kofa/hostels/browser.py:54
-#: waeup/kofa/students/browser.py:80
+#: waeup/kofa/applicants/browser.py:305 waeup/kofa/applicants/browser.py:717
+#: waeup/kofa/browser/pages.py:1397 waeup/kofa/browser/pages.py:1719
+#: waeup/kofa/browser/pages.py:1791 waeup/kofa/browser/pages.py:1903
+#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:80
 #: waeup/kofa/students/browser.py:385
 msgid "Form has been saved."
@@ -477,11 +424,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:397
-#: waeup/kofa/students/browser.py:285
+#: waeup/kofa/applicants/browser.py:397 waeup/kofa/students/browser.py:285
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:398
-#: waeup/kofa/students/browser.py:286
+#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:286
 msgid "unset"
 msgstr ""
@@ -496,22 +441,18 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:461
-#: waeup/kofa/students/browser.py:1023
+#: waeup/kofa/applicants/browser.py:461 waeup/kofa/students/browser.py:1023
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:474
-#: waeup/kofa/students/browser.py:1037
+#: waeup/kofa/applicants/browser.py:474 waeup/kofa/students/browser.py:1037
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:501
-#: waeup/kofa/students/browser.py:1056
+#: waeup/kofa/applicants/browser.py:501 waeup/kofa/students/browser.py:1056
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:529
-#: waeup/kofa/students/browser.py:1105
+#: waeup/kofa/applicants/browser.py:529 waeup/kofa/students/browser.py:1105
 msgid "Valid callback received."
 msgstr ""
@@ -541,26 +482,19 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:654
-#: waeup/kofa/applicants/browser.py:794
+#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:794
 #: waeup/kofa/applicants/browser.py:846
 msgid "Final Submit"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655
-#: waeup/kofa/applicants/browser.py:758
-#: waeup/kofa/applicants/browser.py:792
-#: waeup/kofa/applicants/browser.py:827
+#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:758
+#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:827
 #: waeup/kofa/students/browser.py:980
 msgid "Add online payment ticket"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655
-#: waeup/kofa/applicants/browser.py:763
-#: waeup/kofa/applicants/browser.py:792
-#: waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:832
-#: waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:780
-#: waeup/kofa/students/browser.py:956
+#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:763
+#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:795
+#: waeup/kofa/applicants/browser.py:832 waeup/kofa/students/browser.py:748
+#: waeup/kofa/students/browser.py:780 waeup/kofa/students/browser.py:956
 #: waeup/kofa/students/browser.py:1752
 msgid "Remove selected tickets"
@@ -572,58 +506,40 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:685
-#: waeup/kofa/students/browser.py:356
+#: waeup/kofa/applicants/browser.py:685 waeup/kofa/students/browser.py:356
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:732
-#: waeup/kofa/students/browser.py:962
+#: waeup/kofa/applicants/browser.py:732 waeup/kofa/students/browser.py:962
 msgid "No payment selected."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:76
-#: waeup/kofa/applicants/viewlets.py:88
+#: waeup/kofa/applicants/browser.py:76 waeup/kofa/applicants/viewlets.py:88
 msgid "Manage application section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:79
-#: waeup/kofa/applicants/browser.py:105
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:308
-#: waeup/kofa/browser/pages.py:634
-#: waeup/kofa/browser/pages.py:675
-#: waeup/kofa/browser/pages.py:1277
-#: waeup/kofa/browser/pages.py:1288
-#: waeup/kofa/browser/pages.py:1354
-#: waeup/kofa/browser/pages.py:1389
-#: waeup/kofa/hostels/browser.py:131
-#: waeup/kofa/students/browser.py:206
-#: waeup/kofa/students/browser.py:1151
-#: waeup/kofa/students/browser.py:1164
+#: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:105
+#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:308
+#: waeup/kofa/browser/pages.py:634 waeup/kofa/browser/pages.py:675
+#: waeup/kofa/browser/pages.py:1277 waeup/kofa/browser/pages.py:1288
+#: waeup/kofa/browser/pages.py:1354 waeup/kofa/browser/pages.py:1389
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:206
+#: waeup/kofa/students/browser.py:1151 waeup/kofa/students/browser.py:1164
 msgid "Remove selected"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:79
-#: waeup/kofa/applicants/browser.py:125
-#: waeup/kofa/applicants/browser.py:148
-#: waeup/kofa/applicants/browser.py:160
+#: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:125
+#: waeup/kofa/applicants/browser.py:148 waeup/kofa/applicants/browser.py:160
 msgid "Add applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:805
-#: waeup/kofa/students/browser.py:88
+#: waeup/kofa/applicants/browser.py:805 waeup/kofa/students/browser.py:88
 msgid "The requested form is locked (read-only)."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:81
-#: waeup/kofa/applicants/browser.py:139
-#: waeup/kofa/applicants/browser.py:256
-#: waeup/kofa/applicants/browser.py:347
-#: waeup/kofa/browser/pages.py:1355
-#: waeup/kofa/browser/pages.py:1414
-#: waeup/kofa/browser/pages.py:1524
-#: waeup/kofa/browser/pages.py:1610
-#: waeup/kofa/browser/pages.py:1770
-#: waeup/kofa/browser/pages.py:1827
+#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:139
+#: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:347
+#: waeup/kofa/browser/pages.py:1355 waeup/kofa/browser/pages.py:1414
+#: waeup/kofa/browser/pages.py:1524 waeup/kofa/browser/pages.py:1610
+#: waeup/kofa/browser/pages.py:1770 waeup/kofa/browser/pages.py:1827
 msgid "Remove selected local roles"
 msgstr ""
@@ -633,14 +549,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:82
-#: waeup/kofa/applicants/browser.py:135
-#: waeup/kofa/applicants/browser.py:257
-#: waeup/kofa/applicants/browser.py:343
-#: waeup/kofa/browser/pages.py:1356
-#: waeup/kofa/browser/pages.py:1410
-#: waeup/kofa/browser/pages.py:1525
-#: waeup/kofa/browser/pages.py:1606
-#: waeup/kofa/browser/pages.py:1771
-#: waeup/kofa/browser/pages.py:1823
+#: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:135
+#: waeup/kofa/applicants/browser.py:257 waeup/kofa/applicants/browser.py:343
+#: waeup/kofa/browser/pages.py:1356 waeup/kofa/browser/pages.py:1410
+#: waeup/kofa/browser/pages.py:1525 waeup/kofa/browser/pages.py:1606
+#: waeup/kofa/browser/pages.py:1771 waeup/kofa/browser/pages.py:1823
 msgid "Add local role"
 msgstr ""
@@ -654,6 +565,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:858
-#: waeup/kofa/students/browser.py:1619
+#: waeup/kofa/applicants/browser.py:858 waeup/kofa/students/browser.py:1619
 msgid "This form cannot be submitted. Wrong state!"
 msgstr ""
@@ -701,5 +611,7 @@
 
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:59
-msgid "I confirm that the Passport Photograph uploaded on this form is a true picture of me."
+msgid ""
+"I confirm that the Passport Photograph uploaded on this form is a true "
+"picture of me."
 msgstr ""
 
@@ -722,5 +634,7 @@
 
 #: waeup/kofa/applicants/browser_templates/applicantregister.pt:18
-msgid "An account will be created for you and an email with your login credentials will be sent to the address provided."
+msgid ""
+"An account will be created for you and an email with your login credentials "
+"will be sent to the address provided."
 msgstr ""
 
@@ -750,6 +664,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:197
-#: waeup/kofa/students/browser.py:713
+#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:713
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -775,6 +688,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:204
-#: waeup/kofa/students/browser.py:714
+#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:714
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -871,11 +783,11 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:413
-#: waeup/kofa/students/interfaces.py:490
+#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:375
+#: waeup/kofa/interfaces.py:401 waeup/kofa/students/interfaces.py:490
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:418
-#: waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:380
+#: waeup/kofa/interfaces.py:408 waeup/kofa/students/interfaces.py:203
 msgid "Phone"
 msgstr ""
@@ -951,5 +863,7 @@
 #. Default: ""
 #: waeup/kofa/applicants/pdf.py:203
-msgid "<font size=10>Proceed to the login page of the portal and enter your new credentials: user name= ${a}, password = ${b}.</font>"
+msgid ""
+"<font size=10>Proceed to the login page of the portal and enter your new "
+"credentials: user name= ${a}, password = ${b}.</font>"
 msgstr ""
 
@@ -982,17 +896,14 @@
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:151
-#: waeup/kofa/applicants/workflow.py:99
+#: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
 #: waeup/kofa/students/browser.py:258
 msgid "Create student record"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:168
-#: waeup/kofa/students/viewlets.py:300
+#: waeup/kofa/applicants/viewlets.py:168 waeup/kofa/students/viewlets.py:300
 msgid "Download payment receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:183
-#: waeup/kofa/students/viewlets.py:315
+#: waeup/kofa/applicants/viewlets.py:183 waeup/kofa/students/viewlets.py:315
 msgid "Request callback"
 msgstr ""
@@ -1002,25 +913,19 @@
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:73
-#: waeup/kofa/students/viewlets.py:512
+#: waeup/kofa/applicants/viewlets.py:73 waeup/kofa/students/viewlets.py:512
 msgid "My Data"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:100
-#: waeup/kofa/students/workflow.py:25
+#: waeup/kofa/applicants/workflow.py:100 waeup/kofa/students/workflow.py:25
 msgid "Student record created"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:106
-#: waeup/kofa/applicants/workflow.py:113
-#: waeup/kofa/applicants/workflow.py:120
-#: waeup/kofa/applicants/workflow.py:127
+#: waeup/kofa/applicants/workflow.py:106 waeup/kofa/applicants/workflow.py:113
+#: waeup/kofa/applicants/workflow.py:120 waeup/kofa/applicants/workflow.py:127
 msgid "Reset application to started"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:107
-#: waeup/kofa/applicants/workflow.py:114
-#: waeup/kofa/applicants/workflow.py:121
-#: waeup/kofa/applicants/workflow.py:128
+#: waeup/kofa/applicants/workflow.py:107 waeup/kofa/applicants/workflow.py:114
+#: waeup/kofa/applicants/workflow.py:121 waeup/kofa/applicants/workflow.py:128
 #: waeup/kofa/applicants/workflow.py:134
 msgid "Application reset"
@@ -1043,6 +948,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:41
-#: waeup/kofa/interfaces.py:72
+#: waeup/kofa/applicants/workflow.py:41 waeup/kofa/interfaces.py:72
 msgid "admitted"
 msgstr ""
@@ -1052,6 +956,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:43
-#: waeup/kofa/interfaces.py:71
+#: waeup/kofa/applicants/workflow.py:43 waeup/kofa/interfaces.py:71
 msgid "created"
 msgstr ""
@@ -1097,11 +1000,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:85
-#: waeup/kofa/applicants/workflow.py:92
+#: waeup/kofa/applicants/workflow.py:85 waeup/kofa/applicants/workflow.py:92
 msgid "Refuse application"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:86
-#: waeup/kofa/applicants/workflow.py:93
+#: waeup/kofa/applicants/workflow.py:86 waeup/kofa/applicants/workflow.py:93
 msgid "Application refused"
 msgstr ""
@@ -1111,31 +1012,24 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:116
-#: waeup/kofa/browser/viewlets.py:615
+#: waeup/kofa/browser/breadcrumbs.py:116 waeup/kofa/browser/viewlets.py:615
 msgid "Academics"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:123
-#: waeup/kofa/browser/pages.py:309
+#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:309
 msgid "Administration"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:130
-#: waeup/kofa/browser/viewlets.py:360
+#: waeup/kofa/browser/breadcrumbs.py:130 waeup/kofa/browser/viewlets.py:360
 #: waeup/kofa/browser/viewlets.py:666
 msgid "Portal Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:148
-#: waeup/kofa/browser/pages.py:386
-#: waeup/kofa/browser/viewlets.py:375
-#: waeup/kofa/browser/viewlets.py:676
+#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:386
+#: waeup/kofa/browser/viewlets.py:375 waeup/kofa/browser/viewlets.py:676
 msgid "Portal Users"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:155
-#: waeup/kofa/browser/pages.py:748
-#: waeup/kofa/browser/pages.py:1140
-#: waeup/kofa/browser/viewlets.py:393
+#: waeup/kofa/browser/breadcrumbs.py:155 waeup/kofa/browser/pages.py:748
+#: waeup/kofa/browser/pages.py:1140 waeup/kofa/browser/viewlets.py:393
 #: waeup/kofa/browser/viewlets.py:685
 msgid "Data Center"
@@ -1185,8 +1079,6 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:113
-#: waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:287
-#: waeup/kofa/students/browser.py:230
+#: waeup/kofa/browser/pages.py:113 waeup/kofa/hostels/browser.py:256
+#: waeup/kofa/hostels/browser.py:287 waeup/kofa/students/browser.py:230
 msgid "No item selected."
 msgstr ""
@@ -1226,8 +1118,6 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1277
-#: waeup/kofa/browser/pages.py:1293
-#: waeup/kofa/browser/pages.py:1310
-#: waeup/kofa/browser/pages.py:1314
+#: waeup/kofa/browser/pages.py:1277 waeup/kofa/browser/pages.py:1293
+#: waeup/kofa/browser/pages.py:1310 waeup/kofa/browser/pages.py:1314
 msgid "Add faculty"
 msgstr ""
@@ -1237,6 +1127,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1282
-#: waeup/kofa/browser/viewlets.py:441
+#: waeup/kofa/browser/pages.py:1282 waeup/kofa/browser/viewlets.py:441
 msgid "Manage academic section"
 msgstr ""
@@ -1246,18 +1135,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1342
-#: waeup/kofa/browser/pages.py:1352
+#: waeup/kofa/browser/pages.py:1342 waeup/kofa/browser/pages.py:1352
 msgid "Departments"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1354
-#: waeup/kofa/browser/pages.py:1405
-#: waeup/kofa/browser/pages.py:1424
-#: waeup/kofa/browser/pages.py:1428
+#: waeup/kofa/browser/pages.py:1354 waeup/kofa/browser/pages.py:1405
+#: waeup/kofa/browser/pages.py:1424 waeup/kofa/browser/pages.py:1428
 msgid "Add department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1362
-#: waeup/kofa/browser/viewlets.py:457
+#: waeup/kofa/browser/pages.py:1362 waeup/kofa/browser/viewlets.py:457
 msgid "Manage faculty"
 msgstr ""
@@ -1276,13 +1161,10 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1485
-#: waeup/kofa/browser/pages.py:1504
-#: waeup/kofa/students/browser.py:96
-#: waeup/kofa/students/viewlets.py:472
+#: waeup/kofa/browser/pages.py:1485 waeup/kofa/browser/pages.py:1504
+#: waeup/kofa/students/browser.py:96 waeup/kofa/students/viewlets.py:472
 msgid "Students"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:152
-#: waeup/kofa/browser/viewlets.py:322
+#: waeup/kofa/browser/pages.py:152 waeup/kofa/browser/viewlets.py:322
 #: waeup/kofa/browser/templates/staffsitelayout.pt:28
 #: waeup/kofa/browser/templates/studentsitelayout.pt:33
@@ -1290,30 +1172,23 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1521
-#: waeup/kofa/browser/pages.py:1579
+#: waeup/kofa/browser/pages.py:1521 waeup/kofa/browser/pages.py:1579
 msgid "Remove selected courses"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1521
-#: waeup/kofa/browser/pages.py:1591
-#: waeup/kofa/browser/pages.py:1620
-#: waeup/kofa/browser/pages.py:1624
+#: waeup/kofa/browser/pages.py:1521 waeup/kofa/browser/pages.py:1591
+#: waeup/kofa/browser/pages.py:1620 waeup/kofa/browser/pages.py:1624
 msgid "Add course"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1522
-#: waeup/kofa/browser/pages.py:1585
+#: waeup/kofa/browser/pages.py:1522 waeup/kofa/browser/pages.py:1585
 msgid "Remove selected certificates"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1522
-#: waeup/kofa/browser/pages.py:1596
-#: waeup/kofa/browser/pages.py:1657
-#: waeup/kofa/browser/pages.py:1661
+#: waeup/kofa/browser/pages.py:1522 waeup/kofa/browser/pages.py:1596
+#: waeup/kofa/browser/pages.py:1657 waeup/kofa/browser/pages.py:1661
 msgid "Add certificate"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1531
-#: waeup/kofa/browser/viewlets.py:464
+#: waeup/kofa/browser/pages.py:1531 waeup/kofa/browser/viewlets.py:464
 msgid "Manage department"
 msgstr ""
@@ -1341,6 +1216,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1711
-#: waeup/kofa/browser/viewlets.py:481
+#: waeup/kofa/browser/pages.py:1711 waeup/kofa/browser/viewlets.py:481
 msgid "Edit course"
 msgstr ""
@@ -1350,18 +1224,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1768
-#: waeup/kofa/browser/pages.py:1799
-#: waeup/kofa/browser/pages.py:1840
-#: waeup/kofa/browser/pages.py:1842
+#: waeup/kofa/browser/pages.py:1768 waeup/kofa/browser/pages.py:1799
+#: waeup/kofa/browser/pages.py:1840 waeup/kofa/browser/pages.py:1842
 msgid "Add course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1769
-#: waeup/kofa/browser/pages.py:1794
+#: waeup/kofa/browser/pages.py:1769 waeup/kofa/browser/pages.py:1794
 msgid "Remove selected course referrers"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1775
-#: waeup/kofa/browser/viewlets.py:488
+#: waeup/kofa/browser/pages.py:1775 waeup/kofa/browser/viewlets.py:488
 msgid "Manage certificate"
 msgstr ""
@@ -1380,6 +1250,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1888
-#: waeup/kofa/browser/viewlets.py:505
+#: waeup/kofa/browser/pages.py:1888 waeup/kofa/browser/viewlets.py:505
 msgid "Edit course referrer"
 msgstr ""
@@ -1398,13 +1267,10 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:234
-#: waeup/kofa/browser/pages.py:519
+#: waeup/kofa/browser/pages.py:234 waeup/kofa/browser/pages.py:519
 msgid "Send message now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:253
-#: waeup/kofa/browser/pages.py:272
-#: waeup/kofa/browser/pages.py:536
-#: waeup/kofa/students/browser.py:320
+#: waeup/kofa/browser/pages.py:253 waeup/kofa/browser/pages.py:272
+#: waeup/kofa/browser/pages.py:536 waeup/kofa/students/browser.py:320
 msgid "Your message has been sent."
 msgstr ""
@@ -1422,16 +1288,12 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:387
-#: waeup/kofa/hostels/browser.py:195
-#: waeup/kofa/students/viewlets.py:163
-#: waeup/kofa/students/viewlets.py:171
-#: waeup/kofa/students/viewlets.py:226
-#: waeup/kofa/students/viewlets.py:243
+#: waeup/kofa/browser/pages.py:387 waeup/kofa/hostels/browser.py:195
+#: waeup/kofa/students/viewlets.py:163 waeup/kofa/students/viewlets.py:171
+#: waeup/kofa/students/viewlets.py:226 waeup/kofa/students/viewlets.py:243
 #: waeup/kofa/students/viewlets.py:283
 msgid "Manage"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:388
-#: waeup/kofa/browser/viewlets.py:180
+#: waeup/kofa/browser/pages.py:388 waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
 msgstr ""
@@ -1442,6 +1304,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:426
-#: waeup/kofa/browser/pages.py:428
+#: waeup/kofa/browser/pages.py:426 waeup/kofa/browser/pages.py:428
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
@@ -1463,16 +1324,13 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:517
-#: waeup/kofa/students/browser.py:301
+#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:301
 msgid "Send message to ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:546
-#: waeup/kofa/browser/viewlets.py:400
+#: waeup/kofa/browser/pages.py:546 waeup/kofa/browser/viewlets.py:400
 msgid "My Preferences"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:559
-#: waeup/kofa/browser/viewlets.py:415
+#: waeup/kofa/browser/pages.py:559 waeup/kofa/browser/viewlets.py:415
 msgid "My Roles"
 msgstr ""
@@ -1490,17 +1348,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:631
-#: waeup/kofa/browser/pages.py:680
+#: waeup/kofa/browser/pages.py:631 waeup/kofa/browser/pages.py:680
 msgid "Update plugins"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:633
-#: waeup/kofa/browser/pages.py:661
+#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:661
 #: waeup/kofa/browser/pages.py:692
 msgid "Add session configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:658
-#: waeup/kofa/browser/pages.py:731
+#: waeup/kofa/browser/pages.py:658 waeup/kofa/browser/pages.py:731
 msgid "Settings have been saved."
 msgstr ""
@@ -1536,13 +1391,10 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:803
-#: waeup/kofa/browser/pages.py:833
-#: waeup/kofa/browser/pages.py:953
-#: waeup/kofa/browser/pages.py:1061
+#: waeup/kofa/browser/pages.py:803 waeup/kofa/browser/pages.py:833
+#: waeup/kofa/browser/pages.py:953 waeup/kofa/browser/pages.py:1061
 msgid "Process CSV file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:817
-#: waeup/kofa/browser/pages.py:918
+#: waeup/kofa/browser/pages.py:817 waeup/kofa/browser/pages.py:918
 #: waeup/kofa/browser/pages.py:1037
 msgid "Import aborted."
@@ -1573,6 +1425,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:956
-#: waeup/kofa/browser/pages.py:1182
+#: waeup/kofa/browser/pages.py:956 waeup/kofa/browser/pages.py:1182
 msgid "Reset"
 msgstr ""
@@ -1652,5 +1503,7 @@
 
 #: waeup/kofa/browser/templates/datacenterimport1page.pt:2
-msgid "Using batch processing you can mass-create, mass-update, or mass-remove datasets from the database using CSV files."
+msgid ""
+"Using batch processing you can mass-create, mass-update, or mass-remove "
+"datasets from the database using CSV files."
 msgstr ""
 
@@ -1672,5 +1525,7 @@
 
 #: waeup/kofa/browser/templates/datacenterimport2page.pt:8
-msgid "Please select a file-processor and a processing-mode from the selections below."
+msgid ""
+"Please select a file-processor and a processing-mode from the selections "
+"below."
 msgstr ""
 
@@ -1745,5 +1600,7 @@
 
 #: waeup/kofa/browser/templates/datacenterpage.pt:1
-msgid "The data center helps you to manage portal data. You can upload CSV files here, which will be available for import afterwards."
+msgid ""
+"The data center helps you to manage portal data. You can upload CSV files "
+"here, which will be available for import afterwards."
 msgstr ""
 
@@ -1784,13 +1641,4 @@
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:7
 msgid "Settings"
-msgstr ""
-
-#: waeup/kofa/browser/templates/departmentmanagepage.pt:97
-#: waeup/kofa/browser/templates/userscontainerpage.pt:4
-#: waeup/kofa/browser/templates/facultymanagepage.pt:71
-#: waeup/kofa/browser/templates/certificatemanagepage.pt:88
-#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:89
-#: waeup/kofa/applicants/browser_templates/applicantsrootmanagepage.pt:56
-msgid "User Id"
 msgstr ""
 
@@ -1892,12 +1740,17 @@
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:113
-#: waeup/kofa/browser/templates/studentsitelayout.pt:99
-msgid "Back to top"
-msgstr ""
-
 #: waeup/kofa/browser/templates/staffsitelayout.pt:114
 #: waeup/kofa/browser/templates/studentsitelayout.pt:100
-msgid "Student Information and Registration Portal<br /> Copyright &copy; WAeUP Group, 2008-2012"
+msgid "Back to top"
+msgstr ""
+
+#: waeup/kofa/browser/templates/staffsitelayout.pt:116
+#: waeup/kofa/browser/templates/studentsitelayout.pt:102
+msgid "Kofa - Student Management System"
+msgstr ""
+
+#: waeup/kofa/browser/templates/staffsitelayout.pt:119
+#: waeup/kofa/browser/templates/studentsitelayout.pt:105
+msgid "Copyright &copy; WAeUP Group 2008-2012"
 msgstr ""
 
@@ -1935,6 +1788,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:383
-#: waeup/kofa/students/viewlets.py:155
+#: waeup/kofa/browser/viewlets.py:383 waeup/kofa/students/viewlets.py:155
 msgid "Send email"
 msgstr ""
@@ -1948,11 +1800,9 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:473
-#: waeup/kofa/browser/viewlets.py:497
+#: waeup/kofa/browser/viewlets.py:473 waeup/kofa/browser/viewlets.py:497
 msgid "Show students"
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:528
-#: waeup/kofa/browser/viewlets.py:536
+#: waeup/kofa/browser/viewlets.py:528 waeup/kofa/browser/viewlets.py:536
 msgid "Show batch logs"
 msgstr ""
@@ -1970,8 +1820,6 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:91
-#: waeup/kofa/browser/viewlets.py:160
-#: waeup/kofa/students/viewlets.py:218
-#: waeup/kofa/students/viewlets.py:403
+#: waeup/kofa/browser/viewlets.py:91 waeup/kofa/browser/viewlets.py:160
+#: waeup/kofa/students/viewlets.py:218 waeup/kofa/students/viewlets.py:403
 msgid "Edit"
 msgstr ""
@@ -1981,11 +1829,9 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:113
-#: waeup/kofa/hostels/browser.py:123
+#: waeup/kofa/hostels/browser.py:113 waeup/kofa/hostels/browser.py:123
 msgid "Manage accommodation section"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:145
-#: waeup/kofa/hostels/browser.py:158
+#: waeup/kofa/hostels/browser.py:145 waeup/kofa/hostels/browser.py:158
 msgid "Add hostel"
 msgstr ""
@@ -2007,16 +1853,13 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:210
-#: waeup/kofa/hostels/browser.py:236
+#: waeup/kofa/hostels/browser.py:210 waeup/kofa/hostels/browser.py:236
 msgid "Update all beds"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:211
-#: waeup/kofa/hostels/browser.py:250
+#: waeup/kofa/hostels/browser.py:211 waeup/kofa/hostels/browser.py:250
 msgid "Switch reservation of selected beds"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:212
-#: waeup/kofa/hostels/browser.py:281
+#: waeup/kofa/hostels/browser.py:212 waeup/kofa/hostels/browser.py:281
 msgid "Release selected beds"
 msgstr ""
@@ -2024,5 +1867,6 @@
 #. Default: ""
 #: waeup/kofa/hostels/browser.py:241
-msgid "${a} empty beds removed, ${b} beds added, ${c} occupied beds modified (${d})"
+msgid ""
+"${a} empty beds removed, ${b} beds added, ${c} occupied beds modified (${d})"
 msgstr ""
 
@@ -2045,6 +1889,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:68
-#: waeup/kofa/hostels/browser.py:78
+#: waeup/kofa/hostels/browser.py:68 waeup/kofa/hostels/browser.py:78
 msgid "Hostels"
 msgstr ""
@@ -2113,6 +1956,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/interfaces.py:175
-#: waeup/kofa/students/interfaces.py:427
+#: waeup/kofa/hostels/interfaces.py:175 waeup/kofa/students/interfaces.py:427
 msgid "Bed Type"
 msgstr ""
@@ -2122,6 +1964,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/interfaces.py:186
-#: waeup/kofa/hostels/interfaces.py:199
+#: waeup/kofa/hostels/interfaces.py:186 waeup/kofa/hostels/interfaces.py:199
 msgid "Owner (Student)"
 msgstr ""
@@ -2279,4 +2120,145 @@
 msgstr ""
 
+#: waeup/kofa/interfaces.py:306
+msgid "Importer name"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:310
+msgid "Import mode"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:335
+msgid "Email Address:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:342
+msgid "Email to:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:349
+msgid "Subject:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:353
+msgid "Full Name:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:357
+msgid "Text:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:388
+#: waeup/kofa/browser/templates/departmentmanagepage.pt:97
+#: waeup/kofa/browser/templates/userscontainerpage.pt:4
+#: waeup/kofa/browser/templates/facultymanagepage.pt:71
+#: waeup/kofa/browser/templates/certificatemanagepage.pt:88
+#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:89
+#: waeup/kofa/applicants/browser_templates/applicantsrootmanagepage.pt:56
+msgid "User Id"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:393
+#: waeup/kofa/students/browser_templates/containerpage.pt:33
+#: waeup/kofa/students/browser_templates/containermanagepage.pt:39
+#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:44
+msgid "Full Name"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:397
+msgid "Description/Notice"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:414
+msgid "Portal roles"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:457
+msgid "Name of University"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:458
+msgid "Sample University"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:463
+msgid "Abbreviated Title of University"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:469
+msgid "Skin"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:476
+msgid "Content in reST format"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:488
+msgid "Accommodation Booking Session"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:496
+msgid "Allowed States for Accommodation Booking"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:504
+msgid "Name of Administrator"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:510
+msgid "Email Address of Administrator"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:517
+msgid "Subject of Email to Administrator"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:518
+msgid "Kofa Contact"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:523
+msgid "SMTP mailer to use when sending mail"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:530
+msgid "Captcha used for public registration pages"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:537
+msgid "Carry-over Course Registration"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:546 waeup/kofa/interfaces.py:598
+msgid "Academic Session"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:554 waeup/kofa/payments/interfaces.py:30
+msgid "School Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:559 waeup/kofa/payments/interfaces.py:106
+msgid "Surcharge 1"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:564 waeup/kofa/payments/interfaces.py:113
+msgid "Surcharge 2"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:569 waeup/kofa/payments/interfaces.py:120
+msgid "Surcharge 3"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:574
+msgid "Clearance Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:579
+msgid "Booking Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:584 waeup/kofa/payments/interfaces.py:36
+msgid "Acceptance Fee"
+msgstr ""
+
 #: waeup/kofa/interfaces.py:73
 msgid "clearance started"
@@ -2343,16 +2325,4 @@
 msgstr ""
 
-#: waeup/kofa/payments/interfaces.py:106
-msgid "Surcharge 1"
-msgstr ""
-
-#: waeup/kofa/payments/interfaces.py:113
-msgid "Surcharge 2"
-msgstr ""
-
-#: waeup/kofa/payments/interfaces.py:120
-msgid "Surcharge 3"
-msgstr ""
-
 #: waeup/kofa/payments/interfaces.py:133
 msgid "Activation Code"
@@ -2391,8 +2361,4 @@
 msgstr ""
 
-#: waeup/kofa/payments/interfaces.py:30
-msgid "School Fee"
-msgstr ""
-
 #: waeup/kofa/payments/interfaces.py:31
 msgid "Clearance"
@@ -2413,8 +2379,4 @@
 #: waeup/kofa/payments/interfaces.py:35
 msgid "Gown"
-msgstr ""
-
-#: waeup/kofa/payments/interfaces.py:36
-msgid "Acceptance Fee"
 msgstr ""
 
@@ -2450,6 +2412,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1003
-#: waeup/kofa/students/browser.py:1225
+#: waeup/kofa/students/browser.py:1003 waeup/kofa/students/browser.py:1225
 msgid "Your current session does not match accommodation session."
 msgstr ""
@@ -2460,6 +2421,5 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1085
-#: waeup/kofa/students/browser.py:1093
+#: waeup/kofa/students/browser.py:1085 waeup/kofa/students/browser.py:1093
 #: waeup/kofa/students/browser.py:1101
 msgid "Valid callback received. ${a}"
@@ -2475,6 +2435,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:117
-#: waeup/kofa/students/viewlets.py:114
+#: waeup/kofa/students/browser.py:117 waeup/kofa/students/viewlets.py:114
 #: waeup/kofa/students/viewlets.py:534
 msgid "Study Course"
@@ -2501,6 +2460,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:123
-#: waeup/kofa/students/viewlets.py:120
+#: waeup/kofa/students/browser.py:123 waeup/kofa/students/viewlets.py:120
 #: waeup/kofa/students/viewlets.py:535
 msgid "Payments"
@@ -2511,6 +2469,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1241
-#: waeup/kofa/students/browser.py:1537
+#: waeup/kofa/students/browser.py:1241 waeup/kofa/students/browser.py:1537
 #: waeup/kofa/students/browser.py:1650
 msgid "Activation code is invalid."
@@ -2518,24 +2475,19 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1261
-#: waeup/kofa/students/browser.py:1389
+#: waeup/kofa/students/browser.py:1261 waeup/kofa/students/browser.py:1389
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1266
-#: waeup/kofa/students/browser.py:1542
+#: waeup/kofa/students/browser.py:1266 waeup/kofa/students/browser.py:1542
 #: waeup/kofa/students/browser.py:1655
 msgid "Activation code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1269
-#: waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1658
-#: waeup/kofa/students/browser.py:1917
+#: waeup/kofa/students/browser.py:1269 waeup/kofa/students/browser.py:1545
+#: waeup/kofa/students/browser.py:1658 waeup/kofa/students/browser.py:1917
 msgid "invalidated"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1274
-#: waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1274 waeup/kofa/students/browser.py:1549
 #: waeup/kofa/students/browser.py:1663
 msgid "You are not the owner of this access code."
@@ -2543,6 +2495,5 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1285
-#: waeup/kofa/students/browser.py:1403
+#: waeup/kofa/students/browser.py:1285 waeup/kofa/students/browser.py:1403
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
@@ -2574,6 +2525,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:138
-#: waeup/kofa/students/viewlets.py:126
+#: waeup/kofa/students/browser.py:138 waeup/kofa/students/viewlets.py:126
 msgid "Accommodation"
 msgstr ""
@@ -2589,11 +2539,9 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1441
-#: waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/browser.py:1441 waeup/kofa/students/viewlets.py:356
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1456
-#: waeup/kofa/students/viewlets.py:365
+#: waeup/kofa/students/browser.py:1456 waeup/kofa/students/viewlets.py:365
 msgid "Change password"
 msgstr ""
@@ -2612,6 +2560,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1497
-#: waeup/kofa/students/viewlets.py:389
+#: waeup/kofa/students/browser.py:1497 waeup/kofa/students/viewlets.py:389
 #: waeup/kofa/students/workflow.py:44
 msgid "Start clearance"
@@ -2622,6 +2569,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1518
-#: waeup/kofa/students/browser.py:1639
+#: waeup/kofa/students/browser.py:1518 waeup/kofa/students/browser.py:1639
 msgid "Wrong state"
 msgstr ""
@@ -2643,6 +2589,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1577
-#: waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1577 waeup/kofa/students/browser.py:1591
 msgid "Clearance form has been saved."
 msgstr ""
@@ -2652,6 +2597,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1600
-#: waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1600 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
@@ -2673,6 +2617,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1631
-#: waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:1631 waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr ""
@@ -2728,6 +2671,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:186
-#: waeup/kofa/students/browser.py:222
+#: waeup/kofa/students/browser.py:186 waeup/kofa/students/browser.py:222
 msgid "Empty search string"
 msgstr ""
@@ -2772,16 +2714,13 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:204
-#: waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:204 waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:228
-#: waeup/kofa/students/browser.py:1888
+#: waeup/kofa/students/browser.py:228 waeup/kofa/students/browser.py:1888
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:255
-#: waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:255 waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr ""
@@ -2796,6 +2735,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:322
-#: waeup/kofa/students/browser.py:1865
+#: waeup/kofa/students/browser.py:322 waeup/kofa/students/browser.py:1865
 msgid "An smtp server error occurred."
 msgstr ""
@@ -2810,6 +2748,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:418
-#: waeup/kofa/students/viewlets.py:104
+#: waeup/kofa/students/browser.py:418 waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
@@ -2829,6 +2766,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:475
-#: waeup/kofa/students/browser.py:499
+#: waeup/kofa/students/browser.py:475 waeup/kofa/students/browser.py:499
 msgid "Student is in wrong state."
 msgstr ""
@@ -2860,11 +2796,9 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:585
-#: waeup/kofa/students/browser.py:626
+#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:626
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:586
-#: waeup/kofa/students/browser.py:612
+#: waeup/kofa/students/browser.py:586 waeup/kofa/students/browser.py:612
 msgid "Add study level"
 msgstr ""
@@ -2874,6 +2808,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:622
-#: waeup/kofa/students/browser.py:1708
+#: waeup/kofa/students/browser.py:622 waeup/kofa/students/browser.py:1708
 msgid "This level exists."
 msgstr ""
@@ -2930,6 +2863,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:719
-#: waeup/kofa/students/interfaces.py:370
+#: waeup/kofa/students/browser.py:719 waeup/kofa/students/interfaces.py:370
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2938,10 +2870,7 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:747
-#: waeup/kofa/students/browser.py:776
-#: waeup/kofa/students/browser.py:861
-#: waeup/kofa/students/browser.py:866
-#: waeup/kofa/students/browser.py:1748
-#: waeup/kofa/students/browser.py:1798
+#: waeup/kofa/students/browser.py:747 waeup/kofa/students/browser.py:776
+#: waeup/kofa/students/browser.py:861 waeup/kofa/students/browser.py:866
+#: waeup/kofa/students/browser.py:1748 waeup/kofa/students/browser.py:1798
 msgid "Add course ticket"
 msgstr ""
@@ -2952,11 +2881,9 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:786
-#: waeup/kofa/students/browser.py:1758
+#: waeup/kofa/students/browser.py:786 waeup/kofa/students/browser.py:1758
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:810
-#: waeup/kofa/students/browser.py:832
+#: waeup/kofa/students/browser.py:810 waeup/kofa/students/browser.py:832
 msgid "This level does not correspond current level."
 msgstr ""
@@ -2966,6 +2893,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:816
-#: waeup/kofa/students/browser.py:844
+#: waeup/kofa/students/browser.py:816 waeup/kofa/students/browser.py:844
 msgid "Student is in the wrong state."
 msgstr ""
@@ -2979,12 +2905,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:881
-#: waeup/kofa/students/browser.py:1811
+#: waeup/kofa/students/browser.py:881 waeup/kofa/students/browser.py:1811
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:883
-#: waeup/kofa/students/browser.py:1813
+#: waeup/kofa/students/browser.py:883 waeup/kofa/students/browser.py:1813
 msgid "Successfully added ${a}."
 msgstr ""
@@ -3078,10 +3002,4 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/containerpage.pt:33
-#: waeup/kofa/students/browser_templates/containermanagepage.pt:39
-#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:44
-msgid "Full Name"
-msgstr ""
-
 #: waeup/kofa/students/browser_templates/containerpage.pt:5
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:5
@@ -3115,5 +3033,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/students/browser_templates/imageupload.pt:21
 #: waeup/kofa/students/browser_templates/fileupload.pt:27
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
@@ -3154,5 +3072,11 @@
 
 #: waeup/kofa/students/browser_templates/setpassword.pt:33
-msgid "<li> Acquire a password access code (PWD). </li> <li> Enter your (JAMB) registration number and the access code. </li> <li> After pressing the button, your student id will be displayed and your password set. The 10-digit part of the access code just used is your new password. </li> <li> Go to the <strong><a href=\"login\">general login page</a></strong> and enter your new credentials. </li>"
+msgid ""
+"<li> Acquire a password access code (PWD). </li> <li> Enter your (JAMB) "
+"registration number and the access code. </li> <li> After pressing the "
+"button, your student id will be displayed and your password set. The 10-"
+"digit part of the access code just used is your new password. </li> <li> Go "
+"to the <strong><a href=\"login\">general login page</a></strong> and enter "
+"your new credentials. </li>"
 msgstr ""
 
@@ -3238,12 +3162,10 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:176
-#: waeup/kofa/students/interfaces.py:255
+#: waeup/kofa/students/interfaces.py:176 waeup/kofa/students/interfaces.py:255
 #: waeup/kofa/students/interfaces.py:483
 msgid "Registration Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:183
-#: waeup/kofa/students/interfaces.py:265
+#: waeup/kofa/students/interfaces.py:183 waeup/kofa/students/interfaces.py:265
 msgid "Matriculation Number"
 msgstr ""
@@ -3304,6 +3226,5 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:337
-#: waeup/kofa/students/interfaces.py:434
+#: waeup/kofa/students/interfaces.py:337 waeup/kofa/students/interfaces.py:434
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3355,6 +3276,5 @@
 msgstr ""
 
-#: waeup/kofa/students/utils.py:280
-#: waeup/kofa/students/viewlets.py:71
+#: waeup/kofa/students/utils.py:280 waeup/kofa/students/viewlets.py:71
 #: waeup/kofa/students/viewlets.py:99
 #: waeup/kofa/students/browser_templates/basemanagepage.pt:6
@@ -3366,17 +3286,14 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:109
-#: waeup/kofa/students/viewlets.py:533
+#: waeup/kofa/students/viewlets.py:109 waeup/kofa/students/viewlets.py:533
 msgid "Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:131
-#: waeup/kofa/students/viewlets.py:537
+#: waeup/kofa/students/viewlets.py:131 waeup/kofa/students/viewlets.py:537
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:27
 msgid "History"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:179
-#: waeup/kofa/students/workflow.py:72
+#: waeup/kofa/students/viewlets.py:179 waeup/kofa/students/workflow.py:72
 msgid "Clear student"
 msgstr ""
@@ -3394,6 +3311,5 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:251
-#: waeup/kofa/students/workflow.py:128
+#: waeup/kofa/students/viewlets.py:251 waeup/kofa/students/workflow.py:128
 msgid "Validate courses"
 msgstr ""
@@ -3495,21 +3411,17 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:703
-#: waeup/kofa/students/viewlets.py:714
+#: waeup/kofa/students/viewlets.py:703 waeup/kofa/students/viewlets.py:714
 msgid "Birth Certificate"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:704
-#: waeup/kofa/students/viewlets.py:715
+#: waeup/kofa/students/viewlets.py:704 waeup/kofa/students/viewlets.py:715
 msgid "Birth Certificate Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:724
-#: waeup/kofa/students/viewlets.py:735
+#: waeup/kofa/students/viewlets.py:724 waeup/kofa/students/viewlets.py:735
 msgid "Acceptance Letter"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:725
-#: waeup/kofa/students/viewlets.py:736
+#: waeup/kofa/students/viewlets.py:725 waeup/kofa/students/viewlets.py:736
 msgid "Acceptance Letter Scan"
 msgstr ""
@@ -3573,11 +3485,9 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:121
-#: waeup/kofa/students/workflow.py:135
+#: waeup/kofa/students/workflow.py:121 waeup/kofa/students/workflow.py:135
 msgid "Reset to paid"
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:122
-#: waeup/kofa/students/workflow.py:136
+#: waeup/kofa/students/workflow.py:122 waeup/kofa/students/workflow.py:136
 msgid "Student record reset to 'paid'"
 msgstr ""
@@ -3639,11 +3549,9 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:65
-#: waeup/kofa/students/workflow.py:79
+#: waeup/kofa/students/workflow.py:65 waeup/kofa/students/workflow.py:79
 msgid "Reset to clearance"
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:66
-#: waeup/kofa/students/workflow.py:80
+#: waeup/kofa/students/workflow.py:66 waeup/kofa/students/workflow.py:80
 msgid "Student record reset to 'clearance'"
 msgstr ""
@@ -3653,11 +3561,9 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:86
-#: waeup/kofa/students/workflow.py:100
+#: waeup/kofa/students/workflow.py:86 waeup/kofa/students/workflow.py:100
 msgid "Pay school fee"
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:87
-#: waeup/kofa/students/workflow.py:101
+#: waeup/kofa/students/workflow.py:87 waeup/kofa/students/workflow.py:101
 msgid "School fee paid"
 msgstr ""
@@ -3787,5 +3693,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:119
+#: waeup/kofa/utils/utils.py:122
 msgid ""
 "Fullname: ${a}\n"
@@ -3797,5 +3703,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:164
+#: waeup/kofa/utils/utils.py:167
 msgid ""
 "Dear ${a},\n"
@@ -3825,3 +3731,2 @@
 msgid "remove-selected-items"
 msgstr ""
-
Index: /main/waeup.kofa/trunk/src/waeup/kofa/locales/ha/LC_MESSAGES/waeup.kofa.po
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/locales/ha/LC_MESSAGES/waeup.kofa.po	(revision 7827)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/ha/LC_MESSAGES/waeup.kofa.po	(revision 7828)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Thu Mar  8 23:29:25 2012\n"
+"POT-Creation-Date: Fri Mar  9 23:09:56 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -28,44 +28,24 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: waeup/kofa/accesscodes/browser.py:100
-#: waeup/kofa/accesscodes/browser.py:113
-#: waeup/kofa/applicants/browser.py:80
-#: waeup/kofa/applicants/browser.py:130
-#: waeup/kofa/applicants/browser.py:182
-#: waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:338
-#: waeup/kofa/browser/pages.py:503
-#: waeup/kofa/browser/pages.py:708
-#: waeup/kofa/browser/pages.py:735
-#: waeup/kofa/browser/pages.py:758
-#: waeup/kofa/browser/pages.py:805
-#: waeup/kofa/browser/pages.py:835
-#: waeup/kofa/browser/pages.py:955
-#: waeup/kofa/browser/pages.py:1183
-#: waeup/kofa/browser/pages.py:1277
-#: waeup/kofa/browser/pages.py:1298
-#: waeup/kofa/browser/pages.py:1325
-#: waeup/kofa/browser/pages.py:1353
-#: waeup/kofa/browser/pages.py:1354
-#: waeup/kofa/browser/pages.py:1400
-#: waeup/kofa/browser/pages.py:1441
-#: waeup/kofa/browser/pages.py:1520
-#: waeup/kofa/browser/pages.py:1521
-#: waeup/kofa/browser/pages.py:1523
-#: waeup/kofa/browser/pages.py:1601
-#: waeup/kofa/browser/pages.py:1646
-#: waeup/kofa/browser/pages.py:1684
-#: waeup/kofa/browser/pages.py:1728
-#: waeup/kofa/browser/pages.py:1767
-#: waeup/kofa/browser/pages.py:1769
-#: waeup/kofa/browser/pages.py:1804
-#: waeup/kofa/browser/pages.py:1855
-#: waeup/kofa/browser/pages.py:1907
-#: waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:585
-#: waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:888
+#: waeup/kofa/accesscodes/browser.py:100 waeup/kofa/accesscodes/browser.py:113
+#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:130
+#: waeup/kofa/applicants/browser.py:182 waeup/kofa/applicants/browser.py:254
+#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:338
+#: waeup/kofa/browser/pages.py:503 waeup/kofa/browser/pages.py:708
+#: waeup/kofa/browser/pages.py:735 waeup/kofa/browser/pages.py:758
+#: waeup/kofa/browser/pages.py:805 waeup/kofa/browser/pages.py:835
+#: waeup/kofa/browser/pages.py:955 waeup/kofa/browser/pages.py:1183
+#: waeup/kofa/browser/pages.py:1277 waeup/kofa/browser/pages.py:1298
+#: waeup/kofa/browser/pages.py:1325 waeup/kofa/browser/pages.py:1353
+#: waeup/kofa/browser/pages.py:1354 waeup/kofa/browser/pages.py:1400
+#: waeup/kofa/browser/pages.py:1441 waeup/kofa/browser/pages.py:1520
+#: waeup/kofa/browser/pages.py:1521 waeup/kofa/browser/pages.py:1523
+#: waeup/kofa/browser/pages.py:1601 waeup/kofa/browser/pages.py:1646
+#: waeup/kofa/browser/pages.py:1684 waeup/kofa/browser/pages.py:1728
+#: waeup/kofa/browser/pages.py:1767 waeup/kofa/browser/pages.py:1769
+#: waeup/kofa/browser/pages.py:1804 waeup/kofa/browser/pages.py:1855
+#: waeup/kofa/browser/pages.py:1907 waeup/kofa/students/browser.py:584
+#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:746
+#: waeup/kofa/students/browser.py:748 waeup/kofa/students/browser.py:888
 msgid "Cancel"
 msgstr ""
@@ -105,10 +85,7 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:153
-#: waeup/kofa/browser/pages.py:592
-#: waeup/kofa/browser/pages.py:1142
-#: waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:171
-#: waeup/kofa/students/browser.py:205
+#: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:592
+#: waeup/kofa/browser/pages.py:1142 waeup/kofa/browser/viewlets.py:190
+#: waeup/kofa/students/browser.py:171 waeup/kofa/students/browser.py:205
 msgid "Search"
 msgstr ""
@@ -122,6 +99,5 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:180
-#: waeup/kofa/accesscodes/workflow.py:39
+#: waeup/kofa/accesscodes/browser.py:180 waeup/kofa/accesscodes/workflow.py:39
 msgid "disabled"
 msgstr ""
@@ -175,6 +151,5 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:46
-#: waeup/kofa/accesscodes/browser.py:206
+#: waeup/kofa/accesscodes/browser.py:46 waeup/kofa/accesscodes/browser.py:206
 #: waeup/kofa/accesscodes/browser.py:226
 msgid "Access Code Batches"
@@ -347,6 +322,5 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/workflow.py:37
-#: waeup/kofa/applicants/workflow.py:37
+#: waeup/kofa/accesscodes/workflow.py:37 waeup/kofa/applicants/workflow.py:37
 msgid "initialized"
 msgstr ""
@@ -368,6 +342,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:117
-#: waeup/kofa/applicants/browser.py:325
+#: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:325
 #: waeup/kofa/applicants/browser.py:745
 msgid "Could not delete:"
@@ -375,19 +348,16 @@
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:120
-#: waeup/kofa/applicants/browser.py:328
-#: waeup/kofa/applicants/browser.py:748
-#: waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:243
-#: waeup/kofa/students/browser.py:642
-#: waeup/kofa/students/browser.py:796
-#: waeup/kofa/students/browser.py:974
-#: waeup/kofa/students/browser.py:1184
-#: waeup/kofa/students/browser.py:1770
+#: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py:328
+#: waeup/kofa/applicants/browser.py:748 waeup/kofa/browser/pages.py:134
+#: waeup/kofa/students/browser.py:243 waeup/kofa/students/browser.py:642
+#: waeup/kofa/students/browser.py:796 waeup/kofa/students/browser.py:974
+#: waeup/kofa/students/browser.py:1184 waeup/kofa/students/browser.py:1770
 msgid "Successfully removed: ${a}"
 msgstr ""
 
 #: waeup/kofa/applicants/browser.py:169
-msgid "An applicants container for the same application type and entrance year exists already in the database."
+msgid ""
+"An applicants container for the same application type and entrance year "
+"exists already in the database."
 msgstr ""
 
@@ -396,6 +366,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:190
-#: waeup/kofa/applicants/viewlets.py:44
+#: waeup/kofa/applicants/browser.py:190 waeup/kofa/applicants/viewlets.py:44
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:12
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:36
@@ -403,58 +372,36 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:301
-#: waeup/kofa/applicants/browser.py:654
-#: waeup/kofa/applicants/browser.py:688
-#: waeup/kofa/applicants/browser.py:791
-#: waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:838
-#: waeup/kofa/browser/pages.py:476
-#: waeup/kofa/browser/pages.py:631
-#: waeup/kofa/browser/pages.py:654
-#: waeup/kofa/browser/pages.py:728
-#: waeup/kofa/browser/pages.py:1181
-#: waeup/kofa/browser/pages.py:1353
-#: waeup/kofa/browser/pages.py:1394
-#: waeup/kofa/browser/pages.py:1520
-#: waeup/kofa/browser/pages.py:1573
-#: waeup/kofa/browser/pages.py:1716
-#: waeup/kofa/browser/pages.py:1767
-#: waeup/kofa/browser/pages.py:1788
-#: waeup/kofa/hostels/browser.py:209
-#: waeup/kofa/hostels/browser.py:231
-#: waeup/kofa/hostels/browser.py:319
-#: waeup/kofa/students/browser.py:359
-#: waeup/kofa/students/browser.py:458
-#: waeup/kofa/students/browser.py:535
-#: waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:600
-#: waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:771
-#: waeup/kofa/students/browser.py:1444
-#: waeup/kofa/students/browser.py:1459
-#: waeup/kofa/students/browser.py:1574
+#: waeup/kofa/applicants/browser.py:254 waeup/kofa/applicants/browser.py:301
+#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:688
+#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:794
+#: waeup/kofa/applicants/browser.py:838 waeup/kofa/browser/pages.py:476
+#: waeup/kofa/browser/pages.py:631 waeup/kofa/browser/pages.py:654
+#: waeup/kofa/browser/pages.py:728 waeup/kofa/browser/pages.py:1181
+#: waeup/kofa/browser/pages.py:1353 waeup/kofa/browser/pages.py:1394
+#: waeup/kofa/browser/pages.py:1520 waeup/kofa/browser/pages.py:1573
+#: waeup/kofa/browser/pages.py:1716 waeup/kofa/browser/pages.py:1767
+#: waeup/kofa/browser/pages.py:1788 waeup/kofa/hostels/browser.py:209
+#: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:319
+#: waeup/kofa/students/browser.py:359 waeup/kofa/students/browser.py:458
+#: waeup/kofa/students/browser.py:535 waeup/kofa/students/browser.py:584
+#: waeup/kofa/students/browser.py:600 waeup/kofa/students/browser.py:746
+#: waeup/kofa/students/browser.py:771 waeup/kofa/students/browser.py:1444
+#: waeup/kofa/students/browser.py:1459 waeup/kofa/students/browser.py:1574
 msgid "Save"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:333
+#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:333
 #: waeup/kofa/applicants/browser.py:361
 msgid "Add applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:265
-#: waeup/kofa/applicants/viewlets.py:95
+#: waeup/kofa/applicants/browser.py:265 waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:305
-#: waeup/kofa/applicants/browser.py:717
-#: waeup/kofa/browser/pages.py:1397
-#: waeup/kofa/browser/pages.py:1719
-#: waeup/kofa/browser/pages.py:1791
-#: waeup/kofa/browser/pages.py:1903
-#: waeup/kofa/hostels/browser.py:54
-#: waeup/kofa/students/browser.py:80
+#: waeup/kofa/applicants/browser.py:305 waeup/kofa/applicants/browser.py:717
+#: waeup/kofa/browser/pages.py:1397 waeup/kofa/browser/pages.py:1719
+#: waeup/kofa/browser/pages.py:1791 waeup/kofa/browser/pages.py:1903
+#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:80
 #: waeup/kofa/students/browser.py:385
 msgid "Form has been saved."
@@ -477,11 +424,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:397
-#: waeup/kofa/students/browser.py:285
+#: waeup/kofa/applicants/browser.py:397 waeup/kofa/students/browser.py:285
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:398
-#: waeup/kofa/students/browser.py:286
+#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:286
 msgid "unset"
 msgstr ""
@@ -496,22 +441,18 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:461
-#: waeup/kofa/students/browser.py:1023
+#: waeup/kofa/applicants/browser.py:461 waeup/kofa/students/browser.py:1023
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:474
-#: waeup/kofa/students/browser.py:1037
+#: waeup/kofa/applicants/browser.py:474 waeup/kofa/students/browser.py:1037
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:501
-#: waeup/kofa/students/browser.py:1056
+#: waeup/kofa/applicants/browser.py:501 waeup/kofa/students/browser.py:1056
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:529
-#: waeup/kofa/students/browser.py:1105
+#: waeup/kofa/applicants/browser.py:529 waeup/kofa/students/browser.py:1105
 msgid "Valid callback received."
 msgstr ""
@@ -541,26 +482,19 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:654
-#: waeup/kofa/applicants/browser.py:794
+#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:794
 #: waeup/kofa/applicants/browser.py:846
 msgid "Final Submit"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655
-#: waeup/kofa/applicants/browser.py:758
-#: waeup/kofa/applicants/browser.py:792
-#: waeup/kofa/applicants/browser.py:827
+#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:758
+#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:827
 #: waeup/kofa/students/browser.py:980
 msgid "Add online payment ticket"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655
-#: waeup/kofa/applicants/browser.py:763
-#: waeup/kofa/applicants/browser.py:792
-#: waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:832
-#: waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:780
-#: waeup/kofa/students/browser.py:956
+#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:763
+#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:795
+#: waeup/kofa/applicants/browser.py:832 waeup/kofa/students/browser.py:748
+#: waeup/kofa/students/browser.py:780 waeup/kofa/students/browser.py:956
 #: waeup/kofa/students/browser.py:1752
 msgid "Remove selected tickets"
@@ -572,58 +506,40 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:685
-#: waeup/kofa/students/browser.py:356
+#: waeup/kofa/applicants/browser.py:685 waeup/kofa/students/browser.py:356
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:732
-#: waeup/kofa/students/browser.py:962
+#: waeup/kofa/applicants/browser.py:732 waeup/kofa/students/browser.py:962
 msgid "No payment selected."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:76
-#: waeup/kofa/applicants/viewlets.py:88
+#: waeup/kofa/applicants/browser.py:76 waeup/kofa/applicants/viewlets.py:88
 msgid "Manage application section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:79
-#: waeup/kofa/applicants/browser.py:105
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:308
-#: waeup/kofa/browser/pages.py:634
-#: waeup/kofa/browser/pages.py:675
-#: waeup/kofa/browser/pages.py:1277
-#: waeup/kofa/browser/pages.py:1288
-#: waeup/kofa/browser/pages.py:1354
-#: waeup/kofa/browser/pages.py:1389
-#: waeup/kofa/hostels/browser.py:131
-#: waeup/kofa/students/browser.py:206
-#: waeup/kofa/students/browser.py:1151
-#: waeup/kofa/students/browser.py:1164
+#: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:105
+#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:308
+#: waeup/kofa/browser/pages.py:634 waeup/kofa/browser/pages.py:675
+#: waeup/kofa/browser/pages.py:1277 waeup/kofa/browser/pages.py:1288
+#: waeup/kofa/browser/pages.py:1354 waeup/kofa/browser/pages.py:1389
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:206
+#: waeup/kofa/students/browser.py:1151 waeup/kofa/students/browser.py:1164
 msgid "Remove selected"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:79
-#: waeup/kofa/applicants/browser.py:125
-#: waeup/kofa/applicants/browser.py:148
-#: waeup/kofa/applicants/browser.py:160
+#: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:125
+#: waeup/kofa/applicants/browser.py:148 waeup/kofa/applicants/browser.py:160
 msgid "Add applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:805
-#: waeup/kofa/students/browser.py:88
+#: waeup/kofa/applicants/browser.py:805 waeup/kofa/students/browser.py:88
 msgid "The requested form is locked (read-only)."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:81
-#: waeup/kofa/applicants/browser.py:139
-#: waeup/kofa/applicants/browser.py:256
-#: waeup/kofa/applicants/browser.py:347
-#: waeup/kofa/browser/pages.py:1355
-#: waeup/kofa/browser/pages.py:1414
-#: waeup/kofa/browser/pages.py:1524
-#: waeup/kofa/browser/pages.py:1610
-#: waeup/kofa/browser/pages.py:1770
-#: waeup/kofa/browser/pages.py:1827
+#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:139
+#: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:347
+#: waeup/kofa/browser/pages.py:1355 waeup/kofa/browser/pages.py:1414
+#: waeup/kofa/browser/pages.py:1524 waeup/kofa/browser/pages.py:1610
+#: waeup/kofa/browser/pages.py:1770 waeup/kofa/browser/pages.py:1827
 msgid "Remove selected local roles"
 msgstr ""
@@ -633,14 +549,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:82
-#: waeup/kofa/applicants/browser.py:135
-#: waeup/kofa/applicants/browser.py:257
-#: waeup/kofa/applicants/browser.py:343
-#: waeup/kofa/browser/pages.py:1356
-#: waeup/kofa/browser/pages.py:1410
-#: waeup/kofa/browser/pages.py:1525
-#: waeup/kofa/browser/pages.py:1606
-#: waeup/kofa/browser/pages.py:1771
-#: waeup/kofa/browser/pages.py:1823
+#: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:135
+#: waeup/kofa/applicants/browser.py:257 waeup/kofa/applicants/browser.py:343
+#: waeup/kofa/browser/pages.py:1356 waeup/kofa/browser/pages.py:1410
+#: waeup/kofa/browser/pages.py:1525 waeup/kofa/browser/pages.py:1606
+#: waeup/kofa/browser/pages.py:1771 waeup/kofa/browser/pages.py:1823
 msgid "Add local role"
 msgstr ""
@@ -654,6 +565,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:858
-#: waeup/kofa/students/browser.py:1619
+#: waeup/kofa/applicants/browser.py:858 waeup/kofa/students/browser.py:1619
 msgid "This form cannot be submitted. Wrong state!"
 msgstr ""
@@ -701,5 +611,7 @@
 
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:59
-msgid "I confirm that the Passport Photograph uploaded on this form is a true picture of me."
+msgid ""
+"I confirm that the Passport Photograph uploaded on this form is a true "
+"picture of me."
 msgstr ""
 
@@ -722,5 +634,7 @@
 
 #: waeup/kofa/applicants/browser_templates/applicantregister.pt:18
-msgid "An account will be created for you and an email with your login credentials will be sent to the address provided."
+msgid ""
+"An account will be created for you and an email with your login credentials "
+"will be sent to the address provided."
 msgstr ""
 
@@ -750,6 +664,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:197
-#: waeup/kofa/students/browser.py:713
+#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:713
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -775,6 +688,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:204
-#: waeup/kofa/students/browser.py:714
+#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:714
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -871,11 +783,11 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:413
-#: waeup/kofa/students/interfaces.py:490
+#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:375
+#: waeup/kofa/interfaces.py:401 waeup/kofa/students/interfaces.py:490
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:418
-#: waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:380
+#: waeup/kofa/interfaces.py:408 waeup/kofa/students/interfaces.py:203
 msgid "Phone"
 msgstr ""
@@ -951,5 +863,7 @@
 #. Default: ""
 #: waeup/kofa/applicants/pdf.py:203
-msgid "<font size=10>Proceed to the login page of the portal and enter your new credentials: user name= ${a}, password = ${b}.</font>"
+msgid ""
+"<font size=10>Proceed to the login page of the portal and enter your new "
+"credentials: user name= ${a}, password = ${b}.</font>"
 msgstr ""
 
@@ -982,17 +896,14 @@
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:151
-#: waeup/kofa/applicants/workflow.py:99
+#: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
 #: waeup/kofa/students/browser.py:258
 msgid "Create student record"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:168
-#: waeup/kofa/students/viewlets.py:300
+#: waeup/kofa/applicants/viewlets.py:168 waeup/kofa/students/viewlets.py:300
 msgid "Download payment receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:183
-#: waeup/kofa/students/viewlets.py:315
+#: waeup/kofa/applicants/viewlets.py:183 waeup/kofa/students/viewlets.py:315
 msgid "Request callback"
 msgstr ""
@@ -1002,25 +913,19 @@
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:73
-#: waeup/kofa/students/viewlets.py:512
+#: waeup/kofa/applicants/viewlets.py:73 waeup/kofa/students/viewlets.py:512
 msgid "My Data"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:100
-#: waeup/kofa/students/workflow.py:25
+#: waeup/kofa/applicants/workflow.py:100 waeup/kofa/students/workflow.py:25
 msgid "Student record created"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:106
-#: waeup/kofa/applicants/workflow.py:113
-#: waeup/kofa/applicants/workflow.py:120
-#: waeup/kofa/applicants/workflow.py:127
+#: waeup/kofa/applicants/workflow.py:106 waeup/kofa/applicants/workflow.py:113
+#: waeup/kofa/applicants/workflow.py:120 waeup/kofa/applicants/workflow.py:127
 msgid "Reset application to started"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:107
-#: waeup/kofa/applicants/workflow.py:114
-#: waeup/kofa/applicants/workflow.py:121
-#: waeup/kofa/applicants/workflow.py:128
+#: waeup/kofa/applicants/workflow.py:107 waeup/kofa/applicants/workflow.py:114
+#: waeup/kofa/applicants/workflow.py:121 waeup/kofa/applicants/workflow.py:128
 #: waeup/kofa/applicants/workflow.py:134
 msgid "Application reset"
@@ -1043,6 +948,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:41
-#: waeup/kofa/interfaces.py:72
+#: waeup/kofa/applicants/workflow.py:41 waeup/kofa/interfaces.py:72
 msgid "admitted"
 msgstr ""
@@ -1052,6 +956,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:43
-#: waeup/kofa/interfaces.py:71
+#: waeup/kofa/applicants/workflow.py:43 waeup/kofa/interfaces.py:71
 msgid "created"
 msgstr ""
@@ -1097,11 +1000,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:85
-#: waeup/kofa/applicants/workflow.py:92
+#: waeup/kofa/applicants/workflow.py:85 waeup/kofa/applicants/workflow.py:92
 msgid "Refuse application"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:86
-#: waeup/kofa/applicants/workflow.py:93
+#: waeup/kofa/applicants/workflow.py:86 waeup/kofa/applicants/workflow.py:93
 msgid "Application refused"
 msgstr ""
@@ -1111,31 +1012,24 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:116
-#: waeup/kofa/browser/viewlets.py:615
+#: waeup/kofa/browser/breadcrumbs.py:116 waeup/kofa/browser/viewlets.py:615
 msgid "Academics"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:123
-#: waeup/kofa/browser/pages.py:309
+#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:309
 msgid "Administration"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:130
-#: waeup/kofa/browser/viewlets.py:360
+#: waeup/kofa/browser/breadcrumbs.py:130 waeup/kofa/browser/viewlets.py:360
 #: waeup/kofa/browser/viewlets.py:666
 msgid "Portal Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:148
-#: waeup/kofa/browser/pages.py:386
-#: waeup/kofa/browser/viewlets.py:375
-#: waeup/kofa/browser/viewlets.py:676
+#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:386
+#: waeup/kofa/browser/viewlets.py:375 waeup/kofa/browser/viewlets.py:676
 msgid "Portal Users"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:155
-#: waeup/kofa/browser/pages.py:748
-#: waeup/kofa/browser/pages.py:1140
-#: waeup/kofa/browser/viewlets.py:393
+#: waeup/kofa/browser/breadcrumbs.py:155 waeup/kofa/browser/pages.py:748
+#: waeup/kofa/browser/pages.py:1140 waeup/kofa/browser/viewlets.py:393
 #: waeup/kofa/browser/viewlets.py:685
 msgid "Data Center"
@@ -1185,8 +1079,6 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:113
-#: waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:287
-#: waeup/kofa/students/browser.py:230
+#: waeup/kofa/browser/pages.py:113 waeup/kofa/hostels/browser.py:256
+#: waeup/kofa/hostels/browser.py:287 waeup/kofa/students/browser.py:230
 msgid "No item selected."
 msgstr ""
@@ -1226,8 +1118,6 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1277
-#: waeup/kofa/browser/pages.py:1293
-#: waeup/kofa/browser/pages.py:1310
-#: waeup/kofa/browser/pages.py:1314
+#: waeup/kofa/browser/pages.py:1277 waeup/kofa/browser/pages.py:1293
+#: waeup/kofa/browser/pages.py:1310 waeup/kofa/browser/pages.py:1314
 msgid "Add faculty"
 msgstr ""
@@ -1237,6 +1127,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1282
-#: waeup/kofa/browser/viewlets.py:441
+#: waeup/kofa/browser/pages.py:1282 waeup/kofa/browser/viewlets.py:441
 msgid "Manage academic section"
 msgstr ""
@@ -1246,18 +1135,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1342
-#: waeup/kofa/browser/pages.py:1352
+#: waeup/kofa/browser/pages.py:1342 waeup/kofa/browser/pages.py:1352
 msgid "Departments"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1354
-#: waeup/kofa/browser/pages.py:1405
-#: waeup/kofa/browser/pages.py:1424
-#: waeup/kofa/browser/pages.py:1428
+#: waeup/kofa/browser/pages.py:1354 waeup/kofa/browser/pages.py:1405
+#: waeup/kofa/browser/pages.py:1424 waeup/kofa/browser/pages.py:1428
 msgid "Add department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1362
-#: waeup/kofa/browser/viewlets.py:457
+#: waeup/kofa/browser/pages.py:1362 waeup/kofa/browser/viewlets.py:457
 msgid "Manage faculty"
 msgstr ""
@@ -1276,13 +1161,10 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1485
-#: waeup/kofa/browser/pages.py:1504
-#: waeup/kofa/students/browser.py:96
-#: waeup/kofa/students/viewlets.py:472
+#: waeup/kofa/browser/pages.py:1485 waeup/kofa/browser/pages.py:1504
+#: waeup/kofa/students/browser.py:96 waeup/kofa/students/viewlets.py:472
 msgid "Students"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:152
-#: waeup/kofa/browser/viewlets.py:322
+#: waeup/kofa/browser/pages.py:152 waeup/kofa/browser/viewlets.py:322
 #: waeup/kofa/browser/templates/staffsitelayout.pt:28
 #: waeup/kofa/browser/templates/studentsitelayout.pt:33
@@ -1290,30 +1172,23 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1521
-#: waeup/kofa/browser/pages.py:1579
+#: waeup/kofa/browser/pages.py:1521 waeup/kofa/browser/pages.py:1579
 msgid "Remove selected courses"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1521
-#: waeup/kofa/browser/pages.py:1591
-#: waeup/kofa/browser/pages.py:1620
-#: waeup/kofa/browser/pages.py:1624
+#: waeup/kofa/browser/pages.py:1521 waeup/kofa/browser/pages.py:1591
+#: waeup/kofa/browser/pages.py:1620 waeup/kofa/browser/pages.py:1624
 msgid "Add course"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1522
-#: waeup/kofa/browser/pages.py:1585
+#: waeup/kofa/browser/pages.py:1522 waeup/kofa/browser/pages.py:1585
 msgid "Remove selected certificates"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1522
-#: waeup/kofa/browser/pages.py:1596
-#: waeup/kofa/browser/pages.py:1657
-#: waeup/kofa/browser/pages.py:1661
+#: waeup/kofa/browser/pages.py:1522 waeup/kofa/browser/pages.py:1596
+#: waeup/kofa/browser/pages.py:1657 waeup/kofa/browser/pages.py:1661
 msgid "Add certificate"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1531
-#: waeup/kofa/browser/viewlets.py:464
+#: waeup/kofa/browser/pages.py:1531 waeup/kofa/browser/viewlets.py:464
 msgid "Manage department"
 msgstr ""
@@ -1341,6 +1216,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1711
-#: waeup/kofa/browser/viewlets.py:481
+#: waeup/kofa/browser/pages.py:1711 waeup/kofa/browser/viewlets.py:481
 msgid "Edit course"
 msgstr ""
@@ -1350,18 +1224,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1768
-#: waeup/kofa/browser/pages.py:1799
-#: waeup/kofa/browser/pages.py:1840
-#: waeup/kofa/browser/pages.py:1842
+#: waeup/kofa/browser/pages.py:1768 waeup/kofa/browser/pages.py:1799
+#: waeup/kofa/browser/pages.py:1840 waeup/kofa/browser/pages.py:1842
 msgid "Add course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1769
-#: waeup/kofa/browser/pages.py:1794
+#: waeup/kofa/browser/pages.py:1769 waeup/kofa/browser/pages.py:1794
 msgid "Remove selected course referrers"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1775
-#: waeup/kofa/browser/viewlets.py:488
+#: waeup/kofa/browser/pages.py:1775 waeup/kofa/browser/viewlets.py:488
 msgid "Manage certificate"
 msgstr ""
@@ -1380,6 +1250,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1888
-#: waeup/kofa/browser/viewlets.py:505
+#: waeup/kofa/browser/pages.py:1888 waeup/kofa/browser/viewlets.py:505
 msgid "Edit course referrer"
 msgstr ""
@@ -1398,13 +1267,10 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:234
-#: waeup/kofa/browser/pages.py:519
+#: waeup/kofa/browser/pages.py:234 waeup/kofa/browser/pages.py:519
 msgid "Send message now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:253
-#: waeup/kofa/browser/pages.py:272
-#: waeup/kofa/browser/pages.py:536
-#: waeup/kofa/students/browser.py:320
+#: waeup/kofa/browser/pages.py:253 waeup/kofa/browser/pages.py:272
+#: waeup/kofa/browser/pages.py:536 waeup/kofa/students/browser.py:320
 msgid "Your message has been sent."
 msgstr ""
@@ -1422,16 +1288,12 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:387
-#: waeup/kofa/hostels/browser.py:195
-#: waeup/kofa/students/viewlets.py:163
-#: waeup/kofa/students/viewlets.py:171
-#: waeup/kofa/students/viewlets.py:226
-#: waeup/kofa/students/viewlets.py:243
+#: waeup/kofa/browser/pages.py:387 waeup/kofa/hostels/browser.py:195
+#: waeup/kofa/students/viewlets.py:163 waeup/kofa/students/viewlets.py:171
+#: waeup/kofa/students/viewlets.py:226 waeup/kofa/students/viewlets.py:243
 #: waeup/kofa/students/viewlets.py:283
 msgid "Manage"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:388
-#: waeup/kofa/browser/viewlets.py:180
+#: waeup/kofa/browser/pages.py:388 waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
 msgstr ""
@@ -1442,6 +1304,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:426
-#: waeup/kofa/browser/pages.py:428
+#: waeup/kofa/browser/pages.py:426 waeup/kofa/browser/pages.py:428
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
@@ -1463,16 +1324,13 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:517
-#: waeup/kofa/students/browser.py:301
+#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:301
 msgid "Send message to ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:546
-#: waeup/kofa/browser/viewlets.py:400
+#: waeup/kofa/browser/pages.py:546 waeup/kofa/browser/viewlets.py:400
 msgid "My Preferences"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:559
-#: waeup/kofa/browser/viewlets.py:415
+#: waeup/kofa/browser/pages.py:559 waeup/kofa/browser/viewlets.py:415
 msgid "My Roles"
 msgstr ""
@@ -1490,17 +1348,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:631
-#: waeup/kofa/browser/pages.py:680
+#: waeup/kofa/browser/pages.py:631 waeup/kofa/browser/pages.py:680
 msgid "Update plugins"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:633
-#: waeup/kofa/browser/pages.py:661
+#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:661
 #: waeup/kofa/browser/pages.py:692
 msgid "Add session configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:658
-#: waeup/kofa/browser/pages.py:731
+#: waeup/kofa/browser/pages.py:658 waeup/kofa/browser/pages.py:731
 msgid "Settings have been saved."
 msgstr ""
@@ -1536,13 +1391,10 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:803
-#: waeup/kofa/browser/pages.py:833
-#: waeup/kofa/browser/pages.py:953
-#: waeup/kofa/browser/pages.py:1061
+#: waeup/kofa/browser/pages.py:803 waeup/kofa/browser/pages.py:833
+#: waeup/kofa/browser/pages.py:953 waeup/kofa/browser/pages.py:1061
 msgid "Process CSV file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:817
-#: waeup/kofa/browser/pages.py:918
+#: waeup/kofa/browser/pages.py:817 waeup/kofa/browser/pages.py:918
 #: waeup/kofa/browser/pages.py:1037
 msgid "Import aborted."
@@ -1573,6 +1425,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:956
-#: waeup/kofa/browser/pages.py:1182
+#: waeup/kofa/browser/pages.py:956 waeup/kofa/browser/pages.py:1182
 msgid "Reset"
 msgstr ""
@@ -1652,5 +1503,7 @@
 
 #: waeup/kofa/browser/templates/datacenterimport1page.pt:2
-msgid "Using batch processing you can mass-create, mass-update, or mass-remove datasets from the database using CSV files."
+msgid ""
+"Using batch processing you can mass-create, mass-update, or mass-remove "
+"datasets from the database using CSV files."
 msgstr ""
 
@@ -1672,5 +1525,7 @@
 
 #: waeup/kofa/browser/templates/datacenterimport2page.pt:8
-msgid "Please select a file-processor and a processing-mode from the selections below."
+msgid ""
+"Please select a file-processor and a processing-mode from the selections "
+"below."
 msgstr ""
 
@@ -1745,5 +1600,7 @@
 
 #: waeup/kofa/browser/templates/datacenterpage.pt:1
-msgid "The data center helps you to manage portal data. You can upload CSV files here, which will be available for import afterwards."
+msgid ""
+"The data center helps you to manage portal data. You can upload CSV files "
+"here, which will be available for import afterwards."
 msgstr ""
 
@@ -1784,13 +1641,4 @@
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:7
 msgid "Settings"
-msgstr ""
-
-#: waeup/kofa/browser/templates/departmentmanagepage.pt:97
-#: waeup/kofa/browser/templates/userscontainerpage.pt:4
-#: waeup/kofa/browser/templates/facultymanagepage.pt:71
-#: waeup/kofa/browser/templates/certificatemanagepage.pt:88
-#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:89
-#: waeup/kofa/applicants/browser_templates/applicantsrootmanagepage.pt:56
-msgid "User Id"
 msgstr ""
 
@@ -1892,12 +1740,17 @@
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:113
-#: waeup/kofa/browser/templates/studentsitelayout.pt:99
-msgid "Back to top"
-msgstr ""
-
 #: waeup/kofa/browser/templates/staffsitelayout.pt:114
 #: waeup/kofa/browser/templates/studentsitelayout.pt:100
-msgid "Student Information and Registration Portal<br /> Copyright &copy; WAeUP Group, 2008-2012"
+msgid "Back to top"
+msgstr ""
+
+#: waeup/kofa/browser/templates/staffsitelayout.pt:116
+#: waeup/kofa/browser/templates/studentsitelayout.pt:102
+msgid "Kofa - Student Management System"
+msgstr ""
+
+#: waeup/kofa/browser/templates/staffsitelayout.pt:119
+#: waeup/kofa/browser/templates/studentsitelayout.pt:105
+msgid "Copyright &copy; WAeUP Group 2008-2012"
 msgstr ""
 
@@ -1935,6 +1788,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:383
-#: waeup/kofa/students/viewlets.py:155
+#: waeup/kofa/browser/viewlets.py:383 waeup/kofa/students/viewlets.py:155
 msgid "Send email"
 msgstr ""
@@ -1948,11 +1800,9 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:473
-#: waeup/kofa/browser/viewlets.py:497
+#: waeup/kofa/browser/viewlets.py:473 waeup/kofa/browser/viewlets.py:497
 msgid "Show students"
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:528
-#: waeup/kofa/browser/viewlets.py:536
+#: waeup/kofa/browser/viewlets.py:528 waeup/kofa/browser/viewlets.py:536
 msgid "Show batch logs"
 msgstr ""
@@ -1970,8 +1820,6 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:91
-#: waeup/kofa/browser/viewlets.py:160
-#: waeup/kofa/students/viewlets.py:218
-#: waeup/kofa/students/viewlets.py:403
+#: waeup/kofa/browser/viewlets.py:91 waeup/kofa/browser/viewlets.py:160
+#: waeup/kofa/students/viewlets.py:218 waeup/kofa/students/viewlets.py:403
 msgid "Edit"
 msgstr ""
@@ -1981,11 +1829,9 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:113
-#: waeup/kofa/hostels/browser.py:123
+#: waeup/kofa/hostels/browser.py:113 waeup/kofa/hostels/browser.py:123
 msgid "Manage accommodation section"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:145
-#: waeup/kofa/hostels/browser.py:158
+#: waeup/kofa/hostels/browser.py:145 waeup/kofa/hostels/browser.py:158
 msgid "Add hostel"
 msgstr ""
@@ -2007,16 +1853,13 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:210
-#: waeup/kofa/hostels/browser.py:236
+#: waeup/kofa/hostels/browser.py:210 waeup/kofa/hostels/browser.py:236
 msgid "Update all beds"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:211
-#: waeup/kofa/hostels/browser.py:250
+#: waeup/kofa/hostels/browser.py:211 waeup/kofa/hostels/browser.py:250
 msgid "Switch reservation of selected beds"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:212
-#: waeup/kofa/hostels/browser.py:281
+#: waeup/kofa/hostels/browser.py:212 waeup/kofa/hostels/browser.py:281
 msgid "Release selected beds"
 msgstr ""
@@ -2024,5 +1867,6 @@
 #. Default: ""
 #: waeup/kofa/hostels/browser.py:241
-msgid "${a} empty beds removed, ${b} beds added, ${c} occupied beds modified (${d})"
+msgid ""
+"${a} empty beds removed, ${b} beds added, ${c} occupied beds modified (${d})"
 msgstr ""
 
@@ -2045,6 +1889,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:68
-#: waeup/kofa/hostels/browser.py:78
+#: waeup/kofa/hostels/browser.py:68 waeup/kofa/hostels/browser.py:78
 msgid "Hostels"
 msgstr ""
@@ -2113,6 +1956,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/interfaces.py:175
-#: waeup/kofa/students/interfaces.py:427
+#: waeup/kofa/hostels/interfaces.py:175 waeup/kofa/students/interfaces.py:427
 msgid "Bed Type"
 msgstr ""
@@ -2122,6 +1964,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/interfaces.py:186
-#: waeup/kofa/hostels/interfaces.py:199
+#: waeup/kofa/hostels/interfaces.py:186 waeup/kofa/hostels/interfaces.py:199
 msgid "Owner (Student)"
 msgstr ""
@@ -2279,4 +2120,145 @@
 msgstr ""
 
+#: waeup/kofa/interfaces.py:306
+msgid "Importer name"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:310
+msgid "Import mode"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:335
+msgid "Email Address:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:342
+msgid "Email to:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:349
+msgid "Subject:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:353
+msgid "Full Name:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:357
+msgid "Text:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:388
+#: waeup/kofa/browser/templates/departmentmanagepage.pt:97
+#: waeup/kofa/browser/templates/userscontainerpage.pt:4
+#: waeup/kofa/browser/templates/facultymanagepage.pt:71
+#: waeup/kofa/browser/templates/certificatemanagepage.pt:88
+#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:89
+#: waeup/kofa/applicants/browser_templates/applicantsrootmanagepage.pt:56
+msgid "User Id"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:393
+#: waeup/kofa/students/browser_templates/containerpage.pt:33
+#: waeup/kofa/students/browser_templates/containermanagepage.pt:39
+#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:44
+msgid "Full Name"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:397
+msgid "Description/Notice"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:414
+msgid "Portal roles"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:457
+msgid "Name of University"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:458
+msgid "Sample University"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:463
+msgid "Abbreviated Title of University"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:469
+msgid "Skin"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:476
+msgid "Content in reST format"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:488
+msgid "Accommodation Booking Session"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:496
+msgid "Allowed States for Accommodation Booking"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:504
+msgid "Name of Administrator"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:510
+msgid "Email Address of Administrator"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:517
+msgid "Subject of Email to Administrator"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:518
+msgid "Kofa Contact"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:523
+msgid "SMTP mailer to use when sending mail"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:530
+msgid "Captcha used for public registration pages"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:537
+msgid "Carry-over Course Registration"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:546 waeup/kofa/interfaces.py:598
+msgid "Academic Session"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:554 waeup/kofa/payments/interfaces.py:30
+msgid "School Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:559 waeup/kofa/payments/interfaces.py:106
+msgid "Surcharge 1"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:564 waeup/kofa/payments/interfaces.py:113
+msgid "Surcharge 2"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:569 waeup/kofa/payments/interfaces.py:120
+msgid "Surcharge 3"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:574
+msgid "Clearance Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:579
+msgid "Booking Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:584 waeup/kofa/payments/interfaces.py:36
+msgid "Acceptance Fee"
+msgstr ""
+
 #: waeup/kofa/interfaces.py:73
 msgid "clearance started"
@@ -2343,16 +2325,4 @@
 msgstr ""
 
-#: waeup/kofa/payments/interfaces.py:106
-msgid "Surcharge 1"
-msgstr ""
-
-#: waeup/kofa/payments/interfaces.py:113
-msgid "Surcharge 2"
-msgstr ""
-
-#: waeup/kofa/payments/interfaces.py:120
-msgid "Surcharge 3"
-msgstr ""
-
 #: waeup/kofa/payments/interfaces.py:133
 msgid "Activation Code"
@@ -2391,8 +2361,4 @@
 msgstr ""
 
-#: waeup/kofa/payments/interfaces.py:30
-msgid "School Fee"
-msgstr ""
-
 #: waeup/kofa/payments/interfaces.py:31
 msgid "Clearance"
@@ -2413,8 +2379,4 @@
 #: waeup/kofa/payments/interfaces.py:35
 msgid "Gown"
-msgstr ""
-
-#: waeup/kofa/payments/interfaces.py:36
-msgid "Acceptance Fee"
 msgstr ""
 
@@ -2450,6 +2412,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1003
-#: waeup/kofa/students/browser.py:1225
+#: waeup/kofa/students/browser.py:1003 waeup/kofa/students/browser.py:1225
 msgid "Your current session does not match accommodation session."
 msgstr ""
@@ -2460,6 +2421,5 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1085
-#: waeup/kofa/students/browser.py:1093
+#: waeup/kofa/students/browser.py:1085 waeup/kofa/students/browser.py:1093
 #: waeup/kofa/students/browser.py:1101
 msgid "Valid callback received. ${a}"
@@ -2475,6 +2435,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:117
-#: waeup/kofa/students/viewlets.py:114
+#: waeup/kofa/students/browser.py:117 waeup/kofa/students/viewlets.py:114
 #: waeup/kofa/students/viewlets.py:534
 msgid "Study Course"
@@ -2501,6 +2460,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:123
-#: waeup/kofa/students/viewlets.py:120
+#: waeup/kofa/students/browser.py:123 waeup/kofa/students/viewlets.py:120
 #: waeup/kofa/students/viewlets.py:535
 msgid "Payments"
@@ -2511,6 +2469,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1241
-#: waeup/kofa/students/browser.py:1537
+#: waeup/kofa/students/browser.py:1241 waeup/kofa/students/browser.py:1537
 #: waeup/kofa/students/browser.py:1650
 msgid "Activation code is invalid."
@@ -2518,24 +2475,19 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1261
-#: waeup/kofa/students/browser.py:1389
+#: waeup/kofa/students/browser.py:1261 waeup/kofa/students/browser.py:1389
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1266
-#: waeup/kofa/students/browser.py:1542
+#: waeup/kofa/students/browser.py:1266 waeup/kofa/students/browser.py:1542
 #: waeup/kofa/students/browser.py:1655
 msgid "Activation code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1269
-#: waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1658
-#: waeup/kofa/students/browser.py:1917
+#: waeup/kofa/students/browser.py:1269 waeup/kofa/students/browser.py:1545
+#: waeup/kofa/students/browser.py:1658 waeup/kofa/students/browser.py:1917
 msgid "invalidated"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1274
-#: waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1274 waeup/kofa/students/browser.py:1549
 #: waeup/kofa/students/browser.py:1663
 msgid "You are not the owner of this access code."
@@ -2543,6 +2495,5 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1285
-#: waeup/kofa/students/browser.py:1403
+#: waeup/kofa/students/browser.py:1285 waeup/kofa/students/browser.py:1403
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
@@ -2574,6 +2525,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:138
-#: waeup/kofa/students/viewlets.py:126
+#: waeup/kofa/students/browser.py:138 waeup/kofa/students/viewlets.py:126
 msgid "Accommodation"
 msgstr ""
@@ -2589,11 +2539,9 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1441
-#: waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/browser.py:1441 waeup/kofa/students/viewlets.py:356
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1456
-#: waeup/kofa/students/viewlets.py:365
+#: waeup/kofa/students/browser.py:1456 waeup/kofa/students/viewlets.py:365
 msgid "Change password"
 msgstr ""
@@ -2612,6 +2560,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1497
-#: waeup/kofa/students/viewlets.py:389
+#: waeup/kofa/students/browser.py:1497 waeup/kofa/students/viewlets.py:389
 #: waeup/kofa/students/workflow.py:44
 msgid "Start clearance"
@@ -2622,6 +2569,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1518
-#: waeup/kofa/students/browser.py:1639
+#: waeup/kofa/students/browser.py:1518 waeup/kofa/students/browser.py:1639
 msgid "Wrong state"
 msgstr ""
@@ -2643,6 +2589,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1577
-#: waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1577 waeup/kofa/students/browser.py:1591
 msgid "Clearance form has been saved."
 msgstr ""
@@ -2652,6 +2597,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1600
-#: waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1600 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
@@ -2673,6 +2617,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1631
-#: waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:1631 waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr ""
@@ -2728,6 +2671,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:186
-#: waeup/kofa/students/browser.py:222
+#: waeup/kofa/students/browser.py:186 waeup/kofa/students/browser.py:222
 msgid "Empty search string"
 msgstr ""
@@ -2772,16 +2714,13 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:204
-#: waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:204 waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:228
-#: waeup/kofa/students/browser.py:1888
+#: waeup/kofa/students/browser.py:228 waeup/kofa/students/browser.py:1888
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:255
-#: waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:255 waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr ""
@@ -2796,6 +2735,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:322
-#: waeup/kofa/students/browser.py:1865
+#: waeup/kofa/students/browser.py:322 waeup/kofa/students/browser.py:1865
 msgid "An smtp server error occurred."
 msgstr ""
@@ -2810,6 +2748,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:418
-#: waeup/kofa/students/viewlets.py:104
+#: waeup/kofa/students/browser.py:418 waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
@@ -2829,6 +2766,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:475
-#: waeup/kofa/students/browser.py:499
+#: waeup/kofa/students/browser.py:475 waeup/kofa/students/browser.py:499
 msgid "Student is in wrong state."
 msgstr ""
@@ -2860,11 +2796,9 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:585
-#: waeup/kofa/students/browser.py:626
+#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:626
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:586
-#: waeup/kofa/students/browser.py:612
+#: waeup/kofa/students/browser.py:586 waeup/kofa/students/browser.py:612
 msgid "Add study level"
 msgstr ""
@@ -2874,6 +2808,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:622
-#: waeup/kofa/students/browser.py:1708
+#: waeup/kofa/students/browser.py:622 waeup/kofa/students/browser.py:1708
 msgid "This level exists."
 msgstr ""
@@ -2930,6 +2863,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:719
-#: waeup/kofa/students/interfaces.py:370
+#: waeup/kofa/students/browser.py:719 waeup/kofa/students/interfaces.py:370
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2938,10 +2870,7 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:747
-#: waeup/kofa/students/browser.py:776
-#: waeup/kofa/students/browser.py:861
-#: waeup/kofa/students/browser.py:866
-#: waeup/kofa/students/browser.py:1748
-#: waeup/kofa/students/browser.py:1798
+#: waeup/kofa/students/browser.py:747 waeup/kofa/students/browser.py:776
+#: waeup/kofa/students/browser.py:861 waeup/kofa/students/browser.py:866
+#: waeup/kofa/students/browser.py:1748 waeup/kofa/students/browser.py:1798
 msgid "Add course ticket"
 msgstr ""
@@ -2952,11 +2881,9 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:786
-#: waeup/kofa/students/browser.py:1758
+#: waeup/kofa/students/browser.py:786 waeup/kofa/students/browser.py:1758
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:810
-#: waeup/kofa/students/browser.py:832
+#: waeup/kofa/students/browser.py:810 waeup/kofa/students/browser.py:832
 msgid "This level does not correspond current level."
 msgstr ""
@@ -2966,6 +2893,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:816
-#: waeup/kofa/students/browser.py:844
+#: waeup/kofa/students/browser.py:816 waeup/kofa/students/browser.py:844
 msgid "Student is in the wrong state."
 msgstr ""
@@ -2979,12 +2905,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:881
-#: waeup/kofa/students/browser.py:1811
+#: waeup/kofa/students/browser.py:881 waeup/kofa/students/browser.py:1811
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:883
-#: waeup/kofa/students/browser.py:1813
+#: waeup/kofa/students/browser.py:883 waeup/kofa/students/browser.py:1813
 msgid "Successfully added ${a}."
 msgstr ""
@@ -3078,10 +3002,4 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/containerpage.pt:33
-#: waeup/kofa/students/browser_templates/containermanagepage.pt:39
-#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:44
-msgid "Full Name"
-msgstr ""
-
 #: waeup/kofa/students/browser_templates/containerpage.pt:5
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:5
@@ -3115,5 +3033,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/students/browser_templates/imageupload.pt:21
 #: waeup/kofa/students/browser_templates/fileupload.pt:27
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
@@ -3154,5 +3072,11 @@
 
 #: waeup/kofa/students/browser_templates/setpassword.pt:33
-msgid "<li> Acquire a password access code (PWD). </li> <li> Enter your (JAMB) registration number and the access code. </li> <li> After pressing the button, your student id will be displayed and your password set. The 10-digit part of the access code just used is your new password. </li> <li> Go to the <strong><a href=\"login\">general login page</a></strong> and enter your new credentials. </li>"
+msgid ""
+"<li> Acquire a password access code (PWD). </li> <li> Enter your (JAMB) "
+"registration number and the access code. </li> <li> After pressing the "
+"button, your student id will be displayed and your password set. The 10-"
+"digit part of the access code just used is your new password. </li> <li> Go "
+"to the <strong><a href=\"login\">general login page</a></strong> and enter "
+"your new credentials. </li>"
 msgstr ""
 
@@ -3238,12 +3162,10 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:176
-#: waeup/kofa/students/interfaces.py:255
+#: waeup/kofa/students/interfaces.py:176 waeup/kofa/students/interfaces.py:255
 #: waeup/kofa/students/interfaces.py:483
 msgid "Registration Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:183
-#: waeup/kofa/students/interfaces.py:265
+#: waeup/kofa/students/interfaces.py:183 waeup/kofa/students/interfaces.py:265
 msgid "Matriculation Number"
 msgstr ""
@@ -3304,6 +3226,5 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:337
-#: waeup/kofa/students/interfaces.py:434
+#: waeup/kofa/students/interfaces.py:337 waeup/kofa/students/interfaces.py:434
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3355,6 +3276,5 @@
 msgstr ""
 
-#: waeup/kofa/students/utils.py:280
-#: waeup/kofa/students/viewlets.py:71
+#: waeup/kofa/students/utils.py:280 waeup/kofa/students/viewlets.py:71
 #: waeup/kofa/students/viewlets.py:99
 #: waeup/kofa/students/browser_templates/basemanagepage.pt:6
@@ -3366,17 +3286,14 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:109
-#: waeup/kofa/students/viewlets.py:533
+#: waeup/kofa/students/viewlets.py:109 waeup/kofa/students/viewlets.py:533
 msgid "Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:131
-#: waeup/kofa/students/viewlets.py:537
+#: waeup/kofa/students/viewlets.py:131 waeup/kofa/students/viewlets.py:537
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:27
 msgid "History"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:179
-#: waeup/kofa/students/workflow.py:72
+#: waeup/kofa/students/viewlets.py:179 waeup/kofa/students/workflow.py:72
 msgid "Clear student"
 msgstr ""
@@ -3394,6 +3311,5 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:251
-#: waeup/kofa/students/workflow.py:128
+#: waeup/kofa/students/viewlets.py:251 waeup/kofa/students/workflow.py:128
 msgid "Validate courses"
 msgstr ""
@@ -3495,21 +3411,17 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:703
-#: waeup/kofa/students/viewlets.py:714
+#: waeup/kofa/students/viewlets.py:703 waeup/kofa/students/viewlets.py:714
 msgid "Birth Certificate"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:704
-#: waeup/kofa/students/viewlets.py:715
+#: waeup/kofa/students/viewlets.py:704 waeup/kofa/students/viewlets.py:715
 msgid "Birth Certificate Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:724
-#: waeup/kofa/students/viewlets.py:735
+#: waeup/kofa/students/viewlets.py:724 waeup/kofa/students/viewlets.py:735
 msgid "Acceptance Letter"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:725
-#: waeup/kofa/students/viewlets.py:736
+#: waeup/kofa/students/viewlets.py:725 waeup/kofa/students/viewlets.py:736
 msgid "Acceptance Letter Scan"
 msgstr ""
@@ -3573,11 +3485,9 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:121
-#: waeup/kofa/students/workflow.py:135
+#: waeup/kofa/students/workflow.py:121 waeup/kofa/students/workflow.py:135
 msgid "Reset to paid"
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:122
-#: waeup/kofa/students/workflow.py:136
+#: waeup/kofa/students/workflow.py:122 waeup/kofa/students/workflow.py:136
 msgid "Student record reset to 'paid'"
 msgstr ""
@@ -3639,11 +3549,9 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:65
-#: waeup/kofa/students/workflow.py:79
+#: waeup/kofa/students/workflow.py:65 waeup/kofa/students/workflow.py:79
 msgid "Reset to clearance"
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:66
-#: waeup/kofa/students/workflow.py:80
+#: waeup/kofa/students/workflow.py:66 waeup/kofa/students/workflow.py:80
 msgid "Student record reset to 'clearance'"
 msgstr ""
@@ -3653,11 +3561,9 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:86
-#: waeup/kofa/students/workflow.py:100
+#: waeup/kofa/students/workflow.py:86 waeup/kofa/students/workflow.py:100
 msgid "Pay school fee"
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:87
-#: waeup/kofa/students/workflow.py:101
+#: waeup/kofa/students/workflow.py:87 waeup/kofa/students/workflow.py:101
 msgid "School fee paid"
 msgstr ""
@@ -3787,5 +3693,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:119
+#: waeup/kofa/utils/utils.py:122
 msgid ""
 "Fullname: ${a}\n"
@@ -3797,5 +3703,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:164
+#: waeup/kofa/utils/utils.py:167
 msgid ""
 "Dear ${a},\n"
@@ -3825,3 +3731,2 @@
 msgid "remove-selected-items"
 msgstr ""
-
Index: /main/waeup.kofa/trunk/src/waeup/kofa/locales/ig/LC_MESSAGES/waeup.kofa.po
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/locales/ig/LC_MESSAGES/waeup.kofa.po	(revision 7827)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/ig/LC_MESSAGES/waeup.kofa.po	(revision 7828)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Thu Mar  8 23:29:25 2012\n"
+"POT-Creation-Date: Fri Mar  9 23:09:56 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -28,44 +28,24 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: waeup/kofa/accesscodes/browser.py:100
-#: waeup/kofa/accesscodes/browser.py:113
-#: waeup/kofa/applicants/browser.py:80
-#: waeup/kofa/applicants/browser.py:130
-#: waeup/kofa/applicants/browser.py:182
-#: waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:338
-#: waeup/kofa/browser/pages.py:503
-#: waeup/kofa/browser/pages.py:708
-#: waeup/kofa/browser/pages.py:735
-#: waeup/kofa/browser/pages.py:758
-#: waeup/kofa/browser/pages.py:805
-#: waeup/kofa/browser/pages.py:835
-#: waeup/kofa/browser/pages.py:955
-#: waeup/kofa/browser/pages.py:1183
-#: waeup/kofa/browser/pages.py:1277
-#: waeup/kofa/browser/pages.py:1298
-#: waeup/kofa/browser/pages.py:1325
-#: waeup/kofa/browser/pages.py:1353
-#: waeup/kofa/browser/pages.py:1354
-#: waeup/kofa/browser/pages.py:1400
-#: waeup/kofa/browser/pages.py:1441
-#: waeup/kofa/browser/pages.py:1520
-#: waeup/kofa/browser/pages.py:1521
-#: waeup/kofa/browser/pages.py:1523
-#: waeup/kofa/browser/pages.py:1601
-#: waeup/kofa/browser/pages.py:1646
-#: waeup/kofa/browser/pages.py:1684
-#: waeup/kofa/browser/pages.py:1728
-#: waeup/kofa/browser/pages.py:1767
-#: waeup/kofa/browser/pages.py:1769
-#: waeup/kofa/browser/pages.py:1804
-#: waeup/kofa/browser/pages.py:1855
-#: waeup/kofa/browser/pages.py:1907
-#: waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:585
-#: waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:888
+#: waeup/kofa/accesscodes/browser.py:100 waeup/kofa/accesscodes/browser.py:113
+#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:130
+#: waeup/kofa/applicants/browser.py:182 waeup/kofa/applicants/browser.py:254
+#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:338
+#: waeup/kofa/browser/pages.py:503 waeup/kofa/browser/pages.py:708
+#: waeup/kofa/browser/pages.py:735 waeup/kofa/browser/pages.py:758
+#: waeup/kofa/browser/pages.py:805 waeup/kofa/browser/pages.py:835
+#: waeup/kofa/browser/pages.py:955 waeup/kofa/browser/pages.py:1183
+#: waeup/kofa/browser/pages.py:1277 waeup/kofa/browser/pages.py:1298
+#: waeup/kofa/browser/pages.py:1325 waeup/kofa/browser/pages.py:1353
+#: waeup/kofa/browser/pages.py:1354 waeup/kofa/browser/pages.py:1400
+#: waeup/kofa/browser/pages.py:1441 waeup/kofa/browser/pages.py:1520
+#: waeup/kofa/browser/pages.py:1521 waeup/kofa/browser/pages.py:1523
+#: waeup/kofa/browser/pages.py:1601 waeup/kofa/browser/pages.py:1646
+#: waeup/kofa/browser/pages.py:1684 waeup/kofa/browser/pages.py:1728
+#: waeup/kofa/browser/pages.py:1767 waeup/kofa/browser/pages.py:1769
+#: waeup/kofa/browser/pages.py:1804 waeup/kofa/browser/pages.py:1855
+#: waeup/kofa/browser/pages.py:1907 waeup/kofa/students/browser.py:584
+#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:746
+#: waeup/kofa/students/browser.py:748 waeup/kofa/students/browser.py:888
 msgid "Cancel"
 msgstr ""
@@ -105,10 +85,7 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:153
-#: waeup/kofa/browser/pages.py:592
-#: waeup/kofa/browser/pages.py:1142
-#: waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:171
-#: waeup/kofa/students/browser.py:205
+#: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:592
+#: waeup/kofa/browser/pages.py:1142 waeup/kofa/browser/viewlets.py:190
+#: waeup/kofa/students/browser.py:171 waeup/kofa/students/browser.py:205
 msgid "Search"
 msgstr ""
@@ -122,6 +99,5 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:180
-#: waeup/kofa/accesscodes/workflow.py:39
+#: waeup/kofa/accesscodes/browser.py:180 waeup/kofa/accesscodes/workflow.py:39
 msgid "disabled"
 msgstr ""
@@ -175,6 +151,5 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:46
-#: waeup/kofa/accesscodes/browser.py:206
+#: waeup/kofa/accesscodes/browser.py:46 waeup/kofa/accesscodes/browser.py:206
 #: waeup/kofa/accesscodes/browser.py:226
 msgid "Access Code Batches"
@@ -347,6 +322,5 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/workflow.py:37
-#: waeup/kofa/applicants/workflow.py:37
+#: waeup/kofa/accesscodes/workflow.py:37 waeup/kofa/applicants/workflow.py:37
 msgid "initialized"
 msgstr ""
@@ -368,6 +342,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:117
-#: waeup/kofa/applicants/browser.py:325
+#: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:325
 #: waeup/kofa/applicants/browser.py:745
 msgid "Could not delete:"
@@ -375,19 +348,16 @@
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:120
-#: waeup/kofa/applicants/browser.py:328
-#: waeup/kofa/applicants/browser.py:748
-#: waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:243
-#: waeup/kofa/students/browser.py:642
-#: waeup/kofa/students/browser.py:796
-#: waeup/kofa/students/browser.py:974
-#: waeup/kofa/students/browser.py:1184
-#: waeup/kofa/students/browser.py:1770
+#: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py:328
+#: waeup/kofa/applicants/browser.py:748 waeup/kofa/browser/pages.py:134
+#: waeup/kofa/students/browser.py:243 waeup/kofa/students/browser.py:642
+#: waeup/kofa/students/browser.py:796 waeup/kofa/students/browser.py:974
+#: waeup/kofa/students/browser.py:1184 waeup/kofa/students/browser.py:1770
 msgid "Successfully removed: ${a}"
 msgstr ""
 
 #: waeup/kofa/applicants/browser.py:169
-msgid "An applicants container for the same application type and entrance year exists already in the database."
+msgid ""
+"An applicants container for the same application type and entrance year "
+"exists already in the database."
 msgstr ""
 
@@ -396,6 +366,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:190
-#: waeup/kofa/applicants/viewlets.py:44
+#: waeup/kofa/applicants/browser.py:190 waeup/kofa/applicants/viewlets.py:44
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:12
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:36
@@ -403,58 +372,36 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:301
-#: waeup/kofa/applicants/browser.py:654
-#: waeup/kofa/applicants/browser.py:688
-#: waeup/kofa/applicants/browser.py:791
-#: waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:838
-#: waeup/kofa/browser/pages.py:476
-#: waeup/kofa/browser/pages.py:631
-#: waeup/kofa/browser/pages.py:654
-#: waeup/kofa/browser/pages.py:728
-#: waeup/kofa/browser/pages.py:1181
-#: waeup/kofa/browser/pages.py:1353
-#: waeup/kofa/browser/pages.py:1394
-#: waeup/kofa/browser/pages.py:1520
-#: waeup/kofa/browser/pages.py:1573
-#: waeup/kofa/browser/pages.py:1716
-#: waeup/kofa/browser/pages.py:1767
-#: waeup/kofa/browser/pages.py:1788
-#: waeup/kofa/hostels/browser.py:209
-#: waeup/kofa/hostels/browser.py:231
-#: waeup/kofa/hostels/browser.py:319
-#: waeup/kofa/students/browser.py:359
-#: waeup/kofa/students/browser.py:458
-#: waeup/kofa/students/browser.py:535
-#: waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:600
-#: waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:771
-#: waeup/kofa/students/browser.py:1444
-#: waeup/kofa/students/browser.py:1459
-#: waeup/kofa/students/browser.py:1574
+#: waeup/kofa/applicants/browser.py:254 waeup/kofa/applicants/browser.py:301
+#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:688
+#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:794
+#: waeup/kofa/applicants/browser.py:838 waeup/kofa/browser/pages.py:476
+#: waeup/kofa/browser/pages.py:631 waeup/kofa/browser/pages.py:654
+#: waeup/kofa/browser/pages.py:728 waeup/kofa/browser/pages.py:1181
+#: waeup/kofa/browser/pages.py:1353 waeup/kofa/browser/pages.py:1394
+#: waeup/kofa/browser/pages.py:1520 waeup/kofa/browser/pages.py:1573
+#: waeup/kofa/browser/pages.py:1716 waeup/kofa/browser/pages.py:1767
+#: waeup/kofa/browser/pages.py:1788 waeup/kofa/hostels/browser.py:209
+#: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:319
+#: waeup/kofa/students/browser.py:359 waeup/kofa/students/browser.py:458
+#: waeup/kofa/students/browser.py:535 waeup/kofa/students/browser.py:584
+#: waeup/kofa/students/browser.py:600 waeup/kofa/students/browser.py:746
+#: waeup/kofa/students/browser.py:771 waeup/kofa/students/browser.py:1444
+#: waeup/kofa/students/browser.py:1459 waeup/kofa/students/browser.py:1574
 msgid "Save"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:333
+#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:333
 #: waeup/kofa/applicants/browser.py:361
 msgid "Add applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:265
-#: waeup/kofa/applicants/viewlets.py:95
+#: waeup/kofa/applicants/browser.py:265 waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:305
-#: waeup/kofa/applicants/browser.py:717
-#: waeup/kofa/browser/pages.py:1397
-#: waeup/kofa/browser/pages.py:1719
-#: waeup/kofa/browser/pages.py:1791
-#: waeup/kofa/browser/pages.py:1903
-#: waeup/kofa/hostels/browser.py:54
-#: waeup/kofa/students/browser.py:80
+#: waeup/kofa/applicants/browser.py:305 waeup/kofa/applicants/browser.py:717
+#: waeup/kofa/browser/pages.py:1397 waeup/kofa/browser/pages.py:1719
+#: waeup/kofa/browser/pages.py:1791 waeup/kofa/browser/pages.py:1903
+#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:80
 #: waeup/kofa/students/browser.py:385
 msgid "Form has been saved."
@@ -477,11 +424,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:397
-#: waeup/kofa/students/browser.py:285
+#: waeup/kofa/applicants/browser.py:397 waeup/kofa/students/browser.py:285
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:398
-#: waeup/kofa/students/browser.py:286
+#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:286
 msgid "unset"
 msgstr ""
@@ -496,22 +441,18 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:461
-#: waeup/kofa/students/browser.py:1023
+#: waeup/kofa/applicants/browser.py:461 waeup/kofa/students/browser.py:1023
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:474
-#: waeup/kofa/students/browser.py:1037
+#: waeup/kofa/applicants/browser.py:474 waeup/kofa/students/browser.py:1037
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:501
-#: waeup/kofa/students/browser.py:1056
+#: waeup/kofa/applicants/browser.py:501 waeup/kofa/students/browser.py:1056
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:529
-#: waeup/kofa/students/browser.py:1105
+#: waeup/kofa/applicants/browser.py:529 waeup/kofa/students/browser.py:1105
 msgid "Valid callback received."
 msgstr ""
@@ -541,26 +482,19 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:654
-#: waeup/kofa/applicants/browser.py:794
+#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:794
 #: waeup/kofa/applicants/browser.py:846
 msgid "Final Submit"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655
-#: waeup/kofa/applicants/browser.py:758
-#: waeup/kofa/applicants/browser.py:792
-#: waeup/kofa/applicants/browser.py:827
+#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:758
+#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:827
 #: waeup/kofa/students/browser.py:980
 msgid "Add online payment ticket"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655
-#: waeup/kofa/applicants/browser.py:763
-#: waeup/kofa/applicants/browser.py:792
-#: waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:832
-#: waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:780
-#: waeup/kofa/students/browser.py:956
+#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:763
+#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:795
+#: waeup/kofa/applicants/browser.py:832 waeup/kofa/students/browser.py:748
+#: waeup/kofa/students/browser.py:780 waeup/kofa/students/browser.py:956
 #: waeup/kofa/students/browser.py:1752
 msgid "Remove selected tickets"
@@ -572,58 +506,40 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:685
-#: waeup/kofa/students/browser.py:356
+#: waeup/kofa/applicants/browser.py:685 waeup/kofa/students/browser.py:356
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:732
-#: waeup/kofa/students/browser.py:962
+#: waeup/kofa/applicants/browser.py:732 waeup/kofa/students/browser.py:962
 msgid "No payment selected."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:76
-#: waeup/kofa/applicants/viewlets.py:88
+#: waeup/kofa/applicants/browser.py:76 waeup/kofa/applicants/viewlets.py:88
 msgid "Manage application section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:79
-#: waeup/kofa/applicants/browser.py:105
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:308
-#: waeup/kofa/browser/pages.py:634
-#: waeup/kofa/browser/pages.py:675
-#: waeup/kofa/browser/pages.py:1277
-#: waeup/kofa/browser/pages.py:1288
-#: waeup/kofa/browser/pages.py:1354
-#: waeup/kofa/browser/pages.py:1389
-#: waeup/kofa/hostels/browser.py:131
-#: waeup/kofa/students/browser.py:206
-#: waeup/kofa/students/browser.py:1151
-#: waeup/kofa/students/browser.py:1164
+#: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:105
+#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:308
+#: waeup/kofa/browser/pages.py:634 waeup/kofa/browser/pages.py:675
+#: waeup/kofa/browser/pages.py:1277 waeup/kofa/browser/pages.py:1288
+#: waeup/kofa/browser/pages.py:1354 waeup/kofa/browser/pages.py:1389
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:206
+#: waeup/kofa/students/browser.py:1151 waeup/kofa/students/browser.py:1164
 msgid "Remove selected"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:79
-#: waeup/kofa/applicants/browser.py:125
-#: waeup/kofa/applicants/browser.py:148
-#: waeup/kofa/applicants/browser.py:160
+#: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:125
+#: waeup/kofa/applicants/browser.py:148 waeup/kofa/applicants/browser.py:160
 msgid "Add applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:805
-#: waeup/kofa/students/browser.py:88
+#: waeup/kofa/applicants/browser.py:805 waeup/kofa/students/browser.py:88
 msgid "The requested form is locked (read-only)."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:81
-#: waeup/kofa/applicants/browser.py:139
-#: waeup/kofa/applicants/browser.py:256
-#: waeup/kofa/applicants/browser.py:347
-#: waeup/kofa/browser/pages.py:1355
-#: waeup/kofa/browser/pages.py:1414
-#: waeup/kofa/browser/pages.py:1524
-#: waeup/kofa/browser/pages.py:1610
-#: waeup/kofa/browser/pages.py:1770
-#: waeup/kofa/browser/pages.py:1827
+#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:139
+#: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:347
+#: waeup/kofa/browser/pages.py:1355 waeup/kofa/browser/pages.py:1414
+#: waeup/kofa/browser/pages.py:1524 waeup/kofa/browser/pages.py:1610
+#: waeup/kofa/browser/pages.py:1770 waeup/kofa/browser/pages.py:1827
 msgid "Remove selected local roles"
 msgstr ""
@@ -633,14 +549,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:82
-#: waeup/kofa/applicants/browser.py:135
-#: waeup/kofa/applicants/browser.py:257
-#: waeup/kofa/applicants/browser.py:343
-#: waeup/kofa/browser/pages.py:1356
-#: waeup/kofa/browser/pages.py:1410
-#: waeup/kofa/browser/pages.py:1525
-#: waeup/kofa/browser/pages.py:1606
-#: waeup/kofa/browser/pages.py:1771
-#: waeup/kofa/browser/pages.py:1823
+#: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:135
+#: waeup/kofa/applicants/browser.py:257 waeup/kofa/applicants/browser.py:343
+#: waeup/kofa/browser/pages.py:1356 waeup/kofa/browser/pages.py:1410
+#: waeup/kofa/browser/pages.py:1525 waeup/kofa/browser/pages.py:1606
+#: waeup/kofa/browser/pages.py:1771 waeup/kofa/browser/pages.py:1823
 msgid "Add local role"
 msgstr ""
@@ -654,6 +565,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:858
-#: waeup/kofa/students/browser.py:1619
+#: waeup/kofa/applicants/browser.py:858 waeup/kofa/students/browser.py:1619
 msgid "This form cannot be submitted. Wrong state!"
 msgstr ""
@@ -701,5 +611,7 @@
 
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:59
-msgid "I confirm that the Passport Photograph uploaded on this form is a true picture of me."
+msgid ""
+"I confirm that the Passport Photograph uploaded on this form is a true "
+"picture of me."
 msgstr ""
 
@@ -722,5 +634,7 @@
 
 #: waeup/kofa/applicants/browser_templates/applicantregister.pt:18
-msgid "An account will be created for you and an email with your login credentials will be sent to the address provided."
+msgid ""
+"An account will be created for you and an email with your login credentials "
+"will be sent to the address provided."
 msgstr ""
 
@@ -750,6 +664,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:197
-#: waeup/kofa/students/browser.py:713
+#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:713
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -775,6 +688,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:204
-#: waeup/kofa/students/browser.py:714
+#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:714
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -871,11 +783,11 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:413
-#: waeup/kofa/students/interfaces.py:490
+#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:375
+#: waeup/kofa/interfaces.py:401 waeup/kofa/students/interfaces.py:490
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:418
-#: waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:380
+#: waeup/kofa/interfaces.py:408 waeup/kofa/students/interfaces.py:203
 msgid "Phone"
 msgstr ""
@@ -951,5 +863,7 @@
 #. Default: ""
 #: waeup/kofa/applicants/pdf.py:203
-msgid "<font size=10>Proceed to the login page of the portal and enter your new credentials: user name= ${a}, password = ${b}.</font>"
+msgid ""
+"<font size=10>Proceed to the login page of the portal and enter your new "
+"credentials: user name= ${a}, password = ${b}.</font>"
 msgstr ""
 
@@ -982,17 +896,14 @@
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:151
-#: waeup/kofa/applicants/workflow.py:99
+#: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
 #: waeup/kofa/students/browser.py:258
 msgid "Create student record"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:168
-#: waeup/kofa/students/viewlets.py:300
+#: waeup/kofa/applicants/viewlets.py:168 waeup/kofa/students/viewlets.py:300
 msgid "Download payment receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:183
-#: waeup/kofa/students/viewlets.py:315
+#: waeup/kofa/applicants/viewlets.py:183 waeup/kofa/students/viewlets.py:315
 msgid "Request callback"
 msgstr ""
@@ -1002,25 +913,19 @@
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:73
-#: waeup/kofa/students/viewlets.py:512
+#: waeup/kofa/applicants/viewlets.py:73 waeup/kofa/students/viewlets.py:512
 msgid "My Data"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:100
-#: waeup/kofa/students/workflow.py:25
+#: waeup/kofa/applicants/workflow.py:100 waeup/kofa/students/workflow.py:25
 msgid "Student record created"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:106
-#: waeup/kofa/applicants/workflow.py:113
-#: waeup/kofa/applicants/workflow.py:120
-#: waeup/kofa/applicants/workflow.py:127
+#: waeup/kofa/applicants/workflow.py:106 waeup/kofa/applicants/workflow.py:113
+#: waeup/kofa/applicants/workflow.py:120 waeup/kofa/applicants/workflow.py:127
 msgid "Reset application to started"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:107
-#: waeup/kofa/applicants/workflow.py:114
-#: waeup/kofa/applicants/workflow.py:121
-#: waeup/kofa/applicants/workflow.py:128
+#: waeup/kofa/applicants/workflow.py:107 waeup/kofa/applicants/workflow.py:114
+#: waeup/kofa/applicants/workflow.py:121 waeup/kofa/applicants/workflow.py:128
 #: waeup/kofa/applicants/workflow.py:134
 msgid "Application reset"
@@ -1043,6 +948,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:41
-#: waeup/kofa/interfaces.py:72
+#: waeup/kofa/applicants/workflow.py:41 waeup/kofa/interfaces.py:72
 msgid "admitted"
 msgstr ""
@@ -1052,6 +956,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:43
-#: waeup/kofa/interfaces.py:71
+#: waeup/kofa/applicants/workflow.py:43 waeup/kofa/interfaces.py:71
 msgid "created"
 msgstr ""
@@ -1097,11 +1000,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:85
-#: waeup/kofa/applicants/workflow.py:92
+#: waeup/kofa/applicants/workflow.py:85 waeup/kofa/applicants/workflow.py:92
 msgid "Refuse application"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:86
-#: waeup/kofa/applicants/workflow.py:93
+#: waeup/kofa/applicants/workflow.py:86 waeup/kofa/applicants/workflow.py:93
 msgid "Application refused"
 msgstr ""
@@ -1111,31 +1012,24 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:116
-#: waeup/kofa/browser/viewlets.py:615
+#: waeup/kofa/browser/breadcrumbs.py:116 waeup/kofa/browser/viewlets.py:615
 msgid "Academics"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:123
-#: waeup/kofa/browser/pages.py:309
+#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:309
 msgid "Administration"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:130
-#: waeup/kofa/browser/viewlets.py:360
+#: waeup/kofa/browser/breadcrumbs.py:130 waeup/kofa/browser/viewlets.py:360
 #: waeup/kofa/browser/viewlets.py:666
 msgid "Portal Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:148
-#: waeup/kofa/browser/pages.py:386
-#: waeup/kofa/browser/viewlets.py:375
-#: waeup/kofa/browser/viewlets.py:676
+#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:386
+#: waeup/kofa/browser/viewlets.py:375 waeup/kofa/browser/viewlets.py:676
 msgid "Portal Users"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:155
-#: waeup/kofa/browser/pages.py:748
-#: waeup/kofa/browser/pages.py:1140
-#: waeup/kofa/browser/viewlets.py:393
+#: waeup/kofa/browser/breadcrumbs.py:155 waeup/kofa/browser/pages.py:748
+#: waeup/kofa/browser/pages.py:1140 waeup/kofa/browser/viewlets.py:393
 #: waeup/kofa/browser/viewlets.py:685
 msgid "Data Center"
@@ -1185,8 +1079,6 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:113
-#: waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:287
-#: waeup/kofa/students/browser.py:230
+#: waeup/kofa/browser/pages.py:113 waeup/kofa/hostels/browser.py:256
+#: waeup/kofa/hostels/browser.py:287 waeup/kofa/students/browser.py:230
 msgid "No item selected."
 msgstr ""
@@ -1226,8 +1118,6 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1277
-#: waeup/kofa/browser/pages.py:1293
-#: waeup/kofa/browser/pages.py:1310
-#: waeup/kofa/browser/pages.py:1314
+#: waeup/kofa/browser/pages.py:1277 waeup/kofa/browser/pages.py:1293
+#: waeup/kofa/browser/pages.py:1310 waeup/kofa/browser/pages.py:1314
 msgid "Add faculty"
 msgstr ""
@@ -1237,6 +1127,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1282
-#: waeup/kofa/browser/viewlets.py:441
+#: waeup/kofa/browser/pages.py:1282 waeup/kofa/browser/viewlets.py:441
 msgid "Manage academic section"
 msgstr ""
@@ -1246,18 +1135,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1342
-#: waeup/kofa/browser/pages.py:1352
+#: waeup/kofa/browser/pages.py:1342 waeup/kofa/browser/pages.py:1352
 msgid "Departments"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1354
-#: waeup/kofa/browser/pages.py:1405
-#: waeup/kofa/browser/pages.py:1424
-#: waeup/kofa/browser/pages.py:1428
+#: waeup/kofa/browser/pages.py:1354 waeup/kofa/browser/pages.py:1405
+#: waeup/kofa/browser/pages.py:1424 waeup/kofa/browser/pages.py:1428
 msgid "Add department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1362
-#: waeup/kofa/browser/viewlets.py:457
+#: waeup/kofa/browser/pages.py:1362 waeup/kofa/browser/viewlets.py:457
 msgid "Manage faculty"
 msgstr ""
@@ -1276,13 +1161,10 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1485
-#: waeup/kofa/browser/pages.py:1504
-#: waeup/kofa/students/browser.py:96
-#: waeup/kofa/students/viewlets.py:472
+#: waeup/kofa/browser/pages.py:1485 waeup/kofa/browser/pages.py:1504
+#: waeup/kofa/students/browser.py:96 waeup/kofa/students/viewlets.py:472
 msgid "Students"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:152
-#: waeup/kofa/browser/viewlets.py:322
+#: waeup/kofa/browser/pages.py:152 waeup/kofa/browser/viewlets.py:322
 #: waeup/kofa/browser/templates/staffsitelayout.pt:28
 #: waeup/kofa/browser/templates/studentsitelayout.pt:33
@@ -1290,30 +1172,23 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1521
-#: waeup/kofa/browser/pages.py:1579
+#: waeup/kofa/browser/pages.py:1521 waeup/kofa/browser/pages.py:1579
 msgid "Remove selected courses"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1521
-#: waeup/kofa/browser/pages.py:1591
-#: waeup/kofa/browser/pages.py:1620
-#: waeup/kofa/browser/pages.py:1624
+#: waeup/kofa/browser/pages.py:1521 waeup/kofa/browser/pages.py:1591
+#: waeup/kofa/browser/pages.py:1620 waeup/kofa/browser/pages.py:1624
 msgid "Add course"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1522
-#: waeup/kofa/browser/pages.py:1585
+#: waeup/kofa/browser/pages.py:1522 waeup/kofa/browser/pages.py:1585
 msgid "Remove selected certificates"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1522
-#: waeup/kofa/browser/pages.py:1596
-#: waeup/kofa/browser/pages.py:1657
-#: waeup/kofa/browser/pages.py:1661
+#: waeup/kofa/browser/pages.py:1522 waeup/kofa/browser/pages.py:1596
+#: waeup/kofa/browser/pages.py:1657 waeup/kofa/browser/pages.py:1661
 msgid "Add certificate"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1531
-#: waeup/kofa/browser/viewlets.py:464
+#: waeup/kofa/browser/pages.py:1531 waeup/kofa/browser/viewlets.py:464
 msgid "Manage department"
 msgstr ""
@@ -1341,6 +1216,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1711
-#: waeup/kofa/browser/viewlets.py:481
+#: waeup/kofa/browser/pages.py:1711 waeup/kofa/browser/viewlets.py:481
 msgid "Edit course"
 msgstr ""
@@ -1350,18 +1224,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1768
-#: waeup/kofa/browser/pages.py:1799
-#: waeup/kofa/browser/pages.py:1840
-#: waeup/kofa/browser/pages.py:1842
+#: waeup/kofa/browser/pages.py:1768 waeup/kofa/browser/pages.py:1799
+#: waeup/kofa/browser/pages.py:1840 waeup/kofa/browser/pages.py:1842
 msgid "Add course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1769
-#: waeup/kofa/browser/pages.py:1794
+#: waeup/kofa/browser/pages.py:1769 waeup/kofa/browser/pages.py:1794
 msgid "Remove selected course referrers"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1775
-#: waeup/kofa/browser/viewlets.py:488
+#: waeup/kofa/browser/pages.py:1775 waeup/kofa/browser/viewlets.py:488
 msgid "Manage certificate"
 msgstr ""
@@ -1380,6 +1250,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1888
-#: waeup/kofa/browser/viewlets.py:505
+#: waeup/kofa/browser/pages.py:1888 waeup/kofa/browser/viewlets.py:505
 msgid "Edit course referrer"
 msgstr ""
@@ -1398,13 +1267,10 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:234
-#: waeup/kofa/browser/pages.py:519
+#: waeup/kofa/browser/pages.py:234 waeup/kofa/browser/pages.py:519
 msgid "Send message now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:253
-#: waeup/kofa/browser/pages.py:272
-#: waeup/kofa/browser/pages.py:536
-#: waeup/kofa/students/browser.py:320
+#: waeup/kofa/browser/pages.py:253 waeup/kofa/browser/pages.py:272
+#: waeup/kofa/browser/pages.py:536 waeup/kofa/students/browser.py:320
 msgid "Your message has been sent."
 msgstr ""
@@ -1422,16 +1288,12 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:387
-#: waeup/kofa/hostels/browser.py:195
-#: waeup/kofa/students/viewlets.py:163
-#: waeup/kofa/students/viewlets.py:171
-#: waeup/kofa/students/viewlets.py:226
-#: waeup/kofa/students/viewlets.py:243
+#: waeup/kofa/browser/pages.py:387 waeup/kofa/hostels/browser.py:195
+#: waeup/kofa/students/viewlets.py:163 waeup/kofa/students/viewlets.py:171
+#: waeup/kofa/students/viewlets.py:226 waeup/kofa/students/viewlets.py:243
 #: waeup/kofa/students/viewlets.py:283
 msgid "Manage"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:388
-#: waeup/kofa/browser/viewlets.py:180
+#: waeup/kofa/browser/pages.py:388 waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
 msgstr ""
@@ -1442,6 +1304,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:426
-#: waeup/kofa/browser/pages.py:428
+#: waeup/kofa/browser/pages.py:426 waeup/kofa/browser/pages.py:428
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
@@ -1463,16 +1324,13 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:517
-#: waeup/kofa/students/browser.py:301
+#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:301
 msgid "Send message to ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:546
-#: waeup/kofa/browser/viewlets.py:400
+#: waeup/kofa/browser/pages.py:546 waeup/kofa/browser/viewlets.py:400
 msgid "My Preferences"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:559
-#: waeup/kofa/browser/viewlets.py:415
+#: waeup/kofa/browser/pages.py:559 waeup/kofa/browser/viewlets.py:415
 msgid "My Roles"
 msgstr ""
@@ -1490,17 +1348,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:631
-#: waeup/kofa/browser/pages.py:680
+#: waeup/kofa/browser/pages.py:631 waeup/kofa/browser/pages.py:680
 msgid "Update plugins"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:633
-#: waeup/kofa/browser/pages.py:661
+#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:661
 #: waeup/kofa/browser/pages.py:692
 msgid "Add session configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:658
-#: waeup/kofa/browser/pages.py:731
+#: waeup/kofa/browser/pages.py:658 waeup/kofa/browser/pages.py:731
 msgid "Settings have been saved."
 msgstr ""
@@ -1536,13 +1391,10 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:803
-#: waeup/kofa/browser/pages.py:833
-#: waeup/kofa/browser/pages.py:953
-#: waeup/kofa/browser/pages.py:1061
+#: waeup/kofa/browser/pages.py:803 waeup/kofa/browser/pages.py:833
+#: waeup/kofa/browser/pages.py:953 waeup/kofa/browser/pages.py:1061
 msgid "Process CSV file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:817
-#: waeup/kofa/browser/pages.py:918
+#: waeup/kofa/browser/pages.py:817 waeup/kofa/browser/pages.py:918
 #: waeup/kofa/browser/pages.py:1037
 msgid "Import aborted."
@@ -1573,6 +1425,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:956
-#: waeup/kofa/browser/pages.py:1182
+#: waeup/kofa/browser/pages.py:956 waeup/kofa/browser/pages.py:1182
 msgid "Reset"
 msgstr ""
@@ -1652,5 +1503,7 @@
 
 #: waeup/kofa/browser/templates/datacenterimport1page.pt:2
-msgid "Using batch processing you can mass-create, mass-update, or mass-remove datasets from the database using CSV files."
+msgid ""
+"Using batch processing you can mass-create, mass-update, or mass-remove "
+"datasets from the database using CSV files."
 msgstr ""
 
@@ -1672,5 +1525,7 @@
 
 #: waeup/kofa/browser/templates/datacenterimport2page.pt:8
-msgid "Please select a file-processor and a processing-mode from the selections below."
+msgid ""
+"Please select a file-processor and a processing-mode from the selections "
+"below."
 msgstr ""
 
@@ -1745,5 +1600,7 @@
 
 #: waeup/kofa/browser/templates/datacenterpage.pt:1
-msgid "The data center helps you to manage portal data. You can upload CSV files here, which will be available for import afterwards."
+msgid ""
+"The data center helps you to manage portal data. You can upload CSV files "
+"here, which will be available for import afterwards."
 msgstr ""
 
@@ -1784,13 +1641,4 @@
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:7
 msgid "Settings"
-msgstr ""
-
-#: waeup/kofa/browser/templates/departmentmanagepage.pt:97
-#: waeup/kofa/browser/templates/userscontainerpage.pt:4
-#: waeup/kofa/browser/templates/facultymanagepage.pt:71
-#: waeup/kofa/browser/templates/certificatemanagepage.pt:88
-#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:89
-#: waeup/kofa/applicants/browser_templates/applicantsrootmanagepage.pt:56
-msgid "User Id"
 msgstr ""
 
@@ -1892,12 +1740,17 @@
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:113
-#: waeup/kofa/browser/templates/studentsitelayout.pt:99
-msgid "Back to top"
-msgstr ""
-
 #: waeup/kofa/browser/templates/staffsitelayout.pt:114
 #: waeup/kofa/browser/templates/studentsitelayout.pt:100
-msgid "Student Information and Registration Portal<br /> Copyright &copy; WAeUP Group, 2008-2012"
+msgid "Back to top"
+msgstr ""
+
+#: waeup/kofa/browser/templates/staffsitelayout.pt:116
+#: waeup/kofa/browser/templates/studentsitelayout.pt:102
+msgid "Kofa - Student Management System"
+msgstr ""
+
+#: waeup/kofa/browser/templates/staffsitelayout.pt:119
+#: waeup/kofa/browser/templates/studentsitelayout.pt:105
+msgid "Copyright &copy; WAeUP Group 2008-2012"
 msgstr ""
 
@@ -1935,6 +1788,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:383
-#: waeup/kofa/students/viewlets.py:155
+#: waeup/kofa/browser/viewlets.py:383 waeup/kofa/students/viewlets.py:155
 msgid "Send email"
 msgstr ""
@@ -1948,11 +1800,9 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:473
-#: waeup/kofa/browser/viewlets.py:497
+#: waeup/kofa/browser/viewlets.py:473 waeup/kofa/browser/viewlets.py:497
 msgid "Show students"
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:528
-#: waeup/kofa/browser/viewlets.py:536
+#: waeup/kofa/browser/viewlets.py:528 waeup/kofa/browser/viewlets.py:536
 msgid "Show batch logs"
 msgstr ""
@@ -1970,8 +1820,6 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:91
-#: waeup/kofa/browser/viewlets.py:160
-#: waeup/kofa/students/viewlets.py:218
-#: waeup/kofa/students/viewlets.py:403
+#: waeup/kofa/browser/viewlets.py:91 waeup/kofa/browser/viewlets.py:160
+#: waeup/kofa/students/viewlets.py:218 waeup/kofa/students/viewlets.py:403
 msgid "Edit"
 msgstr ""
@@ -1981,11 +1829,9 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:113
-#: waeup/kofa/hostels/browser.py:123
+#: waeup/kofa/hostels/browser.py:113 waeup/kofa/hostels/browser.py:123
 msgid "Manage accommodation section"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:145
-#: waeup/kofa/hostels/browser.py:158
+#: waeup/kofa/hostels/browser.py:145 waeup/kofa/hostels/browser.py:158
 msgid "Add hostel"
 msgstr ""
@@ -2007,16 +1853,13 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:210
-#: waeup/kofa/hostels/browser.py:236
+#: waeup/kofa/hostels/browser.py:210 waeup/kofa/hostels/browser.py:236
 msgid "Update all beds"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:211
-#: waeup/kofa/hostels/browser.py:250
+#: waeup/kofa/hostels/browser.py:211 waeup/kofa/hostels/browser.py:250
 msgid "Switch reservation of selected beds"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:212
-#: waeup/kofa/hostels/browser.py:281
+#: waeup/kofa/hostels/browser.py:212 waeup/kofa/hostels/browser.py:281
 msgid "Release selected beds"
 msgstr ""
@@ -2024,5 +1867,6 @@
 #. Default: ""
 #: waeup/kofa/hostels/browser.py:241
-msgid "${a} empty beds removed, ${b} beds added, ${c} occupied beds modified (${d})"
+msgid ""
+"${a} empty beds removed, ${b} beds added, ${c} occupied beds modified (${d})"
 msgstr ""
 
@@ -2045,6 +1889,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:68
-#: waeup/kofa/hostels/browser.py:78
+#: waeup/kofa/hostels/browser.py:68 waeup/kofa/hostels/browser.py:78
 msgid "Hostels"
 msgstr ""
@@ -2113,6 +1956,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/interfaces.py:175
-#: waeup/kofa/students/interfaces.py:427
+#: waeup/kofa/hostels/interfaces.py:175 waeup/kofa/students/interfaces.py:427
 msgid "Bed Type"
 msgstr ""
@@ -2122,6 +1964,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/interfaces.py:186
-#: waeup/kofa/hostels/interfaces.py:199
+#: waeup/kofa/hostels/interfaces.py:186 waeup/kofa/hostels/interfaces.py:199
 msgid "Owner (Student)"
 msgstr ""
@@ -2279,4 +2120,145 @@
 msgstr ""
 
+#: waeup/kofa/interfaces.py:306
+msgid "Importer name"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:310
+msgid "Import mode"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:335
+msgid "Email Address:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:342
+msgid "Email to:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:349
+msgid "Subject:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:353
+msgid "Full Name:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:357
+msgid "Text:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:388
+#: waeup/kofa/browser/templates/departmentmanagepage.pt:97
+#: waeup/kofa/browser/templates/userscontainerpage.pt:4
+#: waeup/kofa/browser/templates/facultymanagepage.pt:71
+#: waeup/kofa/browser/templates/certificatemanagepage.pt:88
+#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:89
+#: waeup/kofa/applicants/browser_templates/applicantsrootmanagepage.pt:56
+msgid "User Id"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:393
+#: waeup/kofa/students/browser_templates/containerpage.pt:33
+#: waeup/kofa/students/browser_templates/containermanagepage.pt:39
+#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:44
+msgid "Full Name"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:397
+msgid "Description/Notice"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:414
+msgid "Portal roles"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:457
+msgid "Name of University"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:458
+msgid "Sample University"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:463
+msgid "Abbreviated Title of University"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:469
+msgid "Skin"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:476
+msgid "Content in reST format"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:488
+msgid "Accommodation Booking Session"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:496
+msgid "Allowed States for Accommodation Booking"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:504
+msgid "Name of Administrator"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:510
+msgid "Email Address of Administrator"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:517
+msgid "Subject of Email to Administrator"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:518
+msgid "Kofa Contact"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:523
+msgid "SMTP mailer to use when sending mail"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:530
+msgid "Captcha used for public registration pages"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:537
+msgid "Carry-over Course Registration"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:546 waeup/kofa/interfaces.py:598
+msgid "Academic Session"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:554 waeup/kofa/payments/interfaces.py:30
+msgid "School Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:559 waeup/kofa/payments/interfaces.py:106
+msgid "Surcharge 1"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:564 waeup/kofa/payments/interfaces.py:113
+msgid "Surcharge 2"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:569 waeup/kofa/payments/interfaces.py:120
+msgid "Surcharge 3"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:574
+msgid "Clearance Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:579
+msgid "Booking Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:584 waeup/kofa/payments/interfaces.py:36
+msgid "Acceptance Fee"
+msgstr ""
+
 #: waeup/kofa/interfaces.py:73
 msgid "clearance started"
@@ -2343,16 +2325,4 @@
 msgstr ""
 
-#: waeup/kofa/payments/interfaces.py:106
-msgid "Surcharge 1"
-msgstr ""
-
-#: waeup/kofa/payments/interfaces.py:113
-msgid "Surcharge 2"
-msgstr ""
-
-#: waeup/kofa/payments/interfaces.py:120
-msgid "Surcharge 3"
-msgstr ""
-
 #: waeup/kofa/payments/interfaces.py:133
 msgid "Activation Code"
@@ -2391,8 +2361,4 @@
 msgstr ""
 
-#: waeup/kofa/payments/interfaces.py:30
-msgid "School Fee"
-msgstr ""
-
 #: waeup/kofa/payments/interfaces.py:31
 msgid "Clearance"
@@ -2413,8 +2379,4 @@
 #: waeup/kofa/payments/interfaces.py:35
 msgid "Gown"
-msgstr ""
-
-#: waeup/kofa/payments/interfaces.py:36
-msgid "Acceptance Fee"
 msgstr ""
 
@@ -2450,6 +2412,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1003
-#: waeup/kofa/students/browser.py:1225
+#: waeup/kofa/students/browser.py:1003 waeup/kofa/students/browser.py:1225
 msgid "Your current session does not match accommodation session."
 msgstr ""
@@ -2460,6 +2421,5 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1085
-#: waeup/kofa/students/browser.py:1093
+#: waeup/kofa/students/browser.py:1085 waeup/kofa/students/browser.py:1093
 #: waeup/kofa/students/browser.py:1101
 msgid "Valid callback received. ${a}"
@@ -2475,6 +2435,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:117
-#: waeup/kofa/students/viewlets.py:114
+#: waeup/kofa/students/browser.py:117 waeup/kofa/students/viewlets.py:114
 #: waeup/kofa/students/viewlets.py:534
 msgid "Study Course"
@@ -2501,6 +2460,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:123
-#: waeup/kofa/students/viewlets.py:120
+#: waeup/kofa/students/browser.py:123 waeup/kofa/students/viewlets.py:120
 #: waeup/kofa/students/viewlets.py:535
 msgid "Payments"
@@ -2511,6 +2469,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1241
-#: waeup/kofa/students/browser.py:1537
+#: waeup/kofa/students/browser.py:1241 waeup/kofa/students/browser.py:1537
 #: waeup/kofa/students/browser.py:1650
 msgid "Activation code is invalid."
@@ -2518,24 +2475,19 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1261
-#: waeup/kofa/students/browser.py:1389
+#: waeup/kofa/students/browser.py:1261 waeup/kofa/students/browser.py:1389
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1266
-#: waeup/kofa/students/browser.py:1542
+#: waeup/kofa/students/browser.py:1266 waeup/kofa/students/browser.py:1542
 #: waeup/kofa/students/browser.py:1655
 msgid "Activation code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1269
-#: waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1658
-#: waeup/kofa/students/browser.py:1917
+#: waeup/kofa/students/browser.py:1269 waeup/kofa/students/browser.py:1545
+#: waeup/kofa/students/browser.py:1658 waeup/kofa/students/browser.py:1917
 msgid "invalidated"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1274
-#: waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1274 waeup/kofa/students/browser.py:1549
 #: waeup/kofa/students/browser.py:1663
 msgid "You are not the owner of this access code."
@@ -2543,6 +2495,5 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1285
-#: waeup/kofa/students/browser.py:1403
+#: waeup/kofa/students/browser.py:1285 waeup/kofa/students/browser.py:1403
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
@@ -2574,6 +2525,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:138
-#: waeup/kofa/students/viewlets.py:126
+#: waeup/kofa/students/browser.py:138 waeup/kofa/students/viewlets.py:126
 msgid "Accommodation"
 msgstr ""
@@ -2589,11 +2539,9 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1441
-#: waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/browser.py:1441 waeup/kofa/students/viewlets.py:356
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1456
-#: waeup/kofa/students/viewlets.py:365
+#: waeup/kofa/students/browser.py:1456 waeup/kofa/students/viewlets.py:365
 msgid "Change password"
 msgstr ""
@@ -2612,6 +2560,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1497
-#: waeup/kofa/students/viewlets.py:389
+#: waeup/kofa/students/browser.py:1497 waeup/kofa/students/viewlets.py:389
 #: waeup/kofa/students/workflow.py:44
 msgid "Start clearance"
@@ -2622,6 +2569,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1518
-#: waeup/kofa/students/browser.py:1639
+#: waeup/kofa/students/browser.py:1518 waeup/kofa/students/browser.py:1639
 msgid "Wrong state"
 msgstr ""
@@ -2643,6 +2589,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1577
-#: waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1577 waeup/kofa/students/browser.py:1591
 msgid "Clearance form has been saved."
 msgstr ""
@@ -2652,6 +2597,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1600
-#: waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1600 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
@@ -2673,6 +2617,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1631
-#: waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:1631 waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr ""
@@ -2728,6 +2671,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:186
-#: waeup/kofa/students/browser.py:222
+#: waeup/kofa/students/browser.py:186 waeup/kofa/students/browser.py:222
 msgid "Empty search string"
 msgstr ""
@@ -2772,16 +2714,13 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:204
-#: waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:204 waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:228
-#: waeup/kofa/students/browser.py:1888
+#: waeup/kofa/students/browser.py:228 waeup/kofa/students/browser.py:1888
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:255
-#: waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:255 waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr ""
@@ -2796,6 +2735,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:322
-#: waeup/kofa/students/browser.py:1865
+#: waeup/kofa/students/browser.py:322 waeup/kofa/students/browser.py:1865
 msgid "An smtp server error occurred."
 msgstr ""
@@ -2810,6 +2748,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:418
-#: waeup/kofa/students/viewlets.py:104
+#: waeup/kofa/students/browser.py:418 waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
@@ -2829,6 +2766,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:475
-#: waeup/kofa/students/browser.py:499
+#: waeup/kofa/students/browser.py:475 waeup/kofa/students/browser.py:499
 msgid "Student is in wrong state."
 msgstr ""
@@ -2860,11 +2796,9 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:585
-#: waeup/kofa/students/browser.py:626
+#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:626
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:586
-#: waeup/kofa/students/browser.py:612
+#: waeup/kofa/students/browser.py:586 waeup/kofa/students/browser.py:612
 msgid "Add study level"
 msgstr ""
@@ -2874,6 +2808,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:622
-#: waeup/kofa/students/browser.py:1708
+#: waeup/kofa/students/browser.py:622 waeup/kofa/students/browser.py:1708
 msgid "This level exists."
 msgstr ""
@@ -2930,6 +2863,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:719
-#: waeup/kofa/students/interfaces.py:370
+#: waeup/kofa/students/browser.py:719 waeup/kofa/students/interfaces.py:370
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2938,10 +2870,7 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:747
-#: waeup/kofa/students/browser.py:776
-#: waeup/kofa/students/browser.py:861
-#: waeup/kofa/students/browser.py:866
-#: waeup/kofa/students/browser.py:1748
-#: waeup/kofa/students/browser.py:1798
+#: waeup/kofa/students/browser.py:747 waeup/kofa/students/browser.py:776
+#: waeup/kofa/students/browser.py:861 waeup/kofa/students/browser.py:866
+#: waeup/kofa/students/browser.py:1748 waeup/kofa/students/browser.py:1798
 msgid "Add course ticket"
 msgstr ""
@@ -2952,11 +2881,9 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:786
-#: waeup/kofa/students/browser.py:1758
+#: waeup/kofa/students/browser.py:786 waeup/kofa/students/browser.py:1758
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:810
-#: waeup/kofa/students/browser.py:832
+#: waeup/kofa/students/browser.py:810 waeup/kofa/students/browser.py:832
 msgid "This level does not correspond current level."
 msgstr ""
@@ -2966,6 +2893,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:816
-#: waeup/kofa/students/browser.py:844
+#: waeup/kofa/students/browser.py:816 waeup/kofa/students/browser.py:844
 msgid "Student is in the wrong state."
 msgstr ""
@@ -2979,12 +2905,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:881
-#: waeup/kofa/students/browser.py:1811
+#: waeup/kofa/students/browser.py:881 waeup/kofa/students/browser.py:1811
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:883
-#: waeup/kofa/students/browser.py:1813
+#: waeup/kofa/students/browser.py:883 waeup/kofa/students/browser.py:1813
 msgid "Successfully added ${a}."
 msgstr ""
@@ -3078,10 +3002,4 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/containerpage.pt:33
-#: waeup/kofa/students/browser_templates/containermanagepage.pt:39
-#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:44
-msgid "Full Name"
-msgstr ""
-
 #: waeup/kofa/students/browser_templates/containerpage.pt:5
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:5
@@ -3115,5 +3033,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/students/browser_templates/imageupload.pt:21
 #: waeup/kofa/students/browser_templates/fileupload.pt:27
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
@@ -3154,5 +3072,11 @@
 
 #: waeup/kofa/students/browser_templates/setpassword.pt:33
-msgid "<li> Acquire a password access code (PWD). </li> <li> Enter your (JAMB) registration number and the access code. </li> <li> After pressing the button, your student id will be displayed and your password set. The 10-digit part of the access code just used is your new password. </li> <li> Go to the <strong><a href=\"login\">general login page</a></strong> and enter your new credentials. </li>"
+msgid ""
+"<li> Acquire a password access code (PWD). </li> <li> Enter your (JAMB) "
+"registration number and the access code. </li> <li> After pressing the "
+"button, your student id will be displayed and your password set. The 10-"
+"digit part of the access code just used is your new password. </li> <li> Go "
+"to the <strong><a href=\"login\">general login page</a></strong> and enter "
+"your new credentials. </li>"
 msgstr ""
 
@@ -3238,12 +3162,10 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:176
-#: waeup/kofa/students/interfaces.py:255
+#: waeup/kofa/students/interfaces.py:176 waeup/kofa/students/interfaces.py:255
 #: waeup/kofa/students/interfaces.py:483
 msgid "Registration Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:183
-#: waeup/kofa/students/interfaces.py:265
+#: waeup/kofa/students/interfaces.py:183 waeup/kofa/students/interfaces.py:265
 msgid "Matriculation Number"
 msgstr ""
@@ -3304,6 +3226,5 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:337
-#: waeup/kofa/students/interfaces.py:434
+#: waeup/kofa/students/interfaces.py:337 waeup/kofa/students/interfaces.py:434
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3355,6 +3276,5 @@
 msgstr ""
 
-#: waeup/kofa/students/utils.py:280
-#: waeup/kofa/students/viewlets.py:71
+#: waeup/kofa/students/utils.py:280 waeup/kofa/students/viewlets.py:71
 #: waeup/kofa/students/viewlets.py:99
 #: waeup/kofa/students/browser_templates/basemanagepage.pt:6
@@ -3366,17 +3286,14 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:109
-#: waeup/kofa/students/viewlets.py:533
+#: waeup/kofa/students/viewlets.py:109 waeup/kofa/students/viewlets.py:533
 msgid "Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:131
-#: waeup/kofa/students/viewlets.py:537
+#: waeup/kofa/students/viewlets.py:131 waeup/kofa/students/viewlets.py:537
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:27
 msgid "History"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:179
-#: waeup/kofa/students/workflow.py:72
+#: waeup/kofa/students/viewlets.py:179 waeup/kofa/students/workflow.py:72
 msgid "Clear student"
 msgstr ""
@@ -3394,6 +3311,5 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:251
-#: waeup/kofa/students/workflow.py:128
+#: waeup/kofa/students/viewlets.py:251 waeup/kofa/students/workflow.py:128
 msgid "Validate courses"
 msgstr ""
@@ -3495,21 +3411,17 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:703
-#: waeup/kofa/students/viewlets.py:714
+#: waeup/kofa/students/viewlets.py:703 waeup/kofa/students/viewlets.py:714
 msgid "Birth Certificate"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:704
-#: waeup/kofa/students/viewlets.py:715
+#: waeup/kofa/students/viewlets.py:704 waeup/kofa/students/viewlets.py:715
 msgid "Birth Certificate Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:724
-#: waeup/kofa/students/viewlets.py:735
+#: waeup/kofa/students/viewlets.py:724 waeup/kofa/students/viewlets.py:735
 msgid "Acceptance Letter"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:725
-#: waeup/kofa/students/viewlets.py:736
+#: waeup/kofa/students/viewlets.py:725 waeup/kofa/students/viewlets.py:736
 msgid "Acceptance Letter Scan"
 msgstr ""
@@ -3573,11 +3485,9 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:121
-#: waeup/kofa/students/workflow.py:135
+#: waeup/kofa/students/workflow.py:121 waeup/kofa/students/workflow.py:135
 msgid "Reset to paid"
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:122
-#: waeup/kofa/students/workflow.py:136
+#: waeup/kofa/students/workflow.py:122 waeup/kofa/students/workflow.py:136
 msgid "Student record reset to 'paid'"
 msgstr ""
@@ -3639,11 +3549,9 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:65
-#: waeup/kofa/students/workflow.py:79
+#: waeup/kofa/students/workflow.py:65 waeup/kofa/students/workflow.py:79
 msgid "Reset to clearance"
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:66
-#: waeup/kofa/students/workflow.py:80
+#: waeup/kofa/students/workflow.py:66 waeup/kofa/students/workflow.py:80
 msgid "Student record reset to 'clearance'"
 msgstr ""
@@ -3653,11 +3561,9 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:86
-#: waeup/kofa/students/workflow.py:100
+#: waeup/kofa/students/workflow.py:86 waeup/kofa/students/workflow.py:100
 msgid "Pay school fee"
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:87
-#: waeup/kofa/students/workflow.py:101
+#: waeup/kofa/students/workflow.py:87 waeup/kofa/students/workflow.py:101
 msgid "School fee paid"
 msgstr ""
@@ -3787,5 +3693,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:119
+#: waeup/kofa/utils/utils.py:122
 msgid ""
 "Fullname: ${a}\n"
@@ -3797,5 +3703,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:164
+#: waeup/kofa/utils/utils.py:167
 msgid ""
 "Dear ${a},\n"
@@ -3825,3 +3731,2 @@
 msgid "remove-selected-items"
 msgstr ""
-
Index: /main/waeup.kofa/trunk/src/waeup/kofa/locales/waeup.kofa.pot
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/locales/waeup.kofa.pot	(revision 7827)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/waeup.kofa.pot	(revision 7828)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Thu Mar  8 23:29:25 2012\n"
+"POT-Creation-Date: Fri Mar  9 23:09:56 2012\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -868,4 +868,6 @@
 
 #: waeup/kofa/applicants/interfaces.py:413
+#: waeup/kofa/interfaces.py:375
+#: waeup/kofa/interfaces.py:401
 #: waeup/kofa/students/interfaces.py:490
 msgid "Email Address"
@@ -873,4 +875,6 @@
 
 #: waeup/kofa/applicants/interfaces.py:418
+#: waeup/kofa/interfaces.py:380
+#: waeup/kofa/interfaces.py:408
 #: waeup/kofa/students/interfaces.py:203
 msgid "Phone"
@@ -1780,13 +1784,4 @@
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:7
 msgid "Settings"
-msgstr ""
-
-#: waeup/kofa/browser/templates/departmentmanagepage.pt:97
-#: waeup/kofa/browser/templates/userscontainerpage.pt:4
-#: waeup/kofa/browser/templates/facultymanagepage.pt:71
-#: waeup/kofa/browser/templates/certificatemanagepage.pt:88
-#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:89
-#: waeup/kofa/applicants/browser_templates/applicantsrootmanagepage.pt:56
-msgid "User Id"
 msgstr ""
 
@@ -1888,12 +1883,17 @@
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:113
-#: waeup/kofa/browser/templates/studentsitelayout.pt:99
-msgid "Back to top"
-msgstr ""
-
 #: waeup/kofa/browser/templates/staffsitelayout.pt:114
 #: waeup/kofa/browser/templates/studentsitelayout.pt:100
-msgid "Student Information and Registration Portal<br /> Copyright &copy; WAeUP Group, 2008-2012"
+msgid "Back to top"
+msgstr ""
+
+#: waeup/kofa/browser/templates/staffsitelayout.pt:116
+#: waeup/kofa/browser/templates/studentsitelayout.pt:102
+msgid "Kofa - Student Management System"
+msgstr ""
+
+#: waeup/kofa/browser/templates/staffsitelayout.pt:119
+#: waeup/kofa/browser/templates/studentsitelayout.pt:105
+msgid "Copyright &copy; WAeUP Group 2008-2012"
 msgstr ""
 
@@ -2275,4 +2275,151 @@
 msgstr ""
 
+#: waeup/kofa/interfaces.py:306
+msgid "Importer name"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:310
+msgid "Import mode"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:335
+msgid "Email Address:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:342
+msgid "Email to:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:349
+msgid "Subject:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:353
+msgid "Full Name:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:357
+msgid "Text:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:388
+#: waeup/kofa/browser/templates/departmentmanagepage.pt:97
+#: waeup/kofa/browser/templates/userscontainerpage.pt:4
+#: waeup/kofa/browser/templates/facultymanagepage.pt:71
+#: waeup/kofa/browser/templates/certificatemanagepage.pt:88
+#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:89
+#: waeup/kofa/applicants/browser_templates/applicantsrootmanagepage.pt:56
+msgid "User Id"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:393
+#: waeup/kofa/students/browser_templates/containerpage.pt:33
+#: waeup/kofa/students/browser_templates/containermanagepage.pt:39
+#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:44
+msgid "Full Name"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:397
+msgid "Description/Notice"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:414
+msgid "Portal roles"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:457
+msgid "Name of University"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:458
+msgid "Sample University"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:463
+msgid "Abbreviated Title of University"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:469
+msgid "Skin"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:476
+msgid "Content in reST format"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:488
+msgid "Accommodation Booking Session"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:496
+msgid "Allowed States for Accommodation Booking"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:504
+msgid "Name of Administrator"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:510
+msgid "Email Address of Administrator"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:517
+msgid "Subject of Email to Administrator"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:518
+msgid "Kofa Contact"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:523
+msgid "SMTP mailer to use when sending mail"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:530
+msgid "Captcha used for public registration pages"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:537
+msgid "Carry-over Course Registration"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:546
+#: waeup/kofa/interfaces.py:598
+msgid "Academic Session"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:554
+#: waeup/kofa/payments/interfaces.py:30
+msgid "School Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:559
+#: waeup/kofa/payments/interfaces.py:106
+msgid "Surcharge 1"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:564
+#: waeup/kofa/payments/interfaces.py:113
+msgid "Surcharge 2"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:569
+#: waeup/kofa/payments/interfaces.py:120
+msgid "Surcharge 3"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:574
+msgid "Clearance Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:579
+msgid "Booking Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:584
+#: waeup/kofa/payments/interfaces.py:36
+msgid "Acceptance Fee"
+msgstr ""
+
 #: waeup/kofa/interfaces.py:73
 msgid "clearance started"
@@ -2339,16 +2486,4 @@
 msgstr ""
 
-#: waeup/kofa/payments/interfaces.py:106
-msgid "Surcharge 1"
-msgstr ""
-
-#: waeup/kofa/payments/interfaces.py:113
-msgid "Surcharge 2"
-msgstr ""
-
-#: waeup/kofa/payments/interfaces.py:120
-msgid "Surcharge 3"
-msgstr ""
-
 #: waeup/kofa/payments/interfaces.py:133
 msgid "Activation Code"
@@ -2387,8 +2522,4 @@
 msgstr ""
 
-#: waeup/kofa/payments/interfaces.py:30
-msgid "School Fee"
-msgstr ""
-
 #: waeup/kofa/payments/interfaces.py:31
 msgid "Clearance"
@@ -2409,8 +2540,4 @@
 #: waeup/kofa/payments/interfaces.py:35
 msgid "Gown"
-msgstr ""
-
-#: waeup/kofa/payments/interfaces.py:36
-msgid "Acceptance Fee"
 msgstr ""
 
@@ -3074,10 +3201,4 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/containerpage.pt:33
-#: waeup/kofa/students/browser_templates/containermanagepage.pt:39
-#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:44
-msgid "Full Name"
-msgstr ""
-
 #: waeup/kofa/students/browser_templates/containerpage.pt:5
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:5
@@ -3111,5 +3232,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/students/browser_templates/imageupload.pt:21
 #: waeup/kofa/students/browser_templates/fileupload.pt:27
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
@@ -3783,5 +3904,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:119
+#: waeup/kofa/utils/utils.py:122
 msgid ""
 "Fullname: ${a}\n"
@@ -3793,5 +3914,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:164
+#: waeup/kofa/utils/utils.py:167
 msgid ""
 "Dear ${a},\n"
Index: /main/waeup.kofa/trunk/src/waeup/kofa/locales/yo/LC_MESSAGES/waeup.kofa.po
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/locales/yo/LC_MESSAGES/waeup.kofa.po	(revision 7827)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/yo/LC_MESSAGES/waeup.kofa.po	(revision 7828)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.Kofa\n"
-"POT-Creation-Date: Thu Mar  8 23:29:25 2012\n"
+"POT-Creation-Date: Fri Mar  9 23:09:56 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -28,44 +28,24 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: waeup/kofa/accesscodes/browser.py:100
-#: waeup/kofa/accesscodes/browser.py:113
-#: waeup/kofa/applicants/browser.py:80
-#: waeup/kofa/applicants/browser.py:130
-#: waeup/kofa/applicants/browser.py:182
-#: waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:338
-#: waeup/kofa/browser/pages.py:503
-#: waeup/kofa/browser/pages.py:708
-#: waeup/kofa/browser/pages.py:735
-#: waeup/kofa/browser/pages.py:758
-#: waeup/kofa/browser/pages.py:805
-#: waeup/kofa/browser/pages.py:835
-#: waeup/kofa/browser/pages.py:955
-#: waeup/kofa/browser/pages.py:1183
-#: waeup/kofa/browser/pages.py:1277
-#: waeup/kofa/browser/pages.py:1298
-#: waeup/kofa/browser/pages.py:1325
-#: waeup/kofa/browser/pages.py:1353
-#: waeup/kofa/browser/pages.py:1354
-#: waeup/kofa/browser/pages.py:1400
-#: waeup/kofa/browser/pages.py:1441
-#: waeup/kofa/browser/pages.py:1520
-#: waeup/kofa/browser/pages.py:1521
-#: waeup/kofa/browser/pages.py:1523
-#: waeup/kofa/browser/pages.py:1601
-#: waeup/kofa/browser/pages.py:1646
-#: waeup/kofa/browser/pages.py:1684
-#: waeup/kofa/browser/pages.py:1728
-#: waeup/kofa/browser/pages.py:1767
-#: waeup/kofa/browser/pages.py:1769
-#: waeup/kofa/browser/pages.py:1804
-#: waeup/kofa/browser/pages.py:1855
-#: waeup/kofa/browser/pages.py:1907
-#: waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:585
-#: waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:888
+#: waeup/kofa/accesscodes/browser.py:100 waeup/kofa/accesscodes/browser.py:113
+#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:130
+#: waeup/kofa/applicants/browser.py:182 waeup/kofa/applicants/browser.py:254
+#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:338
+#: waeup/kofa/browser/pages.py:503 waeup/kofa/browser/pages.py:708
+#: waeup/kofa/browser/pages.py:735 waeup/kofa/browser/pages.py:758
+#: waeup/kofa/browser/pages.py:805 waeup/kofa/browser/pages.py:835
+#: waeup/kofa/browser/pages.py:955 waeup/kofa/browser/pages.py:1183
+#: waeup/kofa/browser/pages.py:1277 waeup/kofa/browser/pages.py:1298
+#: waeup/kofa/browser/pages.py:1325 waeup/kofa/browser/pages.py:1353
+#: waeup/kofa/browser/pages.py:1354 waeup/kofa/browser/pages.py:1400
+#: waeup/kofa/browser/pages.py:1441 waeup/kofa/browser/pages.py:1520
+#: waeup/kofa/browser/pages.py:1521 waeup/kofa/browser/pages.py:1523
+#: waeup/kofa/browser/pages.py:1601 waeup/kofa/browser/pages.py:1646
+#: waeup/kofa/browser/pages.py:1684 waeup/kofa/browser/pages.py:1728
+#: waeup/kofa/browser/pages.py:1767 waeup/kofa/browser/pages.py:1769
+#: waeup/kofa/browser/pages.py:1804 waeup/kofa/browser/pages.py:1855
+#: waeup/kofa/browser/pages.py:1907 waeup/kofa/students/browser.py:584
+#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:746
+#: waeup/kofa/students/browser.py:748 waeup/kofa/students/browser.py:888
 msgid "Cancel"
 msgstr ""
@@ -105,10 +85,7 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:153
-#: waeup/kofa/browser/pages.py:592
-#: waeup/kofa/browser/pages.py:1142
-#: waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:171
-#: waeup/kofa/students/browser.py:205
+#: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:592
+#: waeup/kofa/browser/pages.py:1142 waeup/kofa/browser/viewlets.py:190
+#: waeup/kofa/students/browser.py:171 waeup/kofa/students/browser.py:205
 msgid "Search"
 msgstr ""
@@ -122,6 +99,5 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:180
-#: waeup/kofa/accesscodes/workflow.py:39
+#: waeup/kofa/accesscodes/browser.py:180 waeup/kofa/accesscodes/workflow.py:39
 msgid "disabled"
 msgstr ""
@@ -175,6 +151,5 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:46
-#: waeup/kofa/accesscodes/browser.py:206
+#: waeup/kofa/accesscodes/browser.py:46 waeup/kofa/accesscodes/browser.py:206
 #: waeup/kofa/accesscodes/browser.py:226
 msgid "Access Code Batches"
@@ -347,6 +322,5 @@
 msgstr ""
 
-#: waeup/kofa/accesscodes/workflow.py:37
-#: waeup/kofa/applicants/workflow.py:37
+#: waeup/kofa/accesscodes/workflow.py:37 waeup/kofa/applicants/workflow.py:37
 msgid "initialized"
 msgstr ""
@@ -368,6 +342,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:117
-#: waeup/kofa/applicants/browser.py:325
+#: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:325
 #: waeup/kofa/applicants/browser.py:745
 msgid "Could not delete:"
@@ -375,19 +348,16 @@
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:120
-#: waeup/kofa/applicants/browser.py:328
-#: waeup/kofa/applicants/browser.py:748
-#: waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:243
-#: waeup/kofa/students/browser.py:642
-#: waeup/kofa/students/browser.py:796
-#: waeup/kofa/students/browser.py:974
-#: waeup/kofa/students/browser.py:1184
-#: waeup/kofa/students/browser.py:1770
+#: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py:328
+#: waeup/kofa/applicants/browser.py:748 waeup/kofa/browser/pages.py:134
+#: waeup/kofa/students/browser.py:243 waeup/kofa/students/browser.py:642
+#: waeup/kofa/students/browser.py:796 waeup/kofa/students/browser.py:974
+#: waeup/kofa/students/browser.py:1184 waeup/kofa/students/browser.py:1770
 msgid "Successfully removed: ${a}"
 msgstr ""
 
 #: waeup/kofa/applicants/browser.py:169
-msgid "An applicants container for the same application type and entrance year exists already in the database."
+msgid ""
+"An applicants container for the same application type and entrance year "
+"exists already in the database."
 msgstr ""
 
@@ -396,6 +366,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:190
-#: waeup/kofa/applicants/viewlets.py:44
+#: waeup/kofa/applicants/browser.py:190 waeup/kofa/applicants/viewlets.py:44
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:12
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:36
@@ -403,58 +372,36 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:301
-#: waeup/kofa/applicants/browser.py:654
-#: waeup/kofa/applicants/browser.py:688
-#: waeup/kofa/applicants/browser.py:791
-#: waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:838
-#: waeup/kofa/browser/pages.py:476
-#: waeup/kofa/browser/pages.py:631
-#: waeup/kofa/browser/pages.py:654
-#: waeup/kofa/browser/pages.py:728
-#: waeup/kofa/browser/pages.py:1181
-#: waeup/kofa/browser/pages.py:1353
-#: waeup/kofa/browser/pages.py:1394
-#: waeup/kofa/browser/pages.py:1520
-#: waeup/kofa/browser/pages.py:1573
-#: waeup/kofa/browser/pages.py:1716
-#: waeup/kofa/browser/pages.py:1767
-#: waeup/kofa/browser/pages.py:1788
-#: waeup/kofa/hostels/browser.py:209
-#: waeup/kofa/hostels/browser.py:231
-#: waeup/kofa/hostels/browser.py:319
-#: waeup/kofa/students/browser.py:359
-#: waeup/kofa/students/browser.py:458
-#: waeup/kofa/students/browser.py:535
-#: waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:600
-#: waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:771
-#: waeup/kofa/students/browser.py:1444
-#: waeup/kofa/students/browser.py:1459
-#: waeup/kofa/students/browser.py:1574
+#: waeup/kofa/applicants/browser.py:254 waeup/kofa/applicants/browser.py:301
+#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:688
+#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:794
+#: waeup/kofa/applicants/browser.py:838 waeup/kofa/browser/pages.py:476
+#: waeup/kofa/browser/pages.py:631 waeup/kofa/browser/pages.py:654
+#: waeup/kofa/browser/pages.py:728 waeup/kofa/browser/pages.py:1181
+#: waeup/kofa/browser/pages.py:1353 waeup/kofa/browser/pages.py:1394
+#: waeup/kofa/browser/pages.py:1520 waeup/kofa/browser/pages.py:1573
+#: waeup/kofa/browser/pages.py:1716 waeup/kofa/browser/pages.py:1767
+#: waeup/kofa/browser/pages.py:1788 waeup/kofa/hostels/browser.py:209
+#: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:319
+#: waeup/kofa/students/browser.py:359 waeup/kofa/students/browser.py:458
+#: waeup/kofa/students/browser.py:535 waeup/kofa/students/browser.py:584
+#: waeup/kofa/students/browser.py:600 waeup/kofa/students/browser.py:746
+#: waeup/kofa/students/browser.py:771 waeup/kofa/students/browser.py:1444
+#: waeup/kofa/students/browser.py:1459 waeup/kofa/students/browser.py:1574
 msgid "Save"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:333
+#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:333
 #: waeup/kofa/applicants/browser.py:361
 msgid "Add applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:265
-#: waeup/kofa/applicants/viewlets.py:95
+#: waeup/kofa/applicants/browser.py:265 waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:305
-#: waeup/kofa/applicants/browser.py:717
-#: waeup/kofa/browser/pages.py:1397
-#: waeup/kofa/browser/pages.py:1719
-#: waeup/kofa/browser/pages.py:1791
-#: waeup/kofa/browser/pages.py:1903
-#: waeup/kofa/hostels/browser.py:54
-#: waeup/kofa/students/browser.py:80
+#: waeup/kofa/applicants/browser.py:305 waeup/kofa/applicants/browser.py:717
+#: waeup/kofa/browser/pages.py:1397 waeup/kofa/browser/pages.py:1719
+#: waeup/kofa/browser/pages.py:1791 waeup/kofa/browser/pages.py:1903
+#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:80
 #: waeup/kofa/students/browser.py:385
 msgid "Form has been saved."
@@ -477,11 +424,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:397
-#: waeup/kofa/students/browser.py:285
+#: waeup/kofa/applicants/browser.py:397 waeup/kofa/students/browser.py:285
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:398
-#: waeup/kofa/students/browser.py:286
+#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:286
 msgid "unset"
 msgstr ""
@@ -496,22 +441,18 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:461
-#: waeup/kofa/students/browser.py:1023
+#: waeup/kofa/applicants/browser.py:461 waeup/kofa/students/browser.py:1023
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:474
-#: waeup/kofa/students/browser.py:1037
+#: waeup/kofa/applicants/browser.py:474 waeup/kofa/students/browser.py:1037
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:501
-#: waeup/kofa/students/browser.py:1056
+#: waeup/kofa/applicants/browser.py:501 waeup/kofa/students/browser.py:1056
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:529
-#: waeup/kofa/students/browser.py:1105
+#: waeup/kofa/applicants/browser.py:529 waeup/kofa/students/browser.py:1105
 msgid "Valid callback received."
 msgstr ""
@@ -541,26 +482,19 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:654
-#: waeup/kofa/applicants/browser.py:794
+#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:794
 #: waeup/kofa/applicants/browser.py:846
 msgid "Final Submit"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655
-#: waeup/kofa/applicants/browser.py:758
-#: waeup/kofa/applicants/browser.py:792
-#: waeup/kofa/applicants/browser.py:827
+#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:758
+#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:827
 #: waeup/kofa/students/browser.py:980
 msgid "Add online payment ticket"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655
-#: waeup/kofa/applicants/browser.py:763
-#: waeup/kofa/applicants/browser.py:792
-#: waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:832
-#: waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:780
-#: waeup/kofa/students/browser.py:956
+#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:763
+#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:795
+#: waeup/kofa/applicants/browser.py:832 waeup/kofa/students/browser.py:748
+#: waeup/kofa/students/browser.py:780 waeup/kofa/students/browser.py:956
 #: waeup/kofa/students/browser.py:1752
 msgid "Remove selected tickets"
@@ -572,58 +506,40 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:685
-#: waeup/kofa/students/browser.py:356
+#: waeup/kofa/applicants/browser.py:685 waeup/kofa/students/browser.py:356
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:732
-#: waeup/kofa/students/browser.py:962
+#: waeup/kofa/applicants/browser.py:732 waeup/kofa/students/browser.py:962
 msgid "No payment selected."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:76
-#: waeup/kofa/applicants/viewlets.py:88
+#: waeup/kofa/applicants/browser.py:76 waeup/kofa/applicants/viewlets.py:88
 msgid "Manage application section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:79
-#: waeup/kofa/applicants/browser.py:105
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:308
-#: waeup/kofa/browser/pages.py:634
-#: waeup/kofa/browser/pages.py:675
-#: waeup/kofa/browser/pages.py:1277
-#: waeup/kofa/browser/pages.py:1288
-#: waeup/kofa/browser/pages.py:1354
-#: waeup/kofa/browser/pages.py:1389
-#: waeup/kofa/hostels/browser.py:131
-#: waeup/kofa/students/browser.py:206
-#: waeup/kofa/students/browser.py:1151
-#: waeup/kofa/students/browser.py:1164
+#: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:105
+#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:308
+#: waeup/kofa/browser/pages.py:634 waeup/kofa/browser/pages.py:675
+#: waeup/kofa/browser/pages.py:1277 waeup/kofa/browser/pages.py:1288
+#: waeup/kofa/browser/pages.py:1354 waeup/kofa/browser/pages.py:1389
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:206
+#: waeup/kofa/students/browser.py:1151 waeup/kofa/students/browser.py:1164
 msgid "Remove selected"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:79
-#: waeup/kofa/applicants/browser.py:125
-#: waeup/kofa/applicants/browser.py:148
-#: waeup/kofa/applicants/browser.py:160
+#: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:125
+#: waeup/kofa/applicants/browser.py:148 waeup/kofa/applicants/browser.py:160
 msgid "Add applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:805
-#: waeup/kofa/students/browser.py:88
+#: waeup/kofa/applicants/browser.py:805 waeup/kofa/students/browser.py:88
 msgid "The requested form is locked (read-only)."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:81
-#: waeup/kofa/applicants/browser.py:139
-#: waeup/kofa/applicants/browser.py:256
-#: waeup/kofa/applicants/browser.py:347
-#: waeup/kofa/browser/pages.py:1355
-#: waeup/kofa/browser/pages.py:1414
-#: waeup/kofa/browser/pages.py:1524
-#: waeup/kofa/browser/pages.py:1610
-#: waeup/kofa/browser/pages.py:1770
-#: waeup/kofa/browser/pages.py:1827
+#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:139
+#: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:347
+#: waeup/kofa/browser/pages.py:1355 waeup/kofa/browser/pages.py:1414
+#: waeup/kofa/browser/pages.py:1524 waeup/kofa/browser/pages.py:1610
+#: waeup/kofa/browser/pages.py:1770 waeup/kofa/browser/pages.py:1827
 msgid "Remove selected local roles"
 msgstr ""
@@ -633,14 +549,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:82
-#: waeup/kofa/applicants/browser.py:135
-#: waeup/kofa/applicants/browser.py:257
-#: waeup/kofa/applicants/browser.py:343
-#: waeup/kofa/browser/pages.py:1356
-#: waeup/kofa/browser/pages.py:1410
-#: waeup/kofa/browser/pages.py:1525
-#: waeup/kofa/browser/pages.py:1606
-#: waeup/kofa/browser/pages.py:1771
-#: waeup/kofa/browser/pages.py:1823
+#: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:135
+#: waeup/kofa/applicants/browser.py:257 waeup/kofa/applicants/browser.py:343
+#: waeup/kofa/browser/pages.py:1356 waeup/kofa/browser/pages.py:1410
+#: waeup/kofa/browser/pages.py:1525 waeup/kofa/browser/pages.py:1606
+#: waeup/kofa/browser/pages.py:1771 waeup/kofa/browser/pages.py:1823
 msgid "Add local role"
 msgstr ""
@@ -654,6 +565,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:858
-#: waeup/kofa/students/browser.py:1619
+#: waeup/kofa/applicants/browser.py:858 waeup/kofa/students/browser.py:1619
 msgid "This form cannot be submitted. Wrong state!"
 msgstr ""
@@ -701,5 +611,7 @@
 
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:59
-msgid "I confirm that the Passport Photograph uploaded on this form is a true picture of me."
+msgid ""
+"I confirm that the Passport Photograph uploaded on this form is a true "
+"picture of me."
 msgstr ""
 
@@ -722,5 +634,7 @@
 
 #: waeup/kofa/applicants/browser_templates/applicantregister.pt:18
-msgid "An account will be created for you and an email with your login credentials will be sent to the address provided."
+msgid ""
+"An account will be created for you and an email with your login credentials "
+"will be sent to the address provided."
 msgstr ""
 
@@ -750,6 +664,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:197
-#: waeup/kofa/students/browser.py:713
+#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:713
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -775,6 +688,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:204
-#: waeup/kofa/students/browser.py:714
+#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:714
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -871,11 +783,11 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:413
-#: waeup/kofa/students/interfaces.py:490
+#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:375
+#: waeup/kofa/interfaces.py:401 waeup/kofa/students/interfaces.py:490
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:418
-#: waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:380
+#: waeup/kofa/interfaces.py:408 waeup/kofa/students/interfaces.py:203
 msgid "Phone"
 msgstr ""
@@ -951,5 +863,7 @@
 #. Default: ""
 #: waeup/kofa/applicants/pdf.py:203
-msgid "<font size=10>Proceed to the login page of the portal and enter your new credentials: user name= ${a}, password = ${b}.</font>"
+msgid ""
+"<font size=10>Proceed to the login page of the portal and enter your new "
+"credentials: user name= ${a}, password = ${b}.</font>"
 msgstr ""
 
@@ -982,17 +896,14 @@
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:151
-#: waeup/kofa/applicants/workflow.py:99
+#: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
 #: waeup/kofa/students/browser.py:258
 msgid "Create student record"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:168
-#: waeup/kofa/students/viewlets.py:300
+#: waeup/kofa/applicants/viewlets.py:168 waeup/kofa/students/viewlets.py:300
 msgid "Download payment receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:183
-#: waeup/kofa/students/viewlets.py:315
+#: waeup/kofa/applicants/viewlets.py:183 waeup/kofa/students/viewlets.py:315
 msgid "Request callback"
 msgstr ""
@@ -1002,25 +913,19 @@
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:73
-#: waeup/kofa/students/viewlets.py:512
+#: waeup/kofa/applicants/viewlets.py:73 waeup/kofa/students/viewlets.py:512
 msgid "My Data"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:100
-#: waeup/kofa/students/workflow.py:25
+#: waeup/kofa/applicants/workflow.py:100 waeup/kofa/students/workflow.py:25
 msgid "Student record created"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:106
-#: waeup/kofa/applicants/workflow.py:113
-#: waeup/kofa/applicants/workflow.py:120
-#: waeup/kofa/applicants/workflow.py:127
+#: waeup/kofa/applicants/workflow.py:106 waeup/kofa/applicants/workflow.py:113
+#: waeup/kofa/applicants/workflow.py:120 waeup/kofa/applicants/workflow.py:127
 msgid "Reset application to started"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:107
-#: waeup/kofa/applicants/workflow.py:114
-#: waeup/kofa/applicants/workflow.py:121
-#: waeup/kofa/applicants/workflow.py:128
+#: waeup/kofa/applicants/workflow.py:107 waeup/kofa/applicants/workflow.py:114
+#: waeup/kofa/applicants/workflow.py:121 waeup/kofa/applicants/workflow.py:128
 #: waeup/kofa/applicants/workflow.py:134
 msgid "Application reset"
@@ -1043,6 +948,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:41
-#: waeup/kofa/interfaces.py:72
+#: waeup/kofa/applicants/workflow.py:41 waeup/kofa/interfaces.py:72
 msgid "admitted"
 msgstr ""
@@ -1052,6 +956,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:43
-#: waeup/kofa/interfaces.py:71
+#: waeup/kofa/applicants/workflow.py:43 waeup/kofa/interfaces.py:71
 msgid "created"
 msgstr ""
@@ -1097,11 +1000,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:85
-#: waeup/kofa/applicants/workflow.py:92
+#: waeup/kofa/applicants/workflow.py:85 waeup/kofa/applicants/workflow.py:92
 msgid "Refuse application"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:86
-#: waeup/kofa/applicants/workflow.py:93
+#: waeup/kofa/applicants/workflow.py:86 waeup/kofa/applicants/workflow.py:93
 msgid "Application refused"
 msgstr ""
@@ -1111,31 +1012,24 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:116
-#: waeup/kofa/browser/viewlets.py:615
+#: waeup/kofa/browser/breadcrumbs.py:116 waeup/kofa/browser/viewlets.py:615
 msgid "Academics"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:123
-#: waeup/kofa/browser/pages.py:309
+#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:309
 msgid "Administration"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:130
-#: waeup/kofa/browser/viewlets.py:360
+#: waeup/kofa/browser/breadcrumbs.py:130 waeup/kofa/browser/viewlets.py:360
 #: waeup/kofa/browser/viewlets.py:666
 msgid "Portal Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:148
-#: waeup/kofa/browser/pages.py:386
-#: waeup/kofa/browser/viewlets.py:375
-#: waeup/kofa/browser/viewlets.py:676
+#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:386
+#: waeup/kofa/browser/viewlets.py:375 waeup/kofa/browser/viewlets.py:676
 msgid "Portal Users"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:155
-#: waeup/kofa/browser/pages.py:748
-#: waeup/kofa/browser/pages.py:1140
-#: waeup/kofa/browser/viewlets.py:393
+#: waeup/kofa/browser/breadcrumbs.py:155 waeup/kofa/browser/pages.py:748
+#: waeup/kofa/browser/pages.py:1140 waeup/kofa/browser/viewlets.py:393
 #: waeup/kofa/browser/viewlets.py:685
 msgid "Data Center"
@@ -1185,8 +1079,6 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:113
-#: waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:287
-#: waeup/kofa/students/browser.py:230
+#: waeup/kofa/browser/pages.py:113 waeup/kofa/hostels/browser.py:256
+#: waeup/kofa/hostels/browser.py:287 waeup/kofa/students/browser.py:230
 msgid "No item selected."
 msgstr ""
@@ -1226,8 +1118,6 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1277
-#: waeup/kofa/browser/pages.py:1293
-#: waeup/kofa/browser/pages.py:1310
-#: waeup/kofa/browser/pages.py:1314
+#: waeup/kofa/browser/pages.py:1277 waeup/kofa/browser/pages.py:1293
+#: waeup/kofa/browser/pages.py:1310 waeup/kofa/browser/pages.py:1314
 msgid "Add faculty"
 msgstr ""
@@ -1237,6 +1127,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1282
-#: waeup/kofa/browser/viewlets.py:441
+#: waeup/kofa/browser/pages.py:1282 waeup/kofa/browser/viewlets.py:441
 msgid "Manage academic section"
 msgstr ""
@@ -1246,18 +1135,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1342
-#: waeup/kofa/browser/pages.py:1352
+#: waeup/kofa/browser/pages.py:1342 waeup/kofa/browser/pages.py:1352
 msgid "Departments"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1354
-#: waeup/kofa/browser/pages.py:1405
-#: waeup/kofa/browser/pages.py:1424
-#: waeup/kofa/browser/pages.py:1428
+#: waeup/kofa/browser/pages.py:1354 waeup/kofa/browser/pages.py:1405
+#: waeup/kofa/browser/pages.py:1424 waeup/kofa/browser/pages.py:1428
 msgid "Add department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1362
-#: waeup/kofa/browser/viewlets.py:457
+#: waeup/kofa/browser/pages.py:1362 waeup/kofa/browser/viewlets.py:457
 msgid "Manage faculty"
 msgstr ""
@@ -1276,13 +1161,10 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1485
-#: waeup/kofa/browser/pages.py:1504
-#: waeup/kofa/students/browser.py:96
-#: waeup/kofa/students/viewlets.py:472
+#: waeup/kofa/browser/pages.py:1485 waeup/kofa/browser/pages.py:1504
+#: waeup/kofa/students/browser.py:96 waeup/kofa/students/viewlets.py:472
 msgid "Students"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:152
-#: waeup/kofa/browser/viewlets.py:322
+#: waeup/kofa/browser/pages.py:152 waeup/kofa/browser/viewlets.py:322
 #: waeup/kofa/browser/templates/staffsitelayout.pt:28
 #: waeup/kofa/browser/templates/studentsitelayout.pt:33
@@ -1290,30 +1172,23 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1521
-#: waeup/kofa/browser/pages.py:1579
+#: waeup/kofa/browser/pages.py:1521 waeup/kofa/browser/pages.py:1579
 msgid "Remove selected courses"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1521
-#: waeup/kofa/browser/pages.py:1591
-#: waeup/kofa/browser/pages.py:1620
-#: waeup/kofa/browser/pages.py:1624
+#: waeup/kofa/browser/pages.py:1521 waeup/kofa/browser/pages.py:1591
+#: waeup/kofa/browser/pages.py:1620 waeup/kofa/browser/pages.py:1624
 msgid "Add course"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1522
-#: waeup/kofa/browser/pages.py:1585
+#: waeup/kofa/browser/pages.py:1522 waeup/kofa/browser/pages.py:1585
 msgid "Remove selected certificates"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1522
-#: waeup/kofa/browser/pages.py:1596
-#: waeup/kofa/browser/pages.py:1657
-#: waeup/kofa/browser/pages.py:1661
+#: waeup/kofa/browser/pages.py:1522 waeup/kofa/browser/pages.py:1596
+#: waeup/kofa/browser/pages.py:1657 waeup/kofa/browser/pages.py:1661
 msgid "Add certificate"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1531
-#: waeup/kofa/browser/viewlets.py:464
+#: waeup/kofa/browser/pages.py:1531 waeup/kofa/browser/viewlets.py:464
 msgid "Manage department"
 msgstr ""
@@ -1341,6 +1216,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1711
-#: waeup/kofa/browser/viewlets.py:481
+#: waeup/kofa/browser/pages.py:1711 waeup/kofa/browser/viewlets.py:481
 msgid "Edit course"
 msgstr ""
@@ -1350,18 +1224,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1768
-#: waeup/kofa/browser/pages.py:1799
-#: waeup/kofa/browser/pages.py:1840
-#: waeup/kofa/browser/pages.py:1842
+#: waeup/kofa/browser/pages.py:1768 waeup/kofa/browser/pages.py:1799
+#: waeup/kofa/browser/pages.py:1840 waeup/kofa/browser/pages.py:1842
 msgid "Add course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1769
-#: waeup/kofa/browser/pages.py:1794
+#: waeup/kofa/browser/pages.py:1769 waeup/kofa/browser/pages.py:1794
 msgid "Remove selected course referrers"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1775
-#: waeup/kofa/browser/viewlets.py:488
+#: waeup/kofa/browser/pages.py:1775 waeup/kofa/browser/viewlets.py:488
 msgid "Manage certificate"
 msgstr ""
@@ -1380,6 +1250,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1888
-#: waeup/kofa/browser/viewlets.py:505
+#: waeup/kofa/browser/pages.py:1888 waeup/kofa/browser/viewlets.py:505
 msgid "Edit course referrer"
 msgstr ""
@@ -1398,13 +1267,10 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:234
-#: waeup/kofa/browser/pages.py:519
+#: waeup/kofa/browser/pages.py:234 waeup/kofa/browser/pages.py:519
 msgid "Send message now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:253
-#: waeup/kofa/browser/pages.py:272
-#: waeup/kofa/browser/pages.py:536
-#: waeup/kofa/students/browser.py:320
+#: waeup/kofa/browser/pages.py:253 waeup/kofa/browser/pages.py:272
+#: waeup/kofa/browser/pages.py:536 waeup/kofa/students/browser.py:320
 msgid "Your message has been sent."
 msgstr ""
@@ -1422,16 +1288,12 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:387
-#: waeup/kofa/hostels/browser.py:195
-#: waeup/kofa/students/viewlets.py:163
-#: waeup/kofa/students/viewlets.py:171
-#: waeup/kofa/students/viewlets.py:226
-#: waeup/kofa/students/viewlets.py:243
+#: waeup/kofa/browser/pages.py:387 waeup/kofa/hostels/browser.py:195
+#: waeup/kofa/students/viewlets.py:163 waeup/kofa/students/viewlets.py:171
+#: waeup/kofa/students/viewlets.py:226 waeup/kofa/students/viewlets.py:243
 #: waeup/kofa/students/viewlets.py:283
 msgid "Manage"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:388
-#: waeup/kofa/browser/viewlets.py:180
+#: waeup/kofa/browser/pages.py:388 waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
 msgstr ""
@@ -1442,6 +1304,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:426
-#: waeup/kofa/browser/pages.py:428
+#: waeup/kofa/browser/pages.py:426 waeup/kofa/browser/pages.py:428
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
@@ -1463,16 +1324,13 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:517
-#: waeup/kofa/students/browser.py:301
+#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:301
 msgid "Send message to ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:546
-#: waeup/kofa/browser/viewlets.py:400
+#: waeup/kofa/browser/pages.py:546 waeup/kofa/browser/viewlets.py:400
 msgid "My Preferences"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:559
-#: waeup/kofa/browser/viewlets.py:415
+#: waeup/kofa/browser/pages.py:559 waeup/kofa/browser/viewlets.py:415
 msgid "My Roles"
 msgstr ""
@@ -1490,17 +1348,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:631
-#: waeup/kofa/browser/pages.py:680
+#: waeup/kofa/browser/pages.py:631 waeup/kofa/browser/pages.py:680
 msgid "Update plugins"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:633
-#: waeup/kofa/browser/pages.py:661
+#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:661
 #: waeup/kofa/browser/pages.py:692
 msgid "Add session configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:658
-#: waeup/kofa/browser/pages.py:731
+#: waeup/kofa/browser/pages.py:658 waeup/kofa/browser/pages.py:731
 msgid "Settings have been saved."
 msgstr ""
@@ -1536,13 +1391,10 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:803
-#: waeup/kofa/browser/pages.py:833
-#: waeup/kofa/browser/pages.py:953
-#: waeup/kofa/browser/pages.py:1061
+#: waeup/kofa/browser/pages.py:803 waeup/kofa/browser/pages.py:833
+#: waeup/kofa/browser/pages.py:953 waeup/kofa/browser/pages.py:1061
 msgid "Process CSV file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:817
-#: waeup/kofa/browser/pages.py:918
+#: waeup/kofa/browser/pages.py:817 waeup/kofa/browser/pages.py:918
 #: waeup/kofa/browser/pages.py:1037
 msgid "Import aborted."
@@ -1573,6 +1425,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:956
-#: waeup/kofa/browser/pages.py:1182
+#: waeup/kofa/browser/pages.py:956 waeup/kofa/browser/pages.py:1182
 msgid "Reset"
 msgstr ""
@@ -1652,5 +1503,7 @@
 
 #: waeup/kofa/browser/templates/datacenterimport1page.pt:2
-msgid "Using batch processing you can mass-create, mass-update, or mass-remove datasets from the database using CSV files."
+msgid ""
+"Using batch processing you can mass-create, mass-update, or mass-remove "
+"datasets from the database using CSV files."
 msgstr ""
 
@@ -1672,5 +1525,7 @@
 
 #: waeup/kofa/browser/templates/datacenterimport2page.pt:8
-msgid "Please select a file-processor and a processing-mode from the selections below."
+msgid ""
+"Please select a file-processor and a processing-mode from the selections "
+"below."
 msgstr ""
 
@@ -1745,5 +1600,7 @@
 
 #: waeup/kofa/browser/templates/datacenterpage.pt:1
-msgid "The data center helps you to manage portal data. You can upload CSV files here, which will be available for import afterwards."
+msgid ""
+"The data center helps you to manage portal data. You can upload CSV files "
+"here, which will be available for import afterwards."
 msgstr ""
 
@@ -1784,13 +1641,4 @@
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:7
 msgid "Settings"
-msgstr ""
-
-#: waeup/kofa/browser/templates/departmentmanagepage.pt:97
-#: waeup/kofa/browser/templates/userscontainerpage.pt:4
-#: waeup/kofa/browser/templates/facultymanagepage.pt:71
-#: waeup/kofa/browser/templates/certificatemanagepage.pt:88
-#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:89
-#: waeup/kofa/applicants/browser_templates/applicantsrootmanagepage.pt:56
-msgid "User Id"
 msgstr ""
 
@@ -1892,12 +1740,17 @@
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:113
-#: waeup/kofa/browser/templates/studentsitelayout.pt:99
-msgid "Back to top"
-msgstr ""
-
 #: waeup/kofa/browser/templates/staffsitelayout.pt:114
 #: waeup/kofa/browser/templates/studentsitelayout.pt:100
-msgid "Student Information and Registration Portal<br /> Copyright &copy; WAeUP Group, 2008-2012"
+msgid "Back to top"
+msgstr ""
+
+#: waeup/kofa/browser/templates/staffsitelayout.pt:116
+#: waeup/kofa/browser/templates/studentsitelayout.pt:102
+msgid "Kofa - Student Management System"
+msgstr ""
+
+#: waeup/kofa/browser/templates/staffsitelayout.pt:119
+#: waeup/kofa/browser/templates/studentsitelayout.pt:105
+msgid "Copyright &copy; WAeUP Group 2008-2012"
 msgstr ""
 
@@ -1935,6 +1788,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:383
-#: waeup/kofa/students/viewlets.py:155
+#: waeup/kofa/browser/viewlets.py:383 waeup/kofa/students/viewlets.py:155
 msgid "Send email"
 msgstr ""
@@ -1948,11 +1800,9 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:473
-#: waeup/kofa/browser/viewlets.py:497
+#: waeup/kofa/browser/viewlets.py:473 waeup/kofa/browser/viewlets.py:497
 msgid "Show students"
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:528
-#: waeup/kofa/browser/viewlets.py:536
+#: waeup/kofa/browser/viewlets.py:528 waeup/kofa/browser/viewlets.py:536
 msgid "Show batch logs"
 msgstr ""
@@ -1970,8 +1820,6 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:91
-#: waeup/kofa/browser/viewlets.py:160
-#: waeup/kofa/students/viewlets.py:218
-#: waeup/kofa/students/viewlets.py:403
+#: waeup/kofa/browser/viewlets.py:91 waeup/kofa/browser/viewlets.py:160
+#: waeup/kofa/students/viewlets.py:218 waeup/kofa/students/viewlets.py:403
 msgid "Edit"
 msgstr ""
@@ -1981,11 +1829,9 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:113
-#: waeup/kofa/hostels/browser.py:123
+#: waeup/kofa/hostels/browser.py:113 waeup/kofa/hostels/browser.py:123
 msgid "Manage accommodation section"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:145
-#: waeup/kofa/hostels/browser.py:158
+#: waeup/kofa/hostels/browser.py:145 waeup/kofa/hostels/browser.py:158
 msgid "Add hostel"
 msgstr ""
@@ -2007,16 +1853,13 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:210
-#: waeup/kofa/hostels/browser.py:236
+#: waeup/kofa/hostels/browser.py:210 waeup/kofa/hostels/browser.py:236
 msgid "Update all beds"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:211
-#: waeup/kofa/hostels/browser.py:250
+#: waeup/kofa/hostels/browser.py:211 waeup/kofa/hostels/browser.py:250
 msgid "Switch reservation of selected beds"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:212
-#: waeup/kofa/hostels/browser.py:281
+#: waeup/kofa/hostels/browser.py:212 waeup/kofa/hostels/browser.py:281
 msgid "Release selected beds"
 msgstr ""
@@ -2024,5 +1867,6 @@
 #. Default: ""
 #: waeup/kofa/hostels/browser.py:241
-msgid "${a} empty beds removed, ${b} beds added, ${c} occupied beds modified (${d})"
+msgid ""
+"${a} empty beds removed, ${b} beds added, ${c} occupied beds modified (${d})"
 msgstr ""
 
@@ -2045,6 +1889,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:68
-#: waeup/kofa/hostels/browser.py:78
+#: waeup/kofa/hostels/browser.py:68 waeup/kofa/hostels/browser.py:78
 msgid "Hostels"
 msgstr ""
@@ -2113,6 +1956,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/interfaces.py:175
-#: waeup/kofa/students/interfaces.py:427
+#: waeup/kofa/hostels/interfaces.py:175 waeup/kofa/students/interfaces.py:427
 msgid "Bed Type"
 msgstr ""
@@ -2122,6 +1964,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/interfaces.py:186
-#: waeup/kofa/hostels/interfaces.py:199
+#: waeup/kofa/hostels/interfaces.py:186 waeup/kofa/hostels/interfaces.py:199
 msgid "Owner (Student)"
 msgstr ""
@@ -2279,4 +2120,145 @@
 msgstr ""
 
+#: waeup/kofa/interfaces.py:306
+msgid "Importer name"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:310
+msgid "Import mode"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:335
+msgid "Email Address:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:342
+msgid "Email to:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:349
+msgid "Subject:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:353
+msgid "Full Name:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:357
+msgid "Text:"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:388
+#: waeup/kofa/browser/templates/departmentmanagepage.pt:97
+#: waeup/kofa/browser/templates/userscontainerpage.pt:4
+#: waeup/kofa/browser/templates/facultymanagepage.pt:71
+#: waeup/kofa/browser/templates/certificatemanagepage.pt:88
+#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:89
+#: waeup/kofa/applicants/browser_templates/applicantsrootmanagepage.pt:56
+msgid "User Id"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:393
+#: waeup/kofa/students/browser_templates/containerpage.pt:33
+#: waeup/kofa/students/browser_templates/containermanagepage.pt:39
+#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:44
+msgid "Full Name"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:397
+msgid "Description/Notice"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:414
+msgid "Portal roles"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:457
+msgid "Name of University"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:458
+msgid "Sample University"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:463
+msgid "Abbreviated Title of University"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:469
+msgid "Skin"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:476
+msgid "Content in reST format"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:488
+msgid "Accommodation Booking Session"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:496
+msgid "Allowed States for Accommodation Booking"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:504
+msgid "Name of Administrator"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:510
+msgid "Email Address of Administrator"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:517
+msgid "Subject of Email to Administrator"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:518
+msgid "Kofa Contact"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:523
+msgid "SMTP mailer to use when sending mail"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:530
+msgid "Captcha used for public registration pages"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:537
+msgid "Carry-over Course Registration"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:546 waeup/kofa/interfaces.py:598
+msgid "Academic Session"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:554 waeup/kofa/payments/interfaces.py:30
+msgid "School Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:559 waeup/kofa/payments/interfaces.py:106
+msgid "Surcharge 1"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:564 waeup/kofa/payments/interfaces.py:113
+msgid "Surcharge 2"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:569 waeup/kofa/payments/interfaces.py:120
+msgid "Surcharge 3"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:574
+msgid "Clearance Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:579
+msgid "Booking Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:584 waeup/kofa/payments/interfaces.py:36
+msgid "Acceptance Fee"
+msgstr ""
+
 #: waeup/kofa/interfaces.py:73
 msgid "clearance started"
@@ -2343,16 +2325,4 @@
 msgstr ""
 
-#: waeup/kofa/payments/interfaces.py:106
-msgid "Surcharge 1"
-msgstr ""
-
-#: waeup/kofa/payments/interfaces.py:113
-msgid "Surcharge 2"
-msgstr ""
-
-#: waeup/kofa/payments/interfaces.py:120
-msgid "Surcharge 3"
-msgstr ""
-
 #: waeup/kofa/payments/interfaces.py:133
 msgid "Activation Code"
@@ -2391,8 +2361,4 @@
 msgstr ""
 
-#: waeup/kofa/payments/interfaces.py:30
-msgid "School Fee"
-msgstr ""
-
 #: waeup/kofa/payments/interfaces.py:31
 msgid "Clearance"
@@ -2413,8 +2379,4 @@
 #: waeup/kofa/payments/interfaces.py:35
 msgid "Gown"
-msgstr ""
-
-#: waeup/kofa/payments/interfaces.py:36
-msgid "Acceptance Fee"
 msgstr ""
 
@@ -2450,6 +2412,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1003
-#: waeup/kofa/students/browser.py:1225
+#: waeup/kofa/students/browser.py:1003 waeup/kofa/students/browser.py:1225
 msgid "Your current session does not match accommodation session."
 msgstr ""
@@ -2460,6 +2421,5 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1085
-#: waeup/kofa/students/browser.py:1093
+#: waeup/kofa/students/browser.py:1085 waeup/kofa/students/browser.py:1093
 #: waeup/kofa/students/browser.py:1101
 msgid "Valid callback received. ${a}"
@@ -2475,6 +2435,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:117
-#: waeup/kofa/students/viewlets.py:114
+#: waeup/kofa/students/browser.py:117 waeup/kofa/students/viewlets.py:114
 #: waeup/kofa/students/viewlets.py:534
 msgid "Study Course"
@@ -2501,6 +2460,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:123
-#: waeup/kofa/students/viewlets.py:120
+#: waeup/kofa/students/browser.py:123 waeup/kofa/students/viewlets.py:120
 #: waeup/kofa/students/viewlets.py:535
 msgid "Payments"
@@ -2511,6 +2469,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1241
-#: waeup/kofa/students/browser.py:1537
+#: waeup/kofa/students/browser.py:1241 waeup/kofa/students/browser.py:1537
 #: waeup/kofa/students/browser.py:1650
 msgid "Activation code is invalid."
@@ -2518,24 +2475,19 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1261
-#: waeup/kofa/students/browser.py:1389
+#: waeup/kofa/students/browser.py:1261 waeup/kofa/students/browser.py:1389
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1266
-#: waeup/kofa/students/browser.py:1542
+#: waeup/kofa/students/browser.py:1266 waeup/kofa/students/browser.py:1542
 #: waeup/kofa/students/browser.py:1655
 msgid "Activation code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1269
-#: waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1658
-#: waeup/kofa/students/browser.py:1917
+#: waeup/kofa/students/browser.py:1269 waeup/kofa/students/browser.py:1545
+#: waeup/kofa/students/browser.py:1658 waeup/kofa/students/browser.py:1917
 msgid "invalidated"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1274
-#: waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1274 waeup/kofa/students/browser.py:1549
 #: waeup/kofa/students/browser.py:1663
 msgid "You are not the owner of this access code."
@@ -2543,6 +2495,5 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1285
-#: waeup/kofa/students/browser.py:1403
+#: waeup/kofa/students/browser.py:1285 waeup/kofa/students/browser.py:1403
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
@@ -2574,6 +2525,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:138
-#: waeup/kofa/students/viewlets.py:126
+#: waeup/kofa/students/browser.py:138 waeup/kofa/students/viewlets.py:126
 msgid "Accommodation"
 msgstr ""
@@ -2589,11 +2539,9 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1441
-#: waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/browser.py:1441 waeup/kofa/students/viewlets.py:356
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1456
-#: waeup/kofa/students/viewlets.py:365
+#: waeup/kofa/students/browser.py:1456 waeup/kofa/students/viewlets.py:365
 msgid "Change password"
 msgstr ""
@@ -2612,6 +2560,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1497
-#: waeup/kofa/students/viewlets.py:389
+#: waeup/kofa/students/browser.py:1497 waeup/kofa/students/viewlets.py:389
 #: waeup/kofa/students/workflow.py:44
 msgid "Start clearance"
@@ -2622,6 +2569,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1518
-#: waeup/kofa/students/browser.py:1639
+#: waeup/kofa/students/browser.py:1518 waeup/kofa/students/browser.py:1639
 msgid "Wrong state"
 msgstr ""
@@ -2643,6 +2589,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1577
-#: waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1577 waeup/kofa/students/browser.py:1591
 msgid "Clearance form has been saved."
 msgstr ""
@@ -2652,6 +2597,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1600
-#: waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1600 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
@@ -2673,6 +2617,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1631
-#: waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:1631 waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr ""
@@ -2728,6 +2671,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:186
-#: waeup/kofa/students/browser.py:222
+#: waeup/kofa/students/browser.py:186 waeup/kofa/students/browser.py:222
 msgid "Empty search string"
 msgstr ""
@@ -2772,16 +2714,13 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:204
-#: waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:204 waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:228
-#: waeup/kofa/students/browser.py:1888
+#: waeup/kofa/students/browser.py:228 waeup/kofa/students/browser.py:1888
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:255
-#: waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:255 waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr ""
@@ -2796,6 +2735,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:322
-#: waeup/kofa/students/browser.py:1865
+#: waeup/kofa/students/browser.py:322 waeup/kofa/students/browser.py:1865
 msgid "An smtp server error occurred."
 msgstr ""
@@ -2810,6 +2748,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:418
-#: waeup/kofa/students/viewlets.py:104
+#: waeup/kofa/students/browser.py:418 waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
@@ -2829,6 +2766,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:475
-#: waeup/kofa/students/browser.py:499
+#: waeup/kofa/students/browser.py:475 waeup/kofa/students/browser.py:499
 msgid "Student is in wrong state."
 msgstr ""
@@ -2860,11 +2796,9 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:585
-#: waeup/kofa/students/browser.py:626
+#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:626
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:586
-#: waeup/kofa/students/browser.py:612
+#: waeup/kofa/students/browser.py:586 waeup/kofa/students/browser.py:612
 msgid "Add study level"
 msgstr ""
@@ -2874,6 +2808,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:622
-#: waeup/kofa/students/browser.py:1708
+#: waeup/kofa/students/browser.py:622 waeup/kofa/students/browser.py:1708
 msgid "This level exists."
 msgstr ""
@@ -2930,6 +2863,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:719
-#: waeup/kofa/students/interfaces.py:370
+#: waeup/kofa/students/browser.py:719 waeup/kofa/students/interfaces.py:370
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2938,10 +2870,7 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:747
-#: waeup/kofa/students/browser.py:776
-#: waeup/kofa/students/browser.py:861
-#: waeup/kofa/students/browser.py:866
-#: waeup/kofa/students/browser.py:1748
-#: waeup/kofa/students/browser.py:1798
+#: waeup/kofa/students/browser.py:747 waeup/kofa/students/browser.py:776
+#: waeup/kofa/students/browser.py:861 waeup/kofa/students/browser.py:866
+#: waeup/kofa/students/browser.py:1748 waeup/kofa/students/browser.py:1798
 msgid "Add course ticket"
 msgstr ""
@@ -2952,11 +2881,9 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:786
-#: waeup/kofa/students/browser.py:1758
+#: waeup/kofa/students/browser.py:786 waeup/kofa/students/browser.py:1758
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:810
-#: waeup/kofa/students/browser.py:832
+#: waeup/kofa/students/browser.py:810 waeup/kofa/students/browser.py:832
 msgid "This level does not correspond current level."
 msgstr ""
@@ -2966,6 +2893,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:816
-#: waeup/kofa/students/browser.py:844
+#: waeup/kofa/students/browser.py:816 waeup/kofa/students/browser.py:844
 msgid "Student is in the wrong state."
 msgstr ""
@@ -2979,12 +2905,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:881
-#: waeup/kofa/students/browser.py:1811
+#: waeup/kofa/students/browser.py:881 waeup/kofa/students/browser.py:1811
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:883
-#: waeup/kofa/students/browser.py:1813
+#: waeup/kofa/students/browser.py:883 waeup/kofa/students/browser.py:1813
 msgid "Successfully added ${a}."
 msgstr ""
@@ -3078,10 +3002,4 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/containerpage.pt:33
-#: waeup/kofa/students/browser_templates/containermanagepage.pt:39
-#: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:44
-msgid "Full Name"
-msgstr ""
-
 #: waeup/kofa/students/browser_templates/containerpage.pt:5
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:5
@@ -3115,5 +3033,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/students/browser_templates/imageupload.pt:21
 #: waeup/kofa/students/browser_templates/fileupload.pt:27
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
@@ -3154,5 +3072,11 @@
 
 #: waeup/kofa/students/browser_templates/setpassword.pt:33
-msgid "<li> Acquire a password access code (PWD). </li> <li> Enter your (JAMB) registration number and the access code. </li> <li> After pressing the button, your student id will be displayed and your password set. The 10-digit part of the access code just used is your new password. </li> <li> Go to the <strong><a href=\"login\">general login page</a></strong> and enter your new credentials. </li>"
+msgid ""
+"<li> Acquire a password access code (PWD). </li> <li> Enter your (JAMB) "
+"registration number and the access code. </li> <li> After pressing the "
+"button, your student id will be displayed and your password set. The 10-"
+"digit part of the access code just used is your new password. </li> <li> Go "
+"to the <strong><a href=\"login\">general login page</a></strong> and enter "
+"your new credentials. </li>"
 msgstr ""
 
@@ -3238,12 +3162,10 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:176
-#: waeup/kofa/students/interfaces.py:255
+#: waeup/kofa/students/interfaces.py:176 waeup/kofa/students/interfaces.py:255
 #: waeup/kofa/students/interfaces.py:483
 msgid "Registration Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:183
-#: waeup/kofa/students/interfaces.py:265
+#: waeup/kofa/students/interfaces.py:183 waeup/kofa/students/interfaces.py:265
 msgid "Matriculation Number"
 msgstr ""
@@ -3304,6 +3226,5 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:337
-#: waeup/kofa/students/interfaces.py:434
+#: waeup/kofa/students/interfaces.py:337 waeup/kofa/students/interfaces.py:434
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3355,6 +3276,5 @@
 msgstr ""
 
-#: waeup/kofa/students/utils.py:280
-#: waeup/kofa/students/viewlets.py:71
+#: waeup/kofa/students/utils.py:280 waeup/kofa/students/viewlets.py:71
 #: waeup/kofa/students/viewlets.py:99
 #: waeup/kofa/students/browser_templates/basemanagepage.pt:6
@@ -3366,17 +3286,14 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:109
-#: waeup/kofa/students/viewlets.py:533
+#: waeup/kofa/students/viewlets.py:109 waeup/kofa/students/viewlets.py:533
 msgid "Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:131
-#: waeup/kofa/students/viewlets.py:537
+#: waeup/kofa/students/viewlets.py:131 waeup/kofa/students/viewlets.py:537
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:27
 msgid "History"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:179
-#: waeup/kofa/students/workflow.py:72
+#: waeup/kofa/students/viewlets.py:179 waeup/kofa/students/workflow.py:72
 msgid "Clear student"
 msgstr ""
@@ -3394,6 +3311,5 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:251
-#: waeup/kofa/students/workflow.py:128
+#: waeup/kofa/students/viewlets.py:251 waeup/kofa/students/workflow.py:128
 msgid "Validate courses"
 msgstr ""
@@ -3495,21 +3411,17 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:703
-#: waeup/kofa/students/viewlets.py:714
+#: waeup/kofa/students/viewlets.py:703 waeup/kofa/students/viewlets.py:714
 msgid "Birth Certificate"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:704
-#: waeup/kofa/students/viewlets.py:715
+#: waeup/kofa/students/viewlets.py:704 waeup/kofa/students/viewlets.py:715
 msgid "Birth Certificate Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:724
-#: waeup/kofa/students/viewlets.py:735
+#: waeup/kofa/students/viewlets.py:724 waeup/kofa/students/viewlets.py:735
 msgid "Acceptance Letter"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:725
-#: waeup/kofa/students/viewlets.py:736
+#: waeup/kofa/students/viewlets.py:725 waeup/kofa/students/viewlets.py:736
 msgid "Acceptance Letter Scan"
 msgstr ""
@@ -3573,11 +3485,9 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:121
-#: waeup/kofa/students/workflow.py:135
+#: waeup/kofa/students/workflow.py:121 waeup/kofa/students/workflow.py:135
 msgid "Reset to paid"
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:122
-#: waeup/kofa/students/workflow.py:136
+#: waeup/kofa/students/workflow.py:122 waeup/kofa/students/workflow.py:136
 msgid "Student record reset to 'paid'"
 msgstr ""
@@ -3639,11 +3549,9 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:65
-#: waeup/kofa/students/workflow.py:79
+#: waeup/kofa/students/workflow.py:65 waeup/kofa/students/workflow.py:79
 msgid "Reset to clearance"
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:66
-#: waeup/kofa/students/workflow.py:80
+#: waeup/kofa/students/workflow.py:66 waeup/kofa/students/workflow.py:80
 msgid "Student record reset to 'clearance'"
 msgstr ""
@@ -3653,11 +3561,9 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:86
-#: waeup/kofa/students/workflow.py:100
+#: waeup/kofa/students/workflow.py:86 waeup/kofa/students/workflow.py:100
 msgid "Pay school fee"
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:87
-#: waeup/kofa/students/workflow.py:101
+#: waeup/kofa/students/workflow.py:87 waeup/kofa/students/workflow.py:101
 msgid "School fee paid"
 msgstr ""
@@ -3787,5 +3693,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:119
+#: waeup/kofa/utils/utils.py:122
 msgid ""
 "Fullname: ${a}\n"
@@ -3797,5 +3703,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:164
+#: waeup/kofa/utils/utils.py:167
 msgid ""
 "Dear ${a},\n"
@@ -3825,3 +3731,2 @@
 msgid "remove-selected-items"
 msgstr ""
-
Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/imageupload.pt
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/imageupload.pt	(revision 7827)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/imageupload.pt	(revision 7828)
@@ -16,5 +16,6 @@
       <input type="submit"
                tal:attributes="id python:('upload_%s' % viewlet.input_name);
-                  name python:('upload_%s' % viewlet.input_name)"
+                  name python:('upload_%s' % viewlet.input_name);
+                  value viewlet/upload_button"
                value="Upload" class="btn primary" />
       <span i18n:translate="">
