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 7838)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/de/LC_MESSAGES/waeup.kofa.po	(revision 7839)
@@ -15,6 +15,6 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Fri Mar  9 23:09:56 2012\n"
-"PO-Revision-Date: 2012-03-09 23:11+0100\n"
+"POT-Creation-Date: Sun Mar 11 16:45:08 2012\n"
+"PO-Revision-Date: 2012-03-11 16:46+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
 "Language-Team: WAeUP Germany <henrik@waeup.org>\n"
@@ -34,7 +34,7 @@
 #: waeup/kofa/applicants/browser.py:130
 #: waeup/kofa/applicants/browser.py:182
-#: waeup/kofa/applicants/browser.py:254
 #: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:338
+#: waeup/kofa/applicants/browser.py:256
+#: waeup/kofa/applicants/browser.py:339
 #: waeup/kofa/browser/pages.py:503
 #: waeup/kofa/browser/pages.py:708
@@ -64,9 +64,9 @@
 #: waeup/kofa/browser/pages.py:1855
 #: waeup/kofa/browser/pages.py:1907
-#: waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:585
-#: waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:888
+#: waeup/kofa/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
 msgid "Cancel"
 msgstr "Abbruch"
@@ -110,6 +110,6 @@
 #: waeup/kofa/browser/pages.py:1142
 #: waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:171
-#: waeup/kofa/students/browser.py:205
+#: waeup/kofa/students/browser.py:167
+#: waeup/kofa/students/browser.py:201
 msgid "Search"
 msgstr "Suchen"
@@ -370,6 +370,6 @@
 
 #: waeup/kofa/applicants/browser.py:117
-#: waeup/kofa/applicants/browser.py:325
-#: waeup/kofa/applicants/browser.py:745
+#: waeup/kofa/applicants/browser.py:326
+#: waeup/kofa/applicants/browser.py:746
 msgid "Could not delete:"
 msgstr "Konnte nicht gelöscht werden:"
@@ -377,13 +377,13 @@
 #. Default: ""
 #: waeup/kofa/applicants/browser.py:120
-#: waeup/kofa/applicants/browser.py:328
-#: waeup/kofa/applicants/browser.py:748
+#: waeup/kofa/applicants/browser.py:329
+#: waeup/kofa/applicants/browser.py:749
 #: waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:243
-#: waeup/kofa/students/browser.py:642
-#: waeup/kofa/students/browser.py:796
-#: waeup/kofa/students/browser.py:974
-#: waeup/kofa/students/browser.py:1184
-#: waeup/kofa/students/browser.py:1770
+#: waeup/kofa/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
 msgid "Successfully removed: ${a}"
 msgstr "Erfolgreich entfernt: ${a}"
@@ -404,11 +404,11 @@
 msgstr "Antragsteller"
 
-#: waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:301
-#: waeup/kofa/applicants/browser.py:654
-#: waeup/kofa/applicants/browser.py:688
-#: waeup/kofa/applicants/browser.py:791
-#: waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:838
+#: waeup/kofa/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
@@ -425,31 +425,31 @@
 #: waeup/kofa/hostels/browser.py:209
 #: waeup/kofa/hostels/browser.py:231
-#: waeup/kofa/hostels/browser.py:319
-#: waeup/kofa/students/browser.py:359
-#: waeup/kofa/students/browser.py:458
-#: waeup/kofa/students/browser.py:535
-#: waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:600
-#: waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:771
-#: waeup/kofa/students/browser.py:1444
-#: waeup/kofa/students/browser.py:1459
-#: waeup/kofa/students/browser.py:1574
+#: waeup/kofa/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
 msgid "Save"
 msgstr "Speichern"
 
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:333
-#: waeup/kofa/applicants/browser.py:361
+#: waeup/kofa/applicants/browser.py:256
+#: waeup/kofa/applicants/browser.py:334
+#: waeup/kofa/applicants/browser.py:362
 msgid "Add applicant"
 msgstr "Antragsteller hinzufügen"
 
-#: waeup/kofa/applicants/browser.py:265
+#: waeup/kofa/applicants/browser.py:266
 #: waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr "Ordner für Antragsteller verwalten"
 
-#: waeup/kofa/applicants/browser.py:305
-#: waeup/kofa/applicants/browser.py:717
+#: waeup/kofa/applicants/browser.py:306
+#: waeup/kofa/applicants/browser.py:718
 #: waeup/kofa/browser/pages.py:1397
 #: waeup/kofa/browser/pages.py:1719
@@ -458,81 +458,81 @@
 #: waeup/kofa/hostels/browser.py:54
 #: waeup/kofa/students/browser.py:80
-#: waeup/kofa/students/browser.py:385
+#: waeup/kofa/students/browser.py:381
 msgid "Form has been saved."
 msgstr "Das Formular wurde gespeichert."
 
-#: waeup/kofa/applicants/browser.py:314
+#: waeup/kofa/applicants/browser.py:315
 msgid "No applicant selected!"
 msgstr "Nichts ausgewählt!"
 
-#: waeup/kofa/applicants/browser.py:364
+#: waeup/kofa/applicants/browser.py:365
 msgid "Create application record"
 msgstr "Antrag hinzufügen"
 
-#: waeup/kofa/applicants/browser.py:369
+#: waeup/kofa/applicants/browser.py:370
 msgid "Applicant record created."
 msgstr "Antrag wurde erzeugt."
 
-#: waeup/kofa/applicants/browser.py:382
+#: waeup/kofa/applicants/browser.py:383
 msgid "Applicant"
 msgstr "Antragsteller"
 
-#: waeup/kofa/applicants/browser.py:397
-#: waeup/kofa/students/browser.py:285
+#: waeup/kofa/applicants/browser.py:398
+#: waeup/kofa/students/browser.py:281
 msgid "set"
 msgstr "gesetzt"
 
-#: waeup/kofa/applicants/browser.py:398
-#: waeup/kofa/students/browser.py:286
+#: waeup/kofa/applicants/browser.py:399
+#: waeup/kofa/students/browser.py:282
 msgid "unset"
 msgstr "ungesetzt"
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:403
+#: waeup/kofa/applicants/browser.py:404
 msgid "${a} Application Record ${b}"
 msgstr "${a} Antrag ${b}"
 
-#: waeup/kofa/applicants/browser.py:454
+#: waeup/kofa/applicants/browser.py:455
 msgid "Session configuration object is not available."
 msgstr "Session-Konfiguration ist nicht verfügbar."
 
-#: waeup/kofa/applicants/browser.py:461
-#: waeup/kofa/students/browser.py:1023
+#: waeup/kofa/applicants/browser.py:462
+#: waeup/kofa/students/browser.py:1019
 msgid "This type of payment has already been made."
 msgstr "Diese Bezahlung wurde bereits ausgeführt."
 
-#: waeup/kofa/applicants/browser.py:474
-#: waeup/kofa/students/browser.py:1037
+#: waeup/kofa/applicants/browser.py:475
+#: waeup/kofa/students/browser.py:1033
 msgid "Payment ticket created."
 msgstr "Bezahl-Ticket wurde erzeugt."
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:501
-#: waeup/kofa/students/browser.py:1056
+#: waeup/kofa/applicants/browser.py:502
+#: waeup/kofa/students/browser.py:1052
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr "${a}: Online-Bezahl-Ticket ${b}"
 
-#: waeup/kofa/applicants/browser.py:529
-#: waeup/kofa/students/browser.py:1105
+#: waeup/kofa/applicants/browser.py:530
+#: waeup/kofa/students/browser.py:1101
 msgid "Valid callback received."
 msgstr "Gültigen Rückruf erhalten."
 
-#: waeup/kofa/applicants/browser.py:550
+#: waeup/kofa/applicants/browser.py:551
 msgid "Payment Data"
 msgstr "Zahlung"
 
-#: waeup/kofa/applicants/browser.py:556
+#: waeup/kofa/applicants/browser.py:557
 msgid "Online Payment Receipt"
 msgstr "Quittung"
 
-#: waeup/kofa/applicants/browser.py:562
+#: waeup/kofa/applicants/browser.py:563
 msgid "Ticket not yet paid."
 msgstr "Ticket wurde noch nicht bezahlt."
 
-#: waeup/kofa/applicants/browser.py:627
+#: waeup/kofa/applicants/browser.py:628
 msgid "Uploaded image is too big!"
 msgstr "Das hochgeladene Bild ist zu groß!"
 
-#: waeup/kofa/applicants/browser.py:632
+#: waeup/kofa/applicants/browser.py:633
 msgid "jpg file extension expected."
 msgstr "jpg-Dateiendung erwartet."
@@ -542,42 +542,42 @@
 msgstr "Antragstellung"
 
-#: waeup/kofa/applicants/browser.py:654
-#: waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:846
+#: waeup/kofa/applicants/browser.py:655
+#: waeup/kofa/applicants/browser.py:795
+#: waeup/kofa/applicants/browser.py:847
 msgid "Final Submit"
 msgstr "Endgültiges Einreichen"
 
-#: waeup/kofa/applicants/browser.py:655
-#: waeup/kofa/applicants/browser.py:758
-#: waeup/kofa/applicants/browser.py:792
-#: waeup/kofa/applicants/browser.py:827
-#: waeup/kofa/students/browser.py:980
+#: 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
 msgid "Add online payment ticket"
 msgstr "Ticket für Online-Bezahlung hinzufügen"
 
-#: waeup/kofa/applicants/browser.py:655
-#: waeup/kofa/applicants/browser.py:763
-#: waeup/kofa/applicants/browser.py:792
-#: waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:832
-#: waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:780
-#: waeup/kofa/students/browser.py:956
-#: waeup/kofa/students/browser.py:1752
+#: 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
 msgid "Remove selected tickets"
 msgstr "Ausgewählte Tickets löschen"
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:674
+#: waeup/kofa/applicants/browser.py:675
 msgid "${a} Application Form ${b}"
 msgstr "${a} Antragsformular ${b}"
 
-#: waeup/kofa/applicants/browser.py:685
-#: waeup/kofa/students/browser.py:356
+#: waeup/kofa/applicants/browser.py:686
+#: waeup/kofa/students/browser.py:352
 msgid "No transition"
 msgstr "Keine Änderung"
 
-#: waeup/kofa/applicants/browser.py:732
-#: waeup/kofa/students/browser.py:962
+#: waeup/kofa/applicants/browser.py:733
+#: waeup/kofa/students/browser.py:958
 msgid "No payment selected."
 msgstr "Nichts ausgewählt!"
@@ -590,6 +590,6 @@
 #: waeup/kofa/applicants/browser.py:79
 #: waeup/kofa/applicants/browser.py:105
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:308
+#: waeup/kofa/applicants/browser.py:256
+#: waeup/kofa/applicants/browser.py:309
 #: waeup/kofa/browser/pages.py:634
 #: waeup/kofa/browser/pages.py:675
@@ -599,7 +599,7 @@
 #: waeup/kofa/browser/pages.py:1389
 #: waeup/kofa/hostels/browser.py:131
-#: waeup/kofa/students/browser.py:206
-#: waeup/kofa/students/browser.py:1151
-#: waeup/kofa/students/browser.py:1164
+#: waeup/kofa/students/browser.py:202
+#: waeup/kofa/students/browser.py:1147
+#: waeup/kofa/students/browser.py:1160
 msgid "Remove selected"
 msgstr "Ausgewählte Objekte löschen"
@@ -612,5 +612,5 @@
 msgstr "Ordner für Antragsteller hinzufügen"
 
-#: waeup/kofa/applicants/browser.py:805
+#: waeup/kofa/applicants/browser.py:806
 #: waeup/kofa/students/browser.py:88
 msgid "The requested form is locked (read-only)."
@@ -619,6 +619,6 @@
 #: waeup/kofa/applicants/browser.py:81
 #: waeup/kofa/applicants/browser.py:139
-#: waeup/kofa/applicants/browser.py:256
-#: waeup/kofa/applicants/browser.py:347
+#: waeup/kofa/applicants/browser.py:257
+#: waeup/kofa/applicants/browser.py:348
 #: waeup/kofa/browser/pages.py:1355
 #: waeup/kofa/browser/pages.py:1414
@@ -630,12 +630,8 @@
 msgstr "Ausgewählte lokale Rollen löschen"
 
-#: waeup/kofa/applicants/browser.py:819
-msgid "No passport picture uploaded."
-msgstr "Es wurde noch kein Passbild hochgeladen."
-
 #: waeup/kofa/applicants/browser.py:82
 #: waeup/kofa/applicants/browser.py:135
-#: waeup/kofa/applicants/browser.py:257
-#: waeup/kofa/applicants/browser.py:343
+#: waeup/kofa/applicants/browser.py:258
+#: waeup/kofa/applicants/browser.py:344
 #: waeup/kofa/browser/pages.py:1356
 #: waeup/kofa/browser/pages.py:1410
@@ -647,5 +643,9 @@
 msgstr "Lokale Rolle hinzufügen"
 
-#: waeup/kofa/applicants/browser.py:821
+#: waeup/kofa/applicants/browser.py:820
+msgid "No passport picture uploaded."
+msgstr "Es wurde noch kein Passbild hochgeladen."
+
+#: waeup/kofa/applicants/browser.py:822
 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:858
-#: waeup/kofa/students/browser.py:1619
+#: waeup/kofa/applicants/browser.py:859
+#: waeup/kofa/students/browser.py:1615
 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:863
+#: waeup/kofa/applicants/browser.py:864
 msgid "Form has been submitted."
 msgstr "Das Formular wurde eingereicht."
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:898
+#: waeup/kofa/applicants/browser.py:899
 msgid "Register for ${a} Application"
 msgstr "Antragstellung für ${a}"
 
-#: waeup/kofa/applicants/browser.py:904
+#: waeup/kofa/applicants/browser.py:905
 msgid "Application has not yet started."
 msgstr "Antragszeitraum hat noch nicht begonnen."
 
-#: waeup/kofa/applicants/browser.py:909
+#: waeup/kofa/applicants/browser.py:910
 msgid "Application has ended."
 msgstr "Antragszeitraum ist beendet."
 
-#: waeup/kofa/applicants/browser.py:918
+#: waeup/kofa/applicants/browser.py:919
 msgid "Get login credentials"
 msgstr "Zugangsdaten zusenden"
 
-#: waeup/kofa/applicants/browser.py:933
+#: waeup/kofa/applicants/browser.py:934
 msgid "You have successfully been registered for the"
 msgstr "Sie haben sich erfolgreich registriert für"
 
-#: waeup/kofa/applicants/browser.py:940
+#: waeup/kofa/applicants/browser.py:941
 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:949
+#: waeup/kofa/applicants/browser.py:950
 msgid "Your registration was successful."
 msgstr "Ihre Registrierung war erfolgreich."
@@ -752,5 +752,5 @@
 
 #: waeup/kofa/applicants/interfaces.py:197
-#: waeup/kofa/students/browser.py:713
+#: waeup/kofa/students/browser.py:709
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -777,5 +777,5 @@
 
 #: waeup/kofa/applicants/interfaces.py:204
-#: waeup/kofa/students/browser.py:714
+#: waeup/kofa/students/browser.py:710
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -873,6 +873,6 @@
 
 #: waeup/kofa/applicants/interfaces.py:413
-#: waeup/kofa/interfaces.py:375
-#: waeup/kofa/interfaces.py:401
+#: waeup/kofa/interfaces.py:373
+#: waeup/kofa/interfaces.py:399
 #: waeup/kofa/students/interfaces.py:490
 msgid "Email Address"
@@ -880,6 +880,6 @@
 
 #: waeup/kofa/applicants/interfaces.py:418
-#: waeup/kofa/interfaces.py:380
-#: waeup/kofa/interfaces.py:408
+#: waeup/kofa/interfaces.py:378
+#: waeup/kofa/interfaces.py:406
 #: waeup/kofa/students/interfaces.py:203
 msgid "Phone"
@@ -989,5 +989,5 @@
 #: waeup/kofa/applicants/viewlets.py:151
 #: waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:258
+#: waeup/kofa/students/browser.py:254
 msgid "Create student record"
 msgstr "Studenten erzeugen"
@@ -1192,6 +1192,6 @@
 #: waeup/kofa/browser/pages.py:113
 #: waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:287
-#: waeup/kofa/students/browser.py:230
+#: waeup/kofa/hostels/browser.py:286
+#: waeup/kofa/students/browser.py:226
 msgid "No item selected."
 msgstr "Nichts ausgewählt."
@@ -1411,5 +1411,5 @@
 #: waeup/kofa/browser/pages.py:272
 #: waeup/kofa/browser/pages.py:536
-#: waeup/kofa/students/browser.py:320
+#: waeup/kofa/students/browser.py:316
 msgid "Your message has been sent."
 msgstr "Ihre Nachricht wurde verschickt."
@@ -1469,5 +1469,5 @@
 #. Default: ""
 #: waeup/kofa/browser/pages.py:517
-#: waeup/kofa/students/browser.py:301
+#: waeup/kofa/students/browser.py:297
 msgid "Send message to ${a}"
 msgstr "Sende Nachricht an ${a}"
@@ -2019,5 +2019,5 @@
 
 #: waeup/kofa/hostels/browser.py:212
-#: waeup/kofa/hostels/browser.py:281
+#: waeup/kofa/hostels/browser.py:280
 msgid "Release selected beds"
 msgstr "Ausgewählte Betten freigeben"
@@ -2029,18 +2029,18 @@
 
 #. Default: ""
-#: waeup/kofa/hostels/browser.py:275
+#: waeup/kofa/hostels/browser.py:274
 msgid "Successfully switched beds: ${a}"
 msgstr "Erfolgreich geänderte Betten: ${a}"
 
 #. Default: ""
-#: waeup/kofa/hostels/browser.py:299
+#: waeup/kofa/hostels/browser.py:298
 msgid "Successfully released beds: ${a}"
 msgstr "Erfolgreich freigegebene Betten: ${a}"
 
-#: waeup/kofa/hostels/browser.py:304
+#: waeup/kofa/hostels/browser.py:303
 msgid "No allocated bed selected."
 msgstr "Keine Betten ausgewählt."
 
-#: waeup/kofa/hostels/browser.py:316
+#: waeup/kofa/hostels/browser.py:315
 msgid "Allocate student"
 msgstr "Student zuweisen"
@@ -2272,41 +2272,41 @@
 msgstr "Postgraduierten-Wohnheim"
 
-#: waeup/kofa/interfaces.py:174
+#: waeup/kofa/interfaces.py:172
 msgid "Subject"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:178
+msgstr "Fach"
+
+#: waeup/kofa/interfaces.py:176
 msgid "Grade"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:306
+msgstr "Note"
+
+#: waeup/kofa/interfaces.py:304
 msgid "Importer name"
 msgstr "Name des Importers"
 
-#: waeup/kofa/interfaces.py:310
+#: waeup/kofa/interfaces.py:308
 msgid "Import mode"
 msgstr "Importmodus"
 
-#: waeup/kofa/interfaces.py:335
+#: waeup/kofa/interfaces.py:333
 msgid "Email Address:"
 msgstr "Emailadresse:"
 
-#: waeup/kofa/interfaces.py:342
+#: waeup/kofa/interfaces.py:340
 msgid "Email to:"
 msgstr "Email an:"
 
-#: waeup/kofa/interfaces.py:349
+#: waeup/kofa/interfaces.py:347
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: waeup/kofa/interfaces.py:353
+#: waeup/kofa/interfaces.py:351
 msgid "Full Name:"
 msgstr "Vollständiger Name:"
 
-#: waeup/kofa/interfaces.py:357
+#: waeup/kofa/interfaces.py:355
 msgid "Text:"
 msgstr "Text:"
 
-#: waeup/kofa/interfaces.py:388
+#: waeup/kofa/interfaces.py:386
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2318,5 +2318,5 @@
 msgstr "Benutzer Id"
 
-#: waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:391
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2325,102 +2325,102 @@
 msgstr "Vollständiger Name"
 
-#: waeup/kofa/interfaces.py:397
+#: waeup/kofa/interfaces.py:395
 msgid "Description/Notice"
 msgstr "Beschreibung/Nachricht"
 
-#: waeup/kofa/interfaces.py:414
+#: waeup/kofa/interfaces.py:412
 msgid "Portal roles"
 msgstr "Portalweite Rollen"
 
-#: waeup/kofa/interfaces.py:457
+#: waeup/kofa/interfaces.py:455
 msgid "Name of University"
 msgstr "Name der Universität"
 
-#: waeup/kofa/interfaces.py:458
+#: waeup/kofa/interfaces.py:456
 msgid "Sample University"
 msgstr "Deomo-Universität"
 
-#: waeup/kofa/interfaces.py:463
+#: waeup/kofa/interfaces.py:461
 msgid "Abbreviated Title of University"
 msgstr "Abkürzung"
 
-#: waeup/kofa/interfaces.py:469
+#: waeup/kofa/interfaces.py:467
 msgid "Skin"
 msgstr "Skin"
 
-#: waeup/kofa/interfaces.py:476
+#: waeup/kofa/interfaces.py:474
 msgid "Content in reST format"
 msgstr "Inhalt in reST-Format"
 
-#: waeup/kofa/interfaces.py:488
+#: waeup/kofa/interfaces.py:486
 msgid "Accommodation Booking Session"
 msgstr "Buchungssession"
 
-#: waeup/kofa/interfaces.py:496
+#: waeup/kofa/interfaces.py:494
 msgid "Allowed States for Accommodation Booking"
 msgstr "Erlaubte Zustände für das Buchen einer Unterbringung"
 
-#: waeup/kofa/interfaces.py:504
+#: waeup/kofa/interfaces.py:502
 msgid "Name of Administrator"
 msgstr "Name des Administrators"
 
-#: waeup/kofa/interfaces.py:510
+#: waeup/kofa/interfaces.py:508
 msgid "Email Address of Administrator"
 msgstr "Emailadresse des Administrators"
 
-#: waeup/kofa/interfaces.py:517
+#: waeup/kofa/interfaces.py:515
 msgid "Subject of Email to Administrator"
 msgstr "Betreff der Email an Administrator"
 
-#: waeup/kofa/interfaces.py:518
+#: waeup/kofa/interfaces.py:516
 msgid "Kofa Contact"
 msgstr "Kofa-Kontakt"
 
-#: waeup/kofa/interfaces.py:523
+#: waeup/kofa/interfaces.py:521
 msgid "SMTP mailer to use when sending mail"
 msgstr "SMTP Dienst"
 
-#: waeup/kofa/interfaces.py:530
+#: waeup/kofa/interfaces.py:528
 msgid "Captcha used for public registration pages"
 msgstr "Captcha für öffentliche Registrierung"
 
-#: waeup/kofa/interfaces.py:537
+#: waeup/kofa/interfaces.py:535
 msgid "Carry-over Course Registration"
 msgstr "Carry-Over-Kursregistrierung"
 
-#: waeup/kofa/interfaces.py:546
-#: waeup/kofa/interfaces.py:598
+#: waeup/kofa/interfaces.py:544
+#: waeup/kofa/interfaces.py:596
 msgid "Academic Session"
 msgstr "Akademische Session"
 
-#: waeup/kofa/interfaces.py:554
+#: waeup/kofa/interfaces.py:552
 #: waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr "Schulgebühr"
 
-#: waeup/kofa/interfaces.py:559
+#: waeup/kofa/interfaces.py:557
 #: waeup/kofa/payments/interfaces.py:106
 msgid "Surcharge 1"
 msgstr "Zusatzgebühr 1"
 
-#: waeup/kofa/interfaces.py:564
+#: waeup/kofa/interfaces.py:562
 #: waeup/kofa/payments/interfaces.py:113
 msgid "Surcharge 2"
 msgstr "Zusatzgebühr 2"
 
-#: waeup/kofa/interfaces.py:569
+#: waeup/kofa/interfaces.py:567
 #: waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr "Zusatzgebühr 3"
 
-#: waeup/kofa/interfaces.py:574
+#: waeup/kofa/interfaces.py:572
 msgid "Clearance Fee"
 msgstr "Einschreibungsgebühr"
 
-#: waeup/kofa/interfaces.py:579
+#: waeup/kofa/interfaces.py:577
 msgid "Booking Fee"
 msgstr "Buchungsgebühr"
 
-#: waeup/kofa/interfaces.py:584
+#: waeup/kofa/interfaces.py:582
 #: waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
@@ -2454,36 +2454,4 @@
 msgid "courses validated"
 msgstr "Kurse validiert"
-
-#: waeup/kofa/interfaces.py:82
-msgid "Math"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:83
-msgid "Biology"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:84
-msgid "English"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:92
-msgid "Very Good"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:93
-msgid "Good"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:94
-msgid "Satisfactory"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:95
-msgid "Sufficient"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:96
-msgid "Fail"
-msgstr ""
 
 #: waeup/kofa/objecthistory.py:73
@@ -2578,26 +2546,21 @@
 msgstr "Zugangscode der Zahlung"
 
-#: waeup/kofa/students/browser.py:1003
-#: waeup/kofa/students/browser.py:1225
-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:1072
+#: waeup/kofa/students/browser.py:1068
 msgid "This ticket has already been paid."
 msgstr "Diese Bezahlung wurde bereits ausgeführt."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1085
