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 7881)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/de/LC_MESSAGES/waeup.kofa.po	(revision 7882)
@@ -15,6 +15,6 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Sun Mar 11 16:45:08 2012\n"
-"PO-Revision-Date: 2012-03-11 16:46+0100\n"
+"POT-Creation-Date: Wed Mar 14 10:35:59 2012\n"
+"PO-Revision-Date: 2012-03-14 16:36+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
 "Language-Team: WAeUP Germany <henrik@waeup.org>\n"
@@ -37,36 +37,36 @@
 #: waeup/kofa/applicants/browser.py:256
 #: waeup/kofa/applicants/browser.py:339
-#: 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:505
+#: waeup/kofa/browser/pages.py:710
+#: waeup/kofa/browser/pages.py:737
+#: waeup/kofa/browser/pages.py:760
+#: waeup/kofa/browser/pages.py:807
+#: waeup/kofa/browser/pages.py:837
+#: waeup/kofa/browser/pages.py:957
+#: waeup/kofa/browser/pages.py:1185
+#: waeup/kofa/browser/pages.py:1279
+#: waeup/kofa/browser/pages.py:1300
+#: waeup/kofa/browser/pages.py:1327
+#: waeup/kofa/browser/pages.py:1355
+#: waeup/kofa/browser/pages.py:1356
+#: waeup/kofa/browser/pages.py:1402
+#: waeup/kofa/browser/pages.py:1443
+#: waeup/kofa/browser/pages.py:1522
 #: 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:1525
+#: waeup/kofa/browser/pages.py:1603
+#: waeup/kofa/browser/pages.py:1648
+#: waeup/kofa/browser/pages.py:1686
+#: waeup/kofa/browser/pages.py:1730
 #: 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:580
-#: waeup/kofa/students/browser.py:581
-#: waeup/kofa/students/browser.py:742
-#: waeup/kofa/students/browser.py:744
-#: waeup/kofa/students/browser.py:884
+#: waeup/kofa/browser/pages.py:1771
+#: waeup/kofa/browser/pages.py:1806
+#: waeup/kofa/browser/pages.py:1857
+#: waeup/kofa/browser/pages.py:1909
+#: waeup/kofa/students/browser.py:583
+#: waeup/kofa/students/browser.py:584
+#: waeup/kofa/students/browser.py:745
+#: waeup/kofa/students/browser.py:747
+#: waeup/kofa/students/browser.py:887
 msgid "Cancel"
 msgstr "Abbruch"
@@ -107,9 +107,9 @@
 
 #: waeup/kofa/accesscodes/browser.py:153
-#: waeup/kofa/browser/pages.py:592
-#: waeup/kofa/browser/pages.py:1142
+#: waeup/kofa/browser/pages.py:594
+#: waeup/kofa/browser/pages.py:1144
 #: waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:167
-#: waeup/kofa/students/browser.py:201
+#: waeup/kofa/students/browser.py:169
+#: waeup/kofa/students/browser.py:203
 msgid "Search"
 msgstr "Suchen"
@@ -371,5 +371,5 @@
 #: waeup/kofa/applicants/browser.py:117
 #: waeup/kofa/applicants/browser.py:326
-#: waeup/kofa/applicants/browser.py:746
+#: waeup/kofa/applicants/browser.py:747
 msgid "Could not delete:"
 msgstr "Konnte nicht gelöscht werden:"
@@ -378,12 +378,12 @@
 #: waeup/kofa/applicants/browser.py:120
 #: waeup/kofa/applicants/browser.py:329
-#: waeup/kofa/applicants/browser.py:749
-#: waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:239
-#: waeup/kofa/students/browser.py:638
-#: waeup/kofa/students/browser.py:792
-#: waeup/kofa/students/browser.py:970
-#: waeup/kofa/students/browser.py:1180
-#: waeup/kofa/students/browser.py:1766
+#: waeup/kofa/applicants/browser.py:750
+#: waeup/kofa/browser/pages.py:135
+#: waeup/kofa/students/browser.py:241
+#: waeup/kofa/students/browser.py:641
+#: waeup/kofa/students/browser.py:795
+#: waeup/kofa/students/browser.py:973
+#: waeup/kofa/students/browser.py:1183
+#: waeup/kofa/students/browser.py:1770
 msgid "Successfully removed: ${a}"
 msgstr "Erfolgreich entfernt: ${a}"
@@ -406,34 +406,34 @@
 #: waeup/kofa/applicants/browser.py:255
 #: waeup/kofa/applicants/browser.py:302
-#: waeup/kofa/applicants/browser.py:655
-#: waeup/kofa/applicants/browser.py:689
-#: waeup/kofa/applicants/browser.py:792
-#: waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:839
-#: 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/applicants/browser.py:656
+#: waeup/kofa/applicants/browser.py:690
+#: waeup/kofa/applicants/browser.py:793
+#: waeup/kofa/applicants/browser.py:796
+#: waeup/kofa/applicants/browser.py:840
+#: waeup/kofa/browser/pages.py:478
+#: waeup/kofa/browser/pages.py:633
+#: waeup/kofa/browser/pages.py:656
+#: waeup/kofa/browser/pages.py:730
+#: waeup/kofa/browser/pages.py:1183
+#: waeup/kofa/browser/pages.py:1355
+#: waeup/kofa/browser/pages.py:1396
+#: waeup/kofa/browser/pages.py:1522
+#: waeup/kofa/browser/pages.py:1575
+#: waeup/kofa/browser/pages.py:1718
+#: waeup/kofa/browser/pages.py:1769
+#: waeup/kofa/browser/pages.py:1790
 #: waeup/kofa/hostels/browser.py:209
 #: waeup/kofa/hostels/browser.py:231
 #: waeup/kofa/hostels/browser.py:318
-#: waeup/kofa/students/browser.py:355
-#: waeup/kofa/students/browser.py:454
-#: waeup/kofa/students/browser.py:531
-#: waeup/kofa/students/browser.py:580
-#: waeup/kofa/students/browser.py:596
-#: waeup/kofa/students/browser.py:742
-#: waeup/kofa/students/browser.py:767
-#: waeup/kofa/students/browser.py:1440
-#: waeup/kofa/students/browser.py:1455
-#: waeup/kofa/students/browser.py:1570
+#: waeup/kofa/students/browser.py:358
+#: waeup/kofa/students/browser.py:457
+#: waeup/kofa/students/browser.py:534
+#: waeup/kofa/students/browser.py:583
+#: waeup/kofa/students/browser.py:599
+#: waeup/kofa/students/browser.py:745
+#: waeup/kofa/students/browser.py:770
+#: waeup/kofa/students/browser.py:1444
+#: waeup/kofa/students/browser.py:1459
+#: waeup/kofa/students/browser.py:1574
 msgid "Save"
 msgstr "Speichern"
@@ -441,5 +441,5 @@
 #: waeup/kofa/applicants/browser.py:256
 #: waeup/kofa/applicants/browser.py:334
-#: waeup/kofa/applicants/browser.py:362
+#: waeup/kofa/applicants/browser.py:363
 msgid "Add applicant"
 msgstr "Antragsteller hinzufügen"
@@ -451,12 +451,12 @@
 
 #: waeup/kofa/applicants/browser.py:306
-#: waeup/kofa/applicants/browser.py:718
-#: 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/applicants/browser.py:719
+#: waeup/kofa/browser/pages.py:1399
+#: waeup/kofa/browser/pages.py:1721
+#: waeup/kofa/browser/pages.py:1793
+#: waeup/kofa/browser/pages.py:1905
 #: waeup/kofa/hostels/browser.py:54
-#: waeup/kofa/students/browser.py:80
-#: waeup/kofa/students/browser.py:381
+#: waeup/kofa/students/browser.py:82
+#: waeup/kofa/students/browser.py:384
 msgid "Form has been saved."
 msgstr "Das Formular wurde gespeichert."
@@ -466,73 +466,73 @@
 msgstr "Nichts ausgewählt!"
 
-#: waeup/kofa/applicants/browser.py:365
+#: waeup/kofa/applicants/browser.py:366
 msgid "Create application record"
 msgstr "Antrag hinzufügen"
 
-#: waeup/kofa/applicants/browser.py:370
+#: waeup/kofa/applicants/browser.py:371
 msgid "Applicant record created."
 msgstr "Antrag wurde erzeugt."
 
-#: waeup/kofa/applicants/browser.py:383
+#: waeup/kofa/applicants/browser.py:384
 msgid "Applicant"
 msgstr "Antragsteller"
 
-#: waeup/kofa/applicants/browser.py:398
-#: waeup/kofa/students/browser.py:281
+#: waeup/kofa/applicants/browser.py:399
+#: waeup/kofa/students/browser.py:283
 msgid "set"
 msgstr "gesetzt"
 
-#: waeup/kofa/applicants/browser.py:399
-#: waeup/kofa/students/browser.py:282
+#: waeup/kofa/applicants/browser.py:400
+#: waeup/kofa/students/browser.py:284
 msgid "unset"
 msgstr "ungesetzt"
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:404
+#: waeup/kofa/applicants/browser.py:405
 msgid "${a} Application Record ${b}"
 msgstr "${a} Antrag ${b}"
 
-#: waeup/kofa/applicants/browser.py:455
+#: waeup/kofa/applicants/browser.py:456
 msgid "Session configuration object is not available."
 msgstr "Session-Konfiguration ist nicht verfügbar."
 
-#: waeup/kofa/applicants/browser.py:462
-#: waeup/kofa/students/browser.py:1019
+#: waeup/kofa/applicants/browser.py:463
+#: waeup/kofa/students/browser.py:1022
 msgid "This type of payment has already been made."
 msgstr "Diese Bezahlung wurde bereits ausgeführt."
 
-#: waeup/kofa/applicants/browser.py:475
-#: waeup/kofa/students/browser.py:1033
+#: waeup/kofa/applicants/browser.py:476
+#: waeup/kofa/students/browser.py:1036
 msgid "Payment ticket created."
 msgstr "Bezahl-Ticket wurde erzeugt."
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:502
-#: waeup/kofa/students/browser.py:1052
+#: waeup/kofa/applicants/browser.py:503
+#: waeup/kofa/students/browser.py:1055
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr "${a}: Online-Bezahl-Ticket ${b}"
 
-#: waeup/kofa/applicants/browser.py:530
-#: waeup/kofa/students/browser.py:1101
+#: waeup/kofa/applicants/browser.py:531
+#: waeup/kofa/students/browser.py:1104
 msgid "Valid callback received."
 msgstr "Gültigen Rückruf erhalten."
 
-#: waeup/kofa/applicants/browser.py:551
+#: waeup/kofa/applicants/browser.py:552
 msgid "Payment Data"
 msgstr "Zahlung"
 
-#: waeup/kofa/applicants/browser.py:557
+#: waeup/kofa/applicants/browser.py:558
 msgid "Online Payment Receipt"
 msgstr "Quittung"
 
-#: waeup/kofa/applicants/browser.py:563
+#: waeup/kofa/applicants/browser.py:564
 msgid "Ticket not yet paid."
 msgstr "Ticket wurde noch nicht bezahlt."
 
-#: waeup/kofa/applicants/browser.py:628
+#: waeup/kofa/applicants/browser.py:629
 msgid "Uploaded image is too big!"
 msgstr "Das hochgeladene Bild ist zu groß!"
 
-#: waeup/kofa/applicants/browser.py:633
+#: waeup/kofa/applicants/browser.py:634
 msgid "jpg file extension expected."
 msgstr "jpg-Dateiendung erwartet."
@@ -542,42 +542,42 @@
 msgstr "Antragstellung"
 
-#: waeup/kofa/applicants/browser.py:655
-#: waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:847
+#: waeup/kofa/applicants/browser.py:656
+#: waeup/kofa/applicants/browser.py:796
+#: waeup/kofa/applicants/browser.py:848
 msgid "Final Submit"
 msgstr "Endgültiges Einreichen"
 
-#: waeup/kofa/applicants/browser.py:656
-#: waeup/kofa/applicants/browser.py:759
-#: waeup/kofa/applicants/browser.py:793
-#: waeup/kofa/applicants/browser.py:828
-#: waeup/kofa/students/browser.py:976
+#: waeup/kofa/applicants/browser.py:657
+#: waeup/kofa/applicants/browser.py:760
+#: waeup/kofa/applicants/browser.py:794
+#: waeup/kofa/applicants/browser.py:829
+#: waeup/kofa/students/browser.py:979
 msgid "Add online payment ticket"
 msgstr "Ticket für Online-Bezahlung hinzufügen"
 
-#: waeup/kofa/applicants/browser.py:656
-#: waeup/kofa/applicants/browser.py:764
-#: waeup/kofa/applicants/browser.py:793
-#: waeup/kofa/applicants/browser.py:796
-#: waeup/kofa/applicants/browser.py:833
-#: waeup/kofa/students/browser.py:744
-#: waeup/kofa/students/browser.py:776
-#: waeup/kofa/students/browser.py:952
-#: waeup/kofa/students/browser.py:1748
+#: waeup/kofa/applicants/browser.py:657
+#: waeup/kofa/applicants/browser.py:765
+#: waeup/kofa/applicants/browser.py:794
+#: waeup/kofa/applicants/browser.py:797
+#: waeup/kofa/applicants/browser.py:834
+#: waeup/kofa/students/browser.py:747
+#: waeup/kofa/students/browser.py:779
+#: waeup/kofa/students/browser.py:955
+#: waeup/kofa/students/browser.py:1752
 msgid "Remove selected tickets"
 msgstr "Ausgewählte Tickets löschen"
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:675
+#: waeup/kofa/applicants/browser.py:676
 msgid "${a} Application Form ${b}"
 msgstr "${a} Antragsformular ${b}"
 
-#: waeup/kofa/applicants/browser.py:686
-#: waeup/kofa/students/browser.py:352
+#: waeup/kofa/applicants/browser.py:687
+#: waeup/kofa/students/browser.py:355
 msgid "No transition"
 msgstr "Keine Änderung"
 
-#: waeup/kofa/applicants/browser.py:733
-#: waeup/kofa/students/browser.py:958
+#: waeup/kofa/applicants/browser.py:734
+#: waeup/kofa/students/browser.py:961
 msgid "No payment selected."
 msgstr "Nichts ausgewählt!"
@@ -592,14 +592,14 @@
 #: waeup/kofa/applicants/browser.py:256
 #: waeup/kofa/applicants/browser.py:309
-#: 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/browser/pages.py:636
+#: waeup/kofa/browser/pages.py:677
+#: waeup/kofa/browser/pages.py:1279
+#: waeup/kofa/browser/pages.py:1290
+#: waeup/kofa/browser/pages.py:1356
+#: waeup/kofa/browser/pages.py:1391
 #: waeup/kofa/hostels/browser.py:131
-#: waeup/kofa/students/browser.py:202
-#: waeup/kofa/students/browser.py:1147
-#: waeup/kofa/students/browser.py:1160
+#: waeup/kofa/students/browser.py:204
+#: waeup/kofa/students/browser.py:1150
+#: waeup/kofa/students/browser.py:1163
 msgid "Remove selected"
 msgstr "Ausgewählte Objekte löschen"
@@ -612,6 +612,6 @@
 msgstr "Ordner für Antragsteller hinzufügen"
 
-#: waeup/kofa/applicants/browser.py:806
-#: waeup/kofa/students/browser.py:88
+#: waeup/kofa/applicants/browser.py:807
+#: waeup/kofa/students/browser.py:90
 msgid "The requested form is locked (read-only)."
 msgstr "Dieses Formular ist gesperrt."
@@ -621,10 +621,10 @@
 #: waeup/kofa/applicants/browser.py:257
 #: waeup/kofa/applicants/browser.py:348
-#: 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/browser/pages.py:1357
+#: waeup/kofa/browser/pages.py:1416
+#: waeup/kofa/browser/pages.py:1526
+#: waeup/kofa/browser/pages.py:1612
+#: waeup/kofa/browser/pages.py:1772
+#: waeup/kofa/browser/pages.py:1829
 msgid "Remove selected local roles"
 msgstr "Ausgewählte lokale Rollen löschen"
@@ -634,18 +634,18 @@
 #: waeup/kofa/applicants/browser.py:258
 #: waeup/kofa/applicants/browser.py:344
-#: 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/browser/pages.py:1358
+#: waeup/kofa/browser/pages.py:1412
+#: waeup/kofa/browser/pages.py:1527
+#: waeup/kofa/browser/pages.py:1608
+#: waeup/kofa/browser/pages.py:1773
+#: waeup/kofa/browser/pages.py:1825
 msgid "Add local role"
 msgstr "Lokale Rolle hinzufügen"
 
-#: waeup/kofa/applicants/browser.py:820
+#: waeup/kofa/applicants/browser.py:821
 msgid "No passport picture uploaded."
 msgstr "Es wurde noch kein Passbild hochgeladen."
 
-#: waeup/kofa/applicants/browser.py:822
+#: waeup/kofa/applicants/browser.py:823
 msgid "Passport picture confirmation box not ticked."
 msgstr "Bitte bestätigen Sie das Passbild."
@@ -655,39 +655,39 @@
 msgstr "Ordner für Antragsteller"
 
-#: waeup/kofa/applicants/browser.py:859
-#: waeup/kofa/students/browser.py:1615
+#: waeup/kofa/applicants/browser.py:860
+#: waeup/kofa/students/browser.py:1619
 msgid "This form cannot be submitted. Wrong state!"
 msgstr "Dieses Formular kann nicht abgesendet werden, da Sie den falschen Antragsstatus haben."
 
-#: waeup/kofa/applicants/browser.py:864
+#: waeup/kofa/applicants/browser.py:865
 msgid "Form has been submitted."
 msgstr "Das Formular wurde eingereicht."
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:899
+#: waeup/kofa/applicants/browser.py:900
 msgid "Register for ${a} Application"
 msgstr "Antragstellung für ${a}"
 
-#: waeup/kofa/applicants/browser.py:905
+#: waeup/kofa/applicants/browser.py:906
 msgid "Application has not yet started."
 msgstr "Antragszeitraum hat noch nicht begonnen."
 
-#: waeup/kofa/applicants/browser.py:910
+#: waeup/kofa/applicants/browser.py:911
 msgid "Application has ended."
 msgstr "Antragszeitraum ist beendet."
 
-#: waeup/kofa/applicants/browser.py:919
+#: waeup/kofa/applicants/browser.py:920
 msgid "Get login credentials"
 msgstr "Zugangsdaten zusenden"
 
-#: waeup/kofa/applicants/browser.py:934
+#: waeup/kofa/applicants/browser.py:935
 msgid "You have successfully been registered for the"
 msgstr "Sie haben sich erfolgreich registriert für"
 
-#: waeup/kofa/applicants/browser.py:941
+#: waeup/kofa/applicants/browser.py:942
 msgid "Email could not been sent. Please retry later."
 msgstr "Email konnte nicht versendet werden. Bitte versuchen Sie es später noch einmal."
 
-#: waeup/kofa/applicants/browser.py:950
+#: waeup/kofa/applicants/browser.py:951
 msgid "Your registration was successful."
 msgstr "Ihre Registrierung war erfolgreich."
@@ -751,6 +751,14 @@
 msgstr "Beantragungsszeitraum"
 
-#: waeup/kofa/applicants/interfaces.py:197
-#: waeup/kofa/students/browser.py:709
+#: waeup/kofa/applicants/container.py:52
+msgid "Basic"
+msgstr "Basisantragstellung"
+
+#: waeup/kofa/applicants/container.py:55
+msgid "handles basic applicants"
+msgstr "für Antragsteller aller Art"
+
+#: waeup/kofa/applicants/interfaces.py:198
+#: waeup/kofa/students/browser.py:712
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -776,6 +784,6 @@
 msgstr "Kürzel"
 
-#: waeup/kofa/applicants/interfaces.py:204
-#: waeup/kofa/students/browser.py:710
+#: waeup/kofa/applicants/interfaces.py:205
+#: waeup/kofa/students/browser.py:713
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -796,130 +804,130 @@
 msgstr "Titel"
 
-#: waeup/kofa/applicants/interfaces.py:211
-#: waeup/kofa/applicants/interfaces.py:324
+#: waeup/kofa/applicants/interfaces.py:212
+#: waeup/kofa/applicants/interfaces.py:325
 msgid "Application Target"
 msgstr "Antragsobjekt (Programm)"
 
-#: waeup/kofa/applicants/interfaces.py:219
+#: waeup/kofa/applicants/interfaces.py:220
 msgid "Entry Level"
 msgstr "Einstiegslevel"
 
-#: waeup/kofa/applicants/interfaces.py:226
-#: waeup/kofa/applicants/interfaces.py:332
+#: waeup/kofa/applicants/interfaces.py:227
+#: waeup/kofa/applicants/interfaces.py:333
 msgid "Year of Entrance"
 msgstr "Eingangsjahr"
 
-#: waeup/kofa/applicants/interfaces.py:234
-#: waeup/kofa/applicants/interfaces.py:340
+#: waeup/kofa/applicants/interfaces.py:235
+#: waeup/kofa/applicants/interfaces.py:341
 msgid "Applicants Container Type"
 msgstr "Ordnertyp"
 
-#: waeup/kofa/applicants/interfaces.py:250
+#: waeup/kofa/applicants/interfaces.py:251
 msgid "Category for the grouping of certificates"
 msgstr "Kategorie für die Gruppierung von Zertifikaten"
 
-#: waeup/kofa/applicants/interfaces.py:257
+#: waeup/kofa/applicants/interfaces.py:258
 msgid "Human readable description in reST format"
 msgstr "Lesbare Beschreibung im reST-Format"
 
-#: waeup/kofa/applicants/interfaces.py:273
+#: waeup/kofa/applicants/interfaces.py:274
 msgid "Application Start Date"
 msgstr "Beginn der Antragsperiode"
 
-#: waeup/kofa/applicants/interfaces.py:279
+#: waeup/kofa/applicants/interfaces.py:280
 msgid "Application Closing Date"
 msgstr "Ende der Antragsperiode"
 
-#: waeup/kofa/applicants/interfaces.py:285
+#: waeup/kofa/applicants/interfaces.py:286
 msgid "Forbid additions after deadline (enddate)"
 msgstr "Antragstellung nach Ablauf der Antragsfrist verbieten"
 
-#: waeup/kofa/applicants/interfaces.py:368
+#: waeup/kofa/applicants/interfaces.py:369
 msgid "Applicant Id"
 msgstr "Antragsteller Id"
 
-#: waeup/kofa/applicants/interfaces.py:373
+#: waeup/kofa/applicants/interfaces.py:374
 msgid "JAMB Registration Number"
 msgstr "JAMB Regsistrierungsnummer"
 
-#: waeup/kofa/applicants/interfaces.py:385
-#: waeup/kofa/students/interfaces.py:154
+#: waeup/kofa/applicants/interfaces.py:386
+#: waeup/kofa/students/interfaces.py:162
 msgid "First Name"
 msgstr "Vorname"
 
-#: waeup/kofa/applicants/interfaces.py:389
-#: waeup/kofa/students/interfaces.py:159
+#: waeup/kofa/applicants/interfaces.py:390
+#: waeup/kofa/students/interfaces.py:167
 msgid "Middle Name"
 msgstr "Zweiter Vorname"
 
-#: waeup/kofa/applicants/interfaces.py:393
-#: waeup/kofa/students/interfaces.py:164
+#: waeup/kofa/applicants/interfaces.py:394
+#: waeup/kofa/students/interfaces.py:172
 msgid "Last Name (Surname)"
 msgstr "Nachname"
 
-#: waeup/kofa/applicants/interfaces.py:397
-#: waeup/kofa/students/interfaces.py:213
+#: waeup/kofa/applicants/interfaces.py:398
+#: waeup/kofa/students/interfaces.py:221
 msgid "Date of Birth"
 msgstr "Geburtsdatum"
 
-#: waeup/kofa/applicants/interfaces.py:402
+#: waeup/kofa/applicants/interfaces.py:403
 msgid "State/LGA"
 msgstr "State/LGA"
 
-#: waeup/kofa/applicants/interfaces.py:407
-#: waeup/kofa/students/interfaces.py:169
+#: waeup/kofa/applicants/interfaces.py:408
+#: waeup/kofa/students/interfaces.py:177
 msgid "Sex"
 msgstr "Geschlecht"
 
-#: waeup/kofa/applicants/interfaces.py:413
-#: waeup/kofa/interfaces.py:373
-#: waeup/kofa/interfaces.py:399
-#: waeup/kofa/students/interfaces.py:490
+#: waeup/kofa/applicants/interfaces.py:414
+#: waeup/kofa/interfaces.py:388
+#: waeup/kofa/interfaces.py:414
+#: waeup/kofa/students/interfaces.py:498
 msgid "Email Address"
 msgstr "Emailadresse"
 
-#: waeup/kofa/applicants/interfaces.py:418
-#: waeup/kofa/interfaces.py:378
-#: waeup/kofa/interfaces.py:406
-#: waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/applicants/interfaces.py:419
+#: waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:421
+#: waeup/kofa/students/interfaces.py:211
 msgid "Phone"
 msgstr "Telefon"
 
-#: waeup/kofa/applicants/interfaces.py:423
-#: waeup/kofa/applicants/interfaces.py:509
+#: waeup/kofa/applicants/interfaces.py:424
+#: waeup/kofa/applicants/interfaces.py:510
 msgid "1st Choice Course of Study"
 msgstr "Studienfach (1. Wahl)"
 
-#: waeup/kofa/applicants/interfaces.py:428
-#: waeup/kofa/applicants/interfaces.py:514
+#: waeup/kofa/applicants/interfaces.py:429
+#: waeup/kofa/applicants/interfaces.py:515
 msgid "2nd Choice Course of Study"
 msgstr "Studienfach (2. Wahl)"
 
-#: waeup/kofa/applicants/interfaces.py:433
+#: waeup/kofa/applicants/interfaces.py:434
 msgid "School Grades"
 msgstr "Schulnoten"
 
-#: waeup/kofa/applicants/interfaces.py:443
-#: waeup/kofa/applicants/interfaces.py:519
+#: waeup/kofa/applicants/interfaces.py:444
+#: waeup/kofa/applicants/interfaces.py:520
 msgid "Screening Score"
 msgstr "Screening-Score"
 
-#: waeup/kofa/applicants/interfaces.py:447
-#: waeup/kofa/applicants/interfaces.py:524
+#: waeup/kofa/applicants/interfaces.py:448
+#: waeup/kofa/applicants/interfaces.py:525
 msgid "Screening Venue"
 msgstr "Screening-Ort"
 
-#: waeup/kofa/applicants/interfaces.py:451
-#: waeup/kofa/applicants/interfaces.py:529
+#: waeup/kofa/applicants/interfaces.py:452
+#: waeup/kofa/applicants/interfaces.py:530
 msgid "Admitted Course of Study"
 msgstr "Zugelassenes Studienfach"
 
-#: waeup/kofa/applicants/interfaces.py:457
-#: waeup/kofa/applicants/interfaces.py:536
+#: waeup/kofa/applicants/interfaces.py:458
+#: waeup/kofa/applicants/interfaces.py:537
 msgid "Notice"
 msgstr "Bemerkung"
 
-#: waeup/kofa/applicants/interfaces.py:479
-#: waeup/kofa/students/interfaces.py:149
+#: waeup/kofa/applicants/interfaces.py:480
+#: waeup/kofa/students/interfaces.py:157
 #: waeup/kofa/browser/templates/showstudentspage.pt:4
 #: waeup/kofa/students/browser_templates/containerpage.pt:29
@@ -928,10 +936,10 @@
 msgstr "Studenten Id"
 
-#: waeup/kofa/applicants/interfaces.py:484
+#: waeup/kofa/applicants/interfaces.py:485
 msgid "Form locked"
 msgstr "Formular gesperrt"
 
-#: waeup/kofa/applicants/interfaces.py:563
-#: waeup/kofa/students/interfaces.py:469
+#: waeup/kofa/applicants/interfaces.py:564
+#: waeup/kofa/students/interfaces.py:477
 msgid "Payment Session"
 msgstr "Session der Zahlung"
@@ -949,5 +957,5 @@
 msgstr "Fakultät:"
 
-#: waeup/kofa/applicants/pdf.py:185
+#: waeup/kofa/applicants/pdf.py:186
 #: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:26
 msgid "Admitted Course of Study:"
@@ -955,9 +963,9 @@
 
 #. Default: ""
-#: waeup/kofa/applicants/pdf.py:203
+#: waeup/kofa/applicants/pdf.py:204
 msgid "<font size=10>Proceed to the login page of the portal and enter your new credentials: user name= ${a}, password = ${b}.</font>"
 msgstr "<font size=10>Gehen Sie zur Login-Seite des Portals und geben Sie die neuen Zugansdaten ein: Benutzername= ${a}, Passwort = ${b}.</font>"
 
-#: waeup/kofa/applicants/pdf.py:209
+#: waeup/kofa/applicants/pdf.py:210
 msgid "<font size=10>Change your password when you have  logged in.</font>"
 msgstr "<font size=10>Ändern Sie Ihr Passwort, sobald Sie sich eingeloggt haben.</font>"
@@ -989,5 +997,5 @@
 #: waeup/kofa/applicants/viewlets.py:151
 #: waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:254
+#: waeup/kofa/students/browser.py:256
 msgid "Create student record"
 msgstr "Studenten erzeugen"
@@ -1122,5 +1130,5 @@
 
 #: waeup/kofa/browser/breadcrumbs.py:123
-#: waeup/kofa/browser/pages.py:309
+#: waeup/kofa/browser/pages.py:310
 msgid "Administration"
 msgstr "Verwaltung"
@@ -1133,5 +1141,5 @@
 
 #: waeup/kofa/browser/breadcrumbs.py:148
-#: waeup/kofa/browser/pages.py:386
+#: waeup/kofa/browser/pages.py:387
 #: waeup/kofa/browser/viewlets.py:375
 #: waeup/kofa/browser/viewlets.py:676
@@ -1140,6 +1148,6 @@
 
 #: waeup/kofa/browser/breadcrumbs.py:155
-#: waeup/kofa/browser/pages.py:748
-#: waeup/kofa/browser/pages.py:1140
+#: waeup/kofa/browser/pages.py:750
+#: waeup/kofa/browser/pages.py:1142
 #: waeup/kofa/browser/viewlets.py:393
 #: waeup/kofa/browser/viewlets.py:685
@@ -1151,142 +1159,166 @@
 msgstr "Startseite"
 
-#: waeup/kofa/browser/pages.py:1016
+#: waeup/kofa/browser/pages.py:1018
 msgid "Edit headers or replace imported file!"
 msgstr "Bearbeiten Sie die Spaltenüberschrift oder tauschen Sie die Importdatei aus."
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:103
+#: waeup/kofa/browser/pages.py:104
 msgid "Local role successfully removed: ${a}"
 msgstr "Lokale Rolle erfolgreich entfernt: ${a}"
 
-#: waeup/kofa/browser/pages.py:1063
+#: waeup/kofa/browser/pages.py:1065
 msgid "View processing log"
 msgstr "Logdatei betrachten"
 
-#: waeup/kofa/browser/pages.py:1064
+#: waeup/kofa/browser/pages.py:1066
 msgid "Back to data center"
 msgstr "Zurück zum Datenzentrum"
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1108
+#: waeup/kofa/browser/pages.py:1110
 msgid "Processing of ${a} rows failed."
 msgstr "Bearbeitung von ${a} Zeilen fehlgeschlagen."
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1110
+#: waeup/kofa/browser/pages.py:1112
 msgid "Successfully processed ${a} rows."
 msgstr "${a} Zeilen erfolgreich verarbeitet."
 
-#: waeup/kofa/browser/pages.py:1118
+#: waeup/kofa/browser/pages.py:1120
 msgid "Show logfiles"
 msgstr "Logdateien anzeigen"
 
-#: waeup/kofa/browser/pages.py:1120
+#: waeup/kofa/browser/pages.py:1122
 msgid "Back to Data Center"
 msgstr "Zurück zum Datenzentrum"
 
-#: waeup/kofa/browser/pages.py:1121
+#: waeup/kofa/browser/pages.py:1123
 msgid "Show"
 msgstr "Zeigen"
 
-#: waeup/kofa/browser/pages.py:113
+#: waeup/kofa/browser/pages.py:114
 #: waeup/kofa/hostels/browser.py:256
 #: waeup/kofa/hostels/browser.py:286
-#: waeup/kofa/students/browser.py:226
+#: waeup/kofa/students/browser.py:228
 msgid "No item selected."
 msgstr "Nichts ausgewählt."
 
-#: waeup/kofa/browser/pages.py:1143
+#: waeup/kofa/browser/pages.py:1145
 msgid "Back"
 msgstr "Zurück"
 
-#: waeup/kofa/browser/pages.py:1151
+#: waeup/kofa/browser/pages.py:1153
 msgid "Log files can only be searched on Unix-based operating systems."
 msgstr "Logdateien können nur auf Unix-basierten Betriebsystem durchsucht werden."
 
-#: waeup/kofa/browser/pages.py:1179
+#: waeup/kofa/browser/pages.py:1181
 msgid "Edit data center settings"
 msgstr "Einstellungen des Datenzentrums bearbeiten"
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1199
+#: waeup/kofa/browser/pages.py:1201
 msgid "File already existed (not copied): ${a}"
 msgstr "Datei existiert (nicht kopiert): ${a}"
 
-#: waeup/kofa/browser/pages.py:1202
+#: waeup/kofa/browser/pages.py:1204
 msgid "Given storage path cannot be used."
 msgstr "Der Datenpfad kann nicht verwendet werden."
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1203
+#: waeup/kofa/browser/pages.py:1205
 msgid "Error: ${a}"
 msgstr "Fehler: ${a}"
 
-#: waeup/kofa/browser/pages.py:1206
+#: waeup/kofa/browser/pages.py:1208
 msgid "New storage path succefully set."
 msgstr "Neuen Datenpfad erfolgreich gesetzt."
 
-#: waeup/kofa/browser/pages.py:1265
+#: waeup/kofa/browser/pages.py:1267
 msgid "Academic Section"
 msgstr "Akademie"
 
-#: 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:1279
+#: waeup/kofa/browser/pages.py:1295
+#: waeup/kofa/browser/pages.py:1312
+#: waeup/kofa/browser/pages.py:1316
 msgid "Add faculty"
 msgstr "Fakultät hinzufügen"
 
-#: waeup/kofa/browser/pages.py:1278
+#: waeup/kofa/browser/pages.py:1280
 msgid "Faculties"
 msgstr "Fakultäten"
 
-#: waeup/kofa/browser/pages.py:1282
+#: waeup/kofa/browser/pages.py:1284
 #: waeup/kofa/browser/viewlets.py:441
 msgid "Manage academic section"
 msgstr "Akademie verwalten"
 
-#: waeup/kofa/browser/pages.py:1321
+#: waeup/kofa/browser/pages.py:1323
 msgid "The faculty code chosen already exists."
 msgstr "Das Fakultätskürzel existiert bereits."
 
-#: waeup/kofa/browser/pages.py:1342
-#: waeup/kofa/browser/pages.py:1352
+#: waeup/kofa/browser/pages.py:1344
+#: waeup/kofa/browser/pages.py:1354
 msgid "Departments"
 msgstr "Departments"
 
-#: 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:1356
+#: waeup/kofa/browser/pages.py:1407
+#: waeup/kofa/browser/pages.py:1426
+#: waeup/kofa/browser/pages.py:1430
 msgid "Add department"
 msgstr "Department hinzufügen"
 
-#: waeup/kofa/browser/pages.py:1362
+#: waeup/kofa/browser/pages.py:1364
 #: waeup/kofa/browser/viewlets.py:457
 msgid "Manage faculty"
 msgstr "Fakultät verwalten"
 
-#: waeup/kofa/browser/pages.py:1435
+#: waeup/kofa/browser/pages.py:1437
 msgid "The code chosen already exists in this faculty."
 msgstr "Das Kürzel existiert bereits in dieser Fakultät."
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1438
+#: waeup/kofa/browser/pages.py:1440
 msgid "Department ${a} added."
 msgstr "Department ${a} hinzugefügt."
 
-#: waeup/kofa/browser/pages.py:1455
+#: waeup/kofa/browser/pages.py:1457
 msgid "Courses and Certificates"
 msgstr "Kurse und Zertifikate"
 
-#: waeup/kofa/browser/pages.py:1485
-#: waeup/kofa/browser/pages.py:1504
-#: waeup/kofa/students/browser.py:96
+#: waeup/kofa/browser/pages.py:1487
+#: waeup/kofa/browser/pages.py:1506
+#: waeup/kofa/students/browser.py:98
 #: waeup/kofa/students/viewlets.py:472
 msgid "Students"
 msgstr "Studenten"
 
-#: waeup/kofa/browser/pages.py:152
+#: waeup/kofa/browser/pages.py:1523
+#: waeup/kofa/browser/pages.py:1581
+msgid "Remove selected courses"
+msgstr "Ausgewählte Kurse löschen"
+
+#: waeup/kofa/browser/pages.py:1523
+#: waeup/kofa/browser/pages.py:1593
+#: waeup/kofa/browser/pages.py:1622
+#: waeup/kofa/browser/pages.py:1626
+msgid "Add course"
+msgstr "Kurs hinzufügen"
+
+#: waeup/kofa/browser/pages.py:1524
+#: waeup/kofa/browser/pages.py:1587
+msgid "Remove selected certificates"
+msgstr "Ausgewählte Zertifikate löschen"
+
+#: waeup/kofa/browser/pages.py:1524
+#: waeup/kofa/browser/pages.py:1598
+#: waeup/kofa/browser/pages.py:1659
+#: waeup/kofa/browser/pages.py:1663
+msgid "Add certificate"
+msgstr "Zertifikat hinzufügen"
+
+#: waeup/kofa/browser/pages.py:153
 #: waeup/kofa/browser/viewlets.py:322
 #: waeup/kofa/browser/templates/staffsitelayout.pt:28
@@ -1295,137 +1327,113 @@
 msgstr "Einloggen"
 
-#: waeup/kofa/browser/pages.py:1521
-#: waeup/kofa/browser/pages.py:1579
-msgid "Remove selected courses"
-msgstr "Ausgewählte Kurse löschen"
-
-#: 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 "Kurs hinzufügen"
-
-#: waeup/kofa/browser/pages.py:1522
-#: waeup/kofa/browser/pages.py:1585
-msgid "Remove selected certificates"
-msgstr "Ausgewählte Zertifikate löschen"
-
-#: 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 "Zertifikat hinzufügen"
-
-#: waeup/kofa/browser/pages.py:1531
+#: waeup/kofa/browser/pages.py:1533
 #: waeup/kofa/browser/viewlets.py:464
 msgid "Manage department"
 msgstr "Department verwalten"
 
-#: waeup/kofa/browser/pages.py:160
+#: waeup/kofa/browser/pages.py:161
 msgid "You logged in."
 msgstr "Sie sind jetzt eingeloggt."
 
-#: waeup/kofa/browser/pages.py:1636
+#: waeup/kofa/browser/pages.py:1638
 msgid "A course with same code already exists: "
 msgstr "Ein Kurs mit gleichem Kürzel existiert bereits:"
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1642
+#: waeup/kofa/browser/pages.py:1644
 msgid "Course ${a} successfully created."
 msgstr "Kurs ${a} erfolgreich erzeugt."
 
-#: waeup/kofa/browser/pages.py:1673
+#: waeup/kofa/browser/pages.py:1675
 msgid "A certificate with same code already exists: "
 msgstr "Ein Zertifikat mit gleichem Kürzel existiert bereits:"
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1679
+#: waeup/kofa/browser/pages.py:1681
 msgid "Certificate ${a} successfully created."
 msgstr "Zertifikat ${a} erfolgreich erzeugt."
 
-#: waeup/kofa/browser/pages.py:1711
+#: waeup/kofa/browser/pages.py:1713
 #: waeup/kofa/browser/viewlets.py:481
 msgid "Edit course"
 msgstr "Kurs bearbeiten"
 
-#: waeup/kofa/browser/pages.py:1761
+#: waeup/kofa/browser/pages.py:1763
 msgid "Edit certificate"
 msgstr "Zertifikat bearbeiten"
 
-#: waeup/kofa/browser/pages.py:1768
-#: waeup/kofa/browser/pages.py:1799
-#: waeup/kofa/browser/pages.py:1840
+#: waeup/kofa/browser/pages.py:1770
+#: waeup/kofa/browser/pages.py:1801
 #: waeup/kofa/browser/pages.py:1842
+#: waeup/kofa/browser/pages.py:1844
 msgid "Add course referrer"
 msgstr "Kursreferenz hinzufügen"
 
-#: waeup/kofa/browser/pages.py:1769
-#: waeup/kofa/browser/pages.py:1794
+#: waeup/kofa/browser/pages.py:1771
+#: waeup/kofa/browser/pages.py:1796
 msgid "Remove selected course referrers"
 msgstr "Ausgewählte Kursreferenzen löschen"
 
-#: waeup/kofa/browser/pages.py:1775
+#: waeup/kofa/browser/pages.py:1777
 #: waeup/kofa/browser/viewlets.py:488
 msgid "Manage certificate"
 msgstr "Zertifikat verwalten"
 
-#: waeup/kofa/browser/pages.py:178
+#: waeup/kofa/browser/pages.py:179
 msgid "You entered wrong credentials."
 msgstr "Sie haben falsche Zugangsdaten eingegeben."
 
-#: waeup/kofa/browser/pages.py:1847
+#: waeup/kofa/browser/pages.py:1849
 msgid "The chosen course referrer is already part of this certificate."
 msgstr "Die ausgewählte Kursreferenz ist bereits Teil des Zertifikates."
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1851
+#: waeup/kofa/browser/pages.py:1853
 msgid "Course referrer ${a}_${b} added."
 msgstr "Kursreferent ${a}_${b} hinzugefügt."
 
-#: waeup/kofa/browser/pages.py:1888
+#: waeup/kofa/browser/pages.py:1890
 #: waeup/kofa/browser/viewlets.py:505
 msgid "Edit course referrer"
 msgstr "Kursreferenz bearbeiten"
 
-#: waeup/kofa/browser/pages.py:1891
+#: waeup/kofa/browser/pages.py:1893
 msgid "Save and return"
 msgstr "Speichen und zurück"
 
-#: waeup/kofa/browser/pages.py:192
+#: waeup/kofa/browser/pages.py:193
 msgid "You have been logged out. Thanks for using WAeUP Kofa!"
 msgstr "Sie wurden ausgeloggt. Danke dass Sie WAeUP Kofa benutzt haben."
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:228
+#: waeup/kofa/browser/pages.py:229
 msgid "Contact ${a}"
 msgstr "Kontaktiere ${a}"
 
-#: waeup/kofa/browser/pages.py:234
-#: waeup/kofa/browser/pages.py:519
+#: waeup/kofa/browser/pages.py:235
+#: waeup/kofa/browser/pages.py:521
 msgid "Send message now"
 msgstr "Jetzt senden"
 
-#: waeup/kofa/browser/pages.py:253
-#: waeup/kofa/browser/pages.py:272
-#: waeup/kofa/browser/pages.py:536
-#: waeup/kofa/students/browser.py:316
+#: waeup/kofa/browser/pages.py:254
+#: waeup/kofa/browser/pages.py:273
+#: waeup/kofa/browser/pages.py:538
+#: waeup/kofa/students/browser.py:318
 msgid "Your message has been sent."
 msgstr "Ihre Nachricht wurde verschickt."
 
-#: waeup/kofa/browser/pages.py:263
+#: waeup/kofa/browser/pages.py:264
 msgid "Send now"
 msgstr "Sende jetzt"
 
-#: waeup/kofa/browser/pages.py:274
+#: waeup/kofa/browser/pages.py:275
 msgid "A smtp server error occurred."
 msgstr "Es trat ein smtp-Serverfehler auf."
 
-#: waeup/kofa/browser/pages.py:299
+#: waeup/kofa/browser/pages.py:300
 msgid "<h1>Welcome to WAeUP.Kofa</h1>"
 msgstr "<h1>Willkommen bei WAeUP.Kofa</h1>"
 
-#: waeup/kofa/browser/pages.py:387
+#: waeup/kofa/browser/pages.py:388
 #: waeup/kofa/hostels/browser.py:195
 #: waeup/kofa/students/viewlets.py:163
@@ -1437,5 +1445,5 @@
 msgstr "Verwalten"
 
-#: waeup/kofa/browser/pages.py:388
+#: waeup/kofa/browser/pages.py:389
 #: waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
@@ -1443,10 +1451,10 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:395
+#: waeup/kofa/browser/pages.py:396
 msgid "User account ${a} successfully deleted."
 msgstr "Benutzerkonto ${a} erfolgreich gelöscht."
 
-#: waeup/kofa/browser/pages.py:426
 #: waeup/kofa/browser/pages.py:428
+#: waeup/kofa/browser/pages.py:430
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
@@ -1454,142 +1462,142 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:450
+#: waeup/kofa/browser/pages.py:452
 msgid "User account ${a} successfully added."
 msgstr "Benutzerkonto ${a} erfolgreich hinzugefügt."
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:469
+#: waeup/kofa/browser/pages.py:471
 msgid "Edit user ${a}"
 msgstr "Benutzer bearbeiten"
 
-#: waeup/kofa/browser/pages.py:500
+#: waeup/kofa/browser/pages.py:502
 msgid "User settings have been saved."
 msgstr "Benutzereinstellungen wurden gespeichert."
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:517
-#: waeup/kofa/students/browser.py:297
+#: waeup/kofa/browser/pages.py:519
+#: waeup/kofa/students/browser.py:299
 msgid "Send message to ${a}"
 msgstr "Sende Nachricht an ${a}"
 
-#: waeup/kofa/browser/pages.py:546
+#: waeup/kofa/browser/pages.py:548
 #: waeup/kofa/browser/viewlets.py:400
 msgid "My Preferences"
 msgstr "Meine Präferenzen"
 
-#: waeup/kofa/browser/pages.py:559
+#: waeup/kofa/browser/pages.py:561
 #: waeup/kofa/browser/viewlets.py:415
 msgid "My Roles"
 msgstr "Meine Rollen"
 
-#: waeup/kofa/browser/pages.py:590
+#: waeup/kofa/browser/pages.py:592
 msgid "Search Academic Section"
 msgstr "Akademie durchsuchen"
 
-#: waeup/kofa/browser/pages.py:617
+#: waeup/kofa/browser/pages.py:619
 msgid "View portal configuration"
 msgstr "Portal-Konfiguration betrachten"
 
-#: waeup/kofa/browser/pages.py:630
+#: waeup/kofa/browser/pages.py:632
 msgid "Edit portal configuration"
 msgstr "Portalkonfiguration bearbeiten"
 
-#: waeup/kofa/browser/pages.py:631
-#: waeup/kofa/browser/pages.py:680
+#: waeup/kofa/browser/pages.py:633
+#: waeup/kofa/browser/pages.py:682
 msgid "Update plugins"
 msgstr "Plugins aktualisieren"
 
-#: waeup/kofa/browser/pages.py:633
-#: waeup/kofa/browser/pages.py:661
-#: waeup/kofa/browser/pages.py:692
+#: waeup/kofa/browser/pages.py:635
+#: waeup/kofa/browser/pages.py:663
+#: waeup/kofa/browser/pages.py:694
 msgid "Add session configuration"
 msgstr "Session-Konfiguration hinzufügen"
 
-#: waeup/kofa/browser/pages.py:658
-#: waeup/kofa/browser/pages.py:731
+#: waeup/kofa/browser/pages.py:660
+#: waeup/kofa/browser/pages.py:733
 msgid "Settings have been saved."
 msgstr "Einstellungen wurden gespeichert."
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:672
+#: waeup/kofa/browser/pages.py:674
 msgid "Session ${a} Configuration"
 msgstr "Session ${a}-Konfiguration"
 
-#: waeup/kofa/browser/pages.py:683
+#: waeup/kofa/browser/pages.py:685
 msgid "Plugins were updated. See log file for details."
 msgstr "Plugins wurden aktualisiert, siehe Logdatei."
 
-#: waeup/kofa/browser/pages.py:696
+#: waeup/kofa/browser/pages.py:698
 msgid "Add Session Configuration"
 msgstr "Session-Konfiguration hinzufügen"
 
-#: waeup/kofa/browser/pages.py:703
+#: waeup/kofa/browser/pages.py:705
 msgid "The session chosen already exists."
 msgstr "Die Session existiert bereits."
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:725
+#: waeup/kofa/browser/pages.py:727
 msgid "Edit academic session ${a} configuration"
 msgstr "Session ${a}-Konfiguration bearbeiten"
 
-#: waeup/kofa/browser/pages.py:755
+#: waeup/kofa/browser/pages.py:757
 msgid "Upload file"
 msgstr "Datei hochladen"
 
-#: waeup/kofa/browser/pages.py:757
+#: waeup/kofa/browser/pages.py:759
 msgid "Upload"
 msgstr "Hochladen"
 
-#: 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:805
+#: waeup/kofa/browser/pages.py:835
+#: waeup/kofa/browser/pages.py:955
+#: waeup/kofa/browser/pages.py:1063
 msgid "Process CSV file"
 msgstr "Verarbeite CSF-Datei"
 
-#: waeup/kofa/browser/pages.py:817
-#: waeup/kofa/browser/pages.py:918
-#: waeup/kofa/browser/pages.py:1037
+#: waeup/kofa/browser/pages.py:819
+#: waeup/kofa/browser/pages.py:920
+#: waeup/kofa/browser/pages.py:1039
 msgid "Import aborted."
 msgstr "Import abgebrochen."
 
-#: waeup/kofa/browser/pages.py:83
+#: waeup/kofa/browser/pages.py:838
+msgid "Back to step 1"
+msgstr "Zurück zu Schritt 1"
+
+#: waeup/kofa/browser/pages.py:839
+msgid "Proceed to step 3"
+msgstr "Gehe zu Schritt 3"
+
+#: waeup/kofa/browser/pages.py:84
 msgid "No local role selected."
 msgstr "Keine lokalen Rollen ausgewählt."
 
-#: waeup/kofa/browser/pages.py:836
-msgid "Back to step 1"
-msgstr "Zurück zu Schritt 1"
-
-#: waeup/kofa/browser/pages.py:837
-msgid "Proceed to step 3"
-msgstr "Gehe zu Schritt 3"
-
-#: waeup/kofa/browser/pages.py:897
+#: waeup/kofa/browser/pages.py:899
 msgid "Double headers: each column name may only appear once. "
 msgstr "Doppelte Spaltenüberschrift"
 
-#: waeup/kofa/browser/pages.py:905
+#: waeup/kofa/browser/pages.py:907
 msgid "Replace imported file!"
 msgstr "Tauschen Sie die Importdatei aus!"
 
-#: waeup/kofa/browser/pages.py:930
+#: waeup/kofa/browser/pages.py:932
 msgid "Update mode only!"
 msgstr "Nur Aktualisierungsmodus!"
 
-#: waeup/kofa/browser/pages.py:956
-#: waeup/kofa/browser/pages.py:1182
+#: waeup/kofa/browser/pages.py:958
+#: waeup/kofa/browser/pages.py:1184
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: waeup/kofa/browser/pages.py:957
+#: waeup/kofa/browser/pages.py:959
 msgid "Set headerfields"
 msgstr "Spaltenüberschrift setzen"
 
-#: waeup/kofa/browser/pages.py:958
+#: waeup/kofa/browser/pages.py:960
 msgid "Back to step 2"
 msgstr "Zurück zu Schritt 2"
 
-#: waeup/kofa/browser/pages.py:959
+#: waeup/kofa/browser/pages.py:961
 msgid "Perform import"
 msgstr "Import durchführen"
@@ -1974,4 +1982,5 @@
 #: waeup/kofa/browser/viewlets.py:160
 #: waeup/kofa/students/viewlets.py:218
+#: waeup/kofa/students/viewlets.py:356
 #: waeup/kofa/students/viewlets.py:403
 msgid "Edit"
@@ -2115,5 +2124,5 @@
 
 #: waeup/kofa/hostels/interfaces.py:175
-#: waeup/kofa/students/interfaces.py:427
+#: waeup/kofa/students/interfaces.py:435
 msgid "Bed Type"
 msgstr "Betttyp"
@@ -2272,41 +2281,41 @@
 msgstr "Postgraduierten-Wohnheim"
 
-#: waeup/kofa/interfaces.py:172
+#: waeup/kofa/interfaces.py:185
 msgid "Subject"
 msgstr "Fach"
 
-#: waeup/kofa/interfaces.py:176
+#: waeup/kofa/interfaces.py:189
 msgid "Grade"
 msgstr "Note"
 
-#: waeup/kofa/interfaces.py:304
+#: waeup/kofa/interfaces.py:319
 msgid "Importer name"
 msgstr "Name des Importers"
 
-#: waeup/kofa/interfaces.py:308
+#: waeup/kofa/interfaces.py:323
 msgid "Import mode"
 msgstr "Importmodus"
 
-#: waeup/kofa/interfaces.py:333
+#: waeup/kofa/interfaces.py:348
 msgid "Email Address:"
 msgstr "Emailadresse:"
 
-#: waeup/kofa/interfaces.py:340
+#: waeup/kofa/interfaces.py:355
 msgid "Email to:"
 msgstr "Email an:"
 
-#: waeup/kofa/interfaces.py:347
+#: waeup/kofa/interfaces.py:362
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: waeup/kofa/interfaces.py:351
+#: waeup/kofa/interfaces.py:366
 msgid "Full Name:"
 msgstr "Vollständiger Name:"
 
-#: waeup/kofa/interfaces.py:355
+#: waeup/kofa/interfaces.py:370
 msgid "Text:"
 msgstr "Text:"
 
-#: waeup/kofa/interfaces.py:386
+#: waeup/kofa/interfaces.py:401
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2318,5 +2327,5 @@
 msgstr "Benutzer Id"
 
-#: waeup/kofa/interfaces.py:391
+#: waeup/kofa/interfaces.py:406
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2325,102 +2334,102 @@
 msgstr "Vollständiger Name"
 
-#: waeup/kofa/interfaces.py:395
+#: waeup/kofa/interfaces.py:410
 msgid "Description/Notice"
 msgstr "Beschreibung/Nachricht"
 
-#: waeup/kofa/interfaces.py:412
+#: waeup/kofa/interfaces.py:427
 msgid "Portal roles"
 msgstr "Portalweite Rollen"
 
-#: waeup/kofa/interfaces.py:455
+#: waeup/kofa/interfaces.py:470
 msgid "Name of University"
 msgstr "Name der Universität"
 
-#: waeup/kofa/interfaces.py:456
+#: waeup/kofa/interfaces.py:471
 msgid "Sample University"
 msgstr "Deomo-Universität"
 
-#: waeup/kofa/interfaces.py:461
+#: waeup/kofa/interfaces.py:476
 msgid "Abbreviated Title of University"
 msgstr "Abkürzung"
 
-#: waeup/kofa/interfaces.py:467
+#: waeup/kofa/interfaces.py:482
 msgid "Skin"
 msgstr "Skin"
 
-#: waeup/kofa/interfaces.py:474
+#: waeup/kofa/interfaces.py:489
 msgid "Content in reST format"
 msgstr "Inhalt in reST-Format"
 
-#: waeup/kofa/interfaces.py:486
+#: waeup/kofa/interfaces.py:501
 msgid "Accommodation Booking Session"
 msgstr "Buchungssession"
 
-#: waeup/kofa/interfaces.py:494
+#: waeup/kofa/interfaces.py:509
 msgid "Allowed States for Accommodation Booking"
 msgstr "Erlaubte Zustände für das Buchen einer Unterbringung"
 
-#: waeup/kofa/interfaces.py:502
+#: waeup/kofa/interfaces.py:517
 msgid "Name of Administrator"
 msgstr "Name des Administrators"
 
-#: waeup/kofa/interfaces.py:508
+#: waeup/kofa/interfaces.py:523
 msgid "Email Address of Administrator"
 msgstr "Emailadresse des Administrators"
 
-#: waeup/kofa/interfaces.py:515
+#: waeup/kofa/interfaces.py:530
 msgid "Subject of Email to Administrator"
 msgstr "Betreff der Email an Administrator"
 
-#: waeup/kofa/interfaces.py:516
+#: waeup/kofa/interfaces.py:531
 msgid "Kofa Contact"
 msgstr "Kofa-Kontakt"
 
-#: waeup/kofa/interfaces.py:521
+#: waeup/kofa/interfaces.py:536
 msgid "SMTP mailer to use when sending mail"
 msgstr "SMTP Dienst"
 
-#: waeup/kofa/interfaces.py:528
+#: waeup/kofa/interfaces.py:543
 msgid "Captcha used for public registration pages"
 msgstr "Captcha für öffentliche Registrierung"
 
-#: waeup/kofa/interfaces.py:535
+#: waeup/kofa/interfaces.py:550
 msgid "Carry-over Course Registration"
 msgstr "Carry-Over-Kursregistrierung"
 
-#: waeup/kofa/interfaces.py:544
-#: waeup/kofa/interfaces.py:596
+#: waeup/kofa/interfaces.py:559
+#: waeup/kofa/interfaces.py:611
 msgid "Academic Session"
 msgstr "Akademische Session"
 
-#: waeup/kofa/interfaces.py:552
+#: waeup/kofa/interfaces.py:567
 #: waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr "Schulgebühr"
 
-#: waeup/kofa/interfaces.py:557
+#: waeup/kofa/interfaces.py:572
 #: waeup/kofa/payments/interfaces.py:106
-msgid "Surcharge 1"
-msgstr "Zusatzgebühr 1"
-
-#: waeup/kofa/interfaces.py:562
+msgid "Portal Fee"
+msgstr "Kofa-Portalgebühr"
+
+#: waeup/kofa/interfaces.py:577
 #: waeup/kofa/payments/interfaces.py:113
 msgid "Surcharge 2"
 msgstr "Zusatzgebühr 2"
 
-#: waeup/kofa/interfaces.py:567
+#: waeup/kofa/interfaces.py:582
 #: waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr "Zusatzgebühr 3"
 
-#: waeup/kofa/interfaces.py:572
+#: waeup/kofa/interfaces.py:587
 msgid "Clearance Fee"
 msgstr "Einschreibungsgebühr"
 
-#: waeup/kofa/interfaces.py:577
+#: waeup/kofa/interfaces.py:592
 msgid "Booking Fee"
 msgstr "Buchungsgebühr"
 
-#: waeup/kofa/interfaces.py:582
+#: waeup/kofa/interfaces.py:597
 #: waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
@@ -2546,25 +2555,34 @@
 msgstr "Zugangscode der Zahlung"
 
-#: waeup/kofa/students/browser.py:1068
+#: waeup/kofa/students/browser.py:1002
+#: waeup/kofa/students/browser.py:1224
+msgid "Your current session does not match accommodation session."
+msgstr "Sie sind noch nicht in der Session angekommen, für die aktuell die Bettenbuchung aktiviert ist."
+
+#: waeup/kofa/students/browser.py:1071
 msgid "This ticket has already been paid."
 msgstr "Diese Bezahlung wurde bereits ausgeführt."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1081
-#: waeup/kofa/students/browser.py:1089
-#: waeup/kofa/students/browser.py:1097
+#: waeup/kofa/students/browser.py:1084
+#: waeup/kofa/students/browser.py:1092
+#: waeup/kofa/students/browser.py:1100
 msgid "Valid callback received. ${a}"
 msgstr "Gültigen Rückruf erhalten. ${a}"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1151
+#: waeup/kofa/students/browser.py:1154
 msgid "${a}: Accommodation"
 msgstr " ${a}: Unterkunft"
 
-#: waeup/kofa/students/browser.py:1163
+#: waeup/kofa/students/browser.py:1166
 msgid "You are not allowed to remove bed tickets."
 msgstr "Ihnen ist nicht erlaubt, Betttickets zu entfernen."
 
-#: waeup/kofa/students/browser.py:117
+#: waeup/kofa/students/browser.py:1173
+msgid "No bed ticket selected."
+msgstr "Kein Ticket ausgewählt."
+
+#: waeup/kofa/students/browser.py:119
 #: waeup/kofa/students/viewlets.py:114
 #: waeup/kofa/students/viewlets.py:534
@@ -2572,29 +2590,31 @@
 msgstr "Studiengang"
 
-#: waeup/kofa/students/browser.py:1170
-msgid "No bed ticket selected."
-msgstr "Kein Ticket ausgewählt."
-
-#: waeup/kofa/students/browser.py:1201
+#: waeup/kofa/students/browser.py:1204
 msgid "Add bed ticket"
 msgstr "Bettticket hinzufügen"
 
-#: waeup/kofa/students/browser.py:1203
+#: waeup/kofa/students/browser.py:1206
 msgid "Create bed ticket"
 msgstr "Bettticket erzeugen"
 
-#: waeup/kofa/students/browser.py:1211
+#: waeup/kofa/students/browser.py:1214
 msgid "Your data are incomplete."
 msgstr "Die Daten sind unvollständig."
 
-#: waeup/kofa/students/browser.py:1215
+#: waeup/kofa/students/browser.py:1218
 msgid "You are in the wrong registration state."
 msgstr "Sie haben den falschen Status."
 
-#: waeup/kofa/students/browser.py:1226
+#: waeup/kofa/students/browser.py:1229
 msgid "You already booked a bed space in current accommodation session."
 msgstr "Sie haben in der aktuellen Session bereits ein Bett gebucht."
 
-#: waeup/kofa/students/browser.py:123
+#: waeup/kofa/students/browser.py:1240
+#: waeup/kofa/students/browser.py:1537
+#: waeup/kofa/students/browser.py:1650
+msgid "Activation code is invalid."
+msgstr "Aktivierungs-Code ist ungültig."
+
+#: waeup/kofa/students/browser.py:125
 #: waeup/kofa/students/viewlets.py:120
 #: waeup/kofa/students/viewlets.py:535
@@ -2602,68 +2622,62 @@
 msgstr "Zahlungen"
 
-#: waeup/kofa/students/browser.py:1237
-#: waeup/kofa/students/browser.py:1533
-#: waeup/kofa/students/browser.py:1646
-msgid "Activation code is invalid."
-msgstr "Aktivierungs-Code ist ungültig."
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1257
-#: waeup/kofa/students/browser.py:1385
+#. Default: ""
+#: waeup/kofa/students/browser.py:1260
+#: waeup/kofa/students/browser.py:1388
 msgid "There is no free bed in your category ${a}."
 msgstr "In der Kategorie ${a} ist kein Bett mehr frei."
 
-#: waeup/kofa/students/browser.py:1262
-#: waeup/kofa/students/browser.py:1538
-#: waeup/kofa/students/browser.py:1651
+#: waeup/kofa/students/browser.py:1265
+#: waeup/kofa/students/browser.py:1542
+#: waeup/kofa/students/browser.py:1655
 msgid "Activation code has already been used."
 msgstr "Der Aktivierungs-Code wurde bereits verwendet."
 
-#: waeup/kofa/students/browser.py:1265
-#: waeup/kofa/students/browser.py:1541
-#: waeup/kofa/students/browser.py:1654
-#: waeup/kofa/students/browser.py:1913
+#: waeup/kofa/students/browser.py:1268
+#: waeup/kofa/students/browser.py:1545
+#: waeup/kofa/students/browser.py:1658
+#: waeup/kofa/students/browser.py:1917
 msgid "invalidated"
 msgstr "entwertet"
 
-#: waeup/kofa/students/browser.py:1270
-#: waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1659
+#: waeup/kofa/students/browser.py:1273
+#: waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1663
 msgid "You are not the owner of this access code."
 msgstr "Sie sind nicht der Eigentümer dieses Zugangscodes."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1281
-#: waeup/kofa/students/browser.py:1399
+#: waeup/kofa/students/browser.py:1284
+#: waeup/kofa/students/browser.py:1402
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr "${a}, Block ${b}, Raum ${c}, Bett ${d} (${e})"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1290
+#: waeup/kofa/students/browser.py:1293
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr "Bettticket erzeugt und Bett gebucht: ${a}"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1308
+#: waeup/kofa/students/browser.py:1311
 msgid "Bed Ticket for Session ${a}"
 msgstr "Bett-Ticket für Session ${a}"
 
-#: waeup/kofa/students/browser.py:1324
+#: waeup/kofa/students/browser.py:1327
 msgid "Bed Allocation Data"
 msgstr "Bettenzuweisungsdaten"
 
-#: waeup/kofa/students/browser.py:1330
+#: waeup/kofa/students/browser.py:1333
 msgid "Bed Allocation: "
 msgstr "Bettenzuweisung"
 
-#: waeup/kofa/students/browser.py:1357
+#: waeup/kofa/students/browser.py:1360
 msgid "Students in reserved beds can't be relocated."
 msgstr "Studenten in reservierten Betten können nicht umgezogen werden."
 
-#: waeup/kofa/students/browser.py:1363
+#: waeup/kofa/students/browser.py:1366
 msgid "Student can't be relocated."
 msgstr "Studen konnte nicht umgezogen werden."
 
-#: waeup/kofa/students/browser.py:138
+#: waeup/kofa/students/browser.py:140
 #: waeup/kofa/students/viewlets.py:126
 msgid "Accommodation"
@@ -2671,37 +2685,36 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1406
+#: waeup/kofa/students/browser.py:1409
 msgid "Student relocated: ${a}"
 msgstr "Student umgezogen: ${a}"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1425
+#: waeup/kofa/students/browser.py:1428
 msgid "${a}: History"
 msgstr "${a}: Historie"
 
-#: waeup/kofa/students/browser.py:1437
-#: waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/browser.py:1441
 msgid "Edit base data"
-msgstr "Basisdaten verwalten"
-
-#: waeup/kofa/students/browser.py:1452
+msgstr "Basisdaten editieren"
+
+#: waeup/kofa/students/browser.py:1456
 #: waeup/kofa/students/viewlets.py:365
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: waeup/kofa/students/browser.py:1466
+#: waeup/kofa/students/browser.py:1470
 msgid "Password changed."
 msgstr "Passwort geändert"
 
-#. Default: ""
-#: waeup/kofa/students/browser.py:147
+#: waeup/kofa/students/browser.py:1482
+msgid "Upload portrait"
+msgstr "Portrait hochladen"
+
+#. Default: ""
+#: waeup/kofa/students/browser.py:149
 msgid "Bed Ticket ${a}"
 msgstr "Bett-Ticket ${a}"
 
-#: waeup/kofa/students/browser.py:1478
-msgid "Upload portrait"
-msgstr "Portrait hochladen"
-
-#: waeup/kofa/students/browser.py:1493
+#: waeup/kofa/students/browser.py:1497
 #: waeup/kofa/students/viewlets.py:389
 #: waeup/kofa/students/workflow.py:44
@@ -2709,197 +2722,197 @@
 msgstr "Einschreibung starten"
 
-#: waeup/kofa/students/browser.py:1497
+#: waeup/kofa/students/browser.py:1501
 msgid "Start clearance now"
 msgstr "Einschreibung jetzt starten"
 
-#: waeup/kofa/students/browser.py:1514
-#: waeup/kofa/students/browser.py:1635
+#: waeup/kofa/students/browser.py:1518
+#: waeup/kofa/students/browser.py:1639
 msgid "Wrong state"
 msgstr "Falscher Status"
 
-#: waeup/kofa/students/browser.py:1518
+#: waeup/kofa/students/browser.py:1522
 msgid "No portrait uploaded."
 msgstr "Es wurde kein Passbild hochgeladen."
 
-#: waeup/kofa/students/browser.py:1522
+#: waeup/kofa/students/browser.py:1526
 msgid "Not all required fields filled."
 msgstr "Es wurden nicht alle Pflichtfelder ausgefüllt."
 
-#: waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1553
 msgid "Clearance process has been started."
 msgstr "Einschreibung wurde gestartet"
 
-#: waeup/kofa/students/browser.py:1561
+#: waeup/kofa/students/browser.py:1565
 msgid "Edit clearance data"
 msgstr "Bearbeite Einschreibungsdaten"
 
-#: waeup/kofa/students/browser.py:1573
-#: waeup/kofa/students/browser.py:1587
+#: waeup/kofa/students/browser.py:1577
+#: waeup/kofa/students/browser.py:1591
 msgid "Clearance form has been saved."
 msgstr "Einschreibungsdaten wurden gespeichert."
 
-#: waeup/kofa/students/browser.py:1581
+#: waeup/kofa/students/browser.py:1585
 msgid "Save and request clearance"
 msgstr "Speichern und Einschreibung beantragen"
 
-#: waeup/kofa/students/browser.py:1596
+#: waeup/kofa/students/browser.py:1600
 #: waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr "Einschreibung beantragen"
 
-#: waeup/kofa/students/browser.py:1597
+#: waeup/kofa/students/browser.py:1601
 msgid "Enter the CLR access code used for starting clearance."
 msgstr "Geben Sie den CLR-Zugangscode ein, den Sie zum Starten der Einschreibung verwendet haben."
 
-#: waeup/kofa/students/browser.py:1600
+#: waeup/kofa/students/browser.py:1604
 msgid "Request clearance now"
 msgstr "Einschreibung beantragen"
 
-#: waeup/kofa/students/browser.py:1609
+#: waeup/kofa/students/browser.py:1613
 msgid "This isn't your CLR access code."
 msgstr "Dies ist nicht Ihr CLR-Zugangscode"
 
-#: waeup/kofa/students/browser.py:1618
+#: waeup/kofa/students/browser.py:1622
 msgid "Clearance has been requested."
 msgstr "Einschreibung wurde beantragt."
 
-#: waeup/kofa/students/browser.py:1627
+#: waeup/kofa/students/browser.py:1631
 #: waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr "Kurseregistrierung starten"
 
-#: waeup/kofa/students/browser.py:1631
+#: waeup/kofa/students/browser.py:1635
 msgid "Start course registration now"
 msgstr "Kursregistrierung jetzt starten"
 
-#: waeup/kofa/students/browser.py:166
+#: waeup/kofa/students/browser.py:1671
+msgid "Course registration has been started."
+msgstr "Kursregistrierung wurde gestartet."
+
+#: waeup/kofa/students/browser.py:168
 msgid "Student Section"
 msgstr "Studenten"
 
-#: waeup/kofa/students/browser.py:1667
-msgid "Course registration has been started."
-msgstr "Kursregistrierung wurde gestartet."
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1686
+#. Default: ""
+#: waeup/kofa/students/browser.py:1690
 msgid "Add current level ${a}"
 msgstr "Aktuelles Level ${a} hinzufügen"
 
-#: waeup/kofa/students/browser.py:1695
+#: waeup/kofa/students/browser.py:1699
 msgid "Create course list now"
 msgstr "Kursliste jetzt erzeugen"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1734
+#: waeup/kofa/students/browser.py:1738
 msgid "Add and remove course tickets of study level ${a}"
 msgstr "Kurstickets des Levels  ${a} hinzufügen oder löschen"
 
-#: waeup/kofa/students/browser.py:1771
+#: waeup/kofa/students/browser.py:1775
 msgid "Register course list"
 msgstr "Registriere Kursliste"
 
-#: waeup/kofa/students/browser.py:1775
+#: waeup/kofa/students/browser.py:1779
 msgid "Course list has been registered."
 msgstr "Kurseliste wurde registriert."
 
-#: waeup/kofa/students/browser.py:182
-#: waeup/kofa/students/browser.py:218
+#: waeup/kofa/students/browser.py:1825
+msgid "Change my password"
+msgstr "Passwort ändern"
+
+#: waeup/kofa/students/browser.py:1835
+msgid "Get new login credentials"
+msgstr "Zugangsdaten zusenden"
+
+#: waeup/kofa/students/browser.py:184
+#: waeup/kofa/students/browser.py:220
 msgid "Empty search string"
 msgstr "Leerer Suchtext"
 
-#: waeup/kofa/students/browser.py:1821
-msgid "Change my password"
-msgstr "Passwort ändern"
-
-#: waeup/kofa/students/browser.py:1831
-msgid "Get new login credentials"
-msgstr "Zugangsdaten zusenden"
-
-#: waeup/kofa/students/browser.py:1845
+#: waeup/kofa/students/browser.py:1849
 msgid "No student record found."
 msgstr "Keinen Studenten gefunden."
 
-#: waeup/kofa/students/browser.py:1853
+#: waeup/kofa/students/browser.py:1857
 msgid "You have successfully changed your password for the"
 msgstr "Sie haben erfolgreich Ihr Passwort geändert für das"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1858
+#: waeup/kofa/students/browser.py:1862
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr "Eine Email mit Ihren Benutzernamen und Ihrem Passwort wurde versendet an ${a}."
 
-#: waeup/kofa/students/browser.py:1869
+#: waeup/kofa/students/browser.py:1873
 msgid "Set password for first-time login"
 msgstr "Passwort setzen"
 
-#: waeup/kofa/students/browser.py:1872
+#: waeup/kofa/students/browser.py:1876
 msgid "Set"
 msgstr "Setzen"
 
-#: waeup/kofa/students/browser.py:1887
+#: waeup/kofa/students/browser.py:1891
 msgid "More than one student found."
 msgstr "Mehr als einen Studenten gefunden."
 
-#: waeup/kofa/students/browser.py:1895
+#: waeup/kofa/students/browser.py:1899
 msgid "Access code is invalid."
 msgstr "Aktivierungs-Code ist ungültig."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1898
+#: waeup/kofa/students/browser.py:1902
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr "Passwort wurde bereits gesetzt. Ihre Studenten Id ist ${a}"
 
-#: waeup/kofa/students/browser.py:1904
+#: waeup/kofa/students/browser.py:1908
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr "Passwort wurde bereits gesetzt. Sie verwenden den falschen Aktiwierungs-Code."
 
-#: waeup/kofa/students/browser.py:1910
+#: waeup/kofa/students/browser.py:1914
 msgid "Access code has already been used."
 msgstr "Der Aktivierungs-Code wurde bereits verwendet."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1919
+#: waeup/kofa/students/browser.py:1923
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr "Passwort wurde gesetzt. Ihre Studenten Id ist ${a}"
 
-#: waeup/kofa/students/browser.py:200
+#: waeup/kofa/students/browser.py:202
 #: waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr "Studenten verwalten"
 
-#: waeup/kofa/students/browser.py:224
-#: waeup/kofa/students/browser.py:1884
+#: waeup/kofa/students/browser.py:226
+#: waeup/kofa/students/browser.py:1888
 msgid "No student found."
 msgstr "Keinen Studenten gefunden."
 
-#: waeup/kofa/students/browser.py:251
+#: waeup/kofa/students/browser.py:253
 #: waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr "Student hinzufügen"
 
-#: waeup/kofa/students/browser.py:259
+#: waeup/kofa/students/browser.py:261
 msgid "Student record created."
 msgstr "Student erzeugt."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:275
+#: waeup/kofa/students/browser.py:277
 msgid "${a}: Base Data"
 msgstr "${a}: Basisdaten"
 
-#: waeup/kofa/students/browser.py:318
-#: waeup/kofa/students/browser.py:1861
+#: waeup/kofa/students/browser.py:320
+#: waeup/kofa/students/browser.py:1865
 msgid "An smtp server error occurred."
 msgstr "Es trat ein smtp-Serverfehler auf."
 
-#: waeup/kofa/students/browser.py:329
+#: waeup/kofa/students/browser.py:332
 msgid "Manage base data"
 msgstr "Basisdaten verwalten"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:398
+#: waeup/kofa/students/browser.py:401
 msgid "${a}: Clearance Data"
 msgstr "${a}: Einschreibungsdaten"
 
-#: waeup/kofa/students/browser.py:414
+#: waeup/kofa/students/browser.py:417
 #: waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
@@ -2908,88 +2921,88 @@
 msgstr "Einschreibungsdaten"
 
-#: waeup/kofa/students/browser.py:420
+#: waeup/kofa/students/browser.py:423
 msgid "Clearance Slip of "
 msgstr "Einschreibungsbeleg für"
 
-#: waeup/kofa/students/browser.py:440
+#: waeup/kofa/students/browser.py:443
 msgid "Manage clearance data"
 msgstr "Verwalte Einschreibungsdaten"
 
-#: waeup/kofa/students/browser.py:469
+#: waeup/kofa/students/browser.py:472
 msgid "Student has been cleared."
 msgstr "Student wurde eingeschrieben."
 
-#: waeup/kofa/students/browser.py:471
-#: waeup/kofa/students/browser.py:495
+#: waeup/kofa/students/browser.py:474
+#: waeup/kofa/students/browser.py:498
 msgid "Student is in wrong state."
 msgstr "Student hat den falschen Status."
 
-#: waeup/kofa/students/browser.py:488
+#: waeup/kofa/students/browser.py:491
 msgid "Clearance has been annulled."
 msgstr "Einschreibung wurde annulliert."
 
-#: waeup/kofa/students/browser.py:492
+#: waeup/kofa/students/browser.py:495
 msgid "Clearance request has been rejected."
 msgstr "Einschreibung wurde abgelehnt."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:518
+#: waeup/kofa/students/browser.py:521
 msgid "${a}: Personal Data"
 msgstr "${a}: Persönliche Daten"
 
-#: waeup/kofa/students/browser.py:528
+#: waeup/kofa/students/browser.py:531
 msgid "Manage personal data"
 msgstr "Persönliche Daten verwalten"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:548
+#: waeup/kofa/students/browser.py:551
 msgid "${a}: Study Course"
 msgstr "${a}: Studiengang"
 
-#: waeup/kofa/students/browser.py:578
+#: waeup/kofa/students/browser.py:581
 msgid "Manage study course"
 msgstr "Studiengang verwalten"
 
-#: waeup/kofa/students/browser.py:581
-#: waeup/kofa/students/browser.py:622
+#: waeup/kofa/students/browser.py:584
+#: waeup/kofa/students/browser.py:625
 msgid "Remove selected levels"
 msgstr "Ausgewählte Levels  löschen"
 
-#: waeup/kofa/students/browser.py:582
-#: waeup/kofa/students/browser.py:608
+#: waeup/kofa/students/browser.py:585
+#: waeup/kofa/students/browser.py:611
 msgid "Add study level"
 msgstr "Level  hinzufügen"
 
-#: waeup/kofa/students/browser.py:616
+#: waeup/kofa/students/browser.py:619
 msgid "Study level has been added."
 msgstr "Level wurde hinzugefügt."
 
-#: waeup/kofa/students/browser.py:618
-#: waeup/kofa/students/browser.py:1704
+#: waeup/kofa/students/browser.py:621
+#: waeup/kofa/students/browser.py:1708
 msgid "This level exists."
 msgstr "Dieses Level existiert."
 
-#: waeup/kofa/students/browser.py:628
+#: waeup/kofa/students/browser.py:631
 msgid "No study level selected."
 msgstr "Kein Level ausgewählt."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:664
+#: waeup/kofa/students/browser.py:667
 msgid "${a}: Study Level ${b}"
 msgstr "${a}: Level ${b}"
 
-#: waeup/kofa/students/browser.py:687
+#: waeup/kofa/students/browser.py:690
 msgid "Level Data"
 msgstr "Leveldaten"
 
-#: waeup/kofa/students/browser.py:693
+#: waeup/kofa/students/browser.py:696
 msgid "Course List"
 msgstr "Kursliste"
 
-#: waeup/kofa/students/browser.py:702
+#: waeup/kofa/students/browser.py:705
 msgid "Course Registration Slip  "
 msgstr "Kursregistrierungsbeleg"
 
-#: waeup/kofa/students/browser.py:708
+#: waeup/kofa/students/browser.py:711
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -2998,5 +3011,5 @@
 msgstr "Sem."
 
-#: waeup/kofa/students/browser.py:711
+#: waeup/kofa/students/browser.py:714
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -3004,10 +3017,10 @@
 msgstr "Dept."
 
-#: waeup/kofa/students/browser.py:712
+#: waeup/kofa/students/browser.py:715
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr "Fakultät"
 
-#: waeup/kofa/students/browser.py:713
+#: waeup/kofa/students/browser.py:716
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -3015,5 +3028,5 @@
 msgstr "Cred."
 
-#: waeup/kofa/students/browser.py:714
+#: waeup/kofa/students/browser.py:717
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -3021,6 +3034,6 @@
 msgstr "Pflicht"
 
-#: waeup/kofa/students/browser.py:715
-#: waeup/kofa/students/interfaces.py:370
+#: waeup/kofa/students/browser.py:718
+#: waeup/kofa/students/interfaces.py:378
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -3029,83 +3042,78 @@
 msgstr "Score"
 
-#: waeup/kofa/students/browser.py:743
-#: waeup/kofa/students/browser.py:772
-#: waeup/kofa/students/browser.py:857
-#: waeup/kofa/students/browser.py:862
-#: waeup/kofa/students/browser.py:1744
-#: waeup/kofa/students/browser.py:1794
+#: waeup/kofa/students/browser.py:746
+#: waeup/kofa/students/browser.py:775
+#: waeup/kofa/students/browser.py:860
+#: waeup/kofa/students/browser.py:865
+#: waeup/kofa/students/browser.py:1748
+#: waeup/kofa/students/browser.py:1798
 msgid "Add course ticket"
 msgstr "Kursticket hinzufügen"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:764
+#: waeup/kofa/students/browser.py:767
 msgid "Manage study level ${a}"
 msgstr "Verwalte Level  ${a}"
 
-#: waeup/kofa/students/browser.py:782
-#: waeup/kofa/students/browser.py:1754
+#: waeup/kofa/students/browser.py:785
+#: waeup/kofa/students/browser.py:1758
 msgid "No ticket selected."
 msgstr "Kein Ticket ausgewählt."
 
-#: waeup/kofa/students/browser.py:806
-#: waeup/kofa/students/browser.py:828
+#: waeup/kofa/students/browser.py:809
+#: waeup/kofa/students/browser.py:831
 msgid "This level does not correspond current level."
 msgstr "Dieses Level stimmt nicht mit dem aktuellen Studienjahr des Studenten überein."
 
-#: waeup/kofa/students/browser.py:810
+#: waeup/kofa/students/browser.py:813
 msgid "Course list has been validated."
 msgstr "Kurseliste wurde validiert."
 
-#: waeup/kofa/students/browser.py:812
-#: waeup/kofa/students/browser.py:840
+#: waeup/kofa/students/browser.py:815
+#: waeup/kofa/students/browser.py:843
 msgid "Student is in the wrong state."
 msgstr "Student hat den falschen Status."
 
-#: waeup/kofa/students/browser.py:833
+#: waeup/kofa/students/browser.py:836
 msgid "Course list request has been annulled."
 msgstr "Kursregistrierung wurde annulliert."
 
-#: waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:840
 msgid "Course list request has been rejected:"
 msgstr "Kursregistrierung wurde abgelehnt."
 
-#: waeup/kofa/students/browser.py:877
-#: waeup/kofa/students/browser.py:1807
+#: waeup/kofa/students/browser.py:880
+#: waeup/kofa/students/browser.py:1811
 msgid "The ticket exists."
 msgstr "Das Ticket existiert."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:879
-#: waeup/kofa/students/browser.py:1809
+#: waeup/kofa/students/browser.py:882
+#: waeup/kofa/students/browser.py:1813
 msgid "Successfully added ${a}."
 msgstr "Erfolgreich hinzugefügt: ${a}"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:900
+#: waeup/kofa/students/browser.py:903
 msgid "${a}: Course Ticket ${b}"
 msgstr "${a}: Kursticket ${b}"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:916
+#: waeup/kofa/students/browser.py:919
 msgid "Manage course ticket ${a}"
 msgstr "Verwalte Kursticket ${a}"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:943
+#: waeup/kofa/students/browser.py:946
 msgid "${a}: Payments"
 msgstr "${a}: Zahlungen"
 
-#: waeup/kofa/students/browser.py:988
+#: waeup/kofa/students/browser.py:991
 msgid "Add online payment"
 msgstr "Ticket für Online-Bezahlung hinzufügen"
 
-#: waeup/kofa/students/browser.py:991
+#: waeup/kofa/students/browser.py:994
 msgid "Create ticket"
 msgstr "Ticket erzeugen"
-
-#: waeup/kofa/students/browser.py:999
-#: waeup/kofa/students/browser.py:1221
-msgid "Your current session does not match accommodation session."
-msgstr "Sie sind noch nicht in der Session angekommen, für die aktuell die Bettenbuchung aktiviert ist."
 
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:11
@@ -3205,6 +3213,6 @@
 msgstr "Aktivierungs-Code:"
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:21
-#: waeup/kofa/students/browser_templates/fileupload.pt:27
+#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/students/browser_templates/fileupload.pt:26
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
 msgid "Max. file size:"
@@ -3328,72 +3336,72 @@
 msgstr "Bisher wurden keine Tickets hinzugefügt."
 
-#: waeup/kofa/students/interfaces.py:176
-#: waeup/kofa/students/interfaces.py:255
-#: waeup/kofa/students/interfaces.py:483
+#: waeup/kofa/students/interfaces.py:184
+#: waeup/kofa/students/interfaces.py:263
+#: waeup/kofa/students/interfaces.py:491
 msgid "Registration Number"
 msgstr "Regsistrierungsnummer"
 
-#: waeup/kofa/students/interfaces.py:183
-#: waeup/kofa/students/interfaces.py:265
+#: waeup/kofa/students/interfaces.py:191
+#: waeup/kofa/students/interfaces.py:273
 msgid "Matriculation Number"
 msgstr "Matrikelnummer"
 
-#: waeup/kofa/students/interfaces.py:191
+#: waeup/kofa/students/interfaces.py:199
 msgid "PWD Activation Code"
 msgstr "PWD-Aktivierungs-Code"
 
-#: waeup/kofa/students/interfaces.py:198
+#: waeup/kofa/students/interfaces.py:206
 msgid "Email"
 msgstr "Emailadresse"
 
-#: waeup/kofa/students/interfaces.py:218
+#: waeup/kofa/students/interfaces.py:226
 msgid "Clearance form locked"
 msgstr "Einschreibungsformular gesperrt"
 
-#: waeup/kofa/students/interfaces.py:223
+#: waeup/kofa/students/interfaces.py:231
 msgid "CLR Activation Code"
 msgstr "CLR-Aktivierungs-Code"
 
-#: waeup/kofa/students/interfaces.py:231
+#: waeup/kofa/students/interfaces.py:239
 msgid "Nationality"
 msgstr "Nationalität"
 
-#: waeup/kofa/students/interfaces.py:241
+#: waeup/kofa/students/interfaces.py:249
 msgid "Permanent Address"
 msgstr "Postanschrift"
 
-#: waeup/kofa/students/interfaces.py:275
+#: waeup/kofa/students/interfaces.py:283
 #: waeup/kofa/browser/templates/showstudentspage.pt:7
 msgid "Certificate"
 msgstr "Zertifikat"
 
-#: waeup/kofa/students/interfaces.py:282
+#: waeup/kofa/students/interfaces.py:290
 msgid "Entry Mode"
 msgstr "Studienmodus bei Einschreibung"
 
-#: waeup/kofa/students/interfaces.py:290
+#: waeup/kofa/students/interfaces.py:298
 msgid "Entry Session"
 msgstr "Eingangssession"
 
-#: waeup/kofa/students/interfaces.py:299
+#: waeup/kofa/students/interfaces.py:307
 #: waeup/kofa/browser/templates/showstudentspage.pt:8
 msgid "Current Session"
 msgstr "Aktuelle Session"
 
-#: waeup/kofa/students/interfaces.py:307
+#: waeup/kofa/students/interfaces.py:315
 #: waeup/kofa/browser/templates/showstudentspage.pt:9
 msgid "Current Level"
 msgstr "Aktuelles Level"
 
-#: waeup/kofa/students/interfaces.py:315
+#: waeup/kofa/students/interfaces.py:323
 msgid "Current Verdict"
 msgstr "Aktuelles Verdict"
 
-#: waeup/kofa/students/interfaces.py:322
+#: waeup/kofa/students/interfaces.py:330
 msgid "Previous Verdict"
 msgstr "Vorangegangenes Verdict"
 
-#: waeup/kofa/students/interfaces.py:337
-#: waeup/kofa/students/interfaces.py:434
+#: waeup/kofa/students/interfaces.py:345
+#: waeup/kofa/students/interfaces.py:442
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3401,9 +3409,9 @@
 msgstr "Session"
 
-#: waeup/kofa/students/interfaces.py:344
+#: waeup/kofa/students/interfaces.py:352
 msgid "Verdict"
 msgstr "Verdict"
 
-#: waeup/kofa/students/interfaces.py:363
+#: waeup/kofa/students/interfaces.py:371
 #: waeup/kofa/browser/templates/certificatepage.pt:30
 #: waeup/kofa/browser/templates/certificatemanagepage.pt:33
@@ -3411,13 +3419,13 @@
 msgstr "Pflicht"
 
-#: waeup/kofa/students/interfaces.py:377
+#: waeup/kofa/students/interfaces.py:385
 msgid "Automatical Creation"
 msgstr "Automatische Erzeugung"
 
-#: waeup/kofa/students/interfaces.py:384
+#: waeup/kofa/students/interfaces.py:392
 msgid "Carry-over Course"
 msgstr "Kurs aus vergangenem Studienjahr"
 
-#: waeup/kofa/students/interfaces.py:403
+#: waeup/kofa/students/interfaces.py:411
 #: waeup/kofa/university/interfaces.py:299
 #: waeup/kofa/browser/templates/certificatepage.pt:29
@@ -3426,15 +3434,15 @@
 msgstr "Kurs"
 
-#: waeup/kofa/students/interfaces.py:420
+#: waeup/kofa/students/interfaces.py:428
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:10
 msgid "Bed Coordinates"
 msgstr "Bettkoordinaten"
 
-#: waeup/kofa/students/interfaces.py:442
+#: waeup/kofa/students/interfaces.py:450
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:9
 msgid "Booking Date"
 msgstr "Buchungsdatum"
 
-#: waeup/kofa/students/interfaces.py:448
+#: waeup/kofa/students/interfaces.py:456
 msgid "Booking Activation Code"
 msgstr "Aktivierungs-Code der Buchung"
@@ -3445,5 +3453,5 @@
 msgstr "<font size=10>${a}, Seite ${b} von ${c}</font>"
 
-#: waeup/kofa/students/utils.py:280
+#: waeup/kofa/students/utils.py:298
 #: waeup/kofa/students/viewlets.py:71
 #: waeup/kofa/students/viewlets.py:99
@@ -3452,5 +3460,5 @@
 msgstr "Basisdaten"
 
-#: waeup/kofa/students/utils.py:311
+#: waeup/kofa/students/utils.py:329
 msgid "Scanned Documents"
 msgstr "Gescannte Dokumente"
@@ -3610,9 +3618,9 @@
 
 #: waeup/kofa/students/vocabularies.py:135
-msgid "Male"
+msgid "male"
 msgstr "männlich"
 
 #: waeup/kofa/students/vocabularies.py:137
-msgid "Female"
+msgid "female"
 msgstr "weiblich"
 
@@ -3877,5 +3885,5 @@
 msgstr "8. Studienjahr"
 
-#: waeup/kofa/utils/utils.py:228
+#: waeup/kofa/utils/utils.py:142
 msgid ""
 "Fullname: ${a}\n"
@@ -3893,5 +3901,5 @@
 "${e}\n"
 
-#: waeup/kofa/utils/utils.py:273
+#: waeup/kofa/utils/utils.py:187
 msgid ""
 "Dear ${a},\n"
@@ -3931,4 +3939,28 @@
 "${c}\n"
 
+#: waeup/kofa/utils/utils.py:44
+msgid "Germany"
+msgstr "Deutschland"
+
+#: waeup/kofa/utils/utils.py:45
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#: waeup/kofa/utils/utils.py:46
+msgid "U.S."
+msgstr "USA"
+
+#: waeup/kofa/widgets/phonewidget.py:117
+msgid "Empty phone field(s)."
+msgstr "Leere Feld."
+
+#: waeup/kofa/widgets/phonewidget.py:121
+msgid "Int. prefix requires format '+NNN'"
+msgstr "Internationale Vorwahl erwartet: '+NNN'"
+
+#: waeup/kofa/widgets/phonewidget.py:127
+msgid "Phone numbers may contain numbers only."
+msgstr "Telefonnummern dürfen nur Nummern enthalten."
+
 #: waeup/kofa/widgets/sequencewidget.pt:18
 msgid "Don't forget to save the form after adding or deleting items."
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 7881)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/en/LC_MESSAGES/waeup.kofa.po	(revision 7882)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Sun Mar 11 16:45:08 2012\n"
+"POT-Creation-Date: Wed Mar 14 10:35:59 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -32,20 +32,20 @@
 #: waeup/kofa/applicants/browser.py:182 waeup/kofa/applicants/browser.py:255
 #: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:339
-#: 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:580
-#: waeup/kofa/students/browser.py:581 waeup/kofa/students/browser.py:742
-#: waeup/kofa/students/browser.py:744 waeup/kofa/students/browser.py:884
+#: waeup/kofa/browser/pages.py:505 waeup/kofa/browser/pages.py:710
+#: waeup/kofa/browser/pages.py:737 waeup/kofa/browser/pages.py:760
+#: waeup/kofa/browser/pages.py:807 waeup/kofa/browser/pages.py:837
+#: waeup/kofa/browser/pages.py:957 waeup/kofa/browser/pages.py:1185
+#: waeup/kofa/browser/pages.py:1279 waeup/kofa/browser/pages.py:1300
+#: waeup/kofa/browser/pages.py:1327 waeup/kofa/browser/pages.py:1355
+#: waeup/kofa/browser/pages.py:1356 waeup/kofa/browser/pages.py:1402
+#: waeup/kofa/browser/pages.py:1443 waeup/kofa/browser/pages.py:1522
+#: waeup/kofa/browser/pages.py:1523 waeup/kofa/browser/pages.py:1525
+#: waeup/kofa/browser/pages.py:1603 waeup/kofa/browser/pages.py:1648
+#: waeup/kofa/browser/pages.py:1686 waeup/kofa/browser/pages.py:1730
+#: waeup/kofa/browser/pages.py:1769 waeup/kofa/browser/pages.py:1771
+#: waeup/kofa/browser/pages.py:1806 waeup/kofa/browser/pages.py:1857
+#: waeup/kofa/browser/pages.py:1909 waeup/kofa/students/browser.py:583
+#: waeup/kofa/students/browser.py:584 waeup/kofa/students/browser.py:745
+#: waeup/kofa/students/browser.py:747 waeup/kofa/students/browser.py:887
 msgid "Cancel"
 msgstr ""
@@ -85,7 +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:167 waeup/kofa/students/browser.py:201
+#: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:594
+#: waeup/kofa/browser/pages.py:1144 waeup/kofa/browser/viewlets.py:190
+#: waeup/kofa/students/browser.py:169 waeup/kofa/students/browser.py:203
 msgid "Search"
 msgstr ""
@@ -343,5 +343,5 @@
 
 #: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:326
-#: waeup/kofa/applicants/browser.py:746
+#: waeup/kofa/applicants/browser.py:747
 msgid "Could not delete:"
 msgstr ""
@@ -349,8 +349,8 @@
 #. Default: ""
 #: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py:329
-#: waeup/kofa/applicants/browser.py:749 waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:239 waeup/kofa/students/browser.py:638
-#: waeup/kofa/students/browser.py:792 waeup/kofa/students/browser.py:970
-#: waeup/kofa/students/browser.py:1180 waeup/kofa/students/browser.py:1766
+#: waeup/kofa/applicants/browser.py:750 waeup/kofa/browser/pages.py:135
+#: waeup/kofa/students/browser.py:241 waeup/kofa/students/browser.py:641
+#: waeup/kofa/students/browser.py:795 waeup/kofa/students/browser.py:973
+#: waeup/kofa/students/browser.py:1183 waeup/kofa/students/browser.py:1770
 msgid "Successfully removed: ${a}"
 msgstr ""
@@ -373,24 +373,24 @@
 
 #: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:302
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:689
-#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:839 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/applicants/browser.py:656 waeup/kofa/applicants/browser.py:690
+#: waeup/kofa/applicants/browser.py:793 waeup/kofa/applicants/browser.py:796
+#: waeup/kofa/applicants/browser.py:840 waeup/kofa/browser/pages.py:478
+#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:656
+#: waeup/kofa/browser/pages.py:730 waeup/kofa/browser/pages.py:1183
+#: waeup/kofa/browser/pages.py:1355 waeup/kofa/browser/pages.py:1396
+#: waeup/kofa/browser/pages.py:1522 waeup/kofa/browser/pages.py:1575
+#: waeup/kofa/browser/pages.py:1718 waeup/kofa/browser/pages.py:1769
+#: waeup/kofa/browser/pages.py:1790 waeup/kofa/hostels/browser.py:209
 #: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:318
-#: waeup/kofa/students/browser.py:355 waeup/kofa/students/browser.py:454
-#: waeup/kofa/students/browser.py:531 waeup/kofa/students/browser.py:580
-#: waeup/kofa/students/browser.py:596 waeup/kofa/students/browser.py:742
-#: waeup/kofa/students/browser.py:767 waeup/kofa/students/browser.py:1440
-#: waeup/kofa/students/browser.py:1455 waeup/kofa/students/browser.py:1570
+#: waeup/kofa/students/browser.py:358 waeup/kofa/students/browser.py:457
+#: waeup/kofa/students/browser.py:534 waeup/kofa/students/browser.py:583
+#: waeup/kofa/students/browser.py:599 waeup/kofa/students/browser.py:745
+#: waeup/kofa/students/browser.py:770 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:256 waeup/kofa/applicants/browser.py:334
-#: waeup/kofa/applicants/browser.py:362
+#: waeup/kofa/applicants/browser.py:363
 msgid "Add applicant"
 msgstr ""
@@ -400,9 +400,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:306 waeup/kofa/applicants/browser.py:718
-#: 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:381
+#: waeup/kofa/applicants/browser.py:306 waeup/kofa/applicants/browser.py:719
+#: waeup/kofa/browser/pages.py:1399 waeup/kofa/browser/pages.py:1721
+#: waeup/kofa/browser/pages.py:1793 waeup/kofa/browser/pages.py:1905
+#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:82
+#: waeup/kofa/students/browser.py:384
 msgid "Form has been saved."
 msgstr ""
@@ -412,67 +412,67 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:365
+#: waeup/kofa/applicants/browser.py:366
 msgid "Create application record"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:370
+#: waeup/kofa/applicants/browser.py:371
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:383
+#: waeup/kofa/applicants/browser.py:384
 msgid "Applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:281
+#: waeup/kofa/applicants/browser.py:399 waeup/kofa/students/browser.py:283
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:399 waeup/kofa/students/browser.py:282
+#: waeup/kofa/applicants/browser.py:400 waeup/kofa/students/browser.py:284
 msgid "unset"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:404
+#: waeup/kofa/applicants/browser.py:405
 msgid "${a} Application Record ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:455
+#: waeup/kofa/applicants/browser.py:456
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:462 waeup/kofa/students/browser.py:1019
+#: waeup/kofa/applicants/browser.py:463 waeup/kofa/students/browser.py:1022
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:475 waeup/kofa/students/browser.py:1033
+#: waeup/kofa/applicants/browser.py:476 waeup/kofa/students/browser.py:1036
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:502 waeup/kofa/students/browser.py:1052
+#: waeup/kofa/applicants/browser.py:503 waeup/kofa/students/browser.py:1055
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:530 waeup/kofa/students/browser.py:1101
+#: waeup/kofa/applicants/browser.py:531 waeup/kofa/students/browser.py:1104
 msgid "Valid callback received."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:551
+#: waeup/kofa/applicants/browser.py:552
 msgid "Payment Data"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:557
+#: waeup/kofa/applicants/browser.py:558
 msgid "Online Payment Receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:563
+#: waeup/kofa/applicants/browser.py:564
 msgid "Ticket not yet paid."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:628
+#: waeup/kofa/applicants/browser.py:629
 msgid "Uploaded image is too big!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:633
+#: waeup/kofa/applicants/browser.py:634
 msgid "jpg file extension expected."
 msgstr ""
@@ -482,33 +482,33 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:847
+#: waeup/kofa/applicants/browser.py:656 waeup/kofa/applicants/browser.py:796
+#: waeup/kofa/applicants/browser.py:848
 msgid "Final Submit"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:656 waeup/kofa/applicants/browser.py:759
-#: waeup/kofa/applicants/browser.py:793 waeup/kofa/applicants/browser.py:828
-#: waeup/kofa/students/browser.py:976
+#: waeup/kofa/applicants/browser.py:657 waeup/kofa/applicants/browser.py:760
+#: waeup/kofa/applicants/browser.py:794 waeup/kofa/applicants/browser.py:829
+#: waeup/kofa/students/browser.py:979
 msgid "Add online payment ticket"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:656 waeup/kofa/applicants/browser.py:764
-#: waeup/kofa/applicants/browser.py:793 waeup/kofa/applicants/browser.py:796
-#: waeup/kofa/applicants/browser.py:833 waeup/kofa/students/browser.py:744
-#: waeup/kofa/students/browser.py:776 waeup/kofa/students/browser.py:952
-#: waeup/kofa/students/browser.py:1748
+#: waeup/kofa/applicants/browser.py:657 waeup/kofa/applicants/browser.py:765
+#: waeup/kofa/applicants/browser.py:794 waeup/kofa/applicants/browser.py:797
+#: waeup/kofa/applicants/browser.py:834 waeup/kofa/students/browser.py:747
+#: waeup/kofa/students/browser.py:779 waeup/kofa/students/browser.py:955
+#: waeup/kofa/students/browser.py:1752
 msgid "Remove selected tickets"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:675
+#: waeup/kofa/applicants/browser.py:676
 msgid "${a} Application Form ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:686 waeup/kofa/students/browser.py:352
+#: waeup/kofa/applicants/browser.py:687 waeup/kofa/students/browser.py:355
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:733 waeup/kofa/students/browser.py:958
+#: waeup/kofa/applicants/browser.py:734 waeup/kofa/students/browser.py:961
 msgid "No payment selected."
 msgstr ""
@@ -520,9 +520,9 @@
 #: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:105
 #: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:309
-#: 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:202
-#: waeup/kofa/students/browser.py:1147 waeup/kofa/students/browser.py:1160
+#: waeup/kofa/browser/pages.py:636 waeup/kofa/browser/pages.py:677
+#: waeup/kofa/browser/pages.py:1279 waeup/kofa/browser/pages.py:1290
+#: waeup/kofa/browser/pages.py:1356 waeup/kofa/browser/pages.py:1391
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:204
+#: waeup/kofa/students/browser.py:1150 waeup/kofa/students/browser.py:1163
 msgid "Remove selected"
 msgstr ""
@@ -533,5 +533,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:806 waeup/kofa/students/browser.py:88
+#: waeup/kofa/applicants/browser.py:807 waeup/kofa/students/browser.py:90
 msgid "The requested form is locked (read-only)."
 msgstr ""
@@ -539,7 +539,7 @@
 #: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:139
 #: waeup/kofa/applicants/browser.py:257 waeup/kofa/applicants/browser.py:348
-#: 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/browser/pages.py:1357 waeup/kofa/browser/pages.py:1416
+#: waeup/kofa/browser/pages.py:1526 waeup/kofa/browser/pages.py:1612
+#: waeup/kofa/browser/pages.py:1772 waeup/kofa/browser/pages.py:1829
 msgid "Remove selected local roles"
 msgstr ""
@@ -547,15 +547,15 @@
 #: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:135
 #: waeup/kofa/applicants/browser.py:258 waeup/kofa/applicants/browser.py:344
-#: 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/browser/pages.py:1358 waeup/kofa/browser/pages.py:1412
+#: waeup/kofa/browser/pages.py:1527 waeup/kofa/browser/pages.py:1608
+#: waeup/kofa/browser/pages.py:1773 waeup/kofa/browser/pages.py:1825
 msgid "Add local role"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:820
+#: waeup/kofa/applicants/browser.py:821
 msgid "No passport picture uploaded."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:822
+#: waeup/kofa/applicants/browser.py:823
 msgid "Passport picture confirmation box not ticked."
 msgstr ""
@@ -565,38 +565,38 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:859 waeup/kofa/students/browser.py:1615
+#: waeup/kofa/applicants/browser.py:860 waeup/kofa/students/browser.py:1619
 msgid "This form cannot be submitted. Wrong state!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:864
+#: waeup/kofa/applicants/browser.py:865
 msgid "Form has been submitted."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:899
+#: waeup/kofa/applicants/browser.py:900
 msgid "Register for ${a} Application"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:905
+#: waeup/kofa/applicants/browser.py:906
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:910
+#: waeup/kofa/applicants/browser.py:911
 msgid "Application has ended."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:919
+#: waeup/kofa/applicants/browser.py:920
 msgid "Get login credentials"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:934
+#: waeup/kofa/applicants/browser.py:935
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:941
+#: waeup/kofa/applicants/browser.py:942
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:950
+#: waeup/kofa/applicants/browser.py:951
 msgid "Your registration was successful."
 msgstr ""
@@ -664,5 +664,13 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:709
+#: waeup/kofa/applicants/container.py:52
+msgid "Basic"
+msgstr ""
+
+#: waeup/kofa/applicants/container.py:55
+msgid "handles basic applicants"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:198 waeup/kofa/students/browser.py:712
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -688,5 +696,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:710
+#: waeup/kofa/applicants/interfaces.py:205 waeup/kofa/students/browser.py:713
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -707,126 +715,126 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:211
-#: waeup/kofa/applicants/interfaces.py:324
+#: waeup/kofa/applicants/interfaces.py:212
+#: waeup/kofa/applicants/interfaces.py:325
 msgid "Application Target"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:219
+#: waeup/kofa/applicants/interfaces.py:220
 msgid "Entry Level"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:226
-#: waeup/kofa/applicants/interfaces.py:332
+#: waeup/kofa/applicants/interfaces.py:227
+#: waeup/kofa/applicants/interfaces.py:333
 msgid "Year of Entrance"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:234
-#: waeup/kofa/applicants/interfaces.py:340
+#: waeup/kofa/applicants/interfaces.py:235
+#: waeup/kofa/applicants/interfaces.py:341
 msgid "Applicants Container Type"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:250
+#: waeup/kofa/applicants/interfaces.py:251
 msgid "Category for the grouping of certificates"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:257
+#: waeup/kofa/applicants/interfaces.py:258
 msgid "Human readable description in reST format"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:273
+#: waeup/kofa/applicants/interfaces.py:274
 msgid "Application Start Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:279
+#: waeup/kofa/applicants/interfaces.py:280
 msgid "Application Closing Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:285
+#: waeup/kofa/applicants/interfaces.py:286
 msgid "Forbid additions after deadline (enddate)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:368
+#: waeup/kofa/applicants/interfaces.py:369
 msgid "Applicant Id"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:373
+#: waeup/kofa/applicants/interfaces.py:374
 msgid "JAMB Registration Number"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:385
-#: waeup/kofa/students/interfaces.py:154
+#: waeup/kofa/applicants/interfaces.py:386
+#: waeup/kofa/students/interfaces.py:162
 msgid "First Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:389
-#: waeup/kofa/students/interfaces.py:159
+#: waeup/kofa/applicants/interfaces.py:390
+#: waeup/kofa/students/interfaces.py:167
 msgid "Middle Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:393
-#: waeup/kofa/students/interfaces.py:164
+#: waeup/kofa/applicants/interfaces.py:394
+#: waeup/kofa/students/interfaces.py:172
 msgid "Last Name (Surname)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:397
-#: waeup/kofa/students/interfaces.py:213
+#: waeup/kofa/applicants/interfaces.py:398
+#: waeup/kofa/students/interfaces.py:221
 msgid "Date of Birth"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:402
+#: waeup/kofa/applicants/interfaces.py:403
 msgid "State/LGA"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:407
-#: waeup/kofa/students/interfaces.py:169
+#: waeup/kofa/applicants/interfaces.py:408
+#: waeup/kofa/students/interfaces.py:177
 msgid "Sex"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:373
-#: waeup/kofa/interfaces.py:399 waeup/kofa/students/interfaces.py:490
+#: waeup/kofa/applicants/interfaces.py:414 waeup/kofa/interfaces.py:388
+#: waeup/kofa/interfaces.py:414 waeup/kofa/students/interfaces.py:498
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:378
-#: waeup/kofa/interfaces.py:406 waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/applicants/interfaces.py:419 waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:421 waeup/kofa/students/interfaces.py:211
 msgid "Phone"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:423
-#: waeup/kofa/applicants/interfaces.py:509
+#: waeup/kofa/applicants/interfaces.py:424
+#: waeup/kofa/applicants/interfaces.py:510
 msgid "1st Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:428
-#: waeup/kofa/applicants/interfaces.py:514
+#: waeup/kofa/applicants/interfaces.py:429
+#: waeup/kofa/applicants/interfaces.py:515
 msgid "2nd Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:433
+#: waeup/kofa/applicants/interfaces.py:434
 msgid "School Grades"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:443
-#: waeup/kofa/applicants/interfaces.py:519
+#: waeup/kofa/applicants/interfaces.py:444
+#: waeup/kofa/applicants/interfaces.py:520
 msgid "Screening Score"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:447
-#: waeup/kofa/applicants/interfaces.py:524
+#: waeup/kofa/applicants/interfaces.py:448
+#: waeup/kofa/applicants/interfaces.py:525
 msgid "Screening Venue"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:451
-#: waeup/kofa/applicants/interfaces.py:529
+#: waeup/kofa/applicants/interfaces.py:452
+#: waeup/kofa/applicants/interfaces.py:530
 msgid "Admitted Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:457
-#: waeup/kofa/applicants/interfaces.py:536
+#: waeup/kofa/applicants/interfaces.py:458
+#: waeup/kofa/applicants/interfaces.py:537
 msgid "Notice"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:479
-#: waeup/kofa/students/interfaces.py:149
+#: waeup/kofa/applicants/interfaces.py:480
+#: waeup/kofa/students/interfaces.py:157
 #: waeup/kofa/browser/templates/showstudentspage.pt:4
 #: waeup/kofa/students/browser_templates/containerpage.pt:29
@@ -835,10 +843,10 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:484
+#: waeup/kofa/applicants/interfaces.py:485
 msgid "Form locked"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:563
-#: waeup/kofa/students/interfaces.py:469
+#: waeup/kofa/applicants/interfaces.py:564
+#: waeup/kofa/students/interfaces.py:477
 msgid "Payment Session"
 msgstr ""
@@ -856,5 +864,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:185
+#: waeup/kofa/applicants/pdf.py:186
 #: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:26
 msgid "Admitted Course of Study:"
@@ -862,5 +870,5 @@
 
 #. Default: ""
-#: waeup/kofa/applicants/pdf.py:203
+#: waeup/kofa/applicants/pdf.py:204
 msgid ""
 "<font size=10>Proceed to the login page of the portal and enter your new "
@@ -868,5 +876,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:209
+#: waeup/kofa/applicants/pdf.py:210
 msgid "<font size=10>Change your password when you have  logged in.</font>"
 msgstr ""
@@ -897,5 +905,5 @@
 
 #: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:254
+#: waeup/kofa/students/browser.py:256
 msgid "Create student record"
 msgstr ""
@@ -1016,5 +1024,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:309
+#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:310
 msgid "Administration"
 msgstr ""
@@ -1025,11 +1033,11 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:386
+#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:387
 #: 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:750
+#: waeup/kofa/browser/pages.py:1142 waeup/kofa/browser/viewlets.py:393
 #: waeup/kofa/browser/viewlets.py:685
 msgid "Data Center"
@@ -1040,131 +1048,149 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1016
+#: waeup/kofa/browser/pages.py:1018
 msgid "Edit headers or replace imported file!"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:103
+#: waeup/kofa/browser/pages.py:104
 msgid "Local role successfully removed: ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1063
+#: waeup/kofa/browser/pages.py:1065
 msgid "View processing log"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1064
+#: waeup/kofa/browser/pages.py:1066
 msgid "Back to data center"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1108
+#: waeup/kofa/browser/pages.py:1110
 msgid "Processing of ${a} rows failed."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1110
+#: waeup/kofa/browser/pages.py:1112
 msgid "Successfully processed ${a} rows."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1118
+#: waeup/kofa/browser/pages.py:1120
 msgid "Show logfiles"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1120
+#: waeup/kofa/browser/pages.py:1122
 msgid "Back to Data Center"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1121
+#: waeup/kofa/browser/pages.py:1123
 msgid "Show"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:113 waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:226
+#: waeup/kofa/browser/pages.py:114 waeup/kofa/hostels/browser.py:256
+#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:228
 msgid "No item selected."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1143
+#: waeup/kofa/browser/pages.py:1145
 msgid "Back"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1151
+#: waeup/kofa/browser/pages.py:1153
 msgid "Log files can only be searched on Unix-based operating systems."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1179
+#: waeup/kofa/browser/pages.py:1181
 msgid "Edit data center settings"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1199
+#: waeup/kofa/browser/pages.py:1201
 msgid "File already existed (not copied): ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1202
+#: waeup/kofa/browser/pages.py:1204
 msgid "Given storage path cannot be used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1203
+#: waeup/kofa/browser/pages.py:1205
 msgid "Error: ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1206
+#: waeup/kofa/browser/pages.py:1208
 msgid "New storage path succefully set."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1265
+#: waeup/kofa/browser/pages.py:1267
 msgid "Academic Section"
 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:1279 waeup/kofa/browser/pages.py:1295
+#: waeup/kofa/browser/pages.py:1312 waeup/kofa/browser/pages.py:1316
 msgid "Add faculty"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1278
+#: waeup/kofa/browser/pages.py:1280
 msgid "Faculties"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1282 waeup/kofa/browser/viewlets.py:441
+#: waeup/kofa/browser/pages.py:1284 waeup/kofa/browser/viewlets.py:441
 msgid "Manage academic section"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1321
+#: waeup/kofa/browser/pages.py:1323
 msgid "The faculty code chosen already exists."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1342 waeup/kofa/browser/pages.py:1352
+#: waeup/kofa/browser/pages.py:1344 waeup/kofa/browser/pages.py:1354
 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:1356 waeup/kofa/browser/pages.py:1407
+#: waeup/kofa/browser/pages.py:1426 waeup/kofa/browser/pages.py:1430
 msgid "Add department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1362 waeup/kofa/browser/viewlets.py:457
+#: waeup/kofa/browser/pages.py:1364 waeup/kofa/browser/viewlets.py:457
 msgid "Manage faculty"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1435
+#: waeup/kofa/browser/pages.py:1437
 msgid "The code chosen already exists in this faculty."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1438
+#: waeup/kofa/browser/pages.py:1440
 msgid "Department ${a} added."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1455
+#: waeup/kofa/browser/pages.py:1457
 msgid "Courses and Certificates"
 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:1487 waeup/kofa/browser/pages.py:1506
+#: waeup/kofa/students/browser.py:98 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:1523 waeup/kofa/browser/pages.py:1581
+msgid "Remove selected courses"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1523 waeup/kofa/browser/pages.py:1593
+#: waeup/kofa/browser/pages.py:1622 waeup/kofa/browser/pages.py:1626
+msgid "Add course"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1524 waeup/kofa/browser/pages.py:1587
+msgid "Remove selected certificates"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1524 waeup/kofa/browser/pages.py:1598
+#: waeup/kofa/browser/pages.py:1659 waeup/kofa/browser/pages.py:1663
+msgid "Add certificate"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:153 waeup/kofa/browser/viewlets.py:322
 #: waeup/kofa/browser/templates/staffsitelayout.pt:28
 #: waeup/kofa/browser/templates/studentsitelayout.pt:33
@@ -1172,121 +1198,103 @@
 msgstr ""
 
-#: 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
-msgid "Add course"
-msgstr ""
-
-#: 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
-msgid "Add certificate"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:1531 waeup/kofa/browser/viewlets.py:464
+#: waeup/kofa/browser/pages.py:1533 waeup/kofa/browser/viewlets.py:464
 msgid "Manage department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:160
+#: waeup/kofa/browser/pages.py:161
 msgid "You logged in."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1636
+#: waeup/kofa/browser/pages.py:1638
 msgid "A course with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1642
+#: waeup/kofa/browser/pages.py:1644
 msgid "Course ${a} successfully created."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1673
+#: waeup/kofa/browser/pages.py:1675
 msgid "A certificate with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1679
+#: waeup/kofa/browser/pages.py:1681
 msgid "Certificate ${a} successfully created."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1711 waeup/kofa/browser/viewlets.py:481
+#: waeup/kofa/browser/pages.py:1713 waeup/kofa/browser/viewlets.py:481
 msgid "Edit course"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1761
+#: waeup/kofa/browser/pages.py:1763
 msgid "Edit certificate"
 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:1770 waeup/kofa/browser/pages.py:1801
+#: waeup/kofa/browser/pages.py:1842 waeup/kofa/browser/pages.py:1844
 msgid "Add course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1769 waeup/kofa/browser/pages.py:1794
+#: waeup/kofa/browser/pages.py:1771 waeup/kofa/browser/pages.py:1796
 msgid "Remove selected course referrers"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1775 waeup/kofa/browser/viewlets.py:488
+#: waeup/kofa/browser/pages.py:1777 waeup/kofa/browser/viewlets.py:488
 msgid "Manage certificate"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:178
+#: waeup/kofa/browser/pages.py:179
 msgid "You entered wrong credentials."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1847
+#: waeup/kofa/browser/pages.py:1849
 msgid "The chosen course referrer is already part of this certificate."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1851
+#: waeup/kofa/browser/pages.py:1853
 msgid "Course referrer ${a}_${b} added."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1888 waeup/kofa/browser/viewlets.py:505
+#: waeup/kofa/browser/pages.py:1890 waeup/kofa/browser/viewlets.py:505
 msgid "Edit course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1891
+#: waeup/kofa/browser/pages.py:1893
 msgid "Save and return"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:192
+#: waeup/kofa/browser/pages.py:193
 msgid "You have been logged out. Thanks for using WAeUP Kofa!"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:228
+#: waeup/kofa/browser/pages.py:229
 msgid "Contact ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:234 waeup/kofa/browser/pages.py:519
+#: waeup/kofa/browser/pages.py:235 waeup/kofa/browser/pages.py:521
 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:316
+#: waeup/kofa/browser/pages.py:254 waeup/kofa/browser/pages.py:273
+#: waeup/kofa/browser/pages.py:538 waeup/kofa/students/browser.py:318
 msgid "Your message has been sent."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:263
+#: waeup/kofa/browser/pages.py:264
 msgid "Send now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:274
+#: waeup/kofa/browser/pages.py:275
 msgid "A smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:299
+#: waeup/kofa/browser/pages.py:300
 msgid "<h1>Welcome to WAeUP.Kofa</h1>"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:387 waeup/kofa/hostels/browser.py:195
+#: waeup/kofa/browser/pages.py:388 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
@@ -1295,14 +1303,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:388 waeup/kofa/browser/viewlets.py:180
+#: waeup/kofa/browser/pages.py:389 waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:395
+#: waeup/kofa/browser/pages.py:396
 msgid "User account ${a} successfully deleted."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:426 waeup/kofa/browser/pages.py:428
+#: waeup/kofa/browser/pages.py:428 waeup/kofa/browser/pages.py:430
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
@@ -1310,132 +1318,132 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:450
+#: waeup/kofa/browser/pages.py:452
 msgid "User account ${a} successfully added."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:469
+#: waeup/kofa/browser/pages.py:471
 msgid "Edit user ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:500
+#: waeup/kofa/browser/pages.py:502
 msgid "User settings have been saved."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:297
+#: waeup/kofa/browser/pages.py:519 waeup/kofa/students/browser.py:299
 msgid "Send message to ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:546 waeup/kofa/browser/viewlets.py:400
+#: waeup/kofa/browser/pages.py:548 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:561 waeup/kofa/browser/viewlets.py:415
 msgid "My Roles"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:590
+#: waeup/kofa/browser/pages.py:592
 msgid "Search Academic Section"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:617
+#: waeup/kofa/browser/pages.py:619
 msgid "View portal configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:630
+#: waeup/kofa/browser/pages.py:632
 msgid "Edit portal configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:631 waeup/kofa/browser/pages.py:680
+#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:682
 msgid "Update plugins"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:661
-#: waeup/kofa/browser/pages.py:692
+#: waeup/kofa/browser/pages.py:635 waeup/kofa/browser/pages.py:663
+#: waeup/kofa/browser/pages.py:694
 msgid "Add session configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:658 waeup/kofa/browser/pages.py:731
+#: waeup/kofa/browser/pages.py:660 waeup/kofa/browser/pages.py:733
 msgid "Settings have been saved."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:672
+#: waeup/kofa/browser/pages.py:674
 msgid "Session ${a} Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:683
+#: waeup/kofa/browser/pages.py:685
 msgid "Plugins were updated. See log file for details."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:696
+#: waeup/kofa/browser/pages.py:698
 msgid "Add Session Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:703
+#: waeup/kofa/browser/pages.py:705
 msgid "The session chosen already exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:725
+#: waeup/kofa/browser/pages.py:727
 msgid "Edit academic session ${a} configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:755
+#: waeup/kofa/browser/pages.py:757
 msgid "Upload file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:757
+#: waeup/kofa/browser/pages.py:759
 msgid "Upload"
 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:805 waeup/kofa/browser/pages.py:835
+#: waeup/kofa/browser/pages.py:955 waeup/kofa/browser/pages.py:1063
 msgid "Process CSV file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:817 waeup/kofa/browser/pages.py:918
-#: waeup/kofa/browser/pages.py:1037
+#: waeup/kofa/browser/pages.py:819 waeup/kofa/browser/pages.py:920
+#: waeup/kofa/browser/pages.py:1039
 msgid "Import aborted."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:83
+#: waeup/kofa/browser/pages.py:838
+msgid "Back to step 1"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:839
+msgid "Proceed to step 3"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:84
 msgid "No local role selected."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:836
-msgid "Back to step 1"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:837
-msgid "Proceed to step 3"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:897
+#: waeup/kofa/browser/pages.py:899
 msgid "Double headers: each column name may only appear once. "
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:905
+#: waeup/kofa/browser/pages.py:907
 msgid "Replace imported file!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:930
+#: waeup/kofa/browser/pages.py:932
 msgid "Update mode only!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:956 waeup/kofa/browser/pages.py:1182
+#: waeup/kofa/browser/pages.py:958 waeup/kofa/browser/pages.py:1184
 msgid "Reset"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:957
+#: waeup/kofa/browser/pages.py:959
 msgid "Set headerfields"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:958
+#: waeup/kofa/browser/pages.py:960
 msgid "Back to step 2"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:959
+#: waeup/kofa/browser/pages.py:961
 msgid "Perform import"
 msgstr ""
@@ -1821,5 +1829,6 @@
 
 #: 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/students/viewlets.py:218 waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/viewlets.py:403
 msgid "Edit"
 msgstr ""
@@ -1956,5 +1965,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:435
 msgid "Bed Type"
 msgstr ""
@@ -2112,41 +2121,41 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:172
+#: waeup/kofa/interfaces.py:185
 msgid "Subject"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:176
+#: waeup/kofa/interfaces.py:189
 msgid "Grade"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:304
+#: waeup/kofa/interfaces.py:319
 msgid "Importer name"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:308
+#: waeup/kofa/interfaces.py:323
 msgid "Import mode"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:333
+#: waeup/kofa/interfaces.py:348
 msgid "Email Address:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:340
+#: waeup/kofa/interfaces.py:355
 msgid "Email to:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:347
+#: waeup/kofa/interfaces.py:362
 msgid "Subject:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:351
+#: waeup/kofa/interfaces.py:366
 msgid "Full Name:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:355
+#: waeup/kofa/interfaces.py:370
 msgid "Text:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:386
+#: waeup/kofa/interfaces.py:401
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2158,5 +2167,5 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:391
+#: waeup/kofa/interfaces.py:406
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2165,97 +2174,97 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:395
+#: waeup/kofa/interfaces.py:410
 msgid "Description/Notice"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:412
+#: waeup/kofa/interfaces.py:427
 msgid "Portal roles"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:455
+#: waeup/kofa/interfaces.py:470
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:456
+#: waeup/kofa/interfaces.py:471
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:461
+#: waeup/kofa/interfaces.py:476
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:467
+#: waeup/kofa/interfaces.py:482
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:474
+#: waeup/kofa/interfaces.py:489
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:486
+#: waeup/kofa/interfaces.py:501
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:494
+#: waeup/kofa/interfaces.py:509
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:502
+#: waeup/kofa/interfaces.py:517
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:508
+#: waeup/kofa/interfaces.py:523
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:515
+#: waeup/kofa/interfaces.py:530
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:516
+#: waeup/kofa/interfaces.py:531
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:521
+#: waeup/kofa/interfaces.py:536
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:528
+#: waeup/kofa/interfaces.py:543
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:535
+#: waeup/kofa/interfaces.py:550
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:544 waeup/kofa/interfaces.py:596
+#: waeup/kofa/interfaces.py:559 waeup/kofa/interfaces.py:611
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:552 waeup/kofa/payments/interfaces.py:30
+#: waeup/kofa/interfaces.py:567 waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:557 waeup/kofa/payments/interfaces.py:106
-msgid "Surcharge 1"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:562 waeup/kofa/payments/interfaces.py:113
+#: waeup/kofa/interfaces.py:572 waeup/kofa/payments/interfaces.py:106
+msgid "Portal Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:577 waeup/kofa/payments/interfaces.py:113
 msgid "Surcharge 2"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:567 waeup/kofa/payments/interfaces.py:120
+#: waeup/kofa/interfaces.py:582 waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:572
+#: waeup/kofa/interfaces.py:587
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:577
+#: waeup/kofa/interfaces.py:592
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:582 waeup/kofa/payments/interfaces.py:36
+#: waeup/kofa/interfaces.py:597 waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
 msgstr ""
@@ -2380,337 +2389,341 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1068
+#: waeup/kofa/students/browser.py:1002 waeup/kofa/students/browser.py:1224
+msgid "Your current session does not match accommodation session."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1071
 msgid "This ticket has already been paid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1081 waeup/kofa/students/browser.py:1089
-#: waeup/kofa/students/browser.py:1097
+#: waeup/kofa/students/browser.py:1084 waeup/kofa/students/browser.py:1092
+#: waeup/kofa/students/browser.py:1100
 msgid "Valid callback received. ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1151
+#: waeup/kofa/students/browser.py:1154
 msgid "${a}: Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1163
+#: waeup/kofa/students/browser.py:1166
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:117 waeup/kofa/students/viewlets.py:114
+#: waeup/kofa/students/browser.py:1173
+msgid "No bed ticket selected."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:119 waeup/kofa/students/viewlets.py:114
 #: waeup/kofa/students/viewlets.py:534
 msgid "Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1170
-msgid "No bed ticket selected."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1201
+#: waeup/kofa/students/browser.py:1204
 msgid "Add bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1203
+#: waeup/kofa/students/browser.py:1206
 msgid "Create bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1211
+#: waeup/kofa/students/browser.py:1214
 msgid "Your data are incomplete."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1215
+#: waeup/kofa/students/browser.py:1218
 msgid "You are in the wrong registration state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1226
+#: waeup/kofa/students/browser.py:1229
 msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:123 waeup/kofa/students/viewlets.py:120
+#: waeup/kofa/students/browser.py:1240 waeup/kofa/students/browser.py:1537
+#: waeup/kofa/students/browser.py:1650
+msgid "Activation code is invalid."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:125 waeup/kofa/students/viewlets.py:120
 #: waeup/kofa/students/viewlets.py:535
 msgid "Payments"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1237 waeup/kofa/students/browser.py:1533
-#: waeup/kofa/students/browser.py:1646
-msgid "Activation code is invalid."
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1257 waeup/kofa/students/browser.py:1385
+#. Default: ""
+#: waeup/kofa/students/browser.py:1260 waeup/kofa/students/browser.py:1388
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1262 waeup/kofa/students/browser.py:1538
-#: waeup/kofa/students/browser.py:1651
+#: waeup/kofa/students/browser.py:1265 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:1265 waeup/kofa/students/browser.py:1541
-#: waeup/kofa/students/browser.py:1654 waeup/kofa/students/browser.py:1913
+#: waeup/kofa/students/browser.py:1268 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:1270 waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1659
+#: waeup/kofa/students/browser.py:1273 waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1663
 msgid "You are not the owner of this access code."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1281 waeup/kofa/students/browser.py:1399
+#: waeup/kofa/students/browser.py:1284 waeup/kofa/students/browser.py:1402
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1290
+#: waeup/kofa/students/browser.py:1293
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1308
+#: waeup/kofa/students/browser.py:1311
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1324
+#: waeup/kofa/students/browser.py:1327
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1330
+#: waeup/kofa/students/browser.py:1333
 msgid "Bed Allocation: "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1357
+#: waeup/kofa/students/browser.py:1360
 msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1363
+#: waeup/kofa/students/browser.py:1366
 msgid "Student can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:138 waeup/kofa/students/viewlets.py:126
+#: waeup/kofa/students/browser.py:140 waeup/kofa/students/viewlets.py:126
 msgid "Accommodation"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1406
+#: waeup/kofa/students/browser.py:1409
 msgid "Student relocated: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1425
+#: waeup/kofa/students/browser.py:1428
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1437 waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/browser.py:1441
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1452 waeup/kofa/students/viewlets.py:365
+#: waeup/kofa/students/browser.py:1456 waeup/kofa/students/viewlets.py:365
 msgid "Change password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1466
+#: waeup/kofa/students/browser.py:1470
 msgid "Password changed."
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/browser.py:147
+#: waeup/kofa/students/browser.py:1482
+msgid "Upload portrait"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/browser.py:149
 msgid "Bed Ticket ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1478
-msgid "Upload portrait"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1493 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"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1497
+#: waeup/kofa/students/browser.py:1501
 msgid "Start clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1514 waeup/kofa/students/browser.py:1635
+#: waeup/kofa/students/browser.py:1518 waeup/kofa/students/browser.py:1639
 msgid "Wrong state"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1518
+#: waeup/kofa/students/browser.py:1522
 msgid "No portrait uploaded."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1522
+#: waeup/kofa/students/browser.py:1526
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1553
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1561
+#: waeup/kofa/students/browser.py:1565
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1573 waeup/kofa/students/browser.py:1587
+#: waeup/kofa/students/browser.py:1577 waeup/kofa/students/browser.py:1591
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1581
+#: waeup/kofa/students/browser.py:1585
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1596 waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1600 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1597
+#: waeup/kofa/students/browser.py:1601
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1600
+#: waeup/kofa/students/browser.py:1604
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1609
+#: waeup/kofa/students/browser.py:1613
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1618
+#: waeup/kofa/students/browser.py:1622
 msgid "Clearance has been requested."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1627 waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:1631 waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1631
+#: waeup/kofa/students/browser.py:1635
 msgid "Start course registration now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:166
+#: waeup/kofa/students/browser.py:1671
+msgid "Course registration has been started."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:168
 msgid "Student Section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1667
-msgid "Course registration has been started."
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1686
+#. Default: ""
+#: waeup/kofa/students/browser.py:1690
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1695
+#: waeup/kofa/students/browser.py:1699
 msgid "Create course list now"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1734
+#: waeup/kofa/students/browser.py:1738
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1771
+#: waeup/kofa/students/browser.py:1775
 msgid "Register course list"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1775
+#: waeup/kofa/students/browser.py:1779
 msgid "Course list has been registered."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:182 waeup/kofa/students/browser.py:218
+#: waeup/kofa/students/browser.py:1825
+msgid "Change my password"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1835
+msgid "Get new login credentials"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:184 waeup/kofa/students/browser.py:220
 msgid "Empty search string"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1821
-msgid "Change my password"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1831
-msgid "Get new login credentials"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1845
+#: waeup/kofa/students/browser.py:1849
 msgid "No student record found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1853
+#: waeup/kofa/students/browser.py:1857
 msgid "You have successfully changed your password for the"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1858
+#: waeup/kofa/students/browser.py:1862
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1869
+#: waeup/kofa/students/browser.py:1873
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1872
+#: waeup/kofa/students/browser.py:1876
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1887
+#: waeup/kofa/students/browser.py:1891
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1895
+#: waeup/kofa/students/browser.py:1899
 msgid "Access code is invalid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1898
+#: waeup/kofa/students/browser.py:1902
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1904
+#: waeup/kofa/students/browser.py:1908
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1910
+#: waeup/kofa/students/browser.py:1914
 msgid "Access code has already been used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1919
+#: waeup/kofa/students/browser.py:1923
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:200 waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:202 waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:224 waeup/kofa/students/browser.py:1884
+#: waeup/kofa/students/browser.py:226 waeup/kofa/students/browser.py:1888
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:251 waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:253 waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:259
+#: waeup/kofa/students/browser.py:261
 msgid "Student record created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:275
+#: waeup/kofa/students/browser.py:277
 msgid "${a}: Base Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:318 waeup/kofa/students/browser.py:1861
+#: waeup/kofa/students/browser.py:320 waeup/kofa/students/browser.py:1865
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:329
+#: waeup/kofa/students/browser.py:332
 msgid "Manage base data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:398
+#: waeup/kofa/students/browser.py:401
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:414 waeup/kofa/students/viewlets.py:104
+#: waeup/kofa/students/browser.py:417 waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
@@ -2718,84 +2731,84 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:420
+#: waeup/kofa/students/browser.py:423
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:440
+#: waeup/kofa/students/browser.py:443
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:469
+#: waeup/kofa/students/browser.py:472
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:471 waeup/kofa/students/browser.py:495
+#: waeup/kofa/students/browser.py:474 waeup/kofa/students/browser.py:498
 msgid "Student is in wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:488
+#: waeup/kofa/students/browser.py:491
 msgid "Clearance has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:492
+#: waeup/kofa/students/browser.py:495
 msgid "Clearance request has been rejected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:518
+#: waeup/kofa/students/browser.py:521
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:528
+#: waeup/kofa/students/browser.py:531
 msgid "Manage personal data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:548
+#: waeup/kofa/students/browser.py:551
 msgid "${a}: Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:578
+#: waeup/kofa/students/browser.py:581
 msgid "Manage study course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:581 waeup/kofa/students/browser.py:622
+#: waeup/kofa/students/browser.py:584 waeup/kofa/students/browser.py:625
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:582 waeup/kofa/students/browser.py:608
+#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:611
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:616
+#: waeup/kofa/students/browser.py:619
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:618 waeup/kofa/students/browser.py:1704
+#: waeup/kofa/students/browser.py:621 waeup/kofa/students/browser.py:1708
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:628
+#: waeup/kofa/students/browser.py:631
 msgid "No study level selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:664
+#: waeup/kofa/students/browser.py:667
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:687
+#: waeup/kofa/students/browser.py:690
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:693
+#: waeup/kofa/students/browser.py:696
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:702
+#: waeup/kofa/students/browser.py:705
 msgid "Course Registration Slip  "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:708
+#: waeup/kofa/students/browser.py:711
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -2804,5 +2817,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:711
+#: waeup/kofa/students/browser.py:714
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -2810,10 +2823,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:712
+#: waeup/kofa/students/browser.py:715
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:713
+#: waeup/kofa/students/browser.py:716
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -2821,5 +2834,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:714
+#: waeup/kofa/students/browser.py:717
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -2827,5 +2840,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:715 waeup/kofa/students/interfaces.py:370
+#: waeup/kofa/students/browser.py:718 waeup/kofa/students/interfaces.py:378
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2834,73 +2847,69 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:743 waeup/kofa/students/browser.py:772
-#: waeup/kofa/students/browser.py:857 waeup/kofa/students/browser.py:862
-#: waeup/kofa/students/browser.py:1744 waeup/kofa/students/browser.py:1794
+#: waeup/kofa/students/browser.py:746 waeup/kofa/students/browser.py:775
+#: waeup/kofa/students/browser.py:860 waeup/kofa/students/browser.py:865
+#: waeup/kofa/students/browser.py:1748 waeup/kofa/students/browser.py:1798
 msgid "Add course ticket"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:764
+#: waeup/kofa/students/browser.py:767
 msgid "Manage study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:782 waeup/kofa/students/browser.py:1754
+#: waeup/kofa/students/browser.py:785 waeup/kofa/students/browser.py:1758
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:806 waeup/kofa/students/browser.py:828
+#: waeup/kofa/students/browser.py:809 waeup/kofa/students/browser.py:831
 msgid "This level does not correspond current level."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:810
+#: waeup/kofa/students/browser.py:813
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:812 waeup/kofa/students/browser.py:840
+#: waeup/kofa/students/browser.py:815 waeup/kofa/students/browser.py:843
 msgid "Student is in the wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:833
+#: waeup/kofa/students/browser.py:836
 msgid "Course list request has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:840
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:877 waeup/kofa/students/browser.py:1807
+#: waeup/kofa/students/browser.py:880 waeup/kofa/students/browser.py:1811
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:879 waeup/kofa/students/browser.py:1809
+#: waeup/kofa/students/browser.py:882 waeup/kofa/students/browser.py:1813
 msgid "Successfully added ${a}."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:900
+#: waeup/kofa/students/browser.py:903
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:916
+#: waeup/kofa/students/browser.py:919
 msgid "Manage course ticket ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:943
+#: waeup/kofa/students/browser.py:946
 msgid "${a}: Payments"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:988
+#: waeup/kofa/students/browser.py:991
 msgid "Add online payment"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:991
+#: waeup/kofa/students/browser.py:994
 msgid "Create ticket"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:999 waeup/kofa/students/browser.py:1221
-msgid "Your current session does not match accommodation session."
 msgstr ""
 
@@ -3001,6 +3010,6 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:21
-#: waeup/kofa/students/browser_templates/fileupload.pt:27
+#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/students/browser_templates/fileupload.pt:26
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
 msgid "Max. file size:"
@@ -3130,69 +3139,69 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:176 waeup/kofa/students/interfaces.py:255
-#: waeup/kofa/students/interfaces.py:483
+#: waeup/kofa/students/interfaces.py:184 waeup/kofa/students/interfaces.py:263
+#: waeup/kofa/students/interfaces.py:491
 msgid "Registration Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:183 waeup/kofa/students/interfaces.py:265
+#: waeup/kofa/students/interfaces.py:191 waeup/kofa/students/interfaces.py:273
 msgid "Matriculation Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:191
+#: waeup/kofa/students/interfaces.py:199
 msgid "PWD Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:198
+#: waeup/kofa/students/interfaces.py:206
 msgid "Email"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:218
+#: waeup/kofa/students/interfaces.py:226
 msgid "Clearance form locked"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:223
+#: waeup/kofa/students/interfaces.py:231
 msgid "CLR Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:231
+#: waeup/kofa/students/interfaces.py:239
 msgid "Nationality"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:241
+#: waeup/kofa/students/interfaces.py:249
 msgid "Permanent Address"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:275
+#: waeup/kofa/students/interfaces.py:283
 #: waeup/kofa/browser/templates/showstudentspage.pt:7
 msgid "Certificate"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:282
+#: waeup/kofa/students/interfaces.py:290
 msgid "Entry Mode"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:290
+#: waeup/kofa/students/interfaces.py:298
 msgid "Entry Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:299
+#: waeup/kofa/students/interfaces.py:307
 #: waeup/kofa/browser/templates/showstudentspage.pt:8
 msgid "Current Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:307
+#: waeup/kofa/students/interfaces.py:315
 #: waeup/kofa/browser/templates/showstudentspage.pt:9
 msgid "Current Level"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:315
+#: waeup/kofa/students/interfaces.py:323
 msgid "Current Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:322
+#: waeup/kofa/students/interfaces.py:330
 msgid "Previous Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:337 waeup/kofa/students/interfaces.py:434
+#: waeup/kofa/students/interfaces.py:345 waeup/kofa/students/interfaces.py:442
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3200,9 +3209,9 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:344
+#: waeup/kofa/students/interfaces.py:352
 msgid "Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:363
+#: waeup/kofa/students/interfaces.py:371
 #: waeup/kofa/browser/templates/certificatepage.pt:30
 #: waeup/kofa/browser/templates/certificatemanagepage.pt:33
@@ -3210,13 +3219,13 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:377
+#: waeup/kofa/students/interfaces.py:385
 msgid "Automatical Creation"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:384
+#: waeup/kofa/students/interfaces.py:392
 msgid "Carry-over Course"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:403
+#: waeup/kofa/students/interfaces.py:411
 #: waeup/kofa/university/interfaces.py:299
 #: waeup/kofa/browser/templates/certificatepage.pt:29
@@ -3225,15 +3234,15 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:420
+#: waeup/kofa/students/interfaces.py:428
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:10
 msgid "Bed Coordinates"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:442
+#: waeup/kofa/students/interfaces.py:450
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:9
 msgid "Booking Date"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:448
+#: waeup/kofa/students/interfaces.py:456
 msgid "Booking Activation Code"
 msgstr ""
@@ -3244,5 +3253,5 @@
 msgstr ""
 
-#: waeup/kofa/students/utils.py:280 waeup/kofa/students/viewlets.py:71
+#: waeup/kofa/students/utils.py:298 waeup/kofa/students/viewlets.py:71
 #: waeup/kofa/students/viewlets.py:99
 #: waeup/kofa/students/browser_templates/basemanagepage.pt:6
@@ -3250,5 +3259,5 @@
 msgstr ""
 
-#: waeup/kofa/students/utils.py:311
+#: waeup/kofa/students/utils.py:329
 msgid "Scanned Documents"
 msgstr ""
@@ -3400,9 +3409,9 @@
 
 #: waeup/kofa/students/vocabularies.py:135
-msgid "Male"
+msgid "male"
 msgstr ""
 
 #: waeup/kofa/students/vocabularies.py:137
-msgid "Female"
+msgid "female"
 msgstr ""
 
@@ -3661,5 +3670,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:228
+#: waeup/kofa/utils/utils.py:142
 msgid ""
 "Fullname: ${a}\n"
@@ -3671,5 +3680,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:273
+#: waeup/kofa/utils/utils.py:187
 msgid ""
 "Dear ${a},\n"
@@ -3691,4 +3700,28 @@
 msgstr ""
 
+#: waeup/kofa/utils/utils.py:44
+msgid "Germany"
+msgstr ""
+
+#: waeup/kofa/utils/utils.py:45
+msgid "Nigeria"
+msgstr ""
+
+#: waeup/kofa/utils/utils.py:46
+msgid "U.S."
+msgstr ""
+
+#: waeup/kofa/widgets/phonewidget.py:117
+msgid "Empty phone field(s)."
+msgstr ""
+
+#: waeup/kofa/widgets/phonewidget.py:121
+msgid "Int. prefix requires format '+NNN'"
+msgstr ""
+
+#: waeup/kofa/widgets/phonewidget.py:127
+msgid "Phone numbers may contain numbers only."
+msgstr ""
+
 #: waeup/kofa/widgets/sequencewidget.pt:18
 msgid "Don't forget to save the form after adding or deleting items."
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 7881)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/fr/LC_MESSAGES/waeup.kofa.po	(revision 7882)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Sun Mar 11 16:45:08 2012\n"
+"POT-Creation-Date: Wed Mar 14 10:35:59 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -32,20 +32,20 @@
 #: waeup/kofa/applicants/browser.py:182 waeup/kofa/applicants/browser.py:255
 #: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:339
-#: 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:580
-#: waeup/kofa/students/browser.py:581 waeup/kofa/students/browser.py:742
-#: waeup/kofa/students/browser.py:744 waeup/kofa/students/browser.py:884
+#: waeup/kofa/browser/pages.py:505 waeup/kofa/browser/pages.py:710
+#: waeup/kofa/browser/pages.py:737 waeup/kofa/browser/pages.py:760
+#: waeup/kofa/browser/pages.py:807 waeup/kofa/browser/pages.py:837
+#: waeup/kofa/browser/pages.py:957 waeup/kofa/browser/pages.py:1185
+#: waeup/kofa/browser/pages.py:1279 waeup/kofa/browser/pages.py:1300
+#: waeup/kofa/browser/pages.py:1327 waeup/kofa/browser/pages.py:1355
+#: waeup/kofa/browser/pages.py:1356 waeup/kofa/browser/pages.py:1402
+#: waeup/kofa/browser/pages.py:1443 waeup/kofa/browser/pages.py:1522
+#: waeup/kofa/browser/pages.py:1523 waeup/kofa/browser/pages.py:1525
+#: waeup/kofa/browser/pages.py:1603 waeup/kofa/browser/pages.py:1648
+#: waeup/kofa/browser/pages.py:1686 waeup/kofa/browser/pages.py:1730
+#: waeup/kofa/browser/pages.py:1769 waeup/kofa/browser/pages.py:1771
+#: waeup/kofa/browser/pages.py:1806 waeup/kofa/browser/pages.py:1857
+#: waeup/kofa/browser/pages.py:1909 waeup/kofa/students/browser.py:583
+#: waeup/kofa/students/browser.py:584 waeup/kofa/students/browser.py:745
+#: waeup/kofa/students/browser.py:747 waeup/kofa/students/browser.py:887
 msgid "Cancel"
 msgstr ""
@@ -85,7 +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:167 waeup/kofa/students/browser.py:201
+#: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:594
+#: waeup/kofa/browser/pages.py:1144 waeup/kofa/browser/viewlets.py:190
+#: waeup/kofa/students/browser.py:169 waeup/kofa/students/browser.py:203
 msgid "Search"
 msgstr ""
@@ -343,5 +343,5 @@
 
 #: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:326
-#: waeup/kofa/applicants/browser.py:746
+#: waeup/kofa/applicants/browser.py:747
 msgid "Could not delete:"
 msgstr ""
@@ -349,8 +349,8 @@
 #. Default: ""
 #: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py:329
-#: waeup/kofa/applicants/browser.py:749 waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:239 waeup/kofa/students/browser.py:638
-#: waeup/kofa/students/browser.py:792 waeup/kofa/students/browser.py:970
-#: waeup/kofa/students/browser.py:1180 waeup/kofa/students/browser.py:1766
+#: waeup/kofa/applicants/browser.py:750 waeup/kofa/browser/pages.py:135
+#: waeup/kofa/students/browser.py:241 waeup/kofa/students/browser.py:641
+#: waeup/kofa/students/browser.py:795 waeup/kofa/students/browser.py:973
+#: waeup/kofa/students/browser.py:1183 waeup/kofa/students/browser.py:1770
 msgid "Successfully removed: ${a}"
 msgstr ""
@@ -373,24 +373,24 @@
 
 #: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:302
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:689
-#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:839 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/applicants/browser.py:656 waeup/kofa/applicants/browser.py:690
+#: waeup/kofa/applicants/browser.py:793 waeup/kofa/applicants/browser.py:796
+#: waeup/kofa/applicants/browser.py:840 waeup/kofa/browser/pages.py:478
+#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:656
+#: waeup/kofa/browser/pages.py:730 waeup/kofa/browser/pages.py:1183
+#: waeup/kofa/browser/pages.py:1355 waeup/kofa/browser/pages.py:1396
+#: waeup/kofa/browser/pages.py:1522 waeup/kofa/browser/pages.py:1575
+#: waeup/kofa/browser/pages.py:1718 waeup/kofa/browser/pages.py:1769
+#: waeup/kofa/browser/pages.py:1790 waeup/kofa/hostels/browser.py:209
 #: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:318
-#: waeup/kofa/students/browser.py:355 waeup/kofa/students/browser.py:454
-#: waeup/kofa/students/browser.py:531 waeup/kofa/students/browser.py:580
-#: waeup/kofa/students/browser.py:596 waeup/kofa/students/browser.py:742
-#: waeup/kofa/students/browser.py:767 waeup/kofa/students/browser.py:1440
-#: waeup/kofa/students/browser.py:1455 waeup/kofa/students/browser.py:1570
+#: waeup/kofa/students/browser.py:358 waeup/kofa/students/browser.py:457
+#: waeup/kofa/students/browser.py:534 waeup/kofa/students/browser.py:583
+#: waeup/kofa/students/browser.py:599 waeup/kofa/students/browser.py:745
+#: waeup/kofa/students/browser.py:770 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:256 waeup/kofa/applicants/browser.py:334
-#: waeup/kofa/applicants/browser.py:362
+#: waeup/kofa/applicants/browser.py:363
 msgid "Add applicant"
 msgstr ""
@@ -400,9 +400,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:306 waeup/kofa/applicants/browser.py:718
-#: 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:381
+#: waeup/kofa/applicants/browser.py:306 waeup/kofa/applicants/browser.py:719
+#: waeup/kofa/browser/pages.py:1399 waeup/kofa/browser/pages.py:1721
+#: waeup/kofa/browser/pages.py:1793 waeup/kofa/browser/pages.py:1905
+#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:82
+#: waeup/kofa/students/browser.py:384
 msgid "Form has been saved."
 msgstr ""
@@ -412,67 +412,67 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:365
+#: waeup/kofa/applicants/browser.py:366
 msgid "Create application record"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:370
+#: waeup/kofa/applicants/browser.py:371
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:383
+#: waeup/kofa/applicants/browser.py:384
 msgid "Applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:281
+#: waeup/kofa/applicants/browser.py:399 waeup/kofa/students/browser.py:283
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:399 waeup/kofa/students/browser.py:282
+#: waeup/kofa/applicants/browser.py:400 waeup/kofa/students/browser.py:284
 msgid "unset"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:404
+#: waeup/kofa/applicants/browser.py:405
 msgid "${a} Application Record ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:455
+#: waeup/kofa/applicants/browser.py:456
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:462 waeup/kofa/students/browser.py:1019
+#: waeup/kofa/applicants/browser.py:463 waeup/kofa/students/browser.py:1022
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:475 waeup/kofa/students/browser.py:1033
+#: waeup/kofa/applicants/browser.py:476 waeup/kofa/students/browser.py:1036
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:502 waeup/kofa/students/browser.py:1052
+#: waeup/kofa/applicants/browser.py:503 waeup/kofa/students/browser.py:1055
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:530 waeup/kofa/students/browser.py:1101
+#: waeup/kofa/applicants/browser.py:531 waeup/kofa/students/browser.py:1104
 msgid "Valid callback received."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:551
+#: waeup/kofa/applicants/browser.py:552
 msgid "Payment Data"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:557
+#: waeup/kofa/applicants/browser.py:558
 msgid "Online Payment Receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:563
+#: waeup/kofa/applicants/browser.py:564
 msgid "Ticket not yet paid."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:628
+#: waeup/kofa/applicants/browser.py:629
 msgid "Uploaded image is too big!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:633
+#: waeup/kofa/applicants/browser.py:634
 msgid "jpg file extension expected."
 msgstr ""
@@ -482,33 +482,33 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:847
+#: waeup/kofa/applicants/browser.py:656 waeup/kofa/applicants/browser.py:796
+#: waeup/kofa/applicants/browser.py:848
 msgid "Final Submit"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:656 waeup/kofa/applicants/browser.py:759
-#: waeup/kofa/applicants/browser.py:793 waeup/kofa/applicants/browser.py:828
-#: waeup/kofa/students/browser.py:976
+#: waeup/kofa/applicants/browser.py:657 waeup/kofa/applicants/browser.py:760
+#: waeup/kofa/applicants/browser.py:794 waeup/kofa/applicants/browser.py:829
+#: waeup/kofa/students/browser.py:979
 msgid "Add online payment ticket"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:656 waeup/kofa/applicants/browser.py:764
-#: waeup/kofa/applicants/browser.py:793 waeup/kofa/applicants/browser.py:796
-#: waeup/kofa/applicants/browser.py:833 waeup/kofa/students/browser.py:744
-#: waeup/kofa/students/browser.py:776 waeup/kofa/students/browser.py:952
-#: waeup/kofa/students/browser.py:1748
+#: waeup/kofa/applicants/browser.py:657 waeup/kofa/applicants/browser.py:765
+#: waeup/kofa/applicants/browser.py:794 waeup/kofa/applicants/browser.py:797
+#: waeup/kofa/applicants/browser.py:834 waeup/kofa/students/browser.py:747
+#: waeup/kofa/students/browser.py:779 waeup/kofa/students/browser.py:955
+#: waeup/kofa/students/browser.py:1752
 msgid "Remove selected tickets"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:675
+#: waeup/kofa/applicants/browser.py:676
 msgid "${a} Application Form ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:686 waeup/kofa/students/browser.py:352
+#: waeup/kofa/applicants/browser.py:687 waeup/kofa/students/browser.py:355
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:733 waeup/kofa/students/browser.py:958
+#: waeup/kofa/applicants/browser.py:734 waeup/kofa/students/browser.py:961
 msgid "No payment selected."
 msgstr ""
@@ -520,9 +520,9 @@
 #: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:105
 #: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:309
-#: 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:202
-#: waeup/kofa/students/browser.py:1147 waeup/kofa/students/browser.py:1160
+#: waeup/kofa/browser/pages.py:636 waeup/kofa/browser/pages.py:677
+#: waeup/kofa/browser/pages.py:1279 waeup/kofa/browser/pages.py:1290
+#: waeup/kofa/browser/pages.py:1356 waeup/kofa/browser/pages.py:1391
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:204
+#: waeup/kofa/students/browser.py:1150 waeup/kofa/students/browser.py:1163
 msgid "Remove selected"
 msgstr ""
@@ -533,5 +533,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:806 waeup/kofa/students/browser.py:88
+#: waeup/kofa/applicants/browser.py:807 waeup/kofa/students/browser.py:90
 msgid "The requested form is locked (read-only)."
 msgstr ""
@@ -539,7 +539,7 @@
 #: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:139
 #: waeup/kofa/applicants/browser.py:257 waeup/kofa/applicants/browser.py:348
-#: 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/browser/pages.py:1357 waeup/kofa/browser/pages.py:1416
+#: waeup/kofa/browser/pages.py:1526 waeup/kofa/browser/pages.py:1612
+#: waeup/kofa/browser/pages.py:1772 waeup/kofa/browser/pages.py:1829
 msgid "Remove selected local roles"
 msgstr ""
@@ -547,15 +547,15 @@
 #: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:135
 #: waeup/kofa/applicants/browser.py:258 waeup/kofa/applicants/browser.py:344
-#: 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/browser/pages.py:1358 waeup/kofa/browser/pages.py:1412
+#: waeup/kofa/browser/pages.py:1527 waeup/kofa/browser/pages.py:1608
+#: waeup/kofa/browser/pages.py:1773 waeup/kofa/browser/pages.py:1825
 msgid "Add local role"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:820
+#: waeup/kofa/applicants/browser.py:821
 msgid "No passport picture uploaded."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:822
+#: waeup/kofa/applicants/browser.py:823
 msgid "Passport picture confirmation box not ticked."
 msgstr ""
@@ -565,38 +565,38 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:859 waeup/kofa/students/browser.py:1615
+#: waeup/kofa/applicants/browser.py:860 waeup/kofa/students/browser.py:1619
 msgid "This form cannot be submitted. Wrong state!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:864
+#: waeup/kofa/applicants/browser.py:865
 msgid "Form has been submitted."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:899
+#: waeup/kofa/applicants/browser.py:900
 msgid "Register for ${a} Application"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:905
+#: waeup/kofa/applicants/browser.py:906
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:910
+#: waeup/kofa/applicants/browser.py:911
 msgid "Application has ended."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:919
+#: waeup/kofa/applicants/browser.py:920
 msgid "Get login credentials"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:934
+#: waeup/kofa/applicants/browser.py:935
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:941
+#: waeup/kofa/applicants/browser.py:942
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:950
+#: waeup/kofa/applicants/browser.py:951
 msgid "Your registration was successful."
 msgstr ""
@@ -664,5 +664,13 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:709
+#: waeup/kofa/applicants/container.py:52
+msgid "Basic"
+msgstr ""
+
+#: waeup/kofa/applicants/container.py:55
+msgid "handles basic applicants"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:198 waeup/kofa/students/browser.py:712
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -688,5 +696,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:710
+#: waeup/kofa/applicants/interfaces.py:205 waeup/kofa/students/browser.py:713
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -707,126 +715,126 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:211
-#: waeup/kofa/applicants/interfaces.py:324
+#: waeup/kofa/applicants/interfaces.py:212
+#: waeup/kofa/applicants/interfaces.py:325
 msgid "Application Target"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:219
+#: waeup/kofa/applicants/interfaces.py:220
 msgid "Entry Level"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:226
-#: waeup/kofa/applicants/interfaces.py:332
+#: waeup/kofa/applicants/interfaces.py:227
+#: waeup/kofa/applicants/interfaces.py:333
 msgid "Year of Entrance"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:234
-#: waeup/kofa/applicants/interfaces.py:340
+#: waeup/kofa/applicants/interfaces.py:235
+#: waeup/kofa/applicants/interfaces.py:341
 msgid "Applicants Container Type"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:250
+#: waeup/kofa/applicants/interfaces.py:251
 msgid "Category for the grouping of certificates"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:257
+#: waeup/kofa/applicants/interfaces.py:258
 msgid "Human readable description in reST format"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:273
+#: waeup/kofa/applicants/interfaces.py:274
 msgid "Application Start Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:279
+#: waeup/kofa/applicants/interfaces.py:280
 msgid "Application Closing Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:285
+#: waeup/kofa/applicants/interfaces.py:286
 msgid "Forbid additions after deadline (enddate)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:368
+#: waeup/kofa/applicants/interfaces.py:369
 msgid "Applicant Id"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:373
+#: waeup/kofa/applicants/interfaces.py:374
 msgid "JAMB Registration Number"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:385
-#: waeup/kofa/students/interfaces.py:154
+#: waeup/kofa/applicants/interfaces.py:386
+#: waeup/kofa/students/interfaces.py:162
 msgid "First Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:389
-#: waeup/kofa/students/interfaces.py:159
+#: waeup/kofa/applicants/interfaces.py:390
+#: waeup/kofa/students/interfaces.py:167
 msgid "Middle Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:393
-#: waeup/kofa/students/interfaces.py:164
+#: waeup/kofa/applicants/interfaces.py:394
+#: waeup/kofa/students/interfaces.py:172
 msgid "Last Name (Surname)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:397
-#: waeup/kofa/students/interfaces.py:213
+#: waeup/kofa/applicants/interfaces.py:398
+#: waeup/kofa/students/interfaces.py:221
 msgid "Date of Birth"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:402
+#: waeup/kofa/applicants/interfaces.py:403
 msgid "State/LGA"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:407
-#: waeup/kofa/students/interfaces.py:169
+#: waeup/kofa/applicants/interfaces.py:408
+#: waeup/kofa/students/interfaces.py:177
 msgid "Sex"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:373
-#: waeup/kofa/interfaces.py:399 waeup/kofa/students/interfaces.py:490
+#: waeup/kofa/applicants/interfaces.py:414 waeup/kofa/interfaces.py:388
+#: waeup/kofa/interfaces.py:414 waeup/kofa/students/interfaces.py:498
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:378
-#: waeup/kofa/interfaces.py:406 waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/applicants/interfaces.py:419 waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:421 waeup/kofa/students/interfaces.py:211
 msgid "Phone"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:423
-#: waeup/kofa/applicants/interfaces.py:509
+#: waeup/kofa/applicants/interfaces.py:424
+#: waeup/kofa/applicants/interfaces.py:510
 msgid "1st Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:428
-#: waeup/kofa/applicants/interfaces.py:514
+#: waeup/kofa/applicants/interfaces.py:429
+#: waeup/kofa/applicants/interfaces.py:515
 msgid "2nd Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:433
+#: waeup/kofa/applicants/interfaces.py:434
 msgid "School Grades"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:443
-#: waeup/kofa/applicants/interfaces.py:519
+#: waeup/kofa/applicants/interfaces.py:444
+#: waeup/kofa/applicants/interfaces.py:520
 msgid "Screening Score"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:447
-#: waeup/kofa/applicants/interfaces.py:524
+#: waeup/kofa/applicants/interfaces.py:448
+#: waeup/kofa/applicants/interfaces.py:525
 msgid "Screening Venue"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:451
-#: waeup/kofa/applicants/interfaces.py:529
+#: waeup/kofa/applicants/interfaces.py:452
+#: waeup/kofa/applicants/interfaces.py:530
 msgid "Admitted Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:457
-#: waeup/kofa/applicants/interfaces.py:536
+#: waeup/kofa/applicants/interfaces.py:458
+#: waeup/kofa/applicants/interfaces.py:537
 msgid "Notice"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:479
-#: waeup/kofa/students/interfaces.py:149
+#: waeup/kofa/applicants/interfaces.py:480
+#: waeup/kofa/students/interfaces.py:157
 #: waeup/kofa/browser/templates/showstudentspage.pt:4
 #: waeup/kofa/students/browser_templates/containerpage.pt:29
@@ -835,10 +843,10 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:484
+#: waeup/kofa/applicants/interfaces.py:485
 msgid "Form locked"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:563
-#: waeup/kofa/students/interfaces.py:469
+#: waeup/kofa/applicants/interfaces.py:564
+#: waeup/kofa/students/interfaces.py:477
 msgid "Payment Session"
 msgstr ""
@@ -856,5 +864,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:185
+#: waeup/kofa/applicants/pdf.py:186
 #: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:26
 msgid "Admitted Course of Study:"
@@ -862,5 +870,5 @@
 
 #. Default: ""
-#: waeup/kofa/applicants/pdf.py:203
+#: waeup/kofa/applicants/pdf.py:204
 msgid ""
 "<font size=10>Proceed to the login page of the portal and enter your new "
@@ -868,5 +876,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:209
+#: waeup/kofa/applicants/pdf.py:210
 msgid "<font size=10>Change your password when you have  logged in.</font>"
 msgstr ""
@@ -897,5 +905,5 @@
 
 #: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:254
+#: waeup/kofa/students/browser.py:256
 msgid "Create student record"
 msgstr ""
@@ -1016,5 +1024,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:309
+#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:310
 msgid "Administration"
 msgstr ""
@@ -1025,11 +1033,11 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:386
+#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:387
 #: 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:750
+#: waeup/kofa/browser/pages.py:1142 waeup/kofa/browser/viewlets.py:393
 #: waeup/kofa/browser/viewlets.py:685
 msgid "Data Center"
@@ -1040,131 +1048,149 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1016
+#: waeup/kofa/browser/pages.py:1018
 msgid "Edit headers or replace imported file!"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:103
+#: waeup/kofa/browser/pages.py:104
 msgid "Local role successfully removed: ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1063
+#: waeup/kofa/browser/pages.py:1065
 msgid "View processing log"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1064
+#: waeup/kofa/browser/pages.py:1066
 msgid "Back to data center"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1108
+#: waeup/kofa/browser/pages.py:1110
 msgid "Processing of ${a} rows failed."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1110
+#: waeup/kofa/browser/pages.py:1112
 msgid "Successfully processed ${a} rows."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1118
+#: waeup/kofa/browser/pages.py:1120
 msgid "Show logfiles"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1120
+#: waeup/kofa/browser/pages.py:1122
 msgid "Back to Data Center"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1121
+#: waeup/kofa/browser/pages.py:1123
 msgid "Show"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:113 waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:226
+#: waeup/kofa/browser/pages.py:114 waeup/kofa/hostels/browser.py:256
+#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:228
 msgid "No item selected."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1143
+#: waeup/kofa/browser/pages.py:1145
 msgid "Back"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1151
+#: waeup/kofa/browser/pages.py:1153
 msgid "Log files can only be searched on Unix-based operating systems."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1179
+#: waeup/kofa/browser/pages.py:1181
 msgid "Edit data center settings"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1199
+#: waeup/kofa/browser/pages.py:1201
 msgid "File already existed (not copied): ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1202
+#: waeup/kofa/browser/pages.py:1204
 msgid "Given storage path cannot be used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1203
+#: waeup/kofa/browser/pages.py:1205
 msgid "Error: ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1206
+#: waeup/kofa/browser/pages.py:1208
 msgid "New storage path succefully set."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1265
+#: waeup/kofa/browser/pages.py:1267
 msgid "Academic Section"
 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:1279 waeup/kofa/browser/pages.py:1295
+#: waeup/kofa/browser/pages.py:1312 waeup/kofa/browser/pages.py:1316
 msgid "Add faculty"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1278
+#: waeup/kofa/browser/pages.py:1280
 msgid "Faculties"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1282 waeup/kofa/browser/viewlets.py:441
+#: waeup/kofa/browser/pages.py:1284 waeup/kofa/browser/viewlets.py:441
 msgid "Manage academic section"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1321
+#: waeup/kofa/browser/pages.py:1323
 msgid "The faculty code chosen already exists."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1342 waeup/kofa/browser/pages.py:1352
+#: waeup/kofa/browser/pages.py:1344 waeup/kofa/browser/pages.py:1354
 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:1356 waeup/kofa/browser/pages.py:1407
+#: waeup/kofa/browser/pages.py:1426 waeup/kofa/browser/pages.py:1430
 msgid "Add department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1362 waeup/kofa/browser/viewlets.py:457
+#: waeup/kofa/browser/pages.py:1364 waeup/kofa/browser/viewlets.py:457
 msgid "Manage faculty"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1435
+#: waeup/kofa/browser/pages.py:1437
 msgid "The code chosen already exists in this faculty."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1438
+#: waeup/kofa/browser/pages.py:1440
 msgid "Department ${a} added."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1455
+#: waeup/kofa/browser/pages.py:1457
 msgid "Courses and Certificates"
 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:1487 waeup/kofa/browser/pages.py:1506
+#: waeup/kofa/students/browser.py:98 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:1523 waeup/kofa/browser/pages.py:1581
+msgid "Remove selected courses"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1523 waeup/kofa/browser/pages.py:1593
+#: waeup/kofa/browser/pages.py:1622 waeup/kofa/browser/pages.py:1626
+msgid "Add course"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1524 waeup/kofa/browser/pages.py:1587
+msgid "Remove selected certificates"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1524 waeup/kofa/browser/pages.py:1598
+#: waeup/kofa/browser/pages.py:1659 waeup/kofa/browser/pages.py:1663
+msgid "Add certificate"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:153 waeup/kofa/browser/viewlets.py:322
 #: waeup/kofa/browser/templates/staffsitelayout.pt:28
 #: waeup/kofa/browser/templates/studentsitelayout.pt:33
@@ -1172,121 +1198,103 @@
 msgstr ""
 
-#: 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
-msgid "Add course"
-msgstr ""
-
-#: 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
-msgid "Add certificate"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:1531 waeup/kofa/browser/viewlets.py:464
+#: waeup/kofa/browser/pages.py:1533 waeup/kofa/browser/viewlets.py:464
 msgid "Manage department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:160
+#: waeup/kofa/browser/pages.py:161
 msgid "You logged in."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1636
+#: waeup/kofa/browser/pages.py:1638
 msgid "A course with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1642
+#: waeup/kofa/browser/pages.py:1644
 msgid "Course ${a} successfully created."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1673
+#: waeup/kofa/browser/pages.py:1675
 msgid "A certificate with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1679
+#: waeup/kofa/browser/pages.py:1681
 msgid "Certificate ${a} successfully created."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1711 waeup/kofa/browser/viewlets.py:481
+#: waeup/kofa/browser/pages.py:1713 waeup/kofa/browser/viewlets.py:481
 msgid "Edit course"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1761
+#: waeup/kofa/browser/pages.py:1763
 msgid "Edit certificate"
 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:1770 waeup/kofa/browser/pages.py:1801
+#: waeup/kofa/browser/pages.py:1842 waeup/kofa/browser/pages.py:1844
 msgid "Add course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1769 waeup/kofa/browser/pages.py:1794
+#: waeup/kofa/browser/pages.py:1771 waeup/kofa/browser/pages.py:1796
 msgid "Remove selected course referrers"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1775 waeup/kofa/browser/viewlets.py:488
+#: waeup/kofa/browser/pages.py:1777 waeup/kofa/browser/viewlets.py:488
 msgid "Manage certificate"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:178
+#: waeup/kofa/browser/pages.py:179
 msgid "You entered wrong credentials."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1847
+#: waeup/kofa/browser/pages.py:1849
 msgid "The chosen course referrer is already part of this certificate."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1851
+#: waeup/kofa/browser/pages.py:1853
 msgid "Course referrer ${a}_${b} added."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1888 waeup/kofa/browser/viewlets.py:505
+#: waeup/kofa/browser/pages.py:1890 waeup/kofa/browser/viewlets.py:505
 msgid "Edit course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1891
+#: waeup/kofa/browser/pages.py:1893
 msgid "Save and return"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:192
+#: waeup/kofa/browser/pages.py:193
 msgid "You have been logged out. Thanks for using WAeUP Kofa!"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:228
+#: waeup/kofa/browser/pages.py:229
 msgid "Contact ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:234 waeup/kofa/browser/pages.py:519
+#: waeup/kofa/browser/pages.py:235 waeup/kofa/browser/pages.py:521
 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:316
+#: waeup/kofa/browser/pages.py:254 waeup/kofa/browser/pages.py:273
+#: waeup/kofa/browser/pages.py:538 waeup/kofa/students/browser.py:318
 msgid "Your message has been sent."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:263
+#: waeup/kofa/browser/pages.py:264
 msgid "Send now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:274
+#: waeup/kofa/browser/pages.py:275
 msgid "A smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:299
+#: waeup/kofa/browser/pages.py:300
 msgid "<h1>Welcome to WAeUP.Kofa</h1>"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:387 waeup/kofa/hostels/browser.py:195
+#: waeup/kofa/browser/pages.py:388 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
@@ -1295,14 +1303,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:388 waeup/kofa/browser/viewlets.py:180
+#: waeup/kofa/browser/pages.py:389 waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:395
+#: waeup/kofa/browser/pages.py:396
 msgid "User account ${a} successfully deleted."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:426 waeup/kofa/browser/pages.py:428
+#: waeup/kofa/browser/pages.py:428 waeup/kofa/browser/pages.py:430
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
@@ -1310,132 +1318,132 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:450
+#: waeup/kofa/browser/pages.py:452
 msgid "User account ${a} successfully added."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:469
+#: waeup/kofa/browser/pages.py:471
 msgid "Edit user ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:500
+#: waeup/kofa/browser/pages.py:502
 msgid "User settings have been saved."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:297
+#: waeup/kofa/browser/pages.py:519 waeup/kofa/students/browser.py:299
 msgid "Send message to ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:546 waeup/kofa/browser/viewlets.py:400
+#: waeup/kofa/browser/pages.py:548 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:561 waeup/kofa/browser/viewlets.py:415
 msgid "My Roles"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:590
+#: waeup/kofa/browser/pages.py:592
 msgid "Search Academic Section"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:617
+#: waeup/kofa/browser/pages.py:619
 msgid "View portal configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:630
+#: waeup/kofa/browser/pages.py:632
 msgid "Edit portal configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:631 waeup/kofa/browser/pages.py:680
+#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:682
 msgid "Update plugins"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:661
-#: waeup/kofa/browser/pages.py:692
+#: waeup/kofa/browser/pages.py:635 waeup/kofa/browser/pages.py:663
+#: waeup/kofa/browser/pages.py:694
 msgid "Add session configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:658 waeup/kofa/browser/pages.py:731
+#: waeup/kofa/browser/pages.py:660 waeup/kofa/browser/pages.py:733
 msgid "Settings have been saved."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:672
+#: waeup/kofa/browser/pages.py:674
 msgid "Session ${a} Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:683
+#: waeup/kofa/browser/pages.py:685
 msgid "Plugins were updated. See log file for details."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:696
+#: waeup/kofa/browser/pages.py:698
 msgid "Add Session Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:703
+#: waeup/kofa/browser/pages.py:705
 msgid "The session chosen already exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:725
+#: waeup/kofa/browser/pages.py:727
 msgid "Edit academic session ${a} configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:755
+#: waeup/kofa/browser/pages.py:757
 msgid "Upload file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:757
+#: waeup/kofa/browser/pages.py:759
 msgid "Upload"
 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:805 waeup/kofa/browser/pages.py:835
+#: waeup/kofa/browser/pages.py:955 waeup/kofa/browser/pages.py:1063
 msgid "Process CSV file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:817 waeup/kofa/browser/pages.py:918
-#: waeup/kofa/browser/pages.py:1037
+#: waeup/kofa/browser/pages.py:819 waeup/kofa/browser/pages.py:920
+#: waeup/kofa/browser/pages.py:1039
 msgid "Import aborted."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:83
+#: waeup/kofa/browser/pages.py:838
+msgid "Back to step 1"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:839
+msgid "Proceed to step 3"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:84
 msgid "No local role selected."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:836
-msgid "Back to step 1"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:837
-msgid "Proceed to step 3"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:897
+#: waeup/kofa/browser/pages.py:899
 msgid "Double headers: each column name may only appear once. "
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:905
+#: waeup/kofa/browser/pages.py:907
 msgid "Replace imported file!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:930
+#: waeup/kofa/browser/pages.py:932
 msgid "Update mode only!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:956 waeup/kofa/browser/pages.py:1182
+#: waeup/kofa/browser/pages.py:958 waeup/kofa/browser/pages.py:1184
 msgid "Reset"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:957
+#: waeup/kofa/browser/pages.py:959
 msgid "Set headerfields"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:958
+#: waeup/kofa/browser/pages.py:960
 msgid "Back to step 2"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:959
+#: waeup/kofa/browser/pages.py:961
 msgid "Perform import"
 msgstr ""
@@ -1821,5 +1829,6 @@
 
 #: 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/students/viewlets.py:218 waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/viewlets.py:403
 msgid "Edit"
 msgstr ""
@@ -1956,5 +1965,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:435
 msgid "Bed Type"
 msgstr ""
@@ -2112,41 +2121,41 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:172
+#: waeup/kofa/interfaces.py:185
 msgid "Subject"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:176
+#: waeup/kofa/interfaces.py:189
 msgid "Grade"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:304
+#: waeup/kofa/interfaces.py:319
 msgid "Importer name"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:308
+#: waeup/kofa/interfaces.py:323
 msgid "Import mode"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:333
+#: waeup/kofa/interfaces.py:348
 msgid "Email Address:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:340
+#: waeup/kofa/interfaces.py:355
 msgid "Email to:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:347
+#: waeup/kofa/interfaces.py:362
 msgid "Subject:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:351
+#: waeup/kofa/interfaces.py:366
 msgid "Full Name:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:355
+#: waeup/kofa/interfaces.py:370
 msgid "Text:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:386
+#: waeup/kofa/interfaces.py:401
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2158,5 +2167,5 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:391
+#: waeup/kofa/interfaces.py:406
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2165,97 +2174,97 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:395
+#: waeup/kofa/interfaces.py:410
 msgid "Description/Notice"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:412
+#: waeup/kofa/interfaces.py:427
 msgid "Portal roles"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:455
+#: waeup/kofa/interfaces.py:470
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:456
+#: waeup/kofa/interfaces.py:471
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:461
+#: waeup/kofa/interfaces.py:476
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:467
+#: waeup/kofa/interfaces.py:482
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:474
+#: waeup/kofa/interfaces.py:489
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:486
+#: waeup/kofa/interfaces.py:501
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:494
+#: waeup/kofa/interfaces.py:509
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:502
+#: waeup/kofa/interfaces.py:517
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:508
+#: waeup/kofa/interfaces.py:523
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:515
+#: waeup/kofa/interfaces.py:530
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:516
+#: waeup/kofa/interfaces.py:531
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:521
+#: waeup/kofa/interfaces.py:536
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:528
+#: waeup/kofa/interfaces.py:543
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:535
+#: waeup/kofa/interfaces.py:550
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:544 waeup/kofa/interfaces.py:596
+#: waeup/kofa/interfaces.py:559 waeup/kofa/interfaces.py:611
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:552 waeup/kofa/payments/interfaces.py:30
+#: waeup/kofa/interfaces.py:567 waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:557 waeup/kofa/payments/interfaces.py:106
-msgid "Surcharge 1"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:562 waeup/kofa/payments/interfaces.py:113
+#: waeup/kofa/interfaces.py:572 waeup/kofa/payments/interfaces.py:106
+msgid "Portal Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:577 waeup/kofa/payments/interfaces.py:113
 msgid "Surcharge 2"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:567 waeup/kofa/payments/interfaces.py:120
+#: waeup/kofa/interfaces.py:582 waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:572
+#: waeup/kofa/interfaces.py:587
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:577
+#: waeup/kofa/interfaces.py:592
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:582 waeup/kofa/payments/interfaces.py:36
+#: waeup/kofa/interfaces.py:597 waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
 msgstr ""
@@ -2380,337 +2389,341 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1068
+#: waeup/kofa/students/browser.py:1002 waeup/kofa/students/browser.py:1224
+msgid "Your current session does not match accommodation session."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1071
 msgid "This ticket has already been paid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1081 waeup/kofa/students/browser.py:1089
-#: waeup/kofa/students/browser.py:1097
+#: waeup/kofa/students/browser.py:1084 waeup/kofa/students/browser.py:1092
+#: waeup/kofa/students/browser.py:1100
 msgid "Valid callback received. ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1151
+#: waeup/kofa/students/browser.py:1154
 msgid "${a}: Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1163
+#: waeup/kofa/students/browser.py:1166
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:117 waeup/kofa/students/viewlets.py:114
+#: waeup/kofa/students/browser.py:1173
+msgid "No bed ticket selected."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:119 waeup/kofa/students/viewlets.py:114
 #: waeup/kofa/students/viewlets.py:534
 msgid "Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1170
-msgid "No bed ticket selected."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1201
+#: waeup/kofa/students/browser.py:1204
 msgid "Add bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1203
+#: waeup/kofa/students/browser.py:1206
 msgid "Create bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1211
+#: waeup/kofa/students/browser.py:1214
 msgid "Your data are incomplete."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1215
+#: waeup/kofa/students/browser.py:1218
 msgid "You are in the wrong registration state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1226
+#: waeup/kofa/students/browser.py:1229
 msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:123 waeup/kofa/students/viewlets.py:120
+#: waeup/kofa/students/browser.py:1240 waeup/kofa/students/browser.py:1537
+#: waeup/kofa/students/browser.py:1650
+msgid "Activation code is invalid."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:125 waeup/kofa/students/viewlets.py:120
 #: waeup/kofa/students/viewlets.py:535
 msgid "Payments"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1237 waeup/kofa/students/browser.py:1533
-#: waeup/kofa/students/browser.py:1646
-msgid "Activation code is invalid."
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1257 waeup/kofa/students/browser.py:1385
+#. Default: ""
+#: waeup/kofa/students/browser.py:1260 waeup/kofa/students/browser.py:1388
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1262 waeup/kofa/students/browser.py:1538
-#: waeup/kofa/students/browser.py:1651
+#: waeup/kofa/students/browser.py:1265 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:1265 waeup/kofa/students/browser.py:1541
-#: waeup/kofa/students/browser.py:1654 waeup/kofa/students/browser.py:1913
+#: waeup/kofa/students/browser.py:1268 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:1270 waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1659
+#: waeup/kofa/students/browser.py:1273 waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1663
 msgid "You are not the owner of this access code."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1281 waeup/kofa/students/browser.py:1399
+#: waeup/kofa/students/browser.py:1284 waeup/kofa/students/browser.py:1402
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1290
+#: waeup/kofa/students/browser.py:1293
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1308
+#: waeup/kofa/students/browser.py:1311
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1324
+#: waeup/kofa/students/browser.py:1327
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1330
+#: waeup/kofa/students/browser.py:1333
 msgid "Bed Allocation: "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1357
+#: waeup/kofa/students/browser.py:1360
 msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1363
+#: waeup/kofa/students/browser.py:1366
 msgid "Student can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:138 waeup/kofa/students/viewlets.py:126
+#: waeup/kofa/students/browser.py:140 waeup/kofa/students/viewlets.py:126
 msgid "Accommodation"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1406
+#: waeup/kofa/students/browser.py:1409
 msgid "Student relocated: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1425
+#: waeup/kofa/students/browser.py:1428
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1437 waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/browser.py:1441
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1452 waeup/kofa/students/viewlets.py:365
+#: waeup/kofa/students/browser.py:1456 waeup/kofa/students/viewlets.py:365
 msgid "Change password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1466
+#: waeup/kofa/students/browser.py:1470
 msgid "Password changed."
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/browser.py:147
+#: waeup/kofa/students/browser.py:1482
+msgid "Upload portrait"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/browser.py:149
 msgid "Bed Ticket ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1478
-msgid "Upload portrait"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1493 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"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1497
+#: waeup/kofa/students/browser.py:1501
 msgid "Start clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1514 waeup/kofa/students/browser.py:1635
+#: waeup/kofa/students/browser.py:1518 waeup/kofa/students/browser.py:1639
 msgid "Wrong state"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1518
+#: waeup/kofa/students/browser.py:1522
 msgid "No portrait uploaded."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1522
+#: waeup/kofa/students/browser.py:1526
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1553
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1561
+#: waeup/kofa/students/browser.py:1565
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1573 waeup/kofa/students/browser.py:1587
+#: waeup/kofa/students/browser.py:1577 waeup/kofa/students/browser.py:1591
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1581
+#: waeup/kofa/students/browser.py:1585
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1596 waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1600 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1597
+#: waeup/kofa/students/browser.py:1601
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1600
+#: waeup/kofa/students/browser.py:1604
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1609
+#: waeup/kofa/students/browser.py:1613
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1618
+#: waeup/kofa/students/browser.py:1622
 msgid "Clearance has been requested."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1627 waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:1631 waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1631
+#: waeup/kofa/students/browser.py:1635
 msgid "Start course registration now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:166
+#: waeup/kofa/students/browser.py:1671
+msgid "Course registration has been started."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:168
 msgid "Student Section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1667
-msgid "Course registration has been started."
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1686
+#. Default: ""
+#: waeup/kofa/students/browser.py:1690
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1695
+#: waeup/kofa/students/browser.py:1699
 msgid "Create course list now"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1734
+#: waeup/kofa/students/browser.py:1738
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1771
+#: waeup/kofa/students/browser.py:1775
 msgid "Register course list"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1775
+#: waeup/kofa/students/browser.py:1779
 msgid "Course list has been registered."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:182 waeup/kofa/students/browser.py:218
+#: waeup/kofa/students/browser.py:1825
+msgid "Change my password"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1835
+msgid "Get new login credentials"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:184 waeup/kofa/students/browser.py:220
 msgid "Empty search string"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1821
-msgid "Change my password"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1831
-msgid "Get new login credentials"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1845
+#: waeup/kofa/students/browser.py:1849
 msgid "No student record found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1853
+#: waeup/kofa/students/browser.py:1857
 msgid "You have successfully changed your password for the"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1858
+#: waeup/kofa/students/browser.py:1862
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1869
+#: waeup/kofa/students/browser.py:1873
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1872
+#: waeup/kofa/students/browser.py:1876
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1887
+#: waeup/kofa/students/browser.py:1891
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1895
+#: waeup/kofa/students/browser.py:1899
 msgid "Access code is invalid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1898
+#: waeup/kofa/students/browser.py:1902
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1904
+#: waeup/kofa/students/browser.py:1908
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1910
+#: waeup/kofa/students/browser.py:1914
 msgid "Access code has already been used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1919
+#: waeup/kofa/students/browser.py:1923
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:200 waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:202 waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:224 waeup/kofa/students/browser.py:1884
+#: waeup/kofa/students/browser.py:226 waeup/kofa/students/browser.py:1888
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:251 waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:253 waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:259
+#: waeup/kofa/students/browser.py:261
 msgid "Student record created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:275
+#: waeup/kofa/students/browser.py:277
 msgid "${a}: Base Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:318 waeup/kofa/students/browser.py:1861
+#: waeup/kofa/students/browser.py:320 waeup/kofa/students/browser.py:1865
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:329
+#: waeup/kofa/students/browser.py:332
 msgid "Manage base data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:398
+#: waeup/kofa/students/browser.py:401
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:414 waeup/kofa/students/viewlets.py:104
+#: waeup/kofa/students/browser.py:417 waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
@@ -2718,84 +2731,84 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:420
+#: waeup/kofa/students/browser.py:423
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:440
+#: waeup/kofa/students/browser.py:443
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:469
+#: waeup/kofa/students/browser.py:472
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:471 waeup/kofa/students/browser.py:495
+#: waeup/kofa/students/browser.py:474 waeup/kofa/students/browser.py:498
 msgid "Student is in wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:488
+#: waeup/kofa/students/browser.py:491
 msgid "Clearance has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:492
+#: waeup/kofa/students/browser.py:495
 msgid "Clearance request has been rejected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:518
+#: waeup/kofa/students/browser.py:521
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:528
+#: waeup/kofa/students/browser.py:531
 msgid "Manage personal data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:548
+#: waeup/kofa/students/browser.py:551
 msgid "${a}: Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:578
+#: waeup/kofa/students/browser.py:581
 msgid "Manage study course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:581 waeup/kofa/students/browser.py:622
+#: waeup/kofa/students/browser.py:584 waeup/kofa/students/browser.py:625
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:582 waeup/kofa/students/browser.py:608
+#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:611
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:616
+#: waeup/kofa/students/browser.py:619
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:618 waeup/kofa/students/browser.py:1704
+#: waeup/kofa/students/browser.py:621 waeup/kofa/students/browser.py:1708
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:628
+#: waeup/kofa/students/browser.py:631
 msgid "No study level selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:664
+#: waeup/kofa/students/browser.py:667
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:687
+#: waeup/kofa/students/browser.py:690
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:693
+#: waeup/kofa/students/browser.py:696
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:702
+#: waeup/kofa/students/browser.py:705
 msgid "Course Registration Slip  "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:708
+#: waeup/kofa/students/browser.py:711
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -2804,5 +2817,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:711
+#: waeup/kofa/students/browser.py:714
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -2810,10 +2823,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:712
+#: waeup/kofa/students/browser.py:715
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:713
+#: waeup/kofa/students/browser.py:716
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -2821,5 +2834,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:714
+#: waeup/kofa/students/browser.py:717
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -2827,5 +2840,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:715 waeup/kofa/students/interfaces.py:370
+#: waeup/kofa/students/browser.py:718 waeup/kofa/students/interfaces.py:378
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2834,73 +2847,69 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:743 waeup/kofa/students/browser.py:772
-#: waeup/kofa/students/browser.py:857 waeup/kofa/students/browser.py:862
-#: waeup/kofa/students/browser.py:1744 waeup/kofa/students/browser.py:1794
+#: waeup/kofa/students/browser.py:746 waeup/kofa/students/browser.py:775
+#: waeup/kofa/students/browser.py:860 waeup/kofa/students/browser.py:865
+#: waeup/kofa/students/browser.py:1748 waeup/kofa/students/browser.py:1798
 msgid "Add course ticket"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:764
+#: waeup/kofa/students/browser.py:767
 msgid "Manage study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:782 waeup/kofa/students/browser.py:1754
+#: waeup/kofa/students/browser.py:785 waeup/kofa/students/browser.py:1758
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:806 waeup/kofa/students/browser.py:828
+#: waeup/kofa/students/browser.py:809 waeup/kofa/students/browser.py:831
 msgid "This level does not correspond current level."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:810
+#: waeup/kofa/students/browser.py:813
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:812 waeup/kofa/students/browser.py:840
+#: waeup/kofa/students/browser.py:815 waeup/kofa/students/browser.py:843
 msgid "Student is in the wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:833
+#: waeup/kofa/students/browser.py:836
 msgid "Course list request has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:840
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:877 waeup/kofa/students/browser.py:1807
+#: waeup/kofa/students/browser.py:880 waeup/kofa/students/browser.py:1811
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:879 waeup/kofa/students/browser.py:1809
+#: waeup/kofa/students/browser.py:882 waeup/kofa/students/browser.py:1813
 msgid "Successfully added ${a}."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:900
+#: waeup/kofa/students/browser.py:903
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:916
+#: waeup/kofa/students/browser.py:919
 msgid "Manage course ticket ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:943
+#: waeup/kofa/students/browser.py:946
 msgid "${a}: Payments"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:988
+#: waeup/kofa/students/browser.py:991
 msgid "Add online payment"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:991
+#: waeup/kofa/students/browser.py:994
 msgid "Create ticket"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:999 waeup/kofa/students/browser.py:1221
-msgid "Your current session does not match accommodation session."
 msgstr ""
 
@@ -3001,6 +3010,6 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:21
-#: waeup/kofa/students/browser_templates/fileupload.pt:27
+#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/students/browser_templates/fileupload.pt:26
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
 msgid "Max. file size:"
@@ -3130,69 +3139,69 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:176 waeup/kofa/students/interfaces.py:255
-#: waeup/kofa/students/interfaces.py:483
+#: waeup/kofa/students/interfaces.py:184 waeup/kofa/students/interfaces.py:263
+#: waeup/kofa/students/interfaces.py:491
 msgid "Registration Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:183 waeup/kofa/students/interfaces.py:265
+#: waeup/kofa/students/interfaces.py:191 waeup/kofa/students/interfaces.py:273
 msgid "Matriculation Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:191
+#: waeup/kofa/students/interfaces.py:199
 msgid "PWD Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:198
+#: waeup/kofa/students/interfaces.py:206
 msgid "Email"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:218
+#: waeup/kofa/students/interfaces.py:226
 msgid "Clearance form locked"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:223
+#: waeup/kofa/students/interfaces.py:231
 msgid "CLR Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:231
+#: waeup/kofa/students/interfaces.py:239
 msgid "Nationality"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:241
+#: waeup/kofa/students/interfaces.py:249
 msgid "Permanent Address"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:275
+#: waeup/kofa/students/interfaces.py:283
 #: waeup/kofa/browser/templates/showstudentspage.pt:7
 msgid "Certificate"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:282
+#: waeup/kofa/students/interfaces.py:290
 msgid "Entry Mode"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:290
+#: waeup/kofa/students/interfaces.py:298
 msgid "Entry Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:299
+#: waeup/kofa/students/interfaces.py:307
 #: waeup/kofa/browser/templates/showstudentspage.pt:8
 msgid "Current Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:307
+#: waeup/kofa/students/interfaces.py:315
 #: waeup/kofa/browser/templates/showstudentspage.pt:9
 msgid "Current Level"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:315
+#: waeup/kofa/students/interfaces.py:323
 msgid "Current Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:322
+#: waeup/kofa/students/interfaces.py:330
 msgid "Previous Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:337 waeup/kofa/students/interfaces.py:434
+#: waeup/kofa/students/interfaces.py:345 waeup/kofa/students/interfaces.py:442
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3200,9 +3209,9 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:344
+#: waeup/kofa/students/interfaces.py:352
 msgid "Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:363
+#: waeup/kofa/students/interfaces.py:371
 #: waeup/kofa/browser/templates/certificatepage.pt:30
 #: waeup/kofa/browser/templates/certificatemanagepage.pt:33
@@ -3210,13 +3219,13 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:377
+#: waeup/kofa/students/interfaces.py:385
 msgid "Automatical Creation"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:384
+#: waeup/kofa/students/interfaces.py:392
 msgid "Carry-over Course"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:403
+#: waeup/kofa/students/interfaces.py:411
 #: waeup/kofa/university/interfaces.py:299
 #: waeup/kofa/browser/templates/certificatepage.pt:29
@@ -3225,15 +3234,15 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:420
+#: waeup/kofa/students/interfaces.py:428
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:10
 msgid "Bed Coordinates"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:442
+#: waeup/kofa/students/interfaces.py:450
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:9
 msgid "Booking Date"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:448
+#: waeup/kofa/students/interfaces.py:456
 msgid "Booking Activation Code"
 msgstr ""
@@ -3244,5 +3253,5 @@
 msgstr ""
 
-#: waeup/kofa/students/utils.py:280 waeup/kofa/students/viewlets.py:71
+#: waeup/kofa/students/utils.py:298 waeup/kofa/students/viewlets.py:71
 #: waeup/kofa/students/viewlets.py:99
 #: waeup/kofa/students/browser_templates/basemanagepage.pt:6
@@ -3250,5 +3259,5 @@
 msgstr ""
 
-#: waeup/kofa/students/utils.py:311
+#: waeup/kofa/students/utils.py:329
 msgid "Scanned Documents"
 msgstr ""
@@ -3400,9 +3409,9 @@
 
 #: waeup/kofa/students/vocabularies.py:135
-msgid "Male"
+msgid "male"
 msgstr ""
 
 #: waeup/kofa/students/vocabularies.py:137
-msgid "Female"
+msgid "female"
 msgstr ""
 
@@ -3661,5 +3670,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:228
+#: waeup/kofa/utils/utils.py:142
 msgid ""
 "Fullname: ${a}\n"
@@ -3671,5 +3680,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:273
+#: waeup/kofa/utils/utils.py:187
 msgid ""
 "Dear ${a},\n"
@@ -3691,4 +3700,28 @@
 msgstr ""
 
+#: waeup/kofa/utils/utils.py:44
+msgid "Germany"
+msgstr ""
+
+#: waeup/kofa/utils/utils.py:45
+msgid "Nigeria"
+msgstr ""
+
+#: waeup/kofa/utils/utils.py:46
+msgid "U.S."
+msgstr ""
+
+#: waeup/kofa/widgets/phonewidget.py:117
+msgid "Empty phone field(s)."
+msgstr ""
+
+#: waeup/kofa/widgets/phonewidget.py:121
+msgid "Int. prefix requires format '+NNN'"
+msgstr ""
+
+#: waeup/kofa/widgets/phonewidget.py:127
+msgid "Phone numbers may contain numbers only."
+msgstr ""
+
 #: waeup/kofa/widgets/sequencewidget.pt:18
 msgid "Don't forget to save the form after adding or deleting items."
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 7881)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/ha/LC_MESSAGES/waeup.kofa.po	(revision 7882)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Sun Mar 11 16:45:08 2012\n"
+"POT-Creation-Date: Wed Mar 14 10:35:59 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -32,20 +32,20 @@
 #: waeup/kofa/applicants/browser.py:182 waeup/kofa/applicants/browser.py:255
 #: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:339
-#: 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:580
-#: waeup/kofa/students/browser.py:581 waeup/kofa/students/browser.py:742
-#: waeup/kofa/students/browser.py:744 waeup/kofa/students/browser.py:884
+#: waeup/kofa/browser/pages.py:505 waeup/kofa/browser/pages.py:710
+#: waeup/kofa/browser/pages.py:737 waeup/kofa/browser/pages.py:760
+#: waeup/kofa/browser/pages.py:807 waeup/kofa/browser/pages.py:837
+#: waeup/kofa/browser/pages.py:957 waeup/kofa/browser/pages.py:1185
+#: waeup/kofa/browser/pages.py:1279 waeup/kofa/browser/pages.py:1300
+#: waeup/kofa/browser/pages.py:1327 waeup/kofa/browser/pages.py:1355
+#: waeup/kofa/browser/pages.py:1356 waeup/kofa/browser/pages.py:1402
+#: waeup/kofa/browser/pages.py:1443 waeup/kofa/browser/pages.py:1522
+#: waeup/kofa/browser/pages.py:1523 waeup/kofa/browser/pages.py:1525
+#: waeup/kofa/browser/pages.py:1603 waeup/kofa/browser/pages.py:1648
+#: waeup/kofa/browser/pages.py:1686 waeup/kofa/browser/pages.py:1730
+#: waeup/kofa/browser/pages.py:1769 waeup/kofa/browser/pages.py:1771
+#: waeup/kofa/browser/pages.py:1806 waeup/kofa/browser/pages.py:1857
+#: waeup/kofa/browser/pages.py:1909 waeup/kofa/students/browser.py:583
+#: waeup/kofa/students/browser.py:584 waeup/kofa/students/browser.py:745
+#: waeup/kofa/students/browser.py:747 waeup/kofa/students/browser.py:887
 msgid "Cancel"
 msgstr ""
@@ -85,7 +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:167 waeup/kofa/students/browser.py:201
+#: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:594
+#: waeup/kofa/browser/pages.py:1144 waeup/kofa/browser/viewlets.py:190
+#: waeup/kofa/students/browser.py:169 waeup/kofa/students/browser.py:203
 msgid "Search"
 msgstr ""
@@ -343,5 +343,5 @@
 
 #: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:326
-#: waeup/kofa/applicants/browser.py:746
+#: waeup/kofa/applicants/browser.py:747
 msgid "Could not delete:"
 msgstr ""
@@ -349,8 +349,8 @@
 #. Default: ""
 #: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py:329
-#: waeup/kofa/applicants/browser.py:749 waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:239 waeup/kofa/students/browser.py:638
-#: waeup/kofa/students/browser.py:792 waeup/kofa/students/browser.py:970
-#: waeup/kofa/students/browser.py:1180 waeup/kofa/students/browser.py:1766
+#: waeup/kofa/applicants/browser.py:750 waeup/kofa/browser/pages.py:135
+#: waeup/kofa/students/browser.py:241 waeup/kofa/students/browser.py:641
+#: waeup/kofa/students/browser.py:795 waeup/kofa/students/browser.py:973
+#: waeup/kofa/students/browser.py:1183 waeup/kofa/students/browser.py:1770
 msgid "Successfully removed: ${a}"
 msgstr ""
@@ -373,24 +373,24 @@
 
 #: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:302
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:689
-#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:839 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/applicants/browser.py:656 waeup/kofa/applicants/browser.py:690
+#: waeup/kofa/applicants/browser.py:793 waeup/kofa/applicants/browser.py:796
+#: waeup/kofa/applicants/browser.py:840 waeup/kofa/browser/pages.py:478
+#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:656
+#: waeup/kofa/browser/pages.py:730 waeup/kofa/browser/pages.py:1183
+#: waeup/kofa/browser/pages.py:1355 waeup/kofa/browser/pages.py:1396
+#: waeup/kofa/browser/pages.py:1522 waeup/kofa/browser/pages.py:1575
+#: waeup/kofa/browser/pages.py:1718 waeup/kofa/browser/pages.py:1769
+#: waeup/kofa/browser/pages.py:1790 waeup/kofa/hostels/browser.py:209
 #: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:318
-#: waeup/kofa/students/browser.py:355 waeup/kofa/students/browser.py:454
-#: waeup/kofa/students/browser.py:531 waeup/kofa/students/browser.py:580
-#: waeup/kofa/students/browser.py:596 waeup/kofa/students/browser.py:742
-#: waeup/kofa/students/browser.py:767 waeup/kofa/students/browser.py:1440
-#: waeup/kofa/students/browser.py:1455 waeup/kofa/students/browser.py:1570
+#: waeup/kofa/students/browser.py:358 waeup/kofa/students/browser.py:457
+#: waeup/kofa/students/browser.py:534 waeup/kofa/students/browser.py:583
+#: waeup/kofa/students/browser.py:599 waeup/kofa/students/browser.py:745
+#: waeup/kofa/students/browser.py:770 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:256 waeup/kofa/applicants/browser.py:334
-#: waeup/kofa/applicants/browser.py:362
+#: waeup/kofa/applicants/browser.py:363
 msgid "Add applicant"
 msgstr ""
@@ -400,9 +400,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:306 waeup/kofa/applicants/browser.py:718
-#: 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:381
+#: waeup/kofa/applicants/browser.py:306 waeup/kofa/applicants/browser.py:719
+#: waeup/kofa/browser/pages.py:1399 waeup/kofa/browser/pages.py:1721
+#: waeup/kofa/browser/pages.py:1793 waeup/kofa/browser/pages.py:1905
+#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:82
+#: waeup/kofa/students/browser.py:384
 msgid "Form has been saved."
 msgstr ""
@@ -412,67 +412,67 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:365
+#: waeup/kofa/applicants/browser.py:366
 msgid "Create application record"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:370
+#: waeup/kofa/applicants/browser.py:371
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:383
+#: waeup/kofa/applicants/browser.py:384
 msgid "Applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:281
+#: waeup/kofa/applicants/browser.py:399 waeup/kofa/students/browser.py:283
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:399 waeup/kofa/students/browser.py:282
+#: waeup/kofa/applicants/browser.py:400 waeup/kofa/students/browser.py:284
 msgid "unset"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:404
+#: waeup/kofa/applicants/browser.py:405
 msgid "${a} Application Record ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:455
+#: waeup/kofa/applicants/browser.py:456
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:462 waeup/kofa/students/browser.py:1019
+#: waeup/kofa/applicants/browser.py:463 waeup/kofa/students/browser.py:1022
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:475 waeup/kofa/students/browser.py:1033
+#: waeup/kofa/applicants/browser.py:476 waeup/kofa/students/browser.py:1036
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:502 waeup/kofa/students/browser.py:1052
+#: waeup/kofa/applicants/browser.py:503 waeup/kofa/students/browser.py:1055
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:530 waeup/kofa/students/browser.py:1101
+#: waeup/kofa/applicants/browser.py:531 waeup/kofa/students/browser.py:1104
 msgid "Valid callback received."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:551
+#: waeup/kofa/applicants/browser.py:552
 msgid "Payment Data"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:557
+#: waeup/kofa/applicants/browser.py:558
 msgid "Online Payment Receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:563
+#: waeup/kofa/applicants/browser.py:564
 msgid "Ticket not yet paid."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:628
+#: waeup/kofa/applicants/browser.py:629
 msgid "Uploaded image is too big!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:633
+#: waeup/kofa/applicants/browser.py:634
 msgid "jpg file extension expected."
 msgstr ""
@@ -482,33 +482,33 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:847
+#: waeup/kofa/applicants/browser.py:656 waeup/kofa/applicants/browser.py:796
+#: waeup/kofa/applicants/browser.py:848
 msgid "Final Submit"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:656 waeup/kofa/applicants/browser.py:759
-#: waeup/kofa/applicants/browser.py:793 waeup/kofa/applicants/browser.py:828
-#: waeup/kofa/students/browser.py:976
+#: waeup/kofa/applicants/browser.py:657 waeup/kofa/applicants/browser.py:760
+#: waeup/kofa/applicants/browser.py:794 waeup/kofa/applicants/browser.py:829
+#: waeup/kofa/students/browser.py:979
 msgid "Add online payment ticket"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:656 waeup/kofa/applicants/browser.py:764
-#: waeup/kofa/applicants/browser.py:793 waeup/kofa/applicants/browser.py:796
-#: waeup/kofa/applicants/browser.py:833 waeup/kofa/students/browser.py:744
-#: waeup/kofa/students/browser.py:776 waeup/kofa/students/browser.py:952
-#: waeup/kofa/students/browser.py:1748
+#: waeup/kofa/applicants/browser.py:657 waeup/kofa/applicants/browser.py:765
+#: waeup/kofa/applicants/browser.py:794 waeup/kofa/applicants/browser.py:797
+#: waeup/kofa/applicants/browser.py:834 waeup/kofa/students/browser.py:747
+#: waeup/kofa/students/browser.py:779 waeup/kofa/students/browser.py:955
+#: waeup/kofa/students/browser.py:1752
 msgid "Remove selected tickets"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:675
+#: waeup/kofa/applicants/browser.py:676
 msgid "${a} Application Form ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:686 waeup/kofa/students/browser.py:352
+#: waeup/kofa/applicants/browser.py:687 waeup/kofa/students/browser.py:355
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:733 waeup/kofa/students/browser.py:958
+#: waeup/kofa/applicants/browser.py:734 waeup/kofa/students/browser.py:961
 msgid "No payment selected."
 msgstr ""
@@ -520,9 +520,9 @@
 #: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:105
 #: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:309
-#: 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:202
-#: waeup/kofa/students/browser.py:1147 waeup/kofa/students/browser.py:1160
+#: waeup/kofa/browser/pages.py:636 waeup/kofa/browser/pages.py:677
+#: waeup/kofa/browser/pages.py:1279 waeup/kofa/browser/pages.py:1290
+#: waeup/kofa/browser/pages.py:1356 waeup/kofa/browser/pages.py:1391
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:204
+#: waeup/kofa/students/browser.py:1150 waeup/kofa/students/browser.py:1163
 msgid "Remove selected"
 msgstr ""
@@ -533,5 +533,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:806 waeup/kofa/students/browser.py:88
+#: waeup/kofa/applicants/browser.py:807 waeup/kofa/students/browser.py:90
 msgid "The requested form is locked (read-only)."
 msgstr ""
@@ -539,7 +539,7 @@
 #: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:139
 #: waeup/kofa/applicants/browser.py:257 waeup/kofa/applicants/browser.py:348
-#: 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/browser/pages.py:1357 waeup/kofa/browser/pages.py:1416
+#: waeup/kofa/browser/pages.py:1526 waeup/kofa/browser/pages.py:1612
+#: waeup/kofa/browser/pages.py:1772 waeup/kofa/browser/pages.py:1829
 msgid "Remove selected local roles"
 msgstr ""
@@ -547,15 +547,15 @@
 #: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:135
 #: waeup/kofa/applicants/browser.py:258 waeup/kofa/applicants/browser.py:344
-#: 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/browser/pages.py:1358 waeup/kofa/browser/pages.py:1412
+#: waeup/kofa/browser/pages.py:1527 waeup/kofa/browser/pages.py:1608
+#: waeup/kofa/browser/pages.py:1773 waeup/kofa/browser/pages.py:1825
 msgid "Add local role"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:820
+#: waeup/kofa/applicants/browser.py:821
 msgid "No passport picture uploaded."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:822
+#: waeup/kofa/applicants/browser.py:823
 msgid "Passport picture confirmation box not ticked."
 msgstr ""
@@ -565,38 +565,38 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:859 waeup/kofa/students/browser.py:1615
+#: waeup/kofa/applicants/browser.py:860 waeup/kofa/students/browser.py:1619
 msgid "This form cannot be submitted. Wrong state!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:864
+#: waeup/kofa/applicants/browser.py:865
 msgid "Form has been submitted."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:899
+#: waeup/kofa/applicants/browser.py:900
 msgid "Register for ${a} Application"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:905
+#: waeup/kofa/applicants/browser.py:906
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:910
+#: waeup/kofa/applicants/browser.py:911
 msgid "Application has ended."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:919
+#: waeup/kofa/applicants/browser.py:920
 msgid "Get login credentials"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:934
+#: waeup/kofa/applicants/browser.py:935
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:941
+#: waeup/kofa/applicants/browser.py:942
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:950
+#: waeup/kofa/applicants/browser.py:951
 msgid "Your registration was successful."
 msgstr ""
@@ -664,5 +664,13 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:709
+#: waeup/kofa/applicants/container.py:52
+msgid "Basic"
+msgstr ""
+
+#: waeup/kofa/applicants/container.py:55
+msgid "handles basic applicants"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:198 waeup/kofa/students/browser.py:712
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -688,5 +696,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:710
+#: waeup/kofa/applicants/interfaces.py:205 waeup/kofa/students/browser.py:713
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -707,126 +715,126 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:211
-#: waeup/kofa/applicants/interfaces.py:324
+#: waeup/kofa/applicants/interfaces.py:212
+#: waeup/kofa/applicants/interfaces.py:325
 msgid "Application Target"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:219
+#: waeup/kofa/applicants/interfaces.py:220
 msgid "Entry Level"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:226
-#: waeup/kofa/applicants/interfaces.py:332
+#: waeup/kofa/applicants/interfaces.py:227
+#: waeup/kofa/applicants/interfaces.py:333
 msgid "Year of Entrance"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:234
-#: waeup/kofa/applicants/interfaces.py:340
+#: waeup/kofa/applicants/interfaces.py:235
+#: waeup/kofa/applicants/interfaces.py:341
 msgid "Applicants Container Type"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:250
+#: waeup/kofa/applicants/interfaces.py:251
 msgid "Category for the grouping of certificates"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:257
+#: waeup/kofa/applicants/interfaces.py:258
 msgid "Human readable description in reST format"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:273
+#: waeup/kofa/applicants/interfaces.py:274
 msgid "Application Start Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:279
+#: waeup/kofa/applicants/interfaces.py:280
 msgid "Application Closing Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:285
+#: waeup/kofa/applicants/interfaces.py:286
 msgid "Forbid additions after deadline (enddate)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:368
+#: waeup/kofa/applicants/interfaces.py:369
 msgid "Applicant Id"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:373
+#: waeup/kofa/applicants/interfaces.py:374
 msgid "JAMB Registration Number"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:385
-#: waeup/kofa/students/interfaces.py:154
+#: waeup/kofa/applicants/interfaces.py:386
+#: waeup/kofa/students/interfaces.py:162
 msgid "First Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:389
-#: waeup/kofa/students/interfaces.py:159
+#: waeup/kofa/applicants/interfaces.py:390
+#: waeup/kofa/students/interfaces.py:167
 msgid "Middle Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:393
-#: waeup/kofa/students/interfaces.py:164
+#: waeup/kofa/applicants/interfaces.py:394
+#: waeup/kofa/students/interfaces.py:172
 msgid "Last Name (Surname)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:397
-#: waeup/kofa/students/interfaces.py:213
+#: waeup/kofa/applicants/interfaces.py:398
+#: waeup/kofa/students/interfaces.py:221
 msgid "Date of Birth"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:402
+#: waeup/kofa/applicants/interfaces.py:403
 msgid "State/LGA"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:407
-#: waeup/kofa/students/interfaces.py:169
+#: waeup/kofa/applicants/interfaces.py:408
+#: waeup/kofa/students/interfaces.py:177
 msgid "Sex"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:373
-#: waeup/kofa/interfaces.py:399 waeup/kofa/students/interfaces.py:490
+#: waeup/kofa/applicants/interfaces.py:414 waeup/kofa/interfaces.py:388
+#: waeup/kofa/interfaces.py:414 waeup/kofa/students/interfaces.py:498
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:378
-#: waeup/kofa/interfaces.py:406 waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/applicants/interfaces.py:419 waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:421 waeup/kofa/students/interfaces.py:211
 msgid "Phone"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:423
-#: waeup/kofa/applicants/interfaces.py:509
+#: waeup/kofa/applicants/interfaces.py:424
+#: waeup/kofa/applicants/interfaces.py:510
 msgid "1st Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:428
-#: waeup/kofa/applicants/interfaces.py:514
+#: waeup/kofa/applicants/interfaces.py:429
+#: waeup/kofa/applicants/interfaces.py:515
 msgid "2nd Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:433
+#: waeup/kofa/applicants/interfaces.py:434
 msgid "School Grades"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:443
-#: waeup/kofa/applicants/interfaces.py:519
+#: waeup/kofa/applicants/interfaces.py:444
+#: waeup/kofa/applicants/interfaces.py:520
 msgid "Screening Score"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:447
-#: waeup/kofa/applicants/interfaces.py:524
+#: waeup/kofa/applicants/interfaces.py:448
+#: waeup/kofa/applicants/interfaces.py:525
 msgid "Screening Venue"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:451
-#: waeup/kofa/applicants/interfaces.py:529
+#: waeup/kofa/applicants/interfaces.py:452
+#: waeup/kofa/applicants/interfaces.py:530
 msgid "Admitted Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:457
-#: waeup/kofa/applicants/interfaces.py:536
+#: waeup/kofa/applicants/interfaces.py:458
+#: waeup/kofa/applicants/interfaces.py:537
 msgid "Notice"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:479
-#: waeup/kofa/students/interfaces.py:149
+#: waeup/kofa/applicants/interfaces.py:480
+#: waeup/kofa/students/interfaces.py:157
 #: waeup/kofa/browser/templates/showstudentspage.pt:4
 #: waeup/kofa/students/browser_templates/containerpage.pt:29
@@ -835,10 +843,10 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:484
+#: waeup/kofa/applicants/interfaces.py:485
 msgid "Form locked"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:563
-#: waeup/kofa/students/interfaces.py:469
+#: waeup/kofa/applicants/interfaces.py:564
+#: waeup/kofa/students/interfaces.py:477
 msgid "Payment Session"
 msgstr ""
@@ -856,5 +864,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:185
+#: waeup/kofa/applicants/pdf.py:186
 #: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:26
 msgid "Admitted Course of Study:"
@@ -862,5 +870,5 @@
 
 #. Default: ""
-#: waeup/kofa/applicants/pdf.py:203
+#: waeup/kofa/applicants/pdf.py:204
 msgid ""
 "<font size=10>Proceed to the login page of the portal and enter your new "
@@ -868,5 +876,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:209
+#: waeup/kofa/applicants/pdf.py:210
 msgid "<font size=10>Change your password when you have  logged in.</font>"
 msgstr ""
@@ -897,5 +905,5 @@
 
 #: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:254
+#: waeup/kofa/students/browser.py:256
 msgid "Create student record"
 msgstr ""
@@ -1016,5 +1024,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:309
+#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:310
 msgid "Administration"
 msgstr ""
@@ -1025,11 +1033,11 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:386
+#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:387
 #: 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:750
+#: waeup/kofa/browser/pages.py:1142 waeup/kofa/browser/viewlets.py:393
 #: waeup/kofa/browser/viewlets.py:685
 msgid "Data Center"
@@ -1040,131 +1048,149 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1016
+#: waeup/kofa/browser/pages.py:1018
 msgid "Edit headers or replace imported file!"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:103
+#: waeup/kofa/browser/pages.py:104
 msgid "Local role successfully removed: ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1063
+#: waeup/kofa/browser/pages.py:1065
 msgid "View processing log"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1064
+#: waeup/kofa/browser/pages.py:1066
 msgid "Back to data center"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1108
+#: waeup/kofa/browser/pages.py:1110
 msgid "Processing of ${a} rows failed."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1110
+#: waeup/kofa/browser/pages.py:1112
 msgid "Successfully processed ${a} rows."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1118
+#: waeup/kofa/browser/pages.py:1120
 msgid "Show logfiles"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1120
+#: waeup/kofa/browser/pages.py:1122
 msgid "Back to Data Center"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1121
+#: waeup/kofa/browser/pages.py:1123
 msgid "Show"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:113 waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:226
+#: waeup/kofa/browser/pages.py:114 waeup/kofa/hostels/browser.py:256
+#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:228
 msgid "No item selected."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1143
+#: waeup/kofa/browser/pages.py:1145
 msgid "Back"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1151
+#: waeup/kofa/browser/pages.py:1153
 msgid "Log files can only be searched on Unix-based operating systems."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1179
+#: waeup/kofa/browser/pages.py:1181
 msgid "Edit data center settings"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1199
+#: waeup/kofa/browser/pages.py:1201
 msgid "File already existed (not copied): ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1202
+#: waeup/kofa/browser/pages.py:1204
 msgid "Given storage path cannot be used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1203
+#: waeup/kofa/browser/pages.py:1205
 msgid "Error: ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1206
+#: waeup/kofa/browser/pages.py:1208
 msgid "New storage path succefully set."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1265
+#: waeup/kofa/browser/pages.py:1267
 msgid "Academic Section"
 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:1279 waeup/kofa/browser/pages.py:1295
+#: waeup/kofa/browser/pages.py:1312 waeup/kofa/browser/pages.py:1316
 msgid "Add faculty"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1278
+#: waeup/kofa/browser/pages.py:1280
 msgid "Faculties"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1282 waeup/kofa/browser/viewlets.py:441
+#: waeup/kofa/browser/pages.py:1284 waeup/kofa/browser/viewlets.py:441
 msgid "Manage academic section"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1321
+#: waeup/kofa/browser/pages.py:1323
 msgid "The faculty code chosen already exists."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1342 waeup/kofa/browser/pages.py:1352
+#: waeup/kofa/browser/pages.py:1344 waeup/kofa/browser/pages.py:1354
 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:1356 waeup/kofa/browser/pages.py:1407
+#: waeup/kofa/browser/pages.py:1426 waeup/kofa/browser/pages.py:1430
 msgid "Add department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1362 waeup/kofa/browser/viewlets.py:457
+#: waeup/kofa/browser/pages.py:1364 waeup/kofa/browser/viewlets.py:457
 msgid "Manage faculty"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1435
+#: waeup/kofa/browser/pages.py:1437
 msgid "The code chosen already exists in this faculty."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1438
+#: waeup/kofa/browser/pages.py:1440
 msgid "Department ${a} added."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1455
+#: waeup/kofa/browser/pages.py:1457
 msgid "Courses and Certificates"
 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:1487 waeup/kofa/browser/pages.py:1506
+#: waeup/kofa/students/browser.py:98 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:1523 waeup/kofa/browser/pages.py:1581
+msgid "Remove selected courses"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1523 waeup/kofa/browser/pages.py:1593
+#: waeup/kofa/browser/pages.py:1622 waeup/kofa/browser/pages.py:1626
+msgid "Add course"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1524 waeup/kofa/browser/pages.py:1587
+msgid "Remove selected certificates"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1524 waeup/kofa/browser/pages.py:1598
+#: waeup/kofa/browser/pages.py:1659 waeup/kofa/browser/pages.py:1663
+msgid "Add certificate"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:153 waeup/kofa/browser/viewlets.py:322
 #: waeup/kofa/browser/templates/staffsitelayout.pt:28
 #: waeup/kofa/browser/templates/studentsitelayout.pt:33
@@ -1172,121 +1198,103 @@
 msgstr ""
 
-#: 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
-msgid "Add course"
-msgstr ""
-
-#: 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
-msgid "Add certificate"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:1531 waeup/kofa/browser/viewlets.py:464
+#: waeup/kofa/browser/pages.py:1533 waeup/kofa/browser/viewlets.py:464
 msgid "Manage department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:160
+#: waeup/kofa/browser/pages.py:161
 msgid "You logged in."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1636
+#: waeup/kofa/browser/pages.py:1638
 msgid "A course with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1642
+#: waeup/kofa/browser/pages.py:1644
 msgid "Course ${a} successfully created."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1673
+#: waeup/kofa/browser/pages.py:1675
 msgid "A certificate with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1679
+#: waeup/kofa/browser/pages.py:1681
 msgid "Certificate ${a} successfully created."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1711 waeup/kofa/browser/viewlets.py:481
+#: waeup/kofa/browser/pages.py:1713 waeup/kofa/browser/viewlets.py:481
 msgid "Edit course"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1761
+#: waeup/kofa/browser/pages.py:1763
 msgid "Edit certificate"
 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:1770 waeup/kofa/browser/pages.py:1801
+#: waeup/kofa/browser/pages.py:1842 waeup/kofa/browser/pages.py:1844
 msgid "Add course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1769 waeup/kofa/browser/pages.py:1794
+#: waeup/kofa/browser/pages.py:1771 waeup/kofa/browser/pages.py:1796
 msgid "Remove selected course referrers"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1775 waeup/kofa/browser/viewlets.py:488
+#: waeup/kofa/browser/pages.py:1777 waeup/kofa/browser/viewlets.py:488
 msgid "Manage certificate"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:178
+#: waeup/kofa/browser/pages.py:179
 msgid "You entered wrong credentials."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1847
+#: waeup/kofa/browser/pages.py:1849
 msgid "The chosen course referrer is already part of this certificate."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1851
+#: waeup/kofa/browser/pages.py:1853
 msgid "Course referrer ${a}_${b} added."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1888 waeup/kofa/browser/viewlets.py:505
+#: waeup/kofa/browser/pages.py:1890 waeup/kofa/browser/viewlets.py:505
 msgid "Edit course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1891
+#: waeup/kofa/browser/pages.py:1893
 msgid "Save and return"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:192
+#: waeup/kofa/browser/pages.py:193
 msgid "You have been logged out. Thanks for using WAeUP Kofa!"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:228
+#: waeup/kofa/browser/pages.py:229
 msgid "Contact ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:234 waeup/kofa/browser/pages.py:519
+#: waeup/kofa/browser/pages.py:235 waeup/kofa/browser/pages.py:521
 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:316
+#: waeup/kofa/browser/pages.py:254 waeup/kofa/browser/pages.py:273
+#: waeup/kofa/browser/pages.py:538 waeup/kofa/students/browser.py:318
 msgid "Your message has been sent."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:263
+#: waeup/kofa/browser/pages.py:264
 msgid "Send now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:274
+#: waeup/kofa/browser/pages.py:275
 msgid "A smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:299
+#: waeup/kofa/browser/pages.py:300
 msgid "<h1>Welcome to WAeUP.Kofa</h1>"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:387 waeup/kofa/hostels/browser.py:195
+#: waeup/kofa/browser/pages.py:388 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
@@ -1295,14 +1303,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:388 waeup/kofa/browser/viewlets.py:180
+#: waeup/kofa/browser/pages.py:389 waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:395
+#: waeup/kofa/browser/pages.py:396
 msgid "User account ${a} successfully deleted."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:426 waeup/kofa/browser/pages.py:428
+#: waeup/kofa/browser/pages.py:428 waeup/kofa/browser/pages.py:430
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
@@ -1310,132 +1318,132 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:450
+#: waeup/kofa/browser/pages.py:452
 msgid "User account ${a} successfully added."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:469
+#: waeup/kofa/browser/pages.py:471
 msgid "Edit user ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:500
+#: waeup/kofa/browser/pages.py:502
 msgid "User settings have been saved."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:297
+#: waeup/kofa/browser/pages.py:519 waeup/kofa/students/browser.py:299
 msgid "Send message to ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:546 waeup/kofa/browser/viewlets.py:400
+#: waeup/kofa/browser/pages.py:548 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:561 waeup/kofa/browser/viewlets.py:415
 msgid "My Roles"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:590
+#: waeup/kofa/browser/pages.py:592
 msgid "Search Academic Section"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:617
+#: waeup/kofa/browser/pages.py:619
 msgid "View portal configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:630
+#: waeup/kofa/browser/pages.py:632
 msgid "Edit portal configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:631 waeup/kofa/browser/pages.py:680
+#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:682
 msgid "Update plugins"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:661
-#: waeup/kofa/browser/pages.py:692
+#: waeup/kofa/browser/pages.py:635 waeup/kofa/browser/pages.py:663
+#: waeup/kofa/browser/pages.py:694
 msgid "Add session configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:658 waeup/kofa/browser/pages.py:731
+#: waeup/kofa/browser/pages.py:660 waeup/kofa/browser/pages.py:733
 msgid "Settings have been saved."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:672
+#: waeup/kofa/browser/pages.py:674
 msgid "Session ${a} Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:683
+#: waeup/kofa/browser/pages.py:685
 msgid "Plugins were updated. See log file for details."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:696
+#: waeup/kofa/browser/pages.py:698
 msgid "Add Session Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:703
+#: waeup/kofa/browser/pages.py:705
 msgid "The session chosen already exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:725
+#: waeup/kofa/browser/pages.py:727
 msgid "Edit academic session ${a} configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:755
+#: waeup/kofa/browser/pages.py:757
 msgid "Upload file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:757
+#: waeup/kofa/browser/pages.py:759
 msgid "Upload"
 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:805 waeup/kofa/browser/pages.py:835
+#: waeup/kofa/browser/pages.py:955 waeup/kofa/browser/pages.py:1063
 msgid "Process CSV file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:817 waeup/kofa/browser/pages.py:918
-#: waeup/kofa/browser/pages.py:1037
+#: waeup/kofa/browser/pages.py:819 waeup/kofa/browser/pages.py:920
+#: waeup/kofa/browser/pages.py:1039
 msgid "Import aborted."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:83
+#: waeup/kofa/browser/pages.py:838
+msgid "Back to step 1"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:839
+msgid "Proceed to step 3"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:84
 msgid "No local role selected."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:836
-msgid "Back to step 1"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:837
-msgid "Proceed to step 3"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:897
+#: waeup/kofa/browser/pages.py:899
 msgid "Double headers: each column name may only appear once. "
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:905
+#: waeup/kofa/browser/pages.py:907
 msgid "Replace imported file!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:930
+#: waeup/kofa/browser/pages.py:932
 msgid "Update mode only!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:956 waeup/kofa/browser/pages.py:1182
+#: waeup/kofa/browser/pages.py:958 waeup/kofa/browser/pages.py:1184
 msgid "Reset"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:957
+#: waeup/kofa/browser/pages.py:959
 msgid "Set headerfields"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:958
+#: waeup/kofa/browser/pages.py:960
 msgid "Back to step 2"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:959
+#: waeup/kofa/browser/pages.py:961
 msgid "Perform import"
 msgstr ""
@@ -1821,5 +1829,6 @@
 
 #: 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/students/viewlets.py:218 waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/viewlets.py:403
 msgid "Edit"
 msgstr ""
@@ -1956,5 +1965,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:435
 msgid "Bed Type"
 msgstr ""
@@ -2112,41 +2121,41 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:172
+#: waeup/kofa/interfaces.py:185
 msgid "Subject"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:176
+#: waeup/kofa/interfaces.py:189
 msgid "Grade"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:304
+#: waeup/kofa/interfaces.py:319
 msgid "Importer name"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:308
+#: waeup/kofa/interfaces.py:323
 msgid "Import mode"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:333
+#: waeup/kofa/interfaces.py:348
 msgid "Email Address:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:340
+#: waeup/kofa/interfaces.py:355
 msgid "Email to:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:347
+#: waeup/kofa/interfaces.py:362
 msgid "Subject:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:351
+#: waeup/kofa/interfaces.py:366
 msgid "Full Name:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:355
+#: waeup/kofa/interfaces.py:370
 msgid "Text:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:386
+#: waeup/kofa/interfaces.py:401
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2158,5 +2167,5 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:391
+#: waeup/kofa/interfaces.py:406
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2165,97 +2174,97 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:395
+#: waeup/kofa/interfaces.py:410
 msgid "Description/Notice"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:412
+#: waeup/kofa/interfaces.py:427
 msgid "Portal roles"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:455
+#: waeup/kofa/interfaces.py:470
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:456
+#: waeup/kofa/interfaces.py:471
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:461
+#: waeup/kofa/interfaces.py:476
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:467
+#: waeup/kofa/interfaces.py:482
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:474
+#: waeup/kofa/interfaces.py:489
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:486
+#: waeup/kofa/interfaces.py:501
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:494
+#: waeup/kofa/interfaces.py:509
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:502
+#: waeup/kofa/interfaces.py:517
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:508
+#: waeup/kofa/interfaces.py:523
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:515
+#: waeup/kofa/interfaces.py:530
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:516
+#: waeup/kofa/interfaces.py:531
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:521
+#: waeup/kofa/interfaces.py:536
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:528
+#: waeup/kofa/interfaces.py:543
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:535
+#: waeup/kofa/interfaces.py:550
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:544 waeup/kofa/interfaces.py:596
+#: waeup/kofa/interfaces.py:559 waeup/kofa/interfaces.py:611
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:552 waeup/kofa/payments/interfaces.py:30
+#: waeup/kofa/interfaces.py:567 waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:557 waeup/kofa/payments/interfaces.py:106
-msgid "Surcharge 1"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:562 waeup/kofa/payments/interfaces.py:113
+#: waeup/kofa/interfaces.py:572 waeup/kofa/payments/interfaces.py:106
+msgid "Portal Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:577 waeup/kofa/payments/interfaces.py:113
 msgid "Surcharge 2"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:567 waeup/kofa/payments/interfaces.py:120
+#: waeup/kofa/interfaces.py:582 waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:572
+#: waeup/kofa/interfaces.py:587
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:577
+#: waeup/kofa/interfaces.py:592
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:582 waeup/kofa/payments/interfaces.py:36
+#: waeup/kofa/interfaces.py:597 waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
 msgstr ""
@@ -2380,337 +2389,341 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1068
+#: waeup/kofa/students/browser.py:1002 waeup/kofa/students/browser.py:1224
+msgid "Your current session does not match accommodation session."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1071
 msgid "This ticket has already been paid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1081 waeup/kofa/students/browser.py:1089
-#: waeup/kofa/students/browser.py:1097
+#: waeup/kofa/students/browser.py:1084 waeup/kofa/students/browser.py:1092
+#: waeup/kofa/students/browser.py:1100
 msgid "Valid callback received. ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1151
+#: waeup/kofa/students/browser.py:1154
 msgid "${a}: Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1163
+#: waeup/kofa/students/browser.py:1166
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:117 waeup/kofa/students/viewlets.py:114
+#: waeup/kofa/students/browser.py:1173
+msgid "No bed ticket selected."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:119 waeup/kofa/students/viewlets.py:114
 #: waeup/kofa/students/viewlets.py:534
 msgid "Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1170
-msgid "No bed ticket selected."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1201
+#: waeup/kofa/students/browser.py:1204
 msgid "Add bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1203
+#: waeup/kofa/students/browser.py:1206
 msgid "Create bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1211
+#: waeup/kofa/students/browser.py:1214
 msgid "Your data are incomplete."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1215
+#: waeup/kofa/students/browser.py:1218
 msgid "You are in the wrong registration state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1226
+#: waeup/kofa/students/browser.py:1229
 msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:123 waeup/kofa/students/viewlets.py:120
+#: waeup/kofa/students/browser.py:1240 waeup/kofa/students/browser.py:1537
+#: waeup/kofa/students/browser.py:1650
+msgid "Activation code is invalid."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:125 waeup/kofa/students/viewlets.py:120
 #: waeup/kofa/students/viewlets.py:535
 msgid "Payments"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1237 waeup/kofa/students/browser.py:1533
-#: waeup/kofa/students/browser.py:1646
-msgid "Activation code is invalid."
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1257 waeup/kofa/students/browser.py:1385
+#. Default: ""
+#: waeup/kofa/students/browser.py:1260 waeup/kofa/students/browser.py:1388
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1262 waeup/kofa/students/browser.py:1538
-#: waeup/kofa/students/browser.py:1651
+#: waeup/kofa/students/browser.py:1265 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:1265 waeup/kofa/students/browser.py:1541
-#: waeup/kofa/students/browser.py:1654 waeup/kofa/students/browser.py:1913
+#: waeup/kofa/students/browser.py:1268 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:1270 waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1659
+#: waeup/kofa/students/browser.py:1273 waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1663
 msgid "You are not the owner of this access code."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1281 waeup/kofa/students/browser.py:1399
+#: waeup/kofa/students/browser.py:1284 waeup/kofa/students/browser.py:1402
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1290
+#: waeup/kofa/students/browser.py:1293
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1308
+#: waeup/kofa/students/browser.py:1311
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1324
+#: waeup/kofa/students/browser.py:1327
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1330
+#: waeup/kofa/students/browser.py:1333
 msgid "Bed Allocation: "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1357
+#: waeup/kofa/students/browser.py:1360
 msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1363
+#: waeup/kofa/students/browser.py:1366
 msgid "Student can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:138 waeup/kofa/students/viewlets.py:126
+#: waeup/kofa/students/browser.py:140 waeup/kofa/students/viewlets.py:126
 msgid "Accommodation"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1406
+#: waeup/kofa/students/browser.py:1409
 msgid "Student relocated: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1425
+#: waeup/kofa/students/browser.py:1428
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1437 waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/browser.py:1441
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1452 waeup/kofa/students/viewlets.py:365
+#: waeup/kofa/students/browser.py:1456 waeup/kofa/students/viewlets.py:365
 msgid "Change password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1466
+#: waeup/kofa/students/browser.py:1470
 msgid "Password changed."
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/browser.py:147
+#: waeup/kofa/students/browser.py:1482
+msgid "Upload portrait"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/browser.py:149
 msgid "Bed Ticket ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1478
-msgid "Upload portrait"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1493 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"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1497
+#: waeup/kofa/students/browser.py:1501
 msgid "Start clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1514 waeup/kofa/students/browser.py:1635
+#: waeup/kofa/students/browser.py:1518 waeup/kofa/students/browser.py:1639
 msgid "Wrong state"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1518
+#: waeup/kofa/students/browser.py:1522
 msgid "No portrait uploaded."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1522
+#: waeup/kofa/students/browser.py:1526
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1553
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1561
+#: waeup/kofa/students/browser.py:1565
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1573 waeup/kofa/students/browser.py:1587
+#: waeup/kofa/students/browser.py:1577 waeup/kofa/students/browser.py:1591
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1581
+#: waeup/kofa/students/browser.py:1585
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1596 waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1600 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1597
+#: waeup/kofa/students/browser.py:1601
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1600
+#: waeup/kofa/students/browser.py:1604
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1609
+#: waeup/kofa/students/browser.py:1613
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1618
+#: waeup/kofa/students/browser.py:1622
 msgid "Clearance has been requested."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1627 waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:1631 waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1631
+#: waeup/kofa/students/browser.py:1635
 msgid "Start course registration now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:166
+#: waeup/kofa/students/browser.py:1671
+msgid "Course registration has been started."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:168
 msgid "Student Section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1667
-msgid "Course registration has been started."
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1686
+#. Default: ""
+#: waeup/kofa/students/browser.py:1690
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1695
+#: waeup/kofa/students/browser.py:1699
 msgid "Create course list now"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1734
+#: waeup/kofa/students/browser.py:1738
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1771
+#: waeup/kofa/students/browser.py:1775
 msgid "Register course list"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1775
+#: waeup/kofa/students/browser.py:1779
 msgid "Course list has been registered."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:182 waeup/kofa/students/browser.py:218
+#: waeup/kofa/students/browser.py:1825
+msgid "Change my password"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1835
+msgid "Get new login credentials"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:184 waeup/kofa/students/browser.py:220
 msgid "Empty search string"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1821
-msgid "Change my password"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1831
-msgid "Get new login credentials"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1845
+#: waeup/kofa/students/browser.py:1849
 msgid "No student record found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1853
+#: waeup/kofa/students/browser.py:1857
 msgid "You have successfully changed your password for the"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1858
+#: waeup/kofa/students/browser.py:1862
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1869
+#: waeup/kofa/students/browser.py:1873
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1872
+#: waeup/kofa/students/browser.py:1876
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1887
+#: waeup/kofa/students/browser.py:1891
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1895
+#: waeup/kofa/students/browser.py:1899
 msgid "Access code is invalid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1898
+#: waeup/kofa/students/browser.py:1902
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1904
+#: waeup/kofa/students/browser.py:1908
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1910
+#: waeup/kofa/students/browser.py:1914
 msgid "Access code has already been used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1919
+#: waeup/kofa/students/browser.py:1923
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:200 waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:202 waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:224 waeup/kofa/students/browser.py:1884
+#: waeup/kofa/students/browser.py:226 waeup/kofa/students/browser.py:1888
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:251 waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:253 waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:259
+#: waeup/kofa/students/browser.py:261
 msgid "Student record created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:275
+#: waeup/kofa/students/browser.py:277
 msgid "${a}: Base Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:318 waeup/kofa/students/browser.py:1861
+#: waeup/kofa/students/browser.py:320 waeup/kofa/students/browser.py:1865
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:329
+#: waeup/kofa/students/browser.py:332
 msgid "Manage base data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:398
+#: waeup/kofa/students/browser.py:401
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:414 waeup/kofa/students/viewlets.py:104
+#: waeup/kofa/students/browser.py:417 waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
@@ -2718,84 +2731,84 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:420
+#: waeup/kofa/students/browser.py:423
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:440
+#: waeup/kofa/students/browser.py:443
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:469
+#: waeup/kofa/students/browser.py:472
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:471 waeup/kofa/students/browser.py:495
+#: waeup/kofa/students/browser.py:474 waeup/kofa/students/browser.py:498
 msgid "Student is in wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:488
+#: waeup/kofa/students/browser.py:491
 msgid "Clearance has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:492
+#: waeup/kofa/students/browser.py:495
 msgid "Clearance request has been rejected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:518
+#: waeup/kofa/students/browser.py:521
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:528
+#: waeup/kofa/students/browser.py:531
 msgid "Manage personal data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:548
+#: waeup/kofa/students/browser.py:551
 msgid "${a}: Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:578
+#: waeup/kofa/students/browser.py:581
 msgid "Manage study course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:581 waeup/kofa/students/browser.py:622
+#: waeup/kofa/students/browser.py:584 waeup/kofa/students/browser.py:625
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:582 waeup/kofa/students/browser.py:608
+#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:611
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:616
+#: waeup/kofa/students/browser.py:619
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:618 waeup/kofa/students/browser.py:1704
+#: waeup/kofa/students/browser.py:621 waeup/kofa/students/browser.py:1708
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:628
+#: waeup/kofa/students/browser.py:631
 msgid "No study level selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:664
+#: waeup/kofa/students/browser.py:667
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:687
+#: waeup/kofa/students/browser.py:690
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:693
+#: waeup/kofa/students/browser.py:696
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:702
+#: waeup/kofa/students/browser.py:705
 msgid "Course Registration Slip  "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:708
+#: waeup/kofa/students/browser.py:711
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -2804,5 +2817,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:711
+#: waeup/kofa/students/browser.py:714
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -2810,10 +2823,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:712
+#: waeup/kofa/students/browser.py:715
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:713
+#: waeup/kofa/students/browser.py:716
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -2821,5 +2834,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:714
+#: waeup/kofa/students/browser.py:717
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -2827,5 +2840,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:715 waeup/kofa/students/interfaces.py:370
+#: waeup/kofa/students/browser.py:718 waeup/kofa/students/interfaces.py:378
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2834,73 +2847,69 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:743 waeup/kofa/students/browser.py:772
-#: waeup/kofa/students/browser.py:857 waeup/kofa/students/browser.py:862
-#: waeup/kofa/students/browser.py:1744 waeup/kofa/students/browser.py:1794
+#: waeup/kofa/students/browser.py:746 waeup/kofa/students/browser.py:775
+#: waeup/kofa/students/browser.py:860 waeup/kofa/students/browser.py:865
+#: waeup/kofa/students/browser.py:1748 waeup/kofa/students/browser.py:1798
 msgid "Add course ticket"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:764
+#: waeup/kofa/students/browser.py:767
 msgid "Manage study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:782 waeup/kofa/students/browser.py:1754
+#: waeup/kofa/students/browser.py:785 waeup/kofa/students/browser.py:1758
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:806 waeup/kofa/students/browser.py:828
+#: waeup/kofa/students/browser.py:809 waeup/kofa/students/browser.py:831
 msgid "This level does not correspond current level."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:810
+#: waeup/kofa/students/browser.py:813
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:812 waeup/kofa/students/browser.py:840
+#: waeup/kofa/students/browser.py:815 waeup/kofa/students/browser.py:843
 msgid "Student is in the wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:833
+#: waeup/kofa/students/browser.py:836
 msgid "Course list request has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:840
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:877 waeup/kofa/students/browser.py:1807
+#: waeup/kofa/students/browser.py:880 waeup/kofa/students/browser.py:1811
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:879 waeup/kofa/students/browser.py:1809
+#: waeup/kofa/students/browser.py:882 waeup/kofa/students/browser.py:1813
 msgid "Successfully added ${a}."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:900
+#: waeup/kofa/students/browser.py:903
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:916
+#: waeup/kofa/students/browser.py:919
 msgid "Manage course ticket ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:943
+#: waeup/kofa/students/browser.py:946
 msgid "${a}: Payments"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:988
+#: waeup/kofa/students/browser.py:991
 msgid "Add online payment"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:991
+#: waeup/kofa/students/browser.py:994
 msgid "Create ticket"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:999 waeup/kofa/students/browser.py:1221
-msgid "Your current session does not match accommodation session."
 msgstr ""
 
@@ -3001,6 +3010,6 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:21
-#: waeup/kofa/students/browser_templates/fileupload.pt:27
+#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/students/browser_templates/fileupload.pt:26
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
 msgid "Max. file size:"
@@ -3130,69 +3139,69 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:176 waeup/kofa/students/interfaces.py:255
-#: waeup/kofa/students/interfaces.py:483
+#: waeup/kofa/students/interfaces.py:184 waeup/kofa/students/interfaces.py:263
+#: waeup/kofa/students/interfaces.py:491
 msgid "Registration Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:183 waeup/kofa/students/interfaces.py:265
+#: waeup/kofa/students/interfaces.py:191 waeup/kofa/students/interfaces.py:273
 msgid "Matriculation Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:191
+#: waeup/kofa/students/interfaces.py:199
 msgid "PWD Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:198
+#: waeup/kofa/students/interfaces.py:206
 msgid "Email"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:218
+#: waeup/kofa/students/interfaces.py:226
 msgid "Clearance form locked"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:223
+#: waeup/kofa/students/interfaces.py:231
 msgid "CLR Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:231
+#: waeup/kofa/students/interfaces.py:239
 msgid "Nationality"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:241
+#: waeup/kofa/students/interfaces.py:249
 msgid "Permanent Address"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:275
+#: waeup/kofa/students/interfaces.py:283
 #: waeup/kofa/browser/templates/showstudentspage.pt:7
 msgid "Certificate"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:282
+#: waeup/kofa/students/interfaces.py:290
 msgid "Entry Mode"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:290
+#: waeup/kofa/students/interfaces.py:298
 msgid "Entry Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:299
+#: waeup/kofa/students/interfaces.py:307
 #: waeup/kofa/browser/templates/showstudentspage.pt:8
 msgid "Current Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:307
+#: waeup/kofa/students/interfaces.py:315
 #: waeup/kofa/browser/templates/showstudentspage.pt:9
 msgid "Current Level"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:315
+#: waeup/kofa/students/interfaces.py:323
 msgid "Current Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:322
+#: waeup/kofa/students/interfaces.py:330
 msgid "Previous Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:337 waeup/kofa/students/interfaces.py:434
+#: waeup/kofa/students/interfaces.py:345 waeup/kofa/students/interfaces.py:442
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3200,9 +3209,9 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:344
+#: waeup/kofa/students/interfaces.py:352
 msgid "Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:363
+#: waeup/kofa/students/interfaces.py:371
 #: waeup/kofa/browser/templates/certificatepage.pt:30
 #: waeup/kofa/browser/templates/certificatemanagepage.pt:33
@@ -3210,13 +3219,13 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:377
+#: waeup/kofa/students/interfaces.py:385
 msgid "Automatical Creation"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:384
+#: waeup/kofa/students/interfaces.py:392
 msgid "Carry-over Course"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:403
+#: waeup/kofa/students/interfaces.py:411
 #: waeup/kofa/university/interfaces.py:299
 #: waeup/kofa/browser/templates/certificatepage.pt:29
@@ -3225,15 +3234,15 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:420
+#: waeup/kofa/students/interfaces.py:428
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:10
 msgid "Bed Coordinates"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:442
+#: waeup/kofa/students/interfaces.py:450
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:9
 msgid "Booking Date"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:448
+#: waeup/kofa/students/interfaces.py:456
 msgid "Booking Activation Code"
 msgstr ""
@@ -3244,5 +3253,5 @@
 msgstr ""
 
-#: waeup/kofa/students/utils.py:280 waeup/kofa/students/viewlets.py:71
+#: waeup/kofa/students/utils.py:298 waeup/kofa/students/viewlets.py:71
 #: waeup/kofa/students/viewlets.py:99
 #: waeup/kofa/students/browser_templates/basemanagepage.pt:6
@@ -3250,5 +3259,5 @@
 msgstr ""
 
-#: waeup/kofa/students/utils.py:311
+#: waeup/kofa/students/utils.py:329
 msgid "Scanned Documents"
 msgstr ""
@@ -3400,9 +3409,9 @@
 
 #: waeup/kofa/students/vocabularies.py:135
-msgid "Male"
+msgid "male"
 msgstr ""
 
 #: waeup/kofa/students/vocabularies.py:137
-msgid "Female"
+msgid "female"
 msgstr ""
 
@@ -3661,5 +3670,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:228
+#: waeup/kofa/utils/utils.py:142
 msgid ""
 "Fullname: ${a}\n"
@@ -3671,5 +3680,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:273
+#: waeup/kofa/utils/utils.py:187
 msgid ""
 "Dear ${a},\n"
@@ -3691,4 +3700,28 @@
 msgstr ""
 
+#: waeup/kofa/utils/utils.py:44
+msgid "Germany"
+msgstr ""
+
+#: waeup/kofa/utils/utils.py:45
+msgid "Nigeria"
+msgstr ""
+
+#: waeup/kofa/utils/utils.py:46
+msgid "U.S."
+msgstr ""
+
+#: waeup/kofa/widgets/phonewidget.py:117
+msgid "Empty phone field(s)."
+msgstr ""
+
+#: waeup/kofa/widgets/phonewidget.py:121
+msgid "Int. prefix requires format '+NNN'"
+msgstr ""
+
+#: waeup/kofa/widgets/phonewidget.py:127
+msgid "Phone numbers may contain numbers only."
+msgstr ""
+
 #: waeup/kofa/widgets/sequencewidget.pt:18
 msgid "Don't forget to save the form after adding or deleting items."
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 7881)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/ig/LC_MESSAGES/waeup.kofa.po	(revision 7882)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Sun Mar 11 16:45:08 2012\n"
+"POT-Creation-Date: Wed Mar 14 10:35:59 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -32,20 +32,20 @@
 #: waeup/kofa/applicants/browser.py:182 waeup/kofa/applicants/browser.py:255
 #: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:339
-#: 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:580
-#: waeup/kofa/students/browser.py:581 waeup/kofa/students/browser.py:742
-#: waeup/kofa/students/browser.py:744 waeup/kofa/students/browser.py:884
+#: waeup/kofa/browser/pages.py:505 waeup/kofa/browser/pages.py:710
+#: waeup/kofa/browser/pages.py:737 waeup/kofa/browser/pages.py:760
+#: waeup/kofa/browser/pages.py:807 waeup/kofa/browser/pages.py:837
+#: waeup/kofa/browser/pages.py:957 waeup/kofa/browser/pages.py:1185
+#: waeup/kofa/browser/pages.py:1279 waeup/kofa/browser/pages.py:1300
+#: waeup/kofa/browser/pages.py:1327 waeup/kofa/browser/pages.py:1355
+#: waeup/kofa/browser/pages.py:1356 waeup/kofa/browser/pages.py:1402
+#: waeup/kofa/browser/pages.py:1443 waeup/kofa/browser/pages.py:1522
+#: waeup/kofa/browser/pages.py:1523 waeup/kofa/browser/pages.py:1525
+#: waeup/kofa/browser/pages.py:1603 waeup/kofa/browser/pages.py:1648
+#: waeup/kofa/browser/pages.py:1686 waeup/kofa/browser/pages.py:1730
+#: waeup/kofa/browser/pages.py:1769 waeup/kofa/browser/pages.py:1771
+#: waeup/kofa/browser/pages.py:1806 waeup/kofa/browser/pages.py:1857
+#: waeup/kofa/browser/pages.py:1909 waeup/kofa/students/browser.py:583
+#: waeup/kofa/students/browser.py:584 waeup/kofa/students/browser.py:745
+#: waeup/kofa/students/browser.py:747 waeup/kofa/students/browser.py:887
 msgid "Cancel"
 msgstr ""
@@ -85,7 +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:167 waeup/kofa/students/browser.py:201
+#: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:594
+#: waeup/kofa/browser/pages.py:1144 waeup/kofa/browser/viewlets.py:190
+#: waeup/kofa/students/browser.py:169 waeup/kofa/students/browser.py:203
 msgid "Search"
 msgstr ""
@@ -343,5 +343,5 @@
 
 #: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:326
-#: waeup/kofa/applicants/browser.py:746
+#: waeup/kofa/applicants/browser.py:747
 msgid "Could not delete:"
 msgstr ""
@@ -349,8 +349,8 @@
 #. Default: ""
 #: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py:329
-#: waeup/kofa/applicants/browser.py:749 waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:239 waeup/kofa/students/browser.py:638
-#: waeup/kofa/students/browser.py:792 waeup/kofa/students/browser.py:970
-#: waeup/kofa/students/browser.py:1180 waeup/kofa/students/browser.py:1766
+#: waeup/kofa/applicants/browser.py:750 waeup/kofa/browser/pages.py:135
+#: waeup/kofa/students/browser.py:241 waeup/kofa/students/browser.py:641
+#: waeup/kofa/students/browser.py:795 waeup/kofa/students/browser.py:973
+#: waeup/kofa/students/browser.py:1183 waeup/kofa/students/browser.py:1770
 msgid "Successfully removed: ${a}"
 msgstr ""
@@ -373,24 +373,24 @@
 
 #: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:302
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:689
-#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:839 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/applicants/browser.py:656 waeup/kofa/applicants/browser.py:690
+#: waeup/kofa/applicants/browser.py:793 waeup/kofa/applicants/browser.py:796
+#: waeup/kofa/applicants/browser.py:840 waeup/kofa/browser/pages.py:478
+#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:656
+#: waeup/kofa/browser/pages.py:730 waeup/kofa/browser/pages.py:1183
+#: waeup/kofa/browser/pages.py:1355 waeup/kofa/browser/pages.py:1396
+#: waeup/kofa/browser/pages.py:1522 waeup/kofa/browser/pages.py:1575
+#: waeup/kofa/browser/pages.py:1718 waeup/kofa/browser/pages.py:1769
+#: waeup/kofa/browser/pages.py:1790 waeup/kofa/hostels/browser.py:209
 #: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:318
-#: waeup/kofa/students/browser.py:355 waeup/kofa/students/browser.py:454
-#: waeup/kofa/students/browser.py:531 waeup/kofa/students/browser.py:580
-#: waeup/kofa/students/browser.py:596 waeup/kofa/students/browser.py:742
-#: waeup/kofa/students/browser.py:767 waeup/kofa/students/browser.py:1440
-#: waeup/kofa/students/browser.py:1455 waeup/kofa/students/browser.py:1570
+#: waeup/kofa/students/browser.py:358 waeup/kofa/students/browser.py:457
+#: waeup/kofa/students/browser.py:534 waeup/kofa/students/browser.py:583
+#: waeup/kofa/students/browser.py:599 waeup/kofa/students/browser.py:745
+#: waeup/kofa/students/browser.py:770 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:256 waeup/kofa/applicants/browser.py:334
-#: waeup/kofa/applicants/browser.py:362
+#: waeup/kofa/applicants/browser.py:363
 msgid "Add applicant"
 msgstr ""
@@ -400,9 +400,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:306 waeup/kofa/applicants/browser.py:718
-#: 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:381
+#: waeup/kofa/applicants/browser.py:306 waeup/kofa/applicants/browser.py:719
+#: waeup/kofa/browser/pages.py:1399 waeup/kofa/browser/pages.py:1721
+#: waeup/kofa/browser/pages.py:1793 waeup/kofa/browser/pages.py:1905
+#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:82
+#: waeup/kofa/students/browser.py:384
 msgid "Form has been saved."
 msgstr ""
@@ -412,67 +412,67 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:365
+#: waeup/kofa/applicants/browser.py:366
 msgid "Create application record"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:370
+#: waeup/kofa/applicants/browser.py:371
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:383
+#: waeup/kofa/applicants/browser.py:384
 msgid "Applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:281
+#: waeup/kofa/applicants/browser.py:399 waeup/kofa/students/browser.py:283
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:399 waeup/kofa/students/browser.py:282
+#: waeup/kofa/applicants/browser.py:400 waeup/kofa/students/browser.py:284
 msgid "unset"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:404
+#: waeup/kofa/applicants/browser.py:405
 msgid "${a} Application Record ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:455
+#: waeup/kofa/applicants/browser.py:456
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:462 waeup/kofa/students/browser.py:1019
+#: waeup/kofa/applicants/browser.py:463 waeup/kofa/students/browser.py:1022
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:475 waeup/kofa/students/browser.py:1033
+#: waeup/kofa/applicants/browser.py:476 waeup/kofa/students/browser.py:1036
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:502 waeup/kofa/students/browser.py:1052
+#: waeup/kofa/applicants/browser.py:503 waeup/kofa/students/browser.py:1055
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:530 waeup/kofa/students/browser.py:1101
+#: waeup/kofa/applicants/browser.py:531 waeup/kofa/students/browser.py:1104
 msgid "Valid callback received."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:551
+#: waeup/kofa/applicants/browser.py:552
 msgid "Payment Data"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:557
+#: waeup/kofa/applicants/browser.py:558
 msgid "Online Payment Receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:563
+#: waeup/kofa/applicants/browser.py:564
 msgid "Ticket not yet paid."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:628
+#: waeup/kofa/applicants/browser.py:629
 msgid "Uploaded image is too big!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:633
+#: waeup/kofa/applicants/browser.py:634
 msgid "jpg file extension expected."
 msgstr ""
@@ -482,33 +482,33 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:847
+#: waeup/kofa/applicants/browser.py:656 waeup/kofa/applicants/browser.py:796
+#: waeup/kofa/applicants/browser.py:848
 msgid "Final Submit"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:656 waeup/kofa/applicants/browser.py:759
-#: waeup/kofa/applicants/browser.py:793 waeup/kofa/applicants/browser.py:828
-#: waeup/kofa/students/browser.py:976
+#: waeup/kofa/applicants/browser.py:657 waeup/kofa/applicants/browser.py:760
+#: waeup/kofa/applicants/browser.py:794 waeup/kofa/applicants/browser.py:829
+#: waeup/kofa/students/browser.py:979
 msgid "Add online payment ticket"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:656 waeup/kofa/applicants/browser.py:764
-#: waeup/kofa/applicants/browser.py:793 waeup/kofa/applicants/browser.py:796
-#: waeup/kofa/applicants/browser.py:833 waeup/kofa/students/browser.py:744
-#: waeup/kofa/students/browser.py:776 waeup/kofa/students/browser.py:952
-#: waeup/kofa/students/browser.py:1748
+#: waeup/kofa/applicants/browser.py:657 waeup/kofa/applicants/browser.py:765
+#: waeup/kofa/applicants/browser.py:794 waeup/kofa/applicants/browser.py:797
+#: waeup/kofa/applicants/browser.py:834 waeup/kofa/students/browser.py:747
+#: waeup/kofa/students/browser.py:779 waeup/kofa/students/browser.py:955
+#: waeup/kofa/students/browser.py:1752
 msgid "Remove selected tickets"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:675
+#: waeup/kofa/applicants/browser.py:676
 msgid "${a} Application Form ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:686 waeup/kofa/students/browser.py:352
+#: waeup/kofa/applicants/browser.py:687 waeup/kofa/students/browser.py:355
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:733 waeup/kofa/students/browser.py:958
+#: waeup/kofa/applicants/browser.py:734 waeup/kofa/students/browser.py:961
 msgid "No payment selected."
 msgstr ""
@@ -520,9 +520,9 @@
 #: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:105
 #: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:309
-#: 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:202
-#: waeup/kofa/students/browser.py:1147 waeup/kofa/students/browser.py:1160
+#: waeup/kofa/browser/pages.py:636 waeup/kofa/browser/pages.py:677
+#: waeup/kofa/browser/pages.py:1279 waeup/kofa/browser/pages.py:1290
+#: waeup/kofa/browser/pages.py:1356 waeup/kofa/browser/pages.py:1391
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:204
+#: waeup/kofa/students/browser.py:1150 waeup/kofa/students/browser.py:1163
 msgid "Remove selected"
 msgstr ""
@@ -533,5 +533,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:806 waeup/kofa/students/browser.py:88
+#: waeup/kofa/applicants/browser.py:807 waeup/kofa/students/browser.py:90
 msgid "The requested form is locked (read-only)."
 msgstr ""
@@ -539,7 +539,7 @@
 #: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:139
 #: waeup/kofa/applicants/browser.py:257 waeup/kofa/applicants/browser.py:348
-#: 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/browser/pages.py:1357 waeup/kofa/browser/pages.py:1416
+#: waeup/kofa/browser/pages.py:1526 waeup/kofa/browser/pages.py:1612
+#: waeup/kofa/browser/pages.py:1772 waeup/kofa/browser/pages.py:1829
 msgid "Remove selected local roles"
 msgstr ""
@@ -547,15 +547,15 @@
 #: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:135
 #: waeup/kofa/applicants/browser.py:258 waeup/kofa/applicants/browser.py:344
-#: 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/browser/pages.py:1358 waeup/kofa/browser/pages.py:1412
+#: waeup/kofa/browser/pages.py:1527 waeup/kofa/browser/pages.py:1608
+#: waeup/kofa/browser/pages.py:1773 waeup/kofa/browser/pages.py:1825
 msgid "Add local role"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:820
+#: waeup/kofa/applicants/browser.py:821
 msgid "No passport picture uploaded."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:822
+#: waeup/kofa/applicants/browser.py:823
 msgid "Passport picture confirmation box not ticked."
 msgstr ""
@@ -565,38 +565,38 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:859 waeup/kofa/students/browser.py:1615
+#: waeup/kofa/applicants/browser.py:860 waeup/kofa/students/browser.py:1619
 msgid "This form cannot be submitted. Wrong state!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:864
+#: waeup/kofa/applicants/browser.py:865
 msgid "Form has been submitted."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:899
+#: waeup/kofa/applicants/browser.py:900
 msgid "Register for ${a} Application"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:905
+#: waeup/kofa/applicants/browser.py:906
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:910
+#: waeup/kofa/applicants/browser.py:911
 msgid "Application has ended."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:919
+#: waeup/kofa/applicants/browser.py:920
 msgid "Get login credentials"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:934
+#: waeup/kofa/applicants/browser.py:935
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:941
+#: waeup/kofa/applicants/browser.py:942
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:950
+#: waeup/kofa/applicants/browser.py:951
 msgid "Your registration was successful."
 msgstr ""
@@ -664,5 +664,13 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:709
+#: waeup/kofa/applicants/container.py:52
+msgid "Basic"
+msgstr ""
+
+#: waeup/kofa/applicants/container.py:55
+msgid "handles basic applicants"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:198 waeup/kofa/students/browser.py:712
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -688,5 +696,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:710
+#: waeup/kofa/applicants/interfaces.py:205 waeup/kofa/students/browser.py:713
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -707,126 +715,126 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:211
-#: waeup/kofa/applicants/interfaces.py:324
+#: waeup/kofa/applicants/interfaces.py:212
+#: waeup/kofa/applicants/interfaces.py:325
 msgid "Application Target"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:219
+#: waeup/kofa/applicants/interfaces.py:220
 msgid "Entry Level"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:226
-#: waeup/kofa/applicants/interfaces.py:332
+#: waeup/kofa/applicants/interfaces.py:227
+#: waeup/kofa/applicants/interfaces.py:333
 msgid "Year of Entrance"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:234
-#: waeup/kofa/applicants/interfaces.py:340
+#: waeup/kofa/applicants/interfaces.py:235
+#: waeup/kofa/applicants/interfaces.py:341
 msgid "Applicants Container Type"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:250
+#: waeup/kofa/applicants/interfaces.py:251
 msgid "Category for the grouping of certificates"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:257
+#: waeup/kofa/applicants/interfaces.py:258
 msgid "Human readable description in reST format"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:273
+#: waeup/kofa/applicants/interfaces.py:274
 msgid "Application Start Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:279
+#: waeup/kofa/applicants/interfaces.py:280
 msgid "Application Closing Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:285
+#: waeup/kofa/applicants/interfaces.py:286
 msgid "Forbid additions after deadline (enddate)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:368
+#: waeup/kofa/applicants/interfaces.py:369
 msgid "Applicant Id"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:373
+#: waeup/kofa/applicants/interfaces.py:374
 msgid "JAMB Registration Number"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:385
-#: waeup/kofa/students/interfaces.py:154
+#: waeup/kofa/applicants/interfaces.py:386
+#: waeup/kofa/students/interfaces.py:162
 msgid "First Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:389
-#: waeup/kofa/students/interfaces.py:159
+#: waeup/kofa/applicants/interfaces.py:390
+#: waeup/kofa/students/interfaces.py:167
 msgid "Middle Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:393
-#: waeup/kofa/students/interfaces.py:164
+#: waeup/kofa/applicants/interfaces.py:394
+#: waeup/kofa/students/interfaces.py:172
 msgid "Last Name (Surname)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:397
-#: waeup/kofa/students/interfaces.py:213
+#: waeup/kofa/applicants/interfaces.py:398
+#: waeup/kofa/students/interfaces.py:221
 msgid "Date of Birth"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:402
+#: waeup/kofa/applicants/interfaces.py:403
 msgid "State/LGA"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:407
-#: waeup/kofa/students/interfaces.py:169
+#: waeup/kofa/applicants/interfaces.py:408
+#: waeup/kofa/students/interfaces.py:177
 msgid "Sex"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:373
-#: waeup/kofa/interfaces.py:399 waeup/kofa/students/interfaces.py:490
+#: waeup/kofa/applicants/interfaces.py:414 waeup/kofa/interfaces.py:388
+#: waeup/kofa/interfaces.py:414 waeup/kofa/students/interfaces.py:498
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:378
-#: waeup/kofa/interfaces.py:406 waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/applicants/interfaces.py:419 waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:421 waeup/kofa/students/interfaces.py:211
 msgid "Phone"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:423
-#: waeup/kofa/applicants/interfaces.py:509
+#: waeup/kofa/applicants/interfaces.py:424
+#: waeup/kofa/applicants/interfaces.py:510
 msgid "1st Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:428
-#: waeup/kofa/applicants/interfaces.py:514
+#: waeup/kofa/applicants/interfaces.py:429
+#: waeup/kofa/applicants/interfaces.py:515
 msgid "2nd Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:433
+#: waeup/kofa/applicants/interfaces.py:434
 msgid "School Grades"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:443
-#: waeup/kofa/applicants/interfaces.py:519
+#: waeup/kofa/applicants/interfaces.py:444
+#: waeup/kofa/applicants/interfaces.py:520
 msgid "Screening Score"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:447
-#: waeup/kofa/applicants/interfaces.py:524
+#: waeup/kofa/applicants/interfaces.py:448
+#: waeup/kofa/applicants/interfaces.py:525
 msgid "Screening Venue"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:451
-#: waeup/kofa/applicants/interfaces.py:529
+#: waeup/kofa/applicants/interfaces.py:452
+#: waeup/kofa/applicants/interfaces.py:530
 msgid "Admitted Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:457
-#: waeup/kofa/applicants/interfaces.py:536
+#: waeup/kofa/applicants/interfaces.py:458
+#: waeup/kofa/applicants/interfaces.py:537
 msgid "Notice"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:479
-#: waeup/kofa/students/interfaces.py:149
+#: waeup/kofa/applicants/interfaces.py:480
+#: waeup/kofa/students/interfaces.py:157
 #: waeup/kofa/browser/templates/showstudentspage.pt:4
 #: waeup/kofa/students/browser_templates/containerpage.pt:29
@@ -835,10 +843,10 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:484
+#: waeup/kofa/applicants/interfaces.py:485
 msgid "Form locked"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:563
-#: waeup/kofa/students/interfaces.py:469
+#: waeup/kofa/applicants/interfaces.py:564
+#: waeup/kofa/students/interfaces.py:477
 msgid "Payment Session"
 msgstr ""
@@ -856,5 +864,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:185
+#: waeup/kofa/applicants/pdf.py:186
 #: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:26
 msgid "Admitted Course of Study:"
@@ -862,5 +870,5 @@
 
 #. Default: ""
-#: waeup/kofa/applicants/pdf.py:203
+#: waeup/kofa/applicants/pdf.py:204
 msgid ""
 "<font size=10>Proceed to the login page of the portal and enter your new "
@@ -868,5 +876,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:209
+#: waeup/kofa/applicants/pdf.py:210
 msgid "<font size=10>Change your password when you have  logged in.</font>"
 msgstr ""
@@ -897,5 +905,5 @@
 
 #: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:254
+#: waeup/kofa/students/browser.py:256
 msgid "Create student record"
 msgstr ""
@@ -1016,5 +1024,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:309
+#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:310
 msgid "Administration"
 msgstr ""
@@ -1025,11 +1033,11 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:386
+#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:387
 #: 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:750
+#: waeup/kofa/browser/pages.py:1142 waeup/kofa/browser/viewlets.py:393
 #: waeup/kofa/browser/viewlets.py:685
 msgid "Data Center"
@@ -1040,131 +1048,149 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1016
+#: waeup/kofa/browser/pages.py:1018
 msgid "Edit headers or replace imported file!"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:103
+#: waeup/kofa/browser/pages.py:104
 msgid "Local role successfully removed: ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1063
+#: waeup/kofa/browser/pages.py:1065
 msgid "View processing log"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1064
+#: waeup/kofa/browser/pages.py:1066
 msgid "Back to data center"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1108
+#: waeup/kofa/browser/pages.py:1110
 msgid "Processing of ${a} rows failed."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1110
+#: waeup/kofa/browser/pages.py:1112
 msgid "Successfully processed ${a} rows."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1118
+#: waeup/kofa/browser/pages.py:1120
 msgid "Show logfiles"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1120
+#: waeup/kofa/browser/pages.py:1122
 msgid "Back to Data Center"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1121
+#: waeup/kofa/browser/pages.py:1123
 msgid "Show"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:113 waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:226
+#: waeup/kofa/browser/pages.py:114 waeup/kofa/hostels/browser.py:256
+#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:228
 msgid "No item selected."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1143
+#: waeup/kofa/browser/pages.py:1145
 msgid "Back"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1151
+#: waeup/kofa/browser/pages.py:1153
 msgid "Log files can only be searched on Unix-based operating systems."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1179
+#: waeup/kofa/browser/pages.py:1181
 msgid "Edit data center settings"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1199
+#: waeup/kofa/browser/pages.py:1201
 msgid "File already existed (not copied): ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1202
+#: waeup/kofa/browser/pages.py:1204
 msgid "Given storage path cannot be used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1203
+#: waeup/kofa/browser/pages.py:1205
 msgid "Error: ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1206
+#: waeup/kofa/browser/pages.py:1208
 msgid "New storage path succefully set."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1265
+#: waeup/kofa/browser/pages.py:1267
 msgid "Academic Section"
 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:1279 waeup/kofa/browser/pages.py:1295
+#: waeup/kofa/browser/pages.py:1312 waeup/kofa/browser/pages.py:1316
 msgid "Add faculty"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1278
+#: waeup/kofa/browser/pages.py:1280
 msgid "Faculties"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1282 waeup/kofa/browser/viewlets.py:441
+#: waeup/kofa/browser/pages.py:1284 waeup/kofa/browser/viewlets.py:441
 msgid "Manage academic section"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1321
+#: waeup/kofa/browser/pages.py:1323
 msgid "The faculty code chosen already exists."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1342 waeup/kofa/browser/pages.py:1352
+#: waeup/kofa/browser/pages.py:1344 waeup/kofa/browser/pages.py:1354
 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:1356 waeup/kofa/browser/pages.py:1407
+#: waeup/kofa/browser/pages.py:1426 waeup/kofa/browser/pages.py:1430
 msgid "Add department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1362 waeup/kofa/browser/viewlets.py:457
+#: waeup/kofa/browser/pages.py:1364 waeup/kofa/browser/viewlets.py:457
 msgid "Manage faculty"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1435
+#: waeup/kofa/browser/pages.py:1437
 msgid "The code chosen already exists in this faculty."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1438
+#: waeup/kofa/browser/pages.py:1440
 msgid "Department ${a} added."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1455
+#: waeup/kofa/browser/pages.py:1457
 msgid "Courses and Certificates"
 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:1487 waeup/kofa/browser/pages.py:1506
+#: waeup/kofa/students/browser.py:98 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:1523 waeup/kofa/browser/pages.py:1581
+msgid "Remove selected courses"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1523 waeup/kofa/browser/pages.py:1593
+#: waeup/kofa/browser/pages.py:1622 waeup/kofa/browser/pages.py:1626
+msgid "Add course"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1524 waeup/kofa/browser/pages.py:1587
+msgid "Remove selected certificates"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1524 waeup/kofa/browser/pages.py:1598
+#: waeup/kofa/browser/pages.py:1659 waeup/kofa/browser/pages.py:1663
+msgid "Add certificate"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:153 waeup/kofa/browser/viewlets.py:322
 #: waeup/kofa/browser/templates/staffsitelayout.pt:28
 #: waeup/kofa/browser/templates/studentsitelayout.pt:33
@@ -1172,121 +1198,103 @@
 msgstr ""
 
-#: 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
-msgid "Add course"
-msgstr ""
-
-#: 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
-msgid "Add certificate"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:1531 waeup/kofa/browser/viewlets.py:464
+#: waeup/kofa/browser/pages.py:1533 waeup/kofa/browser/viewlets.py:464
 msgid "Manage department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:160
+#: waeup/kofa/browser/pages.py:161
 msgid "You logged in."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1636
+#: waeup/kofa/browser/pages.py:1638
 msgid "A course with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1642
+#: waeup/kofa/browser/pages.py:1644
 msgid "Course ${a} successfully created."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1673
+#: waeup/kofa/browser/pages.py:1675
 msgid "A certificate with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1679
+#: waeup/kofa/browser/pages.py:1681
 msgid "Certificate ${a} successfully created."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1711 waeup/kofa/browser/viewlets.py:481
+#: waeup/kofa/browser/pages.py:1713 waeup/kofa/browser/viewlets.py:481
 msgid "Edit course"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1761
+#: waeup/kofa/browser/pages.py:1763
 msgid "Edit certificate"
 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:1770 waeup/kofa/browser/pages.py:1801
+#: waeup/kofa/browser/pages.py:1842 waeup/kofa/browser/pages.py:1844
 msgid "Add course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1769 waeup/kofa/browser/pages.py:1794
+#: waeup/kofa/browser/pages.py:1771 waeup/kofa/browser/pages.py:1796
 msgid "Remove selected course referrers"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1775 waeup/kofa/browser/viewlets.py:488
+#: waeup/kofa/browser/pages.py:1777 waeup/kofa/browser/viewlets.py:488
 msgid "Manage certificate"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:178
+#: waeup/kofa/browser/pages.py:179
 msgid "You entered wrong credentials."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1847
+#: waeup/kofa/browser/pages.py:1849
 msgid "The chosen course referrer is already part of this certificate."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1851
+#: waeup/kofa/browser/pages.py:1853
 msgid "Course referrer ${a}_${b} added."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1888 waeup/kofa/browser/viewlets.py:505
+#: waeup/kofa/browser/pages.py:1890 waeup/kofa/browser/viewlets.py:505
 msgid "Edit course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1891
+#: waeup/kofa/browser/pages.py:1893
 msgid "Save and return"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:192
+#: waeup/kofa/browser/pages.py:193
 msgid "You have been logged out. Thanks for using WAeUP Kofa!"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:228
+#: waeup/kofa/browser/pages.py:229
 msgid "Contact ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:234 waeup/kofa/browser/pages.py:519
+#: waeup/kofa/browser/pages.py:235 waeup/kofa/browser/pages.py:521
 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:316
+#: waeup/kofa/browser/pages.py:254 waeup/kofa/browser/pages.py:273
+#: waeup/kofa/browser/pages.py:538 waeup/kofa/students/browser.py:318
 msgid "Your message has been sent."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:263
+#: waeup/kofa/browser/pages.py:264
 msgid "Send now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:274
+#: waeup/kofa/browser/pages.py:275
 msgid "A smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:299
+#: waeup/kofa/browser/pages.py:300
 msgid "<h1>Welcome to WAeUP.Kofa</h1>"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:387 waeup/kofa/hostels/browser.py:195
+#: waeup/kofa/browser/pages.py:388 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
@@ -1295,14 +1303,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:388 waeup/kofa/browser/viewlets.py:180
+#: waeup/kofa/browser/pages.py:389 waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:395
+#: waeup/kofa/browser/pages.py:396
 msgid "User account ${a} successfully deleted."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:426 waeup/kofa/browser/pages.py:428
+#: waeup/kofa/browser/pages.py:428 waeup/kofa/browser/pages.py:430
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
@@ -1310,132 +1318,132 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:450
+#: waeup/kofa/browser/pages.py:452
 msgid "User account ${a} successfully added."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:469
+#: waeup/kofa/browser/pages.py:471
 msgid "Edit user ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:500
+#: waeup/kofa/browser/pages.py:502
 msgid "User settings have been saved."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:297
+#: waeup/kofa/browser/pages.py:519 waeup/kofa/students/browser.py:299
 msgid "Send message to ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:546 waeup/kofa/browser/viewlets.py:400
+#: waeup/kofa/browser/pages.py:548 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:561 waeup/kofa/browser/viewlets.py:415
 msgid "My Roles"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:590
+#: waeup/kofa/browser/pages.py:592
 msgid "Search Academic Section"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:617
+#: waeup/kofa/browser/pages.py:619
 msgid "View portal configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:630
+#: waeup/kofa/browser/pages.py:632
 msgid "Edit portal configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:631 waeup/kofa/browser/pages.py:680
+#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:682
 msgid "Update plugins"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:661
-#: waeup/kofa/browser/pages.py:692
+#: waeup/kofa/browser/pages.py:635 waeup/kofa/browser/pages.py:663
+#: waeup/kofa/browser/pages.py:694
 msgid "Add session configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:658 waeup/kofa/browser/pages.py:731
+#: waeup/kofa/browser/pages.py:660 waeup/kofa/browser/pages.py:733
 msgid "Settings have been saved."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:672
+#: waeup/kofa/browser/pages.py:674
 msgid "Session ${a} Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:683
+#: waeup/kofa/browser/pages.py:685
 msgid "Plugins were updated. See log file for details."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:696
+#: waeup/kofa/browser/pages.py:698
 msgid "Add Session Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:703
+#: waeup/kofa/browser/pages.py:705
 msgid "The session chosen already exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:725
+#: waeup/kofa/browser/pages.py:727
 msgid "Edit academic session ${a} configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:755
+#: waeup/kofa/browser/pages.py:757
 msgid "Upload file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:757
+#: waeup/kofa/browser/pages.py:759
 msgid "Upload"
 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:805 waeup/kofa/browser/pages.py:835
+#: waeup/kofa/browser/pages.py:955 waeup/kofa/browser/pages.py:1063
 msgid "Process CSV file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:817 waeup/kofa/browser/pages.py:918
-#: waeup/kofa/browser/pages.py:1037
+#: waeup/kofa/browser/pages.py:819 waeup/kofa/browser/pages.py:920
+#: waeup/kofa/browser/pages.py:1039
 msgid "Import aborted."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:83
+#: waeup/kofa/browser/pages.py:838
+msgid "Back to step 1"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:839
+msgid "Proceed to step 3"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:84
 msgid "No local role selected."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:836
-msgid "Back to step 1"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:837
-msgid "Proceed to step 3"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:897
+#: waeup/kofa/browser/pages.py:899
 msgid "Double headers: each column name may only appear once. "
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:905
+#: waeup/kofa/browser/pages.py:907
 msgid "Replace imported file!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:930
+#: waeup/kofa/browser/pages.py:932
 msgid "Update mode only!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:956 waeup/kofa/browser/pages.py:1182
+#: waeup/kofa/browser/pages.py:958 waeup/kofa/browser/pages.py:1184
 msgid "Reset"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:957
+#: waeup/kofa/browser/pages.py:959
 msgid "Set headerfields"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:958
+#: waeup/kofa/browser/pages.py:960
 msgid "Back to step 2"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:959
+#: waeup/kofa/browser/pages.py:961
 msgid "Perform import"
 msgstr ""
@@ -1821,5 +1829,6 @@
 
 #: 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/students/viewlets.py:218 waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/viewlets.py:403
 msgid "Edit"
 msgstr ""
@@ -1956,5 +1965,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:435
 msgid "Bed Type"
 msgstr ""
@@ -2112,41 +2121,41 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:172
+#: waeup/kofa/interfaces.py:185
 msgid "Subject"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:176
+#: waeup/kofa/interfaces.py:189
 msgid "Grade"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:304
+#: waeup/kofa/interfaces.py:319
 msgid "Importer name"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:308
+#: waeup/kofa/interfaces.py:323
 msgid "Import mode"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:333
+#: waeup/kofa/interfaces.py:348
 msgid "Email Address:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:340
+#: waeup/kofa/interfaces.py:355
 msgid "Email to:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:347
+#: waeup/kofa/interfaces.py:362
 msgid "Subject:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:351
+#: waeup/kofa/interfaces.py:366
 msgid "Full Name:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:355
+#: waeup/kofa/interfaces.py:370
 msgid "Text:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:386
+#: waeup/kofa/interfaces.py:401
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2158,5 +2167,5 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:391
+#: waeup/kofa/interfaces.py:406
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2165,97 +2174,97 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:395
+#: waeup/kofa/interfaces.py:410
 msgid "Description/Notice"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:412
+#: waeup/kofa/interfaces.py:427
 msgid "Portal roles"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:455
+#: waeup/kofa/interfaces.py:470
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:456
+#: waeup/kofa/interfaces.py:471
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:461
+#: waeup/kofa/interfaces.py:476
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:467
+#: waeup/kofa/interfaces.py:482
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:474
+#: waeup/kofa/interfaces.py:489
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:486
+#: waeup/kofa/interfaces.py:501
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:494
+#: waeup/kofa/interfaces.py:509
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:502
+#: waeup/kofa/interfaces.py:517
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:508
+#: waeup/kofa/interfaces.py:523
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:515
+#: waeup/kofa/interfaces.py:530
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:516
+#: waeup/kofa/interfaces.py:531
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:521
+#: waeup/kofa/interfaces.py:536
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:528
+#: waeup/kofa/interfaces.py:543
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:535
+#: waeup/kofa/interfaces.py:550
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:544 waeup/kofa/interfaces.py:596
+#: waeup/kofa/interfaces.py:559 waeup/kofa/interfaces.py:611
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:552 waeup/kofa/payments/interfaces.py:30
+#: waeup/kofa/interfaces.py:567 waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:557 waeup/kofa/payments/interfaces.py:106
-msgid "Surcharge 1"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:562 waeup/kofa/payments/interfaces.py:113
+#: waeup/kofa/interfaces.py:572 waeup/kofa/payments/interfaces.py:106
+msgid "Portal Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:577 waeup/kofa/payments/interfaces.py:113
 msgid "Surcharge 2"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:567 waeup/kofa/payments/interfaces.py:120
+#: waeup/kofa/interfaces.py:582 waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:572
+#: waeup/kofa/interfaces.py:587
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:577
+#: waeup/kofa/interfaces.py:592
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:582 waeup/kofa/payments/interfaces.py:36
+#: waeup/kofa/interfaces.py:597 waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
 msgstr ""
@@ -2380,337 +2389,341 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1068
+#: waeup/kofa/students/browser.py:1002 waeup/kofa/students/browser.py:1224
+msgid "Your current session does not match accommodation session."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1071
 msgid "This ticket has already been paid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1081 waeup/kofa/students/browser.py:1089
-#: waeup/kofa/students/browser.py:1097
+#: waeup/kofa/students/browser.py:1084 waeup/kofa/students/browser.py:1092
+#: waeup/kofa/students/browser.py:1100
 msgid "Valid callback received. ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1151
+#: waeup/kofa/students/browser.py:1154
 msgid "${a}: Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1163
+#: waeup/kofa/students/browser.py:1166
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:117 waeup/kofa/students/viewlets.py:114
+#: waeup/kofa/students/browser.py:1173
+msgid "No bed ticket selected."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:119 waeup/kofa/students/viewlets.py:114
 #: waeup/kofa/students/viewlets.py:534
 msgid "Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1170
-msgid "No bed ticket selected."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1201
+#: waeup/kofa/students/browser.py:1204
 msgid "Add bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1203
+#: waeup/kofa/students/browser.py:1206
 msgid "Create bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1211
+#: waeup/kofa/students/browser.py:1214
 msgid "Your data are incomplete."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1215
+#: waeup/kofa/students/browser.py:1218
 msgid "You are in the wrong registration state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1226
+#: waeup/kofa/students/browser.py:1229
 msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:123 waeup/kofa/students/viewlets.py:120
+#: waeup/kofa/students/browser.py:1240 waeup/kofa/students/browser.py:1537
+#: waeup/kofa/students/browser.py:1650
+msgid "Activation code is invalid."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:125 waeup/kofa/students/viewlets.py:120
 #: waeup/kofa/students/viewlets.py:535
 msgid "Payments"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1237 waeup/kofa/students/browser.py:1533
-#: waeup/kofa/students/browser.py:1646
-msgid "Activation code is invalid."
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1257 waeup/kofa/students/browser.py:1385
+#. Default: ""
+#: waeup/kofa/students/browser.py:1260 waeup/kofa/students/browser.py:1388
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1262 waeup/kofa/students/browser.py:1538
-#: waeup/kofa/students/browser.py:1651
+#: waeup/kofa/students/browser.py:1265 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:1265 waeup/kofa/students/browser.py:1541
-#: waeup/kofa/students/browser.py:1654 waeup/kofa/students/browser.py:1913
+#: waeup/kofa/students/browser.py:1268 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:1270 waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1659
+#: waeup/kofa/students/browser.py:1273 waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1663
 msgid "You are not the owner of this access code."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1281 waeup/kofa/students/browser.py:1399
+#: waeup/kofa/students/browser.py:1284 waeup/kofa/students/browser.py:1402
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1290
+#: waeup/kofa/students/browser.py:1293
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1308
+#: waeup/kofa/students/browser.py:1311
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1324
+#: waeup/kofa/students/browser.py:1327
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1330
+#: waeup/kofa/students/browser.py:1333
 msgid "Bed Allocation: "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1357
+#: waeup/kofa/students/browser.py:1360
 msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1363
+#: waeup/kofa/students/browser.py:1366
 msgid "Student can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:138 waeup/kofa/students/viewlets.py:126
+#: waeup/kofa/students/browser.py:140 waeup/kofa/students/viewlets.py:126
 msgid "Accommodation"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1406
+#: waeup/kofa/students/browser.py:1409
 msgid "Student relocated: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1425
+#: waeup/kofa/students/browser.py:1428
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1437 waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/browser.py:1441
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1452 waeup/kofa/students/viewlets.py:365
+#: waeup/kofa/students/browser.py:1456 waeup/kofa/students/viewlets.py:365
 msgid "Change password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1466
+#: waeup/kofa/students/browser.py:1470
 msgid "Password changed."
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/browser.py:147
+#: waeup/kofa/students/browser.py:1482
+msgid "Upload portrait"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/browser.py:149
 msgid "Bed Ticket ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1478
-msgid "Upload portrait"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1493 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"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1497
+#: waeup/kofa/students/browser.py:1501
 msgid "Start clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1514 waeup/kofa/students/browser.py:1635
+#: waeup/kofa/students/browser.py:1518 waeup/kofa/students/browser.py:1639
 msgid "Wrong state"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1518
+#: waeup/kofa/students/browser.py:1522
 msgid "No portrait uploaded."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1522
+#: waeup/kofa/students/browser.py:1526
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1553
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1561
+#: waeup/kofa/students/browser.py:1565
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1573 waeup/kofa/students/browser.py:1587
+#: waeup/kofa/students/browser.py:1577 waeup/kofa/students/browser.py:1591
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1581
+#: waeup/kofa/students/browser.py:1585
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1596 waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1600 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1597
+#: waeup/kofa/students/browser.py:1601
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1600
+#: waeup/kofa/students/browser.py:1604
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1609
+#: waeup/kofa/students/browser.py:1613
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1618
+#: waeup/kofa/students/browser.py:1622
 msgid "Clearance has been requested."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1627 waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:1631 waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1631
+#: waeup/kofa/students/browser.py:1635
 msgid "Start course registration now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:166
+#: waeup/kofa/students/browser.py:1671
+msgid "Course registration has been started."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:168
 msgid "Student Section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1667
-msgid "Course registration has been started."
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1686
+#. Default: ""
+#: waeup/kofa/students/browser.py:1690
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1695
+#: waeup/kofa/students/browser.py:1699
 msgid "Create course list now"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1734
+#: waeup/kofa/students/browser.py:1738
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1771
+#: waeup/kofa/students/browser.py:1775
 msgid "Register course list"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1775
+#: waeup/kofa/students/browser.py:1779
 msgid "Course list has been registered."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:182 waeup/kofa/students/browser.py:218
+#: waeup/kofa/students/browser.py:1825
+msgid "Change my password"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1835
+msgid "Get new login credentials"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:184 waeup/kofa/students/browser.py:220
 msgid "Empty search string"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1821
-msgid "Change my password"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1831
-msgid "Get new login credentials"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1845
+#: waeup/kofa/students/browser.py:1849
 msgid "No student record found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1853
+#: waeup/kofa/students/browser.py:1857
 msgid "You have successfully changed your password for the"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1858
+#: waeup/kofa/students/browser.py:1862
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1869
+#: waeup/kofa/students/browser.py:1873
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1872
+#: waeup/kofa/students/browser.py:1876
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1887
+#: waeup/kofa/students/browser.py:1891
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1895
+#: waeup/kofa/students/browser.py:1899
 msgid "Access code is invalid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1898
+#: waeup/kofa/students/browser.py:1902
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1904
+#: waeup/kofa/students/browser.py:1908
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1910
+#: waeup/kofa/students/browser.py:1914
 msgid "Access code has already been used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1919
+#: waeup/kofa/students/browser.py:1923
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:200 waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:202 waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:224 waeup/kofa/students/browser.py:1884
+#: waeup/kofa/students/browser.py:226 waeup/kofa/students/browser.py:1888
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:251 waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:253 waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:259
+#: waeup/kofa/students/browser.py:261
 msgid "Student record created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:275
+#: waeup/kofa/students/browser.py:277
 msgid "${a}: Base Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:318 waeup/kofa/students/browser.py:1861
+#: waeup/kofa/students/browser.py:320 waeup/kofa/students/browser.py:1865
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:329
+#: waeup/kofa/students/browser.py:332
 msgid "Manage base data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:398
+#: waeup/kofa/students/browser.py:401
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:414 waeup/kofa/students/viewlets.py:104
+#: waeup/kofa/students/browser.py:417 waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
@@ -2718,84 +2731,84 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:420
+#: waeup/kofa/students/browser.py:423
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:440
+#: waeup/kofa/students/browser.py:443
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:469
+#: waeup/kofa/students/browser.py:472
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:471 waeup/kofa/students/browser.py:495
+#: waeup/kofa/students/browser.py:474 waeup/kofa/students/browser.py:498
 msgid "Student is in wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:488
+#: waeup/kofa/students/browser.py:491
 msgid "Clearance has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:492
+#: waeup/kofa/students/browser.py:495
 msgid "Clearance request has been rejected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:518
+#: waeup/kofa/students/browser.py:521
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:528
+#: waeup/kofa/students/browser.py:531
 msgid "Manage personal data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:548
+#: waeup/kofa/students/browser.py:551
 msgid "${a}: Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:578
+#: waeup/kofa/students/browser.py:581
 msgid "Manage study course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:581 waeup/kofa/students/browser.py:622
+#: waeup/kofa/students/browser.py:584 waeup/kofa/students/browser.py:625
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:582 waeup/kofa/students/browser.py:608
+#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:611
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:616
+#: waeup/kofa/students/browser.py:619
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:618 waeup/kofa/students/browser.py:1704
+#: waeup/kofa/students/browser.py:621 waeup/kofa/students/browser.py:1708
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:628
+#: waeup/kofa/students/browser.py:631
 msgid "No study level selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:664
+#: waeup/kofa/students/browser.py:667
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:687
+#: waeup/kofa/students/browser.py:690
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:693
+#: waeup/kofa/students/browser.py:696
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:702
+#: waeup/kofa/students/browser.py:705
 msgid "Course Registration Slip  "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:708
+#: waeup/kofa/students/browser.py:711
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -2804,5 +2817,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:711
+#: waeup/kofa/students/browser.py:714
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -2810,10 +2823,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:712
+#: waeup/kofa/students/browser.py:715
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:713
+#: waeup/kofa/students/browser.py:716
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -2821,5 +2834,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:714
+#: waeup/kofa/students/browser.py:717
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -2827,5 +2840,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:715 waeup/kofa/students/interfaces.py:370
+#: waeup/kofa/students/browser.py:718 waeup/kofa/students/interfaces.py:378
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2834,73 +2847,69 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:743 waeup/kofa/students/browser.py:772
-#: waeup/kofa/students/browser.py:857 waeup/kofa/students/browser.py:862
-#: waeup/kofa/students/browser.py:1744 waeup/kofa/students/browser.py:1794
+#: waeup/kofa/students/browser.py:746 waeup/kofa/students/browser.py:775
+#: waeup/kofa/students/browser.py:860 waeup/kofa/students/browser.py:865
+#: waeup/kofa/students/browser.py:1748 waeup/kofa/students/browser.py:1798
 msgid "Add course ticket"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:764
+#: waeup/kofa/students/browser.py:767
 msgid "Manage study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:782 waeup/kofa/students/browser.py:1754
+#: waeup/kofa/students/browser.py:785 waeup/kofa/students/browser.py:1758
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:806 waeup/kofa/students/browser.py:828
+#: waeup/kofa/students/browser.py:809 waeup/kofa/students/browser.py:831
 msgid "This level does not correspond current level."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:810
+#: waeup/kofa/students/browser.py:813
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:812 waeup/kofa/students/browser.py:840
+#: waeup/kofa/students/browser.py:815 waeup/kofa/students/browser.py:843
 msgid "Student is in the wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:833
+#: waeup/kofa/students/browser.py:836
 msgid "Course list request has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:840
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:877 waeup/kofa/students/browser.py:1807
+#: waeup/kofa/students/browser.py:880 waeup/kofa/students/browser.py:1811
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:879 waeup/kofa/students/browser.py:1809
+#: waeup/kofa/students/browser.py:882 waeup/kofa/students/browser.py:1813
 msgid "Successfully added ${a}."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:900
+#: waeup/kofa/students/browser.py:903
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:916
+#: waeup/kofa/students/browser.py:919
 msgid "Manage course ticket ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:943
+#: waeup/kofa/students/browser.py:946
 msgid "${a}: Payments"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:988
+#: waeup/kofa/students/browser.py:991
 msgid "Add online payment"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:991
+#: waeup/kofa/students/browser.py:994
 msgid "Create ticket"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:999 waeup/kofa/students/browser.py:1221
-msgid "Your current session does not match accommodation session."
 msgstr ""
 
@@ -3001,6 +3010,6 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:21
-#: waeup/kofa/students/browser_templates/fileupload.pt:27
+#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/students/browser_templates/fileupload.pt:26
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
 msgid "Max. file size:"
@@ -3130,69 +3139,69 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:176 waeup/kofa/students/interfaces.py:255
-#: waeup/kofa/students/interfaces.py:483
+#: waeup/kofa/students/interfaces.py:184 waeup/kofa/students/interfaces.py:263
+#: waeup/kofa/students/interfaces.py:491
 msgid "Registration Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:183 waeup/kofa/students/interfaces.py:265
+#: waeup/kofa/students/interfaces.py:191 waeup/kofa/students/interfaces.py:273
 msgid "Matriculation Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:191
+#: waeup/kofa/students/interfaces.py:199
 msgid "PWD Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:198
+#: waeup/kofa/students/interfaces.py:206
 msgid "Email"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:218
+#: waeup/kofa/students/interfaces.py:226
 msgid "Clearance form locked"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:223
+#: waeup/kofa/students/interfaces.py:231
 msgid "CLR Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:231
+#: waeup/kofa/students/interfaces.py:239
 msgid "Nationality"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:241
+#: waeup/kofa/students/interfaces.py:249
 msgid "Permanent Address"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:275
+#: waeup/kofa/students/interfaces.py:283
 #: waeup/kofa/browser/templates/showstudentspage.pt:7
 msgid "Certificate"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:282
+#: waeup/kofa/students/interfaces.py:290
 msgid "Entry Mode"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:290
+#: waeup/kofa/students/interfaces.py:298
 msgid "Entry Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:299
+#: waeup/kofa/students/interfaces.py:307
 #: waeup/kofa/browser/templates/showstudentspage.pt:8
 msgid "Current Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:307
+#: waeup/kofa/students/interfaces.py:315
 #: waeup/kofa/browser/templates/showstudentspage.pt:9
 msgid "Current Level"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:315
+#: waeup/kofa/students/interfaces.py:323
 msgid "Current Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:322
+#: waeup/kofa/students/interfaces.py:330
 msgid "Previous Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:337 waeup/kofa/students/interfaces.py:434
+#: waeup/kofa/students/interfaces.py:345 waeup/kofa/students/interfaces.py:442
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3200,9 +3209,9 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:344
+#: waeup/kofa/students/interfaces.py:352
 msgid "Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:363
+#: waeup/kofa/students/interfaces.py:371
 #: waeup/kofa/browser/templates/certificatepage.pt:30
 #: waeup/kofa/browser/templates/certificatemanagepage.pt:33
@@ -3210,13 +3219,13 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:377
+#: waeup/kofa/students/interfaces.py:385
 msgid "Automatical Creation"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:384
+#: waeup/kofa/students/interfaces.py:392
 msgid "Carry-over Course"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:403
+#: waeup/kofa/students/interfaces.py:411
 #: waeup/kofa/university/interfaces.py:299
 #: waeup/kofa/browser/templates/certificatepage.pt:29
@@ -3225,15 +3234,15 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:420
+#: waeup/kofa/students/interfaces.py:428
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:10
 msgid "Bed Coordinates"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:442
+#: waeup/kofa/students/interfaces.py:450
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:9
 msgid "Booking Date"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:448
+#: waeup/kofa/students/interfaces.py:456
 msgid "Booking Activation Code"
 msgstr ""
@@ -3244,5 +3253,5 @@
 msgstr ""
 
-#: waeup/kofa/students/utils.py:280 waeup/kofa/students/viewlets.py:71
+#: waeup/kofa/students/utils.py:298 waeup/kofa/students/viewlets.py:71
 #: waeup/kofa/students/viewlets.py:99
 #: waeup/kofa/students/browser_templates/basemanagepage.pt:6
@@ -3250,5 +3259,5 @@
 msgstr ""
 
-#: waeup/kofa/students/utils.py:311
+#: waeup/kofa/students/utils.py:329
 msgid "Scanned Documents"
 msgstr ""
@@ -3400,9 +3409,9 @@
 
 #: waeup/kofa/students/vocabularies.py:135
-msgid "Male"
+msgid "male"
 msgstr ""
 
 #: waeup/kofa/students/vocabularies.py:137
-msgid "Female"
+msgid "female"
 msgstr ""
 
@@ -3661,5 +3670,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:228
+#: waeup/kofa/utils/utils.py:142
 msgid ""
 "Fullname: ${a}\n"
@@ -3671,5 +3680,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:273
+#: waeup/kofa/utils/utils.py:187
 msgid ""
 "Dear ${a},\n"
@@ -3691,4 +3700,28 @@
 msgstr ""
 
+#: waeup/kofa/utils/utils.py:44
+msgid "Germany"
+msgstr ""
+
+#: waeup/kofa/utils/utils.py:45
+msgid "Nigeria"
+msgstr ""
+
+#: waeup/kofa/utils/utils.py:46
+msgid "U.S."
+msgstr ""
+
+#: waeup/kofa/widgets/phonewidget.py:117
+msgid "Empty phone field(s)."
+msgstr ""
+
+#: waeup/kofa/widgets/phonewidget.py:121
+msgid "Int. prefix requires format '+NNN'"
+msgstr ""
+
+#: waeup/kofa/widgets/phonewidget.py:127
+msgid "Phone numbers may contain numbers only."
+msgstr ""
+
 #: waeup/kofa/widgets/sequencewidget.pt:18
 msgid "Don't forget to save the form after adding or deleting items."
Index: /main/waeup.kofa/trunk/src/waeup/kofa/locales/waeup.kofa.pot
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/locales/waeup.kofa.pot	(revision 7881)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/waeup.kofa.pot	(revision 7882)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sun Mar 11 16:45:08 2012\n"
+"POT-Creation-Date: Wed Mar 14 10:35:59 2012\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -32,36 +32,36 @@
 #: waeup/kofa/applicants/browser.py:256
 #: waeup/kofa/applicants/browser.py:339
-#: 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:505
+#: waeup/kofa/browser/pages.py:710
+#: waeup/kofa/browser/pages.py:737
+#: waeup/kofa/browser/pages.py:760
+#: waeup/kofa/browser/pages.py:807
+#: waeup/kofa/browser/pages.py:837
+#: waeup/kofa/browser/pages.py:957
+#: waeup/kofa/browser/pages.py:1185
+#: waeup/kofa/browser/pages.py:1279
+#: waeup/kofa/browser/pages.py:1300
+#: waeup/kofa/browser/pages.py:1327
+#: waeup/kofa/browser/pages.py:1355
+#: waeup/kofa/browser/pages.py:1356
+#: waeup/kofa/browser/pages.py:1402
+#: waeup/kofa/browser/pages.py:1443
+#: waeup/kofa/browser/pages.py:1522
 #: 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:1525
+#: waeup/kofa/browser/pages.py:1603
+#: waeup/kofa/browser/pages.py:1648
+#: waeup/kofa/browser/pages.py:1686
+#: waeup/kofa/browser/pages.py:1730
 #: 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:580
-#: waeup/kofa/students/browser.py:581
-#: waeup/kofa/students/browser.py:742
-#: waeup/kofa/students/browser.py:744
-#: waeup/kofa/students/browser.py:884
+#: waeup/kofa/browser/pages.py:1771
+#: waeup/kofa/browser/pages.py:1806
+#: waeup/kofa/browser/pages.py:1857
+#: waeup/kofa/browser/pages.py:1909
+#: waeup/kofa/students/browser.py:583
+#: waeup/kofa/students/browser.py:584
+#: waeup/kofa/students/browser.py:745
+#: waeup/kofa/students/browser.py:747
+#: waeup/kofa/students/browser.py:887
 msgid "Cancel"
 msgstr ""
@@ -102,9 +102,9 @@
 
 #: waeup/kofa/accesscodes/browser.py:153
-#: waeup/kofa/browser/pages.py:592
-#: waeup/kofa/browser/pages.py:1142
+#: waeup/kofa/browser/pages.py:594
+#: waeup/kofa/browser/pages.py:1144
 #: waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:167
-#: waeup/kofa/students/browser.py:201
+#: waeup/kofa/students/browser.py:169
+#: waeup/kofa/students/browser.py:203
 msgid "Search"
 msgstr ""
@@ -366,5 +366,5 @@
 #: waeup/kofa/applicants/browser.py:117
 #: waeup/kofa/applicants/browser.py:326
-#: waeup/kofa/applicants/browser.py:746
+#: waeup/kofa/applicants/browser.py:747
 msgid "Could not delete:"
 msgstr ""
@@ -372,12 +372,12 @@
 #: waeup/kofa/applicants/browser.py:120
 #: waeup/kofa/applicants/browser.py:329
-#: waeup/kofa/applicants/browser.py:749
-#: waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:239
-#: waeup/kofa/students/browser.py:638
-#: waeup/kofa/students/browser.py:792
-#: waeup/kofa/students/browser.py:970
-#: waeup/kofa/students/browser.py:1180
-#: waeup/kofa/students/browser.py:1766
+#: waeup/kofa/applicants/browser.py:750
+#: waeup/kofa/browser/pages.py:135
+#: waeup/kofa/students/browser.py:241
+#: waeup/kofa/students/browser.py:641
+#: waeup/kofa/students/browser.py:795
+#: waeup/kofa/students/browser.py:973
+#: waeup/kofa/students/browser.py:1183
+#: waeup/kofa/students/browser.py:1770
 #. Default: ""
 msgid "Successfully removed: ${a}"
@@ -401,34 +401,34 @@
 #: waeup/kofa/applicants/browser.py:255
 #: waeup/kofa/applicants/browser.py:302
-#: waeup/kofa/applicants/browser.py:655
-#: waeup/kofa/applicants/browser.py:689
-#: waeup/kofa/applicants/browser.py:792
-#: waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:839
-#: 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/applicants/browser.py:656
+#: waeup/kofa/applicants/browser.py:690
+#: waeup/kofa/applicants/browser.py:793
+#: waeup/kofa/applicants/browser.py:796
+#: waeup/kofa/applicants/browser.py:840
+#: waeup/kofa/browser/pages.py:478
+#: waeup/kofa/browser/pages.py:633
+#: waeup/kofa/browser/pages.py:656
+#: waeup/kofa/browser/pages.py:730
+#: waeup/kofa/browser/pages.py:1183
+#: waeup/kofa/browser/pages.py:1355
+#: waeup/kofa/browser/pages.py:1396
+#: waeup/kofa/browser/pages.py:1522
+#: waeup/kofa/browser/pages.py:1575
+#: waeup/kofa/browser/pages.py:1718
+#: waeup/kofa/browser/pages.py:1769
+#: waeup/kofa/browser/pages.py:1790
 #: waeup/kofa/hostels/browser.py:209
 #: waeup/kofa/hostels/browser.py:231
 #: waeup/kofa/hostels/browser.py:318
-#: waeup/kofa/students/browser.py:355
-#: waeup/kofa/students/browser.py:454
-#: waeup/kofa/students/browser.py:531
-#: waeup/kofa/students/browser.py:580
-#: waeup/kofa/students/browser.py:596
-#: waeup/kofa/students/browser.py:742
-#: waeup/kofa/students/browser.py:767
-#: waeup/kofa/students/browser.py:1440
-#: waeup/kofa/students/browser.py:1455
-#: waeup/kofa/students/browser.py:1570
+#: waeup/kofa/students/browser.py:358
+#: waeup/kofa/students/browser.py:457
+#: waeup/kofa/students/browser.py:534
+#: waeup/kofa/students/browser.py:583
+#: waeup/kofa/students/browser.py:599
+#: waeup/kofa/students/browser.py:745
+#: waeup/kofa/students/browser.py:770
+#: waeup/kofa/students/browser.py:1444
+#: waeup/kofa/students/browser.py:1459
+#: waeup/kofa/students/browser.py:1574
 msgid "Save"
 msgstr ""
@@ -436,5 +436,5 @@
 #: waeup/kofa/applicants/browser.py:256
 #: waeup/kofa/applicants/browser.py:334
-#: waeup/kofa/applicants/browser.py:362
+#: waeup/kofa/applicants/browser.py:363
 msgid "Add applicant"
 msgstr ""
@@ -446,12 +446,12 @@
 
 #: waeup/kofa/applicants/browser.py:306
-#: waeup/kofa/applicants/browser.py:718
-#: 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/applicants/browser.py:719
+#: waeup/kofa/browser/pages.py:1399
+#: waeup/kofa/browser/pages.py:1721
+#: waeup/kofa/browser/pages.py:1793
+#: waeup/kofa/browser/pages.py:1905
 #: waeup/kofa/hostels/browser.py:54
-#: waeup/kofa/students/browser.py:80
-#: waeup/kofa/students/browser.py:381
+#: waeup/kofa/students/browser.py:82
+#: waeup/kofa/students/browser.py:384
 msgid "Form has been saved."
 msgstr ""
@@ -461,73 +461,73 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:365
+#: waeup/kofa/applicants/browser.py:366
 msgid "Create application record"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:370
+#: waeup/kofa/applicants/browser.py:371
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:383
+#: waeup/kofa/applicants/browser.py:384
 msgid "Applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:398
-#: waeup/kofa/students/browser.py:281
+#: waeup/kofa/applicants/browser.py:399
+#: waeup/kofa/students/browser.py:283
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:399
-#: waeup/kofa/students/browser.py:282
+#: waeup/kofa/applicants/browser.py:400
+#: waeup/kofa/students/browser.py:284
 msgid "unset"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:404
+#: waeup/kofa/applicants/browser.py:405
 #. Default: ""
 msgid "${a} Application Record ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:455
+#: waeup/kofa/applicants/browser.py:456
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:462
-#: waeup/kofa/students/browser.py:1019
+#: waeup/kofa/applicants/browser.py:463
+#: waeup/kofa/students/browser.py:1022
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:475
-#: waeup/kofa/students/browser.py:1033
+#: waeup/kofa/applicants/browser.py:476
+#: waeup/kofa/students/browser.py:1036
 msgid "Payment ticket created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:502
-#: waeup/kofa/students/browser.py:1052
+#: waeup/kofa/applicants/browser.py:503
+#: waeup/kofa/students/browser.py:1055
 #. Default: ""
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:530
-#: waeup/kofa/students/browser.py:1101
+#: waeup/kofa/applicants/browser.py:531
+#: waeup/kofa/students/browser.py:1104
 msgid "Valid callback received."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:551
+#: waeup/kofa/applicants/browser.py:552
 msgid "Payment Data"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:557
+#: waeup/kofa/applicants/browser.py:558
 msgid "Online Payment Receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:563
+#: waeup/kofa/applicants/browser.py:564
 msgid "Ticket not yet paid."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:628
+#: waeup/kofa/applicants/browser.py:629
 msgid "Uploaded image is too big!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:633
+#: waeup/kofa/applicants/browser.py:634
 msgid "jpg file extension expected."
 msgstr ""
@@ -537,42 +537,42 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655
-#: waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:847
+#: waeup/kofa/applicants/browser.py:656
+#: waeup/kofa/applicants/browser.py:796
+#: waeup/kofa/applicants/browser.py:848
 msgid "Final Submit"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:656
-#: waeup/kofa/applicants/browser.py:759
-#: waeup/kofa/applicants/browser.py:793
-#: waeup/kofa/applicants/browser.py:828
-#: waeup/kofa/students/browser.py:976
+#: waeup/kofa/applicants/browser.py:657
+#: waeup/kofa/applicants/browser.py:760
+#: waeup/kofa/applicants/browser.py:794
+#: waeup/kofa/applicants/browser.py:829
+#: waeup/kofa/students/browser.py:979
 msgid "Add online payment ticket"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:656
-#: waeup/kofa/applicants/browser.py:764
-#: waeup/kofa/applicants/browser.py:793
-#: waeup/kofa/applicants/browser.py:796
-#: waeup/kofa/applicants/browser.py:833
-#: waeup/kofa/students/browser.py:744
-#: waeup/kofa/students/browser.py:776
-#: waeup/kofa/students/browser.py:952
-#: waeup/kofa/students/browser.py:1748
+#: waeup/kofa/applicants/browser.py:657
+#: waeup/kofa/applicants/browser.py:765
+#: waeup/kofa/applicants/browser.py:794
+#: waeup/kofa/applicants/browser.py:797
+#: waeup/kofa/applicants/browser.py:834
+#: waeup/kofa/students/browser.py:747
+#: waeup/kofa/students/browser.py:779
+#: waeup/kofa/students/browser.py:955
+#: waeup/kofa/students/browser.py:1752
 msgid "Remove selected tickets"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:675
+#: waeup/kofa/applicants/browser.py:676
 #. Default: ""
 msgid "${a} Application Form ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:686
-#: waeup/kofa/students/browser.py:352
+#: waeup/kofa/applicants/browser.py:687
+#: waeup/kofa/students/browser.py:355
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:733
-#: waeup/kofa/students/browser.py:958
+#: waeup/kofa/applicants/browser.py:734
+#: waeup/kofa/students/browser.py:961
 msgid "No payment selected."
 msgstr ""
@@ -587,14 +587,14 @@
 #: waeup/kofa/applicants/browser.py:256
 #: waeup/kofa/applicants/browser.py:309
-#: 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/browser/pages.py:636
+#: waeup/kofa/browser/pages.py:677
+#: waeup/kofa/browser/pages.py:1279
+#: waeup/kofa/browser/pages.py:1290
+#: waeup/kofa/browser/pages.py:1356
+#: waeup/kofa/browser/pages.py:1391
 #: waeup/kofa/hostels/browser.py:131
-#: waeup/kofa/students/browser.py:202
-#: waeup/kofa/students/browser.py:1147
-#: waeup/kofa/students/browser.py:1160
+#: waeup/kofa/students/browser.py:204
+#: waeup/kofa/students/browser.py:1150
+#: waeup/kofa/students/browser.py:1163
 msgid "Remove selected"
 msgstr ""
@@ -607,6 +607,6 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:806
-#: waeup/kofa/students/browser.py:88
+#: waeup/kofa/applicants/browser.py:807
+#: waeup/kofa/students/browser.py:90
 msgid "The requested form is locked (read-only)."
 msgstr ""
@@ -616,10 +616,10 @@
 #: waeup/kofa/applicants/browser.py:257
 #: waeup/kofa/applicants/browser.py:348
-#: 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/browser/pages.py:1357
+#: waeup/kofa/browser/pages.py:1416
+#: waeup/kofa/browser/pages.py:1526
+#: waeup/kofa/browser/pages.py:1612
+#: waeup/kofa/browser/pages.py:1772
+#: waeup/kofa/browser/pages.py:1829
 msgid "Remove selected local roles"
 msgstr ""
@@ -629,18 +629,18 @@
 #: waeup/kofa/applicants/browser.py:258
 #: waeup/kofa/applicants/browser.py:344
-#: 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/browser/pages.py:1358
+#: waeup/kofa/browser/pages.py:1412
+#: waeup/kofa/browser/pages.py:1527
+#: waeup/kofa/browser/pages.py:1608
+#: waeup/kofa/browser/pages.py:1773
+#: waeup/kofa/browser/pages.py:1825
 msgid "Add local role"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:820
+#: waeup/kofa/applicants/browser.py:821
 msgid "No passport picture uploaded."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:822
+#: waeup/kofa/applicants/browser.py:823
 msgid "Passport picture confirmation box not ticked."
 msgstr ""
@@ -650,39 +650,39 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:859
-#: waeup/kofa/students/browser.py:1615
+#: waeup/kofa/applicants/browser.py:860
+#: waeup/kofa/students/browser.py:1619
 msgid "This form cannot be submitted. Wrong state!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:864
+#: waeup/kofa/applicants/browser.py:865
 msgid "Form has been submitted."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:899
+#: waeup/kofa/applicants/browser.py:900
 #. Default: ""
 msgid "Register for ${a} Application"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:905
+#: waeup/kofa/applicants/browser.py:906
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:910
+#: waeup/kofa/applicants/browser.py:911
 msgid "Application has ended."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:919
+#: waeup/kofa/applicants/browser.py:920
 msgid "Get login credentials"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:934
+#: waeup/kofa/applicants/browser.py:935
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:941
+#: waeup/kofa/applicants/browser.py:942
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:950
+#: waeup/kofa/applicants/browser.py:951
 msgid "Your registration was successful."
 msgstr ""
@@ -746,6 +746,14 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:197
-#: waeup/kofa/students/browser.py:709
+#: waeup/kofa/applicants/container.py:52
+msgid "Basic"
+msgstr ""
+
+#: waeup/kofa/applicants/container.py:55
+msgid "handles basic applicants"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:198
+#: waeup/kofa/students/browser.py:712
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -771,6 +779,6 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:204
-#: waeup/kofa/students/browser.py:710
+#: waeup/kofa/applicants/interfaces.py:205
+#: waeup/kofa/students/browser.py:713
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -791,130 +799,130 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:211
-#: waeup/kofa/applicants/interfaces.py:324
+#: waeup/kofa/applicants/interfaces.py:212
+#: waeup/kofa/applicants/interfaces.py:325
 msgid "Application Target"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:219
+#: waeup/kofa/applicants/interfaces.py:220
 msgid "Entry Level"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:226
-#: waeup/kofa/applicants/interfaces.py:332
+#: waeup/kofa/applicants/interfaces.py:227
+#: waeup/kofa/applicants/interfaces.py:333
 msgid "Year of Entrance"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:234
-#: waeup/kofa/applicants/interfaces.py:340
+#: waeup/kofa/applicants/interfaces.py:235
+#: waeup/kofa/applicants/interfaces.py:341
 msgid "Applicants Container Type"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:250
+#: waeup/kofa/applicants/interfaces.py:251
 msgid "Category for the grouping of certificates"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:257
+#: waeup/kofa/applicants/interfaces.py:258
 msgid "Human readable description in reST format"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:273
+#: waeup/kofa/applicants/interfaces.py:274
 msgid "Application Start Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:279
+#: waeup/kofa/applicants/interfaces.py:280
 msgid "Application Closing Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:285
+#: waeup/kofa/applicants/interfaces.py:286
 msgid "Forbid additions after deadline (enddate)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:368
+#: waeup/kofa/applicants/interfaces.py:369
 msgid "Applicant Id"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:373
+#: waeup/kofa/applicants/interfaces.py:374
 msgid "JAMB Registration Number"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:385
-#: waeup/kofa/students/interfaces.py:154
+#: waeup/kofa/applicants/interfaces.py:386
+#: waeup/kofa/students/interfaces.py:162
 msgid "First Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:389
-#: waeup/kofa/students/interfaces.py:159
+#: waeup/kofa/applicants/interfaces.py:390
+#: waeup/kofa/students/interfaces.py:167
 msgid "Middle Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:393
-#: waeup/kofa/students/interfaces.py:164
+#: waeup/kofa/applicants/interfaces.py:394
+#: waeup/kofa/students/interfaces.py:172
 msgid "Last Name (Surname)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:397
-#: waeup/kofa/students/interfaces.py:213
+#: waeup/kofa/applicants/interfaces.py:398
+#: waeup/kofa/students/interfaces.py:221
 msgid "Date of Birth"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:402
+#: waeup/kofa/applicants/interfaces.py:403
 msgid "State/LGA"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:407
-#: waeup/kofa/students/interfaces.py:169
+#: waeup/kofa/applicants/interfaces.py:408
+#: waeup/kofa/students/interfaces.py:177
 msgid "Sex"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:413
-#: waeup/kofa/interfaces.py:373
-#: waeup/kofa/interfaces.py:399
-#: waeup/kofa/students/interfaces.py:490
+#: waeup/kofa/applicants/interfaces.py:414
+#: waeup/kofa/interfaces.py:388
+#: waeup/kofa/interfaces.py:414
+#: waeup/kofa/students/interfaces.py:498
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:418
-#: waeup/kofa/interfaces.py:378
-#: waeup/kofa/interfaces.py:406
-#: waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/applicants/interfaces.py:419
+#: waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:421
+#: waeup/kofa/students/interfaces.py:211
 msgid "Phone"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:423
-#: waeup/kofa/applicants/interfaces.py:509
+#: waeup/kofa/applicants/interfaces.py:424
+#: waeup/kofa/applicants/interfaces.py:510
 msgid "1st Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:428
-#: waeup/kofa/applicants/interfaces.py:514
+#: waeup/kofa/applicants/interfaces.py:429
+#: waeup/kofa/applicants/interfaces.py:515
 msgid "2nd Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:433
+#: waeup/kofa/applicants/interfaces.py:434
 msgid "School Grades"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:443
-#: waeup/kofa/applicants/interfaces.py:519
+#: waeup/kofa/applicants/interfaces.py:444
+#: waeup/kofa/applicants/interfaces.py:520
 msgid "Screening Score"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:447
-#: waeup/kofa/applicants/interfaces.py:524
+#: waeup/kofa/applicants/interfaces.py:448
+#: waeup/kofa/applicants/interfaces.py:525
 msgid "Screening Venue"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:451
-#: waeup/kofa/applicants/interfaces.py:529
+#: waeup/kofa/applicants/interfaces.py:452
+#: waeup/kofa/applicants/interfaces.py:530
 msgid "Admitted Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:457
-#: waeup/kofa/applicants/interfaces.py:536
+#: waeup/kofa/applicants/interfaces.py:458
+#: waeup/kofa/applicants/interfaces.py:537
 msgid "Notice"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:479
-#: waeup/kofa/students/interfaces.py:149
+#: waeup/kofa/applicants/interfaces.py:480
+#: waeup/kofa/students/interfaces.py:157
 #: waeup/kofa/browser/templates/showstudentspage.pt:4
 #: waeup/kofa/students/browser_templates/containerpage.pt:29
@@ -923,10 +931,10 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:484
+#: waeup/kofa/applicants/interfaces.py:485
 msgid "Form locked"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:563
-#: waeup/kofa/students/interfaces.py:469
+#: waeup/kofa/applicants/interfaces.py:564
+#: waeup/kofa/students/interfaces.py:477
 msgid "Payment Session"
 msgstr ""
@@ -944,15 +952,15 @@
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:185
+#: waeup/kofa/applicants/pdf.py:186
 #: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:26
 msgid "Admitted Course of Study:"
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:203
+#: waeup/kofa/applicants/pdf.py:204
 #. Default: ""
 msgid "<font size=10>Proceed to the login page of the portal and enter your new credentials: user name= ${a}, password = ${b}.</font>"
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:209
+#: waeup/kofa/applicants/pdf.py:210
 msgid "<font size=10>Change your password when you have  logged in.</font>"
 msgstr ""
@@ -984,5 +992,5 @@
 #: waeup/kofa/applicants/viewlets.py:151
 #: waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:254
+#: waeup/kofa/students/browser.py:256
 msgid "Create student record"
 msgstr ""
@@ -1117,5 +1125,5 @@
 
 #: waeup/kofa/browser/breadcrumbs.py:123
-#: waeup/kofa/browser/pages.py:309
+#: waeup/kofa/browser/pages.py:310
 msgid "Administration"
 msgstr ""
@@ -1128,5 +1136,5 @@
 
 #: waeup/kofa/browser/breadcrumbs.py:148
-#: waeup/kofa/browser/pages.py:386
+#: waeup/kofa/browser/pages.py:387
 #: waeup/kofa/browser/viewlets.py:375
 #: waeup/kofa/browser/viewlets.py:676
@@ -1135,6 +1143,6 @@
 
 #: waeup/kofa/browser/breadcrumbs.py:155
-#: waeup/kofa/browser/pages.py:748
-#: waeup/kofa/browser/pages.py:1140
+#: waeup/kofa/browser/pages.py:750
+#: waeup/kofa/browser/pages.py:1142
 #: waeup/kofa/browser/viewlets.py:393
 #: waeup/kofa/browser/viewlets.py:685
@@ -1146,142 +1154,166 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1016
+#: waeup/kofa/browser/pages.py:1018
 msgid "Edit headers or replace imported file!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:103
+#: waeup/kofa/browser/pages.py:104
 #. Default: ""
 msgid "Local role successfully removed: ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1063
+#: waeup/kofa/browser/pages.py:1065
 msgid "View processing log"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1064
+#: waeup/kofa/browser/pages.py:1066
 msgid "Back to data center"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1108
+#: waeup/kofa/browser/pages.py:1110
 #. Default: ""
 msgid "Processing of ${a} rows failed."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1110
+#: waeup/kofa/browser/pages.py:1112
 #. Default: ""
 msgid "Successfully processed ${a} rows."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1118
+#: waeup/kofa/browser/pages.py:1120
 msgid "Show logfiles"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1120
+#: waeup/kofa/browser/pages.py:1122
 msgid "Back to Data Center"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1121
+#: waeup/kofa/browser/pages.py:1123
 msgid "Show"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:113
+#: waeup/kofa/browser/pages.py:114
 #: waeup/kofa/hostels/browser.py:256
 #: waeup/kofa/hostels/browser.py:286
-#: waeup/kofa/students/browser.py:226
+#: waeup/kofa/students/browser.py:228
 msgid "No item selected."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1143
+#: waeup/kofa/browser/pages.py:1145
 msgid "Back"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1151
+#: waeup/kofa/browser/pages.py:1153
 msgid "Log files can only be searched on Unix-based operating systems."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1179
+#: waeup/kofa/browser/pages.py:1181
 msgid "Edit data center settings"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1199
+#: waeup/kofa/browser/pages.py:1201
 #. Default: ""
 msgid "File already existed (not copied): ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1202
+#: waeup/kofa/browser/pages.py:1204
 msgid "Given storage path cannot be used."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1203
+#: waeup/kofa/browser/pages.py:1205
 #. Default: ""
 msgid "Error: ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1206
+#: waeup/kofa/browser/pages.py:1208
 msgid "New storage path succefully set."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1265
+#: waeup/kofa/browser/pages.py:1267
 msgid "Academic Section"
 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:1279
+#: waeup/kofa/browser/pages.py:1295
+#: waeup/kofa/browser/pages.py:1312
+#: waeup/kofa/browser/pages.py:1316
 msgid "Add faculty"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1278
+#: waeup/kofa/browser/pages.py:1280
 msgid "Faculties"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1282
+#: waeup/kofa/browser/pages.py:1284
 #: waeup/kofa/browser/viewlets.py:441
 msgid "Manage academic section"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1321
+#: waeup/kofa/browser/pages.py:1323
 msgid "The faculty code chosen already exists."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1342
-#: waeup/kofa/browser/pages.py:1352
+#: waeup/kofa/browser/pages.py:1344
+#: waeup/kofa/browser/pages.py:1354
 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:1356
+#: waeup/kofa/browser/pages.py:1407
+#: waeup/kofa/browser/pages.py:1426
+#: waeup/kofa/browser/pages.py:1430
 msgid "Add department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1362
+#: waeup/kofa/browser/pages.py:1364
 #: waeup/kofa/browser/viewlets.py:457
 msgid "Manage faculty"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1435
+#: waeup/kofa/browser/pages.py:1437
 msgid "The code chosen already exists in this faculty."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1438
+#: waeup/kofa/browser/pages.py:1440
 #. Default: ""
 msgid "Department ${a} added."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1455
+#: waeup/kofa/browser/pages.py:1457
 msgid "Courses and Certificates"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1485
-#: waeup/kofa/browser/pages.py:1504
-#: waeup/kofa/students/browser.py:96
+#: waeup/kofa/browser/pages.py:1487
+#: waeup/kofa/browser/pages.py:1506
+#: waeup/kofa/students/browser.py:98
 #: waeup/kofa/students/viewlets.py:472
 msgid "Students"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:152
+#: waeup/kofa/browser/pages.py:1523
+#: waeup/kofa/browser/pages.py:1581
+msgid "Remove selected courses"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1523
+#: waeup/kofa/browser/pages.py:1593
+#: waeup/kofa/browser/pages.py:1622
+#: waeup/kofa/browser/pages.py:1626
+msgid "Add course"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1524
+#: waeup/kofa/browser/pages.py:1587
+msgid "Remove selected certificates"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1524
+#: waeup/kofa/browser/pages.py:1598
+#: waeup/kofa/browser/pages.py:1659
+#: waeup/kofa/browser/pages.py:1663
+msgid "Add certificate"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:153
 #: waeup/kofa/browser/viewlets.py:322
 #: waeup/kofa/browser/templates/staffsitelayout.pt:28
@@ -1290,137 +1322,113 @@
 msgstr ""
 
-#: 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
-msgid "Add course"
-msgstr ""
-
-#: 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
-msgid "Add certificate"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:1531
+#: waeup/kofa/browser/pages.py:1533
 #: waeup/kofa/browser/viewlets.py:464
 msgid "Manage department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:160
+#: waeup/kofa/browser/pages.py:161
 msgid "You logged in."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1636
+#: waeup/kofa/browser/pages.py:1638
 msgid "A course with same code already exists: "
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1642
+#: waeup/kofa/browser/pages.py:1644
 #. Default: ""
 msgid "Course ${a} successfully created."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1673
+#: waeup/kofa/browser/pages.py:1675
 msgid "A certificate with same code already exists: "
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1679
+#: waeup/kofa/browser/pages.py:1681
 #. Default: ""
 msgid "Certificate ${a} successfully created."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1711
+#: waeup/kofa/browser/pages.py:1713
 #: waeup/kofa/browser/viewlets.py:481
 msgid "Edit course"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1761
+#: waeup/kofa/browser/pages.py:1763
 msgid "Edit certificate"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1768
-#: waeup/kofa/browser/pages.py:1799
-#: waeup/kofa/browser/pages.py:1840
+#: waeup/kofa/browser/pages.py:1770
+#: waeup/kofa/browser/pages.py:1801
 #: waeup/kofa/browser/pages.py:1842
+#: waeup/kofa/browser/pages.py:1844
 msgid "Add course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1769
-#: waeup/kofa/browser/pages.py:1794
+#: waeup/kofa/browser/pages.py:1771
+#: waeup/kofa/browser/pages.py:1796
 msgid "Remove selected course referrers"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1775
+#: waeup/kofa/browser/pages.py:1777
 #: waeup/kofa/browser/viewlets.py:488
 msgid "Manage certificate"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:178
+#: waeup/kofa/browser/pages.py:179
 msgid "You entered wrong credentials."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1847
+#: waeup/kofa/browser/pages.py:1849
 msgid "The chosen course referrer is already part of this certificate."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1851
+#: waeup/kofa/browser/pages.py:1853
 #. Default: ""
 msgid "Course referrer ${a}_${b} added."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1888
+#: waeup/kofa/browser/pages.py:1890
 #: waeup/kofa/browser/viewlets.py:505
 msgid "Edit course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1891
+#: waeup/kofa/browser/pages.py:1893
 msgid "Save and return"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:192
+#: waeup/kofa/browser/pages.py:193
 msgid "You have been logged out. Thanks for using WAeUP Kofa!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:228
+#: waeup/kofa/browser/pages.py:229
 #. Default: ""
 msgid "Contact ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:234
-#: waeup/kofa/browser/pages.py:519
+#: waeup/kofa/browser/pages.py:235
+#: waeup/kofa/browser/pages.py:521
 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:316
+#: waeup/kofa/browser/pages.py:254
+#: waeup/kofa/browser/pages.py:273
+#: waeup/kofa/browser/pages.py:538
+#: waeup/kofa/students/browser.py:318
 msgid "Your message has been sent."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:263
+#: waeup/kofa/browser/pages.py:264
 msgid "Send now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:274
+#: waeup/kofa/browser/pages.py:275
 msgid "A smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:299
+#: waeup/kofa/browser/pages.py:300
 msgid "<h1>Welcome to WAeUP.Kofa</h1>"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:387
+#: waeup/kofa/browser/pages.py:388
 #: waeup/kofa/hostels/browser.py:195
 #: waeup/kofa/students/viewlets.py:163
@@ -1432,159 +1440,159 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:388
+#: waeup/kofa/browser/pages.py:389
 #: waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:395
+#: waeup/kofa/browser/pages.py:396
 #. Default: ""
 msgid "User account ${a} successfully deleted."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:426
 #: waeup/kofa/browser/pages.py:428
+#: waeup/kofa/browser/pages.py:430
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:450
+#: waeup/kofa/browser/pages.py:452
 #. Default: ""
 msgid "User account ${a} successfully added."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:469
+#: waeup/kofa/browser/pages.py:471
 #. Default: ""
 msgid "Edit user ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:500
+#: waeup/kofa/browser/pages.py:502
 msgid "User settings have been saved."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:517
-#: waeup/kofa/students/browser.py:297
+#: waeup/kofa/browser/pages.py:519
+#: waeup/kofa/students/browser.py:299
 #. Default: ""
 msgid "Send message to ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:546
+#: waeup/kofa/browser/pages.py:548
 #: waeup/kofa/browser/viewlets.py:400
 msgid "My Preferences"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:559
+#: waeup/kofa/browser/pages.py:561
 #: waeup/kofa/browser/viewlets.py:415
 msgid "My Roles"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:590
+#: waeup/kofa/browser/pages.py:592
 msgid "Search Academic Section"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:617
+#: waeup/kofa/browser/pages.py:619
 msgid "View portal configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:630
+#: waeup/kofa/browser/pages.py:632
 msgid "Edit portal configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:631
-#: waeup/kofa/browser/pages.py:680
+#: waeup/kofa/browser/pages.py:633
+#: waeup/kofa/browser/pages.py:682
 msgid "Update plugins"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:633
-#: waeup/kofa/browser/pages.py:661
-#: waeup/kofa/browser/pages.py:692
+#: waeup/kofa/browser/pages.py:635
+#: waeup/kofa/browser/pages.py:663
+#: waeup/kofa/browser/pages.py:694
 msgid "Add session configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:658
-#: waeup/kofa/browser/pages.py:731
+#: waeup/kofa/browser/pages.py:660
+#: waeup/kofa/browser/pages.py:733
 msgid "Settings have been saved."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:672
+#: waeup/kofa/browser/pages.py:674
 #. Default: ""
 msgid "Session ${a} Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:683
+#: waeup/kofa/browser/pages.py:685
 msgid "Plugins were updated. See log file for details."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:696
+#: waeup/kofa/browser/pages.py:698
 msgid "Add Session Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:703
+#: waeup/kofa/browser/pages.py:705
 msgid "The session chosen already exists."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:725
+#: waeup/kofa/browser/pages.py:727
 #. Default: ""
 msgid "Edit academic session ${a} configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:755
+#: waeup/kofa/browser/pages.py:757
 msgid "Upload file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:757
+#: waeup/kofa/browser/pages.py:759
 msgid "Upload"
 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:805
+#: waeup/kofa/browser/pages.py:835
+#: waeup/kofa/browser/pages.py:955
+#: waeup/kofa/browser/pages.py:1063
 msgid "Process CSV file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:817
-#: waeup/kofa/browser/pages.py:918
-#: waeup/kofa/browser/pages.py:1037
+#: waeup/kofa/browser/pages.py:819
+#: waeup/kofa/browser/pages.py:920
+#: waeup/kofa/browser/pages.py:1039
 msgid "Import aborted."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:83
+#: waeup/kofa/browser/pages.py:838
+msgid "Back to step 1"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:839
+msgid "Proceed to step 3"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:84
 msgid "No local role selected."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:836
-msgid "Back to step 1"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:837
-msgid "Proceed to step 3"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:897
+#: waeup/kofa/browser/pages.py:899
 msgid "Double headers: each column name may only appear once. "
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:905
+#: waeup/kofa/browser/pages.py:907
 msgid "Replace imported file!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:930
+#: waeup/kofa/browser/pages.py:932
 msgid "Update mode only!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:956
-#: waeup/kofa/browser/pages.py:1182
+#: waeup/kofa/browser/pages.py:958
+#: waeup/kofa/browser/pages.py:1184
 msgid "Reset"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:957
+#: waeup/kofa/browser/pages.py:959
 msgid "Set headerfields"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:958
+#: waeup/kofa/browser/pages.py:960
 msgid "Back to step 2"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:959
+#: waeup/kofa/browser/pages.py:961
 msgid "Perform import"
 msgstr ""
@@ -1969,4 +1977,5 @@
 #: waeup/kofa/browser/viewlets.py:160
 #: waeup/kofa/students/viewlets.py:218
+#: waeup/kofa/students/viewlets.py:356
 #: waeup/kofa/students/viewlets.py:403
 msgid "Edit"
@@ -2110,5 +2119,5 @@
 
 #: waeup/kofa/hostels/interfaces.py:175
-#: waeup/kofa/students/interfaces.py:427
+#: waeup/kofa/students/interfaces.py:435
 msgid "Bed Type"
 msgstr ""
@@ -2267,41 +2276,41 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:172
+#: waeup/kofa/interfaces.py:185
 msgid "Subject"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:176
+#: waeup/kofa/interfaces.py:189
 msgid "Grade"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:304
+#: waeup/kofa/interfaces.py:319
 msgid "Importer name"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:308
+#: waeup/kofa/interfaces.py:323
 msgid "Import mode"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:333
+#: waeup/kofa/interfaces.py:348
 msgid "Email Address:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:340
+#: waeup/kofa/interfaces.py:355
 msgid "Email to:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:347
+#: waeup/kofa/interfaces.py:362
 msgid "Subject:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:351
+#: waeup/kofa/interfaces.py:366
 msgid "Full Name:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:355
+#: waeup/kofa/interfaces.py:370
 msgid "Text:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:386
+#: waeup/kofa/interfaces.py:401
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2313,5 +2322,5 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:391
+#: waeup/kofa/interfaces.py:406
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2320,102 +2329,102 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:395
+#: waeup/kofa/interfaces.py:410
 msgid "Description/Notice"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:412
+#: waeup/kofa/interfaces.py:427
 msgid "Portal roles"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:455
+#: waeup/kofa/interfaces.py:470
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:456
+#: waeup/kofa/interfaces.py:471
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:461
+#: waeup/kofa/interfaces.py:476
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:467
+#: waeup/kofa/interfaces.py:482
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:474
+#: waeup/kofa/interfaces.py:489
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:486
+#: waeup/kofa/interfaces.py:501
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:494
+#: waeup/kofa/interfaces.py:509
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:502
+#: waeup/kofa/interfaces.py:517
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:508
+#: waeup/kofa/interfaces.py:523
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:515
+#: waeup/kofa/interfaces.py:530
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:516
+#: waeup/kofa/interfaces.py:531
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:521
+#: waeup/kofa/interfaces.py:536
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:528
+#: waeup/kofa/interfaces.py:543
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:535
+#: waeup/kofa/interfaces.py:550
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:544
-#: waeup/kofa/interfaces.py:596
+#: waeup/kofa/interfaces.py:559
+#: waeup/kofa/interfaces.py:611
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:552
+#: waeup/kofa/interfaces.py:567
 #: waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:557
+#: waeup/kofa/interfaces.py:572
 #: waeup/kofa/payments/interfaces.py:106
-msgid "Surcharge 1"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:562
+msgid "Portal Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:577
 #: waeup/kofa/payments/interfaces.py:113
 msgid "Surcharge 2"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:567
+#: waeup/kofa/interfaces.py:582
 #: waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:572
+#: waeup/kofa/interfaces.py:587
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:577
+#: waeup/kofa/interfaces.py:592
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:582
+#: waeup/kofa/interfaces.py:597
 #: waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
@@ -2541,25 +2550,34 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1068
+#: waeup/kofa/students/browser.py:1002
+#: waeup/kofa/students/browser.py:1224
+msgid "Your current session does not match accommodation session."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1071
 msgid "This ticket has already been paid."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1081
-#: waeup/kofa/students/browser.py:1089
-#: waeup/kofa/students/browser.py:1097
+#: waeup/kofa/students/browser.py:1084
+#: waeup/kofa/students/browser.py:1092
+#: waeup/kofa/students/browser.py:1100
 #. Default: ""
 msgid "Valid callback received. ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1151
+#: waeup/kofa/students/browser.py:1154
 #. Default: ""
 msgid "${a}: Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1163
+#: waeup/kofa/students/browser.py:1166
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:117
+#: waeup/kofa/students/browser.py:1173
+msgid "No bed ticket selected."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:119
 #: waeup/kofa/students/viewlets.py:114
 #: waeup/kofa/students/viewlets.py:534
@@ -2567,29 +2585,31 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1170
-msgid "No bed ticket selected."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1201
+#: waeup/kofa/students/browser.py:1204
 msgid "Add bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1203
+#: waeup/kofa/students/browser.py:1206
 msgid "Create bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1211
+#: waeup/kofa/students/browser.py:1214
 msgid "Your data are incomplete."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1215
+#: waeup/kofa/students/browser.py:1218
 msgid "You are in the wrong registration state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1226
+#: waeup/kofa/students/browser.py:1229
 msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:123
+#: waeup/kofa/students/browser.py:1240
+#: waeup/kofa/students/browser.py:1537
+#: waeup/kofa/students/browser.py:1650
+msgid "Activation code is invalid."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:125
 #: waeup/kofa/students/viewlets.py:120
 #: waeup/kofa/students/viewlets.py:535
@@ -2597,106 +2617,99 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1237
-#: waeup/kofa/students/browser.py:1533
-#: waeup/kofa/students/browser.py:1646
-msgid "Activation code is invalid."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1257
-#: waeup/kofa/students/browser.py:1385
+#: waeup/kofa/students/browser.py:1260
+#: waeup/kofa/students/browser.py:1388
 #. Default: ""
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1262
-#: waeup/kofa/students/browser.py:1538
-#: waeup/kofa/students/browser.py:1651
+#: waeup/kofa/students/browser.py:1265
+#: 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:1265
-#: waeup/kofa/students/browser.py:1541
-#: waeup/kofa/students/browser.py:1654
-#: waeup/kofa/students/browser.py:1913
+#: waeup/kofa/students/browser.py:1268
+#: 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:1270
-#: waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1659
+#: waeup/kofa/students/browser.py:1273
+#: waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1663
 msgid "You are not the owner of this access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1281
-#: waeup/kofa/students/browser.py:1399
+#: waeup/kofa/students/browser.py:1284
+#: waeup/kofa/students/browser.py:1402
 #. Default: ""
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1290
+#: waeup/kofa/students/browser.py:1293
 #. Default: ""
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1308
+#: waeup/kofa/students/browser.py:1311
 #. Default: ""
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1324
+#: waeup/kofa/students/browser.py:1327
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1330
+#: waeup/kofa/students/browser.py:1333
 msgid "Bed Allocation: "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1357
+#: waeup/kofa/students/browser.py:1360
 msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1363
+#: waeup/kofa/students/browser.py:1366
 msgid "Student can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:138
+#: waeup/kofa/students/browser.py:140
 #: waeup/kofa/students/viewlets.py:126
 msgid "Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1406
+#: waeup/kofa/students/browser.py:1409
 #. Default: ""
 msgid "Student relocated: ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1425
+#: waeup/kofa/students/browser.py:1428
 #. Default: ""
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1437
-#: waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/browser.py:1441
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1452
+#: waeup/kofa/students/browser.py:1456
 #: waeup/kofa/students/viewlets.py:365
 msgid "Change password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1466
+#: waeup/kofa/students/browser.py:1470
 msgid "Password changed."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:147
+#: waeup/kofa/students/browser.py:1482
+msgid "Upload portrait"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:149
 #. Default: ""
 msgid "Bed Ticket ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1478
-msgid "Upload portrait"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1493
+#: waeup/kofa/students/browser.py:1497
 #: waeup/kofa/students/viewlets.py:389
 #: waeup/kofa/students/workflow.py:44
@@ -2704,197 +2717,197 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1497
+#: waeup/kofa/students/browser.py:1501
 msgid "Start clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1514
-#: waeup/kofa/students/browser.py:1635
+#: waeup/kofa/students/browser.py:1518
+#: waeup/kofa/students/browser.py:1639
 msgid "Wrong state"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1518
+#: waeup/kofa/students/browser.py:1522
 msgid "No portrait uploaded."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1522
+#: waeup/kofa/students/browser.py:1526
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1553
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1561
+#: waeup/kofa/students/browser.py:1565
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1573
-#: waeup/kofa/students/browser.py:1587
+#: waeup/kofa/students/browser.py:1577
+#: waeup/kofa/students/browser.py:1591
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1581
+#: waeup/kofa/students/browser.py:1585
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1596
+#: waeup/kofa/students/browser.py:1600
 #: waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1597
+#: waeup/kofa/students/browser.py:1601
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1600
+#: waeup/kofa/students/browser.py:1604
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1609
+#: waeup/kofa/students/browser.py:1613
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1618
+#: waeup/kofa/students/browser.py:1622
 msgid "Clearance has been requested."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1627
+#: waeup/kofa/students/browser.py:1631
 #: waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1631
+#: waeup/kofa/students/browser.py:1635
 msgid "Start course registration now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:166
+#: waeup/kofa/students/browser.py:1671
+msgid "Course registration has been started."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:168
 msgid "Student Section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1667
-msgid "Course registration has been started."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1686
+#: waeup/kofa/students/browser.py:1690
 #. Default: ""
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1695
+#: waeup/kofa/students/browser.py:1699
 msgid "Create course list now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1734
+#: waeup/kofa/students/browser.py:1738
 #. Default: ""
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1771
+#: waeup/kofa/students/browser.py:1775
 msgid "Register course list"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1775
+#: waeup/kofa/students/browser.py:1779
 msgid "Course list has been registered."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:182
-#: waeup/kofa/students/browser.py:218
+#: waeup/kofa/students/browser.py:1825
+msgid "Change my password"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1835
+msgid "Get new login credentials"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:184
+#: waeup/kofa/students/browser.py:220
 msgid "Empty search string"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1821
-msgid "Change my password"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1831
-msgid "Get new login credentials"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1845
+#: waeup/kofa/students/browser.py:1849
 msgid "No student record found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1853
+#: waeup/kofa/students/browser.py:1857
 msgid "You have successfully changed your password for the"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1858
+#: waeup/kofa/students/browser.py:1862
 #. Default: ""
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1869
+#: waeup/kofa/students/browser.py:1873
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1872
+#: waeup/kofa/students/browser.py:1876
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1887
+#: waeup/kofa/students/browser.py:1891
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1895
+#: waeup/kofa/students/browser.py:1899
 msgid "Access code is invalid."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1898
+#: waeup/kofa/students/browser.py:1902
 #. Default: ""
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1904
+#: waeup/kofa/students/browser.py:1908
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1910
+#: waeup/kofa/students/browser.py:1914
 msgid "Access code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1919
+#: waeup/kofa/students/browser.py:1923
 #. Default: ""
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:200
+#: waeup/kofa/students/browser.py:202
 #: waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:224
-#: waeup/kofa/students/browser.py:1884
+#: waeup/kofa/students/browser.py:226
+#: waeup/kofa/students/browser.py:1888
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:251
+#: waeup/kofa/students/browser.py:253
 #: waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:259
+#: waeup/kofa/students/browser.py:261
 msgid "Student record created."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:275
+#: waeup/kofa/students/browser.py:277
 #. Default: ""
 msgid "${a}: Base Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:318
-#: waeup/kofa/students/browser.py:1861
+#: waeup/kofa/students/browser.py:320
+#: waeup/kofa/students/browser.py:1865
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:329
+#: waeup/kofa/students/browser.py:332
 msgid "Manage base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:398
+#: waeup/kofa/students/browser.py:401
 #. Default: ""
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:414
+#: waeup/kofa/students/browser.py:417
 #: waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
@@ -2903,88 +2916,88 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:420
+#: waeup/kofa/students/browser.py:423
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:440
+#: waeup/kofa/students/browser.py:443
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:469
+#: waeup/kofa/students/browser.py:472
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:471
+#: waeup/kofa/students/browser.py:474
+#: waeup/kofa/students/browser.py:498
+msgid "Student is in wrong state."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:491
+msgid "Clearance has been annulled."
+msgstr ""
+
 #: waeup/kofa/students/browser.py:495
-msgid "Student is in wrong state."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:488
-msgid "Clearance has been annulled."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:492
 msgid "Clearance request has been rejected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:518
+#: waeup/kofa/students/browser.py:521
 #. Default: ""
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:528
+#: waeup/kofa/students/browser.py:531
 msgid "Manage personal data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:548
+#: waeup/kofa/students/browser.py:551
 #. Default: ""
 msgid "${a}: Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:578
+#: waeup/kofa/students/browser.py:581
 msgid "Manage study course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:581
-#: waeup/kofa/students/browser.py:622
+#: waeup/kofa/students/browser.py:584
+#: waeup/kofa/students/browser.py:625
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:582
-#: waeup/kofa/students/browser.py:608
+#: waeup/kofa/students/browser.py:585
+#: waeup/kofa/students/browser.py:611
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:616
+#: waeup/kofa/students/browser.py:619
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:618
-#: waeup/kofa/students/browser.py:1704
+#: waeup/kofa/students/browser.py:621
+#: waeup/kofa/students/browser.py:1708
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:628
+#: waeup/kofa/students/browser.py:631
 msgid "No study level selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:664
+#: waeup/kofa/students/browser.py:667
 #. Default: ""
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:687
+#: waeup/kofa/students/browser.py:690
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:693
+#: waeup/kofa/students/browser.py:696
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:702
+#: waeup/kofa/students/browser.py:705
 msgid "Course Registration Slip  "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:708
+#: waeup/kofa/students/browser.py:711
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -2993,5 +3006,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:711
+#: waeup/kofa/students/browser.py:714
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -2999,10 +3012,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:712
+#: waeup/kofa/students/browser.py:715
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:713
+#: waeup/kofa/students/browser.py:716
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -3010,5 +3023,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:714
+#: waeup/kofa/students/browser.py:717
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -3016,6 +3029,6 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:715
-#: waeup/kofa/students/interfaces.py:370
+#: waeup/kofa/students/browser.py:718
+#: waeup/kofa/students/interfaces.py:378
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -3024,82 +3037,77 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:743
-#: waeup/kofa/students/browser.py:772
-#: waeup/kofa/students/browser.py:857
-#: waeup/kofa/students/browser.py:862
-#: waeup/kofa/students/browser.py:1744
-#: waeup/kofa/students/browser.py:1794
+#: waeup/kofa/students/browser.py:746
+#: waeup/kofa/students/browser.py:775
+#: waeup/kofa/students/browser.py:860
+#: waeup/kofa/students/browser.py:865
+#: waeup/kofa/students/browser.py:1748
+#: waeup/kofa/students/browser.py:1798
 msgid "Add course ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:764
+#: waeup/kofa/students/browser.py:767
 #. Default: ""
 msgid "Manage study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:782
-#: waeup/kofa/students/browser.py:1754
+#: waeup/kofa/students/browser.py:785
+#: waeup/kofa/students/browser.py:1758
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:806
-#: waeup/kofa/students/browser.py:828
+#: waeup/kofa/students/browser.py:809
+#: waeup/kofa/students/browser.py:831
 msgid "This level does not correspond current level."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:810
+#: waeup/kofa/students/browser.py:813
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:812
+#: waeup/kofa/students/browser.py:815
+#: waeup/kofa/students/browser.py:843
+msgid "Student is in the wrong state."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:836
+msgid "Course list request has been annulled."
+msgstr ""
+
 #: waeup/kofa/students/browser.py:840
-msgid "Student is in the wrong state."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:833
-msgid "Course list request has been annulled."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:837
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:877
-#: waeup/kofa/students/browser.py:1807
+#: waeup/kofa/students/browser.py:880
+#: waeup/kofa/students/browser.py:1811
 msgid "The ticket exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:879
-#: waeup/kofa/students/browser.py:1809
+#: waeup/kofa/students/browser.py:882
+#: waeup/kofa/students/browser.py:1813
 #. Default: ""
 msgid "Successfully added ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:900
+#: waeup/kofa/students/browser.py:903
 #. Default: ""
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:916
+#: waeup/kofa/students/browser.py:919
 #. Default: ""
 msgid "Manage course ticket ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:943
+#: waeup/kofa/students/browser.py:946
 #. Default: ""
 msgid "${a}: Payments"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:988
+#: waeup/kofa/students/browser.py:991
 msgid "Add online payment"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:991
+#: waeup/kofa/students/browser.py:994
 msgid "Create ticket"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:999
-#: waeup/kofa/students/browser.py:1221
-msgid "Your current session does not match accommodation session."
 msgstr ""
 
@@ -3200,6 +3208,6 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:21
-#: waeup/kofa/students/browser_templates/fileupload.pt:27
+#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/students/browser_templates/fileupload.pt:26
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
 msgid "Max. file size:"
@@ -3323,72 +3331,72 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:176
-#: waeup/kofa/students/interfaces.py:255
-#: waeup/kofa/students/interfaces.py:483
+#: waeup/kofa/students/interfaces.py:184
+#: waeup/kofa/students/interfaces.py:263
+#: waeup/kofa/students/interfaces.py:491
 msgid "Registration Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:183
-#: waeup/kofa/students/interfaces.py:265
+#: waeup/kofa/students/interfaces.py:191
+#: waeup/kofa/students/interfaces.py:273
 msgid "Matriculation Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:191
+#: waeup/kofa/students/interfaces.py:199
 msgid "PWD Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:198
+#: waeup/kofa/students/interfaces.py:206
 msgid "Email"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:218
+#: waeup/kofa/students/interfaces.py:226
 msgid "Clearance form locked"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:223
+#: waeup/kofa/students/interfaces.py:231
 msgid "CLR Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:231
+#: waeup/kofa/students/interfaces.py:239
 msgid "Nationality"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:241
+#: waeup/kofa/students/interfaces.py:249
 msgid "Permanent Address"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:275
+#: waeup/kofa/students/interfaces.py:283
 #: waeup/kofa/browser/templates/showstudentspage.pt:7
 msgid "Certificate"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:282
+#: waeup/kofa/students/interfaces.py:290
 msgid "Entry Mode"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:290
+#: waeup/kofa/students/interfaces.py:298
 msgid "Entry Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:299
+#: waeup/kofa/students/interfaces.py:307
 #: waeup/kofa/browser/templates/showstudentspage.pt:8
 msgid "Current Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:307
+#: waeup/kofa/students/interfaces.py:315
 #: waeup/kofa/browser/templates/showstudentspage.pt:9
 msgid "Current Level"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:315
+#: waeup/kofa/students/interfaces.py:323
 msgid "Current Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:322
+#: waeup/kofa/students/interfaces.py:330
 msgid "Previous Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:337
-#: waeup/kofa/students/interfaces.py:434
+#: waeup/kofa/students/interfaces.py:345
+#: waeup/kofa/students/interfaces.py:442
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3396,9 +3404,9 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:344
+#: waeup/kofa/students/interfaces.py:352
 msgid "Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:363
+#: waeup/kofa/students/interfaces.py:371
 #: waeup/kofa/browser/templates/certificatepage.pt:30
 #: waeup/kofa/browser/templates/certificatemanagepage.pt:33
@@ -3406,13 +3414,13 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:377
+#: waeup/kofa/students/interfaces.py:385
 msgid "Automatical Creation"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:384
+#: waeup/kofa/students/interfaces.py:392
 msgid "Carry-over Course"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:403
+#: waeup/kofa/students/interfaces.py:411
 #: waeup/kofa/university/interfaces.py:299
 #: waeup/kofa/browser/templates/certificatepage.pt:29
@@ -3421,15 +3429,15 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:420
+#: waeup/kofa/students/interfaces.py:428
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:10
 msgid "Bed Coordinates"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:442
+#: waeup/kofa/students/interfaces.py:450
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:9
 msgid "Booking Date"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:448
+#: waeup/kofa/students/interfaces.py:456
 msgid "Booking Activation Code"
 msgstr ""
@@ -3440,5 +3448,5 @@
 msgstr ""
 
-#: waeup/kofa/students/utils.py:280
+#: waeup/kofa/students/utils.py:298
 #: waeup/kofa/students/viewlets.py:71
 #: waeup/kofa/students/viewlets.py:99
@@ -3447,5 +3455,5 @@
 msgstr ""
 
-#: waeup/kofa/students/utils.py:311
+#: waeup/kofa/students/utils.py:329
 msgid "Scanned Documents"
 msgstr ""
@@ -3605,9 +3613,9 @@
 
 #: waeup/kofa/students/vocabularies.py:135
-msgid "Male"
+msgid "male"
 msgstr ""
 
 #: waeup/kofa/students/vocabularies.py:137
-msgid "Female"
+msgid "female"
 msgstr ""
 
@@ -3872,5 +3880,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:228
+#: waeup/kofa/utils/utils.py:142
 msgid ""
 "Fullname: ${a}\n"
@@ -3882,5 +3890,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:273
+#: waeup/kofa/utils/utils.py:187
 msgid ""
 "Dear ${a},\n"
@@ -3902,4 +3910,28 @@
 msgstr ""
 
+#: waeup/kofa/utils/utils.py:44
+msgid "Germany"
+msgstr ""
+
+#: waeup/kofa/utils/utils.py:45
+msgid "Nigeria"
+msgstr ""
+
+#: waeup/kofa/utils/utils.py:46
+msgid "U.S."
+msgstr ""
+
+#: waeup/kofa/widgets/phonewidget.py:117
+msgid "Empty phone field(s)."
+msgstr ""
+
+#: waeup/kofa/widgets/phonewidget.py:121
+msgid "Int. prefix requires format '+NNN'"
+msgstr ""
+
+#: waeup/kofa/widgets/phonewidget.py:127
+msgid "Phone numbers may contain numbers only."
+msgstr ""
+
 #: waeup/kofa/widgets/sequencewidget.pt:18
 msgid "Don't forget to save the form after adding or deleting items."
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 7881)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/yo/LC_MESSAGES/waeup.kofa.po	(revision 7882)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.Kofa\n"
-"POT-Creation-Date: Sun Mar 11 16:45:08 2012\n"
+"POT-Creation-Date: Wed Mar 14 10:35:59 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -32,20 +32,20 @@
 #: waeup/kofa/applicants/browser.py:182 waeup/kofa/applicants/browser.py:255
 #: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:339
-#: 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:580
-#: waeup/kofa/students/browser.py:581 waeup/kofa/students/browser.py:742
-#: waeup/kofa/students/browser.py:744 waeup/kofa/students/browser.py:884
+#: waeup/kofa/browser/pages.py:505 waeup/kofa/browser/pages.py:710
+#: waeup/kofa/browser/pages.py:737 waeup/kofa/browser/pages.py:760
+#: waeup/kofa/browser/pages.py:807 waeup/kofa/browser/pages.py:837
+#: waeup/kofa/browser/pages.py:957 waeup/kofa/browser/pages.py:1185
+#: waeup/kofa/browser/pages.py:1279 waeup/kofa/browser/pages.py:1300
+#: waeup/kofa/browser/pages.py:1327 waeup/kofa/browser/pages.py:1355
+#: waeup/kofa/browser/pages.py:1356 waeup/kofa/browser/pages.py:1402
+#: waeup/kofa/browser/pages.py:1443 waeup/kofa/browser/pages.py:1522
+#: waeup/kofa/browser/pages.py:1523 waeup/kofa/browser/pages.py:1525
+#: waeup/kofa/browser/pages.py:1603 waeup/kofa/browser/pages.py:1648
+#: waeup/kofa/browser/pages.py:1686 waeup/kofa/browser/pages.py:1730
+#: waeup/kofa/browser/pages.py:1769 waeup/kofa/browser/pages.py:1771
+#: waeup/kofa/browser/pages.py:1806 waeup/kofa/browser/pages.py:1857
+#: waeup/kofa/browser/pages.py:1909 waeup/kofa/students/browser.py:583
+#: waeup/kofa/students/browser.py:584 waeup/kofa/students/browser.py:745
+#: waeup/kofa/students/browser.py:747 waeup/kofa/students/browser.py:887
 msgid "Cancel"
 msgstr ""
@@ -85,7 +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:167 waeup/kofa/students/browser.py:201
+#: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:594
+#: waeup/kofa/browser/pages.py:1144 waeup/kofa/browser/viewlets.py:190
+#: waeup/kofa/students/browser.py:169 waeup/kofa/students/browser.py:203
 msgid "Search"
 msgstr ""
@@ -343,5 +343,5 @@
 
 #: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:326
-#: waeup/kofa/applicants/browser.py:746
+#: waeup/kofa/applicants/browser.py:747
 msgid "Could not delete:"
 msgstr ""
@@ -349,8 +349,8 @@
 #. Default: ""
 #: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py:329
-#: waeup/kofa/applicants/browser.py:749 waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:239 waeup/kofa/students/browser.py:638
-#: waeup/kofa/students/browser.py:792 waeup/kofa/students/browser.py:970
-#: waeup/kofa/students/browser.py:1180 waeup/kofa/students/browser.py:1766
+#: waeup/kofa/applicants/browser.py:750 waeup/kofa/browser/pages.py:135
+#: waeup/kofa/students/browser.py:241 waeup/kofa/students/browser.py:641
+#: waeup/kofa/students/browser.py:795 waeup/kofa/students/browser.py:973
+#: waeup/kofa/students/browser.py:1183 waeup/kofa/students/browser.py:1770
 msgid "Successfully removed: ${a}"
 msgstr ""
@@ -373,24 +373,24 @@
 
 #: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:302
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:689
-#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:839 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/applicants/browser.py:656 waeup/kofa/applicants/browser.py:690
+#: waeup/kofa/applicants/browser.py:793 waeup/kofa/applicants/browser.py:796
+#: waeup/kofa/applicants/browser.py:840 waeup/kofa/browser/pages.py:478
+#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:656
+#: waeup/kofa/browser/pages.py:730 waeup/kofa/browser/pages.py:1183
+#: waeup/kofa/browser/pages.py:1355 waeup/kofa/browser/pages.py:1396
+#: waeup/kofa/browser/pages.py:1522 waeup/kofa/browser/pages.py:1575
+#: waeup/kofa/browser/pages.py:1718 waeup/kofa/browser/pages.py:1769
+#: waeup/kofa/browser/pages.py:1790 waeup/kofa/hostels/browser.py:209
 #: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:318
-#: waeup/kofa/students/browser.py:355 waeup/kofa/students/browser.py:454
-#: waeup/kofa/students/browser.py:531 waeup/kofa/students/browser.py:580
-#: waeup/kofa/students/browser.py:596 waeup/kofa/students/browser.py:742
-#: waeup/kofa/students/browser.py:767 waeup/kofa/students/browser.py:1440
-#: waeup/kofa/students/browser.py:1455 waeup/kofa/students/browser.py:1570
+#: waeup/kofa/students/browser.py:358 waeup/kofa/students/browser.py:457
+#: waeup/kofa/students/browser.py:534 waeup/kofa/students/browser.py:583
+#: waeup/kofa/students/browser.py:599 waeup/kofa/students/browser.py:745
+#: waeup/kofa/students/browser.py:770 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:256 waeup/kofa/applicants/browser.py:334
-#: waeup/kofa/applicants/browser.py:362
+#: waeup/kofa/applicants/browser.py:363
 msgid "Add applicant"
 msgstr ""
@@ -400,9 +400,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:306 waeup/kofa/applicants/browser.py:718
-#: 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:381
+#: waeup/kofa/applicants/browser.py:306 waeup/kofa/applicants/browser.py:719
+#: waeup/kofa/browser/pages.py:1399 waeup/kofa/browser/pages.py:1721
+#: waeup/kofa/browser/pages.py:1793 waeup/kofa/browser/pages.py:1905
+#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:82
+#: waeup/kofa/students/browser.py:384
 msgid "Form has been saved."
 msgstr ""
@@ -412,67 +412,67 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:365
+#: waeup/kofa/applicants/browser.py:366
 msgid "Create application record"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:370
+#: waeup/kofa/applicants/browser.py:371
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:383
+#: waeup/kofa/applicants/browser.py:384
 msgid "Applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:281
+#: waeup/kofa/applicants/browser.py:399 waeup/kofa/students/browser.py:283
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:399 waeup/kofa/students/browser.py:282
+#: waeup/kofa/applicants/browser.py:400 waeup/kofa/students/browser.py:284
 msgid "unset"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:404
+#: waeup/kofa/applicants/browser.py:405
 msgid "${a} Application Record ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:455
+#: waeup/kofa/applicants/browser.py:456
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:462 waeup/kofa/students/browser.py:1019
+#: waeup/kofa/applicants/browser.py:463 waeup/kofa/students/browser.py:1022
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:475 waeup/kofa/students/browser.py:1033
+#: waeup/kofa/applicants/browser.py:476 waeup/kofa/students/browser.py:1036
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:502 waeup/kofa/students/browser.py:1052
+#: waeup/kofa/applicants/browser.py:503 waeup/kofa/students/browser.py:1055
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:530 waeup/kofa/students/browser.py:1101
+#: waeup/kofa/applicants/browser.py:531 waeup/kofa/students/browser.py:1104
 msgid "Valid callback received."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:551
+#: waeup/kofa/applicants/browser.py:552
 msgid "Payment Data"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:557
+#: waeup/kofa/applicants/browser.py:558
 msgid "Online Payment Receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:563
+#: waeup/kofa/applicants/browser.py:564
 msgid "Ticket not yet paid."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:628
+#: waeup/kofa/applicants/browser.py:629
 msgid "Uploaded image is too big!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:633
+#: waeup/kofa/applicants/browser.py:634
 msgid "jpg file extension expected."
 msgstr ""
@@ -482,33 +482,33 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:847
+#: waeup/kofa/applicants/browser.py:656 waeup/kofa/applicants/browser.py:796
+#: waeup/kofa/applicants/browser.py:848
 msgid "Final Submit"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:656 waeup/kofa/applicants/browser.py:759
-#: waeup/kofa/applicants/browser.py:793 waeup/kofa/applicants/browser.py:828
-#: waeup/kofa/students/browser.py:976
+#: waeup/kofa/applicants/browser.py:657 waeup/kofa/applicants/browser.py:760
+#: waeup/kofa/applicants/browser.py:794 waeup/kofa/applicants/browser.py:829
+#: waeup/kofa/students/browser.py:979
 msgid "Add online payment ticket"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:656 waeup/kofa/applicants/browser.py:764
-#: waeup/kofa/applicants/browser.py:793 waeup/kofa/applicants/browser.py:796
-#: waeup/kofa/applicants/browser.py:833 waeup/kofa/students/browser.py:744
-#: waeup/kofa/students/browser.py:776 waeup/kofa/students/browser.py:952
-#: waeup/kofa/students/browser.py:1748
+#: waeup/kofa/applicants/browser.py:657 waeup/kofa/applicants/browser.py:765
+#: waeup/kofa/applicants/browser.py:794 waeup/kofa/applicants/browser.py:797
+#: waeup/kofa/applicants/browser.py:834 waeup/kofa/students/browser.py:747
+#: waeup/kofa/students/browser.py:779 waeup/kofa/students/browser.py:955
+#: waeup/kofa/students/browser.py:1752
 msgid "Remove selected tickets"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:675
+#: waeup/kofa/applicants/browser.py:676
 msgid "${a} Application Form ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:686 waeup/kofa/students/browser.py:352
+#: waeup/kofa/applicants/browser.py:687 waeup/kofa/students/browser.py:355
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:733 waeup/kofa/students/browser.py:958
+#: waeup/kofa/applicants/browser.py:734 waeup/kofa/students/browser.py:961
 msgid "No payment selected."
 msgstr ""
@@ -520,9 +520,9 @@
 #: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:105
 #: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:309
-#: 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:202
-#: waeup/kofa/students/browser.py:1147 waeup/kofa/students/browser.py:1160
+#: waeup/kofa/browser/pages.py:636 waeup/kofa/browser/pages.py:677
+#: waeup/kofa/browser/pages.py:1279 waeup/kofa/browser/pages.py:1290
+#: waeup/kofa/browser/pages.py:1356 waeup/kofa/browser/pages.py:1391
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:204
+#: waeup/kofa/students/browser.py:1150 waeup/kofa/students/browser.py:1163
 msgid "Remove selected"
 msgstr ""
@@ -533,5 +533,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:806 waeup/kofa/students/browser.py:88
+#: waeup/kofa/applicants/browser.py:807 waeup/kofa/students/browser.py:90
 msgid "The requested form is locked (read-only)."
 msgstr ""
@@ -539,7 +539,7 @@
 #: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:139
 #: waeup/kofa/applicants/browser.py:257 waeup/kofa/applicants/browser.py:348
-#: 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/browser/pages.py:1357 waeup/kofa/browser/pages.py:1416
+#: waeup/kofa/browser/pages.py:1526 waeup/kofa/browser/pages.py:1612
+#: waeup/kofa/browser/pages.py:1772 waeup/kofa/browser/pages.py:1829
 msgid "Remove selected local roles"
 msgstr ""
@@ -547,15 +547,15 @@
 #: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:135
 #: waeup/kofa/applicants/browser.py:258 waeup/kofa/applicants/browser.py:344
-#: 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/browser/pages.py:1358 waeup/kofa/browser/pages.py:1412
+#: waeup/kofa/browser/pages.py:1527 waeup/kofa/browser/pages.py:1608
+#: waeup/kofa/browser/pages.py:1773 waeup/kofa/browser/pages.py:1825
 msgid "Add local role"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:820
+#: waeup/kofa/applicants/browser.py:821
 msgid "No passport picture uploaded."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:822
+#: waeup/kofa/applicants/browser.py:823
 msgid "Passport picture confirmation box not ticked."
 msgstr ""
@@ -565,38 +565,38 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:859 waeup/kofa/students/browser.py:1615
+#: waeup/kofa/applicants/browser.py:860 waeup/kofa/students/browser.py:1619
 msgid "This form cannot be submitted. Wrong state!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:864
+#: waeup/kofa/applicants/browser.py:865
 msgid "Form has been submitted."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:899
+#: waeup/kofa/applicants/browser.py:900
 msgid "Register for ${a} Application"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:905
+#: waeup/kofa/applicants/browser.py:906
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:910
+#: waeup/kofa/applicants/browser.py:911
 msgid "Application has ended."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:919
+#: waeup/kofa/applicants/browser.py:920
 msgid "Get login credentials"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:934
+#: waeup/kofa/applicants/browser.py:935
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:941
+#: waeup/kofa/applicants/browser.py:942
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:950
+#: waeup/kofa/applicants/browser.py:951
 msgid "Your registration was successful."
 msgstr ""
@@ -664,5 +664,13 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:709
+#: waeup/kofa/applicants/container.py:52
+msgid "Basic"
+msgstr ""
+
+#: waeup/kofa/applicants/container.py:55
+msgid "handles basic applicants"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:198 waeup/kofa/students/browser.py:712
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -688,5 +696,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:710
+#: waeup/kofa/applicants/interfaces.py:205 waeup/kofa/students/browser.py:713
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -707,126 +715,126 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:211
-#: waeup/kofa/applicants/interfaces.py:324
+#: waeup/kofa/applicants/interfaces.py:212
+#: waeup/kofa/applicants/interfaces.py:325
 msgid "Application Target"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:219
+#: waeup/kofa/applicants/interfaces.py:220
 msgid "Entry Level"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:226
-#: waeup/kofa/applicants/interfaces.py:332
+#: waeup/kofa/applicants/interfaces.py:227
+#: waeup/kofa/applicants/interfaces.py:333
 msgid "Year of Entrance"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:234
-#: waeup/kofa/applicants/interfaces.py:340
+#: waeup/kofa/applicants/interfaces.py:235
+#: waeup/kofa/applicants/interfaces.py:341
 msgid "Applicants Container Type"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:250
+#: waeup/kofa/applicants/interfaces.py:251
 msgid "Category for the grouping of certificates"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:257
+#: waeup/kofa/applicants/interfaces.py:258
 msgid "Human readable description in reST format"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:273
+#: waeup/kofa/applicants/interfaces.py:274
 msgid "Application Start Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:279
+#: waeup/kofa/applicants/interfaces.py:280
 msgid "Application Closing Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:285
+#: waeup/kofa/applicants/interfaces.py:286
 msgid "Forbid additions after deadline (enddate)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:368
+#: waeup/kofa/applicants/interfaces.py:369
 msgid "Applicant Id"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:373
+#: waeup/kofa/applicants/interfaces.py:374
 msgid "JAMB Registration Number"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:385
-#: waeup/kofa/students/interfaces.py:154
+#: waeup/kofa/applicants/interfaces.py:386
+#: waeup/kofa/students/interfaces.py:162
 msgid "First Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:389
-#: waeup/kofa/students/interfaces.py:159
+#: waeup/kofa/applicants/interfaces.py:390
+#: waeup/kofa/students/interfaces.py:167
 msgid "Middle Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:393
-#: waeup/kofa/students/interfaces.py:164
+#: waeup/kofa/applicants/interfaces.py:394
+#: waeup/kofa/students/interfaces.py:172
 msgid "Last Name (Surname)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:397
-#: waeup/kofa/students/interfaces.py:213
+#: waeup/kofa/applicants/interfaces.py:398
+#: waeup/kofa/students/interfaces.py:221
 msgid "Date of Birth"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:402
+#: waeup/kofa/applicants/interfaces.py:403
 msgid "State/LGA"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:407
-#: waeup/kofa/students/interfaces.py:169
+#: waeup/kofa/applicants/interfaces.py:408
+#: waeup/kofa/students/interfaces.py:177
 msgid "Sex"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:373
-#: waeup/kofa/interfaces.py:399 waeup/kofa/students/interfaces.py:490
+#: waeup/kofa/applicants/interfaces.py:414 waeup/kofa/interfaces.py:388
+#: waeup/kofa/interfaces.py:414 waeup/kofa/students/interfaces.py:498
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:378
-#: waeup/kofa/interfaces.py:406 waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/applicants/interfaces.py:419 waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:421 waeup/kofa/students/interfaces.py:211
 msgid "Phone"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:423
-#: waeup/kofa/applicants/interfaces.py:509
+#: waeup/kofa/applicants/interfaces.py:424
+#: waeup/kofa/applicants/interfaces.py:510
 msgid "1st Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:428
-#: waeup/kofa/applicants/interfaces.py:514
+#: waeup/kofa/applicants/interfaces.py:429
+#: waeup/kofa/applicants/interfaces.py:515
 msgid "2nd Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:433
+#: waeup/kofa/applicants/interfaces.py:434
 msgid "School Grades"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:443
-#: waeup/kofa/applicants/interfaces.py:519
+#: waeup/kofa/applicants/interfaces.py:444
+#: waeup/kofa/applicants/interfaces.py:520
 msgid "Screening Score"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:447
-#: waeup/kofa/applicants/interfaces.py:524
+#: waeup/kofa/applicants/interfaces.py:448
+#: waeup/kofa/applicants/interfaces.py:525
 msgid "Screening Venue"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:451
-#: waeup/kofa/applicants/interfaces.py:529
+#: waeup/kofa/applicants/interfaces.py:452
+#: waeup/kofa/applicants/interfaces.py:530
 msgid "Admitted Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:457
-#: waeup/kofa/applicants/interfaces.py:536
+#: waeup/kofa/applicants/interfaces.py:458
+#: waeup/kofa/applicants/interfaces.py:537
 msgid "Notice"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:479
-#: waeup/kofa/students/interfaces.py:149
+#: waeup/kofa/applicants/interfaces.py:480
+#: waeup/kofa/students/interfaces.py:157
 #: waeup/kofa/browser/templates/showstudentspage.pt:4
 #: waeup/kofa/students/browser_templates/containerpage.pt:29
@@ -835,10 +843,10 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:484
+#: waeup/kofa/applicants/interfaces.py:485
 msgid "Form locked"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:563
-#: waeup/kofa/students/interfaces.py:469
+#: waeup/kofa/applicants/interfaces.py:564
+#: waeup/kofa/students/interfaces.py:477
 msgid "Payment Session"
 msgstr ""
@@ -856,5 +864,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:185
+#: waeup/kofa/applicants/pdf.py:186
 #: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:26
 msgid "Admitted Course of Study:"
@@ -862,5 +870,5 @@
 
 #. Default: ""
-#: waeup/kofa/applicants/pdf.py:203
+#: waeup/kofa/applicants/pdf.py:204
 msgid ""
 "<font size=10>Proceed to the login page of the portal and enter your new "
@@ -868,5 +876,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:209
+#: waeup/kofa/applicants/pdf.py:210
 msgid "<font size=10>Change your password when you have  logged in.</font>"
 msgstr ""
@@ -897,5 +905,5 @@
 
 #: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:254
+#: waeup/kofa/students/browser.py:256
 msgid "Create student record"
 msgstr ""
@@ -1016,5 +1024,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:309
+#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:310
 msgid "Administration"
 msgstr ""
@@ -1025,11 +1033,11 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:386
+#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:387
 #: 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:750
+#: waeup/kofa/browser/pages.py:1142 waeup/kofa/browser/viewlets.py:393
 #: waeup/kofa/browser/viewlets.py:685
 msgid "Data Center"
@@ -1040,131 +1048,149 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1016
+#: waeup/kofa/browser/pages.py:1018
 msgid "Edit headers or replace imported file!"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:103
+#: waeup/kofa/browser/pages.py:104
 msgid "Local role successfully removed: ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1063
+#: waeup/kofa/browser/pages.py:1065
 msgid "View processing log"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1064
+#: waeup/kofa/browser/pages.py:1066
 msgid "Back to data center"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1108
+#: waeup/kofa/browser/pages.py:1110
 msgid "Processing of ${a} rows failed."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1110
+#: waeup/kofa/browser/pages.py:1112
 msgid "Successfully processed ${a} rows."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1118
+#: waeup/kofa/browser/pages.py:1120
 msgid "Show logfiles"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1120
+#: waeup/kofa/browser/pages.py:1122
 msgid "Back to Data Center"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1121
+#: waeup/kofa/browser/pages.py:1123
 msgid "Show"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:113 waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:226
+#: waeup/kofa/browser/pages.py:114 waeup/kofa/hostels/browser.py:256
+#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:228
 msgid "No item selected."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1143
+#: waeup/kofa/browser/pages.py:1145
 msgid "Back"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1151
+#: waeup/kofa/browser/pages.py:1153
 msgid "Log files can only be searched on Unix-based operating systems."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1179
+#: waeup/kofa/browser/pages.py:1181
 msgid "Edit data center settings"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1199
+#: waeup/kofa/browser/pages.py:1201
 msgid "File already existed (not copied): ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1202
+#: waeup/kofa/browser/pages.py:1204
 msgid "Given storage path cannot be used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1203
+#: waeup/kofa/browser/pages.py:1205
 msgid "Error: ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1206
+#: waeup/kofa/browser/pages.py:1208
 msgid "New storage path succefully set."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1265
+#: waeup/kofa/browser/pages.py:1267
 msgid "Academic Section"
 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:1279 waeup/kofa/browser/pages.py:1295
+#: waeup/kofa/browser/pages.py:1312 waeup/kofa/browser/pages.py:1316
 msgid "Add faculty"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1278
+#: waeup/kofa/browser/pages.py:1280
 msgid "Faculties"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1282 waeup/kofa/browser/viewlets.py:441
+#: waeup/kofa/browser/pages.py:1284 waeup/kofa/browser/viewlets.py:441
 msgid "Manage academic section"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1321
+#: waeup/kofa/browser/pages.py:1323
 msgid "The faculty code chosen already exists."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1342 waeup/kofa/browser/pages.py:1352
+#: waeup/kofa/browser/pages.py:1344 waeup/kofa/browser/pages.py:1354
 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:1356 waeup/kofa/browser/pages.py:1407
+#: waeup/kofa/browser/pages.py:1426 waeup/kofa/browser/pages.py:1430
 msgid "Add department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1362 waeup/kofa/browser/viewlets.py:457
+#: waeup/kofa/browser/pages.py:1364 waeup/kofa/browser/viewlets.py:457
 msgid "Manage faculty"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1435
+#: waeup/kofa/browser/pages.py:1437
 msgid "The code chosen already exists in this faculty."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1438
+#: waeup/kofa/browser/pages.py:1440
 msgid "Department ${a} added."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1455
+#: waeup/kofa/browser/pages.py:1457
 msgid "Courses and Certificates"
 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:1487 waeup/kofa/browser/pages.py:1506
+#: waeup/kofa/students/browser.py:98 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:1523 waeup/kofa/browser/pages.py:1581
+msgid "Remove selected courses"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1523 waeup/kofa/browser/pages.py:1593
+#: waeup/kofa/browser/pages.py:1622 waeup/kofa/browser/pages.py:1626
+msgid "Add course"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1524 waeup/kofa/browser/pages.py:1587
+msgid "Remove selected certificates"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1524 waeup/kofa/browser/pages.py:1598
+#: waeup/kofa/browser/pages.py:1659 waeup/kofa/browser/pages.py:1663
+msgid "Add certificate"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:153 waeup/kofa/browser/viewlets.py:322
 #: waeup/kofa/browser/templates/staffsitelayout.pt:28
 #: waeup/kofa/browser/templates/studentsitelayout.pt:33
@@ -1172,121 +1198,103 @@
 msgstr ""
 
-#: 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
-msgid "Add course"
-msgstr ""
-
-#: 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
-msgid "Add certificate"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:1531 waeup/kofa/browser/viewlets.py:464
+#: waeup/kofa/browser/pages.py:1533 waeup/kofa/browser/viewlets.py:464
 msgid "Manage department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:160
+#: waeup/kofa/browser/pages.py:161
 msgid "You logged in."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1636
+#: waeup/kofa/browser/pages.py:1638
 msgid "A course with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1642
+#: waeup/kofa/browser/pages.py:1644
 msgid "Course ${a} successfully created."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1673
+#: waeup/kofa/browser/pages.py:1675
 msgid "A certificate with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1679
+#: waeup/kofa/browser/pages.py:1681
 msgid "Certificate ${a} successfully created."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1711 waeup/kofa/browser/viewlets.py:481
+#: waeup/kofa/browser/pages.py:1713 waeup/kofa/browser/viewlets.py:481
 msgid "Edit course"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1761
+#: waeup/kofa/browser/pages.py:1763
 msgid "Edit certificate"
 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:1770 waeup/kofa/browser/pages.py:1801
+#: waeup/kofa/browser/pages.py:1842 waeup/kofa/browser/pages.py:1844
 msgid "Add course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1769 waeup/kofa/browser/pages.py:1794
+#: waeup/kofa/browser/pages.py:1771 waeup/kofa/browser/pages.py:1796
 msgid "Remove selected course referrers"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1775 waeup/kofa/browser/viewlets.py:488
+#: waeup/kofa/browser/pages.py:1777 waeup/kofa/browser/viewlets.py:488
 msgid "Manage certificate"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:178
+#: waeup/kofa/browser/pages.py:179
 msgid "You entered wrong credentials."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1847
+#: waeup/kofa/browser/pages.py:1849
 msgid "The chosen course referrer is already part of this certificate."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1851
+#: waeup/kofa/browser/pages.py:1853
 msgid "Course referrer ${a}_${b} added."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1888 waeup/kofa/browser/viewlets.py:505
+#: waeup/kofa/browser/pages.py:1890 waeup/kofa/browser/viewlets.py:505
 msgid "Edit course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1891
+#: waeup/kofa/browser/pages.py:1893
 msgid "Save and return"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:192
+#: waeup/kofa/browser/pages.py:193
 msgid "You have been logged out. Thanks for using WAeUP Kofa!"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:228
+#: waeup/kofa/browser/pages.py:229
 msgid "Contact ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:234 waeup/kofa/browser/pages.py:519
+#: waeup/kofa/browser/pages.py:235 waeup/kofa/browser/pages.py:521
 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:316
+#: waeup/kofa/browser/pages.py:254 waeup/kofa/browser/pages.py:273
+#: waeup/kofa/browser/pages.py:538 waeup/kofa/students/browser.py:318
 msgid "Your message has been sent."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:263
+#: waeup/kofa/browser/pages.py:264
 msgid "Send now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:274
+#: waeup/kofa/browser/pages.py:275
 msgid "A smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:299
+#: waeup/kofa/browser/pages.py:300
 msgid "<h1>Welcome to WAeUP.Kofa</h1>"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:387 waeup/kofa/hostels/browser.py:195
+#: waeup/kofa/browser/pages.py:388 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
@@ -1295,14 +1303,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:388 waeup/kofa/browser/viewlets.py:180
+#: waeup/kofa/browser/pages.py:389 waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:395
+#: waeup/kofa/browser/pages.py:396
 msgid "User account ${a} successfully deleted."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:426 waeup/kofa/browser/pages.py:428
+#: waeup/kofa/browser/pages.py:428 waeup/kofa/browser/pages.py:430
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
@@ -1310,132 +1318,132 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:450
+#: waeup/kofa/browser/pages.py:452
 msgid "User account ${a} successfully added."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:469
+#: waeup/kofa/browser/pages.py:471
 msgid "Edit user ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:500
+#: waeup/kofa/browser/pages.py:502
 msgid "User settings have been saved."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:297
+#: waeup/kofa/browser/pages.py:519 waeup/kofa/students/browser.py:299
 msgid "Send message to ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:546 waeup/kofa/browser/viewlets.py:400
+#: waeup/kofa/browser/pages.py:548 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:561 waeup/kofa/browser/viewlets.py:415
 msgid "My Roles"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:590
+#: waeup/kofa/browser/pages.py:592
 msgid "Search Academic Section"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:617
+#: waeup/kofa/browser/pages.py:619
 msgid "View portal configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:630
+#: waeup/kofa/browser/pages.py:632
 msgid "Edit portal configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:631 waeup/kofa/browser/pages.py:680
+#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:682
 msgid "Update plugins"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:633 waeup/kofa/browser/pages.py:661
-#: waeup/kofa/browser/pages.py:692
+#: waeup/kofa/browser/pages.py:635 waeup/kofa/browser/pages.py:663
+#: waeup/kofa/browser/pages.py:694
 msgid "Add session configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:658 waeup/kofa/browser/pages.py:731
+#: waeup/kofa/browser/pages.py:660 waeup/kofa/browser/pages.py:733
 msgid "Settings have been saved."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:672
+#: waeup/kofa/browser/pages.py:674
 msgid "Session ${a} Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:683
+#: waeup/kofa/browser/pages.py:685
 msgid "Plugins were updated. See log file for details."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:696
+#: waeup/kofa/browser/pages.py:698
 msgid "Add Session Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:703
+#: waeup/kofa/browser/pages.py:705
 msgid "The session chosen already exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:725
+#: waeup/kofa/browser/pages.py:727
 msgid "Edit academic session ${a} configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:755
+#: waeup/kofa/browser/pages.py:757
 msgid "Upload file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:757
+#: waeup/kofa/browser/pages.py:759
 msgid "Upload"
 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:805 waeup/kofa/browser/pages.py:835
+#: waeup/kofa/browser/pages.py:955 waeup/kofa/browser/pages.py:1063
 msgid "Process CSV file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:817 waeup/kofa/browser/pages.py:918
-#: waeup/kofa/browser/pages.py:1037
+#: waeup/kofa/browser/pages.py:819 waeup/kofa/browser/pages.py:920
+#: waeup/kofa/browser/pages.py:1039
 msgid "Import aborted."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:83
+#: waeup/kofa/browser/pages.py:838
+msgid "Back to step 1"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:839
+msgid "Proceed to step 3"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:84
 msgid "No local role selected."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:836
-msgid "Back to step 1"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:837
-msgid "Proceed to step 3"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:897
+#: waeup/kofa/browser/pages.py:899
 msgid "Double headers: each column name may only appear once. "
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:905
+#: waeup/kofa/browser/pages.py:907
 msgid "Replace imported file!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:930
+#: waeup/kofa/browser/pages.py:932
 msgid "Update mode only!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:956 waeup/kofa/browser/pages.py:1182
+#: waeup/kofa/browser/pages.py:958 waeup/kofa/browser/pages.py:1184
 msgid "Reset"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:957
+#: waeup/kofa/browser/pages.py:959
 msgid "Set headerfields"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:958
+#: waeup/kofa/browser/pages.py:960
 msgid "Back to step 2"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:959
+#: waeup/kofa/browser/pages.py:961
 msgid "Perform import"
 msgstr ""
@@ -1821,5 +1829,6 @@
 
 #: 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/students/viewlets.py:218 waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/viewlets.py:403
 msgid "Edit"
 msgstr ""
@@ -1956,5 +1965,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:435
 msgid "Bed Type"
 msgstr ""
@@ -2112,41 +2121,41 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:172
+#: waeup/kofa/interfaces.py:185
 msgid "Subject"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:176
+#: waeup/kofa/interfaces.py:189
 msgid "Grade"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:304
+#: waeup/kofa/interfaces.py:319
 msgid "Importer name"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:308
+#: waeup/kofa/interfaces.py:323
 msgid "Import mode"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:333
+#: waeup/kofa/interfaces.py:348
 msgid "Email Address:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:340
+#: waeup/kofa/interfaces.py:355
 msgid "Email to:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:347
+#: waeup/kofa/interfaces.py:362
 msgid "Subject:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:351
+#: waeup/kofa/interfaces.py:366
 msgid "Full Name:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:355
+#: waeup/kofa/interfaces.py:370
 msgid "Text:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:386
+#: waeup/kofa/interfaces.py:401
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2158,5 +2167,5 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:391
+#: waeup/kofa/interfaces.py:406
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2165,97 +2174,97 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:395
+#: waeup/kofa/interfaces.py:410
 msgid "Description/Notice"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:412
+#: waeup/kofa/interfaces.py:427
 msgid "Portal roles"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:455
+#: waeup/kofa/interfaces.py:470
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:456
+#: waeup/kofa/interfaces.py:471
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:461
+#: waeup/kofa/interfaces.py:476
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:467
+#: waeup/kofa/interfaces.py:482
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:474
+#: waeup/kofa/interfaces.py:489
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:486
+#: waeup/kofa/interfaces.py:501
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:494
+#: waeup/kofa/interfaces.py:509
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:502
+#: waeup/kofa/interfaces.py:517
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:508
+#: waeup/kofa/interfaces.py:523
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:515
+#: waeup/kofa/interfaces.py:530
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:516
+#: waeup/kofa/interfaces.py:531
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:521
+#: waeup/kofa/interfaces.py:536
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:528
+#: waeup/kofa/interfaces.py:543
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:535
+#: waeup/kofa/interfaces.py:550
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:544 waeup/kofa/interfaces.py:596
+#: waeup/kofa/interfaces.py:559 waeup/kofa/interfaces.py:611
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:552 waeup/kofa/payments/interfaces.py:30
+#: waeup/kofa/interfaces.py:567 waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:557 waeup/kofa/payments/interfaces.py:106
-msgid "Surcharge 1"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:562 waeup/kofa/payments/interfaces.py:113
+#: waeup/kofa/interfaces.py:572 waeup/kofa/payments/interfaces.py:106
+msgid "Portal Fee"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:577 waeup/kofa/payments/interfaces.py:113
 msgid "Surcharge 2"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:567 waeup/kofa/payments/interfaces.py:120
+#: waeup/kofa/interfaces.py:582 waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:572
+#: waeup/kofa/interfaces.py:587
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:577
+#: waeup/kofa/interfaces.py:592
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:582 waeup/kofa/payments/interfaces.py:36
+#: waeup/kofa/interfaces.py:597 waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
 msgstr ""
@@ -2380,337 +2389,341 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1068
+#: waeup/kofa/students/browser.py:1002 waeup/kofa/students/browser.py:1224
+msgid "Your current session does not match accommodation session."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1071
 msgid "This ticket has already been paid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1081 waeup/kofa/students/browser.py:1089
-#: waeup/kofa/students/browser.py:1097
+#: waeup/kofa/students/browser.py:1084 waeup/kofa/students/browser.py:1092
+#: waeup/kofa/students/browser.py:1100
 msgid "Valid callback received. ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1151
+#: waeup/kofa/students/browser.py:1154
 msgid "${a}: Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1163
+#: waeup/kofa/students/browser.py:1166
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:117 waeup/kofa/students/viewlets.py:114
+#: waeup/kofa/students/browser.py:1173
+msgid "No bed ticket selected."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:119 waeup/kofa/students/viewlets.py:114
 #: waeup/kofa/students/viewlets.py:534
 msgid "Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1170
-msgid "No bed ticket selected."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1201
+#: waeup/kofa/students/browser.py:1204
 msgid "Add bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1203
+#: waeup/kofa/students/browser.py:1206
 msgid "Create bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1211
+#: waeup/kofa/students/browser.py:1214
 msgid "Your data are incomplete."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1215
+#: waeup/kofa/students/browser.py:1218
 msgid "You are in the wrong registration state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1226
+#: waeup/kofa/students/browser.py:1229
 msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:123 waeup/kofa/students/viewlets.py:120
+#: waeup/kofa/students/browser.py:1240 waeup/kofa/students/browser.py:1537
+#: waeup/kofa/students/browser.py:1650
+msgid "Activation code is invalid."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:125 waeup/kofa/students/viewlets.py:120
 #: waeup/kofa/students/viewlets.py:535
 msgid "Payments"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1237 waeup/kofa/students/browser.py:1533
-#: waeup/kofa/students/browser.py:1646
-msgid "Activation code is invalid."
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1257 waeup/kofa/students/browser.py:1385
+#. Default: ""
+#: waeup/kofa/students/browser.py:1260 waeup/kofa/students/browser.py:1388
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1262 waeup/kofa/students/browser.py:1538
-#: waeup/kofa/students/browser.py:1651
+#: waeup/kofa/students/browser.py:1265 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:1265 waeup/kofa/students/browser.py:1541
-#: waeup/kofa/students/browser.py:1654 waeup/kofa/students/browser.py:1913
+#: waeup/kofa/students/browser.py:1268 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:1270 waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1659
+#: waeup/kofa/students/browser.py:1273 waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1663
 msgid "You are not the owner of this access code."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1281 waeup/kofa/students/browser.py:1399
+#: waeup/kofa/students/browser.py:1284 waeup/kofa/students/browser.py:1402
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1290
+#: waeup/kofa/students/browser.py:1293
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1308
+#: waeup/kofa/students/browser.py:1311
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1324
+#: waeup/kofa/students/browser.py:1327
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1330
+#: waeup/kofa/students/browser.py:1333
 msgid "Bed Allocation: "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1357
+#: waeup/kofa/students/browser.py:1360
 msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1363
+#: waeup/kofa/students/browser.py:1366
 msgid "Student can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:138 waeup/kofa/students/viewlets.py:126
+#: waeup/kofa/students/browser.py:140 waeup/kofa/students/viewlets.py:126
 msgid "Accommodation"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1406
+#: waeup/kofa/students/browser.py:1409
 msgid "Student relocated: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1425
+#: waeup/kofa/students/browser.py:1428
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1437 waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/browser.py:1441
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1452 waeup/kofa/students/viewlets.py:365
+#: waeup/kofa/students/browser.py:1456 waeup/kofa/students/viewlets.py:365
 msgid "Change password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1466
+#: waeup/kofa/students/browser.py:1470
 msgid "Password changed."
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/browser.py:147
+#: waeup/kofa/students/browser.py:1482
+msgid "Upload portrait"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/browser.py:149
 msgid "Bed Ticket ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1478
-msgid "Upload portrait"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1493 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"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1497
+#: waeup/kofa/students/browser.py:1501
 msgid "Start clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1514 waeup/kofa/students/browser.py:1635
+#: waeup/kofa/students/browser.py:1518 waeup/kofa/students/browser.py:1639
 msgid "Wrong state"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1518
+#: waeup/kofa/students/browser.py:1522
 msgid "No portrait uploaded."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1522
+#: waeup/kofa/students/browser.py:1526
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1549
+#: waeup/kofa/students/browser.py:1553
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1561
+#: waeup/kofa/students/browser.py:1565
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1573 waeup/kofa/students/browser.py:1587
+#: waeup/kofa/students/browser.py:1577 waeup/kofa/students/browser.py:1591
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1581
+#: waeup/kofa/students/browser.py:1585
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1596 waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1600 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1597
+#: waeup/kofa/students/browser.py:1601
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1600
+#: waeup/kofa/students/browser.py:1604
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1609
+#: waeup/kofa/students/browser.py:1613
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1618
+#: waeup/kofa/students/browser.py:1622
 msgid "Clearance has been requested."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1627 waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:1631 waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1631
+#: waeup/kofa/students/browser.py:1635
 msgid "Start course registration now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:166
+#: waeup/kofa/students/browser.py:1671
+msgid "Course registration has been started."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:168
 msgid "Student Section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1667
-msgid "Course registration has been started."
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1686
+#. Default: ""
+#: waeup/kofa/students/browser.py:1690
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1695
+#: waeup/kofa/students/browser.py:1699
 msgid "Create course list now"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1734
+#: waeup/kofa/students/browser.py:1738
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1771
+#: waeup/kofa/students/browser.py:1775
 msgid "Register course list"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1775
+#: waeup/kofa/students/browser.py:1779
 msgid "Course list has been registered."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:182 waeup/kofa/students/browser.py:218
+#: waeup/kofa/students/browser.py:1825
+msgid "Change my password"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1835
+msgid "Get new login credentials"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:184 waeup/kofa/students/browser.py:220
 msgid "Empty search string"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1821
-msgid "Change my password"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1831
-msgid "Get new login credentials"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1845
+#: waeup/kofa/students/browser.py:1849
 msgid "No student record found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1853
+#: waeup/kofa/students/browser.py:1857
 msgid "You have successfully changed your password for the"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1858
+#: waeup/kofa/students/browser.py:1862
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1869
+#: waeup/kofa/students/browser.py:1873
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1872
+#: waeup/kofa/students/browser.py:1876
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1887
+#: waeup/kofa/students/browser.py:1891
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1895
+#: waeup/kofa/students/browser.py:1899
 msgid "Access code is invalid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1898
+#: waeup/kofa/students/browser.py:1902
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1904
+#: waeup/kofa/students/browser.py:1908
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1910
+#: waeup/kofa/students/browser.py:1914
 msgid "Access code has already been used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1919
+#: waeup/kofa/students/browser.py:1923
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:200 waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:202 waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:224 waeup/kofa/students/browser.py:1884
+#: waeup/kofa/students/browser.py:226 waeup/kofa/students/browser.py:1888
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:251 waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:253 waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:259
+#: waeup/kofa/students/browser.py:261
 msgid "Student record created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:275
+#: waeup/kofa/students/browser.py:277
 msgid "${a}: Base Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:318 waeup/kofa/students/browser.py:1861
+#: waeup/kofa/students/browser.py:320 waeup/kofa/students/browser.py:1865
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:329
+#: waeup/kofa/students/browser.py:332
 msgid "Manage base data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:398
+#: waeup/kofa/students/browser.py:401
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:414 waeup/kofa/students/viewlets.py:104
+#: waeup/kofa/students/browser.py:417 waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
@@ -2718,84 +2731,84 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:420
+#: waeup/kofa/students/browser.py:423
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:440
+#: waeup/kofa/students/browser.py:443
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:469
+#: waeup/kofa/students/browser.py:472
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:471 waeup/kofa/students/browser.py:495
+#: waeup/kofa/students/browser.py:474 waeup/kofa/students/browser.py:498
 msgid "Student is in wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:488
+#: waeup/kofa/students/browser.py:491
 msgid "Clearance has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:492
+#: waeup/kofa/students/browser.py:495
 msgid "Clearance request has been rejected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:518
+#: waeup/kofa/students/browser.py:521
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:528
+#: waeup/kofa/students/browser.py:531
 msgid "Manage personal data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:548
+#: waeup/kofa/students/browser.py:551
 msgid "${a}: Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:578
+#: waeup/kofa/students/browser.py:581
 msgid "Manage study course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:581 waeup/kofa/students/browser.py:622
+#: waeup/kofa/students/browser.py:584 waeup/kofa/students/browser.py:625
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:582 waeup/kofa/students/browser.py:608
+#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:611
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:616
+#: waeup/kofa/students/browser.py:619
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:618 waeup/kofa/students/browser.py:1704
+#: waeup/kofa/students/browser.py:621 waeup/kofa/students/browser.py:1708
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:628
+#: waeup/kofa/students/browser.py:631
 msgid "No study level selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:664
+#: waeup/kofa/students/browser.py:667
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:687
+#: waeup/kofa/students/browser.py:690
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:693
+#: waeup/kofa/students/browser.py:696
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:702
+#: waeup/kofa/students/browser.py:705
 msgid "Course Registration Slip  "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:708
+#: waeup/kofa/students/browser.py:711
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -2804,5 +2817,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:711
+#: waeup/kofa/students/browser.py:714
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -2810,10 +2823,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:712
+#: waeup/kofa/students/browser.py:715
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:713
+#: waeup/kofa/students/browser.py:716
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -2821,5 +2834,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:714
+#: waeup/kofa/students/browser.py:717
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -2827,5 +2840,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:715 waeup/kofa/students/interfaces.py:370
+#: waeup/kofa/students/browser.py:718 waeup/kofa/students/interfaces.py:378
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2834,73 +2847,69 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:743 waeup/kofa/students/browser.py:772
-#: waeup/kofa/students/browser.py:857 waeup/kofa/students/browser.py:862
-#: waeup/kofa/students/browser.py:1744 waeup/kofa/students/browser.py:1794
+#: waeup/kofa/students/browser.py:746 waeup/kofa/students/browser.py:775
+#: waeup/kofa/students/browser.py:860 waeup/kofa/students/browser.py:865
+#: waeup/kofa/students/browser.py:1748 waeup/kofa/students/browser.py:1798
 msgid "Add course ticket"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:764
+#: waeup/kofa/students/browser.py:767
 msgid "Manage study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:782 waeup/kofa/students/browser.py:1754
+#: waeup/kofa/students/browser.py:785 waeup/kofa/students/browser.py:1758
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:806 waeup/kofa/students/browser.py:828
+#: waeup/kofa/students/browser.py:809 waeup/kofa/students/browser.py:831
 msgid "This level does not correspond current level."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:810
+#: waeup/kofa/students/browser.py:813
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:812 waeup/kofa/students/browser.py:840
+#: waeup/kofa/students/browser.py:815 waeup/kofa/students/browser.py:843
 msgid "Student is in the wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:833
+#: waeup/kofa/students/browser.py:836
 msgid "Course list request has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:840
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:877 waeup/kofa/students/browser.py:1807
+#: waeup/kofa/students/browser.py:880 waeup/kofa/students/browser.py:1811
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:879 waeup/kofa/students/browser.py:1809
+#: waeup/kofa/students/browser.py:882 waeup/kofa/students/browser.py:1813
 msgid "Successfully added ${a}."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:900
+#: waeup/kofa/students/browser.py:903
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:916
+#: waeup/kofa/students/browser.py:919
 msgid "Manage course ticket ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:943
+#: waeup/kofa/students/browser.py:946
 msgid "${a}: Payments"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:988
+#: waeup/kofa/students/browser.py:991
 msgid "Add online payment"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:991
+#: waeup/kofa/students/browser.py:994
 msgid "Create ticket"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:999 waeup/kofa/students/browser.py:1221
-msgid "Your current session does not match accommodation session."
 msgstr ""
 
@@ -3001,6 +3010,6 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:21
-#: waeup/kofa/students/browser_templates/fileupload.pt:27
+#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/students/browser_templates/fileupload.pt:26
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
 msgid "Max. file size:"
@@ -3130,69 +3139,69 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:176 waeup/kofa/students/interfaces.py:255
-#: waeup/kofa/students/interfaces.py:483
+#: waeup/kofa/students/interfaces.py:184 waeup/kofa/students/interfaces.py:263
+#: waeup/kofa/students/interfaces.py:491
 msgid "Registration Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:183 waeup/kofa/students/interfaces.py:265
+#: waeup/kofa/students/interfaces.py:191 waeup/kofa/students/interfaces.py:273
 msgid "Matriculation Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:191
+#: waeup/kofa/students/interfaces.py:199
 msgid "PWD Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:198
+#: waeup/kofa/students/interfaces.py:206
 msgid "Email"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:218
+#: waeup/kofa/students/interfaces.py:226
 msgid "Clearance form locked"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:223
+#: waeup/kofa/students/interfaces.py:231
 msgid "CLR Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:231
+#: waeup/kofa/students/interfaces.py:239
 msgid "Nationality"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:241
+#: waeup/kofa/students/interfaces.py:249
 msgid "Permanent Address"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:275
+#: waeup/kofa/students/interfaces.py:283
 #: waeup/kofa/browser/templates/showstudentspage.pt:7
 msgid "Certificate"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:282
+#: waeup/kofa/students/interfaces.py:290
 msgid "Entry Mode"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:290
+#: waeup/kofa/students/interfaces.py:298
 msgid "Entry Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:299
+#: waeup/kofa/students/interfaces.py:307
 #: waeup/kofa/browser/templates/showstudentspage.pt:8
 msgid "Current Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:307
+#: waeup/kofa/students/interfaces.py:315
 #: waeup/kofa/browser/templates/showstudentspage.pt:9
 msgid "Current Level"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:315
+#: waeup/kofa/students/interfaces.py:323
 msgid "Current Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:322
+#: waeup/kofa/students/interfaces.py:330
 msgid "Previous Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:337 waeup/kofa/students/interfaces.py:434
+#: waeup/kofa/students/interfaces.py:345 waeup/kofa/students/interfaces.py:442
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3200,9 +3209,9 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:344
+#: waeup/kofa/students/interfaces.py:352
 msgid "Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:363
+#: waeup/kofa/students/interfaces.py:371
 #: waeup/kofa/browser/templates/certificatepage.pt:30
 #: waeup/kofa/browser/templates/certificatemanagepage.pt:33
@@ -3210,13 +3219,13 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:377
+#: waeup/kofa/students/interfaces.py:385
 msgid "Automatical Creation"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:384
+#: waeup/kofa/students/interfaces.py:392
 msgid "Carry-over Course"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:403
+#: waeup/kofa/students/interfaces.py:411
 #: waeup/kofa/university/interfaces.py:299
 #: waeup/kofa/browser/templates/certificatepage.pt:29
@@ -3225,15 +3234,15 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:420
+#: waeup/kofa/students/interfaces.py:428
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:10
 msgid "Bed Coordinates"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:442
+#: waeup/kofa/students/interfaces.py:450
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:9
 msgid "Booking Date"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:448
+#: waeup/kofa/students/interfaces.py:456
 msgid "Booking Activation Code"
 msgstr ""
@@ -3244,5 +3253,5 @@
 msgstr ""
 
-#: waeup/kofa/students/utils.py:280 waeup/kofa/students/viewlets.py:71
+#: waeup/kofa/students/utils.py:298 waeup/kofa/students/viewlets.py:71
 #: waeup/kofa/students/viewlets.py:99
 #: waeup/kofa/students/browser_templates/basemanagepage.pt:6
@@ -3250,5 +3259,5 @@
 msgstr ""
 
-#: waeup/kofa/students/utils.py:311
+#: waeup/kofa/students/utils.py:329
 msgid "Scanned Documents"
 msgstr ""
@@ -3400,9 +3409,9 @@
 
 #: waeup/kofa/students/vocabularies.py:135
-msgid "Male"
+msgid "male"
 msgstr ""
 
 #: waeup/kofa/students/vocabularies.py:137
-msgid "Female"
+msgid "female"
 msgstr ""
 
@@ -3661,5 +3670,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:228
+#: waeup/kofa/utils/utils.py:142
 msgid ""
 "Fullname: ${a}\n"
@@ -3671,5 +3680,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:273
+#: waeup/kofa/utils/utils.py:187
 msgid ""
 "Dear ${a},\n"
@@ -3691,4 +3700,28 @@
 msgstr ""
 
+#: waeup/kofa/utils/utils.py:44
+msgid "Germany"
+msgstr ""
+
+#: waeup/kofa/utils/utils.py:45
+msgid "Nigeria"
+msgstr ""
+
+#: waeup/kofa/utils/utils.py:46
+msgid "U.S."
+msgstr ""
+
+#: waeup/kofa/widgets/phonewidget.py:117
+msgid "Empty phone field(s)."
+msgstr ""
+
+#: waeup/kofa/widgets/phonewidget.py:121
+msgid "Int. prefix requires format '+NNN'"
+msgstr ""
+
+#: waeup/kofa/widgets/phonewidget.py:127
+msgid "Phone numbers may contain numbers only."
+msgstr ""
+
 #: waeup/kofa/widgets/sequencewidget.pt:18
 msgid "Don't forget to save the form after adding or deleting items."