-#: waeup/kofa/students/browser.py:1093
-#: waeup/kofa/students/browser.py:1101
+#: waeup/kofa/students/browser.py:1081
+#: waeup/kofa/students/browser.py:1089
+#: waeup/kofa/students/browser.py:1097
 msgid "Valid callback received. ${a}"
 msgstr "Gültigen Rückruf erhalten. ${a}"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1155
+#: waeup/kofa/students/browser.py:1151
 msgid "${a}: Accommodation"
 msgstr " ${a}: Unterkunft"
 
-#: waeup/kofa/students/browser.py:1167
+#: waeup/kofa/students/browser.py:1163
 msgid "You are not allowed to remove bed tickets."
 msgstr "Ihnen ist nicht erlaubt, Betttickets zu entfernen."
@@ -2609,23 +2572,27 @@
 msgstr "Studiengang"
 
-#: waeup/kofa/students/browser.py:1174
+#: waeup/kofa/students/browser.py:1170
 msgid "No bed ticket selected."
 msgstr "Kein Ticket ausgewählt."
 
-#: waeup/kofa/students/browser.py:1205
+#: waeup/kofa/students/browser.py:1201
 msgid "Add bed ticket"
 msgstr "Bettticket hinzufügen"
 
-#: waeup/kofa/students/browser.py:1207
+#: waeup/kofa/students/browser.py:1203
 msgid "Create bed ticket"
 msgstr "Bettticket erzeugen"
 
-#: waeup/kofa/students/browser.py:1215
+#: waeup/kofa/students/browser.py:1211
 msgid "Your data are incomplete."
 msgstr "Die Daten sind unvollständig."
 
-#: waeup/kofa/students/browser.py:1219
+#: waeup/kofa/students/browser.py:1215
 msgid "You are in the wrong registration state."
 msgstr "Sie haben den falschen Status."
+
+#: waeup/kofa/students/browser.py:1226
+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
@@ -2635,68 +2602,64 @@
 msgstr "Zahlungen"
 
-#: waeup/kofa/students/browser.py:1230
-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:1241
-#: waeup/kofa/students/browser.py:1537
-#: waeup/kofa/students/browser.py:1650
+#: 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:1261
-#: waeup/kofa/students/browser.py:1389
+#: waeup/kofa/students/browser.py:1257
+#: waeup/kofa/students/browser.py:1385
 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:1266
-#: waeup/kofa/students/browser.py:1542
-#: waeup/kofa/students/browser.py:1655
+#: waeup/kofa/students/browser.py:1262
+#: waeup/kofa/students/browser.py:1538
+#: waeup/kofa/students/browser.py:1651
 msgid "Activation code has already been used."
 msgstr "Der Aktivierungs-Code wurde bereits verwendet."
 
-#: waeup/kofa/students/browser.py:1269
-#: waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1658
-#: waeup/kofa/students/browser.py:1917
+#: waeup/kofa/students/browser.py:1265
+#: waeup/kofa/students/browser.py:1541
+#: waeup/kofa/students/browser.py:1654
+#: waeup/kofa/students/browser.py:1913
 msgid "invalidated"
 msgstr "entwertet"
 
-#: waeup/kofa/students/browser.py:1274
-#: waeup/kofa/students/browser.py:1549
-#: waeup/kofa/students/browser.py:1663
+#: waeup/kofa/students/browser.py:1270
+#: waeup/kofa/students/browser.py:1545
+#: waeup/kofa/students/browser.py:1659
 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:1285
-#: waeup/kofa/students/browser.py:1403
+#: waeup/kofa/students/browser.py:1281
+#: waeup/kofa/students/browser.py:1399
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr "${a}, Block ${b}, Raum ${c}, Bett ${d} (${e})"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1294
+#: waeup/kofa/students/browser.py:1290
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr "Bettticket erzeugt und Bett gebucht: ${a}"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1312
+#: waeup/kofa/students/browser.py:1308
 msgid "Bed Ticket for Session ${a}"
 msgstr "Bett-Ticket für Session ${a}"
 
-#: waeup/kofa/students/browser.py:1328
+#: waeup/kofa/students/browser.py:1324
 msgid "Bed Allocation Data"
 msgstr "Bettenzuweisungsdaten"
 
-#: waeup/kofa/students/browser.py:1334
+#: waeup/kofa/students/browser.py:1330
 msgid "Bed Allocation: "
 msgstr "Bettenzuweisung"
 
-#: waeup/kofa/students/browser.py:1361
+#: waeup/kofa/students/browser.py:1357
 msgid "Students in reserved beds can't be relocated."
 msgstr "Studenten in reservierten Betten können nicht umgezogen werden."
 
-#: waeup/kofa/students/browser.py:1367
+#: waeup/kofa/students/browser.py:1363
 msgid "Student can't be relocated."
 msgstr "Studen konnte nicht umgezogen werden."
@@ -2708,23 +2671,27 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1410
+#: waeup/kofa/students/browser.py:1406
 msgid "Student relocated: ${a}"
 msgstr "Student umgezogen: ${a}"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1429
+#: waeup/kofa/students/browser.py:1425
 msgid "${a}: History"
 msgstr "${a}: Historie"
 
-#: waeup/kofa/students/browser.py:1441
+#: waeup/kofa/students/browser.py:1437
 #: waeup/kofa/students/viewlets.py:356
 msgid "Edit base data"
 msgstr "Basisdaten verwalten"
 
-#: waeup/kofa/students/browser.py:1456
+#: waeup/kofa/students/browser.py:1452
 #: waeup/kofa/students/viewlets.py:365
 msgid "Change password"
 msgstr "Passwort ändern"
 
+#: waeup/kofa/students/browser.py:1466
+msgid "Password changed."
+msgstr "Passwort geändert"
+
 #. Default: ""
 #: waeup/kofa/students/browser.py:147
@@ -2732,13 +2699,9 @@
 msgstr "Bett-Ticket ${a}"
 
-#: waeup/kofa/students/browser.py:1470
-msgid "Password changed."
-msgstr "Passwort geändert"
-
-#: waeup/kofa/students/browser.py:1482
+#: waeup/kofa/students/browser.py:1478
 msgid "Upload portrait"
 msgstr "Portrait hochladen"
 
-#: waeup/kofa/students/browser.py:1497
+#: waeup/kofa/students/browser.py:1493
 #: waeup/kofa/students/viewlets.py:389
 #: waeup/kofa/students/workflow.py:44
@@ -2746,197 +2709,197 @@
 msgstr "Einschreibung starten"
 
-#: waeup/kofa/students/browser.py:1501
+#: waeup/kofa/students/browser.py:1497
 msgid "Start clearance now"
 msgstr "Einschreibung jetzt starten"
 
-#: waeup/kofa/students/browser.py:1518
-#: waeup/kofa/students/browser.py:1639
+#: waeup/kofa/students/browser.py:1514
+#: waeup/kofa/students/browser.py:1635
 msgid "Wrong state"
 msgstr "Falscher Status"
 
-#: waeup/kofa/students/browser.py:1522
+#: waeup/kofa/students/browser.py:1518
 msgid "No portrait uploaded."
 msgstr "Es wurde kein Passbild hochgeladen."
 
-#: waeup/kofa/students/browser.py:1526
+#: waeup/kofa/students/browser.py:1522
 msgid "Not all required fields filled."
 msgstr "Es wurden nicht alle Pflichtfelder ausgefüllt."
 
-#: waeup/kofa/students/browser.py:1553
+#: waeup/kofa/students/browser.py:1549
 msgid "Clearance process has been started."
 msgstr "Einschreibung wurde gestartet"
 
-#: waeup/kofa/students/browser.py:1565
+#: waeup/kofa/students/browser.py:1561
 msgid "Edit clearance data"
 msgstr "Bearbeite Einschreibungsdaten"
 
-#: waeup/kofa/students/browser.py:1577
-#: waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1573
+#: waeup/kofa/students/browser.py:1587
 msgid "Clearance form has been saved."
 msgstr "Einschreibungsdaten wurden gespeichert."
 
-#: waeup/kofa/students/browser.py:1585
+#: waeup/kofa/students/browser.py:1581
 msgid "Save and request clearance"
 msgstr "Speichern und Einschreibung beantragen"
 
-#: waeup/kofa/students/browser.py:1600
+#: waeup/kofa/students/browser.py:1596
 #: waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr "Einschreibung beantragen"
 
-#: waeup/kofa/students/browser.py:1601
+#: waeup/kofa/students/browser.py:1597
 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:1604
+#: waeup/kofa/students/browser.py:1600
 msgid "Request clearance now"
 msgstr "Einschreibung beantragen"
 
-#: waeup/kofa/students/browser.py:1613
+#: waeup/kofa/students/browser.py:1609
 msgid "This isn't your CLR access code."
 msgstr "Dies ist nicht Ihr CLR-Zugangscode"
 
-#: waeup/kofa/students/browser.py:1622
+#: waeup/kofa/students/browser.py:1618
 msgid "Clearance has been requested."
 msgstr "Einschreibung wurde beantragt."
 
-#: waeup/kofa/students/browser.py:1631
+#: waeup/kofa/students/browser.py:1627
 #: waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr "Kurseregistrierung starten"
 
-#: waeup/kofa/students/browser.py:1635
+#: waeup/kofa/students/browser.py:1631
 msgid "Start course registration now"
 msgstr "Kursregistrierung jetzt starten"
 
-#: waeup/kofa/students/browser.py:1671
+#: waeup/kofa/students/browser.py:166
+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:1690
+#: waeup/kofa/students/browser.py:1686
 msgid "Add current level ${a}"
 msgstr "Aktuelles Level ${a} hinzufügen"
 
-#: waeup/kofa/students/browser.py:1699
+#: waeup/kofa/students/browser.py:1695
 msgid "Create course list now"
 msgstr "Kursliste jetzt erzeugen"
 
-#: waeup/kofa/students/browser.py:170
-msgid "Student Section"
-msgstr "Studenten"
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1738
+#. Default: ""
+#: waeup/kofa/students/browser.py:1734
 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:1775
+#: waeup/kofa/students/browser.py:1771
 msgid "Register course list"
 msgstr "Registriere Kursliste"
 
-#: waeup/kofa/students/browser.py:1779
+#: waeup/kofa/students/browser.py:1775
 msgid "Course list has been registered."
 msgstr "Kurseliste wurde registriert."
 
-#: waeup/kofa/students/browser.py:1825
+#: waeup/kofa/students/browser.py:182
+#: waeup/kofa/students/browser.py:218
+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:1835
+#: waeup/kofa/students/browser.py:1831
 msgid "Get new login credentials"
 msgstr "Zugangsdaten zusenden"
 
-#: waeup/kofa/students/browser.py:1849
+#: waeup/kofa/students/browser.py:1845
 msgid "No student record found."
 msgstr "Keinen Studenten gefunden."
 
-#: waeup/kofa/students/browser.py:1857
+#: waeup/kofa/students/browser.py:1853
 msgid "You have successfully changed your password for the"
 msgstr "Sie haben erfolgreich Ihr Passwort geändert für das"
 
-#: waeup/kofa/students/browser.py:186
-#: waeup/kofa/students/browser.py:222
-msgid "Empty search string"
-msgstr "Leerer Suchtext"
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1862
+#. Default: ""
+#: waeup/kofa/students/browser.py:1858
 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:1873
+#: waeup/kofa/students/browser.py:1869
 msgid "Set password for first-time login"
 msgstr "Passwort setzen"
 
-#: waeup/kofa/students/browser.py:1876
+#: waeup/kofa/students/browser.py:1872
 msgid "Set"
 msgstr "Setzen"
 
-#: waeup/kofa/students/browser.py:1891
+#: waeup/kofa/students/browser.py:1887
 msgid "More than one student found."
 msgstr "Mehr als einen Studenten gefunden."
 
-#: waeup/kofa/students/browser.py:1899
+#: waeup/kofa/students/browser.py:1895
 msgid "Access code is invalid."
 msgstr "Aktivierungs-Code ist ungültig."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1902
+#: waeup/kofa/students/browser.py:1898
 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:1908
+#: waeup/kofa/students/browser.py:1904
 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:1914
+#: waeup/kofa/students/browser.py:1910
 msgid "Access code has already been used."
 msgstr "Der Aktivierungs-Code wurde bereits verwendet."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1923
+#: waeup/kofa/students/browser.py:1919
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr "Passwort wurde gesetzt. Ihre Studenten Id ist ${a}"
 
-#: waeup/kofa/students/browser.py:204
+#: waeup/kofa/students/browser.py:200
 #: waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr "Studenten verwalten"
 
-#: waeup/kofa/students/browser.py:228
-#: waeup/kofa/students/browser.py:1888
+#: waeup/kofa/students/browser.py:224
+#: waeup/kofa/students/browser.py:1884
 msgid "No student found."
 msgstr "Keinen Studenten gefunden."
 
-#: waeup/kofa/students/browser.py:255
+#: waeup/kofa/students/browser.py:251
 #: waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr "Student hinzufügen"
 
-#: waeup/kofa/students/browser.py:263
+#: waeup/kofa/students/browser.py:259
 msgid "Student record created."
 msgstr "Student erzeugt."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:279
+#: waeup/kofa/students/browser.py:275
 msgid "${a}: Base Data"
 msgstr "${a}: Basisdaten"
 
-#: waeup/kofa/students/browser.py:322
-#: waeup/kofa/students/browser.py:1865
+#: waeup/kofa/students/browser.py:318
+#: waeup/kofa/students/browser.py:1861
 msgid "An smtp server error occurred."
 msgstr "Es trat ein smtp-Serverfehler auf."
 
-#: waeup/kofa/students/browser.py:333
+#: waeup/kofa/students/browser.py:329
 msgid "Manage base data"
 msgstr "Basisdaten verwalten"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:402
+#: waeup/kofa/students/browser.py:398
 msgid "${a}: Clearance Data"
 msgstr "${a}: Einschreibungsdaten"
 
-#: waeup/kofa/students/browser.py:418
+#: waeup/kofa/students/browser.py:414
 #: waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
@@ -2945,88 +2908,88 @@
 msgstr "Einschreibungsdaten"
 
-#: waeup/kofa/students/browser.py:424
+#: waeup/kofa/students/browser.py:420
 msgid "Clearance Slip of "
 msgstr "Einschreibungsbeleg für"
 
-#: waeup/kofa/students/browser.py:444
+#: waeup/kofa/students/browser.py:440
 msgid "Manage clearance data"
 msgstr "Verwalte Einschreibungsdaten"
 
-#: waeup/kofa/students/browser.py:473
+#: waeup/kofa/students/browser.py:469
 msgid "Student has been cleared."
 msgstr "Student wurde eingeschrieben."
 
-#: waeup/kofa/students/browser.py:475
-#: waeup/kofa/students/browser.py:499
+#: waeup/kofa/students/browser.py:471
+#: waeup/kofa/students/browser.py:495
 msgid "Student is in wrong state."
 msgstr "Student hat den falschen Status."
 
-#: waeup/kofa/students/browser.py:492
+#: waeup/kofa/students/browser.py:488
 msgid "Clearance has been annulled."
 msgstr "Einschreibung wurde annulliert."
 
-#: waeup/kofa/students/browser.py:496
+#: waeup/kofa/students/browser.py:492
 msgid "Clearance request has been rejected."
 msgstr "Einschreibung wurde abgelehnt."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:522
+#: waeup/kofa/students/browser.py:518
 msgid "${a}: Personal Data"
 msgstr "${a}: Persönliche Daten"
 
-#: waeup/kofa/students/browser.py:532
+#: waeup/kofa/students/browser.py:528
 msgid "Manage personal data"
 msgstr "Persönliche Daten verwalten"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:552
+#: waeup/kofa/students/browser.py:548
 msgid "${a}: Study Course"
 msgstr "${a}: Studiengang"
 
-#: waeup/kofa/students/browser.py:582
+#: waeup/kofa/students/browser.py:578
 msgid "Manage study course"
 msgstr "Studiengang verwalten"
 
-#: waeup/kofa/students/browser.py:585
-#: waeup/kofa/students/browser.py:626
+#: waeup/kofa/students/browser.py:581
+#: waeup/kofa/students/browser.py:622
 msgid "Remove selected levels"
 msgstr "Ausgewählte Levels  löschen"
 
-#: waeup/kofa/students/browser.py:586
-#: waeup/kofa/students/browser.py:612
+#: waeup/kofa/students/browser.py:582
+#: waeup/kofa/students/browser.py:608
 msgid "Add study level"
 msgstr "Level  hinzufügen"
 
-#: waeup/kofa/students/browser.py:620
+#: waeup/kofa/students/browser.py:616
 msgid "Study level has been added."
 msgstr "Level wurde hinzugefügt."
 
-#: waeup/kofa/students/browser.py:622
-#: waeup/kofa/students/browser.py:1708
+#: waeup/kofa/students/browser.py:618
+#: waeup/kofa/students/browser.py:1704
 msgid "This level exists."
 msgstr "Dieses Level existiert."
 
-#: waeup/kofa/students/browser.py:632
+#: waeup/kofa/students/browser.py:628
 msgid "No study level selected."
 msgstr "Kein Level ausgewählt."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:668
+#: waeup/kofa/students/browser.py:664
 msgid "${a}: Study Level ${b}"
 msgstr "${a}: Level ${b}"
 
-#: waeup/kofa/students/browser.py:691
+#: waeup/kofa/students/browser.py:687
 msgid "Level Data"
 msgstr "Leveldaten"
 
-#: waeup/kofa/students/browser.py:697
+#: waeup/kofa/students/browser.py:693
 msgid "Course List"
 msgstr "Kursliste"
 
-#: waeup/kofa/students/browser.py:706
+#: waeup/kofa/students/browser.py:702
 msgid "Course Registration Slip  "
 msgstr "Kursregistrierungsbeleg"
 
-#: waeup/kofa/students/browser.py:712
+#: waeup/kofa/students/browser.py:708
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -3035,5 +2998,5 @@
 msgstr "Sem."
 
-#: waeup/kofa/students/browser.py:715
+#: waeup/kofa/students/browser.py:711
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -3041,10 +3004,10 @@
 msgstr "Dept."
 
-#: waeup/kofa/students/browser.py:716
+#: waeup/kofa/students/browser.py:712
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr "Fakultät"
 
-#: waeup/kofa/students/browser.py:717
+#: waeup/kofa/students/browser.py:713
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -3052,5 +3015,5 @@
 msgstr "Cred."
 
-#: waeup/kofa/students/browser.py:718
+#: waeup/kofa/students/browser.py:714
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -3058,5 +3021,5 @@
 msgstr "Pflicht"
 
-#: waeup/kofa/students/browser.py:719
+#: waeup/kofa/students/browser.py:715
 #: waeup/kofa/students/interfaces.py:370
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
@@ -3066,78 +3029,83 @@
 msgstr "Score"
 
-#: waeup/kofa/students/browser.py:747
-#: waeup/kofa/students/browser.py:776
-#: waeup/kofa/students/browser.py:861
-#: waeup/kofa/students/browser.py:866
-#: waeup/kofa/students/browser.py:1748
-#: waeup/kofa/students/browser.py:1798
+#: waeup/kofa/students/browser.py: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
 msgid "Add course ticket"
 msgstr "Kursticket hinzufügen"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:768
+#: waeup/kofa/students/browser.py:764
 msgid "Manage study level ${a}"
 msgstr "Verwalte Level  ${a}"
 
-#: waeup/kofa/students/browser.py:786
-#: waeup/kofa/students/browser.py:1758
+#: waeup/kofa/students/browser.py:782
+#: waeup/kofa/students/browser.py:1754
 msgid "No ticket selected."
 msgstr "Kein Ticket ausgewählt."
 
-#: waeup/kofa/students/browser.py:810
-#: waeup/kofa/students/browser.py:832
+#: waeup/kofa/students/browser.py:806
+#: waeup/kofa/students/browser.py:828
 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:814
+#: waeup/kofa/students/browser.py:810
 msgid "Course list has been validated."
 msgstr "Kurseliste wurde validiert."
 
-#: waeup/kofa/students/browser.py:816
-#: waeup/kofa/students/browser.py:844
+#: waeup/kofa/students/browser.py:812
+#: waeup/kofa/students/browser.py:840
 msgid "Student is in the wrong state."
 msgstr "Student hat den falschen Status."
 
-#: waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:833
 msgid "Course list request has been annulled."
 msgstr "Kursregistrierung wurde annulliert."
 
-#: waeup/kofa/students/browser.py:841
+#: waeup/kofa/students/browser.py:837
 msgid "Course list request has been rejected:"
 msgstr "Kursregistrierung wurde abgelehnt."
 
-#: waeup/kofa/students/browser.py:881
-#: waeup/kofa/students/browser.py:1811
+#: waeup/kofa/students/browser.py:877
+#: waeup/kofa/students/browser.py:1807
 msgid "The ticket exists."
 msgstr "Das Ticket existiert."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:883
-#: waeup/kofa/students/browser.py:1813
+#: waeup/kofa/students/browser.py:879
+#: waeup/kofa/students/browser.py:1809
 msgid "Successfully added ${a}."
 msgstr "Erfolgreich hinzugefügt: ${a}"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:904
+#: waeup/kofa/students/browser.py:900
 msgid "${a}: Course Ticket ${b}"
 msgstr "${a}: Kursticket ${b}"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:920
+#: waeup/kofa/students/browser.py:916
 msgid "Manage course ticket ${a}"
 msgstr "Verwalte Kursticket ${a}"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:947
+#: waeup/kofa/students/browser.py:943
 msgid "${a}: Payments"
 msgstr "${a}: Zahlungen"
 
-#: waeup/kofa/students/browser.py:992
+#: waeup/kofa/students/browser.py:988
 msgid "Add online payment"
 msgstr "Ticket für Online-Bezahlung hinzufügen"
 
-#: waeup/kofa/students/browser.py:995
+#: waeup/kofa/students/browser.py:991
 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
@@ -3909,5 +3877,5 @@
 msgstr "8. Studienjahr"
 
-#: waeup/kofa/utils/utils.py:122
+#: waeup/kofa/utils/utils.py:228
 msgid ""
 "Fullname: ${a}\n"
@@ -3925,5 +3893,5 @@
 "${e}\n"
 
-#: waeup/kofa/utils/utils.py:167
+#: waeup/kofa/utils/utils.py:273
 msgid ""
 "Dear ${a},\n"
@@ -3965,5 +3933,5 @@
 #: waeup/kofa/widgets/sequencewidget.pt:18
 msgid "Don't forget to save the form after adding or deleting items."
-msgstr "Vergessen Sie nicht, das Formular zu löschen, wenn Sie Elemente hinzugefügt oder entfernt haben."
+msgstr "Vergessen Sie nicht, das Formular zu sichern, wenn Sie Elemente hinzugefügt oder entfernt haben."
 
 #. Default: "Remove selected 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 7838)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/en/LC_MESSAGES/waeup.kofa.po	(revision 7839)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Fri Mar  9 23:09:56 2012\n"
+"POT-Creation-Date: Sun Mar 11 16:45:08 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -30,6 +30,6 @@
 #: waeup/kofa/accesscodes/browser.py:100 waeup/kofa/accesscodes/browser.py:113
 #: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:130
-#: waeup/kofa/applicants/browser.py:182 waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:338
+#: waeup/kofa/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
@@ -45,7 +45,7 @@
 #: waeup/kofa/browser/pages.py:1767 waeup/kofa/browser/pages.py:1769
 #: waeup/kofa/browser/pages.py:1804 waeup/kofa/browser/pages.py:1855
-#: waeup/kofa/browser/pages.py:1907 waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:748 waeup/kofa/students/browser.py:888
+#: waeup/kofa/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
 msgid "Cancel"
 msgstr ""
@@ -87,5 +87,5 @@
 #: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:592
 #: waeup/kofa/browser/pages.py:1142 waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:171 waeup/kofa/students/browser.py:205
+#: waeup/kofa/students/browser.py:167 waeup/kofa/students/browser.py:201
 msgid "Search"
 msgstr ""
@@ -342,15 +342,15 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:325
-#: waeup/kofa/applicants/browser.py:745
+#: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:326
+#: waeup/kofa/applicants/browser.py:746
 msgid "Could not delete:"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py:328
-#: waeup/kofa/applicants/browser.py:748 waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:243 waeup/kofa/students/browser.py:642
-#: waeup/kofa/students/browser.py:796 waeup/kofa/students/browser.py:974
-#: waeup/kofa/students/browser.py:1184 waeup/kofa/students/browser.py:1770
+#: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py: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
 msgid "Successfully removed: ${a}"
 msgstr ""
@@ -372,8 +372,8 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:254 waeup/kofa/applicants/browser.py:301
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:688
-#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:838 waeup/kofa/browser/pages.py:476
+#: waeup/kofa/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
@@ -382,97 +382,97 @@
 #: waeup/kofa/browser/pages.py:1716 waeup/kofa/browser/pages.py:1767
 #: waeup/kofa/browser/pages.py:1788 waeup/kofa/hostels/browser.py:209
-#: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:319
-#: waeup/kofa/students/browser.py:359 waeup/kofa/students/browser.py:458
-#: waeup/kofa/students/browser.py:535 waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:600 waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:771 waeup/kofa/students/browser.py:1444
-#: waeup/kofa/students/browser.py:1459 waeup/kofa/students/browser.py:1574
+#: waeup/kofa/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
 msgid "Save"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:333
-#: waeup/kofa/applicants/browser.py:361
+#: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:334
+#: waeup/kofa/applicants/browser.py:362
 msgid "Add applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:265 waeup/kofa/applicants/viewlets.py:95
+#: waeup/kofa/applicants/browser.py:266 waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:305 waeup/kofa/applicants/browser.py:717
+#: waeup/kofa/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:385
+#: waeup/kofa/students/browser.py:381
 msgid "Form has been saved."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:314
+#: waeup/kofa/applicants/browser.py:315
 msgid "No applicant selected!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:364
+#: waeup/kofa/applicants/browser.py:365
 msgid "Create application record"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:369
+#: waeup/kofa/applicants/browser.py:370
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:382
+#: waeup/kofa/applicants/browser.py:383
 msgid "Applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:397 waeup/kofa/students/browser.py:285
+#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:281
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:286
+#: waeup/kofa/applicants/browser.py:399 waeup/kofa/students/browser.py:282
 msgid "unset"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:403
+#: waeup/kofa/applicants/browser.py:404
 msgid "${a} Application Record ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:454
+#: waeup/kofa/applicants/browser.py:455
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:461 waeup/kofa/students/browser.py:1023
+#: waeup/kofa/applicants/browser.py:462 waeup/kofa/students/browser.py:1019
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:474 waeup/kofa/students/browser.py:1037
+#: waeup/kofa/applicants/browser.py:475 waeup/kofa/students/browser.py:1033
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:501 waeup/kofa/students/browser.py:1056
+#: waeup/kofa/applicants/browser.py:502 waeup/kofa/students/browser.py:1052
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:529 waeup/kofa/students/browser.py:1105
+#: waeup/kofa/applicants/browser.py:530 waeup/kofa/students/browser.py:1101
 msgid "Valid callback received."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:550
+#: waeup/kofa/applicants/browser.py:551
 msgid "Payment Data"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:556
+#: waeup/kofa/applicants/browser.py:557
 msgid "Online Payment Receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:562
+#: waeup/kofa/applicants/browser.py:563
 msgid "Ticket not yet paid."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:627
+#: waeup/kofa/applicants/browser.py:628
 msgid "Uploaded image is too big!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:632
+#: waeup/kofa/applicants/browser.py:633
 msgid "jpg file extension expected."
 msgstr ""
@@ -482,33 +482,33 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:846
+#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:795
+#: waeup/kofa/applicants/browser.py:847
 msgid "Final Submit"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:758
-#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:827
-#: waeup/kofa/students/browser.py:980
+#: 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
 msgid "Add online payment ticket"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:763
-#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:832 waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:780 waeup/kofa/students/browser.py:956
-#: waeup/kofa/students/browser.py:1752
+#: 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
 msgid "Remove selected tickets"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:674
+#: waeup/kofa/applicants/browser.py:675
 msgid "${a} Application Form ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:685 waeup/kofa/students/browser.py:356
+#: waeup/kofa/applicants/browser.py:686 waeup/kofa/students/browser.py:352
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:732 waeup/kofa/students/browser.py:962
+#: waeup/kofa/applicants/browser.py:733 waeup/kofa/students/browser.py:958
 msgid "No payment selected."
 msgstr ""
@@ -519,10 +519,10 @@
 
 #: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:105
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:308
+#: waeup/kofa/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:206
-#: waeup/kofa/students/browser.py:1151 waeup/kofa/students/browser.py:1164
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:202
+#: waeup/kofa/students/browser.py:1147 waeup/kofa/students/browser.py:1160
 msgid "Remove selected"
 msgstr ""
@@ -533,10 +533,10 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:805 waeup/kofa/students/browser.py:88
+#: waeup/kofa/applicants/browser.py:806 waeup/kofa/students/browser.py:88
 msgid "The requested form is locked (read-only)."
 msgstr ""
 
 #: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:139
-#: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:347
+#: waeup/kofa/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
@@ -545,10 +545,6 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:819
-msgid "No passport picture uploaded."
-msgstr ""
-
 #: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:135
-#: waeup/kofa/applicants/browser.py:257 waeup/kofa/applicants/browser.py:343
+#: waeup/kofa/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
@@ -557,5 +553,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:821
+#: waeup/kofa/applicants/browser.py:820
+msgid "No passport picture uploaded."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:822
 msgid "Passport picture confirmation box not ticked."
 msgstr ""
@@ -565,38 +565,38 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:858 waeup/kofa/students/browser.py:1619
+#: waeup/kofa/applicants/browser.py:859 waeup/kofa/students/browser.py:1615
 msgid "This form cannot be submitted. Wrong state!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:863
+#: waeup/kofa/applicants/browser.py:864
 msgid "Form has been submitted."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:898
+#: waeup/kofa/applicants/browser.py:899
 msgid "Register for ${a} Application"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:904
+#: waeup/kofa/applicants/browser.py:905
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:909
+#: waeup/kofa/applicants/browser.py:910
 msgid "Application has ended."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:918
+#: waeup/kofa/applicants/browser.py:919
 msgid "Get login credentials"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:933
+#: waeup/kofa/applicants/browser.py:934
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:940
+#: waeup/kofa/applicants/browser.py:941
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:949
+#: waeup/kofa/applicants/browser.py:950
 msgid "Your registration was successful."
 msgstr ""
@@ -664,5 +664,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:713
+#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:709
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -688,5 +688,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:714
+#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:710
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -783,11 +783,11 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:375
-#: waeup/kofa/interfaces.py:401 waeup/kofa/students/interfaces.py:490
+#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:373
+#: waeup/kofa/interfaces.py:399 waeup/kofa/students/interfaces.py:490
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:380
-#: waeup/kofa/interfaces.py:408 waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:378
+#: waeup/kofa/interfaces.py:406 waeup/kofa/students/interfaces.py:203
 msgid "Phone"
 msgstr ""
@@ -897,5 +897,5 @@
 
 #: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:258
+#: waeup/kofa/students/browser.py:254
 msgid "Create student record"
 msgstr ""
@@ -1080,5 +1080,5 @@
 
 #: waeup/kofa/browser/pages.py:113 waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:287 waeup/kofa/students/browser.py:230
+#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:226
 msgid "No item selected."
 msgstr ""
@@ -1272,5 +1272,5 @@
 
 #: waeup/kofa/browser/pages.py:253 waeup/kofa/browser/pages.py:272
-#: waeup/kofa/browser/pages.py:536 waeup/kofa/students/browser.py:320
+#: waeup/kofa/browser/pages.py:536 waeup/kofa/students/browser.py:316
 msgid "Your message has been sent."
 msgstr ""
@@ -1324,5 +1324,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:301
+#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:297
 msgid "Send message to ${a}"
 msgstr ""
@@ -1861,5 +1861,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:212 waeup/kofa/hostels/browser.py:281
+#: waeup/kofa/hostels/browser.py:212 waeup/kofa/hostels/browser.py:280
 msgid "Release selected beds"
 msgstr ""
@@ -1872,18 +1872,18 @@
 
 #. Default: ""
-#: waeup/kofa/hostels/browser.py:275
+#: waeup/kofa/hostels/browser.py:274
 msgid "Successfully switched beds: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/hostels/browser.py:299
+#: waeup/kofa/hostels/browser.py:298
 msgid "Successfully released beds: ${a}"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:304
+#: waeup/kofa/hostels/browser.py:303
 msgid "No allocated bed selected."
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:316
+#: waeup/kofa/hostels/browser.py:315
 msgid "Allocate student"
 msgstr ""
@@ -2112,41 +2112,41 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:174
+#: waeup/kofa/interfaces.py:172
 msgid "Subject"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:178
+#: waeup/kofa/interfaces.py:176
 msgid "Grade"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:306
+#: waeup/kofa/interfaces.py:304
 msgid "Importer name"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:310
+#: waeup/kofa/interfaces.py:308
 msgid "Import mode"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:335
+#: waeup/kofa/interfaces.py:333
 msgid "Email Address:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:342
+#: waeup/kofa/interfaces.py:340
 msgid "Email to:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:349
+#: waeup/kofa/interfaces.py:347
 msgid "Subject:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:353
+#: waeup/kofa/interfaces.py:351
 msgid "Full Name:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:357
+#: waeup/kofa/interfaces.py:355
 msgid "Text:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:388
+#: waeup/kofa/interfaces.py:386
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2158,5 +2158,5 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:391
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2165,97 +2165,97 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:397
+#: waeup/kofa/interfaces.py:395
 msgid "Description/Notice"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:414
+#: waeup/kofa/interfaces.py:412
 msgid "Portal roles"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:457
+#: waeup/kofa/interfaces.py:455
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:458
+#: waeup/kofa/interfaces.py:456
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:463
+#: waeup/kofa/interfaces.py:461
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:469
+#: waeup/kofa/interfaces.py:467
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:476
+#: waeup/kofa/interfaces.py:474
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:488
+#: waeup/kofa/interfaces.py:486
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:496
+#: waeup/kofa/interfaces.py:494
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:504
+#: waeup/kofa/interfaces.py:502
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:510
+#: waeup/kofa/interfaces.py:508
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:517
+#: waeup/kofa/interfaces.py:515
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:518
+#: waeup/kofa/interfaces.py:516
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:523
+#: waeup/kofa/interfaces.py:521
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:530
+#: waeup/kofa/interfaces.py:528
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:537
+#: waeup/kofa/interfaces.py:535
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:546 waeup/kofa/interfaces.py:598
+#: waeup/kofa/interfaces.py:544 waeup/kofa/interfaces.py:596
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:554 waeup/kofa/payments/interfaces.py:30
+#: waeup/kofa/interfaces.py:552 waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:559 waeup/kofa/payments/interfaces.py:106
+#: waeup/kofa/interfaces.py:557 waeup/kofa/payments/interfaces.py:106
 msgid "Surcharge 1"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:564 waeup/kofa/payments/interfaces.py:113
+#: waeup/kofa/interfaces.py:562 waeup/kofa/payments/interfaces.py:113
 msgid "Surcharge 2"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:569 waeup/kofa/payments/interfaces.py:120
+#: waeup/kofa/interfaces.py:567 waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:574
+#: waeup/kofa/interfaces.py:572
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:579
+#: waeup/kofa/interfaces.py:577
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:584 waeup/kofa/payments/interfaces.py:36
+#: waeup/kofa/interfaces.py:582 waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
 msgstr ""
@@ -2287,36 +2287,4 @@
 #: waeup/kofa/interfaces.py:79
 msgid "courses validated"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:82
-msgid "Math"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:83
-msgid "Biology"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:84
-msgid "English"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:92
-msgid "Very Good"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:93
-msgid "Good"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:94
-msgid "Satisfactory"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:95
-msgid "Sufficient"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:96
-msgid "Fail"
 msgstr ""
 
@@ -2412,24 +2380,20 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1003 waeup/kofa/students/browser.py:1225
-msgid "Your current session does not match accommodation session."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1072
+#: waeup/kofa/students/browser.py:1068
 msgid "This ticket has already been paid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1085 waeup/kofa/students/browser.py:1093
-#: waeup/kofa/students/browser.py:1101
+#: waeup/kofa/students/browser.py:1081 waeup/kofa/students/browser.py:1089
+#: waeup/kofa/students/browser.py:1097
 msgid "Valid callback received. ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1155
+#: waeup/kofa/students/browser.py:1151
 msgid "${a}: Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1167
+#: waeup/kofa/students/browser.py:1163
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
@@ -2440,22 +2404,26 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1174
+#: waeup/kofa/students/browser.py:1170
 msgid "No bed ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1205
+#: waeup/kofa/students/browser.py:1201
 msgid "Add bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1207
+#: waeup/kofa/students/browser.py:1203
 msgid "Create bed ticket"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1211
+msgid "Your data are incomplete."
+msgstr ""
+
 #: waeup/kofa/students/browser.py:1215
-msgid "Your data are incomplete."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1219
 msgid "You are in the wrong registration state."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1226
+msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
@@ -2465,61 +2433,57 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1230
-msgid "You already booked a bed space in current accommodation session."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1241 waeup/kofa/students/browser.py:1537
-#: waeup/kofa/students/browser.py:1650
+#: 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:1261 waeup/kofa/students/browser.py:1389
+#: waeup/kofa/students/browser.py:1257 waeup/kofa/students/browser.py:1385
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1266 waeup/kofa/students/browser.py:1542
-#: waeup/kofa/students/browser.py:1655
+#: waeup/kofa/students/browser.py:1262 waeup/kofa/students/browser.py:1538
+#: waeup/kofa/students/browser.py:1651
 msgid "Activation code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1269 waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1658 waeup/kofa/students/browser.py:1917
+#: waeup/kofa/students/browser.py:1265 waeup/kofa/students/browser.py:1541
+#: waeup/kofa/students/browser.py:1654 waeup/kofa/students/browser.py:1913
 msgid "invalidated"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1274 waeup/kofa/students/browser.py:1549
-#: waeup/kofa/students/browser.py:1663
+#: waeup/kofa/students/browser.py:1270 waeup/kofa/students/browser.py:1545
+#: waeup/kofa/students/browser.py:1659
 msgid "You are not the owner of this access code."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1285 waeup/kofa/students/browser.py:1403
+#: waeup/kofa/students/browser.py:1281 waeup/kofa/students/browser.py:1399
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1294
+#: waeup/kofa/students/browser.py:1290
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1312
+#: waeup/kofa/students/browser.py:1308
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1328
+#: waeup/kofa/students/browser.py:1324
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1334
+#: waeup/kofa/students/browser.py:1330
 msgid "Bed Allocation: "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1361
+#: waeup/kofa/students/browser.py:1357
 msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1367
+#: waeup/kofa/students/browser.py:1363
 msgid "Student can't be relocated."
 msgstr ""
@@ -2530,19 +2494,23 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1410
+#: waeup/kofa/students/browser.py:1406
 msgid "Student relocated: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1429
+#: waeup/kofa/students/browser.py:1425
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1441 waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/browser.py:1437 waeup/kofa/students/viewlets.py:356
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1456 waeup/kofa/students/viewlets.py:365
+#: waeup/kofa/students/browser.py:1452 waeup/kofa/students/viewlets.py:365
 msgid "Change password"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1466
+msgid "Password changed."
 msgstr ""
 
@@ -2552,201 +2520,197 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1470
-msgid "Password changed."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1482
+#: waeup/kofa/students/browser.py:1478
 msgid "Upload portrait"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1497 waeup/kofa/students/viewlets.py:389
+#: waeup/kofa/students/browser.py:1493 waeup/kofa/students/viewlets.py:389
 #: waeup/kofa/students/workflow.py:44
 msgid "Start clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1501
+#: waeup/kofa/students/browser.py:1497
 msgid "Start clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1518 waeup/kofa/students/browser.py:1639
+#: waeup/kofa/students/browser.py:1514 waeup/kofa/students/browser.py:1635
 msgid "Wrong state"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1518
+msgid "No portrait uploaded."
+msgstr ""
+
 #: waeup/kofa/students/browser.py:1522
-msgid "No portrait uploaded."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1526
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1553
+#: waeup/kofa/students/browser.py:1549
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1565
+#: waeup/kofa/students/browser.py:1561
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1577 waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1573 waeup/kofa/students/browser.py:1587
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1585
+#: waeup/kofa/students/browser.py:1581
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1600 waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1596 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1601
+#: waeup/kofa/students/browser.py:1597
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1604
+#: waeup/kofa/students/browser.py:1600
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1613
+#: waeup/kofa/students/browser.py:1609
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1622
+#: waeup/kofa/students/browser.py:1618
 msgid "Clearance has been requested."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1631 waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:1627 waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1635
+#: waeup/kofa/students/browser.py:1631
 msgid "Start course registration now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1671
+#: waeup/kofa/students/browser.py:166
+msgid "Student Section"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1667
 msgid "Course registration has been started."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1690
+#: waeup/kofa/students/browser.py:1686
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1699
+#: waeup/kofa/students/browser.py:1695
 msgid "Create course list now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:170
-msgid "Student Section"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1738
+#. Default: ""
+#: waeup/kofa/students/browser.py:1734
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1771
+msgid "Register course list"
+msgstr ""
+
 #: waeup/kofa/students/browser.py:1775
-msgid "Register course list"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1779
 msgid "Course list has been registered."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1825
+#: waeup/kofa/students/browser.py:182 waeup/kofa/students/browser.py:218
+msgid "Empty search string"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1821
 msgid "Change my password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1835
+#: waeup/kofa/students/browser.py:1831
 msgid "Get new login credentials"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1849
+#: waeup/kofa/students/browser.py:1845
 msgid "No student record found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1857
+#: waeup/kofa/students/browser.py:1853
 msgid "You have successfully changed your password for the"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:186 waeup/kofa/students/browser.py:222
-msgid "Empty search string"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1862
+#. Default: ""
+#: waeup/kofa/students/browser.py:1858
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1873
+#: waeup/kofa/students/browser.py:1869
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1876
+#: waeup/kofa/students/browser.py:1872
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1891
+#: waeup/kofa/students/browser.py:1887
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1899
+#: waeup/kofa/students/browser.py:1895
 msgid "Access code is invalid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1902
+#: waeup/kofa/students/browser.py:1898
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1908
+#: waeup/kofa/students/browser.py:1904
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1914
+#: waeup/kofa/students/browser.py:1910
 msgid "Access code has already been used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1923
+#: waeup/kofa/students/browser.py:1919
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:204 waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:200 waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:228 waeup/kofa/students/browser.py:1888
+#: waeup/kofa/students/browser.py:224 waeup/kofa/students/browser.py:1884
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:255 waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:251 waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:263
+#: waeup/kofa/students/browser.py:259
 msgid "Student record created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:279
+#: waeup/kofa/students/browser.py:275
 msgid "${a}: Base Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:322 waeup/kofa/students/browser.py:1865
+#: waeup/kofa/students/browser.py:318 waeup/kofa/students/browser.py:1861
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:333
+#: waeup/kofa/students/browser.py:329
 msgid "Manage base data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:402
+#: waeup/kofa/students/browser.py:398
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:418 waeup/kofa/students/viewlets.py:104
+#: waeup/kofa/students/browser.py:414 waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
@@ -2754,84 +2718,84 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:424
+#: waeup/kofa/students/browser.py:420
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:444
+#: waeup/kofa/students/browser.py:440
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:473
+#: waeup/kofa/students/browser.py:469
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:475 waeup/kofa/students/browser.py:499
+#: waeup/kofa/students/browser.py:471 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 has been annulled."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:496
 msgid "Clearance request has been rejected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:522
+#: waeup/kofa/students/browser.py:518
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:532
+#: waeup/kofa/students/browser.py:528
 msgid "Manage personal data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:552
+#: waeup/kofa/students/browser.py:548
 msgid "${a}: Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:582
+#: waeup/kofa/students/browser.py:578
 msgid "Manage study course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:626
+#: waeup/kofa/students/browser.py:581 waeup/kofa/students/browser.py:622
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:586 waeup/kofa/students/browser.py:612
+#: waeup/kofa/students/browser.py:582 waeup/kofa/students/browser.py:608
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:620
+#: waeup/kofa/students/browser.py:616
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:622 waeup/kofa/students/browser.py:1708
+#: waeup/kofa/students/browser.py:618 waeup/kofa/students/browser.py:1704
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:632
+#: waeup/kofa/students/browser.py:628
 msgid "No study level selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:668
+#: waeup/kofa/students/browser.py:664
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:691
+#: waeup/kofa/students/browser.py:687
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:697
+#: waeup/kofa/students/browser.py:693
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:706
+#: waeup/kofa/students/browser.py:702
 msgid "Course Registration Slip  "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:712
+#: waeup/kofa/students/browser.py:708
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -2840,5 +2804,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:715
+#: waeup/kofa/students/browser.py:711
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -2846,10 +2810,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:716
+#: waeup/kofa/students/browser.py:712
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:717
+#: waeup/kofa/students/browser.py:713
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -2857,5 +2821,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:718
+#: waeup/kofa/students/browser.py:714
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -2863,5 +2827,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:719 waeup/kofa/students/interfaces.py:370
+#: waeup/kofa/students/browser.py:715 waeup/kofa/students/interfaces.py:370
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2870,69 +2834,73 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:747 waeup/kofa/students/browser.py:776
-#: waeup/kofa/students/browser.py:861 waeup/kofa/students/browser.py:866
-#: waeup/kofa/students/browser.py:1748 waeup/kofa/students/browser.py:1798
+#: waeup/kofa/students/browser.py: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
 msgid "Add course ticket"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:768
+#: waeup/kofa/students/browser.py:764
 msgid "Manage study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:786 waeup/kofa/students/browser.py:1758
+#: waeup/kofa/students/browser.py:782 waeup/kofa/students/browser.py:1754
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:810 waeup/kofa/students/browser.py:832
+#: waeup/kofa/students/browser.py:806 waeup/kofa/students/browser.py:828
 msgid "This level does not correspond current level."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:814
+#: waeup/kofa/students/browser.py:810
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:816 waeup/kofa/students/browser.py:844
+#: waeup/kofa/students/browser.py:812 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 annulled."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:841
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:881 waeup/kofa/students/browser.py:1811
+#: waeup/kofa/students/browser.py:877 waeup/kofa/students/browser.py:1807
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:883 waeup/kofa/students/browser.py:1813
+#: waeup/kofa/students/browser.py:879 waeup/kofa/students/browser.py:1809
 msgid "Successfully added ${a}."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:904
+#: waeup/kofa/students/browser.py:900
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:920
+#: waeup/kofa/students/browser.py:916
 msgid "Manage course ticket ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:947
+#: waeup/kofa/students/browser.py:943
 msgid "${a}: Payments"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:992
+#: waeup/kofa/students/browser.py:988
 msgid "Add online payment"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:995
+#: waeup/kofa/students/browser.py:991
 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 ""
 
@@ -3693,5 +3661,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:122
+#: waeup/kofa/utils/utils.py:228
 msgid ""
 "Fullname: ${a}\n"
@@ -3703,5 +3671,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:167
+#: waeup/kofa/utils/utils.py:273
 msgid ""
 "Dear ${a},\n"
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 7838)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/fr/LC_MESSAGES/waeup.kofa.po	(revision 7839)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Fri Mar  9 23:09:56 2012\n"
+"POT-Creation-Date: Sun Mar 11 16:45:08 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -30,6 +30,6 @@
 #: waeup/kofa/accesscodes/browser.py:100 waeup/kofa/accesscodes/browser.py:113
 #: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:130
-#: waeup/kofa/applicants/browser.py:182 waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:338
+#: waeup/kofa/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
@@ -45,7 +45,7 @@
 #: waeup/kofa/browser/pages.py:1767 waeup/kofa/browser/pages.py:1769
 #: waeup/kofa/browser/pages.py:1804 waeup/kofa/browser/pages.py:1855
-#: waeup/kofa/browser/pages.py:1907 waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:748 waeup/kofa/students/browser.py:888
+#: waeup/kofa/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
 msgid "Cancel"
 msgstr ""
@@ -87,5 +87,5 @@
 #: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:592
 #: waeup/kofa/browser/pages.py:1142 waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:171 waeup/kofa/students/browser.py:205
+#: waeup/kofa/students/browser.py:167 waeup/kofa/students/browser.py:201
 msgid "Search"
 msgstr ""
@@ -342,15 +342,15 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:325
-#: waeup/kofa/applicants/browser.py:745
+#: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:326
+#: waeup/kofa/applicants/browser.py:746
 msgid "Could not delete:"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py:328
-#: waeup/kofa/applicants/browser.py:748 waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:243 waeup/kofa/students/browser.py:642
-#: waeup/kofa/students/browser.py:796 waeup/kofa/students/browser.py:974
-#: waeup/kofa/students/browser.py:1184 waeup/kofa/students/browser.py:1770
+#: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py: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
 msgid "Successfully removed: ${a}"
 msgstr ""
@@ -372,8 +372,8 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:254 waeup/kofa/applicants/browser.py:301
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:688
-#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:838 waeup/kofa/browser/pages.py:476
+#: waeup/kofa/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
@@ -382,97 +382,97 @@
 #: waeup/kofa/browser/pages.py:1716 waeup/kofa/browser/pages.py:1767
 #: waeup/kofa/browser/pages.py:1788 waeup/kofa/hostels/browser.py:209
-#: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:319
-#: waeup/kofa/students/browser.py:359 waeup/kofa/students/browser.py:458
-#: waeup/kofa/students/browser.py:535 waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:600 waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:771 waeup/kofa/students/browser.py:1444
-#: waeup/kofa/students/browser.py:1459 waeup/kofa/students/browser.py:1574
+#: waeup/kofa/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
 msgid "Save"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:333
-#: waeup/kofa/applicants/browser.py:361
+#: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:334
+#: waeup/kofa/applicants/browser.py:362
 msgid "Add applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:265 waeup/kofa/applicants/viewlets.py:95
+#: waeup/kofa/applicants/browser.py:266 waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:305 waeup/kofa/applicants/browser.py:717
+#: waeup/kofa/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:385
+#: waeup/kofa/students/browser.py:381
 msgid "Form has been saved."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:314
+#: waeup/kofa/applicants/browser.py:315
 msgid "No applicant selected!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:364
+#: waeup/kofa/applicants/browser.py:365
 msgid "Create application record"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:369
+#: waeup/kofa/applicants/browser.py:370
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:382
+#: waeup/kofa/applicants/browser.py:383
 msgid "Applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:397 waeup/kofa/students/browser.py:285
+#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:281
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:286
+#: waeup/kofa/applicants/browser.py:399 waeup/kofa/students/browser.py:282
 msgid "unset"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:403
+#: waeup/kofa/applicants/browser.py:404
 msgid "${a} Application Record ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:454
+#: waeup/kofa/applicants/browser.py:455
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:461 waeup/kofa/students/browser.py:1023
+#: waeup/kofa/applicants/browser.py:462 waeup/kofa/students/browser.py:1019
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:474 waeup/kofa/students/browser.py:1037
+#: waeup/kofa/applicants/browser.py:475 waeup/kofa/students/browser.py:1033
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:501 waeup/kofa/students/browser.py:1056
+#: waeup/kofa/applicants/browser.py:502 waeup/kofa/students/browser.py:1052
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:529 waeup/kofa/students/browser.py:1105
+#: waeup/kofa/applicants/browser.py:530 waeup/kofa/students/browser.py:1101
 msgid "Valid callback received."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:550
+#: waeup/kofa/applicants/browser.py:551
 msgid "Payment Data"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:556
+#: waeup/kofa/applicants/browser.py:557
 msgid "Online Payment Receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:562
+#: waeup/kofa/applicants/browser.py:563
 msgid "Ticket not yet paid."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:627
+#: waeup/kofa/applicants/browser.py:628
 msgid "Uploaded image is too big!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:632
+#: waeup/kofa/applicants/browser.py:633
 msgid "jpg file extension expected."
 msgstr ""
@@ -482,33 +482,33 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:846
+#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:795
+#: waeup/kofa/applicants/browser.py:847
 msgid "Final Submit"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:758
-#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:827
-#: waeup/kofa/students/browser.py:980
+#: 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
 msgid "Add online payment ticket"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:763
-#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:832 waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:780 waeup/kofa/students/browser.py:956
-#: waeup/kofa/students/browser.py:1752
+#: 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
 msgid "Remove selected tickets"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:674
+#: waeup/kofa/applicants/browser.py:675
 msgid "${a} Application Form ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:685 waeup/kofa/students/browser.py:356
+#: waeup/kofa/applicants/browser.py:686 waeup/kofa/students/browser.py:352
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:732 waeup/kofa/students/browser.py:962
+#: waeup/kofa/applicants/browser.py:733 waeup/kofa/students/browser.py:958
 msgid "No payment selected."
 msgstr ""
@@ -519,10 +519,10 @@
 
 #: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:105
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:308
+#: waeup/kofa/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:206
-#: waeup/kofa/students/browser.py:1151 waeup/kofa/students/browser.py:1164
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:202
+#: waeup/kofa/students/browser.py:1147 waeup/kofa/students/browser.py:1160
 msgid "Remove selected"
 msgstr ""
@@ -533,10 +533,10 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:805 waeup/kofa/students/browser.py:88
+#: waeup/kofa/applicants/browser.py:806 waeup/kofa/students/browser.py:88
 msgid "The requested form is locked (read-only)."
 msgstr ""
 
 #: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:139
-#: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:347
+#: waeup/kofa/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
@@ -545,10 +545,6 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:819
-msgid "No passport picture uploaded."
-msgstr ""
-
 #: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:135
-#: waeup/kofa/applicants/browser.py:257 waeup/kofa/applicants/browser.py:343
+#: waeup/kofa/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
@@ -557,5 +553,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:821
+#: waeup/kofa/applicants/browser.py:820
+msgid "No passport picture uploaded."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:822
 msgid "Passport picture confirmation box not ticked."
 msgstr ""
@@ -565,38 +565,38 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:858 waeup/kofa/students/browser.py:1619
+#: waeup/kofa/applicants/browser.py:859 waeup/kofa/students/browser.py:1615
 msgid "This form cannot be submitted. Wrong state!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:863
+#: waeup/kofa/applicants/browser.py:864
 msgid "Form has been submitted."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:898
+#: waeup/kofa/applicants/browser.py:899
 msgid "Register for ${a} Application"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:904
+#: waeup/kofa/applicants/browser.py:905
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:909
+#: waeup/kofa/applicants/browser.py:910
 msgid "Application has ended."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:918
+#: waeup/kofa/applicants/browser.py:919
 msgid "Get login credentials"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:933
+#: waeup/kofa/applicants/browser.py:934
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:940
+#: waeup/kofa/applicants/browser.py:941
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:949
+#: waeup/kofa/applicants/browser.py:950
 msgid "Your registration was successful."
 msgstr ""
@@ -664,5 +664,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:713
+#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:709
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -688,5 +688,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:714
+#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:710
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -783,11 +783,11 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:375
-#: waeup/kofa/interfaces.py:401 waeup/kofa/students/interfaces.py:490
+#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:373
+#: waeup/kofa/interfaces.py:399 waeup/kofa/students/interfaces.py:490
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:380
-#: waeup/kofa/interfaces.py:408 waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:378
+#: waeup/kofa/interfaces.py:406 waeup/kofa/students/interfaces.py:203
 msgid "Phone"
 msgstr ""
@@ -897,5 +897,5 @@
 
 #: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:258
+#: waeup/kofa/students/browser.py:254
 msgid "Create student record"
 msgstr ""
@@ -1080,5 +1080,5 @@
 
 #: waeup/kofa/browser/pages.py:113 waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:287 waeup/kofa/students/browser.py:230
+#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:226
 msgid "No item selected."
 msgstr ""
@@ -1272,5 +1272,5 @@
 
 #: waeup/kofa/browser/pages.py:253 waeup/kofa/browser/pages.py:272
-#: waeup/kofa/browser/pages.py:536 waeup/kofa/students/browser.py:320
+#: waeup/kofa/browser/pages.py:536 waeup/kofa/students/browser.py:316
 msgid "Your message has been sent."
 msgstr ""
@@ -1324,5 +1324,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:301
+#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:297
 msgid "Send message to ${a}"
 msgstr ""
@@ -1861,5 +1861,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:212 waeup/kofa/hostels/browser.py:281
+#: waeup/kofa/hostels/browser.py:212 waeup/kofa/hostels/browser.py:280
 msgid "Release selected beds"
 msgstr ""
@@ -1872,18 +1872,18 @@
 
 #. Default: ""
-#: waeup/kofa/hostels/browser.py:275
+#: waeup/kofa/hostels/browser.py:274
 msgid "Successfully switched beds: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/hostels/browser.py:299
+#: waeup/kofa/hostels/browser.py:298
 msgid "Successfully released beds: ${a}"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:304
+#: waeup/kofa/hostels/browser.py:303
 msgid "No allocated bed selected."
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:316
+#: waeup/kofa/hostels/browser.py:315
 msgid "Allocate student"
 msgstr ""
@@ -2112,41 +2112,41 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:174
+#: waeup/kofa/interfaces.py:172
 msgid "Subject"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:178
+#: waeup/kofa/interfaces.py:176
 msgid "Grade"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:306
+#: waeup/kofa/interfaces.py:304
 msgid "Importer name"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:310
+#: waeup/kofa/interfaces.py:308
 msgid "Import mode"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:335
+#: waeup/kofa/interfaces.py:333
 msgid "Email Address:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:342
+#: waeup/kofa/interfaces.py:340
 msgid "Email to:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:349
+#: waeup/kofa/interfaces.py:347
 msgid "Subject:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:353
+#: waeup/kofa/interfaces.py:351
 msgid "Full Name:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:357
+#: waeup/kofa/interfaces.py:355
 msgid "Text:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:388
+#: waeup/kofa/interfaces.py:386
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2158,5 +2158,5 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:391
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2165,97 +2165,97 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:397
+#: waeup/kofa/interfaces.py:395
 msgid "Description/Notice"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:414
+#: waeup/kofa/interfaces.py:412
 msgid "Portal roles"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:457
+#: waeup/kofa/interfaces.py:455
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:458
+#: waeup/kofa/interfaces.py:456
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:463
+#: waeup/kofa/interfaces.py:461
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:469
+#: waeup/kofa/interfaces.py:467
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:476
+#: waeup/kofa/interfaces.py:474
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:488
+#: waeup/kofa/interfaces.py:486
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:496
+#: waeup/kofa/interfaces.py:494
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:504
+#: waeup/kofa/interfaces.py:502
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:510
+#: waeup/kofa/interfaces.py:508
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:517
+#: waeup/kofa/interfaces.py:515
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:518
+#: waeup/kofa/interfaces.py:516
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:523
+#: waeup/kofa/interfaces.py:521
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:530
+#: waeup/kofa/interfaces.py:528
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:537
+#: waeup/kofa/interfaces.py:535
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:546 waeup/kofa/interfaces.py:598
+#: waeup/kofa/interfaces.py:544 waeup/kofa/interfaces.py:596
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:554 waeup/kofa/payments/interfaces.py:30
+#: waeup/kofa/interfaces.py:552 waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:559 waeup/kofa/payments/interfaces.py:106
+#: waeup/kofa/interfaces.py:557 waeup/kofa/payments/interfaces.py:106
 msgid "Surcharge 1"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:564 waeup/kofa/payments/interfaces.py:113
+#: waeup/kofa/interfaces.py:562 waeup/kofa/payments/interfaces.py:113
 msgid "Surcharge 2"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:569 waeup/kofa/payments/interfaces.py:120
+#: waeup/kofa/interfaces.py:567 waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:574
+#: waeup/kofa/interfaces.py:572
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:579
+#: waeup/kofa/interfaces.py:577
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:584 waeup/kofa/payments/interfaces.py:36
+#: waeup/kofa/interfaces.py:582 waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
 msgstr ""
@@ -2287,36 +2287,4 @@
 #: waeup/kofa/interfaces.py:79
 msgid "courses validated"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:82
-msgid "Math"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:83
-msgid "Biology"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:84
-msgid "English"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:92
-msgid "Very Good"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:93
-msgid "Good"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:94
-msgid "Satisfactory"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:95
-msgid "Sufficient"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:96
-msgid "Fail"
 msgstr ""
 
@@ -2412,24 +2380,20 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1003 waeup/kofa/students/browser.py:1225
-msgid "Your current session does not match accommodation session."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1072
+#: waeup/kofa/students/browser.py:1068
 msgid "This ticket has already been paid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1085 waeup/kofa/students/browser.py:1093
-#: waeup/kofa/students/browser.py:1101
+#: waeup/kofa/students/browser.py:1081 waeup/kofa/students/browser.py:1089
+#: waeup/kofa/students/browser.py:1097
 msgid "Valid callback received. ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1155
+#: waeup/kofa/students/browser.py:1151
 msgid "${a}: Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1167
+#: waeup/kofa/students/browser.py:1163
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
@@ -2440,22 +2404,26 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1174
+#: waeup/kofa/students/browser.py:1170
 msgid "No bed ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1205
+#: waeup/kofa/students/browser.py:1201
 msgid "Add bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1207
+#: waeup/kofa/students/browser.py:1203
 msgid "Create bed ticket"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1211
+msgid "Your data are incomplete."
+msgstr ""
+
 #: waeup/kofa/students/browser.py:1215
-msgid "Your data are incomplete."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1219
 msgid "You are in the wrong registration state."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1226
+msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
@@ -2465,61 +2433,57 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1230
-msgid "You already booked a bed space in current accommodation session."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1241 waeup/kofa/students/browser.py:1537
-#: waeup/kofa/students/browser.py:1650
+#: 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:1261 waeup/kofa/students/browser.py:1389
+#: waeup/kofa/students/browser.py:1257 waeup/kofa/students/browser.py:1385
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1266 waeup/kofa/students/browser.py:1542
-#: waeup/kofa/students/browser.py:1655
+#: waeup/kofa/students/browser.py:1262 waeup/kofa/students/browser.py:1538
+#: waeup/kofa/students/browser.py:1651
 msgid "Activation code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1269 waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1658 waeup/kofa/students/browser.py:1917
+#: waeup/kofa/students/browser.py:1265 waeup/kofa/students/browser.py:1541
+#: waeup/kofa/students/browser.py:1654 waeup/kofa/students/browser.py:1913
 msgid "invalidated"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1274 waeup/kofa/students/browser.py:1549
-#: waeup/kofa/students/browser.py:1663
+#: waeup/kofa/students/browser.py:1270 waeup/kofa/students/browser.py:1545
+#: waeup/kofa/students/browser.py:1659
 msgid "You are not the owner of this access code."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1285 waeup/kofa/students/browser.py:1403
+#: waeup/kofa/students/browser.py:1281 waeup/kofa/students/browser.py:1399
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1294
+#: waeup/kofa/students/browser.py:1290
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1312
+#: waeup/kofa/students/browser.py:1308
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1328
+#: waeup/kofa/students/browser.py:1324
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1334
+#: waeup/kofa/students/browser.py:1330
 msgid "Bed Allocation: "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1361
+#: waeup/kofa/students/browser.py:1357
 msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1367
+#: waeup/kofa/students/browser.py:1363
 msgid "Student can't be relocated."
 msgstr ""
@@ -2530,19 +2494,23 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1410
+#: waeup/kofa/students/browser.py:1406
 msgid "Student relocated: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1429
+#: waeup/kofa/students/browser.py:1425
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1441 waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/browser.py:1437 waeup/kofa/students/viewlets.py:356
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1456 waeup/kofa/students/viewlets.py:365
+#: waeup/kofa/students/browser.py:1452 waeup/kofa/students/viewlets.py:365
 msgid "Change password"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1466
+msgid "Password changed."
 msgstr ""
 
@@ -2552,201 +2520,197 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1470
-msgid "Password changed."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1482
+#: waeup/kofa/students/browser.py:1478
 msgid "Upload portrait"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1497 waeup/kofa/students/viewlets.py:389
+#: waeup/kofa/students/browser.py:1493 waeup/kofa/students/viewlets.py:389
 #: waeup/kofa/students/workflow.py:44
 msgid "Start clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1501
+#: waeup/kofa/students/browser.py:1497
 msgid "Start clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1518 waeup/kofa/students/browser.py:1639
+#: waeup/kofa/students/browser.py:1514 waeup/kofa/students/browser.py:1635
 msgid "Wrong state"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1518
+msgid "No portrait uploaded."
+msgstr ""
+
 #: waeup/kofa/students/browser.py:1522
-msgid "No portrait uploaded."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1526
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1553
+#: waeup/kofa/students/browser.py:1549
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1565
+#: waeup/kofa/students/browser.py:1561
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1577 waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1573 waeup/kofa/students/browser.py:1587
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1585
+#: waeup/kofa/students/browser.py:1581
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1600 waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1596 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1601
+#: waeup/kofa/students/browser.py:1597
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1604
+#: waeup/kofa/students/browser.py:1600
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1613
+#: waeup/kofa/students/browser.py:1609
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1622
+#: waeup/kofa/students/browser.py:1618
 msgid "Clearance has been requested."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1631 waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:1627 waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1635
+#: waeup/kofa/students/browser.py:1631
 msgid "Start course registration now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1671
+#: waeup/kofa/students/browser.py:166
+msgid "Student Section"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1667
 msgid "Course registration has been started."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1690
+#: waeup/kofa/students/browser.py:1686
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1699
+#: waeup/kofa/students/browser.py:1695
 msgid "Create course list now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:170
-msgid "Student Section"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1738
+#. Default: ""
+#: waeup/kofa/students/browser.py:1734
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1771
+msgid "Register course list"
+msgstr ""
+
 #: waeup/kofa/students/browser.py:1775
-msgid "Register course list"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1779
 msgid "Course list has been registered."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1825
+#: waeup/kofa/students/browser.py:182 waeup/kofa/students/browser.py:218
+msgid "Empty search string"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1821
 msgid "Change my password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1835
+#: waeup/kofa/students/browser.py:1831
 msgid "Get new login credentials"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1849
+#: waeup/kofa/students/browser.py:1845
 msgid "No student record found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1857
+#: waeup/kofa/students/browser.py:1853
 msgid "You have successfully changed your password for the"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:186 waeup/kofa/students/browser.py:222
-msgid "Empty search string"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1862
+#. Default: ""
+#: waeup/kofa/students/browser.py:1858
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1873
+#: waeup/kofa/students/browser.py:1869
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1876
+#: waeup/kofa/students/browser.py:1872
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1891
+#: waeup/kofa/students/browser.py:1887
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1899
+#: waeup/kofa/students/browser.py:1895
 msgid "Access code is invalid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1902
+#: waeup/kofa/students/browser.py:1898
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1908
+#: waeup/kofa/students/browser.py:1904
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1914
+#: waeup/kofa/students/browser.py:1910
 msgid "Access code has already been used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1923
+#: waeup/kofa/students/browser.py:1919
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:204 waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:200 waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:228 waeup/kofa/students/browser.py:1888
+#: waeup/kofa/students/browser.py:224 waeup/kofa/students/browser.py:1884
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:255 waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:251 waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:263
+#: waeup/kofa/students/browser.py:259
 msgid "Student record created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:279
+#: waeup/kofa/students/browser.py:275
 msgid "${a}: Base Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:322 waeup/kofa/students/browser.py:1865
+#: waeup/kofa/students/browser.py:318 waeup/kofa/students/browser.py:1861
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:333
+#: waeup/kofa/students/browser.py:329
 msgid "Manage base data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:402
+#: waeup/kofa/students/browser.py:398
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:418 waeup/kofa/students/viewlets.py:104
+#: waeup/kofa/students/browser.py:414 waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
@@ -2754,84 +2718,84 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:424
+#: waeup/kofa/students/browser.py:420
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:444
+#: waeup/kofa/students/browser.py:440
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:473
+#: waeup/kofa/students/browser.py:469
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:475 waeup/kofa/students/browser.py:499
+#: waeup/kofa/students/browser.py:471 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 has been annulled."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:496
 msgid "Clearance request has been rejected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:522
+#: waeup/kofa/students/browser.py:518
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:532
+#: waeup/kofa/students/browser.py:528
 msgid "Manage personal data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:552
+#: waeup/kofa/students/browser.py:548
 msgid "${a}: Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:582
+#: waeup/kofa/students/browser.py:578
 msgid "Manage study course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:626
+#: waeup/kofa/students/browser.py:581 waeup/kofa/students/browser.py:622
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:586 waeup/kofa/students/browser.py:612
+#: waeup/kofa/students/browser.py:582 waeup/kofa/students/browser.py:608
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:620
+#: waeup/kofa/students/browser.py:616
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:622 waeup/kofa/students/browser.py:1708
+#: waeup/kofa/students/browser.py:618 waeup/kofa/students/browser.py:1704
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:632
+#: waeup/kofa/students/browser.py:628
 msgid "No study level selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:668
+#: waeup/kofa/students/browser.py:664
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:691
+#: waeup/kofa/students/browser.py:687
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:697
+#: waeup/kofa/students/browser.py:693
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:706
+#: waeup/kofa/students/browser.py:702
 msgid "Course Registration Slip  "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:712
+#: waeup/kofa/students/browser.py:708
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -2840,5 +2804,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:715
+#: waeup/kofa/students/browser.py:711
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -2846,10 +2810,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:716
+#: waeup/kofa/students/browser.py:712
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:717
+#: waeup/kofa/students/browser.py:713
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -2857,5 +2821,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:718
+#: waeup/kofa/students/browser.py:714
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -2863,5 +2827,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:719 waeup/kofa/students/interfaces.py:370
+#: waeup/kofa/students/browser.py:715 waeup/kofa/students/interfaces.py:370
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2870,69 +2834,73 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:747 waeup/kofa/students/browser.py:776
-#: waeup/kofa/students/browser.py:861 waeup/kofa/students/browser.py:866
-#: waeup/kofa/students/browser.py:1748 waeup/kofa/students/browser.py:1798
+#: waeup/kofa/students/browser.py: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
 msgid "Add course ticket"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:768
+#: waeup/kofa/students/browser.py:764
 msgid "Manage study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:786 waeup/kofa/students/browser.py:1758
+#: waeup/kofa/students/browser.py:782 waeup/kofa/students/browser.py:1754
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:810 waeup/kofa/students/browser.py:832
+#: waeup/kofa/students/browser.py:806 waeup/kofa/students/browser.py:828
 msgid "This level does not correspond current level."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:814
+#: waeup/kofa/students/browser.py:810
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:816 waeup/kofa/students/browser.py:844
+#: waeup/kofa/students/browser.py:812 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 annulled."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:841
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:881 waeup/kofa/students/browser.py:1811
+#: waeup/kofa/students/browser.py:877 waeup/kofa/students/browser.py:1807
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:883 waeup/kofa/students/browser.py:1813
+#: waeup/kofa/students/browser.py:879 waeup/kofa/students/browser.py:1809
 msgid "Successfully added ${a}."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:904
+#: waeup/kofa/students/browser.py:900
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:920
+#: waeup/kofa/students/browser.py:916
 msgid "Manage course ticket ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:947
+#: waeup/kofa/students/browser.py:943
 msgid "${a}: Payments"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:992
+#: waeup/kofa/students/browser.py:988
 msgid "Add online payment"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:995
+#: waeup/kofa/students/browser.py:991
 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 ""
 
@@ -3693,5 +3661,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:122
+#: waeup/kofa/utils/utils.py:228
 msgid ""
 "Fullname: ${a}\n"
@@ -3703,5 +3671,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:167
+#: waeup/kofa/utils/utils.py:273
 msgid ""
 "Dear ${a},\n"
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 7838)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/ha/LC_MESSAGES/waeup.kofa.po	(revision 7839)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Fri Mar  9 23:09:56 2012\n"
+"POT-Creation-Date: Sun Mar 11 16:45:08 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -30,6 +30,6 @@
 #: waeup/kofa/accesscodes/browser.py:100 waeup/kofa/accesscodes/browser.py:113
 #: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:130
-#: waeup/kofa/applicants/browser.py:182 waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:338
+#: waeup/kofa/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
@@ -45,7 +45,7 @@
 #: waeup/kofa/browser/pages.py:1767 waeup/kofa/browser/pages.py:1769
 #: waeup/kofa/browser/pages.py:1804 waeup/kofa/browser/pages.py:1855
-#: waeup/kofa/browser/pages.py:1907 waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:748 waeup/kofa/students/browser.py:888
+#: waeup/kofa/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
 msgid "Cancel"
 msgstr ""
@@ -87,5 +87,5 @@
 #: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:592
 #: waeup/kofa/browser/pages.py:1142 waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:171 waeup/kofa/students/browser.py:205
+#: waeup/kofa/students/browser.py:167 waeup/kofa/students/browser.py:201
 msgid "Search"
 msgstr ""
@@ -342,15 +342,15 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:325
-#: waeup/kofa/applicants/browser.py:745
+#: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:326
+#: waeup/kofa/applicants/browser.py:746
 msgid "Could not delete:"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py:328
-#: waeup/kofa/applicants/browser.py:748 waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:243 waeup/kofa/students/browser.py:642
-#: waeup/kofa/students/browser.py:796 waeup/kofa/students/browser.py:974
-#: waeup/kofa/students/browser.py:1184 waeup/kofa/students/browser.py:1770
+#: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py: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
 msgid "Successfully removed: ${a}"
 msgstr ""
@@ -372,8 +372,8 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:254 waeup/kofa/applicants/browser.py:301
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:688
-#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:838 waeup/kofa/browser/pages.py:476
+#: waeup/kofa/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
@@ -382,97 +382,97 @@
 #: waeup/kofa/browser/pages.py:1716 waeup/kofa/browser/pages.py:1767
 #: waeup/kofa/browser/pages.py:1788 waeup/kofa/hostels/browser.py:209
-#: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:319
-#: waeup/kofa/students/browser.py:359 waeup/kofa/students/browser.py:458
-#: waeup/kofa/students/browser.py:535 waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:600 waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:771 waeup/kofa/students/browser.py:1444
-#: waeup/kofa/students/browser.py:1459 waeup/kofa/students/browser.py:1574
+#: waeup/kofa/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
 msgid "Save"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:333
-#: waeup/kofa/applicants/browser.py:361
+#: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:334
+#: waeup/kofa/applicants/browser.py:362
 msgid "Add applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:265 waeup/kofa/applicants/viewlets.py:95
+#: waeup/kofa/applicants/browser.py:266 waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:305 waeup/kofa/applicants/browser.py:717
+#: waeup/kofa/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:385
+#: waeup/kofa/students/browser.py:381
 msgid "Form has been saved."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:314
+#: waeup/kofa/applicants/browser.py:315
 msgid "No applicant selected!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:364
+#: waeup/kofa/applicants/browser.py:365
 msgid "Create application record"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:369
+#: waeup/kofa/applicants/browser.py:370
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:382
+#: waeup/kofa/applicants/browser.py:383
 msgid "Applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:397 waeup/kofa/students/browser.py:285
+#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:281
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:286
+#: waeup/kofa/applicants/browser.py:399 waeup/kofa/students/browser.py:282
 msgid "unset"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:403
+#: waeup/kofa/applicants/browser.py:404
 msgid "${a} Application Record ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:454
+#: waeup/kofa/applicants/browser.py:455
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:461 waeup/kofa/students/browser.py:1023
+#: waeup/kofa/applicants/browser.py:462 waeup/kofa/students/browser.py:1019
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:474 waeup/kofa/students/browser.py:1037
+#: waeup/kofa/applicants/browser.py:475 waeup/kofa/students/browser.py:1033
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:501 waeup/kofa/students/browser.py:1056
+#: waeup/kofa/applicants/browser.py:502 waeup/kofa/students/browser.py:1052
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:529 waeup/kofa/students/browser.py:1105
+#: waeup/kofa/applicants/browser.py:530 waeup/kofa/students/browser.py:1101
 msgid "Valid callback received."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:550
+#: waeup/kofa/applicants/browser.py:551
 msgid "Payment Data"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:556
+#: waeup/kofa/applicants/browser.py:557
 msgid "Online Payment Receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:562
+#: waeup/kofa/applicants/browser.py:563
 msgid "Ticket not yet paid."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:627
+#: waeup/kofa/applicants/browser.py:628
 msgid "Uploaded image is too big!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:632
+#: waeup/kofa/applicants/browser.py:633
 msgid "jpg file extension expected."
 msgstr ""
@@ -482,33 +482,33 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:846
+#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:795
+#: waeup/kofa/applicants/browser.py:847
 msgid "Final Submit"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:758
-#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:827
-#: waeup/kofa/students/browser.py:980
+#: 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
 msgid "Add online payment ticket"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:763
-#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:832 waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:780 waeup/kofa/students/browser.py:956
-#: waeup/kofa/students/browser.py:1752
+#: 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
 msgid "Remove selected tickets"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:674
+#: waeup/kofa/applicants/browser.py:675
 msgid "${a} Application Form ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:685 waeup/kofa/students/browser.py:356
+#: waeup/kofa/applicants/browser.py:686 waeup/kofa/students/browser.py:352
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:732 waeup/kofa/students/browser.py:962
+#: waeup/kofa/applicants/browser.py:733 waeup/kofa/students/browser.py:958
 msgid "No payment selected."
 msgstr ""
@@ -519,10 +519,10 @@
 
 #: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:105
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:308
+#: waeup/kofa/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:206
-#: waeup/kofa/students/browser.py:1151 waeup/kofa/students/browser.py:1164
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:202
+#: waeup/kofa/students/browser.py:1147 waeup/kofa/students/browser.py:1160
 msgid "Remove selected"
 msgstr ""
@@ -533,10 +533,10 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:805 waeup/kofa/students/browser.py:88
+#: waeup/kofa/applicants/browser.py:806 waeup/kofa/students/browser.py:88
 msgid "The requested form is locked (read-only)."
 msgstr ""
 
 #: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:139
-#: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:347
+#: waeup/kofa/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
@@ -545,10 +545,6 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:819
-msgid "No passport picture uploaded."
-msgstr ""
-
 #: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:135
-#: waeup/kofa/applicants/browser.py:257 waeup/kofa/applicants/browser.py:343
+#: waeup/kofa/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
@@ -557,5 +553,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:821
+#: waeup/kofa/applicants/browser.py:820
+msgid "No passport picture uploaded."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:822
 msgid "Passport picture confirmation box not ticked."
 msgstr ""
@@ -565,38 +565,38 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:858 waeup/kofa/students/browser.py:1619
+#: waeup/kofa/applicants/browser.py:859 waeup/kofa/students/browser.py:1615
 msgid "This form cannot be submitted. Wrong state!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:863
+#: waeup/kofa/applicants/browser.py:864
 msgid "Form has been submitted."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:898
+#: waeup/kofa/applicants/browser.py:899
 msgid "Register for ${a} Application"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:904
+#: waeup/kofa/applicants/browser.py:905
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:909
+#: waeup/kofa/applicants/browser.py:910
 msgid "Application has ended."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:918
+#: waeup/kofa/applicants/browser.py:919
 msgid "Get login credentials"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:933
+#: waeup/kofa/applicants/browser.py:934
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:940
+#: waeup/kofa/applicants/browser.py:941
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:949
+#: waeup/kofa/applicants/browser.py:950
 msgid "Your registration was successful."
 msgstr ""
@@ -664,5 +664,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:713
+#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:709
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -688,5 +688,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:714
+#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:710
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -783,11 +783,11 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:375
-#: waeup/kofa/interfaces.py:401 waeup/kofa/students/interfaces.py:490
+#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:373
+#: waeup/kofa/interfaces.py:399 waeup/kofa/students/interfaces.py:490
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:380
-#: waeup/kofa/interfaces.py:408 waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:378
+#: waeup/kofa/interfaces.py:406 waeup/kofa/students/interfaces.py:203
 msgid "Phone"
 msgstr ""
@@ -897,5 +897,5 @@
 
 #: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:258
+#: waeup/kofa/students/browser.py:254
 msgid "Create student record"
 msgstr ""
@@ -1080,5 +1080,5 @@
 
 #: waeup/kofa/browser/pages.py:113 waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:287 waeup/kofa/students/browser.py:230
+#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:226
 msgid "No item selected."
 msgstr ""
@@ -1272,5 +1272,5 @@
 
 #: waeup/kofa/browser/pages.py:253 waeup/kofa/browser/pages.py:272
-#: waeup/kofa/browser/pages.py:536 waeup/kofa/students/browser.py:320
+#: waeup/kofa/browser/pages.py:536 waeup/kofa/students/browser.py:316
 msgid "Your message has been sent."
 msgstr ""
@@ -1324,5 +1324,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:301
+#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:297
 msgid "Send message to ${a}"
 msgstr ""
@@ -1861,5 +1861,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:212 waeup/kofa/hostels/browser.py:281
+#: waeup/kofa/hostels/browser.py:212 waeup/kofa/hostels/browser.py:280
 msgid "Release selected beds"
 msgstr ""
@@ -1872,18 +1872,18 @@
 
 #. Default: ""
-#: waeup/kofa/hostels/browser.py:275
+#: waeup/kofa/hostels/browser.py:274
 msgid "Successfully switched beds: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/hostels/browser.py:299
+#: waeup/kofa/hostels/browser.py:298
 msgid "Successfully released beds: ${a}"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:304
+#: waeup/kofa/hostels/browser.py:303
 msgid "No allocated bed selected."
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:316
+#: waeup/kofa/hostels/browser.py:315
 msgid "Allocate student"
 msgstr ""
@@ -2112,41 +2112,41 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:174
+#: waeup/kofa/interfaces.py:172
 msgid "Subject"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:178
+#: waeup/kofa/interfaces.py:176
 msgid "Grade"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:306
+#: waeup/kofa/interfaces.py:304
 msgid "Importer name"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:310
+#: waeup/kofa/interfaces.py:308
 msgid "Import mode"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:335
+#: waeup/kofa/interfaces.py:333
 msgid "Email Address:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:342
+#: waeup/kofa/interfaces.py:340
 msgid "Email to:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:349
+#: waeup/kofa/interfaces.py:347
 msgid "Subject:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:353
+#: waeup/kofa/interfaces.py:351
 msgid "Full Name:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:357
+#: waeup/kofa/interfaces.py:355
 msgid "Text:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:388
+#: waeup/kofa/interfaces.py:386
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2158,5 +2158,5 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:391
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2165,97 +2165,97 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:397
+#: waeup/kofa/interfaces.py:395
 msgid "Description/Notice"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:414
+#: waeup/kofa/interfaces.py:412
 msgid "Portal roles"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:457
+#: waeup/kofa/interfaces.py:455
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:458
+#: waeup/kofa/interfaces.py:456
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:463
+#: waeup/kofa/interfaces.py:461
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:469
+#: waeup/kofa/interfaces.py:467
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:476
+#: waeup/kofa/interfaces.py:474
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:488
+#: waeup/kofa/interfaces.py:486
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:496
+#: waeup/kofa/interfaces.py:494
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:504
+#: waeup/kofa/interfaces.py:502
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:510
+#: waeup/kofa/interfaces.py:508
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:517
+#: waeup/kofa/interfaces.py:515
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:518
+#: waeup/kofa/interfaces.py:516
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:523
+#: waeup/kofa/interfaces.py:521
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:530
+#: waeup/kofa/interfaces.py:528
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:537
+#: waeup/kofa/interfaces.py:535
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:546 waeup/kofa/interfaces.py:598
+#: waeup/kofa/interfaces.py:544 waeup/kofa/interfaces.py:596
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:554 waeup/kofa/payments/interfaces.py:30
+#: waeup/kofa/interfaces.py:552 waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:559 waeup/kofa/payments/interfaces.py:106
+#: waeup/kofa/interfaces.py:557 waeup/kofa/payments/interfaces.py:106
 msgid "Surcharge 1"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:564 waeup/kofa/payments/interfaces.py:113
+#: waeup/kofa/interfaces.py:562 waeup/kofa/payments/interfaces.py:113
 msgid "Surcharge 2"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:569 waeup/kofa/payments/interfaces.py:120
+#: waeup/kofa/interfaces.py:567 waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:574
+#: waeup/kofa/interfaces.py:572
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:579
+#: waeup/kofa/interfaces.py:577
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:584 waeup/kofa/payments/interfaces.py:36
+#: waeup/kofa/interfaces.py:582 waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
 msgstr ""
@@ -2287,36 +2287,4 @@
 #: waeup/kofa/interfaces.py:79
 msgid "courses validated"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:82
-msgid "Math"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:83
-msgid "Biology"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:84
-msgid "English"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:92
-msgid "Very Good"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:93
-msgid "Good"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:94
-msgid "Satisfactory"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:95
-msgid "Sufficient"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:96
-msgid "Fail"
 msgstr ""
 
@@ -2412,24 +2380,20 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1003 waeup/kofa/students/browser.py:1225
-msgid "Your current session does not match accommodation session."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1072
+#: waeup/kofa/students/browser.py:1068
 msgid "This ticket has already been paid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1085 waeup/kofa/students/browser.py:1093
-#: waeup/kofa/students/browser.py:1101
+#: waeup/kofa/students/browser.py:1081 waeup/kofa/students/browser.py:1089
+#: waeup/kofa/students/browser.py:1097
 msgid "Valid callback received. ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1155
+#: waeup/kofa/students/browser.py:1151
 msgid "${a}: Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1167
+#: waeup/kofa/students/browser.py:1163
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
@@ -2440,22 +2404,26 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1174
+#: waeup/kofa/students/browser.py:1170
 msgid "No bed ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1205
+#: waeup/kofa/students/browser.py:1201
 msgid "Add bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1207
+#: waeup/kofa/students/browser.py:1203
 msgid "Create bed ticket"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1211
+msgid "Your data are incomplete."
+msgstr ""
+
 #: waeup/kofa/students/browser.py:1215
-msgid "Your data are incomplete."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1219
 msgid "You are in the wrong registration state."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1226
+msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
@@ -2465,61 +2433,57 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1230
-msgid "You already booked a bed space in current accommodation session."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1241 waeup/kofa/students/browser.py:1537
-#: waeup/kofa/students/browser.py:1650
+#: 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:1261 waeup/kofa/students/browser.py:1389
+#: waeup/kofa/students/browser.py:1257 waeup/kofa/students/browser.py:1385
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1266 waeup/kofa/students/browser.py:1542
-#: waeup/kofa/students/browser.py:1655
+#: waeup/kofa/students/browser.py:1262 waeup/kofa/students/browser.py:1538
+#: waeup/kofa/students/browser.py:1651
 msgid "Activation code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1269 waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1658 waeup/kofa/students/browser.py:1917
+#: waeup/kofa/students/browser.py:1265 waeup/kofa/students/browser.py:1541
+#: waeup/kofa/students/browser.py:1654 waeup/kofa/students/browser.py:1913
 msgid "invalidated"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1274 waeup/kofa/students/browser.py:1549
-#: waeup/kofa/students/browser.py:1663
+#: waeup/kofa/students/browser.py:1270 waeup/kofa/students/browser.py:1545
+#: waeup/kofa/students/browser.py:1659
 msgid "You are not the owner of this access code."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1285 waeup/kofa/students/browser.py:1403
+#: waeup/kofa/students/browser.py:1281 waeup/kofa/students/browser.py:1399
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1294
+#: waeup/kofa/students/browser.py:1290
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1312
+#: waeup/kofa/students/browser.py:1308
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1328
+#: waeup/kofa/students/browser.py:1324
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1334
+#: waeup/kofa/students/browser.py:1330
 msgid "Bed Allocation: "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1361
+#: waeup/kofa/students/browser.py:1357
 msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1367
+#: waeup/kofa/students/browser.py:1363
 msgid "Student can't be relocated."
 msgstr ""
@@ -2530,19 +2494,23 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1410
+#: waeup/kofa/students/browser.py:1406
 msgid "Student relocated: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1429
+#: waeup/kofa/students/browser.py:1425
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1441 waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/browser.py:1437 waeup/kofa/students/viewlets.py:356
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1456 waeup/kofa/students/viewlets.py:365
+#: waeup/kofa/students/browser.py:1452 waeup/kofa/students/viewlets.py:365
 msgid "Change password"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1466
+msgid "Password changed."
 msgstr ""
 
@@ -2552,201 +2520,197 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1470
-msgid "Password changed."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1482
+#: waeup/kofa/students/browser.py:1478
 msgid "Upload portrait"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1497 waeup/kofa/students/viewlets.py:389
+#: waeup/kofa/students/browser.py:1493 waeup/kofa/students/viewlets.py:389
 #: waeup/kofa/students/workflow.py:44
 msgid "Start clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1501
+#: waeup/kofa/students/browser.py:1497
 msgid "Start clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1518 waeup/kofa/students/browser.py:1639
+#: waeup/kofa/students/browser.py:1514 waeup/kofa/students/browser.py:1635
 msgid "Wrong state"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1518
+msgid "No portrait uploaded."
+msgstr ""
+
 #: waeup/kofa/students/browser.py:1522
-msgid "No portrait uploaded."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1526
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1553
+#: waeup/kofa/students/browser.py:1549
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1565
+#: waeup/kofa/students/browser.py:1561
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1577 waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1573 waeup/kofa/students/browser.py:1587
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1585
+#: waeup/kofa/students/browser.py:1581
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1600 waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1596 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1601
+#: waeup/kofa/students/browser.py:1597
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1604
+#: waeup/kofa/students/browser.py:1600
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1613
+#: waeup/kofa/students/browser.py:1609
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1622
+#: waeup/kofa/students/browser.py:1618
 msgid "Clearance has been requested."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1631 waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:1627 waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1635
+#: waeup/kofa/students/browser.py:1631
 msgid "Start course registration now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1671
+#: waeup/kofa/students/browser.py:166
+msgid "Student Section"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1667
 msgid "Course registration has been started."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1690
+#: waeup/kofa/students/browser.py:1686
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1699
+#: waeup/kofa/students/browser.py:1695
 msgid "Create course list now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:170
-msgid "Student Section"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1738
+#. Default: ""
+#: waeup/kofa/students/browser.py:1734
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1771
+msgid "Register course list"
+msgstr ""
+
 #: waeup/kofa/students/browser.py:1775
-msgid "Register course list"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1779
 msgid "Course list has been registered."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1825
+#: waeup/kofa/students/browser.py:182 waeup/kofa/students/browser.py:218
+msgid "Empty search string"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1821
 msgid "Change my password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1835
+#: waeup/kofa/students/browser.py:1831
 msgid "Get new login credentials"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1849
+#: waeup/kofa/students/browser.py:1845
 msgid "No student record found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1857
+#: waeup/kofa/students/browser.py:1853
 msgid "You have successfully changed your password for the"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:186 waeup/kofa/students/browser.py:222
-msgid "Empty search string"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1862
+#. Default: ""
+#: waeup/kofa/students/browser.py:1858
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1873
+#: waeup/kofa/students/browser.py:1869
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1876
+#: waeup/kofa/students/browser.py:1872
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1891
+#: waeup/kofa/students/browser.py:1887
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1899
+#: waeup/kofa/students/browser.py:1895
 msgid "Access code is invalid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1902
+#: waeup/kofa/students/browser.py:1898
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1908
+#: waeup/kofa/students/browser.py:1904
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1914
+#: waeup/kofa/students/browser.py:1910
 msgid "Access code has already been used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1923
+#: waeup/kofa/students/browser.py:1919
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:204 waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:200 waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:228 waeup/kofa/students/browser.py:1888
+#: waeup/kofa/students/browser.py:224 waeup/kofa/students/browser.py:1884
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:255 waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:251 waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:263
+#: waeup/kofa/students/browser.py:259
 msgid "Student record created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:279
+#: waeup/kofa/students/browser.py:275
 msgid "${a}: Base Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:322 waeup/kofa/students/browser.py:1865
+#: waeup/kofa/students/browser.py:318 waeup/kofa/students/browser.py:1861
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:333
+#: waeup/kofa/students/browser.py:329
 msgid "Manage base data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:402
+#: waeup/kofa/students/browser.py:398
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:418 waeup/kofa/students/viewlets.py:104
+#: waeup/kofa/students/browser.py:414 waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
@@ -2754,84 +2718,84 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:424
+#: waeup/kofa/students/browser.py:420
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:444
+#: waeup/kofa/students/browser.py:440
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:473
+#: waeup/kofa/students/browser.py:469
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:475 waeup/kofa/students/browser.py:499
+#: waeup/kofa/students/browser.py:471 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 has been annulled."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:496
 msgid "Clearance request has been rejected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:522
+#: waeup/kofa/students/browser.py:518
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:532
+#: waeup/kofa/students/browser.py:528
 msgid "Manage personal data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:552
+#: waeup/kofa/students/browser.py:548
 msgid "${a}: Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:582
+#: waeup/kofa/students/browser.py:578
 msgid "Manage study course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:626
+#: waeup/kofa/students/browser.py:581 waeup/kofa/students/browser.py:622
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:586 waeup/kofa/students/browser.py:612
+#: waeup/kofa/students/browser.py:582 waeup/kofa/students/browser.py:608
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:620
+#: waeup/kofa/students/browser.py:616
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:622 waeup/kofa/students/browser.py:1708
+#: waeup/kofa/students/browser.py:618 waeup/kofa/students/browser.py:1704
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:632
+#: waeup/kofa/students/browser.py:628
 msgid "No study level selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:668
+#: waeup/kofa/students/browser.py:664
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:691
+#: waeup/kofa/students/browser.py:687
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:697
+#: waeup/kofa/students/browser.py:693
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:706
+#: waeup/kofa/students/browser.py:702
 msgid "Course Registration Slip  "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:712
+#: waeup/kofa/students/browser.py:708
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -2840,5 +2804,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:715
+#: waeup/kofa/students/browser.py:711
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -2846,10 +2810,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:716
+#: waeup/kofa/students/browser.py:712
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:717
+#: waeup/kofa/students/browser.py:713
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -2857,5 +2821,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:718
+#: waeup/kofa/students/browser.py:714
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -2863,5 +2827,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:719 waeup/kofa/students/interfaces.py:370
+#: waeup/kofa/students/browser.py:715 waeup/kofa/students/interfaces.py:370
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2870,69 +2834,73 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:747 waeup/kofa/students/browser.py:776
-#: waeup/kofa/students/browser.py:861 waeup/kofa/students/browser.py:866
-#: waeup/kofa/students/browser.py:1748 waeup/kofa/students/browser.py:1798
+#: waeup/kofa/students/browser.py: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
 msgid "Add course ticket"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:768
+#: waeup/kofa/students/browser.py:764
 msgid "Manage study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:786 waeup/kofa/students/browser.py:1758
+#: waeup/kofa/students/browser.py:782 waeup/kofa/students/browser.py:1754
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:810 waeup/kofa/students/browser.py:832
+#: waeup/kofa/students/browser.py:806 waeup/kofa/students/browser.py:828
 msgid "This level does not correspond current level."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:814
+#: waeup/kofa/students/browser.py:810
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:816 waeup/kofa/students/browser.py:844
+#: waeup/kofa/students/browser.py:812 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 annulled."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:841
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:881 waeup/kofa/students/browser.py:1811
+#: waeup/kofa/students/browser.py:877 waeup/kofa/students/browser.py:1807
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:883 waeup/kofa/students/browser.py:1813
+#: waeup/kofa/students/browser.py:879 waeup/kofa/students/browser.py:1809
 msgid "Successfully added ${a}."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:904
+#: waeup/kofa/students/browser.py:900
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:920
+#: waeup/kofa/students/browser.py:916
 msgid "Manage course ticket ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:947
+#: waeup/kofa/students/browser.py:943
 msgid "${a}: Payments"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:992
+#: waeup/kofa/students/browser.py:988
 msgid "Add online payment"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:995
+#: waeup/kofa/students/browser.py:991
 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 ""
 
@@ -3693,5 +3661,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:122
+#: waeup/kofa/utils/utils.py:228
 msgid ""
 "Fullname: ${a}\n"
@@ -3703,5 +3671,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:167
+#: waeup/kofa/utils/utils.py:273
 msgid ""
 "Dear ${a},\n"
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 7838)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/ig/LC_MESSAGES/waeup.kofa.po	(revision 7839)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Fri Mar  9 23:09:56 2012\n"
+"POT-Creation-Date: Sun Mar 11 16:45:08 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -30,6 +30,6 @@
 #: waeup/kofa/accesscodes/browser.py:100 waeup/kofa/accesscodes/browser.py:113
 #: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:130
-#: waeup/kofa/applicants/browser.py:182 waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:338
+#: waeup/kofa/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
@@ -45,7 +45,7 @@
 #: waeup/kofa/browser/pages.py:1767 waeup/kofa/browser/pages.py:1769
 #: waeup/kofa/browser/pages.py:1804 waeup/kofa/browser/pages.py:1855
-#: waeup/kofa/browser/pages.py:1907 waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:748 waeup/kofa/students/browser.py:888
+#: waeup/kofa/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
 msgid "Cancel"
 msgstr ""
@@ -87,5 +87,5 @@
 #: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:592
 #: waeup/kofa/browser/pages.py:1142 waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:171 waeup/kofa/students/browser.py:205
+#: waeup/kofa/students/browser.py:167 waeup/kofa/students/browser.py:201
 msgid "Search"
 msgstr ""
@@ -342,15 +342,15 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:325
-#: waeup/kofa/applicants/browser.py:745
+#: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:326
+#: waeup/kofa/applicants/browser.py:746
 msgid "Could not delete:"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py:328
-#: waeup/kofa/applicants/browser.py:748 waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:243 waeup/kofa/students/browser.py:642
-#: waeup/kofa/students/browser.py:796 waeup/kofa/students/browser.py:974
-#: waeup/kofa/students/browser.py:1184 waeup/kofa/students/browser.py:1770
+#: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py: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
 msgid "Successfully removed: ${a}"
 msgstr ""
@@ -372,8 +372,8 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:254 waeup/kofa/applicants/browser.py:301
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:688
-#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:838 waeup/kofa/browser/pages.py:476
+#: waeup/kofa/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
@@ -382,97 +382,97 @@
 #: waeup/kofa/browser/pages.py:1716 waeup/kofa/browser/pages.py:1767
 #: waeup/kofa/browser/pages.py:1788 waeup/kofa/hostels/browser.py:209
-#: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:319
-#: waeup/kofa/students/browser.py:359 waeup/kofa/students/browser.py:458
-#: waeup/kofa/students/browser.py:535 waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:600 waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:771 waeup/kofa/students/browser.py:1444
-#: waeup/kofa/students/browser.py:1459 waeup/kofa/students/browser.py:1574
+#: waeup/kofa/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
 msgid "Save"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:333
-#: waeup/kofa/applicants/browser.py:361
+#: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:334
+#: waeup/kofa/applicants/browser.py:362
 msgid "Add applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:265 waeup/kofa/applicants/viewlets.py:95
+#: waeup/kofa/applicants/browser.py:266 waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:305 waeup/kofa/applicants/browser.py:717
+#: waeup/kofa/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:385
+#: waeup/kofa/students/browser.py:381
 msgid "Form has been saved."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:314
+#: waeup/kofa/applicants/browser.py:315
 msgid "No applicant selected!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:364
+#: waeup/kofa/applicants/browser.py:365
 msgid "Create application record"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:369
+#: waeup/kofa/applicants/browser.py:370
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:382
+#: waeup/kofa/applicants/browser.py:383
 msgid "Applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:397 waeup/kofa/students/browser.py:285
+#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:281
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:286
+#: waeup/kofa/applicants/browser.py:399 waeup/kofa/students/browser.py:282
 msgid "unset"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:403
+#: waeup/kofa/applicants/browser.py:404
 msgid "${a} Application Record ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:454
+#: waeup/kofa/applicants/browser.py:455
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:461 waeup/kofa/students/browser.py:1023
+#: waeup/kofa/applicants/browser.py:462 waeup/kofa/students/browser.py:1019
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:474 waeup/kofa/students/browser.py:1037
+#: waeup/kofa/applicants/browser.py:475 waeup/kofa/students/browser.py:1033
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:501 waeup/kofa/students/browser.py:1056
+#: waeup/kofa/applicants/browser.py:502 waeup/kofa/students/browser.py:1052
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:529 waeup/kofa/students/browser.py:1105
+#: waeup/kofa/applicants/browser.py:530 waeup/kofa/students/browser.py:1101
 msgid "Valid callback received."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:550
+#: waeup/kofa/applicants/browser.py:551
 msgid "Payment Data"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:556
+#: waeup/kofa/applicants/browser.py:557
 msgid "Online Payment Receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:562
+#: waeup/kofa/applicants/browser.py:563
 msgid "Ticket not yet paid."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:627
+#: waeup/kofa/applicants/browser.py:628
 msgid "Uploaded image is too big!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:632
+#: waeup/kofa/applicants/browser.py:633
 msgid "jpg file extension expected."
 msgstr ""
@@ -482,33 +482,33 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:846
+#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:795
+#: waeup/kofa/applicants/browser.py:847
 msgid "Final Submit"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:758
-#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:827
-#: waeup/kofa/students/browser.py:980
+#: 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
 msgid "Add online payment ticket"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:763
-#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:832 waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:780 waeup/kofa/students/browser.py:956
-#: waeup/kofa/students/browser.py:1752
+#: 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
 msgid "Remove selected tickets"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:674
+#: waeup/kofa/applicants/browser.py:675
 msgid "${a} Application Form ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:685 waeup/kofa/students/browser.py:356
+#: waeup/kofa/applicants/browser.py:686 waeup/kofa/students/browser.py:352
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:732 waeup/kofa/students/browser.py:962
+#: waeup/kofa/applicants/browser.py:733 waeup/kofa/students/browser.py:958
 msgid "No payment selected."
 msgstr ""
@@ -519,10 +519,10 @@
 
 #: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:105
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:308
+#: waeup/kofa/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:206
-#: waeup/kofa/students/browser.py:1151 waeup/kofa/students/browser.py:1164
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:202
+#: waeup/kofa/students/browser.py:1147 waeup/kofa/students/browser.py:1160
 msgid "Remove selected"
 msgstr ""
@@ -533,10 +533,10 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:805 waeup/kofa/students/browser.py:88
+#: waeup/kofa/applicants/browser.py:806 waeup/kofa/students/browser.py:88
 msgid "The requested form is locked (read-only)."
 msgstr ""
 
 #: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:139
-#: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:347
+#: waeup/kofa/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
@@ -545,10 +545,6 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:819
-msgid "No passport picture uploaded."
-msgstr ""
-
 #: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:135
-#: waeup/kofa/applicants/browser.py:257 waeup/kofa/applicants/browser.py:343
+#: waeup/kofa/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
@@ -557,5 +553,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:821
+#: waeup/kofa/applicants/browser.py:820
+msgid "No passport picture uploaded."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:822
 msgid "Passport picture confirmation box not ticked."
 msgstr ""
@@ -565,38 +565,38 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:858 waeup/kofa/students/browser.py:1619
+#: waeup/kofa/applicants/browser.py:859 waeup/kofa/students/browser.py:1615
 msgid "This form cannot be submitted. Wrong state!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:863
+#: waeup/kofa/applicants/browser.py:864
 msgid "Form has been submitted."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:898
+#: waeup/kofa/applicants/browser.py:899
 msgid "Register for ${a} Application"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:904
+#: waeup/kofa/applicants/browser.py:905
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:909
+#: waeup/kofa/applicants/browser.py:910
 msgid "Application has ended."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:918
+#: waeup/kofa/applicants/browser.py:919
 msgid "Get login credentials"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:933
+#: waeup/kofa/applicants/browser.py:934
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:940
+#: waeup/kofa/applicants/browser.py:941
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:949
+#: waeup/kofa/applicants/browser.py:950
 msgid "Your registration was successful."
 msgstr ""
@@ -664,5 +664,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:713
+#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:709
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -688,5 +688,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:714
+#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:710
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -783,11 +783,11 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:375
-#: waeup/kofa/interfaces.py:401 waeup/kofa/students/interfaces.py:490
+#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:373
+#: waeup/kofa/interfaces.py:399 waeup/kofa/students/interfaces.py:490
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:380
-#: waeup/kofa/interfaces.py:408 waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:378
+#: waeup/kofa/interfaces.py:406 waeup/kofa/students/interfaces.py:203
 msgid "Phone"
 msgstr ""
@@ -897,5 +897,5 @@
 
 #: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:258
+#: waeup/kofa/students/browser.py:254
 msgid "Create student record"
 msgstr ""
@@ -1080,5 +1080,5 @@
 
 #: waeup/kofa/browser/pages.py:113 waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:287 waeup/kofa/students/browser.py:230
+#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:226
 msgid "No item selected."
 msgstr ""
@@ -1272,5 +1272,5 @@
 
 #: waeup/kofa/browser/pages.py:253 waeup/kofa/browser/pages.py:272
-#: waeup/kofa/browser/pages.py:536 waeup/kofa/students/browser.py:320
+#: waeup/kofa/browser/pages.py:536 waeup/kofa/students/browser.py:316
 msgid "Your message has been sent."
 msgstr ""
@@ -1324,5 +1324,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:301
+#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:297
 msgid "Send message to ${a}"
 msgstr ""
@@ -1861,5 +1861,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:212 waeup/kofa/hostels/browser.py:281
+#: waeup/kofa/hostels/browser.py:212 waeup/kofa/hostels/browser.py:280
 msgid "Release selected beds"
 msgstr ""
@@ -1872,18 +1872,18 @@
 
 #. Default: ""
-#: waeup/kofa/hostels/browser.py:275
+#: waeup/kofa/hostels/browser.py:274
 msgid "Successfully switched beds: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/hostels/browser.py:299
+#: waeup/kofa/hostels/browser.py:298
 msgid "Successfully released beds: ${a}"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:304
+#: waeup/kofa/hostels/browser.py:303
 msgid "No allocated bed selected."
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:316
+#: waeup/kofa/hostels/browser.py:315
 msgid "Allocate student"
 msgstr ""
@@ -2112,41 +2112,41 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:174
+#: waeup/kofa/interfaces.py:172
 msgid "Subject"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:178
+#: waeup/kofa/interfaces.py:176
 msgid "Grade"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:306
+#: waeup/kofa/interfaces.py:304
 msgid "Importer name"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:310
+#: waeup/kofa/interfaces.py:308
 msgid "Import mode"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:335
+#: waeup/kofa/interfaces.py:333
 msgid "Email Address:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:342
+#: waeup/kofa/interfaces.py:340
 msgid "Email to:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:349
+#: waeup/kofa/interfaces.py:347
 msgid "Subject:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:353
+#: waeup/kofa/interfaces.py:351
 msgid "Full Name:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:357
+#: waeup/kofa/interfaces.py:355
 msgid "Text:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:388
+#: waeup/kofa/interfaces.py:386
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2158,5 +2158,5 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:391
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2165,97 +2165,97 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:397
+#: waeup/kofa/interfaces.py:395
 msgid "Description/Notice"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:414
+#: waeup/kofa/interfaces.py:412
 msgid "Portal roles"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:457
+#: waeup/kofa/interfaces.py:455
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:458
+#: waeup/kofa/interfaces.py:456
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:463
+#: waeup/kofa/interfaces.py:461
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:469
+#: waeup/kofa/interfaces.py:467
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:476
+#: waeup/kofa/interfaces.py:474
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:488
+#: waeup/kofa/interfaces.py:486
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:496
+#: waeup/kofa/interfaces.py:494
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:504
+#: waeup/kofa/interfaces.py:502
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:510
+#: waeup/kofa/interfaces.py:508
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:517
+#: waeup/kofa/interfaces.py:515
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:518
+#: waeup/kofa/interfaces.py:516
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:523
+#: waeup/kofa/interfaces.py:521
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:530
+#: waeup/kofa/interfaces.py:528
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:537
+#: waeup/kofa/interfaces.py:535
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:546 waeup/kofa/interfaces.py:598
+#: waeup/kofa/interfaces.py:544 waeup/kofa/interfaces.py:596
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:554 waeup/kofa/payments/interfaces.py:30
+#: waeup/kofa/interfaces.py:552 waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:559 waeup/kofa/payments/interfaces.py:106
+#: waeup/kofa/interfaces.py:557 waeup/kofa/payments/interfaces.py:106
 msgid "Surcharge 1"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:564 waeup/kofa/payments/interfaces.py:113
+#: waeup/kofa/interfaces.py:562 waeup/kofa/payments/interfaces.py:113
 msgid "Surcharge 2"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:569 waeup/kofa/payments/interfaces.py:120
+#: waeup/kofa/interfaces.py:567 waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:574
+#: waeup/kofa/interfaces.py:572
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:579
+#: waeup/kofa/interfaces.py:577
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:584 waeup/kofa/payments/interfaces.py:36
+#: waeup/kofa/interfaces.py:582 waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
 msgstr ""
@@ -2287,36 +2287,4 @@
 #: waeup/kofa/interfaces.py:79
 msgid "courses validated"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:82
-msgid "Math"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:83
-msgid "Biology"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:84
-msgid "English"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:92
-msgid "Very Good"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:93
-msgid "Good"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:94
-msgid "Satisfactory"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:95
-msgid "Sufficient"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:96
-msgid "Fail"
 msgstr ""
 
@@ -2412,24 +2380,20 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1003 waeup/kofa/students/browser.py:1225
-msgid "Your current session does not match accommodation session."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1072
+#: waeup/kofa/students/browser.py:1068
 msgid "This ticket has already been paid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1085 waeup/kofa/students/browser.py:1093
-#: waeup/kofa/students/browser.py:1101
+#: waeup/kofa/students/browser.py:1081 waeup/kofa/students/browser.py:1089
+#: waeup/kofa/students/browser.py:1097
 msgid "Valid callback received. ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1155
+#: waeup/kofa/students/browser.py:1151
 msgid "${a}: Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1167
+#: waeup/kofa/students/browser.py:1163
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
@@ -2440,22 +2404,26 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1174
+#: waeup/kofa/students/browser.py:1170
 msgid "No bed ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1205
+#: waeup/kofa/students/browser.py:1201
 msgid "Add bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1207
+#: waeup/kofa/students/browser.py:1203
 msgid "Create bed ticket"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1211
+msgid "Your data are incomplete."
+msgstr ""
+
 #: waeup/kofa/students/browser.py:1215
-msgid "Your data are incomplete."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1219
 msgid "You are in the wrong registration state."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1226
+msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
@@ -2465,61 +2433,57 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1230
-msgid "You already booked a bed space in current accommodation session."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1241 waeup/kofa/students/browser.py:1537
-#: waeup/kofa/students/browser.py:1650
+#: 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:1261 waeup/kofa/students/browser.py:1389
+#: waeup/kofa/students/browser.py:1257 waeup/kofa/students/browser.py:1385
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1266 waeup/kofa/students/browser.py:1542
-#: waeup/kofa/students/browser.py:1655
+#: waeup/kofa/students/browser.py:1262 waeup/kofa/students/browser.py:1538
+#: waeup/kofa/students/browser.py:1651
 msgid "Activation code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1269 waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1658 waeup/kofa/students/browser.py:1917
+#: waeup/kofa/students/browser.py:1265 waeup/kofa/students/browser.py:1541
+#: waeup/kofa/students/browser.py:1654 waeup/kofa/students/browser.py:1913
 msgid "invalidated"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1274 waeup/kofa/students/browser.py:1549
-#: waeup/kofa/students/browser.py:1663
+#: waeup/kofa/students/browser.py:1270 waeup/kofa/students/browser.py:1545
+#: waeup/kofa/students/browser.py:1659
 msgid "You are not the owner of this access code."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1285 waeup/kofa/students/browser.py:1403
+#: waeup/kofa/students/browser.py:1281 waeup/kofa/students/browser.py:1399
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1294
+#: waeup/kofa/students/browser.py:1290
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1312
+#: waeup/kofa/students/browser.py:1308
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1328
+#: waeup/kofa/students/browser.py:1324
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1334
+#: waeup/kofa/students/browser.py:1330
 msgid "Bed Allocation: "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1361
+#: waeup/kofa/students/browser.py:1357
 msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1367
+#: waeup/kofa/students/browser.py:1363
 msgid "Student can't be relocated."
 msgstr ""
@@ -2530,19 +2494,23 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1410
+#: waeup/kofa/students/browser.py:1406
 msgid "Student relocated: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1429
+#: waeup/kofa/students/browser.py:1425
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1441 waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/browser.py:1437 waeup/kofa/students/viewlets.py:356
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1456 waeup/kofa/students/viewlets.py:365
+#: waeup/kofa/students/browser.py:1452 waeup/kofa/students/viewlets.py:365
 msgid "Change password"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1466
+msgid "Password changed."
 msgstr ""
 
@@ -2552,201 +2520,197 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1470
-msgid "Password changed."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1482
+#: waeup/kofa/students/browser.py:1478
 msgid "Upload portrait"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1497 waeup/kofa/students/viewlets.py:389
+#: waeup/kofa/students/browser.py:1493 waeup/kofa/students/viewlets.py:389
 #: waeup/kofa/students/workflow.py:44
 msgid "Start clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1501
+#: waeup/kofa/students/browser.py:1497
 msgid "Start clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1518 waeup/kofa/students/browser.py:1639
+#: waeup/kofa/students/browser.py:1514 waeup/kofa/students/browser.py:1635
 msgid "Wrong state"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1518
+msgid "No portrait uploaded."
+msgstr ""
+
 #: waeup/kofa/students/browser.py:1522
-msgid "No portrait uploaded."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1526
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1553
+#: waeup/kofa/students/browser.py:1549
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1565
+#: waeup/kofa/students/browser.py:1561
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1577 waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1573 waeup/kofa/students/browser.py:1587
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1585
+#: waeup/kofa/students/browser.py:1581
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1600 waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1596 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1601
+#: waeup/kofa/students/browser.py:1597
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1604
+#: waeup/kofa/students/browser.py:1600
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1613
+#: waeup/kofa/students/browser.py:1609
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1622
+#: waeup/kofa/students/browser.py:1618
 msgid "Clearance has been requested."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1631 waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:1627 waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1635
+#: waeup/kofa/students/browser.py:1631
 msgid "Start course registration now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1671
+#: waeup/kofa/students/browser.py:166
+msgid "Student Section"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1667
 msgid "Course registration has been started."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1690
+#: waeup/kofa/students/browser.py:1686
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1699
+#: waeup/kofa/students/browser.py:1695
 msgid "Create course list now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:170
-msgid "Student Section"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1738
+#. Default: ""
+#: waeup/kofa/students/browser.py:1734
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1771
+msgid "Register course list"
+msgstr ""
+
 #: waeup/kofa/students/browser.py:1775
-msgid "Register course list"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1779
 msgid "Course list has been registered."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1825
+#: waeup/kofa/students/browser.py:182 waeup/kofa/students/browser.py:218
+msgid "Empty search string"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1821
 msgid "Change my password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1835
+#: waeup/kofa/students/browser.py:1831
 msgid "Get new login credentials"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1849
+#: waeup/kofa/students/browser.py:1845
 msgid "No student record found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1857
+#: waeup/kofa/students/browser.py:1853
 msgid "You have successfully changed your password for the"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:186 waeup/kofa/students/browser.py:222
-msgid "Empty search string"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1862
+#. Default: ""
+#: waeup/kofa/students/browser.py:1858
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1873
+#: waeup/kofa/students/browser.py:1869
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1876
+#: waeup/kofa/students/browser.py:1872
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1891
+#: waeup/kofa/students/browser.py:1887
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1899
+#: waeup/kofa/students/browser.py:1895
 msgid "Access code is invalid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1902
+#: waeup/kofa/students/browser.py:1898
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1908
+#: waeup/kofa/students/browser.py:1904
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1914
+#: waeup/kofa/students/browser.py:1910
 msgid "Access code has already been used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1923
+#: waeup/kofa/students/browser.py:1919
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:204 waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:200 waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:228 waeup/kofa/students/browser.py:1888
+#: waeup/kofa/students/browser.py:224 waeup/kofa/students/browser.py:1884
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:255 waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:251 waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:263
+#: waeup/kofa/students/browser.py:259
 msgid "Student record created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:279
+#: waeup/kofa/students/browser.py:275
 msgid "${a}: Base Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:322 waeup/kofa/students/browser.py:1865
+#: waeup/kofa/students/browser.py:318 waeup/kofa/students/browser.py:1861
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:333
+#: waeup/kofa/students/browser.py:329
 msgid "Manage base data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:402
+#: waeup/kofa/students/browser.py:398
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:418 waeup/kofa/students/viewlets.py:104
+#: waeup/kofa/students/browser.py:414 waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
@@ -2754,84 +2718,84 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:424
+#: waeup/kofa/students/browser.py:420
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:444
+#: waeup/kofa/students/browser.py:440
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:473
+#: waeup/kofa/students/browser.py:469
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:475 waeup/kofa/students/browser.py:499
+#: waeup/kofa/students/browser.py:471 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 has been annulled."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:496
 msgid "Clearance request has been rejected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:522
+#: waeup/kofa/students/browser.py:518
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:532
+#: waeup/kofa/students/browser.py:528
 msgid "Manage personal data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:552
+#: waeup/kofa/students/browser.py:548
 msgid "${a}: Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:582
+#: waeup/kofa/students/browser.py:578
 msgid "Manage study course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:626
+#: waeup/kofa/students/browser.py:581 waeup/kofa/students/browser.py:622
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:586 waeup/kofa/students/browser.py:612
+#: waeup/kofa/students/browser.py:582 waeup/kofa/students/browser.py:608
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:620
+#: waeup/kofa/students/browser.py:616
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:622 waeup/kofa/students/browser.py:1708
+#: waeup/kofa/students/browser.py:618 waeup/kofa/students/browser.py:1704
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:632
+#: waeup/kofa/students/browser.py:628
 msgid "No study level selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:668
+#: waeup/kofa/students/browser.py:664
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:691
+#: waeup/kofa/students/browser.py:687
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:697
+#: waeup/kofa/students/browser.py:693
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:706
+#: waeup/kofa/students/browser.py:702
 msgid "Course Registration Slip  "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:712
+#: waeup/kofa/students/browser.py:708
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -2840,5 +2804,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:715
+#: waeup/kofa/students/browser.py:711
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -2846,10 +2810,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:716
+#: waeup/kofa/students/browser.py:712
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:717
+#: waeup/kofa/students/browser.py:713
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -2857,5 +2821,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:718
+#: waeup/kofa/students/browser.py:714
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -2863,5 +2827,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:719 waeup/kofa/students/interfaces.py:370
+#: waeup/kofa/students/browser.py:715 waeup/kofa/students/interfaces.py:370
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2870,69 +2834,73 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:747 waeup/kofa/students/browser.py:776
-#: waeup/kofa/students/browser.py:861 waeup/kofa/students/browser.py:866
-#: waeup/kofa/students/browser.py:1748 waeup/kofa/students/browser.py:1798
+#: waeup/kofa/students/browser.py: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
 msgid "Add course ticket"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:768
+#: waeup/kofa/students/browser.py:764
 msgid "Manage study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:786 waeup/kofa/students/browser.py:1758
+#: waeup/kofa/students/browser.py:782 waeup/kofa/students/browser.py:1754
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:810 waeup/kofa/students/browser.py:832
+#: waeup/kofa/students/browser.py:806 waeup/kofa/students/browser.py:828
 msgid "This level does not correspond current level."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:814
+#: waeup/kofa/students/browser.py:810
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:816 waeup/kofa/students/browser.py:844
+#: waeup/kofa/students/browser.py:812 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 annulled."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:841
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:881 waeup/kofa/students/browser.py:1811
+#: waeup/kofa/students/browser.py:877 waeup/kofa/students/browser.py:1807
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:883 waeup/kofa/students/browser.py:1813
+#: waeup/kofa/students/browser.py:879 waeup/kofa/students/browser.py:1809
 msgid "Successfully added ${a}."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:904
+#: waeup/kofa/students/browser.py:900
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:920
+#: waeup/kofa/students/browser.py:916
 msgid "Manage course ticket ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:947
+#: waeup/kofa/students/browser.py:943
 msgid "${a}: Payments"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:992
+#: waeup/kofa/students/browser.py:988
 msgid "Add online payment"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:995
+#: waeup/kofa/students/browser.py:991
 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 ""
 
@@ -3693,5 +3661,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:122
+#: waeup/kofa/utils/utils.py:228
 msgid ""
 "Fullname: ${a}\n"
@@ -3703,5 +3671,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:167
+#: waeup/kofa/utils/utils.py:273
 msgid ""
 "Dear ${a},\n"
Index: /main/waeup.kofa/trunk/src/waeup/kofa/locales/waeup.kofa.pot
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/locales/waeup.kofa.pot	(revision 7838)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/waeup.kofa.pot	(revision 7839)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Fri Mar  9 23:09:56 2012\n"
+"POT-Creation-Date: Sun Mar 11 16:45:08 2012\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -29,7 +29,7 @@
 #: waeup/kofa/applicants/browser.py:130
 #: waeup/kofa/applicants/browser.py:182
-#: waeup/kofa/applicants/browser.py:254
 #: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:338
+#: waeup/kofa/applicants/browser.py:256
+#: waeup/kofa/applicants/browser.py:339
 #: waeup/kofa/browser/pages.py:503
 #: waeup/kofa/browser/pages.py:708
@@ -59,9 +59,9 @@
 #: waeup/kofa/browser/pages.py:1855
 #: waeup/kofa/browser/pages.py:1907
-#: waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:585
-#: waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:888
+#: waeup/kofa/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
 msgid "Cancel"
 msgstr ""
@@ -105,6 +105,6 @@
 #: waeup/kofa/browser/pages.py:1142
 #: waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:171
-#: waeup/kofa/students/browser.py:205
+#: waeup/kofa/students/browser.py:167
+#: waeup/kofa/students/browser.py:201
 msgid "Search"
 msgstr ""
@@ -365,19 +365,19 @@
 
 #: waeup/kofa/applicants/browser.py:117
-#: waeup/kofa/applicants/browser.py:325
-#: waeup/kofa/applicants/browser.py:745
+#: waeup/kofa/applicants/browser.py:326
+#: waeup/kofa/applicants/browser.py:746
 msgid "Could not delete:"
 msgstr ""
 
 #: waeup/kofa/applicants/browser.py:120
-#: waeup/kofa/applicants/browser.py:328
-#: waeup/kofa/applicants/browser.py:748
+#: waeup/kofa/applicants/browser.py:329
+#: waeup/kofa/applicants/browser.py:749
 #: waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:243
-#: waeup/kofa/students/browser.py:642
-#: waeup/kofa/students/browser.py:796
-#: waeup/kofa/students/browser.py:974
-#: waeup/kofa/students/browser.py:1184
-#: waeup/kofa/students/browser.py:1770
+#: waeup/kofa/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
 #. Default: ""
 msgid "Successfully removed: ${a}"
@@ -399,11 +399,11 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:301
-#: waeup/kofa/applicants/browser.py:654
-#: waeup/kofa/applicants/browser.py:688
-#: waeup/kofa/applicants/browser.py:791
-#: waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:838
+#: waeup/kofa/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
@@ -420,31 +420,31 @@
 #: waeup/kofa/hostels/browser.py:209
 #: waeup/kofa/hostels/browser.py:231
-#: waeup/kofa/hostels/browser.py:319
-#: waeup/kofa/students/browser.py:359
-#: waeup/kofa/students/browser.py:458
-#: waeup/kofa/students/browser.py:535
-#: waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:600
-#: waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:771
-#: waeup/kofa/students/browser.py:1444
-#: waeup/kofa/students/browser.py:1459
-#: waeup/kofa/students/browser.py:1574
+#: waeup/kofa/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
 msgid "Save"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:333
-#: waeup/kofa/applicants/browser.py:361
+#: waeup/kofa/applicants/browser.py:256
+#: waeup/kofa/applicants/browser.py:334
+#: waeup/kofa/applicants/browser.py:362
 msgid "Add applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:265
+#: waeup/kofa/applicants/browser.py:266
 #: waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:305
-#: waeup/kofa/applicants/browser.py:717
+#: waeup/kofa/applicants/browser.py:306
+#: waeup/kofa/applicants/browser.py:718
 #: waeup/kofa/browser/pages.py:1397
 #: waeup/kofa/browser/pages.py:1719
@@ -453,81 +453,81 @@
 #: waeup/kofa/hostels/browser.py:54
 #: waeup/kofa/students/browser.py:80
-#: waeup/kofa/students/browser.py:385
+#: waeup/kofa/students/browser.py:381
 msgid "Form has been saved."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:314
+#: waeup/kofa/applicants/browser.py:315
 msgid "No applicant selected!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:364
+#: waeup/kofa/applicants/browser.py:365
 msgid "Create application record"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:369
+#: waeup/kofa/applicants/browser.py:370
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:382
+#: waeup/kofa/applicants/browser.py:383
 msgid "Applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:397
-#: waeup/kofa/students/browser.py:285
+#: waeup/kofa/applicants/browser.py:398
+#: waeup/kofa/students/browser.py:281
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:398
-#: waeup/kofa/students/browser.py:286
+#: waeup/kofa/applicants/browser.py:399
+#: waeup/kofa/students/browser.py:282
 msgid "unset"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:403
+#: waeup/kofa/applicants/browser.py:404
 #. Default: ""
 msgid "${a} Application Record ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:454
+#: waeup/kofa/applicants/browser.py:455
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:461
-#: waeup/kofa/students/browser.py:1023
+#: waeup/kofa/applicants/browser.py:462
+#: waeup/kofa/students/browser.py:1019
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:474
-#: waeup/kofa/students/browser.py:1037
+#: waeup/kofa/applicants/browser.py:475
+#: waeup/kofa/students/browser.py:1033
 msgid "Payment ticket created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:501
-#: waeup/kofa/students/browser.py:1056
+#: waeup/kofa/applicants/browser.py:502
+#: waeup/kofa/students/browser.py:1052
 #. Default: ""
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:529
-#: waeup/kofa/students/browser.py:1105
+#: waeup/kofa/applicants/browser.py:530
+#: waeup/kofa/students/browser.py:1101
 msgid "Valid callback received."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:550
+#: waeup/kofa/applicants/browser.py:551
 msgid "Payment Data"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:556
+#: waeup/kofa/applicants/browser.py:557
 msgid "Online Payment Receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:562
+#: waeup/kofa/applicants/browser.py:563
 msgid "Ticket not yet paid."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:627
+#: waeup/kofa/applicants/browser.py:628
 msgid "Uploaded image is too big!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:632
+#: waeup/kofa/applicants/browser.py:633
 msgid "jpg file extension expected."
 msgstr ""
@@ -537,42 +537,42 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:654
-#: waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:846
+#: waeup/kofa/applicants/browser.py:655
+#: waeup/kofa/applicants/browser.py:795
+#: waeup/kofa/applicants/browser.py:847
 msgid "Final Submit"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655
-#: waeup/kofa/applicants/browser.py:758
-#: waeup/kofa/applicants/browser.py:792
-#: waeup/kofa/applicants/browser.py:827
-#: waeup/kofa/students/browser.py:980
+#: 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
 msgid "Add online payment ticket"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655
-#: waeup/kofa/applicants/browser.py:763
-#: waeup/kofa/applicants/browser.py:792
-#: waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:832
-#: waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:780
-#: waeup/kofa/students/browser.py:956
-#: waeup/kofa/students/browser.py:1752
+#: 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
 msgid "Remove selected tickets"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:674
+#: waeup/kofa/applicants/browser.py:675
 #. Default: ""
 msgid "${a} Application Form ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:685
-#: waeup/kofa/students/browser.py:356
+#: waeup/kofa/applicants/browser.py:686
+#: waeup/kofa/students/browser.py:352
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:732
-#: waeup/kofa/students/browser.py:962
+#: waeup/kofa/applicants/browser.py:733
+#: waeup/kofa/students/browser.py:958
 msgid "No payment selected."
 msgstr ""
@@ -585,6 +585,6 @@
 #: waeup/kofa/applicants/browser.py:79
 #: waeup/kofa/applicants/browser.py:105
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:308
+#: waeup/kofa/applicants/browser.py:256
+#: waeup/kofa/applicants/browser.py:309
 #: waeup/kofa/browser/pages.py:634
 #: waeup/kofa/browser/pages.py:675
@@ -594,7 +594,7 @@
 #: waeup/kofa/browser/pages.py:1389
 #: waeup/kofa/hostels/browser.py:131
-#: waeup/kofa/students/browser.py:206
-#: waeup/kofa/students/browser.py:1151
-#: waeup/kofa/students/browser.py:1164
+#: waeup/kofa/students/browser.py:202
+#: waeup/kofa/students/browser.py:1147
+#: waeup/kofa/students/browser.py:1160
 msgid "Remove selected"
 msgstr ""
@@ -607,5 +607,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:805
+#: waeup/kofa/applicants/browser.py:806
 #: waeup/kofa/students/browser.py:88
 msgid "The requested form is locked (read-only)."
@@ -614,6 +614,6 @@
 #: waeup/kofa/applicants/browser.py:81
 #: waeup/kofa/applicants/browser.py:139
-#: waeup/kofa/applicants/browser.py:256
-#: waeup/kofa/applicants/browser.py:347
+#: waeup/kofa/applicants/browser.py:257
+#: waeup/kofa/applicants/browser.py:348
 #: waeup/kofa/browser/pages.py:1355
 #: waeup/kofa/browser/pages.py:1414
@@ -625,12 +625,8 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:819
-msgid "No passport picture uploaded."
-msgstr ""
-
 #: waeup/kofa/applicants/browser.py:82
 #: waeup/kofa/applicants/browser.py:135
-#: waeup/kofa/applicants/browser.py:257
-#: waeup/kofa/applicants/browser.py:343
+#: waeup/kofa/applicants/browser.py:258
+#: waeup/kofa/applicants/browser.py:344
 #: waeup/kofa/browser/pages.py:1356
 #: waeup/kofa/browser/pages.py:1410
@@ -642,5 +638,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:821
+#: waeup/kofa/applicants/browser.py:820
+msgid "No passport picture uploaded."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:822
 msgid "Passport picture confirmation box not ticked."
 msgstr ""
@@ -650,39 +650,39 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:858
-#: waeup/kofa/students/browser.py:1619
+#: waeup/kofa/applicants/browser.py:859
+#: waeup/kofa/students/browser.py:1615
 msgid "This form cannot be submitted. Wrong state!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:863
+#: waeup/kofa/applicants/browser.py:864
 msgid "Form has been submitted."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:898
+#: waeup/kofa/applicants/browser.py:899
 #. Default: ""
 msgid "Register for ${a} Application"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:904
+#: waeup/kofa/applicants/browser.py:905
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:909
+#: waeup/kofa/applicants/browser.py:910
 msgid "Application has ended."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:918
+#: waeup/kofa/applicants/browser.py:919
 msgid "Get login credentials"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:933
+#: waeup/kofa/applicants/browser.py:934
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:940
+#: waeup/kofa/applicants/browser.py:941
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:949
+#: waeup/kofa/applicants/browser.py:950
 msgid "Your registration was successful."
 msgstr ""
@@ -747,5 +747,5 @@
 
 #: waeup/kofa/applicants/interfaces.py:197
-#: waeup/kofa/students/browser.py:713
+#: waeup/kofa/students/browser.py:709
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -772,5 +772,5 @@
 
 #: waeup/kofa/applicants/interfaces.py:204
-#: waeup/kofa/students/browser.py:714
+#: waeup/kofa/students/browser.py:710
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -868,6 +868,6 @@
 
 #: waeup/kofa/applicants/interfaces.py:413
-#: waeup/kofa/interfaces.py:375
-#: waeup/kofa/interfaces.py:401
+#: waeup/kofa/interfaces.py:373
+#: waeup/kofa/interfaces.py:399
 #: waeup/kofa/students/interfaces.py:490
 msgid "Email Address"
@@ -875,6 +875,6 @@
 
 #: waeup/kofa/applicants/interfaces.py:418
-#: waeup/kofa/interfaces.py:380
-#: waeup/kofa/interfaces.py:408
+#: waeup/kofa/interfaces.py:378
+#: waeup/kofa/interfaces.py:406
 #: waeup/kofa/students/interfaces.py:203
 msgid "Phone"
@@ -984,5 +984,5 @@
 #: waeup/kofa/applicants/viewlets.py:151
 #: waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:258
+#: waeup/kofa/students/browser.py:254
 msgid "Create student record"
 msgstr ""
@@ -1187,6 +1187,6 @@
 #: waeup/kofa/browser/pages.py:113
 #: waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:287
-#: waeup/kofa/students/browser.py:230
+#: waeup/kofa/hostels/browser.py:286
+#: waeup/kofa/students/browser.py:226
 msgid "No item selected."
 msgstr ""
@@ -1406,5 +1406,5 @@
 #: waeup/kofa/browser/pages.py:272
 #: waeup/kofa/browser/pages.py:536
-#: waeup/kofa/students/browser.py:320
+#: waeup/kofa/students/browser.py:316
 msgid "Your message has been sent."
 msgstr ""
@@ -1463,5 +1463,5 @@
 
 #: waeup/kofa/browser/pages.py:517
-#: waeup/kofa/students/browser.py:301
+#: waeup/kofa/students/browser.py:297
 #. Default: ""
 msgid "Send message to ${a}"
@@ -2014,5 +2014,5 @@
 
 #: waeup/kofa/hostels/browser.py:212
-#: waeup/kofa/hostels/browser.py:281
+#: waeup/kofa/hostels/browser.py:280
 msgid "Release selected beds"
 msgstr ""
@@ -2023,19 +2023,19 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:275
+#: waeup/kofa/hostels/browser.py:274
 #. Default: ""
 msgid "Successfully switched beds: ${a}"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:299
+#: waeup/kofa/hostels/browser.py:298
 #. Default: ""
 msgid "Successfully released beds: ${a}"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:304
+#: waeup/kofa/hostels/browser.py:303
 msgid "No allocated bed selected."
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:316
+#: waeup/kofa/hostels/browser.py:315
 msgid "Allocate student"
 msgstr ""
@@ -2267,41 +2267,41 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:174
+#: waeup/kofa/interfaces.py:172
 msgid "Subject"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:178
+#: waeup/kofa/interfaces.py:176
 msgid "Grade"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:306
+#: waeup/kofa/interfaces.py:304
 msgid "Importer name"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:310
+#: waeup/kofa/interfaces.py:308
 msgid "Import mode"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:335
+#: waeup/kofa/interfaces.py:333
 msgid "Email Address:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:342
+#: waeup/kofa/interfaces.py:340
 msgid "Email to:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:349
+#: waeup/kofa/interfaces.py:347
 msgid "Subject:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:353
+#: waeup/kofa/interfaces.py:351
 msgid "Full Name:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:357
+#: waeup/kofa/interfaces.py:355
 msgid "Text:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:388
+#: waeup/kofa/interfaces.py:386
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2313,5 +2313,5 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:391
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2320,102 +2320,102 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:397
+#: waeup/kofa/interfaces.py:395
 msgid "Description/Notice"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:414
+#: waeup/kofa/interfaces.py:412
 msgid "Portal roles"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:457
+#: waeup/kofa/interfaces.py:455
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:458
+#: waeup/kofa/interfaces.py:456
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:463
+#: waeup/kofa/interfaces.py:461
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:469
+#: waeup/kofa/interfaces.py:467
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:476
+#: waeup/kofa/interfaces.py:474
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:488
+#: waeup/kofa/interfaces.py:486
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:496
+#: waeup/kofa/interfaces.py:494
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:504
+#: waeup/kofa/interfaces.py:502
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:510
+#: waeup/kofa/interfaces.py:508
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:517
+#: waeup/kofa/interfaces.py:515
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:518
+#: waeup/kofa/interfaces.py:516
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:523
+#: waeup/kofa/interfaces.py:521
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:530
+#: waeup/kofa/interfaces.py:528
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:537
+#: waeup/kofa/interfaces.py:535
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:546
-#: waeup/kofa/interfaces.py:598
+#: waeup/kofa/interfaces.py:544
+#: waeup/kofa/interfaces.py:596
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:554
+#: waeup/kofa/interfaces.py:552
 #: waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:559
+#: waeup/kofa/interfaces.py:557
 #: waeup/kofa/payments/interfaces.py:106
 msgid "Surcharge 1"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:564
+#: waeup/kofa/interfaces.py:562
 #: waeup/kofa/payments/interfaces.py:113
 msgid "Surcharge 2"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:569
+#: waeup/kofa/interfaces.py:567
 #: waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:574
+#: waeup/kofa/interfaces.py:572
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:579
+#: waeup/kofa/interfaces.py:577
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:584
+#: waeup/kofa/interfaces.py:582
 #: waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
@@ -2448,36 +2448,4 @@
 #: waeup/kofa/interfaces.py:79
 msgid "courses validated"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:82
-msgid "Math"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:83
-msgid "Biology"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:84
-msgid "English"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:92
-msgid "Very Good"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:93
-msgid "Good"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:94
-msgid "Satisfactory"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:95
-msgid "Sufficient"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:96
-msgid "Fail"
 msgstr ""
 
@@ -2573,26 +2541,21 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1003
-#: waeup/kofa/students/browser.py:1225
-msgid "Your current session does not match accommodation session."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1072
+#: waeup/kofa/students/browser.py:1068
 msgid "This ticket has already been paid."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1085
-#: waeup/kofa/students/browser.py:1093
-#: waeup/kofa/students/browser.py:1101
+#: waeup/kofa/students/browser.py:1081
+#: waeup/kofa/students/browser.py:1089
+#: waeup/kofa/students/browser.py:1097
 #. Default: ""
 msgid "Valid callback received. ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1155
+#: waeup/kofa/students/browser.py:1151
 #. Default: ""
 msgid "${a}: Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1167
+#: waeup/kofa/students/browser.py:1163
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
@@ -2604,22 +2567,26 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1174
+#: waeup/kofa/students/browser.py:1170
 msgid "No bed ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1205
+#: waeup/kofa/students/browser.py:1201
 msgid "Add bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1207
+#: waeup/kofa/students/browser.py:1203
 msgid "Create bed ticket"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1211
+msgid "Your data are incomplete."
+msgstr ""
+
 #: waeup/kofa/students/browser.py:1215
-msgid "Your data are incomplete."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1219
 msgid "You are in the wrong registration state."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1226
+msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
@@ -2630,68 +2597,64 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1230
-msgid "You already booked a bed space in current accommodation session."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1241
-#: waeup/kofa/students/browser.py:1537
-#: waeup/kofa/students/browser.py:1650
+#: 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:1261
-#: waeup/kofa/students/browser.py:1389
+#: waeup/kofa/students/browser.py:1257
+#: waeup/kofa/students/browser.py:1385
 #. Default: ""
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1266
-#: waeup/kofa/students/browser.py:1542
-#: waeup/kofa/students/browser.py:1655
+#: waeup/kofa/students/browser.py:1262
+#: waeup/kofa/students/browser.py:1538
+#: waeup/kofa/students/browser.py:1651
 msgid "Activation code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1269
+#: waeup/kofa/students/browser.py:1265
+#: waeup/kofa/students/browser.py:1541
+#: waeup/kofa/students/browser.py:1654
+#: waeup/kofa/students/browser.py:1913
+msgid "invalidated"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1270
 #: waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1658
-#: waeup/kofa/students/browser.py:1917
-msgid "invalidated"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1274
-#: waeup/kofa/students/browser.py:1549
-#: waeup/kofa/students/browser.py:1663
+#: waeup/kofa/students/browser.py:1659
 msgid "You are not the owner of this access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1285
-#: waeup/kofa/students/browser.py:1403
+#: waeup/kofa/students/browser.py:1281
+#: waeup/kofa/students/browser.py:1399
 #. Default: ""
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1294
+#: waeup/kofa/students/browser.py:1290
 #. Default: ""
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1312
+#: waeup/kofa/students/browser.py:1308
 #. Default: ""
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1328
+#: waeup/kofa/students/browser.py:1324
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1334
+#: waeup/kofa/students/browser.py:1330
 msgid "Bed Allocation: "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1361
+#: waeup/kofa/students/browser.py:1357
 msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1367
+#: waeup/kofa/students/browser.py:1363
 msgid "Student can't be relocated."
 msgstr ""
@@ -2702,24 +2665,28 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1410
+#: waeup/kofa/students/browser.py:1406
 #. Default: ""
 msgid "Student relocated: ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1429
+#: waeup/kofa/students/browser.py:1425
 #. Default: ""
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1441
+#: waeup/kofa/students/browser.py:1437
 #: waeup/kofa/students/viewlets.py:356
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1456
+#: waeup/kofa/students/browser.py:1452
 #: waeup/kofa/students/viewlets.py:365
 msgid "Change password"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1466
+msgid "Password changed."
+msgstr ""
+
 #: waeup/kofa/students/browser.py:147
 #. Default: ""
@@ -2727,13 +2694,9 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1470
-msgid "Password changed."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1482
+#: waeup/kofa/students/browser.py:1478
 msgid "Upload portrait"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1497
+#: waeup/kofa/students/browser.py:1493
 #: waeup/kofa/students/viewlets.py:389
 #: waeup/kofa/students/workflow.py:44
@@ -2741,197 +2704,197 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1501
+#: waeup/kofa/students/browser.py:1497
 msgid "Start clearance now"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1514
+#: waeup/kofa/students/browser.py:1635
+msgid "Wrong state"
+msgstr ""
+
 #: waeup/kofa/students/browser.py:1518
-#: waeup/kofa/students/browser.py:1639
-msgid "Wrong state"
+msgid "No portrait uploaded."
 msgstr ""
 
 #: waeup/kofa/students/browser.py:1522
-msgid "No portrait uploaded."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1526
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1553
+#: waeup/kofa/students/browser.py:1549
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1565
+#: waeup/kofa/students/browser.py:1561
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1577
-#: waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1573
+#: waeup/kofa/students/browser.py:1587
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1585
+#: waeup/kofa/students/browser.py:1581
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1600
+#: waeup/kofa/students/browser.py:1596
 #: waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1601
+#: waeup/kofa/students/browser.py:1597
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1604
+#: waeup/kofa/students/browser.py:1600
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1613
+#: waeup/kofa/students/browser.py:1609
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1622
+#: waeup/kofa/students/browser.py:1618
 msgid "Clearance has been requested."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1631
+#: waeup/kofa/students/browser.py:1627
 #: waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1635
+#: waeup/kofa/students/browser.py:1631
 msgid "Start course registration now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1671
+#: waeup/kofa/students/browser.py:166
+msgid "Student Section"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1667
 msgid "Course registration has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1690
+#: waeup/kofa/students/browser.py:1686
 #. Default: ""
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1699
+#: waeup/kofa/students/browser.py:1695
 msgid "Create course list now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:170
-msgid "Student Section"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1738
+#: waeup/kofa/students/browser.py:1734
 #. Default: ""
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1771
+msgid "Register course list"
+msgstr ""
+
 #: waeup/kofa/students/browser.py:1775
-msgid "Register course list"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1779
 msgid "Course list has been registered."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1825
+#: waeup/kofa/students/browser.py:182
+#: waeup/kofa/students/browser.py:218
+msgid "Empty search string"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1821
 msgid "Change my password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1835
+#: waeup/kofa/students/browser.py:1831
 msgid "Get new login credentials"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1849
+#: waeup/kofa/students/browser.py:1845
 msgid "No student record found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1857
+#: waeup/kofa/students/browser.py:1853
 msgid "You have successfully changed your password for the"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:186
-#: waeup/kofa/students/browser.py:222
-msgid "Empty search string"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1862
+#: waeup/kofa/students/browser.py:1858
 #. Default: ""
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1873
+#: waeup/kofa/students/browser.py:1869
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1876
+#: waeup/kofa/students/browser.py:1872
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1891
+#: waeup/kofa/students/browser.py:1887
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1899
+#: waeup/kofa/students/browser.py:1895
 msgid "Access code is invalid."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1902
+#: waeup/kofa/students/browser.py:1898
 #. Default: ""
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1908
+#: waeup/kofa/students/browser.py:1904
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1914
+#: waeup/kofa/students/browser.py:1910
 msgid "Access code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1923
+#: waeup/kofa/students/browser.py:1919
 #. Default: ""
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:204
+#: waeup/kofa/students/browser.py:200
 #: waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:228
-#: waeup/kofa/students/browser.py:1888
+#: waeup/kofa/students/browser.py:224
+#: waeup/kofa/students/browser.py:1884
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:255
+#: waeup/kofa/students/browser.py:251
 #: waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:263
+#: waeup/kofa/students/browser.py:259
 msgid "Student record created."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:279
+#: waeup/kofa/students/browser.py:275
 #. Default: ""
 msgid "${a}: Base Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:322
-#: waeup/kofa/students/browser.py:1865
+#: waeup/kofa/students/browser.py:318
+#: waeup/kofa/students/browser.py:1861
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:333
+#: waeup/kofa/students/browser.py:329
 msgid "Manage base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:402
+#: waeup/kofa/students/browser.py:398
 #. Default: ""
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:418
+#: waeup/kofa/students/browser.py:414
 #: waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
@@ -2940,88 +2903,88 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:424
+#: waeup/kofa/students/browser.py:420
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:444
+#: waeup/kofa/students/browser.py:440
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:473
+#: waeup/kofa/students/browser.py:469
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:475
-#: waeup/kofa/students/browser.py:499
+#: waeup/kofa/students/browser.py:471
+#: 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 has been annulled."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:496
 msgid "Clearance request has been rejected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:522
+#: waeup/kofa/students/browser.py:518
 #. Default: ""
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:532
+#: waeup/kofa/students/browser.py:528
 msgid "Manage personal data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:552
+#: waeup/kofa/students/browser.py:548
 #. Default: ""
 msgid "${a}: Study Course"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:578
+msgid "Manage study course"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:581
+#: waeup/kofa/students/browser.py:622
+msgid "Remove selected levels"
+msgstr ""
+
 #: waeup/kofa/students/browser.py:582
-msgid "Manage study course"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:585
-#: waeup/kofa/students/browser.py:626
-msgid "Remove selected levels"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:586
-#: waeup/kofa/students/browser.py:612
+#: waeup/kofa/students/browser.py:608
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:620
+#: waeup/kofa/students/browser.py:616
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:622
-#: waeup/kofa/students/browser.py:1708
+#: waeup/kofa/students/browser.py:618
+#: waeup/kofa/students/browser.py:1704
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:632
+#: waeup/kofa/students/browser.py:628
 msgid "No study level selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:668
+#: waeup/kofa/students/browser.py:664
 #. Default: ""
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:691
+#: waeup/kofa/students/browser.py:687
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:697
+#: waeup/kofa/students/browser.py:693
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:706
+#: waeup/kofa/students/browser.py:702
 msgid "Course Registration Slip  "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:712
+#: waeup/kofa/students/browser.py:708
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -3030,5 +2993,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:715
+#: waeup/kofa/students/browser.py:711
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -3036,10 +2999,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:716
+#: waeup/kofa/students/browser.py:712
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:717
+#: waeup/kofa/students/browser.py:713
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -3047,5 +3010,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:718
+#: waeup/kofa/students/browser.py:714
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -3053,5 +3016,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:719
+#: waeup/kofa/students/browser.py:715
 #: waeup/kofa/students/interfaces.py:370
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
@@ -3061,77 +3024,82 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:747
-#: waeup/kofa/students/browser.py:776
-#: waeup/kofa/students/browser.py:861
-#: waeup/kofa/students/browser.py:866
-#: waeup/kofa/students/browser.py:1748
-#: waeup/kofa/students/browser.py:1798
+#: waeup/kofa/students/browser.py: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
 msgid "Add course ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:768
+#: waeup/kofa/students/browser.py:764
 #. Default: ""
 msgid "Manage study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:786
-#: waeup/kofa/students/browser.py:1758
+#: waeup/kofa/students/browser.py:782
+#: waeup/kofa/students/browser.py:1754
 msgid "No ticket selected."
 msgstr ""
 
+#: waeup/kofa/students/browser.py:806
+#: waeup/kofa/students/browser.py:828
+msgid "This level does not correspond current level."
+msgstr ""
+
 #: waeup/kofa/students/browser.py:810
-#: waeup/kofa/students/browser.py:832
-msgid "This level does not correspond current level."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:814
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:816
-#: waeup/kofa/students/browser.py:844
+#: waeup/kofa/students/browser.py:812
+#: 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 annulled."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:841
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:881
-#: waeup/kofa/students/browser.py:1811
+#: waeup/kofa/students/browser.py:877
+#: waeup/kofa/students/browser.py:1807
 msgid "The ticket exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:883
-#: waeup/kofa/students/browser.py:1813
+#: waeup/kofa/students/browser.py:879
+#: waeup/kofa/students/browser.py:1809
 #. Default: ""
 msgid "Successfully added ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:904
+#: waeup/kofa/students/browser.py:900
 #. Default: ""
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:920
+#: waeup/kofa/students/browser.py:916
 #. Default: ""
 msgid "Manage course ticket ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:947
+#: waeup/kofa/students/browser.py:943
 #. Default: ""
 msgid "${a}: Payments"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:992
+#: waeup/kofa/students/browser.py:988
 msgid "Add online payment"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:995
+#: waeup/kofa/students/browser.py:991
 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 ""
 
@@ -3904,5 +3872,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:122
+#: waeup/kofa/utils/utils.py:228
 msgid ""
 "Fullname: ${a}\n"
@@ -3914,5 +3882,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:167
+#: waeup/kofa/utils/utils.py:273
 msgid ""
 "Dear ${a},\n"
Index: /main/waeup.kofa/trunk/src/waeup/kofa/locales/yo/LC_MESSAGES/waeup.kofa.po
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/locales/yo/LC_MESSAGES/waeup.kofa.po	(revision 7838)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/yo/LC_MESSAGES/waeup.kofa.po	(revision 7839)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.Kofa\n"
-"POT-Creation-Date: Fri Mar  9 23:09:56 2012\n"
+"POT-Creation-Date: Sun Mar 11 16:45:08 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -30,6 +30,6 @@
 #: waeup/kofa/accesscodes/browser.py:100 waeup/kofa/accesscodes/browser.py:113
 #: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:130
-#: waeup/kofa/applicants/browser.py:182 waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:338
+#: waeup/kofa/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
@@ -45,7 +45,7 @@
 #: waeup/kofa/browser/pages.py:1767 waeup/kofa/browser/pages.py:1769
 #: waeup/kofa/browser/pages.py:1804 waeup/kofa/browser/pages.py:1855
-#: waeup/kofa/browser/pages.py:1907 waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:748 waeup/kofa/students/browser.py:888
+#: waeup/kofa/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
 msgid "Cancel"
 msgstr ""
@@ -87,5 +87,5 @@
 #: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:592
 #: waeup/kofa/browser/pages.py:1142 waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:171 waeup/kofa/students/browser.py:205
+#: waeup/kofa/students/browser.py:167 waeup/kofa/students/browser.py:201
 msgid "Search"
 msgstr ""
@@ -342,15 +342,15 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:325
-#: waeup/kofa/applicants/browser.py:745
+#: waeup/kofa/applicants/browser.py:117 waeup/kofa/applicants/browser.py:326
+#: waeup/kofa/applicants/browser.py:746
 msgid "Could not delete:"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py:328
-#: waeup/kofa/applicants/browser.py:748 waeup/kofa/browser/pages.py:134
-#: waeup/kofa/students/browser.py:243 waeup/kofa/students/browser.py:642
-#: waeup/kofa/students/browser.py:796 waeup/kofa/students/browser.py:974
-#: waeup/kofa/students/browser.py:1184 waeup/kofa/students/browser.py:1770
+#: waeup/kofa/applicants/browser.py:120 waeup/kofa/applicants/browser.py: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
 msgid "Successfully removed: ${a}"
 msgstr ""
@@ -372,8 +372,8 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:254 waeup/kofa/applicants/browser.py:301
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:688
-#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:838 waeup/kofa/browser/pages.py:476
+#: waeup/kofa/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
@@ -382,97 +382,97 @@
 #: waeup/kofa/browser/pages.py:1716 waeup/kofa/browser/pages.py:1767
 #: waeup/kofa/browser/pages.py:1788 waeup/kofa/hostels/browser.py:209
-#: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:319
-#: waeup/kofa/students/browser.py:359 waeup/kofa/students/browser.py:458
-#: waeup/kofa/students/browser.py:535 waeup/kofa/students/browser.py:584
-#: waeup/kofa/students/browser.py:600 waeup/kofa/students/browser.py:746
-#: waeup/kofa/students/browser.py:771 waeup/kofa/students/browser.py:1444
-#: waeup/kofa/students/browser.py:1459 waeup/kofa/students/browser.py:1574
+#: waeup/kofa/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
 msgid "Save"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:333
-#: waeup/kofa/applicants/browser.py:361
+#: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:334
+#: waeup/kofa/applicants/browser.py:362
 msgid "Add applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:265 waeup/kofa/applicants/viewlets.py:95
+#: waeup/kofa/applicants/browser.py:266 waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:305 waeup/kofa/applicants/browser.py:717
+#: waeup/kofa/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:385
+#: waeup/kofa/students/browser.py:381
 msgid "Form has been saved."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:314
+#: waeup/kofa/applicants/browser.py:315
 msgid "No applicant selected!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:364
+#: waeup/kofa/applicants/browser.py:365
 msgid "Create application record"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:369
+#: waeup/kofa/applicants/browser.py:370
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:382
+#: waeup/kofa/applicants/browser.py:383
 msgid "Applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:397 waeup/kofa/students/browser.py:285
+#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:281
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:398 waeup/kofa/students/browser.py:286
+#: waeup/kofa/applicants/browser.py:399 waeup/kofa/students/browser.py:282
 msgid "unset"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:403
+#: waeup/kofa/applicants/browser.py:404
 msgid "${a} Application Record ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:454
+#: waeup/kofa/applicants/browser.py:455
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:461 waeup/kofa/students/browser.py:1023
+#: waeup/kofa/applicants/browser.py:462 waeup/kofa/students/browser.py:1019
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:474 waeup/kofa/students/browser.py:1037
+#: waeup/kofa/applicants/browser.py:475 waeup/kofa/students/browser.py:1033
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:501 waeup/kofa/students/browser.py:1056
+#: waeup/kofa/applicants/browser.py:502 waeup/kofa/students/browser.py:1052
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:529 waeup/kofa/students/browser.py:1105
+#: waeup/kofa/applicants/browser.py:530 waeup/kofa/students/browser.py:1101
 msgid "Valid callback received."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:550
+#: waeup/kofa/applicants/browser.py:551
 msgid "Payment Data"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:556
+#: waeup/kofa/applicants/browser.py:557
 msgid "Online Payment Receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:562
+#: waeup/kofa/applicants/browser.py:563
 msgid "Ticket not yet paid."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:627
+#: waeup/kofa/applicants/browser.py:628
 msgid "Uploaded image is too big!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:632
+#: waeup/kofa/applicants/browser.py:633
 msgid "jpg file extension expected."
 msgstr ""
@@ -482,33 +482,33 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:846
+#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:795
+#: waeup/kofa/applicants/browser.py:847
 msgid "Final Submit"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:758
-#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:827
-#: waeup/kofa/students/browser.py:980
+#: 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
 msgid "Add online payment ticket"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:655 waeup/kofa/applicants/browser.py:763
-#: waeup/kofa/applicants/browser.py:792 waeup/kofa/applicants/browser.py:795
-#: waeup/kofa/applicants/browser.py:832 waeup/kofa/students/browser.py:748
-#: waeup/kofa/students/browser.py:780 waeup/kofa/students/browser.py:956
-#: waeup/kofa/students/browser.py:1752
+#: 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
 msgid "Remove selected tickets"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:674
+#: waeup/kofa/applicants/browser.py:675
 msgid "${a} Application Form ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:685 waeup/kofa/students/browser.py:356
+#: waeup/kofa/applicants/browser.py:686 waeup/kofa/students/browser.py:352
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:732 waeup/kofa/students/browser.py:962
+#: waeup/kofa/applicants/browser.py:733 waeup/kofa/students/browser.py:958
 msgid "No payment selected."
 msgstr ""
@@ -519,10 +519,10 @@
 
 #: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:105
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:308
+#: waeup/kofa/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:206
-#: waeup/kofa/students/browser.py:1151 waeup/kofa/students/browser.py:1164
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:202
+#: waeup/kofa/students/browser.py:1147 waeup/kofa/students/browser.py:1160
 msgid "Remove selected"
 msgstr ""
@@ -533,10 +533,10 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:805 waeup/kofa/students/browser.py:88
+#: waeup/kofa/applicants/browser.py:806 waeup/kofa/students/browser.py:88
 msgid "The requested form is locked (read-only)."
 msgstr ""
 
 #: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:139
-#: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:347
+#: waeup/kofa/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
@@ -545,10 +545,6 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:819
-msgid "No passport picture uploaded."
-msgstr ""
-
 #: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:135
-#: waeup/kofa/applicants/browser.py:257 waeup/kofa/applicants/browser.py:343
+#: waeup/kofa/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
@@ -557,5 +553,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:821
+#: waeup/kofa/applicants/browser.py:820
+msgid "No passport picture uploaded."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:822
 msgid "Passport picture confirmation box not ticked."
 msgstr ""
@@ -565,38 +565,38 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:858 waeup/kofa/students/browser.py:1619
+#: waeup/kofa/applicants/browser.py:859 waeup/kofa/students/browser.py:1615
 msgid "This form cannot be submitted. Wrong state!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:863
+#: waeup/kofa/applicants/browser.py:864
 msgid "Form has been submitted."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:898
+#: waeup/kofa/applicants/browser.py:899
 msgid "Register for ${a} Application"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:904
+#: waeup/kofa/applicants/browser.py:905
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:909
+#: waeup/kofa/applicants/browser.py:910
 msgid "Application has ended."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:918
+#: waeup/kofa/applicants/browser.py:919
 msgid "Get login credentials"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:933
+#: waeup/kofa/applicants/browser.py:934
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:940
+#: waeup/kofa/applicants/browser.py:941
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:949
+#: waeup/kofa/applicants/browser.py:950
 msgid "Your registration was successful."
 msgstr ""
@@ -664,5 +664,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:713
+#: waeup/kofa/applicants/interfaces.py:197 waeup/kofa/students/browser.py:709
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -688,5 +688,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:714
+#: waeup/kofa/applicants/interfaces.py:204 waeup/kofa/students/browser.py:710
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -783,11 +783,11 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:375
-#: waeup/kofa/interfaces.py:401 waeup/kofa/students/interfaces.py:490
+#: waeup/kofa/applicants/interfaces.py:413 waeup/kofa/interfaces.py:373
+#: waeup/kofa/interfaces.py:399 waeup/kofa/students/interfaces.py:490
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:380
-#: waeup/kofa/interfaces.py:408 waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/applicants/interfaces.py:418 waeup/kofa/interfaces.py:378
+#: waeup/kofa/interfaces.py:406 waeup/kofa/students/interfaces.py:203
 msgid "Phone"
 msgstr ""
@@ -897,5 +897,5 @@
 
 #: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:258
+#: waeup/kofa/students/browser.py:254
 msgid "Create student record"
 msgstr ""
@@ -1080,5 +1080,5 @@
 
 #: waeup/kofa/browser/pages.py:113 waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:287 waeup/kofa/students/browser.py:230
+#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:226
 msgid "No item selected."
 msgstr ""
@@ -1272,5 +1272,5 @@
 
 #: waeup/kofa/browser/pages.py:253 waeup/kofa/browser/pages.py:272
-#: waeup/kofa/browser/pages.py:536 waeup/kofa/students/browser.py:320
+#: waeup/kofa/browser/pages.py:536 waeup/kofa/students/browser.py:316
 msgid "Your message has been sent."
 msgstr ""
@@ -1324,5 +1324,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:301
+#: waeup/kofa/browser/pages.py:517 waeup/kofa/students/browser.py:297
 msgid "Send message to ${a}"
 msgstr ""
@@ -1861,5 +1861,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:212 waeup/kofa/hostels/browser.py:281
+#: waeup/kofa/hostels/browser.py:212 waeup/kofa/hostels/browser.py:280
 msgid "Release selected beds"
 msgstr ""
@@ -1872,18 +1872,18 @@
 
 #. Default: ""
-#: waeup/kofa/hostels/browser.py:275
+#: waeup/kofa/hostels/browser.py:274
 msgid "Successfully switched beds: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/hostels/browser.py:299
+#: waeup/kofa/hostels/browser.py:298
 msgid "Successfully released beds: ${a}"
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:304
+#: waeup/kofa/hostels/browser.py:303
 msgid "No allocated bed selected."
 msgstr ""
 
-#: waeup/kofa/hostels/browser.py:316
+#: waeup/kofa/hostels/browser.py:315
 msgid "Allocate student"
 msgstr ""
@@ -2112,41 +2112,41 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:174
+#: waeup/kofa/interfaces.py:172
 msgid "Subject"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:178
+#: waeup/kofa/interfaces.py:176
 msgid "Grade"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:306
+#: waeup/kofa/interfaces.py:304
 msgid "Importer name"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:310
+#: waeup/kofa/interfaces.py:308
 msgid "Import mode"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:335
+#: waeup/kofa/interfaces.py:333
 msgid "Email Address:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:342
+#: waeup/kofa/interfaces.py:340
 msgid "Email to:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:349
+#: waeup/kofa/interfaces.py:347
 msgid "Subject:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:353
+#: waeup/kofa/interfaces.py:351
 msgid "Full Name:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:357
+#: waeup/kofa/interfaces.py:355
 msgid "Text:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:388
+#: waeup/kofa/interfaces.py:386
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2158,5 +2158,5 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:391
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2165,97 +2165,97 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:397
+#: waeup/kofa/interfaces.py:395
 msgid "Description/Notice"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:414
+#: waeup/kofa/interfaces.py:412
 msgid "Portal roles"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:457
+#: waeup/kofa/interfaces.py:455
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:458
+#: waeup/kofa/interfaces.py:456
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:463
+#: waeup/kofa/interfaces.py:461
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:469
+#: waeup/kofa/interfaces.py:467
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:476
+#: waeup/kofa/interfaces.py:474
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:488
+#: waeup/kofa/interfaces.py:486
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:496
+#: waeup/kofa/interfaces.py:494
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:504
+#: waeup/kofa/interfaces.py:502
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:510
+#: waeup/kofa/interfaces.py:508
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:517
+#: waeup/kofa/interfaces.py:515
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:518
+#: waeup/kofa/interfaces.py:516
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:523
+#: waeup/kofa/interfaces.py:521
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:530
+#: waeup/kofa/interfaces.py:528
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:537
+#: waeup/kofa/interfaces.py:535
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:546 waeup/kofa/interfaces.py:598
+#: waeup/kofa/interfaces.py:544 waeup/kofa/interfaces.py:596
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:554 waeup/kofa/payments/interfaces.py:30
+#: waeup/kofa/interfaces.py:552 waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:559 waeup/kofa/payments/interfaces.py:106
+#: waeup/kofa/interfaces.py:557 waeup/kofa/payments/interfaces.py:106
 msgid "Surcharge 1"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:564 waeup/kofa/payments/interfaces.py:113
+#: waeup/kofa/interfaces.py:562 waeup/kofa/payments/interfaces.py:113
 msgid "Surcharge 2"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:569 waeup/kofa/payments/interfaces.py:120
+#: waeup/kofa/interfaces.py:567 waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:574
+#: waeup/kofa/interfaces.py:572
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:579
+#: waeup/kofa/interfaces.py:577
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:584 waeup/kofa/payments/interfaces.py:36
+#: waeup/kofa/interfaces.py:582 waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
 msgstr ""
@@ -2287,36 +2287,4 @@
 #: waeup/kofa/interfaces.py:79
 msgid "courses validated"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:82
-msgid "Math"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:83
-msgid "Biology"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:84
-msgid "English"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:92
-msgid "Very Good"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:93
-msgid "Good"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:94
-msgid "Satisfactory"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:95
-msgid "Sufficient"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:96
-msgid "Fail"
 msgstr ""
 
@@ -2412,24 +2380,20 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1003 waeup/kofa/students/browser.py:1225
-msgid "Your current session does not match accommodation session."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1072
+#: waeup/kofa/students/browser.py:1068
 msgid "This ticket has already been paid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1085 waeup/kofa/students/browser.py:1093
-#: waeup/kofa/students/browser.py:1101
+#: waeup/kofa/students/browser.py:1081 waeup/kofa/students/browser.py:1089
+#: waeup/kofa/students/browser.py:1097
 msgid "Valid callback received. ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1155
+#: waeup/kofa/students/browser.py:1151
 msgid "${a}: Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1167
+#: waeup/kofa/students/browser.py:1163
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
@@ -2440,22 +2404,26 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1174
+#: waeup/kofa/students/browser.py:1170
 msgid "No bed ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1205
+#: waeup/kofa/students/browser.py:1201
 msgid "Add bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1207
+#: waeup/kofa/students/browser.py:1203
 msgid "Create bed ticket"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1211
+msgid "Your data are incomplete."
+msgstr ""
+
 #: waeup/kofa/students/browser.py:1215
-msgid "Your data are incomplete."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1219
 msgid "You are in the wrong registration state."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1226
+msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
@@ -2465,61 +2433,57 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1230
-msgid "You already booked a bed space in current accommodation session."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1241 waeup/kofa/students/browser.py:1537
-#: waeup/kofa/students/browser.py:1650
+#: 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:1261 waeup/kofa/students/browser.py:1389
+#: waeup/kofa/students/browser.py:1257 waeup/kofa/students/browser.py:1385
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1266 waeup/kofa/students/browser.py:1542
-#: waeup/kofa/students/browser.py:1655
+#: waeup/kofa/students/browser.py:1262 waeup/kofa/students/browser.py:1538
+#: waeup/kofa/students/browser.py:1651
 msgid "Activation code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1269 waeup/kofa/students/browser.py:1545
-#: waeup/kofa/students/browser.py:1658 waeup/kofa/students/browser.py:1917
+#: waeup/kofa/students/browser.py:1265 waeup/kofa/students/browser.py:1541
+#: waeup/kofa/students/browser.py:1654 waeup/kofa/students/browser.py:1913
 msgid "invalidated"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1274 waeup/kofa/students/browser.py:1549
-#: waeup/kofa/students/browser.py:1663
+#: waeup/kofa/students/browser.py:1270 waeup/kofa/students/browser.py:1545
+#: waeup/kofa/students/browser.py:1659
 msgid "You are not the owner of this access code."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1285 waeup/kofa/students/browser.py:1403
+#: waeup/kofa/students/browser.py:1281 waeup/kofa/students/browser.py:1399
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1294
+#: waeup/kofa/students/browser.py:1290
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1312
+#: waeup/kofa/students/browser.py:1308
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1328
+#: waeup/kofa/students/browser.py:1324
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1334
+#: waeup/kofa/students/browser.py:1330
 msgid "Bed Allocation: "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1361
+#: waeup/kofa/students/browser.py:1357
 msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1367
+#: waeup/kofa/students/browser.py:1363
 msgid "Student can't be relocated."
 msgstr ""
@@ -2530,19 +2494,23 @@
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1410
+#: waeup/kofa/students/browser.py:1406
 msgid "Student relocated: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1429
+#: waeup/kofa/students/browser.py:1425
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1441 waeup/kofa/students/viewlets.py:356
+#: waeup/kofa/students/browser.py:1437 waeup/kofa/students/viewlets.py:356
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1456 waeup/kofa/students/viewlets.py:365
+#: waeup/kofa/students/browser.py:1452 waeup/kofa/students/viewlets.py:365
 msgid "Change password"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1466
+msgid "Password changed."
 msgstr ""
 
@@ -2552,201 +2520,197 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1470
-msgid "Password changed."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1482
+#: waeup/kofa/students/browser.py:1478
 msgid "Upload portrait"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1497 waeup/kofa/students/viewlets.py:389
+#: waeup/kofa/students/browser.py:1493 waeup/kofa/students/viewlets.py:389
 #: waeup/kofa/students/workflow.py:44
 msgid "Start clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1501
+#: waeup/kofa/students/browser.py:1497
 msgid "Start clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1518 waeup/kofa/students/browser.py:1639
+#: waeup/kofa/students/browser.py:1514 waeup/kofa/students/browser.py:1635
 msgid "Wrong state"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1518
+msgid "No portrait uploaded."
+msgstr ""
+
 #: waeup/kofa/students/browser.py:1522
-msgid "No portrait uploaded."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1526
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1553
+#: waeup/kofa/students/browser.py:1549
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1565
+#: waeup/kofa/students/browser.py:1561
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1577 waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1573 waeup/kofa/students/browser.py:1587
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1585
+#: waeup/kofa/students/browser.py:1581
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1600 waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1596 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1601
+#: waeup/kofa/students/browser.py:1597
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1604
+#: waeup/kofa/students/browser.py:1600
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1613
+#: waeup/kofa/students/browser.py:1609
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1622
+#: waeup/kofa/students/browser.py:1618
 msgid "Clearance has been requested."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1631 waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:1627 waeup/kofa/students/viewlets.py:418
 msgid "Start course registration"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1635
+#: waeup/kofa/students/browser.py:1631
 msgid "Start course registration now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1671
+#: waeup/kofa/students/browser.py:166
+msgid "Student Section"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1667
 msgid "Course registration has been started."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1690
+#: waeup/kofa/students/browser.py:1686
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1699
+#: waeup/kofa/students/browser.py:1695
 msgid "Create course list now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:170
-msgid "Student Section"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1738
+#. Default: ""
+#: waeup/kofa/students/browser.py:1734
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
+#: waeup/kofa/students/browser.py:1771
+msgid "Register course list"
+msgstr ""
+
 #: waeup/kofa/students/browser.py:1775
-msgid "Register course list"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1779
 msgid "Course list has been registered."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1825
+#: waeup/kofa/students/browser.py:182 waeup/kofa/students/browser.py:218
+msgid "Empty search string"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1821
 msgid "Change my password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1835
+#: waeup/kofa/students/browser.py:1831
 msgid "Get new login credentials"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1849
+#: waeup/kofa/students/browser.py:1845
 msgid "No student record found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1857
+#: waeup/kofa/students/browser.py:1853
 msgid "You have successfully changed your password for the"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:186 waeup/kofa/students/browser.py:222
-msgid "Empty search string"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1862
+#. Default: ""
+#: waeup/kofa/students/browser.py:1858
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1873
+#: waeup/kofa/students/browser.py:1869
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1876
+#: waeup/kofa/students/browser.py:1872
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1891
+#: waeup/kofa/students/browser.py:1887
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1899
+#: waeup/kofa/students/browser.py:1895
 msgid "Access code is invalid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1902
+#: waeup/kofa/students/browser.py:1898
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1908
+#: waeup/kofa/students/browser.py:1904
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1914
+#: waeup/kofa/students/browser.py:1910
 msgid "Access code has already been used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1923
+#: waeup/kofa/students/browser.py:1919
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:204 waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:200 waeup/kofa/students/viewlets.py:139
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:228 waeup/kofa/students/browser.py:1888
+#: waeup/kofa/students/browser.py:224 waeup/kofa/students/browser.py:1884
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:255 waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:251 waeup/kofa/students/viewlets.py:146
 msgid "Add student"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:263
+#: waeup/kofa/students/browser.py:259
 msgid "Student record created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:279
+#: waeup/kofa/students/browser.py:275
 msgid "${a}: Base Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:322 waeup/kofa/students/browser.py:1865
+#: waeup/kofa/students/browser.py:318 waeup/kofa/students/browser.py:1861
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:333
+#: waeup/kofa/students/browser.py:329
 msgid "Manage base data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:402
+#: waeup/kofa/students/browser.py:398
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:418 waeup/kofa/students/viewlets.py:104
+#: waeup/kofa/students/browser.py:414 waeup/kofa/students/viewlets.py:104
 #: waeup/kofa/students/viewlets.py:532
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
@@ -2754,84 +2718,84 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:424
+#: waeup/kofa/students/browser.py:420
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:444
+#: waeup/kofa/students/browser.py:440
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:473
+#: waeup/kofa/students/browser.py:469
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:475 waeup/kofa/students/browser.py:499
+#: waeup/kofa/students/browser.py:471 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 has been annulled."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:496
 msgid "Clearance request has been rejected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:522
+#: waeup/kofa/students/browser.py:518
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:532
+#: waeup/kofa/students/browser.py:528
 msgid "Manage personal data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:552
+#: waeup/kofa/students/browser.py:548
 msgid "${a}: Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:582
+#: waeup/kofa/students/browser.py:578
 msgid "Manage study course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:585 waeup/kofa/students/browser.py:626
+#: waeup/kofa/students/browser.py:581 waeup/kofa/students/browser.py:622
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:586 waeup/kofa/students/browser.py:612
+#: waeup/kofa/students/browser.py:582 waeup/kofa/students/browser.py:608
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:620
+#: waeup/kofa/students/browser.py:616
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:622 waeup/kofa/students/browser.py:1708
+#: waeup/kofa/students/browser.py:618 waeup/kofa/students/browser.py:1704
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:632
+#: waeup/kofa/students/browser.py:628
 msgid "No study level selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:668
+#: waeup/kofa/students/browser.py:664
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:691
+#: waeup/kofa/students/browser.py:687
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:697
+#: waeup/kofa/students/browser.py:693
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:706
+#: waeup/kofa/students/browser.py:702
 msgid "Course Registration Slip  "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:712
+#: waeup/kofa/students/browser.py:708
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -2840,5 +2804,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:715
+#: waeup/kofa/students/browser.py:711
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -2846,10 +2810,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:716
+#: waeup/kofa/students/browser.py:712
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:717
+#: waeup/kofa/students/browser.py:713
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -2857,5 +2821,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:718
+#: waeup/kofa/students/browser.py:714
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -2863,5 +2827,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:719 waeup/kofa/students/interfaces.py:370
+#: waeup/kofa/students/browser.py:715 waeup/kofa/students/interfaces.py:370
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2870,69 +2834,73 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:747 waeup/kofa/students/browser.py:776
-#: waeup/kofa/students/browser.py:861 waeup/kofa/students/browser.py:866
-#: waeup/kofa/students/browser.py:1748 waeup/kofa/students/browser.py:1798
+#: waeup/kofa/students/browser.py: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
 msgid "Add course ticket"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:768
+#: waeup/kofa/students/browser.py:764
 msgid "Manage study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:786 waeup/kofa/students/browser.py:1758
+#: waeup/kofa/students/browser.py:782 waeup/kofa/students/browser.py:1754
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:810 waeup/kofa/students/browser.py:832
+#: waeup/kofa/students/browser.py:806 waeup/kofa/students/browser.py:828
 msgid "This level does not correspond current level."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:814
+#: waeup/kofa/students/browser.py:810
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:816 waeup/kofa/students/browser.py:844
+#: waeup/kofa/students/browser.py:812 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 annulled."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:841
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:881 waeup/kofa/students/browser.py:1811
+#: waeup/kofa/students/browser.py:877 waeup/kofa/students/browser.py:1807
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:883 waeup/kofa/students/browser.py:1813
+#: waeup/kofa/students/browser.py:879 waeup/kofa/students/browser.py:1809
 msgid "Successfully added ${a}."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:904
+#: waeup/kofa/students/browser.py:900
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:920
+#: waeup/kofa/students/browser.py:916
 msgid "Manage course ticket ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:947
+#: waeup/kofa/students/browser.py:943
 msgid "${a}: Payments"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:992
+#: waeup/kofa/students/browser.py:988
 msgid "Add online payment"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:995
+#: waeup/kofa/students/browser.py:991
 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 ""
 
@@ -3693,5 +3661,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:122
+#: waeup/kofa/utils/utils.py:228
 msgid ""
 "Fullname: ${a}\n"
@@ -3703,5 +3671,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:167
+#: waeup/kofa/utils/utils.py:273
 msgid ""
 "Dear ${a},\n"
