Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicanteditpage.pt
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicanteditpage.pt	(revision 8196)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicanteditpage.pt	(revision 8197)
@@ -18,5 +18,5 @@
       <tr>
         <td class="fieldname" i18n:translate="">
-          Photograph:
+          Passport Photo:
         </td>
         <td>
Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/viewlets.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/viewlets.py	(revision 8196)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/viewlets.py	(revision 8197)
@@ -526,5 +526,5 @@
     icon = 'actionicon_manage.png' # File must exist in static/
     target = '@@show' # link to this viewname.
-    text = _('Show batch logs') # Text to display on the button
+    text = _('Show logs') # Text to display on the button
 
 class BrowseDatacenterLogs(BrowseActionButton):
@@ -532,7 +532,7 @@
     grok.view(DatacenterPage)
     grok.order(4)
-    icon = 'documentinfo_templet.png'
+    icon = 'actionicon_info.png'
     target = '@@logs'
-    text = _('Show batch logs')
+    text = _('Show logs')
 
 #
@@ -544,5 +544,5 @@
     grok.require('waeup.manageUniversity')
     grok.order(6)
-    icon = 'actionbox_templet.png'
+    icon = 'actionicon_gear.png'
     target = '@@import1'
     text = _('Batch processing')
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 8196)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/de/LC_MESSAGES/waeup.kofa.po	(revision 8197)
@@ -15,6 +15,6 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Mon Mar 26 11:33:10 2012\n"
-"PO-Revision-Date: 2012-03-26 13:04+0100\n"
+"POT-Creation-Date: Tue Apr 17 16:18:24 2012\n"
+"PO-Revision-Date: 2012-04-17 16:19+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
 "Language-Team: WAeUP Germany <henrik@waeup.org>\n"
@@ -29,12 +29,12 @@
 "X-Poedit-Basepath: \\\\Salsa\\kofa\\trunk\\src\n"
 
-#: waeup/kofa/accesscodes/browser.py:100
-#: waeup/kofa/accesscodes/browser.py:113
-#: waeup/kofa/applicants/browser.py:79
-#: waeup/kofa/applicants/browser.py:129
-#: waeup/kofa/applicants/browser.py:181
-#: waeup/kofa/applicants/browser.py:252
-#: waeup/kofa/applicants/browser.py:253
-#: waeup/kofa/applicants/browser.py:336
+#: waeup/kofa/accesscodes/browser.py:101
+#: waeup/kofa/accesscodes/browser.py:114
+#: waeup/kofa/applicants/browser.py:81
+#: waeup/kofa/applicants/browser.py:131
+#: waeup/kofa/applicants/browser.py:180
+#: waeup/kofa/applicants/browser.py:249
+#: waeup/kofa/applicants/browser.py:250
+#: waeup/kofa/applicants/browser.py:331
 #: waeup/kofa/browser/pages.py:507
 #: waeup/kofa/browser/pages.py:712
@@ -64,64 +64,64 @@
 #: waeup/kofa/browser/pages.py:1902
 #: waeup/kofa/browser/pages.py:1954
-#: waeup/kofa/students/browser.py:589
-#: waeup/kofa/students/browser.py:590
-#: waeup/kofa/students/browser.py:751
-#: waeup/kofa/students/browser.py:753
-#: waeup/kofa/students/browser.py:893
+#: waeup/kofa/students/browser.py:623
+#: waeup/kofa/students/browser.py:624
+#: waeup/kofa/students/browser.py:807
+#: waeup/kofa/students/browser.py:809
+#: waeup/kofa/students/browser.py:950
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: waeup/kofa/accesscodes/browser.py:102
+#: waeup/kofa/accesscodes/browser.py:103
 msgid "Batch creation cancelled."
 msgstr "Zugangscodeerzeugung abgebrochen."
 
-#: waeup/kofa/accesscodes/browser.py:112
+#: waeup/kofa/accesscodes/browser.py:113
 msgid "Reimport"
 msgstr "Reimportieren"
 
-#: waeup/kofa/accesscodes/browser.py:115
+#: waeup/kofa/accesscodes/browser.py:116
 msgid "Reimport Access Code Batches"
 msgstr "Zugangscodeserie reimportieren"
 
-#: waeup/kofa/accesscodes/browser.py:120
+#: waeup/kofa/accesscodes/browser.py:121
 msgid "Reimport cancelled."
 msgstr "Reimport abgebrochen."
 
-#: waeup/kofa/accesscodes/browser.py:126
+#: waeup/kofa/accesscodes/browser.py:127
 msgid "No file chosen. Action cancelled."
 msgstr "Keine Datei ausgewählt, Aktion abgebrochen."
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:136
+#: waeup/kofa/accesscodes/browser.py:137
 msgid "This batch already exists: ${a}"
 msgstr "Diese Serie existiert bereits: ${a}"
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:139
+#: waeup/kofa/accesscodes/browser.py:140
 msgid "Successfully reimported: ${a}"
 msgstr "Erfolgreich reimportiert: ${a}"
 
-#: waeup/kofa/accesscodes/browser.py:152
+#: waeup/kofa/accesscodes/browser.py:153
 msgid "Search and Manage Access Codes"
 msgstr "Suche und verwalte Zugangscodes"
 
-#: waeup/kofa/accesscodes/browser.py:153
+#: waeup/kofa/accesscodes/browser.py:154
 #: waeup/kofa/browser/pages.py:596
 #: waeup/kofa/browser/pages.py:1146
 #: waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:169
-#: waeup/kofa/students/browser.py:203
+#: waeup/kofa/students/browser.py:171
+#: waeup/kofa/students/browser.py:209
 msgid "Search"
 msgstr "Suchen"
 
-#: waeup/kofa/accesscodes/browser.py:154
+#: waeup/kofa/accesscodes/browser.py:155
 msgid "Disable ACs"
 msgstr "Zugangscode deaktivieren"
 
-#: waeup/kofa/accesscodes/browser.py:155
+#: waeup/kofa/accesscodes/browser.py:156
 msgid "Enable ACs"
 msgstr "Zugangscode aktivieren"
 
-#: waeup/kofa/accesscodes/browser.py:180
+#: waeup/kofa/accesscodes/browser.py:181
 #: waeup/kofa/accesscodes/workflow.py:39
 msgid "disabled"
@@ -129,86 +129,86 @@
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:182
+#: waeup/kofa/accesscodes/browser.py:183
 msgid "${a} disabled."
 msgstr "${a} deaktiviert"
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:186
+#: waeup/kofa/accesscodes/browser.py:187
 msgid "${a}: Disable transition not allowed."
 msgstr "${a}: Deaktivierung nicht möglich."
 
-#: waeup/kofa/accesscodes/browser.py:190
+#: waeup/kofa/accesscodes/browser.py:191
 msgid "re-enabled"
 msgstr "reaktiviert"
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:192
+#: waeup/kofa/accesscodes/browser.py:193
 msgid "${a} (re-)enabled."
 msgstr "${a} (re-)aktiviert."
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:196
+#: waeup/kofa/accesscodes/browser.py:197
 msgid "${a}: Re-enable transition not allowed."
 msgstr "${a}: Reaktivieren nich möglich."
 
-#: waeup/kofa/accesscodes/browser.py:235
+#: waeup/kofa/accesscodes/browser.py:236
 msgid "Add Access Code Batch"
 msgstr "Zugangscodeserie hinzufügen"
 
-#: waeup/kofa/accesscodes/browser.py:244
+#: waeup/kofa/accesscodes/browser.py:245
 msgid "Reimport Access Code Batch"
 msgstr "Zugangscodeserie reimportieren"
 
-#: waeup/kofa/accesscodes/browser.py:252
+#: waeup/kofa/accesscodes/browser.py:253
 msgid "Search Access Codes"
 msgstr "Zugangscode suchen"
 
-#: waeup/kofa/accesscodes/browser.py:261
+#: waeup/kofa/accesscodes/browser.py:262
 msgid "Access Codes"
 msgstr "Zugangscodes"
 
-#: waeup/kofa/accesscodes/browser.py:43
+#: waeup/kofa/accesscodes/browser.py:44
 msgid "Archive"
 msgstr "Archivieren"
 
-#: waeup/kofa/accesscodes/browser.py:44
+#: waeup/kofa/accesscodes/browser.py:45
 msgid "Archive and delete"
 msgstr "Archivieren und löschen"
 
-#: waeup/kofa/accesscodes/browser.py:46
-#: waeup/kofa/accesscodes/browser.py:206
-#: waeup/kofa/accesscodes/browser.py:226
+#: waeup/kofa/accesscodes/browser.py:47
+#: waeup/kofa/accesscodes/browser.py:207
+#: waeup/kofa/accesscodes/browser.py:227
 msgid "Access Code Batches"
 msgstr "Zugangscodeserien"
 
-#: waeup/kofa/accesscodes/browser.py:53
+#: waeup/kofa/accesscodes/browser.py:54
 msgid "No batch selected."
 msgstr "Keine Serie ausgewählt."
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:61
+#: waeup/kofa/accesscodes/browser.py:62
 msgid "Archived ${a} (${b})"
 msgstr "${a} (${b}) archiviert"
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:68
+#: waeup/kofa/accesscodes/browser.py:69
 msgid "Deleted batch ${a}"
 msgstr "Serie ${a} gelöscht"
 
-#: waeup/kofa/accesscodes/browser.py:77
+#: waeup/kofa/accesscodes/browser.py:78
 msgid "Create Access Code Batch"
 msgstr "Zugangscodeserie erzeugen"
 
-#: waeup/kofa/accesscodes/browser.py:83
+#: waeup/kofa/accesscodes/browser.py:84
 msgid "Create batch"
 msgstr "Serie erzeugen"
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:91
+#: waeup/kofa/accesscodes/browser.py:92
 msgid "Batch created (${a} entries)"
 msgstr "Serie ${a} mit Einträgen erzeugt."
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:93
+#: waeup/kofa/accesscodes/browser.py:94
 msgid "Data written to ${a}"
 msgstr "Daten in ${a} gespeichert."
@@ -369,21 +369,21 @@
 msgstr "Unbenutzte PIN deaktivieren"
 
-#: waeup/kofa/applicants/browser.py:116
-#: waeup/kofa/applicants/browser.py:323
-#: waeup/kofa/applicants/browser.py:744
+#: waeup/kofa/applicants/browser.py:118
+#: waeup/kofa/applicants/browser.py:318
+#: waeup/kofa/applicants/browser.py:714
 msgid "Could not delete:"
 msgstr "Konnte nicht gelöscht werden:"
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:119
-#: waeup/kofa/applicants/browser.py:326
-#: waeup/kofa/applicants/browser.py:747
-#: waeup/kofa/browser/pages.py:137
-#: waeup/kofa/students/browser.py:241
-#: waeup/kofa/students/browser.py:647
-#: waeup/kofa/students/browser.py:801
-#: waeup/kofa/students/browser.py:979
-#: waeup/kofa/students/browser.py:1189
-#: waeup/kofa/students/browser.py:1776
+#: waeup/kofa/applicants/browser.py:121
+#: waeup/kofa/applicants/browser.py:321
+#: waeup/kofa/applicants/browser.py:717
+#: waeup/kofa/browser/pages.py:136
+#: waeup/kofa/students/browser.py:253
+#: waeup/kofa/students/browser.py:687
+#: waeup/kofa/students/browser.py:857
+#: waeup/kofa/students/browser.py:1036
+#: waeup/kofa/students/browser.py:1251
+#: waeup/kofa/students/browser.py:1841
 msgid "Successfully removed: ${a}"
 msgstr "Erfolgreich entfernt: ${a}"
@@ -393,10 +393,10 @@
 msgstr "Ein Ordner für diesen Antragstypen mit gleichem Eingangsjahr existiert bereits."
 
-#: waeup/kofa/applicants/browser.py:177
+#: waeup/kofa/applicants/browser.py:176
 msgid "Added:"
 msgstr "Hinzugefügt:"
 
-#: waeup/kofa/applicants/browser.py:189
-#: waeup/kofa/applicants/export.py:78
+#: waeup/kofa/applicants/browser.py:188
+#: waeup/kofa/applicants/export.py:76
 #: waeup/kofa/applicants/viewlets.py:44
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:12
@@ -405,11 +405,11 @@
 msgstr "Antragsteller"
 
-#: waeup/kofa/applicants/browser.py:252
-#: waeup/kofa/applicants/browser.py:299
-#: waeup/kofa/applicants/browser.py:653
-#: waeup/kofa/applicants/browser.py:687
-#: waeup/kofa/applicants/browser.py:790
-#: waeup/kofa/applicants/browser.py:793
-#: waeup/kofa/applicants/browser.py:837
+#: waeup/kofa/applicants/browser.py:249
+#: waeup/kofa/applicants/browser.py:294
+#: waeup/kofa/applicants/browser.py:619
+#: waeup/kofa/applicants/browser.py:657
+#: waeup/kofa/applicants/browser.py:759
+#: waeup/kofa/applicants/browser.py:762
+#: waeup/kofa/applicants/browser.py:806
 #: waeup/kofa/browser/pages.py:480
 #: waeup/kofa/browser/pages.py:635
@@ -427,30 +427,30 @@
 #: waeup/kofa/hostels/browser.py:231
 #: waeup/kofa/hostels/browser.py:318
-#: waeup/kofa/students/browser.py:358
-#: waeup/kofa/students/browser.py:463
-#: waeup/kofa/students/browser.py:540
-#: waeup/kofa/students/browser.py:589
-#: waeup/kofa/students/browser.py:605
-#: waeup/kofa/students/browser.py:751
-#: waeup/kofa/students/browser.py:776
-#: waeup/kofa/students/browser.py:1450
-#: waeup/kofa/students/browser.py:1465
-#: waeup/kofa/students/browser.py:1580
+#: waeup/kofa/students/browser.py:369
+#: waeup/kofa/students/browser.py:497
+#: waeup/kofa/students/browser.py:574
+#: waeup/kofa/students/browser.py:623
+#: waeup/kofa/students/browser.py:639
+#: waeup/kofa/students/browser.py:807
+#: waeup/kofa/students/browser.py:832
+#: waeup/kofa/students/browser.py:1509
+#: waeup/kofa/students/browser.py:1524
+#: waeup/kofa/students/browser.py:1645
 msgid "Save"
 msgstr "Speichern"
 
-#: waeup/kofa/applicants/browser.py:253
-#: waeup/kofa/applicants/browser.py:331
-#: waeup/kofa/applicants/browser.py:360
+#: waeup/kofa/applicants/browser.py:250
+#: waeup/kofa/applicants/browser.py:326
+#: waeup/kofa/applicants/browser.py:354
 msgid "Add applicant"
 msgstr "Antragsteller hinzufügen"
 
-#: waeup/kofa/applicants/browser.py:263
+#: waeup/kofa/applicants/browser.py:258
 #: waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr "Ordner für Antragsteller verwalten"
 
-#: waeup/kofa/applicants/browser.py:303
-#: waeup/kofa/applicants/browser.py:716
+#: waeup/kofa/applicants/browser.py:298
+#: waeup/kofa/applicants/browser.py:686
 #: waeup/kofa/browser/pages.py:1444
 #: waeup/kofa/browser/pages.py:1766
@@ -458,139 +458,152 @@
 #: waeup/kofa/browser/pages.py:1950
 #: waeup/kofa/hostels/browser.py:54
-#: waeup/kofa/students/browser.py:82
-#: waeup/kofa/students/browser.py:384
+#: waeup/kofa/students/browser.py:84
+#: waeup/kofa/students/browser.py:395
 msgid "Form has been saved."
 msgstr "Das Formular wurde gespeichert."
 
-#: waeup/kofa/applicants/browser.py:312
+#: waeup/kofa/applicants/browser.py:307
 msgid "No applicant selected!"
 msgstr "Nichts ausgewählt!"
 
-#: waeup/kofa/applicants/browser.py:363
+#: waeup/kofa/applicants/browser.py:357
 msgid "Create application record"
 msgstr "Antrag hinzufügen"
 
-#: waeup/kofa/applicants/browser.py:368
+#: waeup/kofa/applicants/browser.py:362
 msgid "Applicant record created."
 msgstr "Antrag wurde erzeugt."
 
-#: waeup/kofa/applicants/browser.py:381
+#: waeup/kofa/applicants/browser.py:376
 msgid "Applicant"
 msgstr "Antragsteller"
 
-#: waeup/kofa/applicants/browser.py:396
-#: waeup/kofa/students/browser.py:283
+#: waeup/kofa/applicants/browser.py:395
+#: waeup/kofa/students/browser.py:295
 msgid "set"
 msgstr "gesetzt"
 
-#: waeup/kofa/applicants/browser.py:397
-#: waeup/kofa/students/browser.py:284
+#: waeup/kofa/applicants/browser.py:396
+#: waeup/kofa/students/browser.py:296
 msgid "unset"
 msgstr "ungesetzt"
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:402
-msgid "${a} Application Record ${b}"
-msgstr "${a} Antrag ${b}"
-
-#: waeup/kofa/applicants/browser.py:453
+#: waeup/kofa/applicants/browser.py:401
+msgid "${a} <br /> Application Record ${b}"
+msgstr "${a} <br /> Antrag ${b}"
+
+#: waeup/kofa/applicants/browser.py:452
 msgid "Session configuration object is not available."
 msgstr "Session-Konfiguration ist nicht verfügbar."
 
-#: waeup/kofa/applicants/browser.py:460
-#: waeup/kofa/students/browser.py:1028
+#: waeup/kofa/applicants/browser.py:459
+#: waeup/kofa/students/browser.py:1091
 msgid "This type of payment has already been made."
 msgstr "Diese Bezahlung wurde bereits ausgeführt."
 
-#: waeup/kofa/applicants/browser.py:473
-#: waeup/kofa/students/browser.py:1042
+#: waeup/kofa/applicants/browser.py:472
+#: waeup/kofa/students/browser.py:1105
 msgid "Payment ticket created."
 msgstr "Bezahl-Ticket wurde erzeugt."
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:500
-#: waeup/kofa/students/browser.py:1061
+#: waeup/kofa/applicants/browser.py:499
+#: waeup/kofa/students/browser.py:1124
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr "${a}: Online-Bezahl-Ticket ${b}"
 
-#: waeup/kofa/applicants/browser.py:528
-#: waeup/kofa/students/browser.py:1110
+#: waeup/kofa/applicants/browser.py:527
+#: waeup/kofa/students/browser.py:1172
 msgid "Valid callback received."
 msgstr "Gültigen Rückruf erhalten."
 
-#: waeup/kofa/applicants/browser.py:549
+#: waeup/kofa/applicants/browser.py:548
 msgid "Payment Data"
 msgstr "Zahlung"
 
-#: waeup/kofa/applicants/browser.py:555
+#: waeup/kofa/applicants/browser.py:554
 msgid "Online Payment Receipt"
 msgstr "Quittung"
 
-#: waeup/kofa/applicants/browser.py:561
+#: waeup/kofa/applicants/browser.py:560
 msgid "Ticket not yet paid."
 msgstr "Ticket wurde noch nicht bezahlt."
 
-#: waeup/kofa/applicants/browser.py:626
+#: waeup/kofa/applicants/browser.py:594
 msgid "Uploaded image is too big!"
 msgstr "Das hochgeladene Bild ist zu groß!"
 
-#: waeup/kofa/applicants/browser.py:63
+#: waeup/kofa/applicants/browser.py:599
+msgid "jpg file extension expected."
+msgstr "jpg-Dateiendung erwartet."
+
+#: waeup/kofa/applicants/browser.py:619
+#: waeup/kofa/applicants/browser.py:762
+#: waeup/kofa/applicants/browser.py:814
+msgid "Final Submit"
+msgstr "Endgültiges Einreichen"
+
+#: waeup/kofa/applicants/browser.py:620
+#: waeup/kofa/applicants/browser.py:727
+#: waeup/kofa/applicants/browser.py:760
+#: waeup/kofa/applicants/browser.py:795
+#: waeup/kofa/students/browser.py:1042
+msgid "Add online payment ticket"
+msgstr "Ticket für Online-Bezahlung hinzufügen"
+
+#: waeup/kofa/applicants/browser.py:620
+#: waeup/kofa/applicants/browser.py:732
+#: waeup/kofa/applicants/browser.py:760
+#: waeup/kofa/applicants/browser.py:763
+#: waeup/kofa/applicants/browser.py:800
+#: waeup/kofa/students/browser.py:809
+#: waeup/kofa/students/browser.py:841
+#: waeup/kofa/students/browser.py:1018
+#: waeup/kofa/students/browser.py:1823
+msgid "Remove selected tickets"
+msgstr "Ausgewählte Tickets löschen"
+
+#. Default: ""
+#: waeup/kofa/applicants/browser.py:643
+msgid "${a} <br /> Application Form ${b}"
+msgstr "${a} <br /> Antragsformular ${b}"
+
+#: waeup/kofa/applicants/browser.py:65
 msgid "Application Section"
 msgstr "Antragstellung"
 
-#: waeup/kofa/applicants/browser.py:631
-msgid "jpg file extension expected."
-msgstr "jpg-Dateiendung erwartet."
-
-#: waeup/kofa/applicants/browser.py:653
-#: waeup/kofa/applicants/browser.py:793
-#: waeup/kofa/applicants/browser.py:845
-msgid "Final Submit"
-msgstr "Endgültiges Einreichen"
-
 #: waeup/kofa/applicants/browser.py:654
-#: waeup/kofa/applicants/browser.py:757
-#: waeup/kofa/applicants/browser.py:791
-#: waeup/kofa/applicants/browser.py:826
-#: waeup/kofa/students/browser.py:985
-msgid "Add online payment ticket"
-msgstr "Ticket für Online-Bezahlung hinzufügen"
-
-#: waeup/kofa/applicants/browser.py:654
-#: waeup/kofa/applicants/browser.py:762
-#: waeup/kofa/applicants/browser.py:791
-#: waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:831
-#: waeup/kofa/students/browser.py:753
-#: waeup/kofa/students/browser.py:785
-#: waeup/kofa/students/browser.py:961
-#: waeup/kofa/students/browser.py:1758
-msgid "Remove selected tickets"
-msgstr "Ausgewählte Tickets löschen"
-
-#. Default: ""
-#: waeup/kofa/applicants/browser.py:673
-msgid "${a} Application Form ${b}"
-msgstr "${a} Antragsformular ${b}"
-
-#: waeup/kofa/applicants/browser.py:684
-#: waeup/kofa/students/browser.py:355
+#: waeup/kofa/students/browser.py:366
 msgid "No transition"
 msgstr "Keine Änderung"
 
-#: waeup/kofa/applicants/browser.py:731
-#: waeup/kofa/students/browser.py:967
+#: waeup/kofa/applicants/browser.py:701
+#: waeup/kofa/students/browser.py:1024
 msgid "No payment selected."
 msgstr "Nichts ausgewählt!"
 
-#: waeup/kofa/applicants/browser.py:75
+#: waeup/kofa/applicants/browser.py:77
 #: waeup/kofa/applicants/viewlets.py:88
 msgid "Manage application section"
 msgstr "Antragstellungsverfahren verwalten"
 
-#: waeup/kofa/applicants/browser.py:78
-#: waeup/kofa/applicants/browser.py:104
-#: waeup/kofa/applicants/browser.py:253
-#: waeup/kofa/applicants/browser.py:306
+#: waeup/kofa/applicants/browser.py:773
+#: waeup/kofa/students/browser.py:92
+msgid "The requested form is locked (read-only)."
+msgstr "Dieses Formular ist gesperrt."
+
+#: waeup/kofa/applicants/browser.py:787
+msgid "No passport picture uploaded."
+msgstr "Es wurde noch kein Passbild hochgeladen."
+
+#: waeup/kofa/applicants/browser.py:789
+msgid "Passport picture confirmation box not ticked."
+msgstr "Bitte bestätigen Sie das Passbild."
+
+#: waeup/kofa/applicants/browser.py:80
+#: waeup/kofa/applicants/browser.py:106
+#: waeup/kofa/applicants/browser.py:250
+#: waeup/kofa/applicants/browser.py:301
 #: waeup/kofa/browser/pages.py:638
 #: waeup/kofa/browser/pages.py:679
@@ -600,21 +613,21 @@
 #: waeup/kofa/browser/pages.py:1436
 #: waeup/kofa/hostels/browser.py:131
-#: waeup/kofa/students/browser.py:204
-#: waeup/kofa/students/browser.py:1156
-#: waeup/kofa/students/browser.py:1169
+#: waeup/kofa/students/browser.py:210
+#: waeup/kofa/students/browser.py:1218
+#: waeup/kofa/students/browser.py:1231
 msgid "Remove selected"
 msgstr "Ausgewählte Objekte löschen"
 
-#: waeup/kofa/applicants/browser.py:78
-#: waeup/kofa/applicants/browser.py:124
-#: waeup/kofa/applicants/browser.py:147
+#: waeup/kofa/applicants/browser.py:80
+#: waeup/kofa/applicants/browser.py:126
+#: waeup/kofa/applicants/browser.py:149
 #: waeup/kofa/applicants/browser.py:159
 msgid "Add applicants container"
 msgstr "Ordner für Antragsteller hinzufügen"
 
-#: waeup/kofa/applicants/browser.py:80
-#: waeup/kofa/applicants/browser.py:138
-#: waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:345
+#: waeup/kofa/applicants/browser.py:82
+#: waeup/kofa/applicants/browser.py:140
+#: waeup/kofa/applicants/browser.py:251
+#: waeup/kofa/applicants/browser.py:340
 #: waeup/kofa/browser/pages.py:1402
 #: waeup/kofa/browser/pages.py:1461
@@ -626,13 +639,13 @@
 msgstr "Ausgewählte lokale Rollen löschen"
 
-#: waeup/kofa/applicants/browser.py:804
-#: waeup/kofa/students/browser.py:90
-msgid "The requested form is locked (read-only)."
-msgstr "Dieses Formular ist gesperrt."
-
-#: waeup/kofa/applicants/browser.py:81
-#: waeup/kofa/applicants/browser.py:134
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:341
+#: waeup/kofa/applicants/browser.py:826
+#: waeup/kofa/students/browser.py:1690
+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:83
+#: waeup/kofa/applicants/browser.py:136
+#: waeup/kofa/applicants/browser.py:252
+#: waeup/kofa/applicants/browser.py:336
 #: waeup/kofa/browser/pages.py:1403
 #: waeup/kofa/browser/pages.py:1457
@@ -644,68 +657,72 @@
 msgstr "Lokale Rolle hinzufügen"
 
-#: waeup/kofa/applicants/browser.py:818
-msgid "No passport picture uploaded."
-msgstr "Es wurde noch kein Passbild hochgeladen."
-
-#: waeup/kofa/applicants/browser.py:82
+#: waeup/kofa/applicants/browser.py:831
+msgid "Form has been submitted."
+msgstr "Das Formular wurde eingereicht."
+
+#: waeup/kofa/applicants/browser.py:84
 msgid "Applicants Containers"
 msgstr "Ordner für Antragsteller"
 
-#: waeup/kofa/applicants/browser.py:820
-msgid "Passport picture confirmation box not ticked."
-msgstr "Bitte bestätigen Sie das Passbild."
-
-#: waeup/kofa/applicants/browser.py:857
-#: waeup/kofa/students/browser.py:1625
-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:862
-msgid "Form has been submitted."
-msgstr "Das Formular wurde eingereicht."
-
-#. Default: ""
-#: waeup/kofa/applicants/browser.py:897
-msgid "Register for ${a} Application"
-msgstr "Antragstellung für ${a}"
-
-#: waeup/kofa/applicants/browser.py:903
+#. Default: ""
+#: waeup/kofa/applicants/browser.py:874
+msgid "Apply for ${a}"
+msgstr "Registrierung für ${a}"
+
+#: waeup/kofa/applicants/browser.py:880
 msgid "Application has not yet started."
 msgstr "Antragszeitraum hat noch nicht begonnen."
 
-#: waeup/kofa/applicants/browser.py:908
+#: waeup/kofa/applicants/browser.py:885
 msgid "Application has ended."
 msgstr "Antragszeitraum ist beendet."
 
-#: waeup/kofa/applicants/browser.py:917
+#: waeup/kofa/applicants/browser.py:894
 msgid "Get login credentials"
 msgstr "Zugangsdaten zusenden"
 
-#: waeup/kofa/applicants/browser.py:932
+#: waeup/kofa/applicants/browser.py:917
+msgid "An error occurred."
+msgstr "Es ein Fehler auf."
+
+#: waeup/kofa/applicants/browser.py:923
+#: waeup/kofa/applicants/browser.py:934
+msgid "No application record found."
+msgstr "Es wurde kein passender Datensatz gefunden."
+
+#: waeup/kofa/applicants/browser.py:926
+msgid "Your password has already been set. Please proceed to the login page."
+msgstr "Das Passwort wurde bereits gesetzt. Bitte gehen Sie zu Login-Seite."
+
+#: waeup/kofa/applicants/browser.py:944
 msgid "You have successfully been registered for the"
 msgstr "Sie haben sich erfolgreich registriert für"
 
-#: waeup/kofa/applicants/browser.py:939
+#: waeup/kofa/applicants/browser.py:951
 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:948
+#: waeup/kofa/applicants/browser.py:960
 msgid "Your registration was successful."
 msgstr "Ihre Registrierung war erfolgreich."
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:18
-msgid "Photograph"
-msgstr "Fotografie"
-
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:43
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:17
+msgid "Admitted Course of Study:"
+msgstr "Zugelassen für Studienfach:"
+
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:19
+msgid "Passport Photo:"
+msgstr "Passbild:"
+
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:44
 msgid "Application Transition:"
 msgstr "Zustandsänderung der Antragstellung:"
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:59
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:60
 msgid "I confirm that the Passport Photograph uploaded on this form is a true picture of me."
 msgstr "Ich bestätige, dass die hochgeladene Fotografie ein naturgetreues Portrait von mir ist."
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:74
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:43
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:76
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:34
 msgid "Acceptance Fee Payment Tickets"
 msgstr "Zullassungsgebühr-Tickets"
@@ -726,4 +743,8 @@
 msgid "An account will be created for you and an email with your login credentials will be sent to the address provided."
 msgstr "Ein Benutzerkonto wird für Sie eingerichtet. Anschließend werden die die Anmeldedaten an die von Ihnen zur Verfügung gestellte Emailadresse versendet."
+
+#: waeup/kofa/applicants/browser_templates/applicantregister.pt:22
+msgid "Your application record will be looked up and an email with your login credentials will be sent to the address provided."
+msgstr "Wenn Ihr Datensatz gefunden wurde, werden die Zugangsdaten an die zur Verfügung gestellte Emailadresse versendet."
 
 #: waeup/kofa/applicants/browser_templates/applicantregister.pt:8
@@ -752,18 +773,18 @@
 msgstr "Beantragungsszeitraum"
 
-#: waeup/kofa/applicants/container.py:52
-msgid "Basic"
-msgstr "Basisantragstellung"
-
-#: waeup/kofa/applicants/container.py:55
-msgid "handles basic applicants"
-msgstr "für Antragsteller aller Art"
-
 #: waeup/kofa/applicants/export.py:40
 msgid "Basic Applicants Containers"
 msgstr "Basisordner für Antragsteller"
 
-#: waeup/kofa/applicants/interfaces.py:198
-#: waeup/kofa/students/browser.py:718
+#: waeup/kofa/applicants/interfaces.py:138
+msgid "Create Application Records"
+msgstr "Anträge hinzufügen"
+
+#: waeup/kofa/applicants/interfaces.py:139
+msgid "Update Application Records"
+msgstr "Anträge aktualisieren"
+
+#: waeup/kofa/applicants/interfaces.py:159
+#: waeup/kofa/students/browser.py:773
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -789,6 +810,6 @@
 msgstr "Kürzel"
 
-#: waeup/kofa/applicants/interfaces.py:205
-#: waeup/kofa/students/browser.py:719
+#: waeup/kofa/applicants/interfaces.py:165
+#: waeup/kofa/students/browser.py:774
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -809,130 +830,127 @@
 msgstr "Titel"
 
-#: waeup/kofa/applicants/interfaces.py:212
-#: waeup/kofa/applicants/interfaces.py:322
+#: waeup/kofa/applicants/interfaces.py:171
+#: waeup/kofa/applicants/interfaces.py:275
 msgid "Application Target"
 msgstr "Antragsobjekt (Programm)"
 
-#: waeup/kofa/applicants/interfaces.py:220
+#: waeup/kofa/applicants/interfaces.py:178
+#: waeup/kofa/applicants/interfaces.py:282
+msgid "Year of Entrance"
+msgstr "Eingangsjahr"
+
+#: waeup/kofa/applicants/interfaces.py:185
+msgid "Application Mode"
+msgstr "Modus der Antragstellung"
+
+#: waeup/kofa/applicants/interfaces.py:191
 msgid "Entry Level"
 msgstr "Einstiegslevel"
 
-#: waeup/kofa/applicants/interfaces.py:227
-#: waeup/kofa/applicants/interfaces.py:330
-msgid "Year of Entrance"
-msgstr "Eingangsjahr"
-
-#: waeup/kofa/applicants/interfaces.py:235
-#: waeup/kofa/applicants/interfaces.py:338
-msgid "Applicants Container Type"
-msgstr "Ordnertyp"
-
-#: waeup/kofa/applicants/interfaces.py:251
+#: waeup/kofa/applicants/interfaces.py:205
 msgid "Category for the grouping of certificates"
 msgstr "Kategorie für die Gruppierung von Zertifikaten"
 
-#: waeup/kofa/applicants/interfaces.py:258
+#: waeup/kofa/applicants/interfaces.py:211
 msgid "Human readable description in reST format"
 msgstr "Lesbare Beschreibung im reST-Format"
 
-#: waeup/kofa/applicants/interfaces.py:271
+#: waeup/kofa/applicants/interfaces.py:224
 msgid "Application Start Date"
 msgstr "Beginn der Antragsperiode"
 
-#: waeup/kofa/applicants/interfaces.py:277
+#: waeup/kofa/applicants/interfaces.py:230
 msgid "Application Closing Date"
 msgstr "Ende der Antragsperiode"
 
-#: waeup/kofa/applicants/interfaces.py:283
+#: waeup/kofa/applicants/interfaces.py:236
 msgid "Forbid additions after deadline (enddate)"
 msgstr "Antragstellung nach Ablauf der Antragsfrist verbieten"
 
-#: waeup/kofa/applicants/interfaces.py:366
+#: waeup/kofa/applicants/interfaces.py:315
 msgid "Applicant Id"
 msgstr "Antragsteller Id"
 
-#: waeup/kofa/applicants/interfaces.py:371
-msgid "JAMB Registration Number"
-msgstr "JAMB Regsistrierungsnummer"
-
-#: waeup/kofa/applicants/interfaces.py:383
-#: waeup/kofa/students/interfaces.py:162
+#: waeup/kofa/applicants/interfaces.py:320
+#: waeup/kofa/students/interfaces.py:184
+#: waeup/kofa/students/interfaces.py:271
+#: waeup/kofa/students/interfaces.py:518
+msgid "Registration Number"
+msgstr "Regsistrierungsnummer"
+
+#: waeup/kofa/applicants/interfaces.py:331
+#: waeup/kofa/applicants/interfaces.py:499
+#: waeup/kofa/students/interfaces.py:163
 msgid "First Name"
 msgstr "Vorname"
 
-#: waeup/kofa/applicants/interfaces.py:387
-#: waeup/kofa/students/interfaces.py:167
+#: waeup/kofa/applicants/interfaces.py:335
+#: waeup/kofa/students/interfaces.py:168
 msgid "Middle Name"
 msgstr "Zweiter Vorname"
 
-#: waeup/kofa/applicants/interfaces.py:391
-#: waeup/kofa/students/interfaces.py:172
+#: waeup/kofa/applicants/interfaces.py:339
+#: waeup/kofa/students/interfaces.py:173
 msgid "Last Name (Surname)"
 msgstr "Nachname"
 
-#: waeup/kofa/applicants/interfaces.py:395
-#: waeup/kofa/students/interfaces.py:218
+#: waeup/kofa/applicants/interfaces.py:343
+#: waeup/kofa/students/interfaces.py:219
 msgid "Date of Birth"
 msgstr "Geburtsdatum"
 
-#: waeup/kofa/applicants/interfaces.py:400
-msgid "State/LGA"
-msgstr "State/LGA"
-
-#: waeup/kofa/applicants/interfaces.py:405
-#: waeup/kofa/students/interfaces.py:177
+#: waeup/kofa/applicants/interfaces.py:349
+#: waeup/kofa/students/interfaces.py:178
 msgid "Sex"
 msgstr "Geschlecht"
 
-#: waeup/kofa/applicants/interfaces.py:411
-#: waeup/kofa/interfaces.py:392
-#: waeup/kofa/interfaces.py:418
-#: waeup/kofa/students/interfaces.py:504
+#: waeup/kofa/applicants/interfaces.py:354
+#: waeup/kofa/applicants/interfaces.py:437
+#: waeup/kofa/applicants/interfaces.py:504
+#: waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:419
+#: waeup/kofa/students/interfaces.py:524
 msgid "Email Address"
 msgstr "Emailadresse"
 
-#: waeup/kofa/applicants/interfaces.py:416
-#: waeup/kofa/interfaces.py:397
-#: waeup/kofa/interfaces.py:425
-#: waeup/kofa/students/interfaces.py:208
+#: waeup/kofa/applicants/interfaces.py:359
+#: waeup/kofa/interfaces.py:398
+#: waeup/kofa/interfaces.py:426
+#: waeup/kofa/students/interfaces.py:209
 msgid "Phone"
 msgstr "Telefon"
 
-#: waeup/kofa/applicants/interfaces.py:421
-#: waeup/kofa/applicants/interfaces.py:507
+#: waeup/kofa/applicants/interfaces.py:364
+#: waeup/kofa/applicants/interfaces.py:442
 msgid "1st Choice Course of Study"
 msgstr "Studienfach (1. Wahl)"
 
-#: waeup/kofa/applicants/interfaces.py:426
-#: waeup/kofa/applicants/interfaces.py:512
+#: waeup/kofa/applicants/interfaces.py:369
+#: waeup/kofa/applicants/interfaces.py:447
 msgid "2nd Choice Course of Study"
 msgstr "Studienfach (2. Wahl)"
 
-#: waeup/kofa/applicants/interfaces.py:431
-msgid "School Grades"
-msgstr "Schulnoten"
-
-#: waeup/kofa/applicants/interfaces.py:441
-#: waeup/kofa/applicants/interfaces.py:517
+#: waeup/kofa/applicants/interfaces.py:381
+#: waeup/kofa/applicants/interfaces.py:468
+msgid "Notice"
+msgstr "Bemerkung"
+
+#: waeup/kofa/applicants/interfaces.py:385
+#: waeup/kofa/applicants/interfaces.py:457
+msgid "Screening Venue"
+msgstr "Screening-Ort"
+
+#: waeup/kofa/applicants/interfaces.py:389
+#: waeup/kofa/applicants/interfaces.py:452
 msgid "Screening Score"
 msgstr "Screening-Score"
 
-#: waeup/kofa/applicants/interfaces.py:445
-#: waeup/kofa/applicants/interfaces.py:522
-msgid "Screening Venue"
-msgstr "Screening-Ort"
-
-#: waeup/kofa/applicants/interfaces.py:449
-#: waeup/kofa/applicants/interfaces.py:527
+#: waeup/kofa/applicants/interfaces.py:393
+#: waeup/kofa/applicants/interfaces.py:462
 msgid "Admitted Course of Study"
 msgstr "Zugelassenes Studienfach"
 
-#: waeup/kofa/applicants/interfaces.py:455
-#: waeup/kofa/applicants/interfaces.py:534
-msgid "Notice"
-msgstr "Bemerkung"
-
-#: waeup/kofa/applicants/interfaces.py:477
-#: waeup/kofa/students/interfaces.py:157
+#: waeup/kofa/applicants/interfaces.py:398
+#: waeup/kofa/students/interfaces.py:158
 #: waeup/kofa/browser/templates/showstudentspage.pt:4
 #: waeup/kofa/students/browser_templates/containerpage.pt:29
@@ -941,42 +959,33 @@
 msgstr "Studenten Id"
 
-#: waeup/kofa/applicants/interfaces.py:482
+#: waeup/kofa/applicants/interfaces.py:403
 msgid "Form locked"
 msgstr "Formular gesperrt"
 
-#: waeup/kofa/applicants/interfaces.py:561
-#: waeup/kofa/students/interfaces.py:484
+#: waeup/kofa/applicants/interfaces.py:514
+#: waeup/kofa/students/interfaces.py:504
 msgid "Payment Session"
 msgstr "Session der Zahlung"
 
-#: waeup/kofa/applicants/pdf.py:110
-#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:23
-#: waeup/kofa/students/browser_templates/studycoursepage.pt:28
-msgid "Department:"
-msgstr "Department:"
-
-#: waeup/kofa/applicants/pdf.py:121
-#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:15
-#: waeup/kofa/students/browser_templates/studycoursepage.pt:39
-msgid "Faculty:"
-msgstr "Fakultät:"
-
-#: waeup/kofa/applicants/pdf.py:186
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:26
-msgid "Admitted Course of Study:"
-msgstr "Zugelassen für Studienfach:"
-
-#. Default: ""
-#: waeup/kofa/applicants/pdf.py:204
-msgid "<font size=10>Proceed to the login page of the portal and enter your new credentials: user name= ${a}, password = ${b}.</font>"
-msgstr "<font size=10>Gehen Sie zur Login-Seite des Portals und geben Sie die neuen Zugansdaten ein: Benutzername= ${a}, Passwort = ${b}.</font>"
-
-#: waeup/kofa/applicants/pdf.py:210
-msgid "<font size=10>Change your password when you have  logged in.</font>"
-msgstr "<font size=10>Ändern Sie Ihr Passwort, sobald Sie sich eingeloggt haben.</font>"
-
-#: waeup/kofa/applicants/pdf.py:57
+#: waeup/kofa/applicants/pdf.py:50
 msgid "Application Record"
 msgstr "Antrag"
+
+#. Default: ""
+#: waeup/kofa/applicants/pdf.py:84
+msgid "Proceed to the login page of the portal and enter your new credentials: user name= ${a}, password = ${b}."
+msgstr "Gehen Sie zur Login-Seite des Portals und geben Sie die neuen Zugansdaten ein: Benutzername= ${a}, Passwort = ${b}."
+
+#: waeup/kofa/applicants/pdf.py:91
+msgid "Change your password when you have logged in."
+msgstr "Ändern Sie Ihr Passwort, sobald Sie sich eingeloggt haben."
+
+#: waeup/kofa/applicants/utils.py:35
+msgid "Desired Study Courses"
+msgstr "Gewünschter Studiengang"
+
+#: waeup/kofa/applicants/utils.py:36
+msgid "Process Data"
+msgstr "Prozessdaten"
 
 #: waeup/kofa/applicants/viewlets.py:103
@@ -1002,15 +1011,15 @@
 #: waeup/kofa/applicants/viewlets.py:151
 #: waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:256
+#: waeup/kofa/students/browser.py:268
 msgid "Create student record"
 msgstr "Studenten erzeugen"
 
 #: waeup/kofa/applicants/viewlets.py:168
-#: waeup/kofa/students/viewlets.py:300
+#: waeup/kofa/students/viewlets.py:321
 msgid "Download payment receipt"
 msgstr "Quittung herunterladen"
 
 #: waeup/kofa/applicants/viewlets.py:183
-#: waeup/kofa/students/viewlets.py:315
+#: waeup/kofa/students/viewlets.py:336
 msgid "Request callback"
 msgstr "Bitte um Rückruf"
@@ -1021,10 +1030,10 @@
 
 #: waeup/kofa/applicants/viewlets.py:73
-#: waeup/kofa/students/viewlets.py:512
+#: waeup/kofa/students/viewlets.py:535
 msgid "My Data"
 msgstr "Meine Daten"
 
 #: waeup/kofa/applicants/workflow.py:100
-#: waeup/kofa/students/batching.py:141
+#: waeup/kofa/students/batching.py:142
 #: waeup/kofa/students/workflow.py:25
 msgid "Student record created"
@@ -1063,5 +1072,5 @@
 
 #: waeup/kofa/applicants/workflow.py:41
-#: waeup/kofa/interfaces.py:72
+#: waeup/kofa/interfaces.py:73
 msgid "admitted"
 msgstr "zugelassen"
@@ -1072,5 +1081,5 @@
 
 #: waeup/kofa/applicants/workflow.py:43
-#: waeup/kofa/interfaces.py:71
+#: waeup/kofa/interfaces.py:72
 msgid "created"
 msgstr "neu"
@@ -1136,5 +1145,5 @@
 
 #: waeup/kofa/browser/breadcrumbs.py:123
-#: waeup/kofa/browser/pages.py:312
+#: waeup/kofa/browser/pages.py:311
 msgid "Administration"
 msgstr "Verwaltung"
@@ -1147,5 +1156,5 @@
 
 #: waeup/kofa/browser/breadcrumbs.py:148
-#: waeup/kofa/browser/pages.py:389
+#: waeup/kofa/browser/pages.py:388
 #: waeup/kofa/browser/viewlets.py:375
 #: waeup/kofa/browser/viewlets.py:685
@@ -1170,5 +1179,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:106
+#: waeup/kofa/browser/pages.py:105
 msgid "Local role successfully removed: ${a}"
 msgstr "Lokale Rolle erfolgreich entfernt: ${a}"
@@ -1208,14 +1217,14 @@
 msgstr "Zurück"
 
+#: waeup/kofa/browser/pages.py:115
+#: waeup/kofa/hostels/browser.py:256
+#: waeup/kofa/hostels/browser.py:286
+#: waeup/kofa/students/browser.py:240
+msgid "No item selected."
+msgstr "Nichts ausgewählt."
+
 #: waeup/kofa/browser/pages.py:1155
 msgid "Log files can only be searched on Unix-based operating systems."
 msgstr "Logdateien können nur auf Unix-basierten Betriebsystem durchsucht werden."
-
-#: waeup/kofa/browser/pages.py:116
-#: waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:286
-#: waeup/kofa/students/browser.py:228
-msgid "No item selected."
-msgstr "Nichts ausgewählt."
 
 #: waeup/kofa/browser/pages.py:1183
@@ -1307,14 +1316,14 @@
 #: waeup/kofa/browser/pages.py:1532
 #: waeup/kofa/browser/pages.py:1551
-#: waeup/kofa/students/browser.py:98
-#: waeup/kofa/students/export.py:22
-#: waeup/kofa/students/viewlets.py:472
+#: waeup/kofa/students/browser.py:100
+#: waeup/kofa/students/export.py:40
+#: waeup/kofa/students/viewlets.py:495
 msgid "Students"
 msgstr "Studenten"
 
-#: waeup/kofa/browser/pages.py:155
+#: waeup/kofa/browser/pages.py:154
 #: waeup/kofa/browser/viewlets.py:322
-#: waeup/kofa/browser/templates/staffsitelayout.pt:28
-#: waeup/kofa/browser/templates/studentsitelayout.pt:33
+#: waeup/kofa/browser/templates/staffsitelayout.pt:27
+#: waeup/kofa/browser/templates/studentsitelayout.pt:32
 msgid "Login"
 msgstr "Einloggen"
@@ -1349,5 +1358,5 @@
 msgstr "Department verwalten"
 
-#: waeup/kofa/browser/pages.py:163
+#: waeup/kofa/browser/pages.py:162
 msgid "You logged in."
 msgstr "Sie sind jetzt eingeloggt."
@@ -1376,11 +1385,11 @@
 msgstr "Kurs bearbeiten"
 
+#: waeup/kofa/browser/pages.py:180
+msgid "You entered wrong credentials."
+msgstr "Sie haben falsche Zugangsdaten eingegeben."
+
 #: waeup/kofa/browser/pages.py:1808
 msgid "Edit certificate"
 msgstr "Zertifikat bearbeiten"
-
-#: waeup/kofa/browser/pages.py:181
-msgid "You entered wrong credentials."
-msgstr "Sie haben falsche Zugangsdaten eingegeben."
 
 #: waeup/kofa/browser/pages.py:1815
@@ -1419,48 +1428,48 @@
 msgstr "Speichen und zurück"
 
-#: waeup/kofa/browser/pages.py:195
+#: waeup/kofa/browser/pages.py:194
 msgid "You have been logged out. Thanks for using WAeUP Kofa!"
 msgstr "Sie wurden ausgeloggt. Danke dass Sie WAeUP Kofa benutzt haben."
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:231
+#: waeup/kofa/browser/pages.py:230
 msgid "Contact ${a}"
 msgstr "Kontaktiere ${a}"
 
-#: waeup/kofa/browser/pages.py:237
+#: waeup/kofa/browser/pages.py:236
 #: waeup/kofa/browser/pages.py:523
 msgid "Send message now"
 msgstr "Jetzt senden"
 
-#: waeup/kofa/browser/pages.py:256
-#: waeup/kofa/browser/pages.py:275
+#: waeup/kofa/browser/pages.py:255
+#: waeup/kofa/browser/pages.py:274
 #: waeup/kofa/browser/pages.py:540
-#: waeup/kofa/students/browser.py:318
+#: waeup/kofa/students/browser.py:330
 msgid "Your message has been sent."
 msgstr "Ihre Nachricht wurde verschickt."
 
-#: waeup/kofa/browser/pages.py:266
+#: waeup/kofa/browser/pages.py:265
 msgid "Send now"
 msgstr "Sende jetzt"
 
-#: waeup/kofa/browser/pages.py:277
+#: waeup/kofa/browser/pages.py:276
 msgid "A smtp server error occurred."
 msgstr "Es trat ein smtp-Serverfehler auf."
 
-#: waeup/kofa/browser/pages.py:302
+#: waeup/kofa/browser/pages.py:301
 msgid "<h1>Welcome to WAeUP.Kofa</h1>"
 msgstr "<h1>Willkommen bei WAeUP.Kofa</h1>"
 
-#: waeup/kofa/browser/pages.py:390
+#: waeup/kofa/browser/pages.py:389
 #: waeup/kofa/hostels/browser.py:195
-#: waeup/kofa/students/viewlets.py:163
-#: waeup/kofa/students/viewlets.py:171
-#: waeup/kofa/students/viewlets.py:226
-#: waeup/kofa/students/viewlets.py:243
-#: waeup/kofa/students/viewlets.py:283
+#: waeup/kofa/students/viewlets.py:166
+#: waeup/kofa/students/viewlets.py:174
+#: waeup/kofa/students/viewlets.py:247
+#: waeup/kofa/students/viewlets.py:255
+#: waeup/kofa/students/viewlets.py:304
 msgid "Manage"
 msgstr "Verwalten"
 
-#: waeup/kofa/browser/pages.py:391
+#: waeup/kofa/browser/pages.py:390
 #: waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
@@ -1472,6 +1481,6 @@
 msgstr "Benutzerkonto ${a} erfolgreich gelöscht."
 
-#: waeup/kofa/browser/pages.py:430
-#: waeup/kofa/browser/pages.py:432
+#: waeup/kofa/browser/pages.py:431
+#: waeup/kofa/browser/pages.py:433
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
@@ -1479,5 +1488,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:454
+#: waeup/kofa/browser/pages.py:455
 msgid "User account ${a} successfully added."
 msgstr "Benutzerkonto ${a} erfolgreich hinzugefügt."
@@ -1494,5 +1503,5 @@
 #. Default: ""
 #: waeup/kofa/browser/pages.py:521
-#: waeup/kofa/students/browser.py:299
+#: waeup/kofa/students/browser.py:311
 msgid "Send message to ${a}"
 msgstr "Sende Nachricht an ${a}"
@@ -1587,5 +1596,5 @@
 msgstr "Gehe zu Schritt 3"
 
-#: waeup/kofa/browser/pages.py:86
+#: waeup/kofa/browser/pages.py:85
 msgid "No local role selected."
 msgstr "Keine lokalen Rollen ausgewählt."
@@ -1619,4 +1628,14 @@
 msgid "Perform import"
 msgstr "Import durchführen"
+
+#. Default: ""
+#: waeup/kofa/browser/pdf.py:127
+msgid "${footer_text} Page ${num1} of ${num2}"
+msgstr "${footer_text} Seite ${num1} of ${num2}"
+
+#. Default: ""
+#: waeup/kofa/browser/pdf.py:336
+msgid "Date: ${a}"
+msgstr "Datum: ${a}"
 
 #: waeup/kofa/browser/templates/certificatecoursepage.pt:10
@@ -1793,4 +1812,8 @@
 msgid "Upload Date"
 msgstr "Hochladedatum"
+
+#: waeup/kofa/browser/templates/default_waeup_display_form.pt:6
+msgid "Uploaded Files"
+msgstr "Hochgeladene Dateien"
 
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:101
@@ -1831,15 +1854,20 @@
 
 #: waeup/kofa/browser/templates/facultypage.pt:1
-#: waeup/kofa/hostels/browser_templates/containerpage.pt:1
-msgid "There no subobjects registered yet."
+msgid "There are no subobjects registered yet."
 msgstr "Es existieren bisher keine Unterobjekte."
 
+#: waeup/kofa/browser/templates/fileupload.pt:26
+#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:26
+msgid "Max. file size:"
+msgstr "Max. Dateigröße:"
+
 #: waeup/kofa/browser/templates/loginpage.pt:13
-#: waeup/kofa/browser/templates/usereditformpage.pt:8
+#: waeup/kofa/browser/templates/usereditformpage.pt:9
 #: waeup/kofa/students/browser_templates/basepage.pt:14
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:17
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:18
 #: waeup/kofa/students/browser_templates/change_password.pt:10
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:31
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:34
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:32
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:25
 msgid "Password:"
 msgstr "Passwort:"
@@ -1859,5 +1887,5 @@
 msgstr "Wenn Sie ein neuer Student sind und noch kein Benutzerkonto haben, oder Ihr Datensatz gerade frisch  erzeugt wurde, erwerben Sie bitte einen PWD-Zugangscode und initialisieren Sie Ihr Benutzerkonto <strong><a href=\"setpassword\"> hier</a></strong>."
 
-#. Default: "Or simply forgot your student id or password? Then request a new password <strong><a href=\"changepw\"> here</a></strong>."
+#. Default: "Or simply forgot your student id, application id or password? Then request a new password <strong><a href=\"sendpw\"> here</a></strong>."
 #: waeup/kofa/browser/templates/loginpage.pt:44
 msgid "login_trouble3"
@@ -1910,46 +1938,46 @@
 msgstr "Status"
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:101
-#: waeup/kofa/browser/templates/studentsitelayout.pt:86
+#: waeup/kofa/browser/templates/staffsitelayout.pt:102
+#: waeup/kofa/browser/templates/studentsitelayout.pt:87
 msgid "Form Status:"
 msgstr "Formularstatus:"
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:114
-#: waeup/kofa/browser/templates/studentsitelayout.pt:100
+#: waeup/kofa/browser/templates/staffsitelayout.pt:115
+#: waeup/kofa/browser/templates/studentsitelayout.pt:101
 msgid "Back to top"
 msgstr "Zurück zum Anfang"
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:116
-#: waeup/kofa/browser/templates/studentsitelayout.pt:102
+#: waeup/kofa/browser/templates/staffsitelayout.pt:117
+#: waeup/kofa/browser/templates/studentsitelayout.pt:103
 msgid "Kofa - Student Management System"
 msgstr "Kofa - Student Management System"
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:119
-#: waeup/kofa/browser/templates/studentsitelayout.pt:105
+#: waeup/kofa/browser/templates/staffsitelayout.pt:120
+#: waeup/kofa/browser/templates/studentsitelayout.pt:106
 msgid "Copyright &copy; WAeUP Group 2008-2012"
 msgstr "Copyright &copy; WAeUP Group 2008-2012"
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:34
-#: waeup/kofa/browser/templates/studentsitelayout.pt:39
+#: waeup/kofa/browser/templates/staffsitelayout.pt:33
+#: waeup/kofa/browser/templates/studentsitelayout.pt:38
 msgid "Contact"
 msgstr "Kontakt"
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:40
-#: waeup/kofa/browser/templates/studentsitelayout.pt:45
+#: waeup/kofa/browser/templates/staffsitelayout.pt:39
+#: waeup/kofa/browser/templates/studentsitelayout.pt:44
 msgid "Logout"
 msgstr "Ausloggen"
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:60
+#: waeup/kofa/browser/templates/staffsitelayout.pt:61
 msgid "Student Id:"
 msgstr "Studenten Id:"
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:64
+#: waeup/kofa/browser/templates/staffsitelayout.pt:65
 msgid "State:"
 msgstr "Status:"
 
-#: waeup/kofa/browser/templates/usereditformpage.pt:14
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:23
+#: waeup/kofa/browser/templates/usereditformpage.pt:15
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:24
 #: waeup/kofa/students/browser_templates/change_password.pt:16
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:37
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:38
 msgid "Retype password:"
 msgstr "Wiederhole Passwort:"
@@ -1964,5 +1992,5 @@
 
 #: waeup/kofa/browser/viewlets.py:383
-#: waeup/kofa/students/viewlets.py:155
+#: waeup/kofa/students/viewlets.py:158
 msgid "Send email"
 msgstr "Email versenden"
@@ -1983,6 +2011,6 @@
 #: waeup/kofa/browser/viewlets.py:528
 #: waeup/kofa/browser/viewlets.py:536
-msgid "Show batch logs"
-msgstr "Logdateien zeigen"
+msgid "Show logs"
+msgstr "Logdateien anzeigen"
 
 #: waeup/kofa/browser/viewlets.py:548
@@ -2004,7 +2032,7 @@
 #: waeup/kofa/browser/viewlets.py:91
 #: waeup/kofa/browser/viewlets.py:160
-#: waeup/kofa/students/viewlets.py:218
-#: waeup/kofa/students/viewlets.py:356
-#: waeup/kofa/students/viewlets.py:403
+#: waeup/kofa/students/viewlets.py:239
+#: waeup/kofa/students/viewlets.py:379
+#: waeup/kofa/students/viewlets.py:426
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -2087,4 +2115,8 @@
 msgid "Block ${a}, Room ${b}, Bed ${c}"
 msgstr "Block ${a}, Raum ${b}, Bett ${c}"
+
+#: waeup/kofa/hostels/browser_templates/containerpage.pt:1
+msgid "There no subobjects registered yet."
+msgstr "Es existieren bisher keine Unterobjekte."
 
 #: waeup/kofa/hostels/browser_templates/containerpage.pt:9
@@ -2110,9 +2142,9 @@
 msgstr "Betten"
 
-#: waeup/kofa/hostels/hostel.py:180
+#: waeup/kofa/hostels/hostel.py:185
 msgid "unreserved"
 msgstr "nicht reserviert"
 
-#: waeup/kofa/hostels/hostel.py:187
+#: waeup/kofa/hostels/hostel.py:192
 msgid "reserved"
 msgstr "reserviert"
@@ -2147,5 +2179,5 @@
 
 #: waeup/kofa/hostels/interfaces.py:175
-#: waeup/kofa/students/interfaces.py:445
+#: waeup/kofa/students/interfaces.py:465
 msgid "Bed Type"
 msgstr "Betttyp"
@@ -2304,41 +2336,41 @@
 msgstr "Postgraduierten-Wohnheim"
 
-#: waeup/kofa/interfaces.py:185
+#: waeup/kofa/interfaces.py:186
 msgid "Subject"
 msgstr "Fach"
 
-#: waeup/kofa/interfaces.py:189
+#: waeup/kofa/interfaces.py:190
 msgid "Grade"
 msgstr "Note"
 
-#: waeup/kofa/interfaces.py:323
+#: waeup/kofa/interfaces.py:324
 msgid "Processor name"
 msgstr "Prozessorname"
 
-#: waeup/kofa/interfaces.py:327
-msgid "Import mode"
+#: waeup/kofa/interfaces.py:328
+msgid "Import Mode"
 msgstr "Importmodus"
 
-#: waeup/kofa/interfaces.py:352
+#: waeup/kofa/interfaces.py:353
 msgid "Email Address:"
 msgstr "Emailadresse:"
 
-#: waeup/kofa/interfaces.py:359
+#: waeup/kofa/interfaces.py:360
 msgid "Email to:"
 msgstr "Email an:"
 
-#: waeup/kofa/interfaces.py:366
+#: waeup/kofa/interfaces.py:367
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: waeup/kofa/interfaces.py:370
+#: waeup/kofa/interfaces.py:371
 msgid "Full Name:"
 msgstr "Vollständiger Name:"
 
-#: waeup/kofa/interfaces.py:374
+#: waeup/kofa/interfaces.py:375
 msgid "Text:"
 msgstr "Text:"
 
-#: waeup/kofa/interfaces.py:405
+#: waeup/kofa/interfaces.py:406
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2350,5 +2382,5 @@
 msgstr "Benutzer Id"
 
-#: waeup/kofa/interfaces.py:410
+#: waeup/kofa/interfaces.py:411
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2357,133 +2389,133 @@
 msgstr "Vollständiger Name"
 
-#: waeup/kofa/interfaces.py:414
+#: waeup/kofa/interfaces.py:415
 msgid "Description/Notice"
 msgstr "Beschreibung/Nachricht"
 
-#: waeup/kofa/interfaces.py:431
+#: waeup/kofa/interfaces.py:432
 msgid "Portal roles"
 msgstr "Portalweite Rollen"
 
-#: waeup/kofa/interfaces.py:474
+#: waeup/kofa/interfaces.py:477
 msgid "Name of University"
 msgstr "Name der Universität"
 
-#: waeup/kofa/interfaces.py:475
+#: waeup/kofa/interfaces.py:478
 msgid "Sample University"
 msgstr "Deomo-Universität"
 
-#: waeup/kofa/interfaces.py:480
+#: waeup/kofa/interfaces.py:483
 msgid "Abbreviated Title of University"
 msgstr "Abkürzung"
 
-#: waeup/kofa/interfaces.py:486
+#: waeup/kofa/interfaces.py:489
 msgid "Skin"
 msgstr "Skin"
 
-#: waeup/kofa/interfaces.py:493
+#: waeup/kofa/interfaces.py:496
 msgid "Content in reST format"
 msgstr "Inhalt in reST-Format"
 
-#: waeup/kofa/interfaces.py:505
+#: waeup/kofa/interfaces.py:508
 msgid "Accommodation Booking Session"
 msgstr "Buchungssession"
 
-#: waeup/kofa/interfaces.py:513
+#: waeup/kofa/interfaces.py:516
 msgid "Allowed States for Accommodation Booking"
 msgstr "Erlaubte Zustände für das Buchen einer Unterbringung"
 
-#: waeup/kofa/interfaces.py:521
+#: waeup/kofa/interfaces.py:524
 msgid "Name of Administrator"
 msgstr "Name des Administrators"
 
-#: waeup/kofa/interfaces.py:527
+#: waeup/kofa/interfaces.py:530
 msgid "Email Address of Administrator"
 msgstr "Emailadresse des Administrators"
 
-#: waeup/kofa/interfaces.py:534
+#: waeup/kofa/interfaces.py:537
 msgid "Subject of Email to Administrator"
 msgstr "Betreff der Email an Administrator"
 
-#: waeup/kofa/interfaces.py:535
+#: waeup/kofa/interfaces.py:538
 msgid "Kofa Contact"
 msgstr "Kofa-Kontakt"
 
-#: waeup/kofa/interfaces.py:540
+#: waeup/kofa/interfaces.py:543
 msgid "SMTP mailer to use when sending mail"
 msgstr "SMTP Dienst"
 
-#: waeup/kofa/interfaces.py:547
+#: waeup/kofa/interfaces.py:550
 msgid "Captcha used for public registration pages"
 msgstr "Captcha für öffentliche Registrierung"
 
-#: waeup/kofa/interfaces.py:554
+#: waeup/kofa/interfaces.py:557
 msgid "Carry-over Course Registration"
 msgstr "Carry-Over-Kursregistrierung"
 
-#: waeup/kofa/interfaces.py:563
-#: waeup/kofa/interfaces.py:621
+#: waeup/kofa/interfaces.py:566
+#: waeup/kofa/interfaces.py:624
 msgid "Academic Session"
 msgstr "Akademische Session"
 
-#: waeup/kofa/interfaces.py:571
+#: waeup/kofa/interfaces.py:574
 #: waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr "Schulgebühr"
 
-#: waeup/kofa/interfaces.py:576
+#: waeup/kofa/interfaces.py:579
 msgid "Surcharge Portal Provider"
 msgstr "Gebürhr des Protal-Providers"
 
-#: waeup/kofa/interfaces.py:582
+#: waeup/kofa/interfaces.py:585
 msgid "Surcharge Payment Gateway Provider"
 msgstr "Gebühr des Bezahlsystem-Providers"
 
-#: waeup/kofa/interfaces.py:588
+#: waeup/kofa/interfaces.py:591
 #: waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr "Zusatzgebühr 3"
 
-#: waeup/kofa/interfaces.py:594
+#: waeup/kofa/interfaces.py:597
 msgid "Clearance Fee"
 msgstr "Einschreibungsgebühr"
 
-#: waeup/kofa/interfaces.py:600
+#: waeup/kofa/interfaces.py:603
 msgid "Booking Fee"
 msgstr "Buchungsgebühr"
 
-#: waeup/kofa/interfaces.py:606
+#: waeup/kofa/interfaces.py:609
 #: waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
 msgstr "Zulassungsgebühr"
 
-#: waeup/kofa/interfaces.py:73
+#: waeup/kofa/interfaces.py:74
 msgid "clearance started"
 msgstr "Einschreibung begonnen"
 
-#: waeup/kofa/interfaces.py:74
+#: waeup/kofa/interfaces.py:75
 msgid "clearance requested"
 msgstr "Einschreibung beantragt"
 
-#: waeup/kofa/interfaces.py:75
+#: waeup/kofa/interfaces.py:76
 msgid "cleared"
 msgstr "eingeschrieben"
 
-#: waeup/kofa/interfaces.py:76
+#: waeup/kofa/interfaces.py:77
 msgid "school fee paid"
 msgstr "Gebühren bezahlt"
 
-#: waeup/kofa/interfaces.py:77
+#: waeup/kofa/interfaces.py:78
 msgid "returning"
 msgstr "rückgemeldet"
 
-#: waeup/kofa/interfaces.py:78
+#: waeup/kofa/interfaces.py:79
 msgid "courses registered"
 msgstr "Kurse registriert"
 
-#: waeup/kofa/interfaces.py:79
+#: waeup/kofa/interfaces.py:80
 msgid "courses validated"
 msgstr "Kurse validiert"
 
-#: waeup/kofa/objecthistory.py:71
+#: waeup/kofa/objecthistory.py:72
 msgid "by"
 msgstr "von"
@@ -2571,6 +2603,6 @@
 #: waeup/kofa/payments/interfaces.py:76
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:10
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:84
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:51
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:86
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:42
 msgid "Payment Date"
 msgstr "Datum der Zahlung"
@@ -2585,462 +2617,483 @@
 
 #. Default: ""
-#: waeup/kofa/students/batching.py:165
+#: waeup/kofa/students/batching.py:166
 msgid "State '${a}' set"
 msgstr "Zustand '${a}' gesetzt"
 
-#: waeup/kofa/students/browser.py:1000
+#. Default: ""
+#: waeup/kofa/students/browser.py:1009
+msgid "${a}: Payments"
+msgstr "${a}: Zahlungen"
+
+#: waeup/kofa/students/browser.py:1054
+msgid "Add online payment"
+msgstr "Ticket für Online-Bezahlung hinzufügen"
+
+#: waeup/kofa/students/browser.py:1057
 msgid "Create ticket"
 msgstr "Ticket erzeugen"
 
-#: waeup/kofa/students/browser.py:1008
-#: waeup/kofa/students/browser.py:1230
+#: waeup/kofa/students/browser.py:1065
+#: waeup/kofa/students/browser.py:1292
 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:1077
+#: waeup/kofa/students/browser.py:1075
+msgid "Study course data are incomplete."
+msgstr "Die Studiengangdaten sind unvollständig."
+
+#: waeup/kofa/students/browser.py:1139
 msgid "This ticket has already been paid."
 msgstr "Diese Bezahlung wurde bereits ausgeführt."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1090
-#: waeup/kofa/students/browser.py:1098
-#: waeup/kofa/students/browser.py:1106
+#: waeup/kofa/students/browser.py:1152
+#: waeup/kofa/students/browser.py:1160
+#: waeup/kofa/students/browser.py:1168
 msgid "Valid callback received. ${a}"
 msgstr "Gültigen Rückruf erhalten. ${a}"
 
-#. Default: ""
-#: waeup/kofa/students/browser.py:1160
+#: waeup/kofa/students/browser.py:121
+#: waeup/kofa/students/viewlets.py:117
+#: waeup/kofa/students/viewlets.py:557
+msgid "Study Course"
+msgstr "Studiengang"
+
+#. Default: ""
+#: waeup/kofa/students/browser.py:1222
 msgid "${a}: Accommodation"
 msgstr " ${a}: Unterkunft"
 
-#: waeup/kofa/students/browser.py:1172
+#: waeup/kofa/students/browser.py:1234
 msgid "You are not allowed to remove bed tickets."
 msgstr "Ihnen ist nicht erlaubt, Betttickets zu entfernen."
 
-#: waeup/kofa/students/browser.py:1179
+#: waeup/kofa/students/browser.py:1241
 msgid "No bed ticket selected."
 msgstr "Kein Ticket ausgewählt."
 
-#: waeup/kofa/students/browser.py:119
-#: waeup/kofa/students/viewlets.py:114
-#: waeup/kofa/students/viewlets.py:534
-msgid "Study Course"
-msgstr "Studiengang"
-
-#: waeup/kofa/students/browser.py:1210
+#: waeup/kofa/students/browser.py:127
+#: waeup/kofa/students/viewlets.py:123
+#: waeup/kofa/students/viewlets.py:558
+msgid "Payments"
+msgstr "Zahlungen"
+
+#: waeup/kofa/students/browser.py:1272
 msgid "Add bed ticket"
 msgstr "Bettticket hinzufügen"
 
-#: waeup/kofa/students/browser.py:1212
+#: waeup/kofa/students/browser.py:1274
 msgid "Create bed ticket"
 msgstr "Bettticket erzeugen"
 
-#: waeup/kofa/students/browser.py:1220
+#: waeup/kofa/students/browser.py:1282
 msgid "Your data are incomplete."
 msgstr "Die Daten sind unvollständig."
 
-#: waeup/kofa/students/browser.py:1224
+#: waeup/kofa/students/browser.py:1286
 msgid "You are in the wrong registration state."
 msgstr "Sie haben den falschen Status."
 
-#: waeup/kofa/students/browser.py:1235
+#: waeup/kofa/students/browser.py:1297
 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:1246
-#: waeup/kofa/students/browser.py:1543
-#: waeup/kofa/students/browser.py:1656
+#: waeup/kofa/students/browser.py:1308
+#: waeup/kofa/students/browser.py:1602
+#: waeup/kofa/students/browser.py:1721
 msgid "Activation code is invalid."
 msgstr "Aktivierungs-Code ist ungültig."
 
-#: waeup/kofa/students/browser.py:125
-#: waeup/kofa/students/viewlets.py:120
-#: waeup/kofa/students/viewlets.py:535
-msgid "Payments"
-msgstr "Zahlungen"
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1266
-#: waeup/kofa/students/browser.py:1394
+#. Default: ""
+#: waeup/kofa/students/browser.py:1328
+#: waeup/kofa/students/browser.py:1454
 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:1271
-#: waeup/kofa/students/browser.py:1548
-#: waeup/kofa/students/browser.py:1661
+#: waeup/kofa/students/browser.py:1333
+#: waeup/kofa/students/browser.py:1607
+#: waeup/kofa/students/browser.py:1726
 msgid "Activation code has already been used."
 msgstr "Der Aktivierungs-Code wurde bereits verwendet."
 
-#: waeup/kofa/students/browser.py:1274
-#: waeup/kofa/students/browser.py:1551
-#: waeup/kofa/students/browser.py:1664
-#: waeup/kofa/students/browser.py:1923
+#: waeup/kofa/students/browser.py:1336
+#: waeup/kofa/students/browser.py:1610
+#: waeup/kofa/students/browser.py:1729
+#: waeup/kofa/students/browser.py:1997
 msgid "invalidated"
 msgstr "entwertet"
 
-#: waeup/kofa/students/browser.py:1279
-#: waeup/kofa/students/browser.py:1555
-#: waeup/kofa/students/browser.py:1669
+#: waeup/kofa/students/browser.py:1341
+#: waeup/kofa/students/browser.py:1614
+#: waeup/kofa/students/browser.py:1734
 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:1290
-#: waeup/kofa/students/browser.py:1408
+#: waeup/kofa/students/browser.py:1352
+#: waeup/kofa/students/browser.py:1468
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr "${a}, Block ${b}, Raum ${c}, Bett ${d} (${e})"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1299
+#: waeup/kofa/students/browser.py:1361
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr "Bettticket erzeugt und Bett gebucht: ${a}"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1317
+#: waeup/kofa/students/browser.py:1377
 msgid "Bed Ticket for Session ${a}"
 msgstr "Bett-Ticket für Session ${a}"
 
-#: waeup/kofa/students/browser.py:1333
+#: waeup/kofa/students/browser.py:1393
 msgid "Bed Allocation Data"
 msgstr "Bettenzuweisungsdaten"
 
-#: waeup/kofa/students/browser.py:1339
+#: waeup/kofa/students/browser.py:1399
 msgid "Bed Allocation: "
 msgstr "Bettenzuweisung"
 
-#: waeup/kofa/students/browser.py:1366
+#: waeup/kofa/students/browser.py:142
+#: waeup/kofa/students/viewlets.py:129
+msgid "Accommodation"
+msgstr "Unterkunft"
+
+#: waeup/kofa/students/browser.py:1426
 msgid "Students in reserved beds can't be relocated."
 msgstr "Studenten in reservierten Betten können nicht umgezogen werden."
 
-#: waeup/kofa/students/browser.py:1372
+#: waeup/kofa/students/browser.py:1432
 msgid "Student can't be relocated."
 msgstr "Studen konnte nicht umgezogen werden."
 
-#: waeup/kofa/students/browser.py:140
-#: waeup/kofa/students/viewlets.py:126
-msgid "Accommodation"
-msgstr "Unterkunft"
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1415
+#. Default: ""
+#: waeup/kofa/students/browser.py:1475
 msgid "Student relocated: ${a}"
 msgstr "Student umgezogen: ${a}"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1434
+#: waeup/kofa/students/browser.py:1494
 msgid "${a}: History"
 msgstr "${a}: Historie"
 
-#: waeup/kofa/students/browser.py:1447
+#: waeup/kofa/students/browser.py:1506
 msgid "Edit base data"
 msgstr "Basisdaten editieren"
 
-#: waeup/kofa/students/browser.py:1462
-#: waeup/kofa/students/viewlets.py:365
+#. Default: ""
+#: waeup/kofa/students/browser.py:151
+msgid "Bed Ticket ${a}"
+msgstr "Bett-Ticket ${a}"
+
+#: waeup/kofa/students/browser.py:1521
+#: waeup/kofa/students/viewlets.py:388
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: waeup/kofa/students/browser.py:1476
+#: waeup/kofa/students/browser.py:1535
 msgid "Password changed."
 msgstr "Passwort geändert"
 
-#: waeup/kofa/students/browser.py:1488
+#: waeup/kofa/students/browser.py:1547
 msgid "Upload portrait"
 msgstr "Portrait hochladen"
 
-#. Default: ""
-#: waeup/kofa/students/browser.py:149
-msgid "Bed Ticket ${a}"
-msgstr "Bett-Ticket ${a}"
-
-#: waeup/kofa/students/browser.py:1503
-#: waeup/kofa/students/viewlets.py:389
+#: waeup/kofa/students/browser.py:1562
+#: waeup/kofa/students/viewlets.py:412
 #: waeup/kofa/students/workflow.py:44
 msgid "Start clearance"
 msgstr "Einschreibung starten"
 
-#: waeup/kofa/students/browser.py:1507
+#: waeup/kofa/students/browser.py:1566
 msgid "Start clearance now"
 msgstr "Einschreibung jetzt starten"
 
-#: waeup/kofa/students/browser.py:1524
-#: waeup/kofa/students/browser.py:1645
+#: waeup/kofa/students/browser.py:1583
+#: waeup/kofa/students/browser.py:1710
 msgid "Wrong state"
 msgstr "Falscher Status"
 
-#: waeup/kofa/students/browser.py:1528
+#: waeup/kofa/students/browser.py:1587
 msgid "No portrait uploaded."
 msgstr "Es wurde kein Passbild hochgeladen."
 
-#: waeup/kofa/students/browser.py:1532
+#: waeup/kofa/students/browser.py:1591
 msgid "Not all required fields filled."
 msgstr "Es wurden nicht alle Pflichtfelder ausgefüllt."
 
-#: waeup/kofa/students/browser.py:1559
+#: waeup/kofa/students/browser.py:1618
 msgid "Clearance process has been started."
 msgstr "Einschreibung wurde gestartet"
 
-#: waeup/kofa/students/browser.py:1571
+#: waeup/kofa/students/browser.py:1628
 msgid "Edit clearance data"
 msgstr "Bearbeite Einschreibungsdaten"
 
-#: waeup/kofa/students/browser.py:1583
-#: waeup/kofa/students/browser.py:1597
+#: waeup/kofa/students/browser.py:1648
+#: waeup/kofa/students/browser.py:1662
 msgid "Clearance form has been saved."
 msgstr "Einschreibungsdaten wurden gespeichert."
 
-#: waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1656
 msgid "Save and request clearance"
 msgstr "Speichern und Einschreibung beantragen"
 
-#: waeup/kofa/students/browser.py:1606
+#: waeup/kofa/students/browser.py:1671
 #: waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr "Einschreibung beantragen"
 
-#: waeup/kofa/students/browser.py:1607
+#: waeup/kofa/students/browser.py:1672
 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:1610
+#: waeup/kofa/students/browser.py:1675
 msgid "Request clearance now"
 msgstr "Einschreibung beantragen"
 
-#: waeup/kofa/students/browser.py:1619
+#: waeup/kofa/students/browser.py:1684
 msgid "This isn't your CLR access code."
 msgstr "Dies ist nicht Ihr CLR-Zugangscode"
 
-#: waeup/kofa/students/browser.py:1628
+#: waeup/kofa/students/browser.py:1693
 msgid "Clearance has been requested."
 msgstr "Einschreibung wurde beantragt."
 
-#: waeup/kofa/students/browser.py:1637
-#: waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:170
+msgid "Student Section"
+msgstr "Studenten"
+
+#: waeup/kofa/students/browser.py:1702
+#: waeup/kofa/students/viewlets.py:441
 msgid "Start course registration"
 msgstr "Kurseregistrierung starten"
 
-#: waeup/kofa/students/browser.py:1641
+#: waeup/kofa/students/browser.py:1706
 msgid "Start course registration now"
 msgstr "Kursregistrierung jetzt starten"
 
-#: waeup/kofa/students/browser.py:1677
+#: waeup/kofa/students/browser.py:1742
 msgid "Course registration has been started."
 msgstr "Kursregistrierung wurde gestartet."
 
-#: waeup/kofa/students/browser.py:168
-msgid "Student Section"
-msgstr "Studenten"
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1696
+#. Default: ""
+#: waeup/kofa/students/browser.py:1761
 msgid "Add current level ${a}"
 msgstr "Aktuelles Level ${a} hinzufügen"
 
-#: waeup/kofa/students/browser.py:1705
+#: waeup/kofa/students/browser.py:1770
 msgid "Create course list now"
 msgstr "Kursliste jetzt erzeugen"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1744
+#: waeup/kofa/students/browser.py:1809
 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:1781
+#: waeup/kofa/students/browser.py:1846
 msgid "Register course list"
 msgstr "Registriere Kursliste"
 
-#: waeup/kofa/students/browser.py:1785
+#: waeup/kofa/students/browser.py:1850
 msgid "Course list has been registered."
 msgstr "Kurseliste wurde registriert."
 
-#: waeup/kofa/students/browser.py:1831
-msgid "Change my password"
-msgstr "Passwort ändern"
-
-#: waeup/kofa/students/browser.py:184
-#: waeup/kofa/students/browser.py:220
+#: waeup/kofa/students/browser.py:186
+#: waeup/kofa/students/browser.py:226
 msgid "Empty search string"
 msgstr "Leerer Suchtext"
 
-#: waeup/kofa/students/browser.py:1841
+#: waeup/kofa/students/browser.py:1896
+msgid "Send me a new password"
+msgstr "Neues Passwort zusenden"
+
+#: waeup/kofa/students/browser.py:1906
 msgid "Get new login credentials"
 msgstr "Zugangsdaten zusenden"
 
-#: waeup/kofa/students/browser.py:1855
-msgid "No student record found."
-msgstr "Keinen Studenten gefunden."
-
-#: waeup/kofa/students/browser.py:1863
+#: waeup/kofa/students/browser.py:1923
+msgid "Application package not installed."
+msgstr "Application package not installed."
+
+#: waeup/kofa/students/browser.py:1929
+msgid "No record found."
+msgstr "Keinen Datensatz gefunden."
+
+#: waeup/kofa/students/browser.py:1937
 msgid "You have successfully changed your password for the"
 msgstr "Sie haben erfolgreich Ihr Passwort geändert für das"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1868
+#: waeup/kofa/students/browser.py:1942
 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:1879
+#: waeup/kofa/students/browser.py:1953
 msgid "Set password for first-time login"
 msgstr "Passwort setzen"
 
-#: waeup/kofa/students/browser.py:1882
+#: waeup/kofa/students/browser.py:1956
 msgid "Set"
 msgstr "Setzen"
 
-#: waeup/kofa/students/browser.py:1897
+#: waeup/kofa/students/browser.py:1971
 msgid "More than one student found."
 msgstr "Mehr als einen Studenten gefunden."
 
-#: waeup/kofa/students/browser.py:1905
+#: waeup/kofa/students/browser.py:1979
 msgid "Access code is invalid."
 msgstr "Aktivierungs-Code ist ungültig."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1908
+#: waeup/kofa/students/browser.py:1982
 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:1914
+#: waeup/kofa/students/browser.py:1988
 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:1920
+#: waeup/kofa/students/browser.py:1994
 msgid "Access code has already been used."
 msgstr "Der Aktivierungs-Code wurde bereits verwendet."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1929
+#: waeup/kofa/students/browser.py:2003
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr "Passwort wurde gesetzt. Ihre Studenten Id ist ${a}"
 
-#: waeup/kofa/students/browser.py:202
-#: waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:208
+#: waeup/kofa/students/viewlets.py:142
 msgid "Manage student section"
 msgstr "Studenten verwalten"
 
-#: waeup/kofa/students/browser.py:226
-#: waeup/kofa/students/browser.py:1894
+#: waeup/kofa/students/browser.py:238
+#: waeup/kofa/students/browser.py:1968
 msgid "No student found."
 msgstr "Keinen Studenten gefunden."
 
-#: waeup/kofa/students/browser.py:253
-#: waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:265
+#: waeup/kofa/students/viewlets.py:149
 msgid "Add student"
 msgstr "Student hinzufügen"
 
-#: waeup/kofa/students/browser.py:261
+#: waeup/kofa/students/browser.py:273
 msgid "Student record created."
 msgstr "Student erzeugt."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:277
+#: waeup/kofa/students/browser.py:289
 msgid "${a}: Base Data"
 msgstr "${a}: Basisdaten"
 
-#: waeup/kofa/students/browser.py:320
-#: waeup/kofa/students/browser.py:1871
+#: waeup/kofa/students/browser.py:332
+#: waeup/kofa/students/browser.py:1945
 msgid "An smtp server error occurred."
 msgstr "Es trat ein smtp-Serverfehler auf."
 
-#: waeup/kofa/students/browser.py:332
+#: waeup/kofa/students/browser.py:343
 msgid "Manage base data"
 msgstr "Basisdaten verwalten"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:407
+#: waeup/kofa/students/browser.py:423
 msgid "${a}: Clearance Data"
 msgstr "${a}: Einschreibungsdaten"
 
-#: waeup/kofa/students/browser.py:423
-#: waeup/kofa/students/viewlets.py:104
-#: waeup/kofa/students/viewlets.py:532
+#: waeup/kofa/students/browser.py:446
+#: waeup/kofa/students/viewlets.py:107
+#: waeup/kofa/students/viewlets.py:555
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
 msgid "Clearance Data"
 msgstr "Einschreibungsdaten"
 
-#: waeup/kofa/students/browser.py:429
+#: waeup/kofa/students/browser.py:452
 msgid "Clearance Slip of "
 msgstr "Einschreibungsbeleg für"
 
-#: waeup/kofa/students/browser.py:449
+#: waeup/kofa/students/browser.py:471
 msgid "Manage clearance data"
 msgstr "Verwalte Einschreibungsdaten"
 
-#: waeup/kofa/students/browser.py:478
+#: waeup/kofa/students/browser.py:512
 msgid "Student has been cleared."
 msgstr "Student wurde eingeschrieben."
 
-#: waeup/kofa/students/browser.py:480
-#: waeup/kofa/students/browser.py:504
+#: waeup/kofa/students/browser.py:514
+#: waeup/kofa/students/browser.py:538
 msgid "Student is in wrong state."
 msgstr "Student hat den falschen Status."
 
-#: waeup/kofa/students/browser.py:497
+#: waeup/kofa/students/browser.py:531
 msgid "Clearance has been annulled."
 msgstr "Einschreibung wurde annulliert."
 
-#: waeup/kofa/students/browser.py:501
+#: waeup/kofa/students/browser.py:535
 msgid "Clearance request has been rejected."
 msgstr "Einschreibung wurde abgelehnt."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:527
+#: waeup/kofa/students/browser.py:561
 msgid "${a}: Personal Data"
 msgstr "${a}: Persönliche Daten"
 
-#: waeup/kofa/students/browser.py:537
-msgid "Manage personal data"
-msgstr "Persönliche Daten verwalten"
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:557
+#: waeup/kofa/students/browser.py:571
+msgid "Edit personal data"
+msgstr "Persönliche Daten bearbeiten"
+
+#. Default: ""
+#: waeup/kofa/students/browser.py:591
 msgid "${a}: Study Course"
 msgstr "${a}: Studiengang"
 
-#: waeup/kofa/students/browser.py:587
+#: waeup/kofa/students/browser.py:621
 msgid "Manage study course"
 msgstr "Studiengang verwalten"
 
-#: waeup/kofa/students/browser.py:590
-#: waeup/kofa/students/browser.py:631
+#: waeup/kofa/students/browser.py:624
+#: waeup/kofa/students/browser.py:671
 msgid "Remove selected levels"
 msgstr "Ausgewählte Levels  löschen"
 
-#: waeup/kofa/students/browser.py:591
-#: waeup/kofa/students/browser.py:617
+#: waeup/kofa/students/browser.py:625
+#: waeup/kofa/students/browser.py:657
 msgid "Add study level"
 msgstr "Level  hinzufügen"
 
-#: waeup/kofa/students/browser.py:625
+#: waeup/kofa/students/browser.py:645
+msgid "Current level not available for certificate."
+msgstr "Das Studienjaht ist "
+
+#: waeup/kofa/students/browser.py:665
 msgid "Study level has been added."
 msgstr "Level wurde hinzugefügt."
 
-#: waeup/kofa/students/browser.py:627
-#: waeup/kofa/students/browser.py:1714
+#: waeup/kofa/students/browser.py:667
+#: waeup/kofa/students/browser.py:1779
 msgid "This level exists."
 msgstr "Dieses Level existiert."
 
-#: waeup/kofa/students/browser.py:637
+#: waeup/kofa/students/browser.py:677
 msgid "No study level selected."
 msgstr "Kein Level ausgewählt."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:673
+#: waeup/kofa/students/browser.py:728
 msgid "${a}: Study Level ${b}"
 msgstr "${a}: Level ${b}"
 
-#: waeup/kofa/students/browser.py:696
+#: waeup/kofa/students/browser.py:751
 msgid "Level Data"
 msgstr "Leveldaten"
 
-#: waeup/kofa/students/browser.py:702
+#: waeup/kofa/students/browser.py:757
 msgid "Course List"
 msgstr "Kursliste"
 
-#: waeup/kofa/students/browser.py:711
-msgid "Course Registration Slip  "
+#: waeup/kofa/students/browser.py:766
+msgid "Course Registration Slip"
 msgstr "Kursregistrierungsbeleg"
 
-#: waeup/kofa/students/browser.py:717
+#: waeup/kofa/students/browser.py:772
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -3049,5 +3102,5 @@
 msgstr "Sem."
 
-#: waeup/kofa/students/browser.py:720
+#: waeup/kofa/students/browser.py:775
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -3055,10 +3108,10 @@
 msgstr "Dept."
 
-#: waeup/kofa/students/browser.py:721
+#: waeup/kofa/students/browser.py:776
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr "Fakultät"
 
-#: waeup/kofa/students/browser.py:722
+#: waeup/kofa/students/browser.py:777
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -3066,5 +3119,5 @@
 msgstr "Cred."
 
-#: waeup/kofa/students/browser.py:723
+#: waeup/kofa/students/browser.py:778
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -3072,6 +3125,6 @@
 msgstr "Pflicht"
 
-#: waeup/kofa/students/browser.py:724
-#: waeup/kofa/students/interfaces.py:389
+#: waeup/kofa/students/browser.py:779
+#: waeup/kofa/students/interfaces.py:409
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -3080,74 +3133,65 @@
 msgstr "Score"
 
-#: waeup/kofa/students/browser.py:752
-#: waeup/kofa/students/browser.py:781
-#: waeup/kofa/students/browser.py:866
-#: waeup/kofa/students/browser.py:871
-#: waeup/kofa/students/browser.py:1754
-#: waeup/kofa/students/browser.py:1804
+#: waeup/kofa/students/browser.py:808
+#: waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:922
+#: waeup/kofa/students/browser.py:927
+#: waeup/kofa/students/browser.py:1819
+#: waeup/kofa/students/browser.py:1869
 msgid "Add course ticket"
 msgstr "Kursticket hinzufügen"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:773
+#: waeup/kofa/students/browser.py:829
 msgid "Manage study level ${a}"
 msgstr "Verwalte Level  ${a}"
 
-#: waeup/kofa/students/browser.py:791
-#: waeup/kofa/students/browser.py:1764
+#: waeup/kofa/students/browser.py:847
+#: waeup/kofa/students/browser.py:1829
 msgid "No ticket selected."
 msgstr "Kein Ticket ausgewählt."
 
-#: waeup/kofa/students/browser.py:815
-#: waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:871
+#: waeup/kofa/students/browser.py:893
 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:819
+#: waeup/kofa/students/browser.py:875
 msgid "Course list has been validated."
 msgstr "Kurseliste wurde validiert."
 
-#: waeup/kofa/students/browser.py:821
-#: waeup/kofa/students/browser.py:849
+#: waeup/kofa/students/browser.py:877
+#: waeup/kofa/students/browser.py:905
 msgid "Student is in the wrong state."
 msgstr "Student hat den falschen Status."
 
-#: waeup/kofa/students/browser.py:842
+#: waeup/kofa/students/browser.py:898
 msgid "Course list request has been annulled."
 msgstr "Kursregistrierung wurde annulliert."
 
-#: waeup/kofa/students/browser.py:846
+#: waeup/kofa/students/browser.py:902
 msgid "Course list request has been rejected:"
 msgstr "Kursregistrierung wurde abgelehnt."
 
-#: waeup/kofa/students/browser.py:886
-#: waeup/kofa/students/browser.py:1817
+#: waeup/kofa/students/browser.py:943
+#: waeup/kofa/students/browser.py:1882
 msgid "The ticket exists."
 msgstr "Das Ticket existiert."
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:888
-#: waeup/kofa/students/browser.py:1819
+#: waeup/kofa/students/browser.py:945
+#: waeup/kofa/students/browser.py:1884
 msgid "Successfully added ${a}."
 msgstr "Erfolgreich hinzugefügt: ${a}"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:909
+#: waeup/kofa/students/browser.py:966
 msgid "${a}: Course Ticket ${b}"
 msgstr "${a}: Kursticket ${b}"
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:925
+#: waeup/kofa/students/browser.py:982
 msgid "Manage course ticket ${a}"
 msgstr "Verwalte Kursticket ${a}"
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:952
-msgid "${a}: Payments"
-msgstr "${a}: Zahlungen"
-
-#: waeup/kofa/students/browser.py:997
-msgid "Add online payment"
-msgstr "Ticket für Online-Bezahlung hinzufügen"
 
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:11
@@ -3155,12 +3199,7 @@
 msgstr "Betten-Kategorie"
 
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:29
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:30
 msgid "Registration Transition:"
 msgstr "Zustandsänderung der Registrierung:"
-
-#. Default: "Please solve the captcha<br />to prevent misuse of this service:"
-#: waeup/kofa/students/browser_templates/changepw.pt:8
-msgid "solve_captcha"
-msgstr "Bitte helfen Sie uns, Missbrauch des Dienstes zu vermeiden, indem Sie das folgende Captcha lösen:"
 
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:8
@@ -3211,6 +3250,6 @@
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:14
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:25
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:87
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:54
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:89
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:45
 msgid "State"
 msgstr "Status"
@@ -3231,4 +3270,14 @@
 msgstr "mit Name"
 
+#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:15
+#: waeup/kofa/students/browser_templates/studycoursepage.pt:39
+msgid "Faculty:"
+msgstr "Fakultät:"
+
+#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:23
+#: waeup/kofa/students/browser_templates/studycoursepage.pt:28
+msgid "Department:"
+msgstr "Department:"
+
 #: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:31
 msgid "Semester:"
@@ -3247,33 +3296,37 @@
 msgstr "Aktivierungs-Code:"
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:20
-#: waeup/kofa/students/browser_templates/fileupload.pt:26
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
-msgid "Max. file size:"
-msgstr "Max. Dateigröße:"
-
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:11
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:85
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:52
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:87
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:43
 msgid "Category"
 msgstr "Kategorie"
 
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:12
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:86
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:53
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:88
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:44
 msgid "Item"
 msgstr "Gegenstand"
 
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:8
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:82
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:49
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:84
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:40
 msgid "Payment Id"
 msgstr "Zahlungs-Id"
 
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:9
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:83
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:50
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:85
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:41
 msgid "Creation Date"
 msgstr "Erstellungsdatum"
+
+#. Default: "Enter the email address stored on Kofa. You can't change your email address here. If you've forgotten your email address or the email address stored in Kofa is wrong or no longer valid, use the enquiries form to request a change of address."
+#: waeup/kofa/students/browser_templates/sendpassword.pt:19
+msgid "email_address_problem"
+msgstr "Geben Sie Ihre im System gespeicherte Emailadresse an. Sie können die Adresse auf diesem Wege nicht ändern. Wenn Sie die Adresse vergessen haben oder die Adresse nicht mehr gültig sein sollte, nutzen Sie das Kontaktformular und beantragen Sie einen Adresswechsel."
+
+#. Default: "Please solve the captcha<br />to prevent misuse of this service:"
+#: waeup/kofa/students/browser_templates/sendpassword.pt:8
+msgid "solve_captcha"
+msgstr "Bitte helfen Sie uns, Missbrauch des Dienstes zu vermeiden, indem Sie das folgende Captcha lösen:"
 
 #: waeup/kofa/students/browser_templates/setpassword.pt:14
@@ -3370,75 +3423,81 @@
 msgstr "Bisher wurden keine Tickets hinzugefügt."
 
-#: waeup/kofa/students/interfaces.py:183
-#: waeup/kofa/students/interfaces.py:259
-#: waeup/kofa/students/interfaces.py:498
-msgid "Registration Number"
-msgstr "Regsistrierungsnummer"
-
-#: waeup/kofa/students/interfaces.py:190
-#: waeup/kofa/students/interfaces.py:268
+#: waeup/kofa/students/export.py:139
+msgid "Student Study Levels"
+msgstr "Levels"
+
+#: waeup/kofa/students/export.py:87
+msgid "Student Study Courses"
+msgstr "Studiengangdaten"
+
+#: waeup/kofa/students/interfaces.py:191
+#: waeup/kofa/students/interfaces.py:280
 msgid "Matriculation Number"
 msgstr "Matrikelnummer"
 
-#: waeup/kofa/students/interfaces.py:197
+#: waeup/kofa/students/interfaces.py:198
 msgid "PWD Activation Code"
 msgstr "PWD-Aktivierungs-Code"
 
-#: waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/students/interfaces.py:204
 msgid "Email"
 msgstr "Emailadresse"
 
-#: waeup/kofa/students/interfaces.py:223
+#: waeup/kofa/students/interfaces.py:225
 msgid "Clearance form locked"
 msgstr "Einschreibungsformular gesperrt"
 
-#: waeup/kofa/students/interfaces.py:228
+#: waeup/kofa/students/interfaces.py:230
 msgid "CLR Activation Code"
 msgstr "CLR-Aktivierungs-Code"
 
-#: waeup/kofa/students/interfaces.py:235
+#: waeup/kofa/students/interfaces.py:237
 msgid "Nationality"
 msgstr "Nationalität"
 
-#: waeup/kofa/students/interfaces.py:245
+#: waeup/kofa/students/interfaces.py:246
+msgid "Employer"
+msgstr "Arbeitgeber"
+
+#: waeup/kofa/students/interfaces.py:256
 msgid "Permanent Address"
 msgstr "Postanschrift"
 
-#: waeup/kofa/students/interfaces.py:277
+#: waeup/kofa/students/interfaces.py:289
 #: waeup/kofa/browser/templates/showstudentspage.pt:7
 msgid "Certificate"
 msgstr "Zertifikat"
 
-#: waeup/kofa/students/interfaces.py:283
+#: waeup/kofa/students/interfaces.py:295
 msgid "Entry Mode"
 msgstr "Studienmodus bei Einschreibung"
 
-#: waeup/kofa/students/interfaces.py:290
+#: waeup/kofa/students/interfaces.py:302
 msgid "Entry Session"
 msgstr "Eingangssession"
 
-#: waeup/kofa/students/interfaces.py:298
-#: waeup/kofa/students/interfaces.py:337
+#: waeup/kofa/students/interfaces.py:310
+#: waeup/kofa/students/interfaces.py:349
 #: waeup/kofa/browser/templates/showstudentspage.pt:8
 msgid "Current Session"
 msgstr "Aktuelle Session"
 
-#: waeup/kofa/students/interfaces.py:305
-#: waeup/kofa/students/interfaces.py:343
+#: waeup/kofa/students/interfaces.py:317
+#: waeup/kofa/students/interfaces.py:355
 #: waeup/kofa/browser/templates/showstudentspage.pt:9
 msgid "Current Level"
 msgstr "Aktuelles Level"
 
-#: waeup/kofa/students/interfaces.py:312
-#: waeup/kofa/students/interfaces.py:331
+#: waeup/kofa/students/interfaces.py:324
+#: waeup/kofa/students/interfaces.py:343
 msgid "Current Verdict"
 msgstr "Aktuelles Verdict"
 
-#: waeup/kofa/students/interfaces.py:319
+#: waeup/kofa/students/interfaces.py:331
 msgid "Previous Verdict"
 msgstr "Vorangegangenes Verdict"
 
-#: waeup/kofa/students/interfaces.py:357
-#: waeup/kofa/students/interfaces.py:451
+#: waeup/kofa/students/interfaces.py:369
+#: waeup/kofa/students/interfaces.py:471
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3446,9 +3505,9 @@
 msgstr "Session"
 
-#: waeup/kofa/students/interfaces.py:363
+#: waeup/kofa/students/interfaces.py:375
 msgid "Verdict"
 msgstr "Verdict"
 
-#: waeup/kofa/students/interfaces.py:382
+#: waeup/kofa/students/interfaces.py:402
 #: waeup/kofa/browser/templates/certificatepage.pt:30
 #: waeup/kofa/browser/templates/certificatemanagepage.pt:33
@@ -3456,13 +3515,13 @@
 msgstr "Pflicht"
 
-#: waeup/kofa/students/interfaces.py:396
+#: waeup/kofa/students/interfaces.py:416
 msgid "Automatical Creation"
 msgstr "Automatische Erzeugung"
 
-#: waeup/kofa/students/interfaces.py:403
+#: waeup/kofa/students/interfaces.py:423
 msgid "Carry-over Course"
 msgstr "Kurs aus vergangenem Studienjahr"
 
-#: waeup/kofa/students/interfaces.py:422
+#: waeup/kofa/students/interfaces.py:442
 #: waeup/kofa/university/interfaces.py:299
 #: waeup/kofa/browser/templates/certificatepage.pt:29
@@ -3471,136 +3530,145 @@
 msgstr "Kurs"
 
-#: waeup/kofa/students/interfaces.py:439
+#: waeup/kofa/students/interfaces.py:459
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:10
 msgid "Bed Coordinates"
 msgstr "Bettkoordinaten"
 
-#: waeup/kofa/students/interfaces.py:458
+#: waeup/kofa/students/interfaces.py:478
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:9
 msgid "Booking Date"
 msgstr "Buchungsdatum"
 
-#: waeup/kofa/students/interfaces.py:464
+#: waeup/kofa/students/interfaces.py:484
 msgid "Booking Activation Code"
 msgstr "Aktivierungs-Code der Buchung"
 
-#. Default: ""
-#: waeup/kofa/students/utils.py:167
+#: waeup/kofa/students/utils.py:182
+msgid "Scanned Documents"
+msgstr "Gescannte Dokumente"
+
+#: waeup/kofa/students/utils.py:190
+msgid "(not provided)"
+msgstr "(nicht hochgeladen)"
+
+#. Default: ""
+#: waeup/kofa/students/utils.py:218
 msgid "<font size=10>${a} Page ${b} of ${c}</font>"
 msgstr "<font size=10>${a}, Seite ${b} von ${c}</font>"
 
-#: waeup/kofa/students/utils.py:298
-#: waeup/kofa/students/viewlets.py:71
-#: waeup/kofa/students/viewlets.py:99
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:6
+#: waeup/kofa/students/utils.py:333
+#: waeup/kofa/students/viewlets.py:74
+#: waeup/kofa/students/viewlets.py:102
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:7
 msgid "Base Data"
 msgstr "Basisdaten"
 
-#: waeup/kofa/students/utils.py:329
-msgid "Scanned Documents"
-msgstr "Gescannte Dokumente"
-
-#: waeup/kofa/students/utils.py:382
+#: waeup/kofa/students/utils.py:368
 msgid "(not yet)"
 msgstr "(noch nicht zugewiesen)"
 
-#: waeup/kofa/students/viewlets.py:109
-#: waeup/kofa/students/viewlets.py:533
+#: waeup/kofa/students/viewlets.py:112
+#: waeup/kofa/students/viewlets.py:556
 msgid "Personal Data"
 msgstr "Persönliche Daten"
 
-#: waeup/kofa/students/viewlets.py:131
-#: waeup/kofa/students/viewlets.py:537
+#: waeup/kofa/students/viewlets.py:134
+#: waeup/kofa/students/viewlets.py:560
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:27
 msgid "History"
 msgstr "Historie"
 
-#: waeup/kofa/students/viewlets.py:179
+#: waeup/kofa/students/viewlets.py:182
 #: waeup/kofa/students/workflow.py:72
 msgid "Clear student"
 msgstr "Student einschreiben"
 
-#: waeup/kofa/students/viewlets.py:194
+#: waeup/kofa/students/viewlets.py:197
 msgid "Reject clearance"
 msgstr "Einschreibung zurückweisen"
 
-#: waeup/kofa/students/viewlets.py:210
+#: waeup/kofa/students/viewlets.py:213
 msgid "Download clearance slip"
 msgstr "Einschreibungsbeleg herunterladen"
 
-#: waeup/kofa/students/viewlets.py:235
-msgid "Download course registration slip"
-msgstr "Kurseregistrierungsbeleg herunterladen"
-
-#: waeup/kofa/students/viewlets.py:251
+#: waeup/kofa/students/viewlets.py:222
+#: waeup/kofa/students/viewlets.py:231
+msgid "View"
+msgstr "Ansehen"
+
+#: waeup/kofa/students/viewlets.py:263
 #: waeup/kofa/students/workflow.py:128
 msgid "Validate courses"
 msgstr "Kurse validieren"
 
-#: waeup/kofa/students/viewlets.py:267
+#: waeup/kofa/students/viewlets.py:279
 msgid "Reject courses"
 msgstr "Kurseregistrierung zurückweisen"
 
-#: waeup/kofa/students/viewlets.py:330
+#: waeup/kofa/students/viewlets.py:296
+msgid "Download course registration slip"
+msgstr "Kurseregistrierungsbeleg herunterladen"
+
+#: waeup/kofa/students/viewlets.py:353
 msgid "Book accommodation"
 msgstr "Unterkunft buchen"
 
-#: waeup/kofa/students/viewlets.py:339
+#: waeup/kofa/students/viewlets.py:362
 msgid "Download bed allocation slip"
 msgstr "Unterkunftbeleg herunterladen"
 
-#: waeup/kofa/students/viewlets.py:348
+#: waeup/kofa/students/viewlets.py:371
 msgid "Relocate student"
 msgstr "Student umziehen"
 
-#: waeup/kofa/students/viewlets.py:374
+#: waeup/kofa/students/viewlets.py:397
 msgid "Change portrait"
 msgstr "Porträt ändern"
 
-#: waeup/kofa/students/viewlets.py:432
+#: waeup/kofa/students/viewlets.py:455
 msgid "Add course list"
 msgstr "Kursliste hinzufügen"
 
-#: waeup/kofa/students/viewlets.py:450
+#: waeup/kofa/students/viewlets.py:473
 msgid "Add and remove courses"
 msgstr "Kurs hinzufügen oder löschen"
 
-#: waeup/kofa/students/viewlets.py:536
+#: waeup/kofa/students/viewlets.py:559
 msgid "Accommodation Data"
 msgstr "Unterkunft"
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:548
+#: waeup/kofa/students/viewlets.py:571
 msgid "${a} deleted."
 msgstr "${a} gelöscht."
 
-#: waeup/kofa/students/viewlets.py:561
+#: waeup/kofa/students/viewlets.py:584
 msgid "File name has no extension."
 msgstr "Dateiname hat keine Endung."
 
-#: waeup/kofa/students/viewlets.py:564
+#: waeup/kofa/students/viewlets.py:587
 msgid "File name contains more than one dot."
 msgstr "Dateiname enthält mehr als einen Punkt."
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:571
+#: waeup/kofa/students/viewlets.py:594
 msgid "${a} file extension expected."
 msgstr "${a} Dateiendung erwartet."
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:577
+#: waeup/kofa/students/viewlets.py:600
 msgid "Only the following extension are allowed: ${a}"
 msgstr "Nur die folgenden Erweiterungen sind erlaubt: ${a}."
 
-#: waeup/kofa/students/viewlets.py:583
+#: waeup/kofa/students/viewlets.py:606
 msgid "Uploaded file is too big."
 msgstr "Das hochgeladene Bild ist zu groß!"
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:590
+#: waeup/kofa/students/viewlets.py:613
 msgid "File ${a} uploaded."
 msgstr "Datei ${a} hochgeladen."
 
-#: waeup/kofa/students/viewlets.py:608
+#: waeup/kofa/students/viewlets.py:631
 #: waeup/kofa/browser/templates/datacenterlogspage.pt:10
 #: waeup/kofa/browser/templates/datacenterpage.pt:14
@@ -3609,88 +3677,88 @@
 msgstr "Datei"
 
-#: waeup/kofa/students/viewlets.py:609
+#: waeup/kofa/students/viewlets.py:632
 msgid "Scan"
 msgstr "Scan"
 
-#: waeup/kofa/students/viewlets.py:632
+#: waeup/kofa/students/viewlets.py:655
 msgid "Upload new file"
 msgstr "Neue Datei hochladen"
 
-#: waeup/kofa/students/viewlets.py:633
+#: waeup/kofa/students/viewlets.py:656
 msgid "Delete attachment"
 msgstr "Anhang löschen"
 
-#: waeup/kofa/students/viewlets.py:663
+#: waeup/kofa/students/viewlets.py:687
 msgid "No local file selected."
 msgstr "Keine lokale Datei ausgewählt."
 
-#: waeup/kofa/students/viewlets.py:677
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:8
+#: waeup/kofa/students/viewlets.py:701
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:9
 msgid "Passport Picture"
 msgstr "Passbild"
 
-#: waeup/kofa/students/viewlets.py:688
+#: waeup/kofa/students/viewlets.py:712
 msgid "Passport Picture (jpg only)"
 msgstr "Passbild (nur jpg)"
 
-#: waeup/kofa/students/viewlets.py:703
-#: waeup/kofa/students/viewlets.py:714
+#: waeup/kofa/students/viewlets.py:727
+#: waeup/kofa/students/viewlets.py:738
 msgid "Birth Certificate"
 msgstr "Geburtsurkunde"
 
-#: waeup/kofa/students/viewlets.py:704
-#: waeup/kofa/students/viewlets.py:715
+#: waeup/kofa/students/viewlets.py:728
+#: waeup/kofa/students/viewlets.py:739
 msgid "Birth Certificate Scan"
 msgstr "Geburtsurkunde-Scan"
 
-#: waeup/kofa/students/viewlets.py:724
-#: waeup/kofa/students/viewlets.py:735
+#: waeup/kofa/students/viewlets.py:748
+#: waeup/kofa/students/viewlets.py:759
 msgid "Acceptance Letter"
 msgstr "Acceptance Letter"
 
-#: waeup/kofa/students/viewlets.py:725
-#: waeup/kofa/students/viewlets.py:736
+#: waeup/kofa/students/viewlets.py:749
+#: waeup/kofa/students/viewlets.py:760
 msgid "Acceptance Letter Scan"
 msgstr "Acceptance Letter Scan"
 
-#: waeup/kofa/students/viewlets.py:85
+#: waeup/kofa/students/viewlets.py:88
 msgid "Application Slip"
 msgstr "Antrag"
 
-#: waeup/kofa/students/vocabularies.py:117
+#: waeup/kofa/students/vocabularies.py:116
 msgid "male"
 msgstr "männlich"
 
-#: waeup/kofa/students/vocabularies.py:119
+#: waeup/kofa/students/vocabularies.py:118
 msgid "female"
 msgstr "weiblich"
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:77
+#: waeup/kofa/students/vocabularies.py:76
 msgid "Error: level id ${value} out of range"
 msgstr "Fehler: level_id ${value} nicht verfügbar"
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:88
+#: waeup/kofa/students/vocabularies.py:87
 msgid "${title} 2nd spillover"
 msgstr "${title} / 2. Nachholen"
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:91
+#: waeup/kofa/students/vocabularies.py:90
 msgid "${title} 3rd spillover"
 msgstr "${title} / 3. Nachholen"
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:94
+#: waeup/kofa/students/vocabularies.py:93
 msgid "${title} 1st spillover"
 msgstr "${title} / 1. Nachholen"
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:96
+#: waeup/kofa/students/vocabularies.py:95
 msgid "${title} on 1st probation"
 msgstr "${title} / 1. Wiederholung"
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:98
+#: waeup/kofa/students/vocabularies.py:97
 msgid "${title} on 2nd probation"
 msgstr "${title} / 2. Wiederholung"
@@ -3701,6 +3769,7 @@
 
 #: waeup/kofa/students/workflow.py:108
-msgid "Student record reset to 'returning'"
-msgstr "Student zurückgesetzt auf 'rückgemeldet'"
+#: waeup/kofa/students/workflow.py:143
+msgid "Reset to 'returning'"
+msgstr "Auf 'rückgemeldet' zurücksetzen"
 
 #: waeup/kofa/students/workflow.py:114
@@ -3719,6 +3788,6 @@
 #: waeup/kofa/students/workflow.py:122
 #: waeup/kofa/students/workflow.py:136
-msgid "Student record reset to 'paid'"
-msgstr "Student zurückgesetzt auf 'Gebühren bezahlt'"
+msgid "Reset to 'paid'"
+msgstr "Auf 'Gebühren bezahlt' zurücksetzen"
 
 #: waeup/kofa/students/workflow.py:129
@@ -3730,8 +3799,4 @@
 msgstr "Zurückmelden"
 
-#: waeup/kofa/students/workflow.py:143
-msgid "Returned"
-msgstr "zurückgemeldet"
-
 #: waeup/kofa/students/workflow.py:149
 msgid "Reset to validated"
@@ -3739,6 +3804,6 @@
 
 #: waeup/kofa/students/workflow.py:150
-msgid "Student record reset to 'validated'"
-msgstr "Student zurückgesetzt auf 'Kurse validiert'"
+msgid "Reset to 'validated'"
+msgstr "Auf 'Kurse validiert' zurücksetzen"
 
 #: waeup/kofa/students/workflow.py:22
@@ -3759,6 +3824,6 @@
 
 #: waeup/kofa/students/workflow.py:38
-msgid "Student record reset"
-msgstr "Student zurückgesetzt"
+msgid "Reset to initial state"
+msgstr "Auf 'initialisiert' zurücksetzen"
 
 #: waeup/kofa/students/workflow.py:45
@@ -3771,6 +3836,6 @@
 
 #: waeup/kofa/students/workflow.py:52
-msgid "Student record reset to 'admitted'"
-msgstr "Student zurückgesetzt auf 'zugelassen'"
+msgid "Reset to 'admitted'"
+msgstr "Auf 'zugelassen' zurücksetzen"
 
 #: waeup/kofa/students/workflow.py:59
@@ -3785,6 +3850,6 @@
 #: waeup/kofa/students/workflow.py:66
 #: waeup/kofa/students/workflow.py:80
-msgid "Student record reset to 'clearance'"
-msgstr "Student zurückgesetzt auf 'Einschreibung begonnen'"
+msgid "Reset to 'clearance'"
+msgstr "Auf 'Einschreibung begonnen' zurücksetzen"
 
 #: waeup/kofa/students/workflow.py:73
@@ -3807,6 +3872,6 @@
 
 #: waeup/kofa/students/workflow.py:94
-msgid "Student record reset to 'cleared'"
-msgstr "Student zurückgesetzt auf 'eingeschrieben'"
+msgid "Reset to 'cleared'"
+msgstr "Auf 'eingeschrieben' zurücksetzen"
 
 #: waeup/kofa/university/export.py:102
@@ -3942,4 +4007,8 @@
 msgstr "8. Studienjahr"
 
+#: waeup/kofa/university/vocabularies.py:38
+msgid "900 (Year 9)"
+msgstr "9. Studienjahr"
+
 #: waeup/kofa/utils/countries.py:10
 msgid "Albania"
@@ -4247,5 +4316,5 @@
 
 #: waeup/kofa/utils/countries.py:169
-#: waeup/kofa/utils/utils.py:47
+#: waeup/kofa/utils/utils.py:48
 msgid "Nigeria"
 msgstr "Nigeria"
@@ -4900,5 +4969,5 @@
 
 #: waeup/kofa/utils/countries.py:90
-#: waeup/kofa/utils/utils.py:46
+#: waeup/kofa/utils/utils.py:47
 msgid "Germany"
 msgstr "Deutschland"
@@ -4940,5 +5009,5 @@
 msgstr "Guernsey"
 
-#: waeup/kofa/utils/utils.py:149
+#: waeup/kofa/utils/utils.py:151
 msgid ""
 "Fullname: ${a}\n"
@@ -4956,5 +5025,5 @@
 "${e}\n"
 
-#: waeup/kofa/utils/utils.py:194
+#: waeup/kofa/utils/utils.py:201
 msgid ""
 "Dear ${a},\n"
@@ -4994,17 +5063,17 @@
 "${c}\n"
 
-#: waeup/kofa/utils/utils.py:48
+#: waeup/kofa/utils/utils.py:49
 msgid "U.S."
 msgstr "USA"
 
-#: waeup/kofa/widgets/phonewidget.py:117
+#: waeup/kofa/widgets/phonewidget.py:118
 msgid "Empty phone field(s)."
 msgstr "Leere Feld."
 
-#: waeup/kofa/widgets/phonewidget.py:121
+#: waeup/kofa/widgets/phonewidget.py:122
 msgid "Int. prefix requires format '+NNN'"
 msgstr "Internationale Vorwahl erwartet: '+NNN'"
 
-#: waeup/kofa/widgets/phonewidget.py:127
+#: waeup/kofa/widgets/phonewidget.py:130
 msgid "Phone numbers may contain numbers only."
 msgstr "Telefonnummern dürfen nur Nummern enthalten."
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 8196)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/en/LC_MESSAGES/waeup.kofa.po	(revision 8197)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Mon Mar 26 11:33:10 2012\n"
+"POT-Creation-Date: Tue Apr 17 16:18:24 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -28,8 +28,8 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: waeup/kofa/accesscodes/browser.py:100 waeup/kofa/accesscodes/browser.py:113
-#: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:129
-#: waeup/kofa/applicants/browser.py:181 waeup/kofa/applicants/browser.py:252
-#: waeup/kofa/applicants/browser.py:253 waeup/kofa/applicants/browser.py:336
+#: waeup/kofa/accesscodes/browser.py:101 waeup/kofa/accesscodes/browser.py:114
+#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:131
+#: waeup/kofa/applicants/browser.py:180 waeup/kofa/applicants/browser.py:249
+#: waeup/kofa/applicants/browser.py:250 waeup/kofa/applicants/browser.py:331
 #: waeup/kofa/browser/pages.py:507 waeup/kofa/browser/pages.py:712
 #: waeup/kofa/browser/pages.py:739 waeup/kofa/browser/pages.py:762
@@ -45,144 +45,144 @@
 #: waeup/kofa/browser/pages.py:1814 waeup/kofa/browser/pages.py:1816
 #: waeup/kofa/browser/pages.py:1851 waeup/kofa/browser/pages.py:1902
-#: waeup/kofa/browser/pages.py:1954 waeup/kofa/students/browser.py:589
-#: waeup/kofa/students/browser.py:590 waeup/kofa/students/browser.py:751
-#: waeup/kofa/students/browser.py:753 waeup/kofa/students/browser.py:893
+#: waeup/kofa/browser/pages.py:1954 waeup/kofa/students/browser.py:623
+#: waeup/kofa/students/browser.py:624 waeup/kofa/students/browser.py:807
+#: waeup/kofa/students/browser.py:809 waeup/kofa/students/browser.py:950
 msgid "Cancel"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:102
+#: waeup/kofa/accesscodes/browser.py:103
 msgid "Batch creation cancelled."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:112
+#: waeup/kofa/accesscodes/browser.py:113
 msgid "Reimport"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:115
+#: waeup/kofa/accesscodes/browser.py:116
 msgid "Reimport Access Code Batches"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:120
+#: waeup/kofa/accesscodes/browser.py:121
 msgid "Reimport cancelled."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:126
+#: waeup/kofa/accesscodes/browser.py:127
 msgid "No file chosen. Action cancelled."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:136
+#: waeup/kofa/accesscodes/browser.py:137
 msgid "This batch already exists: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:139
+#: waeup/kofa/accesscodes/browser.py:140
 msgid "Successfully reimported: ${a}"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:152
+#: waeup/kofa/accesscodes/browser.py:153
 msgid "Search and Manage Access Codes"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:596
+#: waeup/kofa/accesscodes/browser.py:154 waeup/kofa/browser/pages.py:596
 #: waeup/kofa/browser/pages.py:1146 waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:169 waeup/kofa/students/browser.py:203
+#: waeup/kofa/students/browser.py:171 waeup/kofa/students/browser.py:209
 msgid "Search"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:154
+#: waeup/kofa/accesscodes/browser.py:155
 msgid "Disable ACs"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:155
+#: waeup/kofa/accesscodes/browser.py:156
 msgid "Enable ACs"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:180 waeup/kofa/accesscodes/workflow.py:39
+#: waeup/kofa/accesscodes/browser.py:181 waeup/kofa/accesscodes/workflow.py:39
 msgid "disabled"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:182
+#: waeup/kofa/accesscodes/browser.py:183
 msgid "${a} disabled."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:186
+#: waeup/kofa/accesscodes/browser.py:187
 msgid "${a}: Disable transition not allowed."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:190
+#: waeup/kofa/accesscodes/browser.py:191
 msgid "re-enabled"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:192
+#: waeup/kofa/accesscodes/browser.py:193
 msgid "${a} (re-)enabled."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:196
+#: waeup/kofa/accesscodes/browser.py:197
 msgid "${a}: Re-enable transition not allowed."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:235
+#: waeup/kofa/accesscodes/browser.py:236
 msgid "Add Access Code Batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:244
+#: waeup/kofa/accesscodes/browser.py:245
 msgid "Reimport Access Code Batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:252
+#: waeup/kofa/accesscodes/browser.py:253
 msgid "Search Access Codes"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:261
+#: waeup/kofa/accesscodes/browser.py:262
 msgid "Access Codes"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:43
+#: waeup/kofa/accesscodes/browser.py:44
 msgid "Archive"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:44
+#: waeup/kofa/accesscodes/browser.py:45
 msgid "Archive and delete"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:46 waeup/kofa/accesscodes/browser.py:206
-#: waeup/kofa/accesscodes/browser.py:226
+#: waeup/kofa/accesscodes/browser.py:47 waeup/kofa/accesscodes/browser.py:207
+#: waeup/kofa/accesscodes/browser.py:227
 msgid "Access Code Batches"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:53
+#: waeup/kofa/accesscodes/browser.py:54
 msgid "No batch selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:61
+#: waeup/kofa/accesscodes/browser.py:62
 msgid "Archived ${a} (${b})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:68
+#: waeup/kofa/accesscodes/browser.py:69
 msgid "Deleted batch ${a}"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:77
+#: waeup/kofa/accesscodes/browser.py:78
 msgid "Create Access Code Batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:83
+#: waeup/kofa/accesscodes/browser.py:84
 msgid "Create batch"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:91
+#: waeup/kofa/accesscodes/browser.py:92
 msgid "Batch created (${a} entries)"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:93
+#: waeup/kofa/accesscodes/browser.py:94
 msgid "Data written to ${a}"
 msgstr ""
@@ -342,15 +342,15 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:116 waeup/kofa/applicants/browser.py:323
-#: waeup/kofa/applicants/browser.py:744
+#: waeup/kofa/applicants/browser.py:118 waeup/kofa/applicants/browser.py:318
+#: waeup/kofa/applicants/browser.py:714
 msgid "Could not delete:"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:119 waeup/kofa/applicants/browser.py:326
-#: waeup/kofa/applicants/browser.py:747 waeup/kofa/browser/pages.py:137
-#: waeup/kofa/students/browser.py:241 waeup/kofa/students/browser.py:647
-#: waeup/kofa/students/browser.py:801 waeup/kofa/students/browser.py:979
-#: waeup/kofa/students/browser.py:1189 waeup/kofa/students/browser.py:1776
+#: waeup/kofa/applicants/browser.py:121 waeup/kofa/applicants/browser.py:321
+#: waeup/kofa/applicants/browser.py:717 waeup/kofa/browser/pages.py:136
+#: waeup/kofa/students/browser.py:253 waeup/kofa/students/browser.py:687
+#: waeup/kofa/students/browser.py:857 waeup/kofa/students/browser.py:1036
+#: waeup/kofa/students/browser.py:1251 waeup/kofa/students/browser.py:1841
 msgid "Successfully removed: ${a}"
 msgstr ""
@@ -362,9 +362,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:177
+#: waeup/kofa/applicants/browser.py:176
 msgid "Added:"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:189 waeup/kofa/applicants/export.py:78
+#: waeup/kofa/applicants/browser.py:188 waeup/kofa/applicants/export.py:76
 #: waeup/kofa/applicants/viewlets.py:44
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:12
@@ -373,8 +373,8 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:252 waeup/kofa/applicants/browser.py:299
-#: waeup/kofa/applicants/browser.py:653 waeup/kofa/applicants/browser.py:687
-#: waeup/kofa/applicants/browser.py:790 waeup/kofa/applicants/browser.py:793
-#: waeup/kofa/applicants/browser.py:837 waeup/kofa/browser/pages.py:480
+#: waeup/kofa/applicants/browser.py:249 waeup/kofa/applicants/browser.py:294
+#: waeup/kofa/applicants/browser.py:619 waeup/kofa/applicants/browser.py:657
+#: waeup/kofa/applicants/browser.py:759 waeup/kofa/applicants/browser.py:762
+#: waeup/kofa/applicants/browser.py:806 waeup/kofa/browser/pages.py:480
 #: waeup/kofa/browser/pages.py:635 waeup/kofa/browser/pages.py:658
 #: waeup/kofa/browser/pages.py:732 waeup/kofa/browser/pages.py:1185
@@ -384,156 +384,168 @@
 #: waeup/kofa/browser/pages.py:1835 waeup/kofa/hostels/browser.py:209
 #: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:318
-#: waeup/kofa/students/browser.py:358 waeup/kofa/students/browser.py:463
-#: waeup/kofa/students/browser.py:540 waeup/kofa/students/browser.py:589
-#: waeup/kofa/students/browser.py:605 waeup/kofa/students/browser.py:751
-#: waeup/kofa/students/browser.py:776 waeup/kofa/students/browser.py:1450
-#: waeup/kofa/students/browser.py:1465 waeup/kofa/students/browser.py:1580
+#: waeup/kofa/students/browser.py:369 waeup/kofa/students/browser.py:497
+#: waeup/kofa/students/browser.py:574 waeup/kofa/students/browser.py:623
+#: waeup/kofa/students/browser.py:639 waeup/kofa/students/browser.py:807
+#: waeup/kofa/students/browser.py:832 waeup/kofa/students/browser.py:1509
+#: waeup/kofa/students/browser.py:1524 waeup/kofa/students/browser.py:1645
 msgid "Save"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:253 waeup/kofa/applicants/browser.py:331
-#: waeup/kofa/applicants/browser.py:360
+#: waeup/kofa/applicants/browser.py:250 waeup/kofa/applicants/browser.py:326
+#: waeup/kofa/applicants/browser.py:354
 msgid "Add applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:263 waeup/kofa/applicants/viewlets.py:95
+#: waeup/kofa/applicants/browser.py:258 waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:303 waeup/kofa/applicants/browser.py:716
+#: waeup/kofa/applicants/browser.py:298 waeup/kofa/applicants/browser.py:686
 #: waeup/kofa/browser/pages.py:1444 waeup/kofa/browser/pages.py:1766
 #: waeup/kofa/browser/pages.py:1838 waeup/kofa/browser/pages.py:1950
-#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:82
-#: waeup/kofa/students/browser.py:384
+#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:84
+#: waeup/kofa/students/browser.py:395
 msgid "Form has been saved."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:312
+#: waeup/kofa/applicants/browser.py:307
 msgid "No applicant selected!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:363
+#: waeup/kofa/applicants/browser.py:357
 msgid "Create application record"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:368
+#: waeup/kofa/applicants/browser.py:362
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:381
+#: waeup/kofa/applicants/browser.py:376
 msgid "Applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:396 waeup/kofa/students/browser.py:283
+#: waeup/kofa/applicants/browser.py:395 waeup/kofa/students/browser.py:295
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:397 waeup/kofa/students/browser.py:284
+#: waeup/kofa/applicants/browser.py:396 waeup/kofa/students/browser.py:296
 msgid "unset"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:402
-msgid "${a} Application Record ${b}"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:453
+#: waeup/kofa/applicants/browser.py:401
+msgid "${a} <br /> Application Record ${b}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:452
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:460 waeup/kofa/students/browser.py:1028
+#: waeup/kofa/applicants/browser.py:459 waeup/kofa/students/browser.py:1091
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:473 waeup/kofa/students/browser.py:1042
+#: waeup/kofa/applicants/browser.py:472 waeup/kofa/students/browser.py:1105
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:500 waeup/kofa/students/browser.py:1061
+#: waeup/kofa/applicants/browser.py:499 waeup/kofa/students/browser.py:1124
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:528 waeup/kofa/students/browser.py:1110
+#: waeup/kofa/applicants/browser.py:527 waeup/kofa/students/browser.py:1172
 msgid "Valid callback received."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:549
+#: waeup/kofa/applicants/browser.py:548
 msgid "Payment Data"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:555
+#: waeup/kofa/applicants/browser.py:554
 msgid "Online Payment Receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:561
+#: waeup/kofa/applicants/browser.py:560
 msgid "Ticket not yet paid."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:626
+#: waeup/kofa/applicants/browser.py:594
 msgid "Uploaded image is too big!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:63
+#: waeup/kofa/applicants/browser.py:599
+msgid "jpg file extension expected."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:619 waeup/kofa/applicants/browser.py:762
+#: waeup/kofa/applicants/browser.py:814
+msgid "Final Submit"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:620 waeup/kofa/applicants/browser.py:727
+#: waeup/kofa/applicants/browser.py:760 waeup/kofa/applicants/browser.py:795
+#: waeup/kofa/students/browser.py:1042
+msgid "Add online payment ticket"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:620 waeup/kofa/applicants/browser.py:732
+#: waeup/kofa/applicants/browser.py:760 waeup/kofa/applicants/browser.py:763
+#: waeup/kofa/applicants/browser.py:800 waeup/kofa/students/browser.py:809
+#: waeup/kofa/students/browser.py:841 waeup/kofa/students/browser.py:1018
+#: waeup/kofa/students/browser.py:1823
+msgid "Remove selected tickets"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/applicants/browser.py:643
+msgid "${a} <br /> Application Form ${b}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:65
 msgid "Application Section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:631
-msgid "jpg file extension expected."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:653 waeup/kofa/applicants/browser.py:793
-#: waeup/kofa/applicants/browser.py:845
-msgid "Final Submit"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:757
-#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:826
-#: waeup/kofa/students/browser.py:985
-msgid "Add online payment ticket"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:762
-#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:831 waeup/kofa/students/browser.py:753
-#: waeup/kofa/students/browser.py:785 waeup/kofa/students/browser.py:961
-#: waeup/kofa/students/browser.py:1758
-msgid "Remove selected tickets"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/applicants/browser.py:673
-msgid "${a} Application Form ${b}"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:684 waeup/kofa/students/browser.py:355
+#: waeup/kofa/applicants/browser.py:654 waeup/kofa/students/browser.py:366
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:731 waeup/kofa/students/browser.py:967
+#: waeup/kofa/applicants/browser.py:701 waeup/kofa/students/browser.py:1024
 msgid "No payment selected."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:75 waeup/kofa/applicants/viewlets.py:88
+#: waeup/kofa/applicants/browser.py:77 waeup/kofa/applicants/viewlets.py:88
 msgid "Manage application section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:78 waeup/kofa/applicants/browser.py:104
-#: waeup/kofa/applicants/browser.py:253 waeup/kofa/applicants/browser.py:306
+#: waeup/kofa/applicants/browser.py:773 waeup/kofa/students/browser.py:92
+msgid "The requested form is locked (read-only)."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:787
+msgid "No passport picture uploaded."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:789
+msgid "Passport picture confirmation box not ticked."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:106
+#: waeup/kofa/applicants/browser.py:250 waeup/kofa/applicants/browser.py:301
 #: waeup/kofa/browser/pages.py:638 waeup/kofa/browser/pages.py:679
 #: waeup/kofa/browser/pages.py:1324 waeup/kofa/browser/pages.py:1335
 #: waeup/kofa/browser/pages.py:1401 waeup/kofa/browser/pages.py:1436
-#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:204
-#: waeup/kofa/students/browser.py:1156 waeup/kofa/students/browser.py:1169
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:210
+#: waeup/kofa/students/browser.py:1218 waeup/kofa/students/browser.py:1231
 msgid "Remove selected"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:78 waeup/kofa/applicants/browser.py:124
-#: waeup/kofa/applicants/browser.py:147 waeup/kofa/applicants/browser.py:159
+#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:126
+#: waeup/kofa/applicants/browser.py:149 waeup/kofa/applicants/browser.py:159
 msgid "Add applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:138
-#: waeup/kofa/applicants/browser.py:254 waeup/kofa/applicants/browser.py:345
+#: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:140
+#: waeup/kofa/applicants/browser.py:251 waeup/kofa/applicants/browser.py:340
 #: waeup/kofa/browser/pages.py:1402 waeup/kofa/browser/pages.py:1461
 #: waeup/kofa/browser/pages.py:1571 waeup/kofa/browser/pages.py:1657
@@ -542,10 +554,10 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:804 waeup/kofa/students/browser.py:90
-msgid "The requested form is locked (read-only)."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:134
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:341
+#: waeup/kofa/applicants/browser.py:826 waeup/kofa/students/browser.py:1690
+msgid "This form cannot be submitted. Wrong state!"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:83 waeup/kofa/applicants/browser.py:136
+#: waeup/kofa/applicants/browser.py:252 waeup/kofa/applicants/browser.py:336
 #: waeup/kofa/browser/pages.py:1403 waeup/kofa/browser/pages.py:1457
 #: waeup/kofa/browser/pages.py:1572 waeup/kofa/browser/pages.py:1653
@@ -554,62 +566,66 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:818
-msgid "No passport picture uploaded."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:82
+#: waeup/kofa/applicants/browser.py:831
+msgid "Form has been submitted."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:84
 msgid "Applicants Containers"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:820
-msgid "Passport picture confirmation box not ticked."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:857 waeup/kofa/students/browser.py:1625
-msgid "This form cannot be submitted. Wrong state!"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:862
-msgid "Form has been submitted."
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/applicants/browser.py:897
-msgid "Register for ${a} Application"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:903
+#. Default: ""
+#: waeup/kofa/applicants/browser.py:874
+msgid "Apply for ${a}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:880
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:908
+#: waeup/kofa/applicants/browser.py:885
 msgid "Application has ended."
 msgstr ""
 
+#: waeup/kofa/applicants/browser.py:894
+msgid "Get login credentials"
+msgstr ""
+
 #: waeup/kofa/applicants/browser.py:917
-msgid "Get login credentials"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:932
+msgid "An error occurred."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:923 waeup/kofa/applicants/browser.py:934
+msgid "No application record found."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:926
+msgid "Your password has already been set. Please proceed to the login page."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:944
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:939
+#: waeup/kofa/applicants/browser.py:951
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:948
+#: waeup/kofa/applicants/browser.py:960
 msgid "Your registration was successful."
 msgstr ""
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:18
-msgid "Photograph"
-msgstr ""
-
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:43
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:17
+msgid "Admitted Course of Study:"
+msgstr ""
+
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:19
+msgid "Passport Photo:"
+msgstr ""
+
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:44
 msgid "Application Transition:"
 msgstr ""
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:59
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:60
 msgid ""
 "I confirm that the Passport Photograph uploaded on this form is a true "
@@ -617,6 +633,6 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:74
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:43
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:76
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:34
 msgid "Acceptance Fee Payment Tickets"
 msgstr ""
@@ -640,4 +656,10 @@
 msgstr ""
 
+#: waeup/kofa/applicants/browser_templates/applicantregister.pt:22
+msgid ""
+"Your application record will be looked up and an email with your login "
+"credentials will be sent to the address provided."
+msgstr ""
+
 #: waeup/kofa/applicants/browser_templates/applicantregister.pt:8
 msgid "Please solve the captcha<br />to prevent misuse of this service:"
@@ -665,17 +687,17 @@
 msgstr ""
 
-#: waeup/kofa/applicants/container.py:52
-msgid "Basic"
-msgstr ""
-
-#: waeup/kofa/applicants/container.py:55
-msgid "handles basic applicants"
-msgstr ""
-
 #: waeup/kofa/applicants/export.py:40
 msgid "Basic Applicants Containers"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:198 waeup/kofa/students/browser.py:718
+#: waeup/kofa/applicants/interfaces.py:138
+msgid "Create Application Records"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:139
+msgid "Update Application Records"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:159 waeup/kofa/students/browser.py:773
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -701,5 +723,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:205 waeup/kofa/students/browser.py:719
+#: waeup/kofa/applicants/interfaces.py:165 waeup/kofa/students/browser.py:774
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -720,126 +742,122 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:212
-#: waeup/kofa/applicants/interfaces.py:322
+#: waeup/kofa/applicants/interfaces.py:171
+#: waeup/kofa/applicants/interfaces.py:275
 msgid "Application Target"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:220
+#: waeup/kofa/applicants/interfaces.py:178
+#: waeup/kofa/applicants/interfaces.py:282
+msgid "Year of Entrance"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:185
+msgid "Application Mode"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:191
 msgid "Entry Level"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:227
-#: waeup/kofa/applicants/interfaces.py:330
-msgid "Year of Entrance"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:235
-#: waeup/kofa/applicants/interfaces.py:338
-msgid "Applicants Container Type"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:251
+#: waeup/kofa/applicants/interfaces.py:205
 msgid "Category for the grouping of certificates"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:258
+#: waeup/kofa/applicants/interfaces.py:211
 msgid "Human readable description in reST format"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:271
+#: waeup/kofa/applicants/interfaces.py:224
 msgid "Application Start Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:277
+#: waeup/kofa/applicants/interfaces.py:230
 msgid "Application Closing Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:283
+#: waeup/kofa/applicants/interfaces.py:236
 msgid "Forbid additions after deadline (enddate)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:366
+#: waeup/kofa/applicants/interfaces.py:315
 msgid "Applicant Id"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:371
-msgid "JAMB Registration Number"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:383
-#: waeup/kofa/students/interfaces.py:162
+#: waeup/kofa/applicants/interfaces.py:320
+#: waeup/kofa/students/interfaces.py:184 waeup/kofa/students/interfaces.py:271
+#: waeup/kofa/students/interfaces.py:518
+msgid "Registration Number"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:331
+#: waeup/kofa/applicants/interfaces.py:499
+#: waeup/kofa/students/interfaces.py:163
 msgid "First Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:387
-#: waeup/kofa/students/interfaces.py:167
+#: waeup/kofa/applicants/interfaces.py:335
+#: waeup/kofa/students/interfaces.py:168
 msgid "Middle Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:391
-#: waeup/kofa/students/interfaces.py:172
+#: waeup/kofa/applicants/interfaces.py:339
+#: waeup/kofa/students/interfaces.py:173
 msgid "Last Name (Surname)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:395
-#: waeup/kofa/students/interfaces.py:218
+#: waeup/kofa/applicants/interfaces.py:343
+#: waeup/kofa/students/interfaces.py:219
 msgid "Date of Birth"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:400
-msgid "State/LGA"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:405
-#: waeup/kofa/students/interfaces.py:177
+#: waeup/kofa/applicants/interfaces.py:349
+#: waeup/kofa/students/interfaces.py:178
 msgid "Sex"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:411 waeup/kofa/interfaces.py:392
-#: waeup/kofa/interfaces.py:418 waeup/kofa/students/interfaces.py:504
+#: waeup/kofa/applicants/interfaces.py:354
+#: waeup/kofa/applicants/interfaces.py:437
+#: waeup/kofa/applicants/interfaces.py:504 waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:419 waeup/kofa/students/interfaces.py:524
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:416 waeup/kofa/interfaces.py:397
-#: waeup/kofa/interfaces.py:425 waeup/kofa/students/interfaces.py:208
+#: waeup/kofa/applicants/interfaces.py:359 waeup/kofa/interfaces.py:398
+#: waeup/kofa/interfaces.py:426 waeup/kofa/students/interfaces.py:209
 msgid "Phone"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:421
-#: waeup/kofa/applicants/interfaces.py:507
+#: waeup/kofa/applicants/interfaces.py:364
+#: waeup/kofa/applicants/interfaces.py:442
 msgid "1st Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:426
-#: waeup/kofa/applicants/interfaces.py:512
+#: waeup/kofa/applicants/interfaces.py:369
+#: waeup/kofa/applicants/interfaces.py:447
 msgid "2nd Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:431
-msgid "School Grades"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:441
-#: waeup/kofa/applicants/interfaces.py:517
+#: waeup/kofa/applicants/interfaces.py:381
+#: waeup/kofa/applicants/interfaces.py:468
+msgid "Notice"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:385
+#: waeup/kofa/applicants/interfaces.py:457
+msgid "Screening Venue"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:389
+#: waeup/kofa/applicants/interfaces.py:452
 msgid "Screening Score"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:445
-#: waeup/kofa/applicants/interfaces.py:522
-msgid "Screening Venue"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:449
-#: waeup/kofa/applicants/interfaces.py:527
+#: waeup/kofa/applicants/interfaces.py:393
+#: waeup/kofa/applicants/interfaces.py:462
 msgid "Admitted Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:455
-#: waeup/kofa/applicants/interfaces.py:534
-msgid "Notice"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:477
-#: waeup/kofa/students/interfaces.py:157
+#: waeup/kofa/applicants/interfaces.py:398
+#: waeup/kofa/students/interfaces.py:158
 #: waeup/kofa/browser/templates/showstudentspage.pt:4
 #: waeup/kofa/students/browser_templates/containerpage.pt:29
@@ -848,43 +866,34 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:482
+#: waeup/kofa/applicants/interfaces.py:403
 msgid "Form locked"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:561
-#: waeup/kofa/students/interfaces.py:484
+#: waeup/kofa/applicants/interfaces.py:514
+#: waeup/kofa/students/interfaces.py:504
 msgid "Payment Session"
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:110
-#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:23
-#: waeup/kofa/students/browser_templates/studycoursepage.pt:28
-msgid "Department:"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:121
-#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:15
-#: waeup/kofa/students/browser_templates/studycoursepage.pt:39
-msgid "Faculty:"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:186
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:26
-msgid "Admitted Course of Study:"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/applicants/pdf.py:204
+#: waeup/kofa/applicants/pdf.py:50
+msgid "Application Record"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/applicants/pdf.py:84
 msgid ""
-"<font size=10>Proceed to the login page of the portal and enter your new "
-"credentials: user name= ${a}, password = ${b}.</font>"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:210
-msgid "<font size=10>Change your password when you have  logged in.</font>"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:57
-msgid "Application Record"
+"Proceed to the login page of the portal and enter your new credentials: user "
+"name= ${a}, password = ${b}."
+msgstr ""
+
+#: waeup/kofa/applicants/pdf.py:91
+msgid "Change your password when you have logged in."
+msgstr ""
+
+#: waeup/kofa/applicants/utils.py:35
+msgid "Desired Study Courses"
+msgstr ""
+
+#: waeup/kofa/applicants/utils.py:36
+msgid "Process Data"
 msgstr ""
 
@@ -910,13 +919,13 @@
 
 #: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:256
+#: waeup/kofa/students/browser.py:268
 msgid "Create student record"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:168 waeup/kofa/students/viewlets.py:300
+#: waeup/kofa/applicants/viewlets.py:168 waeup/kofa/students/viewlets.py:321
 msgid "Download payment receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:183 waeup/kofa/students/viewlets.py:315
+#: waeup/kofa/applicants/viewlets.py:183 waeup/kofa/students/viewlets.py:336
 msgid "Request callback"
 msgstr ""
@@ -926,9 +935,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:73 waeup/kofa/students/viewlets.py:512
+#: waeup/kofa/applicants/viewlets.py:73 waeup/kofa/students/viewlets.py:535
 msgid "My Data"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:100 waeup/kofa/students/batching.py:141
+#: waeup/kofa/applicants/workflow.py:100 waeup/kofa/students/batching.py:142
 #: waeup/kofa/students/workflow.py:25
 msgid "Student record created"
@@ -962,5 +971,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:41 waeup/kofa/interfaces.py:72
+#: waeup/kofa/applicants/workflow.py:41 waeup/kofa/interfaces.py:73
 msgid "admitted"
 msgstr ""
@@ -970,5 +979,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:43 waeup/kofa/interfaces.py:71
+#: waeup/kofa/applicants/workflow.py:43 waeup/kofa/interfaces.py:72
 msgid "created"
 msgstr ""
@@ -1030,5 +1039,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:312
+#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:311
 msgid "Administration"
 msgstr ""
@@ -1039,5 +1048,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:389
+#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:388
 #: waeup/kofa/browser/viewlets.py:375 waeup/kofa/browser/viewlets.py:685
 msgid "Portal Users"
@@ -1059,5 +1068,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:106
+#: waeup/kofa/browser/pages.py:105
 msgid "Local role successfully removed: ${a}"
 msgstr ""
@@ -1097,11 +1106,11 @@
 msgstr ""
 
+#: waeup/kofa/browser/pages.py:115 waeup/kofa/hostels/browser.py:256
+#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:240
+msgid "No item selected."
+msgstr ""
+
 #: waeup/kofa/browser/pages.py:1155
 msgid "Log files can only be searched on Unix-based operating systems."
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:116 waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:228
-msgid "No item selected."
 msgstr ""
 
@@ -1185,12 +1194,12 @@
 
 #: waeup/kofa/browser/pages.py:1532 waeup/kofa/browser/pages.py:1551
-#: waeup/kofa/students/browser.py:98 waeup/kofa/students/export.py:22
-#: waeup/kofa/students/viewlets.py:472
+#: waeup/kofa/students/browser.py:100 waeup/kofa/students/export.py:40
+#: waeup/kofa/students/viewlets.py:495
 msgid "Students"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:155 waeup/kofa/browser/viewlets.py:322
-#: waeup/kofa/browser/templates/staffsitelayout.pt:28
-#: waeup/kofa/browser/templates/studentsitelayout.pt:33
+#: waeup/kofa/browser/pages.py:154 waeup/kofa/browser/viewlets.py:322
+#: waeup/kofa/browser/templates/staffsitelayout.pt:27
+#: waeup/kofa/browser/templates/studentsitelayout.pt:32
 msgid "Login"
 msgstr ""
@@ -1218,5 +1227,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:163
+#: waeup/kofa/browser/pages.py:162
 msgid "You logged in."
 msgstr ""
@@ -1244,10 +1253,10 @@
 msgstr ""
 
+#: waeup/kofa/browser/pages.py:180
+msgid "You entered wrong credentials."
+msgstr ""
+
 #: waeup/kofa/browser/pages.py:1808
 msgid "Edit certificate"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:181
-msgid "You entered wrong credentials."
 msgstr ""
 
@@ -1282,42 +1291,42 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:195
+#: waeup/kofa/browser/pages.py:194
 msgid "You have been logged out. Thanks for using WAeUP Kofa!"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:231
+#: waeup/kofa/browser/pages.py:230
 msgid "Contact ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:237 waeup/kofa/browser/pages.py:523
+#: waeup/kofa/browser/pages.py:236 waeup/kofa/browser/pages.py:523
 msgid "Send message now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:256 waeup/kofa/browser/pages.py:275
-#: waeup/kofa/browser/pages.py:540 waeup/kofa/students/browser.py:318
+#: waeup/kofa/browser/pages.py:255 waeup/kofa/browser/pages.py:274
+#: waeup/kofa/browser/pages.py:540 waeup/kofa/students/browser.py:330
 msgid "Your message has been sent."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:266
+#: waeup/kofa/browser/pages.py:265
 msgid "Send now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:277
+#: waeup/kofa/browser/pages.py:276
 msgid "A smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:302
+#: waeup/kofa/browser/pages.py:301
 msgid "<h1>Welcome to WAeUP.Kofa</h1>"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:390 waeup/kofa/hostels/browser.py:195
-#: waeup/kofa/students/viewlets.py:163 waeup/kofa/students/viewlets.py:171
-#: waeup/kofa/students/viewlets.py:226 waeup/kofa/students/viewlets.py:243
-#: waeup/kofa/students/viewlets.py:283
+#: waeup/kofa/browser/pages.py:389 waeup/kofa/hostels/browser.py:195
+#: waeup/kofa/students/viewlets.py:166 waeup/kofa/students/viewlets.py:174
+#: waeup/kofa/students/viewlets.py:247 waeup/kofa/students/viewlets.py:255
+#: waeup/kofa/students/viewlets.py:304
 msgid "Manage"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:391 waeup/kofa/browser/viewlets.py:180
+#: waeup/kofa/browser/pages.py:390 waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
 msgstr ""
@@ -1328,5 +1337,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:430 waeup/kofa/browser/pages.py:432
+#: waeup/kofa/browser/pages.py:431 waeup/kofa/browser/pages.py:433
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
@@ -1334,5 +1343,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:454
+#: waeup/kofa/browser/pages.py:455
 msgid "User account ${a} successfully added."
 msgstr ""
@@ -1348,5 +1357,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:521 waeup/kofa/students/browser.py:299
+#: waeup/kofa/browser/pages.py:521 waeup/kofa/students/browser.py:311
 msgid "Send message to ${a}"
 msgstr ""
@@ -1433,5 +1442,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:86
+#: waeup/kofa/browser/pages.py:85
 msgid "No local role selected."
 msgstr ""
@@ -1463,4 +1472,14 @@
 #: waeup/kofa/browser/pages.py:963
 msgid "Perform import"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/browser/pdf.py:127
+msgid "${footer_text} Page ${num1} of ${num2}"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/browser/pdf.py:336
+msgid "Date: ${a}"
 msgstr ""
 
@@ -1644,4 +1663,8 @@
 #: waeup/kofa/browser/templates/datacenterpage.pt:16
 msgid "Upload Date"
+msgstr ""
+
+#: waeup/kofa/browser/templates/default_waeup_display_form.pt:6
+msgid "Uploaded Files"
 msgstr ""
 
@@ -1683,15 +1706,20 @@
 
 #: waeup/kofa/browser/templates/facultypage.pt:1
-#: waeup/kofa/hostels/browser_templates/containerpage.pt:1
-msgid "There no subobjects registered yet."
+msgid "There are no subobjects registered yet."
+msgstr ""
+
+#: waeup/kofa/browser/templates/fileupload.pt:26
+#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:26
+msgid "Max. file size:"
 msgstr ""
 
 #: waeup/kofa/browser/templates/loginpage.pt:13
-#: waeup/kofa/browser/templates/usereditformpage.pt:8
+#: waeup/kofa/browser/templates/usereditformpage.pt:9
 #: waeup/kofa/students/browser_templates/basepage.pt:14
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:17
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:18
 #: waeup/kofa/students/browser_templates/change_password.pt:10
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:31
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:34
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:32
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:25
 msgid "Password:"
 msgstr ""
@@ -1711,5 +1739,5 @@
 msgstr ""
 
-#. Default: "Or simply forgot your student id or password? Then request a new password <strong><a href=\"changepw\"> here</a></strong>."
+#. Default: "Or simply forgot your student id, application id or password? Then request a new password <strong><a href=\"sendpw\"> here</a></strong>."
 #: waeup/kofa/browser/templates/loginpage.pt:44
 msgid "login_trouble3"
@@ -1762,46 +1790,46 @@
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:101
-#: waeup/kofa/browser/templates/studentsitelayout.pt:86
+#: waeup/kofa/browser/templates/staffsitelayout.pt:102
+#: waeup/kofa/browser/templates/studentsitelayout.pt:87
 msgid "Form Status:"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:114
-#: waeup/kofa/browser/templates/studentsitelayout.pt:100
+#: waeup/kofa/browser/templates/staffsitelayout.pt:115
+#: waeup/kofa/browser/templates/studentsitelayout.pt:101
 msgid "Back to top"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:116
-#: waeup/kofa/browser/templates/studentsitelayout.pt:102
+#: waeup/kofa/browser/templates/staffsitelayout.pt:117
+#: waeup/kofa/browser/templates/studentsitelayout.pt:103
 msgid "Kofa - Student Management System"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:119
-#: waeup/kofa/browser/templates/studentsitelayout.pt:105
+#: waeup/kofa/browser/templates/staffsitelayout.pt:120
+#: waeup/kofa/browser/templates/studentsitelayout.pt:106
 msgid "Copyright &copy; WAeUP Group 2008-2012"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:34
-#: waeup/kofa/browser/templates/studentsitelayout.pt:39
+#: waeup/kofa/browser/templates/staffsitelayout.pt:33
+#: waeup/kofa/browser/templates/studentsitelayout.pt:38
 msgid "Contact"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:40
-#: waeup/kofa/browser/templates/studentsitelayout.pt:45
+#: waeup/kofa/browser/templates/staffsitelayout.pt:39
+#: waeup/kofa/browser/templates/studentsitelayout.pt:44
 msgid "Logout"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:60
+#: waeup/kofa/browser/templates/staffsitelayout.pt:61
 msgid "Student Id:"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:64
+#: waeup/kofa/browser/templates/staffsitelayout.pt:65
 msgid "State:"
 msgstr ""
 
-#: waeup/kofa/browser/templates/usereditformpage.pt:14
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:23
+#: waeup/kofa/browser/templates/usereditformpage.pt:15
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:24
 #: waeup/kofa/students/browser_templates/change_password.pt:16
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:37
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:38
 msgid "Retype password:"
 msgstr ""
@@ -1815,5 +1843,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:383 waeup/kofa/students/viewlets.py:155
+#: waeup/kofa/browser/viewlets.py:383 waeup/kofa/students/viewlets.py:158
 msgid "Send email"
 msgstr ""
@@ -1832,5 +1860,5 @@
 
 #: waeup/kofa/browser/viewlets.py:528 waeup/kofa/browser/viewlets.py:536
-msgid "Show batch logs"
+msgid "Show logs"
 msgstr ""
 
@@ -1852,6 +1880,6 @@
 
 #: waeup/kofa/browser/viewlets.py:91 waeup/kofa/browser/viewlets.py:160
-#: waeup/kofa/students/viewlets.py:218 waeup/kofa/students/viewlets.py:356
-#: waeup/kofa/students/viewlets.py:403
+#: waeup/kofa/students/viewlets.py:239 waeup/kofa/students/viewlets.py:379
+#: waeup/kofa/students/viewlets.py:426
 msgid "Edit"
 msgstr ""
@@ -1928,4 +1956,8 @@
 #: waeup/kofa/hostels/browser.py:95
 msgid "Block ${a}, Room ${b}, Bed ${c}"
+msgstr ""
+
+#: waeup/kofa/hostels/browser_templates/containerpage.pt:1
+msgid "There no subobjects registered yet."
 msgstr ""
 
@@ -1952,9 +1984,9 @@
 msgstr ""
 
-#: waeup/kofa/hostels/hostel.py:180
+#: waeup/kofa/hostels/hostel.py:185
 msgid "unreserved"
 msgstr ""
 
-#: waeup/kofa/hostels/hostel.py:187
+#: waeup/kofa/hostels/hostel.py:192
 msgid "reserved"
 msgstr ""
@@ -1988,5 +2020,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/interfaces.py:175 waeup/kofa/students/interfaces.py:445
+#: waeup/kofa/hostels/interfaces.py:175 waeup/kofa/students/interfaces.py:465
 msgid "Bed Type"
 msgstr ""
@@ -2144,41 +2176,41 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:185
+#: waeup/kofa/interfaces.py:186
 msgid "Subject"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:189
+#: waeup/kofa/interfaces.py:190
 msgid "Grade"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:323
+#: waeup/kofa/interfaces.py:324
 msgid "Processor name"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:327
-msgid "Import mode"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:352
+#: waeup/kofa/interfaces.py:328
+msgid "Import Mode"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:353
 msgid "Email Address:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:359
+#: waeup/kofa/interfaces.py:360
 msgid "Email to:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:366
+#: waeup/kofa/interfaces.py:367
 msgid "Subject:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:370
+#: waeup/kofa/interfaces.py:371
 msgid "Full Name:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:374
+#: waeup/kofa/interfaces.py:375
 msgid "Text:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:405
+#: waeup/kofa/interfaces.py:406
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2190,5 +2222,5 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:410
+#: waeup/kofa/interfaces.py:411
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2197,129 +2229,129 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:414
+#: waeup/kofa/interfaces.py:415
 msgid "Description/Notice"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:431
+#: waeup/kofa/interfaces.py:432
 msgid "Portal roles"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:474
+#: waeup/kofa/interfaces.py:477
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:475
+#: waeup/kofa/interfaces.py:478
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:480
+#: waeup/kofa/interfaces.py:483
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:486
+#: waeup/kofa/interfaces.py:489
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:493
+#: waeup/kofa/interfaces.py:496
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:505
+#: waeup/kofa/interfaces.py:508
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:513
+#: waeup/kofa/interfaces.py:516
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:521
+#: waeup/kofa/interfaces.py:524
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:527
+#: waeup/kofa/interfaces.py:530
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:534
+#: waeup/kofa/interfaces.py:537
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:535
+#: waeup/kofa/interfaces.py:538
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:540
+#: waeup/kofa/interfaces.py:543
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:547
+#: waeup/kofa/interfaces.py:550
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:554
+#: waeup/kofa/interfaces.py:557
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:563 waeup/kofa/interfaces.py:621
+#: waeup/kofa/interfaces.py:566 waeup/kofa/interfaces.py:624
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:571 waeup/kofa/payments/interfaces.py:30
+#: waeup/kofa/interfaces.py:574 waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:576
+#: waeup/kofa/interfaces.py:579
 msgid "Surcharge Portal Provider"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:582
+#: waeup/kofa/interfaces.py:585
 msgid "Surcharge Payment Gateway Provider"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:588 waeup/kofa/payments/interfaces.py:120
+#: waeup/kofa/interfaces.py:591 waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:594
+#: waeup/kofa/interfaces.py:597
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:600
+#: waeup/kofa/interfaces.py:603
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:606 waeup/kofa/payments/interfaces.py:36
+#: waeup/kofa/interfaces.py:609 waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:73
+#: waeup/kofa/interfaces.py:74
 msgid "clearance started"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:74
+#: waeup/kofa/interfaces.py:75
 msgid "clearance requested"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:75
+#: waeup/kofa/interfaces.py:76
 msgid "cleared"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:76
+#: waeup/kofa/interfaces.py:77
 msgid "school fee paid"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:77
+#: waeup/kofa/interfaces.py:78
 msgid "returning"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:78
+#: waeup/kofa/interfaces.py:79
 msgid "courses registered"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:79
+#: waeup/kofa/interfaces.py:80
 msgid "courses validated"
 msgstr ""
 
-#: waeup/kofa/objecthistory.py:71
+#: waeup/kofa/objecthistory.py:72
 msgid "by"
 msgstr ""
@@ -2407,6 +2439,6 @@
 #: waeup/kofa/payments/interfaces.py:76
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:10
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:84
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:51
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:86
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:42
 msgid "Payment Date"
 msgstr ""
@@ -2421,434 +2453,455 @@
 
 #. Default: ""
-#: waeup/kofa/students/batching.py:165
+#: waeup/kofa/students/batching.py:166
 msgid "State '${a}' set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1000
+#. Default: ""
+#: waeup/kofa/students/browser.py:1009
+msgid "${a}: Payments"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1054
+msgid "Add online payment"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1057
 msgid "Create ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1008 waeup/kofa/students/browser.py:1230
+#: waeup/kofa/students/browser.py:1065 waeup/kofa/students/browser.py:1292
 msgid "Your current session does not match accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1077
+#: waeup/kofa/students/browser.py:1075
+msgid "Study course data are incomplete."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1139
 msgid "This ticket has already been paid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1090 waeup/kofa/students/browser.py:1098
-#: waeup/kofa/students/browser.py:1106
+#: waeup/kofa/students/browser.py:1152 waeup/kofa/students/browser.py:1160
+#: waeup/kofa/students/browser.py:1168
 msgid "Valid callback received. ${a}"
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/browser.py:1160
+#: waeup/kofa/students/browser.py:121 waeup/kofa/students/viewlets.py:117
+#: waeup/kofa/students/viewlets.py:557
+msgid "Study Course"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/browser.py:1222
 msgid "${a}: Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1172
+#: waeup/kofa/students/browser.py:1234
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1179
+#: waeup/kofa/students/browser.py:1241
 msgid "No bed ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:119 waeup/kofa/students/viewlets.py:114
-#: waeup/kofa/students/viewlets.py:534
-msgid "Study Course"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1210
+#: waeup/kofa/students/browser.py:127 waeup/kofa/students/viewlets.py:123
+#: waeup/kofa/students/viewlets.py:558
+msgid "Payments"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1272
 msgid "Add bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1212
+#: waeup/kofa/students/browser.py:1274
 msgid "Create bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1220
+#: waeup/kofa/students/browser.py:1282
 msgid "Your data are incomplete."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1224
+#: waeup/kofa/students/browser.py:1286
 msgid "You are in the wrong registration state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1235
+#: waeup/kofa/students/browser.py:1297
 msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1246 waeup/kofa/students/browser.py:1543
-#: waeup/kofa/students/browser.py:1656
+#: waeup/kofa/students/browser.py:1308 waeup/kofa/students/browser.py:1602
+#: waeup/kofa/students/browser.py:1721
 msgid "Activation code is invalid."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:125 waeup/kofa/students/viewlets.py:120
-#: waeup/kofa/students/viewlets.py:535
-msgid "Payments"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1266 waeup/kofa/students/browser.py:1394
+#. Default: ""
+#: waeup/kofa/students/browser.py:1328 waeup/kofa/students/browser.py:1454
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1271 waeup/kofa/students/browser.py:1548
-#: waeup/kofa/students/browser.py:1661
+#: waeup/kofa/students/browser.py:1333 waeup/kofa/students/browser.py:1607
+#: waeup/kofa/students/browser.py:1726
 msgid "Activation code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1274 waeup/kofa/students/browser.py:1551
-#: waeup/kofa/students/browser.py:1664 waeup/kofa/students/browser.py:1923
+#: waeup/kofa/students/browser.py:1336 waeup/kofa/students/browser.py:1610
+#: waeup/kofa/students/browser.py:1729 waeup/kofa/students/browser.py:1997
 msgid "invalidated"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1279 waeup/kofa/students/browser.py:1555
-#: waeup/kofa/students/browser.py:1669
+#: waeup/kofa/students/browser.py:1341 waeup/kofa/students/browser.py:1614
+#: waeup/kofa/students/browser.py:1734
 msgid "You are not the owner of this access code."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1290 waeup/kofa/students/browser.py:1408
+#: waeup/kofa/students/browser.py:1352 waeup/kofa/students/browser.py:1468
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1299
+#: waeup/kofa/students/browser.py:1361
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1317
+#: waeup/kofa/students/browser.py:1377
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1333
+#: waeup/kofa/students/browser.py:1393
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1339
+#: waeup/kofa/students/browser.py:1399
 msgid "Bed Allocation: "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1366
+#: waeup/kofa/students/browser.py:142 waeup/kofa/students/viewlets.py:129
+msgid "Accommodation"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1426
 msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1372
+#: waeup/kofa/students/browser.py:1432
 msgid "Student can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:140 waeup/kofa/students/viewlets.py:126
-msgid "Accommodation"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1415
+#. Default: ""
+#: waeup/kofa/students/browser.py:1475
 msgid "Student relocated: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1434
+#: waeup/kofa/students/browser.py:1494
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1447
+#: waeup/kofa/students/browser.py:1506
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1462 waeup/kofa/students/viewlets.py:365
+#. Default: ""
+#: waeup/kofa/students/browser.py:151
+msgid "Bed Ticket ${a}"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1521 waeup/kofa/students/viewlets.py:388
 msgid "Change password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1476
+#: waeup/kofa/students/browser.py:1535
 msgid "Password changed."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1488
+#: waeup/kofa/students/browser.py:1547
 msgid "Upload portrait"
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/browser.py:149
-msgid "Bed Ticket ${a}"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1503 waeup/kofa/students/viewlets.py:389
+#: waeup/kofa/students/browser.py:1562 waeup/kofa/students/viewlets.py:412
 #: waeup/kofa/students/workflow.py:44
 msgid "Start clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1507
+#: waeup/kofa/students/browser.py:1566
 msgid "Start clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1524 waeup/kofa/students/browser.py:1645
+#: waeup/kofa/students/browser.py:1583 waeup/kofa/students/browser.py:1710
 msgid "Wrong state"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1528
+#: waeup/kofa/students/browser.py:1587
 msgid "No portrait uploaded."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1532
+#: waeup/kofa/students/browser.py:1591
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1559
+#: waeup/kofa/students/browser.py:1618
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1571
+#: waeup/kofa/students/browser.py:1628
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1583 waeup/kofa/students/browser.py:1597
+#: waeup/kofa/students/browser.py:1648 waeup/kofa/students/browser.py:1662
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1656
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1606 waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1671 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1607
+#: waeup/kofa/students/browser.py:1672
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1610
+#: waeup/kofa/students/browser.py:1675
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1619
+#: waeup/kofa/students/browser.py:1684
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1628
+#: waeup/kofa/students/browser.py:1693
 msgid "Clearance has been requested."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1637 waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:170
+msgid "Student Section"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1702 waeup/kofa/students/viewlets.py:441
 msgid "Start course registration"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1641
+#: waeup/kofa/students/browser.py:1706
 msgid "Start course registration now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1677
+#: waeup/kofa/students/browser.py:1742
 msgid "Course registration has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:168
-msgid "Student Section"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1696
+#. Default: ""
+#: waeup/kofa/students/browser.py:1761
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1705
+#: waeup/kofa/students/browser.py:1770
 msgid "Create course list now"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1744
+#: waeup/kofa/students/browser.py:1809
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1781
+#: waeup/kofa/students/browser.py:1846
 msgid "Register course list"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1785
+#: waeup/kofa/students/browser.py:1850
 msgid "Course list has been registered."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1831
-msgid "Change my password"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:184 waeup/kofa/students/browser.py:220
+#: waeup/kofa/students/browser.py:186 waeup/kofa/students/browser.py:226
 msgid "Empty search string"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1841
+#: waeup/kofa/students/browser.py:1896
+msgid "Send me a new password"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1906
 msgid "Get new login credentials"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1855
-msgid "No student record found."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1863
+#: waeup/kofa/students/browser.py:1923
+msgid "Application package not installed."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1929
+msgid "No record found."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1937
 msgid "You have successfully changed your password for the"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1868
+#: waeup/kofa/students/browser.py:1942
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1879
+#: waeup/kofa/students/browser.py:1953
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1882
+#: waeup/kofa/students/browser.py:1956
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1897
+#: waeup/kofa/students/browser.py:1971
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1905
+#: waeup/kofa/students/browser.py:1979
 msgid "Access code is invalid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1908
+#: waeup/kofa/students/browser.py:1982
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1914
+#: waeup/kofa/students/browser.py:1988
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1920
+#: waeup/kofa/students/browser.py:1994
 msgid "Access code has already been used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1929
+#: waeup/kofa/students/browser.py:2003
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:202 waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:208 waeup/kofa/students/viewlets.py:142
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:226 waeup/kofa/students/browser.py:1894
+#: waeup/kofa/students/browser.py:238 waeup/kofa/students/browser.py:1968
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:253 waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:265 waeup/kofa/students/viewlets.py:149
 msgid "Add student"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:261
+#: waeup/kofa/students/browser.py:273
 msgid "Student record created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:277
+#: waeup/kofa/students/browser.py:289
 msgid "${a}: Base Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:320 waeup/kofa/students/browser.py:1871
+#: waeup/kofa/students/browser.py:332 waeup/kofa/students/browser.py:1945
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:332
+#: waeup/kofa/students/browser.py:343
 msgid "Manage base data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:407
+#: waeup/kofa/students/browser.py:423
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:423 waeup/kofa/students/viewlets.py:104
-#: waeup/kofa/students/viewlets.py:532
+#: waeup/kofa/students/browser.py:446 waeup/kofa/students/viewlets.py:107
+#: waeup/kofa/students/viewlets.py:555
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
 msgid "Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:429
+#: waeup/kofa/students/browser.py:452
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:449
+#: waeup/kofa/students/browser.py:471
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:478
+#: waeup/kofa/students/browser.py:512
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:480 waeup/kofa/students/browser.py:504
+#: waeup/kofa/students/browser.py:514 waeup/kofa/students/browser.py:538
 msgid "Student is in wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:497
+#: waeup/kofa/students/browser.py:531
 msgid "Clearance has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:501
+#: waeup/kofa/students/browser.py:535
 msgid "Clearance request has been rejected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:527
+#: waeup/kofa/students/browser.py:561
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:537
-msgid "Manage personal data"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:557
+#: waeup/kofa/students/browser.py:571
+msgid "Edit personal data"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/browser.py:591
 msgid "${a}: Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:587
+#: waeup/kofa/students/browser.py:621
 msgid "Manage study course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:590 waeup/kofa/students/browser.py:631
+#: waeup/kofa/students/browser.py:624 waeup/kofa/students/browser.py:671
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:591 waeup/kofa/students/browser.py:617
+#: waeup/kofa/students/browser.py:625 waeup/kofa/students/browser.py:657
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:625
+#: waeup/kofa/students/browser.py:645
+msgid "Current level not available for certificate."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:665
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:627 waeup/kofa/students/browser.py:1714
+#: waeup/kofa/students/browser.py:667 waeup/kofa/students/browser.py:1779
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:637
+#: waeup/kofa/students/browser.py:677
 msgid "No study level selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:673
+#: waeup/kofa/students/browser.py:728
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:696
+#: waeup/kofa/students/browser.py:751
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:702
+#: waeup/kofa/students/browser.py:757
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:711
-msgid "Course Registration Slip  "
-msgstr ""
-
-#: waeup/kofa/students/browser.py:717
+#: waeup/kofa/students/browser.py:766
+msgid "Course Registration Slip"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:772
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -2857,5 +2910,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:720
+#: waeup/kofa/students/browser.py:775
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -2863,10 +2916,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:721
+#: waeup/kofa/students/browser.py:776
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:722
+#: waeup/kofa/students/browser.py:777
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -2874,5 +2927,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:723
+#: waeup/kofa/students/browser.py:778
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -2880,5 +2933,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:724 waeup/kofa/students/interfaces.py:389
+#: waeup/kofa/students/browser.py:779 waeup/kofa/students/interfaces.py:409
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2887,65 +2940,56 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:752 waeup/kofa/students/browser.py:781
-#: waeup/kofa/students/browser.py:866 waeup/kofa/students/browser.py:871
-#: waeup/kofa/students/browser.py:1754 waeup/kofa/students/browser.py:1804
+#: waeup/kofa/students/browser.py:808 waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:922 waeup/kofa/students/browser.py:927
+#: waeup/kofa/students/browser.py:1819 waeup/kofa/students/browser.py:1869
 msgid "Add course ticket"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:773
+#: waeup/kofa/students/browser.py:829
 msgid "Manage study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:791 waeup/kofa/students/browser.py:1764
+#: waeup/kofa/students/browser.py:847 waeup/kofa/students/browser.py:1829
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:815 waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:871 waeup/kofa/students/browser.py:893
 msgid "This level does not correspond current level."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:819
+#: waeup/kofa/students/browser.py:875
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:821 waeup/kofa/students/browser.py:849
+#: waeup/kofa/students/browser.py:877 waeup/kofa/students/browser.py:905
 msgid "Student is in the wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:842
+#: waeup/kofa/students/browser.py:898
 msgid "Course list request has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:846
+#: waeup/kofa/students/browser.py:902
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:886 waeup/kofa/students/browser.py:1817
+#: waeup/kofa/students/browser.py:943 waeup/kofa/students/browser.py:1882
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:888 waeup/kofa/students/browser.py:1819
+#: waeup/kofa/students/browser.py:945 waeup/kofa/students/browser.py:1884
 msgid "Successfully added ${a}."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:909
+#: waeup/kofa/students/browser.py:966
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:925
+#: waeup/kofa/students/browser.py:982
 msgid "Manage course ticket ${a}"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:952
-msgid "${a}: Payments"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:997
-msgid "Add online payment"
 msgstr ""
 
@@ -2954,11 +2998,6 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:29
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:30
 msgid "Registration Transition:"
-msgstr ""
-
-#. Default: "Please solve the captcha<br />to prevent misuse of this service:"
-#: waeup/kofa/students/browser_templates/changepw.pt:8
-msgid "solve_captcha"
 msgstr ""
 
@@ -3010,6 +3049,6 @@
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:14
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:25
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:87
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:54
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:89
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:45
 msgid "State"
 msgstr ""
@@ -3030,4 +3069,14 @@
 msgstr ""
 
+#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:15
+#: waeup/kofa/students/browser_templates/studycoursepage.pt:39
+msgid "Faculty:"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:23
+#: waeup/kofa/students/browser_templates/studycoursepage.pt:28
+msgid "Department:"
+msgstr ""
+
 #: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:31
 msgid "Semester:"
@@ -3046,32 +3095,36 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:20
-#: waeup/kofa/students/browser_templates/fileupload.pt:26
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
-msgid "Max. file size:"
-msgstr ""
-
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:11
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:87
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:43
+msgid "Category"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:12
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:88
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:44
+msgid "Item"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:8
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:84
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:40
+msgid "Payment Id"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:9
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:85
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:52
-msgid "Category"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:12
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:86
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:53
-msgid "Item"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:8
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:82
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:49
-msgid "Payment Id"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:9
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:83
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:50
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:41
 msgid "Creation Date"
+msgstr ""
+
+#. Default: "Enter the email address stored on Kofa. You can't change your email address here. If you've forgotten your email address or the email address stored in Kofa is wrong or no longer valid, use the enquiries form to request a change of address."
+#: waeup/kofa/students/browser_templates/sendpassword.pt:19
+msgid "email_address_problem"
+msgstr ""
+
+#. Default: "Please solve the captcha<br />to prevent misuse of this service:"
+#: waeup/kofa/students/browser_templates/sendpassword.pt:8
+msgid "solve_captcha"
 msgstr ""
 
@@ -3175,69 +3228,76 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:183 waeup/kofa/students/interfaces.py:259
-#: waeup/kofa/students/interfaces.py:498
-msgid "Registration Number"
-msgstr ""
-
-#: waeup/kofa/students/interfaces.py:190 waeup/kofa/students/interfaces.py:268
+#: waeup/kofa/students/export.py:139
+msgid "Student Study Levels"
+msgstr ""
+
+#: waeup/kofa/students/export.py:87
+msgid "Student Study Courses"
+msgstr ""
+
+#: waeup/kofa/students/interfaces.py:191 waeup/kofa/students/interfaces.py:280
 msgid "Matriculation Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:197
+#: waeup/kofa/students/interfaces.py:198
 msgid "PWD Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/students/interfaces.py:204
 msgid "Email"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:223
+#: waeup/kofa/students/interfaces.py:225
 msgid "Clearance form locked"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:228
+#: waeup/kofa/students/interfaces.py:230
 msgid "CLR Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:235
+#: waeup/kofa/students/interfaces.py:237
 msgid "Nationality"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:245
+#: waeup/kofa/students/interfaces.py:246
+msgid "Employer"
+msgstr ""
+
+#: waeup/kofa/students/interfaces.py:256
 msgid "Permanent Address"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:277
+#: waeup/kofa/students/interfaces.py:289
 #: waeup/kofa/browser/templates/showstudentspage.pt:7
 msgid "Certificate"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:283
+#: waeup/kofa/students/interfaces.py:295
 msgid "Entry Mode"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:290
+#: waeup/kofa/students/interfaces.py:302
 msgid "Entry Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:298 waeup/kofa/students/interfaces.py:337
+#: waeup/kofa/students/interfaces.py:310 waeup/kofa/students/interfaces.py:349
 #: waeup/kofa/browser/templates/showstudentspage.pt:8
 msgid "Current Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:305 waeup/kofa/students/interfaces.py:343
+#: waeup/kofa/students/interfaces.py:317 waeup/kofa/students/interfaces.py:355
 #: waeup/kofa/browser/templates/showstudentspage.pt:9
 msgid "Current Level"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:312 waeup/kofa/students/interfaces.py:331
+#: waeup/kofa/students/interfaces.py:324 waeup/kofa/students/interfaces.py:343
 msgid "Current Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:319
+#: waeup/kofa/students/interfaces.py:331
 msgid "Previous Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:357 waeup/kofa/students/interfaces.py:451
+#: waeup/kofa/students/interfaces.py:369 waeup/kofa/students/interfaces.py:471
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3245,9 +3305,9 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:363
+#: waeup/kofa/students/interfaces.py:375
 msgid "Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:382
+#: waeup/kofa/students/interfaces.py:402
 #: waeup/kofa/browser/templates/certificatepage.pt:30
 #: waeup/kofa/browser/templates/certificatemanagepage.pt:33
@@ -3255,13 +3315,13 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:396
+#: waeup/kofa/students/interfaces.py:416
 msgid "Automatical Creation"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:403
+#: waeup/kofa/students/interfaces.py:423
 msgid "Carry-over Course"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:422
+#: waeup/kofa/students/interfaces.py:442
 #: waeup/kofa/university/interfaces.py:299
 #: waeup/kofa/browser/templates/certificatepage.pt:29
@@ -3270,131 +3330,139 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:439
+#: waeup/kofa/students/interfaces.py:459
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:10
 msgid "Bed Coordinates"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:458
+#: waeup/kofa/students/interfaces.py:478
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:9
 msgid "Booking Date"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:464
+#: waeup/kofa/students/interfaces.py:484
 msgid "Booking Activation Code"
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/utils.py:167
+#: waeup/kofa/students/utils.py:182
+msgid "Scanned Documents"
+msgstr ""
+
+#: waeup/kofa/students/utils.py:190
+msgid "(not provided)"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/utils.py:218
 msgid "<font size=10>${a} Page ${b} of ${c}</font>"
 msgstr ""
 
-#: waeup/kofa/students/utils.py:298 waeup/kofa/students/viewlets.py:71
-#: waeup/kofa/students/viewlets.py:99
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:6
+#: waeup/kofa/students/utils.py:333 waeup/kofa/students/viewlets.py:74
+#: waeup/kofa/students/viewlets.py:102
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:7
 msgid "Base Data"
 msgstr ""
 
-#: waeup/kofa/students/utils.py:329
-msgid "Scanned Documents"
-msgstr ""
-
-#: waeup/kofa/students/utils.py:382
+#: waeup/kofa/students/utils.py:368
 msgid "(not yet)"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:109 waeup/kofa/students/viewlets.py:533
+#: waeup/kofa/students/viewlets.py:112 waeup/kofa/students/viewlets.py:556
 msgid "Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:131 waeup/kofa/students/viewlets.py:537
+#: waeup/kofa/students/viewlets.py:134 waeup/kofa/students/viewlets.py:560
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:27
 msgid "History"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:179 waeup/kofa/students/workflow.py:72
+#: waeup/kofa/students/viewlets.py:182 waeup/kofa/students/workflow.py:72
 msgid "Clear student"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:194
+#: waeup/kofa/students/viewlets.py:197
 msgid "Reject clearance"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:210
+#: waeup/kofa/students/viewlets.py:213
 msgid "Download clearance slip"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:235
+#: waeup/kofa/students/viewlets.py:222 waeup/kofa/students/viewlets.py:231
+msgid "View"
+msgstr ""
+
+#: waeup/kofa/students/viewlets.py:263 waeup/kofa/students/workflow.py:128
+msgid "Validate courses"
+msgstr ""
+
+#: waeup/kofa/students/viewlets.py:279
+msgid "Reject courses"
+msgstr ""
+
+#: waeup/kofa/students/viewlets.py:296
 msgid "Download course registration slip"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:251 waeup/kofa/students/workflow.py:128
-msgid "Validate courses"
-msgstr ""
-
-#: waeup/kofa/students/viewlets.py:267
-msgid "Reject courses"
-msgstr ""
-
-#: waeup/kofa/students/viewlets.py:330
+#: waeup/kofa/students/viewlets.py:353
 msgid "Book accommodation"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:339
+#: waeup/kofa/students/viewlets.py:362
 msgid "Download bed allocation slip"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:348
+#: waeup/kofa/students/viewlets.py:371
 msgid "Relocate student"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:374
+#: waeup/kofa/students/viewlets.py:397
 msgid "Change portrait"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:432
+#: waeup/kofa/students/viewlets.py:455
 msgid "Add course list"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:450
+#: waeup/kofa/students/viewlets.py:473
 msgid "Add and remove courses"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:536
+#: waeup/kofa/students/viewlets.py:559
 msgid "Accommodation Data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:548
+#: waeup/kofa/students/viewlets.py:571
 msgid "${a} deleted."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:561
+#: waeup/kofa/students/viewlets.py:584
 msgid "File name has no extension."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:564
+#: waeup/kofa/students/viewlets.py:587
 msgid "File name contains more than one dot."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:571
+#: waeup/kofa/students/viewlets.py:594
 msgid "${a} file extension expected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:577
+#: waeup/kofa/students/viewlets.py:600
 msgid "Only the following extension are allowed: ${a}"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:583
+#: waeup/kofa/students/viewlets.py:606
 msgid "Uploaded file is too big."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:590
+#: waeup/kofa/students/viewlets.py:613
 msgid "File ${a} uploaded."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:608
+#: waeup/kofa/students/viewlets.py:631
 #: waeup/kofa/browser/templates/datacenterlogspage.pt:10
 #: waeup/kofa/browser/templates/datacenterpage.pt:14
@@ -3403,84 +3471,84 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:609
+#: waeup/kofa/students/viewlets.py:632
 msgid "Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:632
+#: waeup/kofa/students/viewlets.py:655
 msgid "Upload new file"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:633
+#: waeup/kofa/students/viewlets.py:656
 msgid "Delete attachment"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:663
+#: waeup/kofa/students/viewlets.py:687
 msgid "No local file selected."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:677
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:8
+#: waeup/kofa/students/viewlets.py:701
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:9
 msgid "Passport Picture"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:688
+#: waeup/kofa/students/viewlets.py:712
 msgid "Passport Picture (jpg only)"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:703 waeup/kofa/students/viewlets.py:714
+#: waeup/kofa/students/viewlets.py:727 waeup/kofa/students/viewlets.py:738
 msgid "Birth Certificate"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:704 waeup/kofa/students/viewlets.py:715
+#: waeup/kofa/students/viewlets.py:728 waeup/kofa/students/viewlets.py:739
 msgid "Birth Certificate Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:724 waeup/kofa/students/viewlets.py:735
+#: waeup/kofa/students/viewlets.py:748 waeup/kofa/students/viewlets.py:759
 msgid "Acceptance Letter"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:725 waeup/kofa/students/viewlets.py:736
+#: waeup/kofa/students/viewlets.py:749 waeup/kofa/students/viewlets.py:760
 msgid "Acceptance Letter Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:85
+#: waeup/kofa/students/viewlets.py:88
 msgid "Application Slip"
 msgstr ""
 
-#: waeup/kofa/students/vocabularies.py:117
+#: waeup/kofa/students/vocabularies.py:116
 msgid "male"
 msgstr ""
 
-#: waeup/kofa/students/vocabularies.py:119
+#: waeup/kofa/students/vocabularies.py:118
 msgid "female"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:77
+#: waeup/kofa/students/vocabularies.py:76
 msgid "Error: level id ${value} out of range"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:88
+#: waeup/kofa/students/vocabularies.py:87
 msgid "${title} 2nd spillover"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:91
+#: waeup/kofa/students/vocabularies.py:90
 msgid "${title} 3rd spillover"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:94
+#: waeup/kofa/students/vocabularies.py:93
 msgid "${title} 1st spillover"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:96
+#: waeup/kofa/students/vocabularies.py:95
 msgid "${title} on 1st probation"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:98
+#: waeup/kofa/students/vocabularies.py:97
 msgid "${title} on 2nd probation"
 msgstr ""
@@ -3490,6 +3558,6 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:108
-msgid "Student record reset to 'returning'"
+#: waeup/kofa/students/workflow.py:108 waeup/kofa/students/workflow.py:143
+msgid "Reset to 'returning'"
 msgstr ""
 
@@ -3507,5 +3575,5 @@
 
 #: waeup/kofa/students/workflow.py:122 waeup/kofa/students/workflow.py:136
-msgid "Student record reset to 'paid'"
+msgid "Reset to 'paid'"
 msgstr ""
 
@@ -3518,8 +3586,4 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:143
-msgid "Returned"
-msgstr ""
-
 #: waeup/kofa/students/workflow.py:149
 msgid "Reset to validated"
@@ -3527,5 +3591,5 @@
 
 #: waeup/kofa/students/workflow.py:150
-msgid "Student record reset to 'validated'"
+msgid "Reset to 'validated'"
 msgstr ""
 
@@ -3547,5 +3611,5 @@
 
 #: waeup/kofa/students/workflow.py:38
-msgid "Student record reset"
+msgid "Reset to initial state"
 msgstr ""
 
@@ -3559,5 +3623,5 @@
 
 #: waeup/kofa/students/workflow.py:52
-msgid "Student record reset to 'admitted'"
+msgid "Reset to 'admitted'"
 msgstr ""
 
@@ -3571,5 +3635,5 @@
 
 #: waeup/kofa/students/workflow.py:66 waeup/kofa/students/workflow.py:80
-msgid "Student record reset to 'clearance'"
+msgid "Reset to 'clearance'"
 msgstr ""
 
@@ -3591,5 +3655,5 @@
 
 #: waeup/kofa/students/workflow.py:94
-msgid "Student record reset to 'cleared'"
+msgid "Reset to 'cleared'"
 msgstr ""
 
@@ -3726,4 +3790,8 @@
 msgstr ""
 
+#: waeup/kofa/university/vocabularies.py:38
+msgid "900 (Year 9)"
+msgstr ""
+
 #: waeup/kofa/utils/countries.py:10
 msgid "Albania"
@@ -4030,5 +4098,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/countries.py:169 waeup/kofa/utils/utils.py:47
+#: waeup/kofa/utils/countries.py:169 waeup/kofa/utils/utils.py:48
 msgid "Nigeria"
 msgstr ""
@@ -4682,5 +4750,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/countries.py:90 waeup/kofa/utils/utils.py:46
+#: waeup/kofa/utils/countries.py:90 waeup/kofa/utils/utils.py:47
 msgid "Germany"
 msgstr ""
@@ -4722,5 +4790,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:149
+#: waeup/kofa/utils/utils.py:151
 msgid ""
 "Fullname: ${a}\n"
@@ -4732,5 +4800,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:194
+#: waeup/kofa/utils/utils.py:201
 msgid ""
 "Dear ${a},\n"
@@ -4752,17 +4820,17 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:48
+#: waeup/kofa/utils/utils.py:49
 msgid "U.S."
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:117
+#: waeup/kofa/widgets/phonewidget.py:118
 msgid "Empty phone field(s)."
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:121
+#: waeup/kofa/widgets/phonewidget.py:122
 msgid "Int. prefix requires format '+NNN'"
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:127
+#: waeup/kofa/widgets/phonewidget.py:130
 msgid "Phone numbers may contain numbers only."
 msgstr ""
Index: /main/waeup.kofa/trunk/src/waeup/kofa/locales/fr/LC_MESSAGES/waeup.kofa.po
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/locales/fr/LC_MESSAGES/waeup.kofa.po	(revision 8196)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/fr/LC_MESSAGES/waeup.kofa.po	(revision 8197)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Mon Mar 26 11:33:10 2012\n"
+"POT-Creation-Date: Tue Apr 17 16:18:24 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -28,8 +28,8 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: waeup/kofa/accesscodes/browser.py:100 waeup/kofa/accesscodes/browser.py:113
-#: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:129
-#: waeup/kofa/applicants/browser.py:181 waeup/kofa/applicants/browser.py:252
-#: waeup/kofa/applicants/browser.py:253 waeup/kofa/applicants/browser.py:336
+#: waeup/kofa/accesscodes/browser.py:101 waeup/kofa/accesscodes/browser.py:114
+#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:131
+#: waeup/kofa/applicants/browser.py:180 waeup/kofa/applicants/browser.py:249
+#: waeup/kofa/applicants/browser.py:250 waeup/kofa/applicants/browser.py:331
 #: waeup/kofa/browser/pages.py:507 waeup/kofa/browser/pages.py:712
 #: waeup/kofa/browser/pages.py:739 waeup/kofa/browser/pages.py:762
@@ -45,144 +45,144 @@
 #: waeup/kofa/browser/pages.py:1814 waeup/kofa/browser/pages.py:1816
 #: waeup/kofa/browser/pages.py:1851 waeup/kofa/browser/pages.py:1902
-#: waeup/kofa/browser/pages.py:1954 waeup/kofa/students/browser.py:589
-#: waeup/kofa/students/browser.py:590 waeup/kofa/students/browser.py:751
-#: waeup/kofa/students/browser.py:753 waeup/kofa/students/browser.py:893
+#: waeup/kofa/browser/pages.py:1954 waeup/kofa/students/browser.py:623
+#: waeup/kofa/students/browser.py:624 waeup/kofa/students/browser.py:807
+#: waeup/kofa/students/browser.py:809 waeup/kofa/students/browser.py:950
 msgid "Cancel"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:102
+#: waeup/kofa/accesscodes/browser.py:103
 msgid "Batch creation cancelled."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:112
+#: waeup/kofa/accesscodes/browser.py:113
 msgid "Reimport"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:115
+#: waeup/kofa/accesscodes/browser.py:116
 msgid "Reimport Access Code Batches"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:120
+#: waeup/kofa/accesscodes/browser.py:121
 msgid "Reimport cancelled."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:126
+#: waeup/kofa/accesscodes/browser.py:127
 msgid "No file chosen. Action cancelled."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:136
+#: waeup/kofa/accesscodes/browser.py:137
 msgid "This batch already exists: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:139
+#: waeup/kofa/accesscodes/browser.py:140
 msgid "Successfully reimported: ${a}"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:152
+#: waeup/kofa/accesscodes/browser.py:153
 msgid "Search and Manage Access Codes"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:596
+#: waeup/kofa/accesscodes/browser.py:154 waeup/kofa/browser/pages.py:596
 #: waeup/kofa/browser/pages.py:1146 waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:169 waeup/kofa/students/browser.py:203
+#: waeup/kofa/students/browser.py:171 waeup/kofa/students/browser.py:209
 msgid "Search"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:154
+#: waeup/kofa/accesscodes/browser.py:155
 msgid "Disable ACs"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:155
+#: waeup/kofa/accesscodes/browser.py:156
 msgid "Enable ACs"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:180 waeup/kofa/accesscodes/workflow.py:39
+#: waeup/kofa/accesscodes/browser.py:181 waeup/kofa/accesscodes/workflow.py:39
 msgid "disabled"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:182
+#: waeup/kofa/accesscodes/browser.py:183
 msgid "${a} disabled."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:186
+#: waeup/kofa/accesscodes/browser.py:187
 msgid "${a}: Disable transition not allowed."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:190
+#: waeup/kofa/accesscodes/browser.py:191
 msgid "re-enabled"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:192
+#: waeup/kofa/accesscodes/browser.py:193
 msgid "${a} (re-)enabled."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:196
+#: waeup/kofa/accesscodes/browser.py:197
 msgid "${a}: Re-enable transition not allowed."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:235
+#: waeup/kofa/accesscodes/browser.py:236
 msgid "Add Access Code Batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:244
+#: waeup/kofa/accesscodes/browser.py:245
 msgid "Reimport Access Code Batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:252
+#: waeup/kofa/accesscodes/browser.py:253
 msgid "Search Access Codes"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:261
+#: waeup/kofa/accesscodes/browser.py:262
 msgid "Access Codes"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:43
+#: waeup/kofa/accesscodes/browser.py:44
 msgid "Archive"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:44
+#: waeup/kofa/accesscodes/browser.py:45
 msgid "Archive and delete"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:46 waeup/kofa/accesscodes/browser.py:206
-#: waeup/kofa/accesscodes/browser.py:226
+#: waeup/kofa/accesscodes/browser.py:47 waeup/kofa/accesscodes/browser.py:207
+#: waeup/kofa/accesscodes/browser.py:227
 msgid "Access Code Batches"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:53
+#: waeup/kofa/accesscodes/browser.py:54
 msgid "No batch selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:61
+#: waeup/kofa/accesscodes/browser.py:62
 msgid "Archived ${a} (${b})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:68
+#: waeup/kofa/accesscodes/browser.py:69
 msgid "Deleted batch ${a}"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:77
+#: waeup/kofa/accesscodes/browser.py:78
 msgid "Create Access Code Batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:83
+#: waeup/kofa/accesscodes/browser.py:84
 msgid "Create batch"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:91
+#: waeup/kofa/accesscodes/browser.py:92
 msgid "Batch created (${a} entries)"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:93
+#: waeup/kofa/accesscodes/browser.py:94
 msgid "Data written to ${a}"
 msgstr ""
@@ -342,15 +342,15 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:116 waeup/kofa/applicants/browser.py:323
-#: waeup/kofa/applicants/browser.py:744
+#: waeup/kofa/applicants/browser.py:118 waeup/kofa/applicants/browser.py:318
+#: waeup/kofa/applicants/browser.py:714
 msgid "Could not delete:"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:119 waeup/kofa/applicants/browser.py:326
-#: waeup/kofa/applicants/browser.py:747 waeup/kofa/browser/pages.py:137
-#: waeup/kofa/students/browser.py:241 waeup/kofa/students/browser.py:647
-#: waeup/kofa/students/browser.py:801 waeup/kofa/students/browser.py:979
-#: waeup/kofa/students/browser.py:1189 waeup/kofa/students/browser.py:1776
+#: waeup/kofa/applicants/browser.py:121 waeup/kofa/applicants/browser.py:321
+#: waeup/kofa/applicants/browser.py:717 waeup/kofa/browser/pages.py:136
+#: waeup/kofa/students/browser.py:253 waeup/kofa/students/browser.py:687
+#: waeup/kofa/students/browser.py:857 waeup/kofa/students/browser.py:1036
+#: waeup/kofa/students/browser.py:1251 waeup/kofa/students/browser.py:1841
 msgid "Successfully removed: ${a}"
 msgstr ""
@@ -362,9 +362,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:177
+#: waeup/kofa/applicants/browser.py:176
 msgid "Added:"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:189 waeup/kofa/applicants/export.py:78
+#: waeup/kofa/applicants/browser.py:188 waeup/kofa/applicants/export.py:76
 #: waeup/kofa/applicants/viewlets.py:44
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:12
@@ -373,8 +373,8 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:252 waeup/kofa/applicants/browser.py:299
-#: waeup/kofa/applicants/browser.py:653 waeup/kofa/applicants/browser.py:687
-#: waeup/kofa/applicants/browser.py:790 waeup/kofa/applicants/browser.py:793
-#: waeup/kofa/applicants/browser.py:837 waeup/kofa/browser/pages.py:480
+#: waeup/kofa/applicants/browser.py:249 waeup/kofa/applicants/browser.py:294
+#: waeup/kofa/applicants/browser.py:619 waeup/kofa/applicants/browser.py:657
+#: waeup/kofa/applicants/browser.py:759 waeup/kofa/applicants/browser.py:762
+#: waeup/kofa/applicants/browser.py:806 waeup/kofa/browser/pages.py:480
 #: waeup/kofa/browser/pages.py:635 waeup/kofa/browser/pages.py:658
 #: waeup/kofa/browser/pages.py:732 waeup/kofa/browser/pages.py:1185
@@ -384,156 +384,168 @@
 #: waeup/kofa/browser/pages.py:1835 waeup/kofa/hostels/browser.py:209
 #: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:318
-#: waeup/kofa/students/browser.py:358 waeup/kofa/students/browser.py:463
-#: waeup/kofa/students/browser.py:540 waeup/kofa/students/browser.py:589
-#: waeup/kofa/students/browser.py:605 waeup/kofa/students/browser.py:751
-#: waeup/kofa/students/browser.py:776 waeup/kofa/students/browser.py:1450
-#: waeup/kofa/students/browser.py:1465 waeup/kofa/students/browser.py:1580
+#: waeup/kofa/students/browser.py:369 waeup/kofa/students/browser.py:497
+#: waeup/kofa/students/browser.py:574 waeup/kofa/students/browser.py:623
+#: waeup/kofa/students/browser.py:639 waeup/kofa/students/browser.py:807
+#: waeup/kofa/students/browser.py:832 waeup/kofa/students/browser.py:1509
+#: waeup/kofa/students/browser.py:1524 waeup/kofa/students/browser.py:1645
 msgid "Save"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:253 waeup/kofa/applicants/browser.py:331
-#: waeup/kofa/applicants/browser.py:360
+#: waeup/kofa/applicants/browser.py:250 waeup/kofa/applicants/browser.py:326
+#: waeup/kofa/applicants/browser.py:354
 msgid "Add applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:263 waeup/kofa/applicants/viewlets.py:95
+#: waeup/kofa/applicants/browser.py:258 waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:303 waeup/kofa/applicants/browser.py:716
+#: waeup/kofa/applicants/browser.py:298 waeup/kofa/applicants/browser.py:686
 #: waeup/kofa/browser/pages.py:1444 waeup/kofa/browser/pages.py:1766
 #: waeup/kofa/browser/pages.py:1838 waeup/kofa/browser/pages.py:1950
-#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:82
-#: waeup/kofa/students/browser.py:384
+#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:84
+#: waeup/kofa/students/browser.py:395
 msgid "Form has been saved."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:312
+#: waeup/kofa/applicants/browser.py:307
 msgid "No applicant selected!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:363
+#: waeup/kofa/applicants/browser.py:357
 msgid "Create application record"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:368
+#: waeup/kofa/applicants/browser.py:362
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:381
+#: waeup/kofa/applicants/browser.py:376
 msgid "Applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:396 waeup/kofa/students/browser.py:283
+#: waeup/kofa/applicants/browser.py:395 waeup/kofa/students/browser.py:295
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:397 waeup/kofa/students/browser.py:284
+#: waeup/kofa/applicants/browser.py:396 waeup/kofa/students/browser.py:296
 msgid "unset"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:402
-msgid "${a} Application Record ${b}"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:453
+#: waeup/kofa/applicants/browser.py:401
+msgid "${a} <br /> Application Record ${b}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:452
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:460 waeup/kofa/students/browser.py:1028
+#: waeup/kofa/applicants/browser.py:459 waeup/kofa/students/browser.py:1091
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:473 waeup/kofa/students/browser.py:1042
+#: waeup/kofa/applicants/browser.py:472 waeup/kofa/students/browser.py:1105
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:500 waeup/kofa/students/browser.py:1061
+#: waeup/kofa/applicants/browser.py:499 waeup/kofa/students/browser.py:1124
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:528 waeup/kofa/students/browser.py:1110
+#: waeup/kofa/applicants/browser.py:527 waeup/kofa/students/browser.py:1172
 msgid "Valid callback received."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:549
+#: waeup/kofa/applicants/browser.py:548
 msgid "Payment Data"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:555
+#: waeup/kofa/applicants/browser.py:554
 msgid "Online Payment Receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:561
+#: waeup/kofa/applicants/browser.py:560
 msgid "Ticket not yet paid."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:626
+#: waeup/kofa/applicants/browser.py:594
 msgid "Uploaded image is too big!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:63
+#: waeup/kofa/applicants/browser.py:599
+msgid "jpg file extension expected."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:619 waeup/kofa/applicants/browser.py:762
+#: waeup/kofa/applicants/browser.py:814
+msgid "Final Submit"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:620 waeup/kofa/applicants/browser.py:727
+#: waeup/kofa/applicants/browser.py:760 waeup/kofa/applicants/browser.py:795
+#: waeup/kofa/students/browser.py:1042
+msgid "Add online payment ticket"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:620 waeup/kofa/applicants/browser.py:732
+#: waeup/kofa/applicants/browser.py:760 waeup/kofa/applicants/browser.py:763
+#: waeup/kofa/applicants/browser.py:800 waeup/kofa/students/browser.py:809
+#: waeup/kofa/students/browser.py:841 waeup/kofa/students/browser.py:1018
+#: waeup/kofa/students/browser.py:1823
+msgid "Remove selected tickets"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/applicants/browser.py:643
+msgid "${a} <br /> Application Form ${b}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:65
 msgid "Application Section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:631
-msgid "jpg file extension expected."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:653 waeup/kofa/applicants/browser.py:793
-#: waeup/kofa/applicants/browser.py:845
-msgid "Final Submit"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:757
-#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:826
-#: waeup/kofa/students/browser.py:985
-msgid "Add online payment ticket"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:762
-#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:831 waeup/kofa/students/browser.py:753
-#: waeup/kofa/students/browser.py:785 waeup/kofa/students/browser.py:961
-#: waeup/kofa/students/browser.py:1758
-msgid "Remove selected tickets"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/applicants/browser.py:673
-msgid "${a} Application Form ${b}"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:684 waeup/kofa/students/browser.py:355
+#: waeup/kofa/applicants/browser.py:654 waeup/kofa/students/browser.py:366
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:731 waeup/kofa/students/browser.py:967
+#: waeup/kofa/applicants/browser.py:701 waeup/kofa/students/browser.py:1024
 msgid "No payment selected."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:75 waeup/kofa/applicants/viewlets.py:88
+#: waeup/kofa/applicants/browser.py:77 waeup/kofa/applicants/viewlets.py:88
 msgid "Manage application section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:78 waeup/kofa/applicants/browser.py:104
-#: waeup/kofa/applicants/browser.py:253 waeup/kofa/applicants/browser.py:306
+#: waeup/kofa/applicants/browser.py:773 waeup/kofa/students/browser.py:92
+msgid "The requested form is locked (read-only)."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:787
+msgid "No passport picture uploaded."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:789
+msgid "Passport picture confirmation box not ticked."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:106
+#: waeup/kofa/applicants/browser.py:250 waeup/kofa/applicants/browser.py:301
 #: waeup/kofa/browser/pages.py:638 waeup/kofa/browser/pages.py:679
 #: waeup/kofa/browser/pages.py:1324 waeup/kofa/browser/pages.py:1335
 #: waeup/kofa/browser/pages.py:1401 waeup/kofa/browser/pages.py:1436
-#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:204
-#: waeup/kofa/students/browser.py:1156 waeup/kofa/students/browser.py:1169
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:210
+#: waeup/kofa/students/browser.py:1218 waeup/kofa/students/browser.py:1231
 msgid "Remove selected"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:78 waeup/kofa/applicants/browser.py:124
-#: waeup/kofa/applicants/browser.py:147 waeup/kofa/applicants/browser.py:159
+#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:126
+#: waeup/kofa/applicants/browser.py:149 waeup/kofa/applicants/browser.py:159
 msgid "Add applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:138
-#: waeup/kofa/applicants/browser.py:254 waeup/kofa/applicants/browser.py:345
+#: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:140
+#: waeup/kofa/applicants/browser.py:251 waeup/kofa/applicants/browser.py:340
 #: waeup/kofa/browser/pages.py:1402 waeup/kofa/browser/pages.py:1461
 #: waeup/kofa/browser/pages.py:1571 waeup/kofa/browser/pages.py:1657
@@ -542,10 +554,10 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:804 waeup/kofa/students/browser.py:90
-msgid "The requested form is locked (read-only)."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:134
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:341
+#: waeup/kofa/applicants/browser.py:826 waeup/kofa/students/browser.py:1690
+msgid "This form cannot be submitted. Wrong state!"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:83 waeup/kofa/applicants/browser.py:136
+#: waeup/kofa/applicants/browser.py:252 waeup/kofa/applicants/browser.py:336
 #: waeup/kofa/browser/pages.py:1403 waeup/kofa/browser/pages.py:1457
 #: waeup/kofa/browser/pages.py:1572 waeup/kofa/browser/pages.py:1653
@@ -554,62 +566,66 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:818
-msgid "No passport picture uploaded."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:82
+#: waeup/kofa/applicants/browser.py:831
+msgid "Form has been submitted."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:84
 msgid "Applicants Containers"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:820
-msgid "Passport picture confirmation box not ticked."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:857 waeup/kofa/students/browser.py:1625
-msgid "This form cannot be submitted. Wrong state!"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:862
-msgid "Form has been submitted."
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/applicants/browser.py:897
-msgid "Register for ${a} Application"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:903
+#. Default: ""
+#: waeup/kofa/applicants/browser.py:874
+msgid "Apply for ${a}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:880
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:908
+#: waeup/kofa/applicants/browser.py:885
 msgid "Application has ended."
 msgstr ""
 
+#: waeup/kofa/applicants/browser.py:894
+msgid "Get login credentials"
+msgstr ""
+
 #: waeup/kofa/applicants/browser.py:917
-msgid "Get login credentials"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:932
+msgid "An error occurred."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:923 waeup/kofa/applicants/browser.py:934
+msgid "No application record found."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:926
+msgid "Your password has already been set. Please proceed to the login page."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:944
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:939
+#: waeup/kofa/applicants/browser.py:951
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:948
+#: waeup/kofa/applicants/browser.py:960
 msgid "Your registration was successful."
 msgstr ""
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:18
-msgid "Photograph"
-msgstr ""
-
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:43
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:17
+msgid "Admitted Course of Study:"
+msgstr ""
+
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:19
+msgid "Passport Photo:"
+msgstr ""
+
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:44
 msgid "Application Transition:"
 msgstr ""
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:59
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:60
 msgid ""
 "I confirm that the Passport Photograph uploaded on this form is a true "
@@ -617,6 +633,6 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:74
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:43
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:76
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:34
 msgid "Acceptance Fee Payment Tickets"
 msgstr ""
@@ -640,4 +656,10 @@
 msgstr ""
 
+#: waeup/kofa/applicants/browser_templates/applicantregister.pt:22
+msgid ""
+"Your application record will be looked up and an email with your login "
+"credentials will be sent to the address provided."
+msgstr ""
+
 #: waeup/kofa/applicants/browser_templates/applicantregister.pt:8
 msgid "Please solve the captcha<br />to prevent misuse of this service:"
@@ -665,17 +687,17 @@
 msgstr ""
 
-#: waeup/kofa/applicants/container.py:52
-msgid "Basic"
-msgstr ""
-
-#: waeup/kofa/applicants/container.py:55
-msgid "handles basic applicants"
-msgstr ""
-
 #: waeup/kofa/applicants/export.py:40
 msgid "Basic Applicants Containers"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:198 waeup/kofa/students/browser.py:718
+#: waeup/kofa/applicants/interfaces.py:138
+msgid "Create Application Records"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:139
+msgid "Update Application Records"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:159 waeup/kofa/students/browser.py:773
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -701,5 +723,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:205 waeup/kofa/students/browser.py:719
+#: waeup/kofa/applicants/interfaces.py:165 waeup/kofa/students/browser.py:774
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -720,126 +742,122 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:212
-#: waeup/kofa/applicants/interfaces.py:322
+#: waeup/kofa/applicants/interfaces.py:171
+#: waeup/kofa/applicants/interfaces.py:275
 msgid "Application Target"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:220
+#: waeup/kofa/applicants/interfaces.py:178
+#: waeup/kofa/applicants/interfaces.py:282
+msgid "Year of Entrance"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:185
+msgid "Application Mode"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:191
 msgid "Entry Level"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:227
-#: waeup/kofa/applicants/interfaces.py:330
-msgid "Year of Entrance"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:235
-#: waeup/kofa/applicants/interfaces.py:338
-msgid "Applicants Container Type"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:251
+#: waeup/kofa/applicants/interfaces.py:205
 msgid "Category for the grouping of certificates"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:258
+#: waeup/kofa/applicants/interfaces.py:211
 msgid "Human readable description in reST format"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:271
+#: waeup/kofa/applicants/interfaces.py:224
 msgid "Application Start Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:277
+#: waeup/kofa/applicants/interfaces.py:230
 msgid "Application Closing Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:283
+#: waeup/kofa/applicants/interfaces.py:236
 msgid "Forbid additions after deadline (enddate)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:366
+#: waeup/kofa/applicants/interfaces.py:315
 msgid "Applicant Id"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:371
-msgid "JAMB Registration Number"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:383
-#: waeup/kofa/students/interfaces.py:162
+#: waeup/kofa/applicants/interfaces.py:320
+#: waeup/kofa/students/interfaces.py:184 waeup/kofa/students/interfaces.py:271
+#: waeup/kofa/students/interfaces.py:518
+msgid "Registration Number"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:331
+#: waeup/kofa/applicants/interfaces.py:499
+#: waeup/kofa/students/interfaces.py:163
 msgid "First Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:387
-#: waeup/kofa/students/interfaces.py:167
+#: waeup/kofa/applicants/interfaces.py:335
+#: waeup/kofa/students/interfaces.py:168
 msgid "Middle Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:391
-#: waeup/kofa/students/interfaces.py:172
+#: waeup/kofa/applicants/interfaces.py:339
+#: waeup/kofa/students/interfaces.py:173
 msgid "Last Name (Surname)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:395
-#: waeup/kofa/students/interfaces.py:218
+#: waeup/kofa/applicants/interfaces.py:343
+#: waeup/kofa/students/interfaces.py:219
 msgid "Date of Birth"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:400
-msgid "State/LGA"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:405
-#: waeup/kofa/students/interfaces.py:177
+#: waeup/kofa/applicants/interfaces.py:349
+#: waeup/kofa/students/interfaces.py:178
 msgid "Sex"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:411 waeup/kofa/interfaces.py:392
-#: waeup/kofa/interfaces.py:418 waeup/kofa/students/interfaces.py:504
+#: waeup/kofa/applicants/interfaces.py:354
+#: waeup/kofa/applicants/interfaces.py:437
+#: waeup/kofa/applicants/interfaces.py:504 waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:419 waeup/kofa/students/interfaces.py:524
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:416 waeup/kofa/interfaces.py:397
-#: waeup/kofa/interfaces.py:425 waeup/kofa/students/interfaces.py:208
+#: waeup/kofa/applicants/interfaces.py:359 waeup/kofa/interfaces.py:398
+#: waeup/kofa/interfaces.py:426 waeup/kofa/students/interfaces.py:209
 msgid "Phone"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:421
-#: waeup/kofa/applicants/interfaces.py:507
+#: waeup/kofa/applicants/interfaces.py:364
+#: waeup/kofa/applicants/interfaces.py:442
 msgid "1st Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:426
-#: waeup/kofa/applicants/interfaces.py:512
+#: waeup/kofa/applicants/interfaces.py:369
+#: waeup/kofa/applicants/interfaces.py:447
 msgid "2nd Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:431
-msgid "School Grades"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:441
-#: waeup/kofa/applicants/interfaces.py:517
+#: waeup/kofa/applicants/interfaces.py:381
+#: waeup/kofa/applicants/interfaces.py:468
+msgid "Notice"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:385
+#: waeup/kofa/applicants/interfaces.py:457
+msgid "Screening Venue"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:389
+#: waeup/kofa/applicants/interfaces.py:452
 msgid "Screening Score"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:445
-#: waeup/kofa/applicants/interfaces.py:522
-msgid "Screening Venue"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:449
-#: waeup/kofa/applicants/interfaces.py:527
+#: waeup/kofa/applicants/interfaces.py:393
+#: waeup/kofa/applicants/interfaces.py:462
 msgid "Admitted Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:455
-#: waeup/kofa/applicants/interfaces.py:534
-msgid "Notice"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:477
-#: waeup/kofa/students/interfaces.py:157
+#: waeup/kofa/applicants/interfaces.py:398
+#: waeup/kofa/students/interfaces.py:158
 #: waeup/kofa/browser/templates/showstudentspage.pt:4
 #: waeup/kofa/students/browser_templates/containerpage.pt:29
@@ -848,43 +866,34 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:482
+#: waeup/kofa/applicants/interfaces.py:403
 msgid "Form locked"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:561
-#: waeup/kofa/students/interfaces.py:484
+#: waeup/kofa/applicants/interfaces.py:514
+#: waeup/kofa/students/interfaces.py:504
 msgid "Payment Session"
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:110
-#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:23
-#: waeup/kofa/students/browser_templates/studycoursepage.pt:28
-msgid "Department:"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:121
-#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:15
-#: waeup/kofa/students/browser_templates/studycoursepage.pt:39
-msgid "Faculty:"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:186
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:26
-msgid "Admitted Course of Study:"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/applicants/pdf.py:204
+#: waeup/kofa/applicants/pdf.py:50
+msgid "Application Record"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/applicants/pdf.py:84
 msgid ""
-"<font size=10>Proceed to the login page of the portal and enter your new "
-"credentials: user name= ${a}, password = ${b}.</font>"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:210
-msgid "<font size=10>Change your password when you have  logged in.</font>"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:57
-msgid "Application Record"
+"Proceed to the login page of the portal and enter your new credentials: user "
+"name= ${a}, password = ${b}."
+msgstr ""
+
+#: waeup/kofa/applicants/pdf.py:91
+msgid "Change your password when you have logged in."
+msgstr ""
+
+#: waeup/kofa/applicants/utils.py:35
+msgid "Desired Study Courses"
+msgstr ""
+
+#: waeup/kofa/applicants/utils.py:36
+msgid "Process Data"
 msgstr ""
 
@@ -910,13 +919,13 @@
 
 #: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:256
+#: waeup/kofa/students/browser.py:268
 msgid "Create student record"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:168 waeup/kofa/students/viewlets.py:300
+#: waeup/kofa/applicants/viewlets.py:168 waeup/kofa/students/viewlets.py:321
 msgid "Download payment receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:183 waeup/kofa/students/viewlets.py:315
+#: waeup/kofa/applicants/viewlets.py:183 waeup/kofa/students/viewlets.py:336
 msgid "Request callback"
 msgstr ""
@@ -926,9 +935,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:73 waeup/kofa/students/viewlets.py:512
+#: waeup/kofa/applicants/viewlets.py:73 waeup/kofa/students/viewlets.py:535
 msgid "My Data"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:100 waeup/kofa/students/batching.py:141
+#: waeup/kofa/applicants/workflow.py:100 waeup/kofa/students/batching.py:142
 #: waeup/kofa/students/workflow.py:25
 msgid "Student record created"
@@ -962,5 +971,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:41 waeup/kofa/interfaces.py:72
+#: waeup/kofa/applicants/workflow.py:41 waeup/kofa/interfaces.py:73
 msgid "admitted"
 msgstr ""
@@ -970,5 +979,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:43 waeup/kofa/interfaces.py:71
+#: waeup/kofa/applicants/workflow.py:43 waeup/kofa/interfaces.py:72
 msgid "created"
 msgstr ""
@@ -1030,5 +1039,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:312
+#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:311
 msgid "Administration"
 msgstr ""
@@ -1039,5 +1048,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:389
+#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:388
 #: waeup/kofa/browser/viewlets.py:375 waeup/kofa/browser/viewlets.py:685
 msgid "Portal Users"
@@ -1059,5 +1068,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:106
+#: waeup/kofa/browser/pages.py:105
 msgid "Local role successfully removed: ${a}"
 msgstr ""
@@ -1097,11 +1106,11 @@
 msgstr ""
 
+#: waeup/kofa/browser/pages.py:115 waeup/kofa/hostels/browser.py:256
+#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:240
+msgid "No item selected."
+msgstr ""
+
 #: waeup/kofa/browser/pages.py:1155
 msgid "Log files can only be searched on Unix-based operating systems."
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:116 waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:228
-msgid "No item selected."
 msgstr ""
 
@@ -1185,12 +1194,12 @@
 
 #: waeup/kofa/browser/pages.py:1532 waeup/kofa/browser/pages.py:1551
-#: waeup/kofa/students/browser.py:98 waeup/kofa/students/export.py:22
-#: waeup/kofa/students/viewlets.py:472
+#: waeup/kofa/students/browser.py:100 waeup/kofa/students/export.py:40
+#: waeup/kofa/students/viewlets.py:495
 msgid "Students"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:155 waeup/kofa/browser/viewlets.py:322
-#: waeup/kofa/browser/templates/staffsitelayout.pt:28
-#: waeup/kofa/browser/templates/studentsitelayout.pt:33
+#: waeup/kofa/browser/pages.py:154 waeup/kofa/browser/viewlets.py:322
+#: waeup/kofa/browser/templates/staffsitelayout.pt:27
+#: waeup/kofa/browser/templates/studentsitelayout.pt:32
 msgid "Login"
 msgstr ""
@@ -1218,5 +1227,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:163
+#: waeup/kofa/browser/pages.py:162
 msgid "You logged in."
 msgstr ""
@@ -1244,10 +1253,10 @@
 msgstr ""
 
+#: waeup/kofa/browser/pages.py:180
+msgid "You entered wrong credentials."
+msgstr ""
+
 #: waeup/kofa/browser/pages.py:1808
 msgid "Edit certificate"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:181
-msgid "You entered wrong credentials."
 msgstr ""
 
@@ -1282,42 +1291,42 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:195
+#: waeup/kofa/browser/pages.py:194
 msgid "You have been logged out. Thanks for using WAeUP Kofa!"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:231
+#: waeup/kofa/browser/pages.py:230
 msgid "Contact ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:237 waeup/kofa/browser/pages.py:523
+#: waeup/kofa/browser/pages.py:236 waeup/kofa/browser/pages.py:523
 msgid "Send message now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:256 waeup/kofa/browser/pages.py:275
-#: waeup/kofa/browser/pages.py:540 waeup/kofa/students/browser.py:318
+#: waeup/kofa/browser/pages.py:255 waeup/kofa/browser/pages.py:274
+#: waeup/kofa/browser/pages.py:540 waeup/kofa/students/browser.py:330
 msgid "Your message has been sent."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:266
+#: waeup/kofa/browser/pages.py:265
 msgid "Send now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:277
+#: waeup/kofa/browser/pages.py:276
 msgid "A smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:302
+#: waeup/kofa/browser/pages.py:301
 msgid "<h1>Welcome to WAeUP.Kofa</h1>"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:390 waeup/kofa/hostels/browser.py:195
-#: waeup/kofa/students/viewlets.py:163 waeup/kofa/students/viewlets.py:171
-#: waeup/kofa/students/viewlets.py:226 waeup/kofa/students/viewlets.py:243
-#: waeup/kofa/students/viewlets.py:283
+#: waeup/kofa/browser/pages.py:389 waeup/kofa/hostels/browser.py:195
+#: waeup/kofa/students/viewlets.py:166 waeup/kofa/students/viewlets.py:174
+#: waeup/kofa/students/viewlets.py:247 waeup/kofa/students/viewlets.py:255
+#: waeup/kofa/students/viewlets.py:304
 msgid "Manage"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:391 waeup/kofa/browser/viewlets.py:180
+#: waeup/kofa/browser/pages.py:390 waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
 msgstr ""
@@ -1328,5 +1337,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:430 waeup/kofa/browser/pages.py:432
+#: waeup/kofa/browser/pages.py:431 waeup/kofa/browser/pages.py:433
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
@@ -1334,5 +1343,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:454
+#: waeup/kofa/browser/pages.py:455
 msgid "User account ${a} successfully added."
 msgstr ""
@@ -1348,5 +1357,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:521 waeup/kofa/students/browser.py:299
+#: waeup/kofa/browser/pages.py:521 waeup/kofa/students/browser.py:311
 msgid "Send message to ${a}"
 msgstr ""
@@ -1433,5 +1442,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:86
+#: waeup/kofa/browser/pages.py:85
 msgid "No local role selected."
 msgstr ""
@@ -1463,4 +1472,14 @@
 #: waeup/kofa/browser/pages.py:963
 msgid "Perform import"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/browser/pdf.py:127
+msgid "${footer_text} Page ${num1} of ${num2}"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/browser/pdf.py:336
+msgid "Date: ${a}"
 msgstr ""
 
@@ -1644,4 +1663,8 @@
 #: waeup/kofa/browser/templates/datacenterpage.pt:16
 msgid "Upload Date"
+msgstr ""
+
+#: waeup/kofa/browser/templates/default_waeup_display_form.pt:6
+msgid "Uploaded Files"
 msgstr ""
 
@@ -1683,15 +1706,20 @@
 
 #: waeup/kofa/browser/templates/facultypage.pt:1
-#: waeup/kofa/hostels/browser_templates/containerpage.pt:1
-msgid "There no subobjects registered yet."
+msgid "There are no subobjects registered yet."
+msgstr ""
+
+#: waeup/kofa/browser/templates/fileupload.pt:26
+#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:26
+msgid "Max. file size:"
 msgstr ""
 
 #: waeup/kofa/browser/templates/loginpage.pt:13
-#: waeup/kofa/browser/templates/usereditformpage.pt:8
+#: waeup/kofa/browser/templates/usereditformpage.pt:9
 #: waeup/kofa/students/browser_templates/basepage.pt:14
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:17
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:18
 #: waeup/kofa/students/browser_templates/change_password.pt:10
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:31
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:34
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:32
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:25
 msgid "Password:"
 msgstr ""
@@ -1711,5 +1739,5 @@
 msgstr ""
 
-#. Default: "Or simply forgot your student id or password? Then request a new password <strong><a href=\"changepw\"> here</a></strong>."
+#. Default: "Or simply forgot your student id, application id or password? Then request a new password <strong><a href=\"sendpw\"> here</a></strong>."
 #: waeup/kofa/browser/templates/loginpage.pt:44
 msgid "login_trouble3"
@@ -1762,46 +1790,46 @@
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:101
-#: waeup/kofa/browser/templates/studentsitelayout.pt:86
+#: waeup/kofa/browser/templates/staffsitelayout.pt:102
+#: waeup/kofa/browser/templates/studentsitelayout.pt:87
 msgid "Form Status:"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:114
-#: waeup/kofa/browser/templates/studentsitelayout.pt:100
+#: waeup/kofa/browser/templates/staffsitelayout.pt:115
+#: waeup/kofa/browser/templates/studentsitelayout.pt:101
 msgid "Back to top"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:116
-#: waeup/kofa/browser/templates/studentsitelayout.pt:102
+#: waeup/kofa/browser/templates/staffsitelayout.pt:117
+#: waeup/kofa/browser/templates/studentsitelayout.pt:103
 msgid "Kofa - Student Management System"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:119
-#: waeup/kofa/browser/templates/studentsitelayout.pt:105
+#: waeup/kofa/browser/templates/staffsitelayout.pt:120
+#: waeup/kofa/browser/templates/studentsitelayout.pt:106
 msgid "Copyright &copy; WAeUP Group 2008-2012"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:34
-#: waeup/kofa/browser/templates/studentsitelayout.pt:39
+#: waeup/kofa/browser/templates/staffsitelayout.pt:33
+#: waeup/kofa/browser/templates/studentsitelayout.pt:38
 msgid "Contact"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:40
-#: waeup/kofa/browser/templates/studentsitelayout.pt:45
+#: waeup/kofa/browser/templates/staffsitelayout.pt:39
+#: waeup/kofa/browser/templates/studentsitelayout.pt:44
 msgid "Logout"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:60
+#: waeup/kofa/browser/templates/staffsitelayout.pt:61
 msgid "Student Id:"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:64
+#: waeup/kofa/browser/templates/staffsitelayout.pt:65
 msgid "State:"
 msgstr ""
 
-#: waeup/kofa/browser/templates/usereditformpage.pt:14
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:23
+#: waeup/kofa/browser/templates/usereditformpage.pt:15
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:24
 #: waeup/kofa/students/browser_templates/change_password.pt:16
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:37
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:38
 msgid "Retype password:"
 msgstr ""
@@ -1815,5 +1843,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:383 waeup/kofa/students/viewlets.py:155
+#: waeup/kofa/browser/viewlets.py:383 waeup/kofa/students/viewlets.py:158
 msgid "Send email"
 msgstr ""
@@ -1832,5 +1860,5 @@
 
 #: waeup/kofa/browser/viewlets.py:528 waeup/kofa/browser/viewlets.py:536
-msgid "Show batch logs"
+msgid "Show logs"
 msgstr ""
 
@@ -1852,6 +1880,6 @@
 
 #: waeup/kofa/browser/viewlets.py:91 waeup/kofa/browser/viewlets.py:160
-#: waeup/kofa/students/viewlets.py:218 waeup/kofa/students/viewlets.py:356
-#: waeup/kofa/students/viewlets.py:403
+#: waeup/kofa/students/viewlets.py:239 waeup/kofa/students/viewlets.py:379
+#: waeup/kofa/students/viewlets.py:426
 msgid "Edit"
 msgstr ""
@@ -1928,4 +1956,8 @@
 #: waeup/kofa/hostels/browser.py:95
 msgid "Block ${a}, Room ${b}, Bed ${c}"
+msgstr ""
+
+#: waeup/kofa/hostels/browser_templates/containerpage.pt:1
+msgid "There no subobjects registered yet."
 msgstr ""
 
@@ -1952,9 +1984,9 @@
 msgstr ""
 
-#: waeup/kofa/hostels/hostel.py:180
+#: waeup/kofa/hostels/hostel.py:185
 msgid "unreserved"
 msgstr ""
 
-#: waeup/kofa/hostels/hostel.py:187
+#: waeup/kofa/hostels/hostel.py:192
 msgid "reserved"
 msgstr ""
@@ -1988,5 +2020,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/interfaces.py:175 waeup/kofa/students/interfaces.py:445
+#: waeup/kofa/hostels/interfaces.py:175 waeup/kofa/students/interfaces.py:465
 msgid "Bed Type"
 msgstr ""
@@ -2144,41 +2176,41 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:185
+#: waeup/kofa/interfaces.py:186
 msgid "Subject"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:189
+#: waeup/kofa/interfaces.py:190
 msgid "Grade"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:323
+#: waeup/kofa/interfaces.py:324
 msgid "Processor name"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:327
-msgid "Import mode"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:352
+#: waeup/kofa/interfaces.py:328
+msgid "Import Mode"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:353
 msgid "Email Address:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:359
+#: waeup/kofa/interfaces.py:360
 msgid "Email to:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:366
+#: waeup/kofa/interfaces.py:367
 msgid "Subject:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:370
+#: waeup/kofa/interfaces.py:371
 msgid "Full Name:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:374
+#: waeup/kofa/interfaces.py:375
 msgid "Text:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:405
+#: waeup/kofa/interfaces.py:406
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2190,5 +2222,5 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:410
+#: waeup/kofa/interfaces.py:411
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2197,129 +2229,129 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:414
+#: waeup/kofa/interfaces.py:415
 msgid "Description/Notice"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:431
+#: waeup/kofa/interfaces.py:432
 msgid "Portal roles"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:474
+#: waeup/kofa/interfaces.py:477
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:475
+#: waeup/kofa/interfaces.py:478
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:480
+#: waeup/kofa/interfaces.py:483
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:486
+#: waeup/kofa/interfaces.py:489
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:493
+#: waeup/kofa/interfaces.py:496
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:505
+#: waeup/kofa/interfaces.py:508
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:513
+#: waeup/kofa/interfaces.py:516
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:521
+#: waeup/kofa/interfaces.py:524
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:527
+#: waeup/kofa/interfaces.py:530
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:534
+#: waeup/kofa/interfaces.py:537
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:535
+#: waeup/kofa/interfaces.py:538
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:540
+#: waeup/kofa/interfaces.py:543
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:547
+#: waeup/kofa/interfaces.py:550
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:554
+#: waeup/kofa/interfaces.py:557
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:563 waeup/kofa/interfaces.py:621
+#: waeup/kofa/interfaces.py:566 waeup/kofa/interfaces.py:624
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:571 waeup/kofa/payments/interfaces.py:30
+#: waeup/kofa/interfaces.py:574 waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:576
+#: waeup/kofa/interfaces.py:579
 msgid "Surcharge Portal Provider"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:582
+#: waeup/kofa/interfaces.py:585
 msgid "Surcharge Payment Gateway Provider"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:588 waeup/kofa/payments/interfaces.py:120
+#: waeup/kofa/interfaces.py:591 waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:594
+#: waeup/kofa/interfaces.py:597
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:600
+#: waeup/kofa/interfaces.py:603
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:606 waeup/kofa/payments/interfaces.py:36
+#: waeup/kofa/interfaces.py:609 waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:73
+#: waeup/kofa/interfaces.py:74
 msgid "clearance started"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:74
+#: waeup/kofa/interfaces.py:75
 msgid "clearance requested"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:75
+#: waeup/kofa/interfaces.py:76
 msgid "cleared"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:76
+#: waeup/kofa/interfaces.py:77
 msgid "school fee paid"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:77
+#: waeup/kofa/interfaces.py:78
 msgid "returning"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:78
+#: waeup/kofa/interfaces.py:79
 msgid "courses registered"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:79
+#: waeup/kofa/interfaces.py:80
 msgid "courses validated"
 msgstr ""
 
-#: waeup/kofa/objecthistory.py:71
+#: waeup/kofa/objecthistory.py:72
 msgid "by"
 msgstr ""
@@ -2407,6 +2439,6 @@
 #: waeup/kofa/payments/interfaces.py:76
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:10
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:84
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:51
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:86
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:42
 msgid "Payment Date"
 msgstr ""
@@ -2421,434 +2453,455 @@
 
 #. Default: ""
-#: waeup/kofa/students/batching.py:165
+#: waeup/kofa/students/batching.py:166
 msgid "State '${a}' set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1000
+#. Default: ""
+#: waeup/kofa/students/browser.py:1009
+msgid "${a}: Payments"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1054
+msgid "Add online payment"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1057
 msgid "Create ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1008 waeup/kofa/students/browser.py:1230
+#: waeup/kofa/students/browser.py:1065 waeup/kofa/students/browser.py:1292
 msgid "Your current session does not match accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1077
+#: waeup/kofa/students/browser.py:1075
+msgid "Study course data are incomplete."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1139
 msgid "This ticket has already been paid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1090 waeup/kofa/students/browser.py:1098
-#: waeup/kofa/students/browser.py:1106
+#: waeup/kofa/students/browser.py:1152 waeup/kofa/students/browser.py:1160
+#: waeup/kofa/students/browser.py:1168
 msgid "Valid callback received. ${a}"
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/browser.py:1160
+#: waeup/kofa/students/browser.py:121 waeup/kofa/students/viewlets.py:117
+#: waeup/kofa/students/viewlets.py:557
+msgid "Study Course"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/browser.py:1222
 msgid "${a}: Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1172
+#: waeup/kofa/students/browser.py:1234
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1179
+#: waeup/kofa/students/browser.py:1241
 msgid "No bed ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:119 waeup/kofa/students/viewlets.py:114
-#: waeup/kofa/students/viewlets.py:534
-msgid "Study Course"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1210
+#: waeup/kofa/students/browser.py:127 waeup/kofa/students/viewlets.py:123
+#: waeup/kofa/students/viewlets.py:558
+msgid "Payments"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1272
 msgid "Add bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1212
+#: waeup/kofa/students/browser.py:1274
 msgid "Create bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1220
+#: waeup/kofa/students/browser.py:1282
 msgid "Your data are incomplete."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1224
+#: waeup/kofa/students/browser.py:1286
 msgid "You are in the wrong registration state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1235
+#: waeup/kofa/students/browser.py:1297
 msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1246 waeup/kofa/students/browser.py:1543
-#: waeup/kofa/students/browser.py:1656
+#: waeup/kofa/students/browser.py:1308 waeup/kofa/students/browser.py:1602
+#: waeup/kofa/students/browser.py:1721
 msgid "Activation code is invalid."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:125 waeup/kofa/students/viewlets.py:120
-#: waeup/kofa/students/viewlets.py:535
-msgid "Payments"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1266 waeup/kofa/students/browser.py:1394
+#. Default: ""
+#: waeup/kofa/students/browser.py:1328 waeup/kofa/students/browser.py:1454
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1271 waeup/kofa/students/browser.py:1548
-#: waeup/kofa/students/browser.py:1661
+#: waeup/kofa/students/browser.py:1333 waeup/kofa/students/browser.py:1607
+#: waeup/kofa/students/browser.py:1726
 msgid "Activation code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1274 waeup/kofa/students/browser.py:1551
-#: waeup/kofa/students/browser.py:1664 waeup/kofa/students/browser.py:1923
+#: waeup/kofa/students/browser.py:1336 waeup/kofa/students/browser.py:1610
+#: waeup/kofa/students/browser.py:1729 waeup/kofa/students/browser.py:1997
 msgid "invalidated"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1279 waeup/kofa/students/browser.py:1555
-#: waeup/kofa/students/browser.py:1669
+#: waeup/kofa/students/browser.py:1341 waeup/kofa/students/browser.py:1614
+#: waeup/kofa/students/browser.py:1734
 msgid "You are not the owner of this access code."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1290 waeup/kofa/students/browser.py:1408
+#: waeup/kofa/students/browser.py:1352 waeup/kofa/students/browser.py:1468
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1299
+#: waeup/kofa/students/browser.py:1361
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1317
+#: waeup/kofa/students/browser.py:1377
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1333
+#: waeup/kofa/students/browser.py:1393
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1339
+#: waeup/kofa/students/browser.py:1399
 msgid "Bed Allocation: "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1366
+#: waeup/kofa/students/browser.py:142 waeup/kofa/students/viewlets.py:129
+msgid "Accommodation"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1426
 msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1372
+#: waeup/kofa/students/browser.py:1432
 msgid "Student can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:140 waeup/kofa/students/viewlets.py:126
-msgid "Accommodation"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1415
+#. Default: ""
+#: waeup/kofa/students/browser.py:1475
 msgid "Student relocated: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1434
+#: waeup/kofa/students/browser.py:1494
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1447
+#: waeup/kofa/students/browser.py:1506
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1462 waeup/kofa/students/viewlets.py:365
+#. Default: ""
+#: waeup/kofa/students/browser.py:151
+msgid "Bed Ticket ${a}"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1521 waeup/kofa/students/viewlets.py:388
 msgid "Change password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1476
+#: waeup/kofa/students/browser.py:1535
 msgid "Password changed."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1488
+#: waeup/kofa/students/browser.py:1547
 msgid "Upload portrait"
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/browser.py:149
-msgid "Bed Ticket ${a}"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1503 waeup/kofa/students/viewlets.py:389
+#: waeup/kofa/students/browser.py:1562 waeup/kofa/students/viewlets.py:412
 #: waeup/kofa/students/workflow.py:44
 msgid "Start clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1507
+#: waeup/kofa/students/browser.py:1566
 msgid "Start clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1524 waeup/kofa/students/browser.py:1645
+#: waeup/kofa/students/browser.py:1583 waeup/kofa/students/browser.py:1710
 msgid "Wrong state"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1528
+#: waeup/kofa/students/browser.py:1587
 msgid "No portrait uploaded."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1532
+#: waeup/kofa/students/browser.py:1591
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1559
+#: waeup/kofa/students/browser.py:1618
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1571
+#: waeup/kofa/students/browser.py:1628
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1583 waeup/kofa/students/browser.py:1597
+#: waeup/kofa/students/browser.py:1648 waeup/kofa/students/browser.py:1662
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1656
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1606 waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1671 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1607
+#: waeup/kofa/students/browser.py:1672
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1610
+#: waeup/kofa/students/browser.py:1675
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1619
+#: waeup/kofa/students/browser.py:1684
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1628
+#: waeup/kofa/students/browser.py:1693
 msgid "Clearance has been requested."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1637 waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:170
+msgid "Student Section"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1702 waeup/kofa/students/viewlets.py:441
 msgid "Start course registration"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1641
+#: waeup/kofa/students/browser.py:1706
 msgid "Start course registration now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1677
+#: waeup/kofa/students/browser.py:1742
 msgid "Course registration has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:168
-msgid "Student Section"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1696
+#. Default: ""
+#: waeup/kofa/students/browser.py:1761
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1705
+#: waeup/kofa/students/browser.py:1770
 msgid "Create course list now"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1744
+#: waeup/kofa/students/browser.py:1809
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1781
+#: waeup/kofa/students/browser.py:1846
 msgid "Register course list"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1785
+#: waeup/kofa/students/browser.py:1850
 msgid "Course list has been registered."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1831
-msgid "Change my password"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:184 waeup/kofa/students/browser.py:220
+#: waeup/kofa/students/browser.py:186 waeup/kofa/students/browser.py:226
 msgid "Empty search string"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1841
+#: waeup/kofa/students/browser.py:1896
+msgid "Send me a new password"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1906
 msgid "Get new login credentials"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1855
-msgid "No student record found."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1863
+#: waeup/kofa/students/browser.py:1923
+msgid "Application package not installed."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1929
+msgid "No record found."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1937
 msgid "You have successfully changed your password for the"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1868
+#: waeup/kofa/students/browser.py:1942
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1879
+#: waeup/kofa/students/browser.py:1953
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1882
+#: waeup/kofa/students/browser.py:1956
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1897
+#: waeup/kofa/students/browser.py:1971
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1905
+#: waeup/kofa/students/browser.py:1979
 msgid "Access code is invalid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1908
+#: waeup/kofa/students/browser.py:1982
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1914
+#: waeup/kofa/students/browser.py:1988
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1920
+#: waeup/kofa/students/browser.py:1994
 msgid "Access code has already been used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1929
+#: waeup/kofa/students/browser.py:2003
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:202 waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:208 waeup/kofa/students/viewlets.py:142
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:226 waeup/kofa/students/browser.py:1894
+#: waeup/kofa/students/browser.py:238 waeup/kofa/students/browser.py:1968
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:253 waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:265 waeup/kofa/students/viewlets.py:149
 msgid "Add student"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:261
+#: waeup/kofa/students/browser.py:273
 msgid "Student record created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:277
+#: waeup/kofa/students/browser.py:289
 msgid "${a}: Base Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:320 waeup/kofa/students/browser.py:1871
+#: waeup/kofa/students/browser.py:332 waeup/kofa/students/browser.py:1945
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:332
+#: waeup/kofa/students/browser.py:343
 msgid "Manage base data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:407
+#: waeup/kofa/students/browser.py:423
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:423 waeup/kofa/students/viewlets.py:104
-#: waeup/kofa/students/viewlets.py:532
+#: waeup/kofa/students/browser.py:446 waeup/kofa/students/viewlets.py:107
+#: waeup/kofa/students/viewlets.py:555
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
 msgid "Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:429
+#: waeup/kofa/students/browser.py:452
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:449
+#: waeup/kofa/students/browser.py:471
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:478
+#: waeup/kofa/students/browser.py:512
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:480 waeup/kofa/students/browser.py:504
+#: waeup/kofa/students/browser.py:514 waeup/kofa/students/browser.py:538
 msgid "Student is in wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:497
+#: waeup/kofa/students/browser.py:531
 msgid "Clearance has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:501
+#: waeup/kofa/students/browser.py:535
 msgid "Clearance request has been rejected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:527
+#: waeup/kofa/students/browser.py:561
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:537
-msgid "Manage personal data"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:557
+#: waeup/kofa/students/browser.py:571
+msgid "Edit personal data"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/browser.py:591
 msgid "${a}: Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:587
+#: waeup/kofa/students/browser.py:621
 msgid "Manage study course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:590 waeup/kofa/students/browser.py:631
+#: waeup/kofa/students/browser.py:624 waeup/kofa/students/browser.py:671
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:591 waeup/kofa/students/browser.py:617
+#: waeup/kofa/students/browser.py:625 waeup/kofa/students/browser.py:657
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:625
+#: waeup/kofa/students/browser.py:645
+msgid "Current level not available for certificate."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:665
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:627 waeup/kofa/students/browser.py:1714
+#: waeup/kofa/students/browser.py:667 waeup/kofa/students/browser.py:1779
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:637
+#: waeup/kofa/students/browser.py:677
 msgid "No study level selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:673
+#: waeup/kofa/students/browser.py:728
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:696
+#: waeup/kofa/students/browser.py:751
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:702
+#: waeup/kofa/students/browser.py:757
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:711
-msgid "Course Registration Slip  "
-msgstr ""
-
-#: waeup/kofa/students/browser.py:717
+#: waeup/kofa/students/browser.py:766
+msgid "Course Registration Slip"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:772
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -2857,5 +2910,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:720
+#: waeup/kofa/students/browser.py:775
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -2863,10 +2916,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:721
+#: waeup/kofa/students/browser.py:776
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:722
+#: waeup/kofa/students/browser.py:777
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -2874,5 +2927,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:723
+#: waeup/kofa/students/browser.py:778
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -2880,5 +2933,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:724 waeup/kofa/students/interfaces.py:389
+#: waeup/kofa/students/browser.py:779 waeup/kofa/students/interfaces.py:409
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2887,65 +2940,56 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:752 waeup/kofa/students/browser.py:781
-#: waeup/kofa/students/browser.py:866 waeup/kofa/students/browser.py:871
-#: waeup/kofa/students/browser.py:1754 waeup/kofa/students/browser.py:1804
+#: waeup/kofa/students/browser.py:808 waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:922 waeup/kofa/students/browser.py:927
+#: waeup/kofa/students/browser.py:1819 waeup/kofa/students/browser.py:1869
 msgid "Add course ticket"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:773
+#: waeup/kofa/students/browser.py:829
 msgid "Manage study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:791 waeup/kofa/students/browser.py:1764
+#: waeup/kofa/students/browser.py:847 waeup/kofa/students/browser.py:1829
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:815 waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:871 waeup/kofa/students/browser.py:893
 msgid "This level does not correspond current level."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:819
+#: waeup/kofa/students/browser.py:875
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:821 waeup/kofa/students/browser.py:849
+#: waeup/kofa/students/browser.py:877 waeup/kofa/students/browser.py:905
 msgid "Student is in the wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:842
+#: waeup/kofa/students/browser.py:898
 msgid "Course list request has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:846
+#: waeup/kofa/students/browser.py:902
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:886 waeup/kofa/students/browser.py:1817
+#: waeup/kofa/students/browser.py:943 waeup/kofa/students/browser.py:1882
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:888 waeup/kofa/students/browser.py:1819
+#: waeup/kofa/students/browser.py:945 waeup/kofa/students/browser.py:1884
 msgid "Successfully added ${a}."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:909
+#: waeup/kofa/students/browser.py:966
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:925
+#: waeup/kofa/students/browser.py:982
 msgid "Manage course ticket ${a}"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:952
-msgid "${a}: Payments"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:997
-msgid "Add online payment"
 msgstr ""
 
@@ -2954,11 +2998,6 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:29
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:30
 msgid "Registration Transition:"
-msgstr ""
-
-#. Default: "Please solve the captcha<br />to prevent misuse of this service:"
-#: waeup/kofa/students/browser_templates/changepw.pt:8
-msgid "solve_captcha"
 msgstr ""
 
@@ -3010,6 +3049,6 @@
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:14
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:25
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:87
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:54
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:89
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:45
 msgid "State"
 msgstr ""
@@ -3030,4 +3069,14 @@
 msgstr ""
 
+#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:15
+#: waeup/kofa/students/browser_templates/studycoursepage.pt:39
+msgid "Faculty:"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:23
+#: waeup/kofa/students/browser_templates/studycoursepage.pt:28
+msgid "Department:"
+msgstr ""
+
 #: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:31
 msgid "Semester:"
@@ -3046,32 +3095,36 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:20
-#: waeup/kofa/students/browser_templates/fileupload.pt:26
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
-msgid "Max. file size:"
-msgstr ""
-
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:11
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:87
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:43
+msgid "Category"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:12
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:88
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:44
+msgid "Item"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:8
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:84
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:40
+msgid "Payment Id"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:9
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:85
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:52
-msgid "Category"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:12
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:86
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:53
-msgid "Item"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:8
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:82
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:49
-msgid "Payment Id"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:9
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:83
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:50
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:41
 msgid "Creation Date"
+msgstr ""
+
+#. Default: "Enter the email address stored on Kofa. You can't change your email address here. If you've forgotten your email address or the email address stored in Kofa is wrong or no longer valid, use the enquiries form to request a change of address."
+#: waeup/kofa/students/browser_templates/sendpassword.pt:19
+msgid "email_address_problem"
+msgstr ""
+
+#. Default: "Please solve the captcha<br />to prevent misuse of this service:"
+#: waeup/kofa/students/browser_templates/sendpassword.pt:8
+msgid "solve_captcha"
 msgstr ""
 
@@ -3175,69 +3228,76 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:183 waeup/kofa/students/interfaces.py:259
-#: waeup/kofa/students/interfaces.py:498
-msgid "Registration Number"
-msgstr ""
-
-#: waeup/kofa/students/interfaces.py:190 waeup/kofa/students/interfaces.py:268
+#: waeup/kofa/students/export.py:139
+msgid "Student Study Levels"
+msgstr ""
+
+#: waeup/kofa/students/export.py:87
+msgid "Student Study Courses"
+msgstr ""
+
+#: waeup/kofa/students/interfaces.py:191 waeup/kofa/students/interfaces.py:280
 msgid "Matriculation Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:197
+#: waeup/kofa/students/interfaces.py:198
 msgid "PWD Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/students/interfaces.py:204
 msgid "Email"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:223
+#: waeup/kofa/students/interfaces.py:225
 msgid "Clearance form locked"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:228
+#: waeup/kofa/students/interfaces.py:230
 msgid "CLR Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:235
+#: waeup/kofa/students/interfaces.py:237
 msgid "Nationality"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:245
+#: waeup/kofa/students/interfaces.py:246
+msgid "Employer"
+msgstr ""
+
+#: waeup/kofa/students/interfaces.py:256
 msgid "Permanent Address"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:277
+#: waeup/kofa/students/interfaces.py:289
 #: waeup/kofa/browser/templates/showstudentspage.pt:7
 msgid "Certificate"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:283
+#: waeup/kofa/students/interfaces.py:295
 msgid "Entry Mode"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:290
+#: waeup/kofa/students/interfaces.py:302
 msgid "Entry Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:298 waeup/kofa/students/interfaces.py:337
+#: waeup/kofa/students/interfaces.py:310 waeup/kofa/students/interfaces.py:349
 #: waeup/kofa/browser/templates/showstudentspage.pt:8
 msgid "Current Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:305 waeup/kofa/students/interfaces.py:343
+#: waeup/kofa/students/interfaces.py:317 waeup/kofa/students/interfaces.py:355
 #: waeup/kofa/browser/templates/showstudentspage.pt:9
 msgid "Current Level"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:312 waeup/kofa/students/interfaces.py:331
+#: waeup/kofa/students/interfaces.py:324 waeup/kofa/students/interfaces.py:343
 msgid "Current Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:319
+#: waeup/kofa/students/interfaces.py:331
 msgid "Previous Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:357 waeup/kofa/students/interfaces.py:451
+#: waeup/kofa/students/interfaces.py:369 waeup/kofa/students/interfaces.py:471
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3245,9 +3305,9 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:363
+#: waeup/kofa/students/interfaces.py:375
 msgid "Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:382
+#: waeup/kofa/students/interfaces.py:402
 #: waeup/kofa/browser/templates/certificatepage.pt:30
 #: waeup/kofa/browser/templates/certificatemanagepage.pt:33
@@ -3255,13 +3315,13 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:396
+#: waeup/kofa/students/interfaces.py:416
 msgid "Automatical Creation"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:403
+#: waeup/kofa/students/interfaces.py:423
 msgid "Carry-over Course"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:422
+#: waeup/kofa/students/interfaces.py:442
 #: waeup/kofa/university/interfaces.py:299
 #: waeup/kofa/browser/templates/certificatepage.pt:29
@@ -3270,131 +3330,139 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:439
+#: waeup/kofa/students/interfaces.py:459
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:10
 msgid "Bed Coordinates"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:458
+#: waeup/kofa/students/interfaces.py:478
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:9
 msgid "Booking Date"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:464
+#: waeup/kofa/students/interfaces.py:484
 msgid "Booking Activation Code"
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/utils.py:167
+#: waeup/kofa/students/utils.py:182
+msgid "Scanned Documents"
+msgstr ""
+
+#: waeup/kofa/students/utils.py:190
+msgid "(not provided)"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/utils.py:218
 msgid "<font size=10>${a} Page ${b} of ${c}</font>"
 msgstr ""
 
-#: waeup/kofa/students/utils.py:298 waeup/kofa/students/viewlets.py:71
-#: waeup/kofa/students/viewlets.py:99
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:6
+#: waeup/kofa/students/utils.py:333 waeup/kofa/students/viewlets.py:74
+#: waeup/kofa/students/viewlets.py:102
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:7
 msgid "Base Data"
 msgstr ""
 
-#: waeup/kofa/students/utils.py:329
-msgid "Scanned Documents"
-msgstr ""
-
-#: waeup/kofa/students/utils.py:382
+#: waeup/kofa/students/utils.py:368
 msgid "(not yet)"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:109 waeup/kofa/students/viewlets.py:533
+#: waeup/kofa/students/viewlets.py:112 waeup/kofa/students/viewlets.py:556
 msgid "Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:131 waeup/kofa/students/viewlets.py:537
+#: waeup/kofa/students/viewlets.py:134 waeup/kofa/students/viewlets.py:560
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:27
 msgid "History"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:179 waeup/kofa/students/workflow.py:72
+#: waeup/kofa/students/viewlets.py:182 waeup/kofa/students/workflow.py:72
 msgid "Clear student"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:194
+#: waeup/kofa/students/viewlets.py:197
 msgid "Reject clearance"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:210
+#: waeup/kofa/students/viewlets.py:213
 msgid "Download clearance slip"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:235
+#: waeup/kofa/students/viewlets.py:222 waeup/kofa/students/viewlets.py:231
+msgid "View"
+msgstr ""
+
+#: waeup/kofa/students/viewlets.py:263 waeup/kofa/students/workflow.py:128
+msgid "Validate courses"
+msgstr ""
+
+#: waeup/kofa/students/viewlets.py:279
+msgid "Reject courses"
+msgstr ""
+
+#: waeup/kofa/students/viewlets.py:296
 msgid "Download course registration slip"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:251 waeup/kofa/students/workflow.py:128
-msgid "Validate courses"
-msgstr ""
-
-#: waeup/kofa/students/viewlets.py:267
-msgid "Reject courses"
-msgstr ""
-
-#: waeup/kofa/students/viewlets.py:330
+#: waeup/kofa/students/viewlets.py:353
 msgid "Book accommodation"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:339
+#: waeup/kofa/students/viewlets.py:362
 msgid "Download bed allocation slip"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:348
+#: waeup/kofa/students/viewlets.py:371
 msgid "Relocate student"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:374
+#: waeup/kofa/students/viewlets.py:397
 msgid "Change portrait"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:432
+#: waeup/kofa/students/viewlets.py:455
 msgid "Add course list"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:450
+#: waeup/kofa/students/viewlets.py:473
 msgid "Add and remove courses"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:536
+#: waeup/kofa/students/viewlets.py:559
 msgid "Accommodation Data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:548
+#: waeup/kofa/students/viewlets.py:571
 msgid "${a} deleted."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:561
+#: waeup/kofa/students/viewlets.py:584
 msgid "File name has no extension."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:564
+#: waeup/kofa/students/viewlets.py:587
 msgid "File name contains more than one dot."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:571
+#: waeup/kofa/students/viewlets.py:594
 msgid "${a} file extension expected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:577
+#: waeup/kofa/students/viewlets.py:600
 msgid "Only the following extension are allowed: ${a}"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:583
+#: waeup/kofa/students/viewlets.py:606
 msgid "Uploaded file is too big."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:590
+#: waeup/kofa/students/viewlets.py:613
 msgid "File ${a} uploaded."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:608
+#: waeup/kofa/students/viewlets.py:631
 #: waeup/kofa/browser/templates/datacenterlogspage.pt:10
 #: waeup/kofa/browser/templates/datacenterpage.pt:14
@@ -3403,84 +3471,84 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:609
+#: waeup/kofa/students/viewlets.py:632
 msgid "Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:632
+#: waeup/kofa/students/viewlets.py:655
 msgid "Upload new file"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:633
+#: waeup/kofa/students/viewlets.py:656
 msgid "Delete attachment"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:663
+#: waeup/kofa/students/viewlets.py:687
 msgid "No local file selected."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:677
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:8
+#: waeup/kofa/students/viewlets.py:701
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:9
 msgid "Passport Picture"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:688
+#: waeup/kofa/students/viewlets.py:712
 msgid "Passport Picture (jpg only)"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:703 waeup/kofa/students/viewlets.py:714
+#: waeup/kofa/students/viewlets.py:727 waeup/kofa/students/viewlets.py:738
 msgid "Birth Certificate"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:704 waeup/kofa/students/viewlets.py:715
+#: waeup/kofa/students/viewlets.py:728 waeup/kofa/students/viewlets.py:739
 msgid "Birth Certificate Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:724 waeup/kofa/students/viewlets.py:735
+#: waeup/kofa/students/viewlets.py:748 waeup/kofa/students/viewlets.py:759
 msgid "Acceptance Letter"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:725 waeup/kofa/students/viewlets.py:736
+#: waeup/kofa/students/viewlets.py:749 waeup/kofa/students/viewlets.py:760
 msgid "Acceptance Letter Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:85
+#: waeup/kofa/students/viewlets.py:88
 msgid "Application Slip"
 msgstr ""
 
-#: waeup/kofa/students/vocabularies.py:117
+#: waeup/kofa/students/vocabularies.py:116
 msgid "male"
 msgstr ""
 
-#: waeup/kofa/students/vocabularies.py:119
+#: waeup/kofa/students/vocabularies.py:118
 msgid "female"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:77
+#: waeup/kofa/students/vocabularies.py:76
 msgid "Error: level id ${value} out of range"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:88
+#: waeup/kofa/students/vocabularies.py:87
 msgid "${title} 2nd spillover"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:91
+#: waeup/kofa/students/vocabularies.py:90
 msgid "${title} 3rd spillover"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:94
+#: waeup/kofa/students/vocabularies.py:93
 msgid "${title} 1st spillover"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:96
+#: waeup/kofa/students/vocabularies.py:95
 msgid "${title} on 1st probation"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:98
+#: waeup/kofa/students/vocabularies.py:97
 msgid "${title} on 2nd probation"
 msgstr ""
@@ -3490,6 +3558,6 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:108
-msgid "Student record reset to 'returning'"
+#: waeup/kofa/students/workflow.py:108 waeup/kofa/students/workflow.py:143
+msgid "Reset to 'returning'"
 msgstr ""
 
@@ -3507,5 +3575,5 @@
 
 #: waeup/kofa/students/workflow.py:122 waeup/kofa/students/workflow.py:136
-msgid "Student record reset to 'paid'"
+msgid "Reset to 'paid'"
 msgstr ""
 
@@ -3518,8 +3586,4 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:143
-msgid "Returned"
-msgstr ""
-
 #: waeup/kofa/students/workflow.py:149
 msgid "Reset to validated"
@@ -3527,5 +3591,5 @@
 
 #: waeup/kofa/students/workflow.py:150
-msgid "Student record reset to 'validated'"
+msgid "Reset to 'validated'"
 msgstr ""
 
@@ -3547,5 +3611,5 @@
 
 #: waeup/kofa/students/workflow.py:38
-msgid "Student record reset"
+msgid "Reset to initial state"
 msgstr ""
 
@@ -3559,5 +3623,5 @@
 
 #: waeup/kofa/students/workflow.py:52
-msgid "Student record reset to 'admitted'"
+msgid "Reset to 'admitted'"
 msgstr ""
 
@@ -3571,5 +3635,5 @@
 
 #: waeup/kofa/students/workflow.py:66 waeup/kofa/students/workflow.py:80
-msgid "Student record reset to 'clearance'"
+msgid "Reset to 'clearance'"
 msgstr ""
 
@@ -3591,5 +3655,5 @@
 
 #: waeup/kofa/students/workflow.py:94
-msgid "Student record reset to 'cleared'"
+msgid "Reset to 'cleared'"
 msgstr ""
 
@@ -3726,4 +3790,8 @@
 msgstr ""
 
+#: waeup/kofa/university/vocabularies.py:38
+msgid "900 (Year 9)"
+msgstr ""
+
 #: waeup/kofa/utils/countries.py:10
 msgid "Albania"
@@ -4030,5 +4098,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/countries.py:169 waeup/kofa/utils/utils.py:47
+#: waeup/kofa/utils/countries.py:169 waeup/kofa/utils/utils.py:48
 msgid "Nigeria"
 msgstr ""
@@ -4682,5 +4750,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/countries.py:90 waeup/kofa/utils/utils.py:46
+#: waeup/kofa/utils/countries.py:90 waeup/kofa/utils/utils.py:47
 msgid "Germany"
 msgstr ""
@@ -4722,5 +4790,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:149
+#: waeup/kofa/utils/utils.py:151
 msgid ""
 "Fullname: ${a}\n"
@@ -4732,5 +4800,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:194
+#: waeup/kofa/utils/utils.py:201
 msgid ""
 "Dear ${a},\n"
@@ -4752,17 +4820,17 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:48
+#: waeup/kofa/utils/utils.py:49
 msgid "U.S."
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:117
+#: waeup/kofa/widgets/phonewidget.py:118
 msgid "Empty phone field(s)."
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:121
+#: waeup/kofa/widgets/phonewidget.py:122
 msgid "Int. prefix requires format '+NNN'"
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:127
+#: waeup/kofa/widgets/phonewidget.py:130
 msgid "Phone numbers may contain numbers only."
 msgstr ""
Index: /main/waeup.kofa/trunk/src/waeup/kofa/locales/ha/LC_MESSAGES/waeup.kofa.po
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/locales/ha/LC_MESSAGES/waeup.kofa.po	(revision 8196)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/ha/LC_MESSAGES/waeup.kofa.po	(revision 8197)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Mon Mar 26 11:33:10 2012\n"
+"POT-Creation-Date: Tue Apr 17 16:18:24 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -28,8 +28,8 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: waeup/kofa/accesscodes/browser.py:100 waeup/kofa/accesscodes/browser.py:113
-#: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:129
-#: waeup/kofa/applicants/browser.py:181 waeup/kofa/applicants/browser.py:252
-#: waeup/kofa/applicants/browser.py:253 waeup/kofa/applicants/browser.py:336
+#: waeup/kofa/accesscodes/browser.py:101 waeup/kofa/accesscodes/browser.py:114
+#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:131
+#: waeup/kofa/applicants/browser.py:180 waeup/kofa/applicants/browser.py:249
+#: waeup/kofa/applicants/browser.py:250 waeup/kofa/applicants/browser.py:331
 #: waeup/kofa/browser/pages.py:507 waeup/kofa/browser/pages.py:712
 #: waeup/kofa/browser/pages.py:739 waeup/kofa/browser/pages.py:762
@@ -45,144 +45,144 @@
 #: waeup/kofa/browser/pages.py:1814 waeup/kofa/browser/pages.py:1816
 #: waeup/kofa/browser/pages.py:1851 waeup/kofa/browser/pages.py:1902
-#: waeup/kofa/browser/pages.py:1954 waeup/kofa/students/browser.py:589
-#: waeup/kofa/students/browser.py:590 waeup/kofa/students/browser.py:751
-#: waeup/kofa/students/browser.py:753 waeup/kofa/students/browser.py:893
+#: waeup/kofa/browser/pages.py:1954 waeup/kofa/students/browser.py:623
+#: waeup/kofa/students/browser.py:624 waeup/kofa/students/browser.py:807
+#: waeup/kofa/students/browser.py:809 waeup/kofa/students/browser.py:950
 msgid "Cancel"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:102
+#: waeup/kofa/accesscodes/browser.py:103
 msgid "Batch creation cancelled."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:112
+#: waeup/kofa/accesscodes/browser.py:113
 msgid "Reimport"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:115
+#: waeup/kofa/accesscodes/browser.py:116
 msgid "Reimport Access Code Batches"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:120
+#: waeup/kofa/accesscodes/browser.py:121
 msgid "Reimport cancelled."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:126
+#: waeup/kofa/accesscodes/browser.py:127
 msgid "No file chosen. Action cancelled."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:136
+#: waeup/kofa/accesscodes/browser.py:137
 msgid "This batch already exists: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:139
+#: waeup/kofa/accesscodes/browser.py:140
 msgid "Successfully reimported: ${a}"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:152
+#: waeup/kofa/accesscodes/browser.py:153
 msgid "Search and Manage Access Codes"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:596
+#: waeup/kofa/accesscodes/browser.py:154 waeup/kofa/browser/pages.py:596
 #: waeup/kofa/browser/pages.py:1146 waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:169 waeup/kofa/students/browser.py:203
+#: waeup/kofa/students/browser.py:171 waeup/kofa/students/browser.py:209
 msgid "Search"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:154
+#: waeup/kofa/accesscodes/browser.py:155
 msgid "Disable ACs"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:155
+#: waeup/kofa/accesscodes/browser.py:156
 msgid "Enable ACs"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:180 waeup/kofa/accesscodes/workflow.py:39
+#: waeup/kofa/accesscodes/browser.py:181 waeup/kofa/accesscodes/workflow.py:39
 msgid "disabled"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:182
+#: waeup/kofa/accesscodes/browser.py:183
 msgid "${a} disabled."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:186
+#: waeup/kofa/accesscodes/browser.py:187
 msgid "${a}: Disable transition not allowed."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:190
+#: waeup/kofa/accesscodes/browser.py:191
 msgid "re-enabled"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:192
+#: waeup/kofa/accesscodes/browser.py:193
 msgid "${a} (re-)enabled."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:196
+#: waeup/kofa/accesscodes/browser.py:197
 msgid "${a}: Re-enable transition not allowed."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:235
+#: waeup/kofa/accesscodes/browser.py:236
 msgid "Add Access Code Batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:244
+#: waeup/kofa/accesscodes/browser.py:245
 msgid "Reimport Access Code Batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:252
+#: waeup/kofa/accesscodes/browser.py:253
 msgid "Search Access Codes"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:261
+#: waeup/kofa/accesscodes/browser.py:262
 msgid "Access Codes"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:43
+#: waeup/kofa/accesscodes/browser.py:44
 msgid "Archive"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:44
+#: waeup/kofa/accesscodes/browser.py:45
 msgid "Archive and delete"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:46 waeup/kofa/accesscodes/browser.py:206
-#: waeup/kofa/accesscodes/browser.py:226
+#: waeup/kofa/accesscodes/browser.py:47 waeup/kofa/accesscodes/browser.py:207
+#: waeup/kofa/accesscodes/browser.py:227
 msgid "Access Code Batches"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:53
+#: waeup/kofa/accesscodes/browser.py:54
 msgid "No batch selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:61
+#: waeup/kofa/accesscodes/browser.py:62
 msgid "Archived ${a} (${b})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:68
+#: waeup/kofa/accesscodes/browser.py:69
 msgid "Deleted batch ${a}"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:77
+#: waeup/kofa/accesscodes/browser.py:78
 msgid "Create Access Code Batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:83
+#: waeup/kofa/accesscodes/browser.py:84
 msgid "Create batch"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:91
+#: waeup/kofa/accesscodes/browser.py:92
 msgid "Batch created (${a} entries)"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:93
+#: waeup/kofa/accesscodes/browser.py:94
 msgid "Data written to ${a}"
 msgstr ""
@@ -342,15 +342,15 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:116 waeup/kofa/applicants/browser.py:323
-#: waeup/kofa/applicants/browser.py:744
+#: waeup/kofa/applicants/browser.py:118 waeup/kofa/applicants/browser.py:318
+#: waeup/kofa/applicants/browser.py:714
 msgid "Could not delete:"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:119 waeup/kofa/applicants/browser.py:326
-#: waeup/kofa/applicants/browser.py:747 waeup/kofa/browser/pages.py:137
-#: waeup/kofa/students/browser.py:241 waeup/kofa/students/browser.py:647
-#: waeup/kofa/students/browser.py:801 waeup/kofa/students/browser.py:979
-#: waeup/kofa/students/browser.py:1189 waeup/kofa/students/browser.py:1776
+#: waeup/kofa/applicants/browser.py:121 waeup/kofa/applicants/browser.py:321
+#: waeup/kofa/applicants/browser.py:717 waeup/kofa/browser/pages.py:136
+#: waeup/kofa/students/browser.py:253 waeup/kofa/students/browser.py:687
+#: waeup/kofa/students/browser.py:857 waeup/kofa/students/browser.py:1036
+#: waeup/kofa/students/browser.py:1251 waeup/kofa/students/browser.py:1841
 msgid "Successfully removed: ${a}"
 msgstr ""
@@ -362,9 +362,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:177
+#: waeup/kofa/applicants/browser.py:176
 msgid "Added:"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:189 waeup/kofa/applicants/export.py:78
+#: waeup/kofa/applicants/browser.py:188 waeup/kofa/applicants/export.py:76
 #: waeup/kofa/applicants/viewlets.py:44
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:12
@@ -373,8 +373,8 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:252 waeup/kofa/applicants/browser.py:299
-#: waeup/kofa/applicants/browser.py:653 waeup/kofa/applicants/browser.py:687
-#: waeup/kofa/applicants/browser.py:790 waeup/kofa/applicants/browser.py:793
-#: waeup/kofa/applicants/browser.py:837 waeup/kofa/browser/pages.py:480
+#: waeup/kofa/applicants/browser.py:249 waeup/kofa/applicants/browser.py:294
+#: waeup/kofa/applicants/browser.py:619 waeup/kofa/applicants/browser.py:657
+#: waeup/kofa/applicants/browser.py:759 waeup/kofa/applicants/browser.py:762
+#: waeup/kofa/applicants/browser.py:806 waeup/kofa/browser/pages.py:480
 #: waeup/kofa/browser/pages.py:635 waeup/kofa/browser/pages.py:658
 #: waeup/kofa/browser/pages.py:732 waeup/kofa/browser/pages.py:1185
@@ -384,156 +384,168 @@
 #: waeup/kofa/browser/pages.py:1835 waeup/kofa/hostels/browser.py:209
 #: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:318
-#: waeup/kofa/students/browser.py:358 waeup/kofa/students/browser.py:463
-#: waeup/kofa/students/browser.py:540 waeup/kofa/students/browser.py:589
-#: waeup/kofa/students/browser.py:605 waeup/kofa/students/browser.py:751
-#: waeup/kofa/students/browser.py:776 waeup/kofa/students/browser.py:1450
-#: waeup/kofa/students/browser.py:1465 waeup/kofa/students/browser.py:1580
+#: waeup/kofa/students/browser.py:369 waeup/kofa/students/browser.py:497
+#: waeup/kofa/students/browser.py:574 waeup/kofa/students/browser.py:623
+#: waeup/kofa/students/browser.py:639 waeup/kofa/students/browser.py:807
+#: waeup/kofa/students/browser.py:832 waeup/kofa/students/browser.py:1509
+#: waeup/kofa/students/browser.py:1524 waeup/kofa/students/browser.py:1645
 msgid "Save"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:253 waeup/kofa/applicants/browser.py:331
-#: waeup/kofa/applicants/browser.py:360
+#: waeup/kofa/applicants/browser.py:250 waeup/kofa/applicants/browser.py:326
+#: waeup/kofa/applicants/browser.py:354
 msgid "Add applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:263 waeup/kofa/applicants/viewlets.py:95
+#: waeup/kofa/applicants/browser.py:258 waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:303 waeup/kofa/applicants/browser.py:716
+#: waeup/kofa/applicants/browser.py:298 waeup/kofa/applicants/browser.py:686
 #: waeup/kofa/browser/pages.py:1444 waeup/kofa/browser/pages.py:1766
 #: waeup/kofa/browser/pages.py:1838 waeup/kofa/browser/pages.py:1950
-#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:82
-#: waeup/kofa/students/browser.py:384
+#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:84
+#: waeup/kofa/students/browser.py:395
 msgid "Form has been saved."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:312
+#: waeup/kofa/applicants/browser.py:307
 msgid "No applicant selected!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:363
+#: waeup/kofa/applicants/browser.py:357
 msgid "Create application record"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:368
+#: waeup/kofa/applicants/browser.py:362
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:381
+#: waeup/kofa/applicants/browser.py:376
 msgid "Applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:396 waeup/kofa/students/browser.py:283
+#: waeup/kofa/applicants/browser.py:395 waeup/kofa/students/browser.py:295
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:397 waeup/kofa/students/browser.py:284
+#: waeup/kofa/applicants/browser.py:396 waeup/kofa/students/browser.py:296
 msgid "unset"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:402
-msgid "${a} Application Record ${b}"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:453
+#: waeup/kofa/applicants/browser.py:401
+msgid "${a} <br /> Application Record ${b}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:452
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:460 waeup/kofa/students/browser.py:1028
+#: waeup/kofa/applicants/browser.py:459 waeup/kofa/students/browser.py:1091
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:473 waeup/kofa/students/browser.py:1042
+#: waeup/kofa/applicants/browser.py:472 waeup/kofa/students/browser.py:1105
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:500 waeup/kofa/students/browser.py:1061
+#: waeup/kofa/applicants/browser.py:499 waeup/kofa/students/browser.py:1124
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:528 waeup/kofa/students/browser.py:1110
+#: waeup/kofa/applicants/browser.py:527 waeup/kofa/students/browser.py:1172
 msgid "Valid callback received."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:549
+#: waeup/kofa/applicants/browser.py:548
 msgid "Payment Data"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:555
+#: waeup/kofa/applicants/browser.py:554
 msgid "Online Payment Receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:561
+#: waeup/kofa/applicants/browser.py:560
 msgid "Ticket not yet paid."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:626
+#: waeup/kofa/applicants/browser.py:594
 msgid "Uploaded image is too big!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:63
+#: waeup/kofa/applicants/browser.py:599
+msgid "jpg file extension expected."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:619 waeup/kofa/applicants/browser.py:762
+#: waeup/kofa/applicants/browser.py:814
+msgid "Final Submit"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:620 waeup/kofa/applicants/browser.py:727
+#: waeup/kofa/applicants/browser.py:760 waeup/kofa/applicants/browser.py:795
+#: waeup/kofa/students/browser.py:1042
+msgid "Add online payment ticket"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:620 waeup/kofa/applicants/browser.py:732
+#: waeup/kofa/applicants/browser.py:760 waeup/kofa/applicants/browser.py:763
+#: waeup/kofa/applicants/browser.py:800 waeup/kofa/students/browser.py:809
+#: waeup/kofa/students/browser.py:841 waeup/kofa/students/browser.py:1018
+#: waeup/kofa/students/browser.py:1823
+msgid "Remove selected tickets"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/applicants/browser.py:643
+msgid "${a} <br /> Application Form ${b}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:65
 msgid "Application Section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:631
-msgid "jpg file extension expected."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:653 waeup/kofa/applicants/browser.py:793
-#: waeup/kofa/applicants/browser.py:845
-msgid "Final Submit"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:757
-#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:826
-#: waeup/kofa/students/browser.py:985
-msgid "Add online payment ticket"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:762
-#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:831 waeup/kofa/students/browser.py:753
-#: waeup/kofa/students/browser.py:785 waeup/kofa/students/browser.py:961
-#: waeup/kofa/students/browser.py:1758
-msgid "Remove selected tickets"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/applicants/browser.py:673
-msgid "${a} Application Form ${b}"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:684 waeup/kofa/students/browser.py:355
+#: waeup/kofa/applicants/browser.py:654 waeup/kofa/students/browser.py:366
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:731 waeup/kofa/students/browser.py:967
+#: waeup/kofa/applicants/browser.py:701 waeup/kofa/students/browser.py:1024
 msgid "No payment selected."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:75 waeup/kofa/applicants/viewlets.py:88
+#: waeup/kofa/applicants/browser.py:77 waeup/kofa/applicants/viewlets.py:88
 msgid "Manage application section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:78 waeup/kofa/applicants/browser.py:104
-#: waeup/kofa/applicants/browser.py:253 waeup/kofa/applicants/browser.py:306
+#: waeup/kofa/applicants/browser.py:773 waeup/kofa/students/browser.py:92
+msgid "The requested form is locked (read-only)."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:787
+msgid "No passport picture uploaded."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:789
+msgid "Passport picture confirmation box not ticked."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:106
+#: waeup/kofa/applicants/browser.py:250 waeup/kofa/applicants/browser.py:301
 #: waeup/kofa/browser/pages.py:638 waeup/kofa/browser/pages.py:679
 #: waeup/kofa/browser/pages.py:1324 waeup/kofa/browser/pages.py:1335
 #: waeup/kofa/browser/pages.py:1401 waeup/kofa/browser/pages.py:1436
-#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:204
-#: waeup/kofa/students/browser.py:1156 waeup/kofa/students/browser.py:1169
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:210
+#: waeup/kofa/students/browser.py:1218 waeup/kofa/students/browser.py:1231
 msgid "Remove selected"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:78 waeup/kofa/applicants/browser.py:124
-#: waeup/kofa/applicants/browser.py:147 waeup/kofa/applicants/browser.py:159
+#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:126
+#: waeup/kofa/applicants/browser.py:149 waeup/kofa/applicants/browser.py:159
 msgid "Add applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:138
-#: waeup/kofa/applicants/browser.py:254 waeup/kofa/applicants/browser.py:345
+#: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:140
+#: waeup/kofa/applicants/browser.py:251 waeup/kofa/applicants/browser.py:340
 #: waeup/kofa/browser/pages.py:1402 waeup/kofa/browser/pages.py:1461
 #: waeup/kofa/browser/pages.py:1571 waeup/kofa/browser/pages.py:1657
@@ -542,10 +554,10 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:804 waeup/kofa/students/browser.py:90
-msgid "The requested form is locked (read-only)."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:134
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:341
+#: waeup/kofa/applicants/browser.py:826 waeup/kofa/students/browser.py:1690
+msgid "This form cannot be submitted. Wrong state!"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:83 waeup/kofa/applicants/browser.py:136
+#: waeup/kofa/applicants/browser.py:252 waeup/kofa/applicants/browser.py:336
 #: waeup/kofa/browser/pages.py:1403 waeup/kofa/browser/pages.py:1457
 #: waeup/kofa/browser/pages.py:1572 waeup/kofa/browser/pages.py:1653
@@ -554,62 +566,66 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:818
-msgid "No passport picture uploaded."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:82
+#: waeup/kofa/applicants/browser.py:831
+msgid "Form has been submitted."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:84
 msgid "Applicants Containers"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:820
-msgid "Passport picture confirmation box not ticked."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:857 waeup/kofa/students/browser.py:1625
-msgid "This form cannot be submitted. Wrong state!"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:862
-msgid "Form has been submitted."
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/applicants/browser.py:897
-msgid "Register for ${a} Application"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:903
+#. Default: ""
+#: waeup/kofa/applicants/browser.py:874
+msgid "Apply for ${a}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:880
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:908
+#: waeup/kofa/applicants/browser.py:885
 msgid "Application has ended."
 msgstr ""
 
+#: waeup/kofa/applicants/browser.py:894
+msgid "Get login credentials"
+msgstr ""
+
 #: waeup/kofa/applicants/browser.py:917
-msgid "Get login credentials"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:932
+msgid "An error occurred."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:923 waeup/kofa/applicants/browser.py:934
+msgid "No application record found."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:926
+msgid "Your password has already been set. Please proceed to the login page."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:944
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:939
+#: waeup/kofa/applicants/browser.py:951
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:948
+#: waeup/kofa/applicants/browser.py:960
 msgid "Your registration was successful."
 msgstr ""
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:18
-msgid "Photograph"
-msgstr ""
-
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:43
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:17
+msgid "Admitted Course of Study:"
+msgstr ""
+
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:19
+msgid "Passport Photo:"
+msgstr ""
+
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:44
 msgid "Application Transition:"
 msgstr ""
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:59
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:60
 msgid ""
 "I confirm that the Passport Photograph uploaded on this form is a true "
@@ -617,6 +633,6 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:74
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:43
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:76
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:34
 msgid "Acceptance Fee Payment Tickets"
 msgstr ""
@@ -640,4 +656,10 @@
 msgstr ""
 
+#: waeup/kofa/applicants/browser_templates/applicantregister.pt:22
+msgid ""
+"Your application record will be looked up and an email with your login "
+"credentials will be sent to the address provided."
+msgstr ""
+
 #: waeup/kofa/applicants/browser_templates/applicantregister.pt:8
 msgid "Please solve the captcha<br />to prevent misuse of this service:"
@@ -665,17 +687,17 @@
 msgstr ""
 
-#: waeup/kofa/applicants/container.py:52
-msgid "Basic"
-msgstr ""
-
-#: waeup/kofa/applicants/container.py:55
-msgid "handles basic applicants"
-msgstr ""
-
 #: waeup/kofa/applicants/export.py:40
 msgid "Basic Applicants Containers"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:198 waeup/kofa/students/browser.py:718
+#: waeup/kofa/applicants/interfaces.py:138
+msgid "Create Application Records"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:139
+msgid "Update Application Records"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:159 waeup/kofa/students/browser.py:773
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -701,5 +723,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:205 waeup/kofa/students/browser.py:719
+#: waeup/kofa/applicants/interfaces.py:165 waeup/kofa/students/browser.py:774
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -720,126 +742,122 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:212
-#: waeup/kofa/applicants/interfaces.py:322
+#: waeup/kofa/applicants/interfaces.py:171
+#: waeup/kofa/applicants/interfaces.py:275
 msgid "Application Target"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:220
+#: waeup/kofa/applicants/interfaces.py:178
+#: waeup/kofa/applicants/interfaces.py:282
+msgid "Year of Entrance"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:185
+msgid "Application Mode"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:191
 msgid "Entry Level"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:227
-#: waeup/kofa/applicants/interfaces.py:330
-msgid "Year of Entrance"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:235
-#: waeup/kofa/applicants/interfaces.py:338
-msgid "Applicants Container Type"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:251
+#: waeup/kofa/applicants/interfaces.py:205
 msgid "Category for the grouping of certificates"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:258
+#: waeup/kofa/applicants/interfaces.py:211
 msgid "Human readable description in reST format"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:271
+#: waeup/kofa/applicants/interfaces.py:224
 msgid "Application Start Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:277
+#: waeup/kofa/applicants/interfaces.py:230
 msgid "Application Closing Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:283
+#: waeup/kofa/applicants/interfaces.py:236
 msgid "Forbid additions after deadline (enddate)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:366
+#: waeup/kofa/applicants/interfaces.py:315
 msgid "Applicant Id"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:371
-msgid "JAMB Registration Number"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:383
-#: waeup/kofa/students/interfaces.py:162
+#: waeup/kofa/applicants/interfaces.py:320
+#: waeup/kofa/students/interfaces.py:184 waeup/kofa/students/interfaces.py:271
+#: waeup/kofa/students/interfaces.py:518
+msgid "Registration Number"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:331
+#: waeup/kofa/applicants/interfaces.py:499
+#: waeup/kofa/students/interfaces.py:163
 msgid "First Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:387
-#: waeup/kofa/students/interfaces.py:167
+#: waeup/kofa/applicants/interfaces.py:335
+#: waeup/kofa/students/interfaces.py:168
 msgid "Middle Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:391
-#: waeup/kofa/students/interfaces.py:172
+#: waeup/kofa/applicants/interfaces.py:339
+#: waeup/kofa/students/interfaces.py:173
 msgid "Last Name (Surname)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:395
-#: waeup/kofa/students/interfaces.py:218
+#: waeup/kofa/applicants/interfaces.py:343
+#: waeup/kofa/students/interfaces.py:219
 msgid "Date of Birth"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:400
-msgid "State/LGA"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:405
-#: waeup/kofa/students/interfaces.py:177
+#: waeup/kofa/applicants/interfaces.py:349
+#: waeup/kofa/students/interfaces.py:178
 msgid "Sex"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:411 waeup/kofa/interfaces.py:392
-#: waeup/kofa/interfaces.py:418 waeup/kofa/students/interfaces.py:504
+#: waeup/kofa/applicants/interfaces.py:354
+#: waeup/kofa/applicants/interfaces.py:437
+#: waeup/kofa/applicants/interfaces.py:504 waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:419 waeup/kofa/students/interfaces.py:524
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:416 waeup/kofa/interfaces.py:397
-#: waeup/kofa/interfaces.py:425 waeup/kofa/students/interfaces.py:208
+#: waeup/kofa/applicants/interfaces.py:359 waeup/kofa/interfaces.py:398
+#: waeup/kofa/interfaces.py:426 waeup/kofa/students/interfaces.py:209
 msgid "Phone"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:421
-#: waeup/kofa/applicants/interfaces.py:507
+#: waeup/kofa/applicants/interfaces.py:364
+#: waeup/kofa/applicants/interfaces.py:442
 msgid "1st Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:426
-#: waeup/kofa/applicants/interfaces.py:512
+#: waeup/kofa/applicants/interfaces.py:369
+#: waeup/kofa/applicants/interfaces.py:447
 msgid "2nd Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:431
-msgid "School Grades"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:441
-#: waeup/kofa/applicants/interfaces.py:517
+#: waeup/kofa/applicants/interfaces.py:381
+#: waeup/kofa/applicants/interfaces.py:468
+msgid "Notice"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:385
+#: waeup/kofa/applicants/interfaces.py:457
+msgid "Screening Venue"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:389
+#: waeup/kofa/applicants/interfaces.py:452
 msgid "Screening Score"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:445
-#: waeup/kofa/applicants/interfaces.py:522
-msgid "Screening Venue"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:449
-#: waeup/kofa/applicants/interfaces.py:527
+#: waeup/kofa/applicants/interfaces.py:393
+#: waeup/kofa/applicants/interfaces.py:462
 msgid "Admitted Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:455
-#: waeup/kofa/applicants/interfaces.py:534
-msgid "Notice"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:477
-#: waeup/kofa/students/interfaces.py:157
+#: waeup/kofa/applicants/interfaces.py:398
+#: waeup/kofa/students/interfaces.py:158
 #: waeup/kofa/browser/templates/showstudentspage.pt:4
 #: waeup/kofa/students/browser_templates/containerpage.pt:29
@@ -848,43 +866,34 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:482
+#: waeup/kofa/applicants/interfaces.py:403
 msgid "Form locked"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:561
-#: waeup/kofa/students/interfaces.py:484
+#: waeup/kofa/applicants/interfaces.py:514
+#: waeup/kofa/students/interfaces.py:504
 msgid "Payment Session"
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:110
-#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:23
-#: waeup/kofa/students/browser_templates/studycoursepage.pt:28
-msgid "Department:"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:121
-#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:15
-#: waeup/kofa/students/browser_templates/studycoursepage.pt:39
-msgid "Faculty:"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:186
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:26
-msgid "Admitted Course of Study:"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/applicants/pdf.py:204
+#: waeup/kofa/applicants/pdf.py:50
+msgid "Application Record"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/applicants/pdf.py:84
 msgid ""
-"<font size=10>Proceed to the login page of the portal and enter your new "
-"credentials: user name= ${a}, password = ${b}.</font>"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:210
-msgid "<font size=10>Change your password when you have  logged in.</font>"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:57
-msgid "Application Record"
+"Proceed to the login page of the portal and enter your new credentials: user "
+"name= ${a}, password = ${b}."
+msgstr ""
+
+#: waeup/kofa/applicants/pdf.py:91
+msgid "Change your password when you have logged in."
+msgstr ""
+
+#: waeup/kofa/applicants/utils.py:35
+msgid "Desired Study Courses"
+msgstr ""
+
+#: waeup/kofa/applicants/utils.py:36
+msgid "Process Data"
 msgstr ""
 
@@ -910,13 +919,13 @@
 
 #: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:256
+#: waeup/kofa/students/browser.py:268
 msgid "Create student record"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:168 waeup/kofa/students/viewlets.py:300
+#: waeup/kofa/applicants/viewlets.py:168 waeup/kofa/students/viewlets.py:321
 msgid "Download payment receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:183 waeup/kofa/students/viewlets.py:315
+#: waeup/kofa/applicants/viewlets.py:183 waeup/kofa/students/viewlets.py:336
 msgid "Request callback"
 msgstr ""
@@ -926,9 +935,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:73 waeup/kofa/students/viewlets.py:512
+#: waeup/kofa/applicants/viewlets.py:73 waeup/kofa/students/viewlets.py:535
 msgid "My Data"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:100 waeup/kofa/students/batching.py:141
+#: waeup/kofa/applicants/workflow.py:100 waeup/kofa/students/batching.py:142
 #: waeup/kofa/students/workflow.py:25
 msgid "Student record created"
@@ -962,5 +971,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:41 waeup/kofa/interfaces.py:72
+#: waeup/kofa/applicants/workflow.py:41 waeup/kofa/interfaces.py:73
 msgid "admitted"
 msgstr ""
@@ -970,5 +979,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:43 waeup/kofa/interfaces.py:71
+#: waeup/kofa/applicants/workflow.py:43 waeup/kofa/interfaces.py:72
 msgid "created"
 msgstr ""
@@ -1030,5 +1039,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:312
+#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:311
 msgid "Administration"
 msgstr ""
@@ -1039,5 +1048,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:389
+#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:388
 #: waeup/kofa/browser/viewlets.py:375 waeup/kofa/browser/viewlets.py:685
 msgid "Portal Users"
@@ -1059,5 +1068,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:106
+#: waeup/kofa/browser/pages.py:105
 msgid "Local role successfully removed: ${a}"
 msgstr ""
@@ -1097,11 +1106,11 @@
 msgstr ""
 
+#: waeup/kofa/browser/pages.py:115 waeup/kofa/hostels/browser.py:256
+#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:240
+msgid "No item selected."
+msgstr ""
+
 #: waeup/kofa/browser/pages.py:1155
 msgid "Log files can only be searched on Unix-based operating systems."
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:116 waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:228
-msgid "No item selected."
 msgstr ""
 
@@ -1185,12 +1194,12 @@
 
 #: waeup/kofa/browser/pages.py:1532 waeup/kofa/browser/pages.py:1551
-#: waeup/kofa/students/browser.py:98 waeup/kofa/students/export.py:22
-#: waeup/kofa/students/viewlets.py:472
+#: waeup/kofa/students/browser.py:100 waeup/kofa/students/export.py:40
+#: waeup/kofa/students/viewlets.py:495
 msgid "Students"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:155 waeup/kofa/browser/viewlets.py:322
-#: waeup/kofa/browser/templates/staffsitelayout.pt:28
-#: waeup/kofa/browser/templates/studentsitelayout.pt:33
+#: waeup/kofa/browser/pages.py:154 waeup/kofa/browser/viewlets.py:322
+#: waeup/kofa/browser/templates/staffsitelayout.pt:27
+#: waeup/kofa/browser/templates/studentsitelayout.pt:32
 msgid "Login"
 msgstr ""
@@ -1218,5 +1227,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:163
+#: waeup/kofa/browser/pages.py:162
 msgid "You logged in."
 msgstr ""
@@ -1244,10 +1253,10 @@
 msgstr ""
 
+#: waeup/kofa/browser/pages.py:180
+msgid "You entered wrong credentials."
+msgstr ""
+
 #: waeup/kofa/browser/pages.py:1808
 msgid "Edit certificate"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:181
-msgid "You entered wrong credentials."
 msgstr ""
 
@@ -1282,42 +1291,42 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:195
+#: waeup/kofa/browser/pages.py:194
 msgid "You have been logged out. Thanks for using WAeUP Kofa!"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:231
+#: waeup/kofa/browser/pages.py:230
 msgid "Contact ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:237 waeup/kofa/browser/pages.py:523
+#: waeup/kofa/browser/pages.py:236 waeup/kofa/browser/pages.py:523
 msgid "Send message now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:256 waeup/kofa/browser/pages.py:275
-#: waeup/kofa/browser/pages.py:540 waeup/kofa/students/browser.py:318
+#: waeup/kofa/browser/pages.py:255 waeup/kofa/browser/pages.py:274
+#: waeup/kofa/browser/pages.py:540 waeup/kofa/students/browser.py:330
 msgid "Your message has been sent."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:266
+#: waeup/kofa/browser/pages.py:265
 msgid "Send now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:277
+#: waeup/kofa/browser/pages.py:276
 msgid "A smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:302
+#: waeup/kofa/browser/pages.py:301
 msgid "<h1>Welcome to WAeUP.Kofa</h1>"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:390 waeup/kofa/hostels/browser.py:195
-#: waeup/kofa/students/viewlets.py:163 waeup/kofa/students/viewlets.py:171
-#: waeup/kofa/students/viewlets.py:226 waeup/kofa/students/viewlets.py:243
-#: waeup/kofa/students/viewlets.py:283
+#: waeup/kofa/browser/pages.py:389 waeup/kofa/hostels/browser.py:195
+#: waeup/kofa/students/viewlets.py:166 waeup/kofa/students/viewlets.py:174
+#: waeup/kofa/students/viewlets.py:247 waeup/kofa/students/viewlets.py:255
+#: waeup/kofa/students/viewlets.py:304
 msgid "Manage"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:391 waeup/kofa/browser/viewlets.py:180
+#: waeup/kofa/browser/pages.py:390 waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
 msgstr ""
@@ -1328,5 +1337,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:430 waeup/kofa/browser/pages.py:432
+#: waeup/kofa/browser/pages.py:431 waeup/kofa/browser/pages.py:433
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
@@ -1334,5 +1343,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:454
+#: waeup/kofa/browser/pages.py:455
 msgid "User account ${a} successfully added."
 msgstr ""
@@ -1348,5 +1357,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:521 waeup/kofa/students/browser.py:299
+#: waeup/kofa/browser/pages.py:521 waeup/kofa/students/browser.py:311
 msgid "Send message to ${a}"
 msgstr ""
@@ -1433,5 +1442,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:86
+#: waeup/kofa/browser/pages.py:85
 msgid "No local role selected."
 msgstr ""
@@ -1463,4 +1472,14 @@
 #: waeup/kofa/browser/pages.py:963
 msgid "Perform import"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/browser/pdf.py:127
+msgid "${footer_text} Page ${num1} of ${num2}"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/browser/pdf.py:336
+msgid "Date: ${a}"
 msgstr ""
 
@@ -1644,4 +1663,8 @@
 #: waeup/kofa/browser/templates/datacenterpage.pt:16
 msgid "Upload Date"
+msgstr ""
+
+#: waeup/kofa/browser/templates/default_waeup_display_form.pt:6
+msgid "Uploaded Files"
 msgstr ""
 
@@ -1683,15 +1706,20 @@
 
 #: waeup/kofa/browser/templates/facultypage.pt:1
-#: waeup/kofa/hostels/browser_templates/containerpage.pt:1
-msgid "There no subobjects registered yet."
+msgid "There are no subobjects registered yet."
+msgstr ""
+
+#: waeup/kofa/browser/templates/fileupload.pt:26
+#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:26
+msgid "Max. file size:"
 msgstr ""
 
 #: waeup/kofa/browser/templates/loginpage.pt:13
-#: waeup/kofa/browser/templates/usereditformpage.pt:8
+#: waeup/kofa/browser/templates/usereditformpage.pt:9
 #: waeup/kofa/students/browser_templates/basepage.pt:14
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:17
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:18
 #: waeup/kofa/students/browser_templates/change_password.pt:10
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:31
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:34
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:32
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:25
 msgid "Password:"
 msgstr ""
@@ -1711,5 +1739,5 @@
 msgstr ""
 
-#. Default: "Or simply forgot your student id or password? Then request a new password <strong><a href=\"changepw\"> here</a></strong>."
+#. Default: "Or simply forgot your student id, application id or password? Then request a new password <strong><a href=\"sendpw\"> here</a></strong>."
 #: waeup/kofa/browser/templates/loginpage.pt:44
 msgid "login_trouble3"
@@ -1762,46 +1790,46 @@
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:101
-#: waeup/kofa/browser/templates/studentsitelayout.pt:86
+#: waeup/kofa/browser/templates/staffsitelayout.pt:102
+#: waeup/kofa/browser/templates/studentsitelayout.pt:87
 msgid "Form Status:"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:114
-#: waeup/kofa/browser/templates/studentsitelayout.pt:100
+#: waeup/kofa/browser/templates/staffsitelayout.pt:115
+#: waeup/kofa/browser/templates/studentsitelayout.pt:101
 msgid "Back to top"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:116
-#: waeup/kofa/browser/templates/studentsitelayout.pt:102
+#: waeup/kofa/browser/templates/staffsitelayout.pt:117
+#: waeup/kofa/browser/templates/studentsitelayout.pt:103
 msgid "Kofa - Student Management System"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:119
-#: waeup/kofa/browser/templates/studentsitelayout.pt:105
+#: waeup/kofa/browser/templates/staffsitelayout.pt:120
+#: waeup/kofa/browser/templates/studentsitelayout.pt:106
 msgid "Copyright &copy; WAeUP Group 2008-2012"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:34
-#: waeup/kofa/browser/templates/studentsitelayout.pt:39
+#: waeup/kofa/browser/templates/staffsitelayout.pt:33
+#: waeup/kofa/browser/templates/studentsitelayout.pt:38
 msgid "Contact"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:40
-#: waeup/kofa/browser/templates/studentsitelayout.pt:45
+#: waeup/kofa/browser/templates/staffsitelayout.pt:39
+#: waeup/kofa/browser/templates/studentsitelayout.pt:44
 msgid "Logout"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:60
+#: waeup/kofa/browser/templates/staffsitelayout.pt:61
 msgid "Student Id:"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:64
+#: waeup/kofa/browser/templates/staffsitelayout.pt:65
 msgid "State:"
 msgstr ""
 
-#: waeup/kofa/browser/templates/usereditformpage.pt:14
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:23
+#: waeup/kofa/browser/templates/usereditformpage.pt:15
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:24
 #: waeup/kofa/students/browser_templates/change_password.pt:16
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:37
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:38
 msgid "Retype password:"
 msgstr ""
@@ -1815,5 +1843,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:383 waeup/kofa/students/viewlets.py:155
+#: waeup/kofa/browser/viewlets.py:383 waeup/kofa/students/viewlets.py:158
 msgid "Send email"
 msgstr ""
@@ -1832,5 +1860,5 @@
 
 #: waeup/kofa/browser/viewlets.py:528 waeup/kofa/browser/viewlets.py:536
-msgid "Show batch logs"
+msgid "Show logs"
 msgstr ""
 
@@ -1852,6 +1880,6 @@
 
 #: waeup/kofa/browser/viewlets.py:91 waeup/kofa/browser/viewlets.py:160
-#: waeup/kofa/students/viewlets.py:218 waeup/kofa/students/viewlets.py:356
-#: waeup/kofa/students/viewlets.py:403
+#: waeup/kofa/students/viewlets.py:239 waeup/kofa/students/viewlets.py:379
+#: waeup/kofa/students/viewlets.py:426
 msgid "Edit"
 msgstr ""
@@ -1928,4 +1956,8 @@
 #: waeup/kofa/hostels/browser.py:95
 msgid "Block ${a}, Room ${b}, Bed ${c}"
+msgstr ""
+
+#: waeup/kofa/hostels/browser_templates/containerpage.pt:1
+msgid "There no subobjects registered yet."
 msgstr ""
 
@@ -1952,9 +1984,9 @@
 msgstr ""
 
-#: waeup/kofa/hostels/hostel.py:180
+#: waeup/kofa/hostels/hostel.py:185
 msgid "unreserved"
 msgstr ""
 
-#: waeup/kofa/hostels/hostel.py:187
+#: waeup/kofa/hostels/hostel.py:192
 msgid "reserved"
 msgstr ""
@@ -1988,5 +2020,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/interfaces.py:175 waeup/kofa/students/interfaces.py:445
+#: waeup/kofa/hostels/interfaces.py:175 waeup/kofa/students/interfaces.py:465
 msgid "Bed Type"
 msgstr ""
@@ -2144,41 +2176,41 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:185
+#: waeup/kofa/interfaces.py:186
 msgid "Subject"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:189
+#: waeup/kofa/interfaces.py:190
 msgid "Grade"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:323
+#: waeup/kofa/interfaces.py:324
 msgid "Processor name"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:327
-msgid "Import mode"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:352
+#: waeup/kofa/interfaces.py:328
+msgid "Import Mode"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:353
 msgid "Email Address:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:359
+#: waeup/kofa/interfaces.py:360
 msgid "Email to:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:366
+#: waeup/kofa/interfaces.py:367
 msgid "Subject:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:370
+#: waeup/kofa/interfaces.py:371
 msgid "Full Name:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:374
+#: waeup/kofa/interfaces.py:375
 msgid "Text:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:405
+#: waeup/kofa/interfaces.py:406
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2190,5 +2222,5 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:410
+#: waeup/kofa/interfaces.py:411
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2197,129 +2229,129 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:414
+#: waeup/kofa/interfaces.py:415
 msgid "Description/Notice"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:431
+#: waeup/kofa/interfaces.py:432
 msgid "Portal roles"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:474
+#: waeup/kofa/interfaces.py:477
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:475
+#: waeup/kofa/interfaces.py:478
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:480
+#: waeup/kofa/interfaces.py:483
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:486
+#: waeup/kofa/interfaces.py:489
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:493
+#: waeup/kofa/interfaces.py:496
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:505
+#: waeup/kofa/interfaces.py:508
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:513
+#: waeup/kofa/interfaces.py:516
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:521
+#: waeup/kofa/interfaces.py:524
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:527
+#: waeup/kofa/interfaces.py:530
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:534
+#: waeup/kofa/interfaces.py:537
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:535
+#: waeup/kofa/interfaces.py:538
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:540
+#: waeup/kofa/interfaces.py:543
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:547
+#: waeup/kofa/interfaces.py:550
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:554
+#: waeup/kofa/interfaces.py:557
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:563 waeup/kofa/interfaces.py:621
+#: waeup/kofa/interfaces.py:566 waeup/kofa/interfaces.py:624
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:571 waeup/kofa/payments/interfaces.py:30
+#: waeup/kofa/interfaces.py:574 waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:576
+#: waeup/kofa/interfaces.py:579
 msgid "Surcharge Portal Provider"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:582
+#: waeup/kofa/interfaces.py:585
 msgid "Surcharge Payment Gateway Provider"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:588 waeup/kofa/payments/interfaces.py:120
+#: waeup/kofa/interfaces.py:591 waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:594
+#: waeup/kofa/interfaces.py:597
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:600
+#: waeup/kofa/interfaces.py:603
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:606 waeup/kofa/payments/interfaces.py:36
+#: waeup/kofa/interfaces.py:609 waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:73
+#: waeup/kofa/interfaces.py:74
 msgid "clearance started"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:74
+#: waeup/kofa/interfaces.py:75
 msgid "clearance requested"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:75
+#: waeup/kofa/interfaces.py:76
 msgid "cleared"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:76
+#: waeup/kofa/interfaces.py:77
 msgid "school fee paid"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:77
+#: waeup/kofa/interfaces.py:78
 msgid "returning"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:78
+#: waeup/kofa/interfaces.py:79
 msgid "courses registered"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:79
+#: waeup/kofa/interfaces.py:80
 msgid "courses validated"
 msgstr ""
 
-#: waeup/kofa/objecthistory.py:71
+#: waeup/kofa/objecthistory.py:72
 msgid "by"
 msgstr ""
@@ -2407,6 +2439,6 @@
 #: waeup/kofa/payments/interfaces.py:76
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:10
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:84
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:51
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:86
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:42
 msgid "Payment Date"
 msgstr ""
@@ -2421,434 +2453,455 @@
 
 #. Default: ""
-#: waeup/kofa/students/batching.py:165
+#: waeup/kofa/students/batching.py:166
 msgid "State '${a}' set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1000
+#. Default: ""
+#: waeup/kofa/students/browser.py:1009
+msgid "${a}: Payments"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1054
+msgid "Add online payment"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1057
 msgid "Create ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1008 waeup/kofa/students/browser.py:1230
+#: waeup/kofa/students/browser.py:1065 waeup/kofa/students/browser.py:1292
 msgid "Your current session does not match accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1077
+#: waeup/kofa/students/browser.py:1075
+msgid "Study course data are incomplete."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1139
 msgid "This ticket has already been paid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1090 waeup/kofa/students/browser.py:1098
-#: waeup/kofa/students/browser.py:1106
+#: waeup/kofa/students/browser.py:1152 waeup/kofa/students/browser.py:1160
+#: waeup/kofa/students/browser.py:1168
 msgid "Valid callback received. ${a}"
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/browser.py:1160
+#: waeup/kofa/students/browser.py:121 waeup/kofa/students/viewlets.py:117
+#: waeup/kofa/students/viewlets.py:557
+msgid "Study Course"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/browser.py:1222
 msgid "${a}: Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1172
+#: waeup/kofa/students/browser.py:1234
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1179
+#: waeup/kofa/students/browser.py:1241
 msgid "No bed ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:119 waeup/kofa/students/viewlets.py:114
-#: waeup/kofa/students/viewlets.py:534
-msgid "Study Course"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1210
+#: waeup/kofa/students/browser.py:127 waeup/kofa/students/viewlets.py:123
+#: waeup/kofa/students/viewlets.py:558
+msgid "Payments"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1272
 msgid "Add bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1212
+#: waeup/kofa/students/browser.py:1274
 msgid "Create bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1220
+#: waeup/kofa/students/browser.py:1282
 msgid "Your data are incomplete."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1224
+#: waeup/kofa/students/browser.py:1286
 msgid "You are in the wrong registration state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1235
+#: waeup/kofa/students/browser.py:1297
 msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1246 waeup/kofa/students/browser.py:1543
-#: waeup/kofa/students/browser.py:1656
+#: waeup/kofa/students/browser.py:1308 waeup/kofa/students/browser.py:1602
+#: waeup/kofa/students/browser.py:1721
 msgid "Activation code is invalid."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:125 waeup/kofa/students/viewlets.py:120
-#: waeup/kofa/students/viewlets.py:535
-msgid "Payments"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1266 waeup/kofa/students/browser.py:1394
+#. Default: ""
+#: waeup/kofa/students/browser.py:1328 waeup/kofa/students/browser.py:1454
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1271 waeup/kofa/students/browser.py:1548
-#: waeup/kofa/students/browser.py:1661
+#: waeup/kofa/students/browser.py:1333 waeup/kofa/students/browser.py:1607
+#: waeup/kofa/students/browser.py:1726
 msgid "Activation code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1274 waeup/kofa/students/browser.py:1551
-#: waeup/kofa/students/browser.py:1664 waeup/kofa/students/browser.py:1923
+#: waeup/kofa/students/browser.py:1336 waeup/kofa/students/browser.py:1610
+#: waeup/kofa/students/browser.py:1729 waeup/kofa/students/browser.py:1997
 msgid "invalidated"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1279 waeup/kofa/students/browser.py:1555
-#: waeup/kofa/students/browser.py:1669
+#: waeup/kofa/students/browser.py:1341 waeup/kofa/students/browser.py:1614
+#: waeup/kofa/students/browser.py:1734
 msgid "You are not the owner of this access code."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1290 waeup/kofa/students/browser.py:1408
+#: waeup/kofa/students/browser.py:1352 waeup/kofa/students/browser.py:1468
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1299
+#: waeup/kofa/students/browser.py:1361
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1317
+#: waeup/kofa/students/browser.py:1377
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1333
+#: waeup/kofa/students/browser.py:1393
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1339
+#: waeup/kofa/students/browser.py:1399
 msgid "Bed Allocation: "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1366
+#: waeup/kofa/students/browser.py:142 waeup/kofa/students/viewlets.py:129
+msgid "Accommodation"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1426
 msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1372
+#: waeup/kofa/students/browser.py:1432
 msgid "Student can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:140 waeup/kofa/students/viewlets.py:126
-msgid "Accommodation"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1415
+#. Default: ""
+#: waeup/kofa/students/browser.py:1475
 msgid "Student relocated: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1434
+#: waeup/kofa/students/browser.py:1494
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1447
+#: waeup/kofa/students/browser.py:1506
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1462 waeup/kofa/students/viewlets.py:365
+#. Default: ""
+#: waeup/kofa/students/browser.py:151
+msgid "Bed Ticket ${a}"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1521 waeup/kofa/students/viewlets.py:388
 msgid "Change password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1476
+#: waeup/kofa/students/browser.py:1535
 msgid "Password changed."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1488
+#: waeup/kofa/students/browser.py:1547
 msgid "Upload portrait"
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/browser.py:149
-msgid "Bed Ticket ${a}"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1503 waeup/kofa/students/viewlets.py:389
+#: waeup/kofa/students/browser.py:1562 waeup/kofa/students/viewlets.py:412
 #: waeup/kofa/students/workflow.py:44
 msgid "Start clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1507
+#: waeup/kofa/students/browser.py:1566
 msgid "Start clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1524 waeup/kofa/students/browser.py:1645
+#: waeup/kofa/students/browser.py:1583 waeup/kofa/students/browser.py:1710
 msgid "Wrong state"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1528
+#: waeup/kofa/students/browser.py:1587
 msgid "No portrait uploaded."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1532
+#: waeup/kofa/students/browser.py:1591
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1559
+#: waeup/kofa/students/browser.py:1618
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1571
+#: waeup/kofa/students/browser.py:1628
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1583 waeup/kofa/students/browser.py:1597
+#: waeup/kofa/students/browser.py:1648 waeup/kofa/students/browser.py:1662
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1656
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1606 waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1671 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1607
+#: waeup/kofa/students/browser.py:1672
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1610
+#: waeup/kofa/students/browser.py:1675
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1619
+#: waeup/kofa/students/browser.py:1684
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1628
+#: waeup/kofa/students/browser.py:1693
 msgid "Clearance has been requested."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1637 waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:170
+msgid "Student Section"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1702 waeup/kofa/students/viewlets.py:441
 msgid "Start course registration"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1641
+#: waeup/kofa/students/browser.py:1706
 msgid "Start course registration now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1677
+#: waeup/kofa/students/browser.py:1742
 msgid "Course registration has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:168
-msgid "Student Section"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1696
+#. Default: ""
+#: waeup/kofa/students/browser.py:1761
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1705
+#: waeup/kofa/students/browser.py:1770
 msgid "Create course list now"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1744
+#: waeup/kofa/students/browser.py:1809
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1781
+#: waeup/kofa/students/browser.py:1846
 msgid "Register course list"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1785
+#: waeup/kofa/students/browser.py:1850
 msgid "Course list has been registered."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1831
-msgid "Change my password"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:184 waeup/kofa/students/browser.py:220
+#: waeup/kofa/students/browser.py:186 waeup/kofa/students/browser.py:226
 msgid "Empty search string"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1841
+#: waeup/kofa/students/browser.py:1896
+msgid "Send me a new password"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1906
 msgid "Get new login credentials"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1855
-msgid "No student record found."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1863
+#: waeup/kofa/students/browser.py:1923
+msgid "Application package not installed."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1929
+msgid "No record found."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1937
 msgid "You have successfully changed your password for the"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1868
+#: waeup/kofa/students/browser.py:1942
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1879
+#: waeup/kofa/students/browser.py:1953
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1882
+#: waeup/kofa/students/browser.py:1956
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1897
+#: waeup/kofa/students/browser.py:1971
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1905
+#: waeup/kofa/students/browser.py:1979
 msgid "Access code is invalid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1908
+#: waeup/kofa/students/browser.py:1982
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1914
+#: waeup/kofa/students/browser.py:1988
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1920
+#: waeup/kofa/students/browser.py:1994
 msgid "Access code has already been used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1929
+#: waeup/kofa/students/browser.py:2003
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:202 waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:208 waeup/kofa/students/viewlets.py:142
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:226 waeup/kofa/students/browser.py:1894
+#: waeup/kofa/students/browser.py:238 waeup/kofa/students/browser.py:1968
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:253 waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:265 waeup/kofa/students/viewlets.py:149
 msgid "Add student"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:261
+#: waeup/kofa/students/browser.py:273
 msgid "Student record created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:277
+#: waeup/kofa/students/browser.py:289
 msgid "${a}: Base Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:320 waeup/kofa/students/browser.py:1871
+#: waeup/kofa/students/browser.py:332 waeup/kofa/students/browser.py:1945
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:332
+#: waeup/kofa/students/browser.py:343
 msgid "Manage base data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:407
+#: waeup/kofa/students/browser.py:423
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:423 waeup/kofa/students/viewlets.py:104
-#: waeup/kofa/students/viewlets.py:532
+#: waeup/kofa/students/browser.py:446 waeup/kofa/students/viewlets.py:107
+#: waeup/kofa/students/viewlets.py:555
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
 msgid "Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:429
+#: waeup/kofa/students/browser.py:452
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:449
+#: waeup/kofa/students/browser.py:471
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:478
+#: waeup/kofa/students/browser.py:512
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:480 waeup/kofa/students/browser.py:504
+#: waeup/kofa/students/browser.py:514 waeup/kofa/students/browser.py:538
 msgid "Student is in wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:497
+#: waeup/kofa/students/browser.py:531
 msgid "Clearance has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:501
+#: waeup/kofa/students/browser.py:535
 msgid "Clearance request has been rejected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:527
+#: waeup/kofa/students/browser.py:561
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:537
-msgid "Manage personal data"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:557
+#: waeup/kofa/students/browser.py:571
+msgid "Edit personal data"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/browser.py:591
 msgid "${a}: Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:587
+#: waeup/kofa/students/browser.py:621
 msgid "Manage study course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:590 waeup/kofa/students/browser.py:631
+#: waeup/kofa/students/browser.py:624 waeup/kofa/students/browser.py:671
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:591 waeup/kofa/students/browser.py:617
+#: waeup/kofa/students/browser.py:625 waeup/kofa/students/browser.py:657
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:625
+#: waeup/kofa/students/browser.py:645
+msgid "Current level not available for certificate."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:665
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:627 waeup/kofa/students/browser.py:1714
+#: waeup/kofa/students/browser.py:667 waeup/kofa/students/browser.py:1779
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:637
+#: waeup/kofa/students/browser.py:677
 msgid "No study level selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:673
+#: waeup/kofa/students/browser.py:728
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:696
+#: waeup/kofa/students/browser.py:751
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:702
+#: waeup/kofa/students/browser.py:757
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:711
-msgid "Course Registration Slip  "
-msgstr ""
-
-#: waeup/kofa/students/browser.py:717
+#: waeup/kofa/students/browser.py:766
+msgid "Course Registration Slip"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:772
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -2857,5 +2910,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:720
+#: waeup/kofa/students/browser.py:775
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -2863,10 +2916,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:721
+#: waeup/kofa/students/browser.py:776
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:722
+#: waeup/kofa/students/browser.py:777
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -2874,5 +2927,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:723
+#: waeup/kofa/students/browser.py:778
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -2880,5 +2933,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:724 waeup/kofa/students/interfaces.py:389
+#: waeup/kofa/students/browser.py:779 waeup/kofa/students/interfaces.py:409
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2887,65 +2940,56 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:752 waeup/kofa/students/browser.py:781
-#: waeup/kofa/students/browser.py:866 waeup/kofa/students/browser.py:871
-#: waeup/kofa/students/browser.py:1754 waeup/kofa/students/browser.py:1804
+#: waeup/kofa/students/browser.py:808 waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:922 waeup/kofa/students/browser.py:927
+#: waeup/kofa/students/browser.py:1819 waeup/kofa/students/browser.py:1869
 msgid "Add course ticket"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:773
+#: waeup/kofa/students/browser.py:829
 msgid "Manage study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:791 waeup/kofa/students/browser.py:1764
+#: waeup/kofa/students/browser.py:847 waeup/kofa/students/browser.py:1829
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:815 waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:871 waeup/kofa/students/browser.py:893
 msgid "This level does not correspond current level."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:819
+#: waeup/kofa/students/browser.py:875
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:821 waeup/kofa/students/browser.py:849
+#: waeup/kofa/students/browser.py:877 waeup/kofa/students/browser.py:905
 msgid "Student is in the wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:842
+#: waeup/kofa/students/browser.py:898
 msgid "Course list request has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:846
+#: waeup/kofa/students/browser.py:902
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:886 waeup/kofa/students/browser.py:1817
+#: waeup/kofa/students/browser.py:943 waeup/kofa/students/browser.py:1882
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:888 waeup/kofa/students/browser.py:1819
+#: waeup/kofa/students/browser.py:945 waeup/kofa/students/browser.py:1884
 msgid "Successfully added ${a}."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:909
+#: waeup/kofa/students/browser.py:966
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:925
+#: waeup/kofa/students/browser.py:982
 msgid "Manage course ticket ${a}"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:952
-msgid "${a}: Payments"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:997
-msgid "Add online payment"
 msgstr ""
 
@@ -2954,11 +2998,6 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:29
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:30
 msgid "Registration Transition:"
-msgstr ""
-
-#. Default: "Please solve the captcha<br />to prevent misuse of this service:"
-#: waeup/kofa/students/browser_templates/changepw.pt:8
-msgid "solve_captcha"
 msgstr ""
 
@@ -3010,6 +3049,6 @@
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:14
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:25
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:87
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:54
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:89
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:45
 msgid "State"
 msgstr ""
@@ -3030,4 +3069,14 @@
 msgstr ""
 
+#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:15
+#: waeup/kofa/students/browser_templates/studycoursepage.pt:39
+msgid "Faculty:"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:23
+#: waeup/kofa/students/browser_templates/studycoursepage.pt:28
+msgid "Department:"
+msgstr ""
+
 #: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:31
 msgid "Semester:"
@@ -3046,32 +3095,36 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:20
-#: waeup/kofa/students/browser_templates/fileupload.pt:26
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
-msgid "Max. file size:"
-msgstr ""
-
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:11
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:87
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:43
+msgid "Category"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:12
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:88
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:44
+msgid "Item"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:8
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:84
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:40
+msgid "Payment Id"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:9
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:85
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:52
-msgid "Category"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:12
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:86
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:53
-msgid "Item"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:8
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:82
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:49
-msgid "Payment Id"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:9
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:83
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:50
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:41
 msgid "Creation Date"
+msgstr ""
+
+#. Default: "Enter the email address stored on Kofa. You can't change your email address here. If you've forgotten your email address or the email address stored in Kofa is wrong or no longer valid, use the enquiries form to request a change of address."
+#: waeup/kofa/students/browser_templates/sendpassword.pt:19
+msgid "email_address_problem"
+msgstr ""
+
+#. Default: "Please solve the captcha<br />to prevent misuse of this service:"
+#: waeup/kofa/students/browser_templates/sendpassword.pt:8
+msgid "solve_captcha"
 msgstr ""
 
@@ -3175,69 +3228,76 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:183 waeup/kofa/students/interfaces.py:259
-#: waeup/kofa/students/interfaces.py:498
-msgid "Registration Number"
-msgstr ""
-
-#: waeup/kofa/students/interfaces.py:190 waeup/kofa/students/interfaces.py:268
+#: waeup/kofa/students/export.py:139
+msgid "Student Study Levels"
+msgstr ""
+
+#: waeup/kofa/students/export.py:87
+msgid "Student Study Courses"
+msgstr ""
+
+#: waeup/kofa/students/interfaces.py:191 waeup/kofa/students/interfaces.py:280
 msgid "Matriculation Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:197
+#: waeup/kofa/students/interfaces.py:198
 msgid "PWD Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/students/interfaces.py:204
 msgid "Email"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:223
+#: waeup/kofa/students/interfaces.py:225
 msgid "Clearance form locked"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:228
+#: waeup/kofa/students/interfaces.py:230
 msgid "CLR Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:235
+#: waeup/kofa/students/interfaces.py:237
 msgid "Nationality"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:245
+#: waeup/kofa/students/interfaces.py:246
+msgid "Employer"
+msgstr ""
+
+#: waeup/kofa/students/interfaces.py:256
 msgid "Permanent Address"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:277
+#: waeup/kofa/students/interfaces.py:289
 #: waeup/kofa/browser/templates/showstudentspage.pt:7
 msgid "Certificate"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:283
+#: waeup/kofa/students/interfaces.py:295
 msgid "Entry Mode"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:290
+#: waeup/kofa/students/interfaces.py:302
 msgid "Entry Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:298 waeup/kofa/students/interfaces.py:337
+#: waeup/kofa/students/interfaces.py:310 waeup/kofa/students/interfaces.py:349
 #: waeup/kofa/browser/templates/showstudentspage.pt:8
 msgid "Current Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:305 waeup/kofa/students/interfaces.py:343
+#: waeup/kofa/students/interfaces.py:317 waeup/kofa/students/interfaces.py:355
 #: waeup/kofa/browser/templates/showstudentspage.pt:9
 msgid "Current Level"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:312 waeup/kofa/students/interfaces.py:331
+#: waeup/kofa/students/interfaces.py:324 waeup/kofa/students/interfaces.py:343
 msgid "Current Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:319
+#: waeup/kofa/students/interfaces.py:331
 msgid "Previous Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:357 waeup/kofa/students/interfaces.py:451
+#: waeup/kofa/students/interfaces.py:369 waeup/kofa/students/interfaces.py:471
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3245,9 +3305,9 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:363
+#: waeup/kofa/students/interfaces.py:375
 msgid "Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:382
+#: waeup/kofa/students/interfaces.py:402
 #: waeup/kofa/browser/templates/certificatepage.pt:30
 #: waeup/kofa/browser/templates/certificatemanagepage.pt:33
@@ -3255,13 +3315,13 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:396
+#: waeup/kofa/students/interfaces.py:416
 msgid "Automatical Creation"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:403
+#: waeup/kofa/students/interfaces.py:423
 msgid "Carry-over Course"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:422
+#: waeup/kofa/students/interfaces.py:442
 #: waeup/kofa/university/interfaces.py:299
 #: waeup/kofa/browser/templates/certificatepage.pt:29
@@ -3270,131 +3330,139 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:439
+#: waeup/kofa/students/interfaces.py:459
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:10
 msgid "Bed Coordinates"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:458
+#: waeup/kofa/students/interfaces.py:478
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:9
 msgid "Booking Date"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:464
+#: waeup/kofa/students/interfaces.py:484
 msgid "Booking Activation Code"
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/utils.py:167
+#: waeup/kofa/students/utils.py:182
+msgid "Scanned Documents"
+msgstr ""
+
+#: waeup/kofa/students/utils.py:190
+msgid "(not provided)"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/utils.py:218
 msgid "<font size=10>${a} Page ${b} of ${c}</font>"
 msgstr ""
 
-#: waeup/kofa/students/utils.py:298 waeup/kofa/students/viewlets.py:71
-#: waeup/kofa/students/viewlets.py:99
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:6
+#: waeup/kofa/students/utils.py:333 waeup/kofa/students/viewlets.py:74
+#: waeup/kofa/students/viewlets.py:102
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:7
 msgid "Base Data"
 msgstr ""
 
-#: waeup/kofa/students/utils.py:329
-msgid "Scanned Documents"
-msgstr ""
-
-#: waeup/kofa/students/utils.py:382
+#: waeup/kofa/students/utils.py:368
 msgid "(not yet)"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:109 waeup/kofa/students/viewlets.py:533
+#: waeup/kofa/students/viewlets.py:112 waeup/kofa/students/viewlets.py:556
 msgid "Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:131 waeup/kofa/students/viewlets.py:537
+#: waeup/kofa/students/viewlets.py:134 waeup/kofa/students/viewlets.py:560
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:27
 msgid "History"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:179 waeup/kofa/students/workflow.py:72
+#: waeup/kofa/students/viewlets.py:182 waeup/kofa/students/workflow.py:72
 msgid "Clear student"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:194
+#: waeup/kofa/students/viewlets.py:197
 msgid "Reject clearance"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:210
+#: waeup/kofa/students/viewlets.py:213
 msgid "Download clearance slip"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:235
+#: waeup/kofa/students/viewlets.py:222 waeup/kofa/students/viewlets.py:231
+msgid "View"
+msgstr ""
+
+#: waeup/kofa/students/viewlets.py:263 waeup/kofa/students/workflow.py:128
+msgid "Validate courses"
+msgstr ""
+
+#: waeup/kofa/students/viewlets.py:279
+msgid "Reject courses"
+msgstr ""
+
+#: waeup/kofa/students/viewlets.py:296
 msgid "Download course registration slip"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:251 waeup/kofa/students/workflow.py:128
-msgid "Validate courses"
-msgstr ""
-
-#: waeup/kofa/students/viewlets.py:267
-msgid "Reject courses"
-msgstr ""
-
-#: waeup/kofa/students/viewlets.py:330
+#: waeup/kofa/students/viewlets.py:353
 msgid "Book accommodation"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:339
+#: waeup/kofa/students/viewlets.py:362
 msgid "Download bed allocation slip"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:348
+#: waeup/kofa/students/viewlets.py:371
 msgid "Relocate student"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:374
+#: waeup/kofa/students/viewlets.py:397
 msgid "Change portrait"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:432
+#: waeup/kofa/students/viewlets.py:455
 msgid "Add course list"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:450
+#: waeup/kofa/students/viewlets.py:473
 msgid "Add and remove courses"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:536
+#: waeup/kofa/students/viewlets.py:559
 msgid "Accommodation Data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:548
+#: waeup/kofa/students/viewlets.py:571
 msgid "${a} deleted."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:561
+#: waeup/kofa/students/viewlets.py:584
 msgid "File name has no extension."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:564
+#: waeup/kofa/students/viewlets.py:587
 msgid "File name contains more than one dot."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:571
+#: waeup/kofa/students/viewlets.py:594
 msgid "${a} file extension expected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:577
+#: waeup/kofa/students/viewlets.py:600
 msgid "Only the following extension are allowed: ${a}"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:583
+#: waeup/kofa/students/viewlets.py:606
 msgid "Uploaded file is too big."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:590
+#: waeup/kofa/students/viewlets.py:613
 msgid "File ${a} uploaded."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:608
+#: waeup/kofa/students/viewlets.py:631
 #: waeup/kofa/browser/templates/datacenterlogspage.pt:10
 #: waeup/kofa/browser/templates/datacenterpage.pt:14
@@ -3403,84 +3471,84 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:609
+#: waeup/kofa/students/viewlets.py:632
 msgid "Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:632
+#: waeup/kofa/students/viewlets.py:655
 msgid "Upload new file"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:633
+#: waeup/kofa/students/viewlets.py:656
 msgid "Delete attachment"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:663
+#: waeup/kofa/students/viewlets.py:687
 msgid "No local file selected."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:677
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:8
+#: waeup/kofa/students/viewlets.py:701
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:9
 msgid "Passport Picture"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:688
+#: waeup/kofa/students/viewlets.py:712
 msgid "Passport Picture (jpg only)"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:703 waeup/kofa/students/viewlets.py:714
+#: waeup/kofa/students/viewlets.py:727 waeup/kofa/students/viewlets.py:738
 msgid "Birth Certificate"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:704 waeup/kofa/students/viewlets.py:715
+#: waeup/kofa/students/viewlets.py:728 waeup/kofa/students/viewlets.py:739
 msgid "Birth Certificate Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:724 waeup/kofa/students/viewlets.py:735
+#: waeup/kofa/students/viewlets.py:748 waeup/kofa/students/viewlets.py:759
 msgid "Acceptance Letter"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:725 waeup/kofa/students/viewlets.py:736
+#: waeup/kofa/students/viewlets.py:749 waeup/kofa/students/viewlets.py:760
 msgid "Acceptance Letter Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:85
+#: waeup/kofa/students/viewlets.py:88
 msgid "Application Slip"
 msgstr ""
 
-#: waeup/kofa/students/vocabularies.py:117
+#: waeup/kofa/students/vocabularies.py:116
 msgid "male"
 msgstr ""
 
-#: waeup/kofa/students/vocabularies.py:119
+#: waeup/kofa/students/vocabularies.py:118
 msgid "female"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:77
+#: waeup/kofa/students/vocabularies.py:76
 msgid "Error: level id ${value} out of range"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:88
+#: waeup/kofa/students/vocabularies.py:87
 msgid "${title} 2nd spillover"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:91
+#: waeup/kofa/students/vocabularies.py:90
 msgid "${title} 3rd spillover"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:94
+#: waeup/kofa/students/vocabularies.py:93
 msgid "${title} 1st spillover"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:96
+#: waeup/kofa/students/vocabularies.py:95
 msgid "${title} on 1st probation"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:98
+#: waeup/kofa/students/vocabularies.py:97
 msgid "${title} on 2nd probation"
 msgstr ""
@@ -3490,6 +3558,6 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:108
-msgid "Student record reset to 'returning'"
+#: waeup/kofa/students/workflow.py:108 waeup/kofa/students/workflow.py:143
+msgid "Reset to 'returning'"
 msgstr ""
 
@@ -3507,5 +3575,5 @@
 
 #: waeup/kofa/students/workflow.py:122 waeup/kofa/students/workflow.py:136
-msgid "Student record reset to 'paid'"
+msgid "Reset to 'paid'"
 msgstr ""
 
@@ -3518,8 +3586,4 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:143
-msgid "Returned"
-msgstr ""
-
 #: waeup/kofa/students/workflow.py:149
 msgid "Reset to validated"
@@ -3527,5 +3591,5 @@
 
 #: waeup/kofa/students/workflow.py:150
-msgid "Student record reset to 'validated'"
+msgid "Reset to 'validated'"
 msgstr ""
 
@@ -3547,5 +3611,5 @@
 
 #: waeup/kofa/students/workflow.py:38
-msgid "Student record reset"
+msgid "Reset to initial state"
 msgstr ""
 
@@ -3559,5 +3623,5 @@
 
 #: waeup/kofa/students/workflow.py:52
-msgid "Student record reset to 'admitted'"
+msgid "Reset to 'admitted'"
 msgstr ""
 
@@ -3571,5 +3635,5 @@
 
 #: waeup/kofa/students/workflow.py:66 waeup/kofa/students/workflow.py:80
-msgid "Student record reset to 'clearance'"
+msgid "Reset to 'clearance'"
 msgstr ""
 
@@ -3591,5 +3655,5 @@
 
 #: waeup/kofa/students/workflow.py:94
-msgid "Student record reset to 'cleared'"
+msgid "Reset to 'cleared'"
 msgstr ""
 
@@ -3726,4 +3790,8 @@
 msgstr ""
 
+#: waeup/kofa/university/vocabularies.py:38
+msgid "900 (Year 9)"
+msgstr ""
+
 #: waeup/kofa/utils/countries.py:10
 msgid "Albania"
@@ -4030,5 +4098,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/countries.py:169 waeup/kofa/utils/utils.py:47
+#: waeup/kofa/utils/countries.py:169 waeup/kofa/utils/utils.py:48
 msgid "Nigeria"
 msgstr ""
@@ -4682,5 +4750,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/countries.py:90 waeup/kofa/utils/utils.py:46
+#: waeup/kofa/utils/countries.py:90 waeup/kofa/utils/utils.py:47
 msgid "Germany"
 msgstr ""
@@ -4722,5 +4790,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:149
+#: waeup/kofa/utils/utils.py:151
 msgid ""
 "Fullname: ${a}\n"
@@ -4732,5 +4800,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:194
+#: waeup/kofa/utils/utils.py:201
 msgid ""
 "Dear ${a},\n"
@@ -4752,17 +4820,17 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:48
+#: waeup/kofa/utils/utils.py:49
 msgid "U.S."
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:117
+#: waeup/kofa/widgets/phonewidget.py:118
 msgid "Empty phone field(s)."
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:121
+#: waeup/kofa/widgets/phonewidget.py:122
 msgid "Int. prefix requires format '+NNN'"
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:127
+#: waeup/kofa/widgets/phonewidget.py:130
 msgid "Phone numbers may contain numbers only."
 msgstr ""
Index: /main/waeup.kofa/trunk/src/waeup/kofa/locales/ig/LC_MESSAGES/waeup.kofa.po
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/locales/ig/LC_MESSAGES/waeup.kofa.po	(revision 8196)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/ig/LC_MESSAGES/waeup.kofa.po	(revision 8197)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.KOFA\n"
-"POT-Creation-Date: Mon Mar 26 11:33:10 2012\n"
+"POT-Creation-Date: Tue Apr 17 16:18:24 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -28,8 +28,8 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: waeup/kofa/accesscodes/browser.py:100 waeup/kofa/accesscodes/browser.py:113
-#: waeup/kofa/applicants/browser.py:79 waeup/kofa/applicants/browser.py:129
-#: waeup/kofa/applicants/browser.py:181 waeup/kofa/applicants/browser.py:252
-#: waeup/kofa/applicants/browser.py:253 waeup/kofa/applicants/browser.py:336
+#: waeup/kofa/accesscodes/browser.py:101 waeup/kofa/accesscodes/browser.py:114
+#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:131
+#: waeup/kofa/applicants/browser.py:180 waeup/kofa/applicants/browser.py:249
+#: waeup/kofa/applicants/browser.py:250 waeup/kofa/applicants/browser.py:331
 #: waeup/kofa/browser/pages.py:507 waeup/kofa/browser/pages.py:712
 #: waeup/kofa/browser/pages.py:739 waeup/kofa/browser/pages.py:762
@@ -45,144 +45,144 @@
 #: waeup/kofa/browser/pages.py:1814 waeup/kofa/browser/pages.py:1816
 #: waeup/kofa/browser/pages.py:1851 waeup/kofa/browser/pages.py:1902
-#: waeup/kofa/browser/pages.py:1954 waeup/kofa/students/browser.py:589
-#: waeup/kofa/students/browser.py:590 waeup/kofa/students/browser.py:751
-#: waeup/kofa/students/browser.py:753 waeup/kofa/students/browser.py:893
+#: waeup/kofa/browser/pages.py:1954 waeup/kofa/students/browser.py:623
+#: waeup/kofa/students/browser.py:624 waeup/kofa/students/browser.py:807
+#: waeup/kofa/students/browser.py:809 waeup/kofa/students/browser.py:950
 msgid "Cancel"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:102
+#: waeup/kofa/accesscodes/browser.py:103
 msgid "Batch creation cancelled."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:112
+#: waeup/kofa/accesscodes/browser.py:113
 msgid "Reimport"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:115
+#: waeup/kofa/accesscodes/browser.py:116
 msgid "Reimport Access Code Batches"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:120
+#: waeup/kofa/accesscodes/browser.py:121
 msgid "Reimport cancelled."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:126
+#: waeup/kofa/accesscodes/browser.py:127
 msgid "No file chosen. Action cancelled."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:136
+#: waeup/kofa/accesscodes/browser.py:137
 msgid "This batch already exists: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:139
+#: waeup/kofa/accesscodes/browser.py:140
 msgid "Successfully reimported: ${a}"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:152
+#: waeup/kofa/accesscodes/browser.py:153
 msgid "Search and Manage Access Codes"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:596
+#: waeup/kofa/accesscodes/browser.py:154 waeup/kofa/browser/pages.py:596
 #: waeup/kofa/browser/pages.py:1146 waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:169 waeup/kofa/students/browser.py:203
+#: waeup/kofa/students/browser.py:171 waeup/kofa/students/browser.py:209
 msgid "Search"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:154
+#: waeup/kofa/accesscodes/browser.py:155
 msgid "Disable ACs"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:155
+#: waeup/kofa/accesscodes/browser.py:156
 msgid "Enable ACs"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:180 waeup/kofa/accesscodes/workflow.py:39
+#: waeup/kofa/accesscodes/browser.py:181 waeup/kofa/accesscodes/workflow.py:39
 msgid "disabled"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:182
+#: waeup/kofa/accesscodes/browser.py:183
 msgid "${a} disabled."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:186
+#: waeup/kofa/accesscodes/browser.py:187
 msgid "${a}: Disable transition not allowed."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:190
+#: waeup/kofa/accesscodes/browser.py:191
 msgid "re-enabled"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:192
+#: waeup/kofa/accesscodes/browser.py:193
 msgid "${a} (re-)enabled."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:196
+#: waeup/kofa/accesscodes/browser.py:197
 msgid "${a}: Re-enable transition not allowed."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:235
+#: waeup/kofa/accesscodes/browser.py:236
 msgid "Add Access Code Batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:244
+#: waeup/kofa/accesscodes/browser.py:245
 msgid "Reimport Access Code Batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:252
+#: waeup/kofa/accesscodes/browser.py:253
 msgid "Search Access Codes"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:261
+#: waeup/kofa/accesscodes/browser.py:262
 msgid "Access Codes"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:43
+#: waeup/kofa/accesscodes/browser.py:44
 msgid "Archive"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:44
+#: waeup/kofa/accesscodes/browser.py:45
 msgid "Archive and delete"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:46 waeup/kofa/accesscodes/browser.py:206
-#: waeup/kofa/accesscodes/browser.py:226
+#: waeup/kofa/accesscodes/browser.py:47 waeup/kofa/accesscodes/browser.py:207
+#: waeup/kofa/accesscodes/browser.py:227
 msgid "Access Code Batches"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:53
+#: waeup/kofa/accesscodes/browser.py:54
 msgid "No batch selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:61
+#: waeup/kofa/accesscodes/browser.py:62
 msgid "Archived ${a} (${b})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:68
+#: waeup/kofa/accesscodes/browser.py:69
 msgid "Deleted batch ${a}"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:77
+#: waeup/kofa/accesscodes/browser.py:78
 msgid "Create Access Code Batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:83
+#: waeup/kofa/accesscodes/browser.py:84
 msgid "Create batch"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:91
+#: waeup/kofa/accesscodes/browser.py:92
 msgid "Batch created (${a} entries)"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:93
+#: waeup/kofa/accesscodes/browser.py:94
 msgid "Data written to ${a}"
 msgstr ""
@@ -342,15 +342,15 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:116 waeup/kofa/applicants/browser.py:323
-#: waeup/kofa/applicants/browser.py:744
+#: waeup/kofa/applicants/browser.py:118 waeup/kofa/applicants/browser.py:318
+#: waeup/kofa/applicants/browser.py:714
 msgid "Could not delete:"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:119 waeup/kofa/applicants/browser.py:326
-#: waeup/kofa/applicants/browser.py:747 waeup/kofa/browser/pages.py:137
-#: waeup/kofa/students/browser.py:241 waeup/kofa/students/browser.py:647
-#: waeup/kofa/students/browser.py:801 waeup/kofa/students/browser.py:979
-#: waeup/kofa/students/browser.py:1189 waeup/kofa/students/browser.py:1776
+#: waeup/kofa/applicants/browser.py:121 waeup/kofa/applicants/browser.py:321
+#: waeup/kofa/applicants/browser.py:717 waeup/kofa/browser/pages.py:136
+#: waeup/kofa/students/browser.py:253 waeup/kofa/students/browser.py:687
+#: waeup/kofa/students/browser.py:857 waeup/kofa/students/browser.py:1036
+#: waeup/kofa/students/browser.py:1251 waeup/kofa/students/browser.py:1841
 msgid "Successfully removed: ${a}"
 msgstr ""
@@ -362,9 +362,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:177
+#: waeup/kofa/applicants/browser.py:176
 msgid "Added:"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:189 waeup/kofa/applicants/export.py:78
+#: waeup/kofa/applicants/browser.py:188 waeup/kofa/applicants/export.py:76
 #: waeup/kofa/applicants/viewlets.py:44
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:12
@@ -373,8 +373,8 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:252 waeup/kofa/applicants/browser.py:299
-#: waeup/kofa/applicants/browser.py:653 waeup/kofa/applicants/browser.py:687
-#: waeup/kofa/applicants/browser.py:790 waeup/kofa/applicants/browser.py:793
-#: waeup/kofa/applicants/browser.py:837 waeup/kofa/browser/pages.py:480
+#: waeup/kofa/applicants/browser.py:249 waeup/kofa/applicants/browser.py:294
+#: waeup/kofa/applicants/browser.py:619 waeup/kofa/applicants/browser.py:657
+#: waeup/kofa/applicants/browser.py:759 waeup/kofa/applicants/browser.py:762
+#: waeup/kofa/applicants/browser.py:806 waeup/kofa/browser/pages.py:480
 #: waeup/kofa/browser/pages.py:635 waeup/kofa/browser/pages.py:658
 #: waeup/kofa/browser/pages.py:732 waeup/kofa/browser/pages.py:1185
@@ -384,156 +384,168 @@
 #: waeup/kofa/browser/pages.py:1835 waeup/kofa/hostels/browser.py:209
 #: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:318
-#: waeup/kofa/students/browser.py:358 waeup/kofa/students/browser.py:463
-#: waeup/kofa/students/browser.py:540 waeup/kofa/students/browser.py:589
-#: waeup/kofa/students/browser.py:605 waeup/kofa/students/browser.py:751
-#: waeup/kofa/students/browser.py:776 waeup/kofa/students/browser.py:1450
-#: waeup/kofa/students/browser.py:1465 waeup/kofa/students/browser.py:1580
+#: waeup/kofa/students/browser.py:369 waeup/kofa/students/browser.py:497
+#: waeup/kofa/students/browser.py:574 waeup/kofa/students/browser.py:623
+#: waeup/kofa/students/browser.py:639 waeup/kofa/students/browser.py:807
+#: waeup/kofa/students/browser.py:832 waeup/kofa/students/browser.py:1509
+#: waeup/kofa/students/browser.py:1524 waeup/kofa/students/browser.py:1645
 msgid "Save"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:253 waeup/kofa/applicants/browser.py:331
-#: waeup/kofa/applicants/browser.py:360
+#: waeup/kofa/applicants/browser.py:250 waeup/kofa/applicants/browser.py:326
+#: waeup/kofa/applicants/browser.py:354
 msgid "Add applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:263 waeup/kofa/applicants/viewlets.py:95
+#: waeup/kofa/applicants/browser.py:258 waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:303 waeup/kofa/applicants/browser.py:716
+#: waeup/kofa/applicants/browser.py:298 waeup/kofa/applicants/browser.py:686
 #: waeup/kofa/browser/pages.py:1444 waeup/kofa/browser/pages.py:1766
 #: waeup/kofa/browser/pages.py:1838 waeup/kofa/browser/pages.py:1950
-#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:82
-#: waeup/kofa/students/browser.py:384
+#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:84
+#: waeup/kofa/students/browser.py:395
 msgid "Form has been saved."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:312
+#: waeup/kofa/applicants/browser.py:307
 msgid "No applicant selected!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:363
+#: waeup/kofa/applicants/browser.py:357
 msgid "Create application record"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:368
+#: waeup/kofa/applicants/browser.py:362
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:381
+#: waeup/kofa/applicants/browser.py:376
 msgid "Applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:396 waeup/kofa/students/browser.py:283
+#: waeup/kofa/applicants/browser.py:395 waeup/kofa/students/browser.py:295
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:397 waeup/kofa/students/browser.py:284
+#: waeup/kofa/applicants/browser.py:396 waeup/kofa/students/browser.py:296
 msgid "unset"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:402
-msgid "${a} Application Record ${b}"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:453
+#: waeup/kofa/applicants/browser.py:401
+msgid "${a} <br /> Application Record ${b}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:452
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:460 waeup/kofa/students/browser.py:1028
+#: waeup/kofa/applicants/browser.py:459 waeup/kofa/students/browser.py:1091
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:473 waeup/kofa/students/browser.py:1042
+#: waeup/kofa/applicants/browser.py:472 waeup/kofa/students/browser.py:1105
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:500 waeup/kofa/students/browser.py:1061
+#: waeup/kofa/applicants/browser.py:499 waeup/kofa/students/browser.py:1124
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:528 waeup/kofa/students/browser.py:1110
+#: waeup/kofa/applicants/browser.py:527 waeup/kofa/students/browser.py:1172
 msgid "Valid callback received."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:549
+#: waeup/kofa/applicants/browser.py:548
 msgid "Payment Data"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:555
+#: waeup/kofa/applicants/browser.py:554
 msgid "Online Payment Receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:561
+#: waeup/kofa/applicants/browser.py:560
 msgid "Ticket not yet paid."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:626
+#: waeup/kofa/applicants/browser.py:594
 msgid "Uploaded image is too big!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:63
+#: waeup/kofa/applicants/browser.py:599
+msgid "jpg file extension expected."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:619 waeup/kofa/applicants/browser.py:762
+#: waeup/kofa/applicants/browser.py:814
+msgid "Final Submit"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:620 waeup/kofa/applicants/browser.py:727
+#: waeup/kofa/applicants/browser.py:760 waeup/kofa/applicants/browser.py:795
+#: waeup/kofa/students/browser.py:1042
+msgid "Add online payment ticket"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:620 waeup/kofa/applicants/browser.py:732
+#: waeup/kofa/applicants/browser.py:760 waeup/kofa/applicants/browser.py:763
+#: waeup/kofa/applicants/browser.py:800 waeup/kofa/students/browser.py:809
+#: waeup/kofa/students/browser.py:841 waeup/kofa/students/browser.py:1018
+#: waeup/kofa/students/browser.py:1823
+msgid "Remove selected tickets"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/applicants/browser.py:643
+msgid "${a} <br /> Application Form ${b}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:65
 msgid "Application Section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:631
-msgid "jpg file extension expected."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:653 waeup/kofa/applicants/browser.py:793
-#: waeup/kofa/applicants/browser.py:845
-msgid "Final Submit"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:757
-#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:826
-#: waeup/kofa/students/browser.py:985
-msgid "Add online payment ticket"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:654 waeup/kofa/applicants/browser.py:762
-#: waeup/kofa/applicants/browser.py:791 waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:831 waeup/kofa/students/browser.py:753
-#: waeup/kofa/students/browser.py:785 waeup/kofa/students/browser.py:961
-#: waeup/kofa/students/browser.py:1758
-msgid "Remove selected tickets"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/applicants/browser.py:673
-msgid "${a} Application Form ${b}"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:684 waeup/kofa/students/browser.py:355
+#: waeup/kofa/applicants/browser.py:654 waeup/kofa/students/browser.py:366
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:731 waeup/kofa/students/browser.py:967
+#: waeup/kofa/applicants/browser.py:701 waeup/kofa/students/browser.py:1024
 msgid "No payment selected."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:75 waeup/kofa/applicants/viewlets.py:88
+#: waeup/kofa/applicants/browser.py:77 waeup/kofa/applicants/viewlets.py:88
 msgid "Manage application section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:78 waeup/kofa/applicants/browser.py:104
-#: waeup/kofa/applicants/browser.py:253 waeup/kofa/applicants/browser.py:306
+#: waeup/kofa/applicants/browser.py:773 waeup/kofa/students/browser.py:92
+msgid "The requested form is locked (read-only)."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:787
+msgid "No passport picture uploaded."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:789
+msgid "Passport picture confirmation box not ticked."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:106
+#: waeup/kofa/applicants/browser.py:250 waeup/kofa/applicants/browser.py:301
 #: waeup/kofa/browser/pages.py:638 waeup/kofa/browser/pages.py:679
 #: waeup/kofa/browser/pages.py:1324 waeup/kofa/browser/pages.py:1335
 #: waeup/kofa/browser/pages.py:1401 waeup/kofa/browser/pages.py:1436
-#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:204
-#: waeup/kofa/students/browser.py:1156 waeup/kofa/students/browser.py:1169
+#: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:210
+#: waeup/kofa/students/browser.py:1218 waeup/kofa/students/browser.py:1231
 msgid "Remove selected"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:78 waeup/kofa/applicants/browser.py:124
-#: waeup/kofa/applicants/browser.py:147 waeup/kofa/applicants/browser.py:159
+#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:126
+#: waeup/kofa/applicants/browser.py:149 waeup/kofa/applicants/browser.py:159
 msgid "Add applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:138
-#: waeup/kofa/applicants/browser.py:254 waeup/kofa/applicants/browser.py:345
+#: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:140
+#: waeup/kofa/applicants/browser.py:251 waeup/kofa/applicants/browser.py:340
 #: waeup/kofa/browser/pages.py:1402 waeup/kofa/browser/pages.py:1461
 #: waeup/kofa/browser/pages.py:1571 waeup/kofa/browser/pages.py:1657
@@ -542,10 +554,10 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:804 waeup/kofa/students/browser.py:90
-msgid "The requested form is locked (read-only)."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:134
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:341
+#: waeup/kofa/applicants/browser.py:826 waeup/kofa/students/browser.py:1690
+msgid "This form cannot be submitted. Wrong state!"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:83 waeup/kofa/applicants/browser.py:136
+#: waeup/kofa/applicants/browser.py:252 waeup/kofa/applicants/browser.py:336
 #: waeup/kofa/browser/pages.py:1403 waeup/kofa/browser/pages.py:1457
 #: waeup/kofa/browser/pages.py:1572 waeup/kofa/browser/pages.py:1653
@@ -554,62 +566,66 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:818
-msgid "No passport picture uploaded."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:82
+#: waeup/kofa/applicants/browser.py:831
+msgid "Form has been submitted."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:84
 msgid "Applicants Containers"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:820
-msgid "Passport picture confirmation box not ticked."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:857 waeup/kofa/students/browser.py:1625
-msgid "This form cannot be submitted. Wrong state!"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:862
-msgid "Form has been submitted."
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/applicants/browser.py:897
-msgid "Register for ${a} Application"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:903
+#. Default: ""
+#: waeup/kofa/applicants/browser.py:874
+msgid "Apply for ${a}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:880
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:908
+#: waeup/kofa/applicants/browser.py:885
 msgid "Application has ended."
 msgstr ""
 
+#: waeup/kofa/applicants/browser.py:894
+msgid "Get login credentials"
+msgstr ""
+
 #: waeup/kofa/applicants/browser.py:917
-msgid "Get login credentials"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:932
+msgid "An error occurred."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:923 waeup/kofa/applicants/browser.py:934
+msgid "No application record found."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:926
+msgid "Your password has already been set. Please proceed to the login page."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:944
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:939
+#: waeup/kofa/applicants/browser.py:951
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:948
+#: waeup/kofa/applicants/browser.py:960
 msgid "Your registration was successful."
 msgstr ""
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:18
-msgid "Photograph"
-msgstr ""
-
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:43
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:17
+msgid "Admitted Course of Study:"
+msgstr ""
+
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:19
+msgid "Passport Photo:"
+msgstr ""
+
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:44
 msgid "Application Transition:"
 msgstr ""
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:59
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:60
 msgid ""
 "I confirm that the Passport Photograph uploaded on this form is a true "
@@ -617,6 +633,6 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:74
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:43
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:76
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:34
 msgid "Acceptance Fee Payment Tickets"
 msgstr ""
@@ -640,4 +656,10 @@
 msgstr ""
 
+#: waeup/kofa/applicants/browser_templates/applicantregister.pt:22
+msgid ""
+"Your application record will be looked up and an email with your login "
+"credentials will be sent to the address provided."
+msgstr ""
+
 #: waeup/kofa/applicants/browser_templates/applicantregister.pt:8
 msgid "Please solve the captcha<br />to prevent misuse of this service:"
@@ -665,17 +687,17 @@
 msgstr ""
 
-#: waeup/kofa/applicants/container.py:52
-msgid "Basic"
-msgstr ""
-
-#: waeup/kofa/applicants/container.py:55
-msgid "handles basic applicants"
-msgstr ""
-
 #: waeup/kofa/applicants/export.py:40
 msgid "Basic Applicants Containers"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:198 waeup/kofa/students/browser.py:718
+#: waeup/kofa/applicants/interfaces.py:138
+msgid "Create Application Records"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:139
+msgid "Update Application Records"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:159 waeup/kofa/students/browser.py:773
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -701,5 +723,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:205 waeup/kofa/students/browser.py:719
+#: waeup/kofa/applicants/interfaces.py:165 waeup/kofa/students/browser.py:774
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -720,126 +742,122 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:212
-#: waeup/kofa/applicants/interfaces.py:322
+#: waeup/kofa/applicants/interfaces.py:171
+#: waeup/kofa/applicants/interfaces.py:275
 msgid "Application Target"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:220
+#: waeup/kofa/applicants/interfaces.py:178
+#: waeup/kofa/applicants/interfaces.py:282
+msgid "Year of Entrance"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:185
+msgid "Application Mode"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:191
 msgid "Entry Level"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:227
-#: waeup/kofa/applicants/interfaces.py:330
-msgid "Year of Entrance"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:235
-#: waeup/kofa/applicants/interfaces.py:338
-msgid "Applicants Container Type"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:251
+#: waeup/kofa/applicants/interfaces.py:205
 msgid "Category for the grouping of certificates"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:258
+#: waeup/kofa/applicants/interfaces.py:211
 msgid "Human readable description in reST format"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:271
+#: waeup/kofa/applicants/interfaces.py:224
 msgid "Application Start Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:277
+#: waeup/kofa/applicants/interfaces.py:230
 msgid "Application Closing Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:283
+#: waeup/kofa/applicants/interfaces.py:236
 msgid "Forbid additions after deadline (enddate)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:366
+#: waeup/kofa/applicants/interfaces.py:315
 msgid "Applicant Id"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:371
-msgid "JAMB Registration Number"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:383
-#: waeup/kofa/students/interfaces.py:162
+#: waeup/kofa/applicants/interfaces.py:320
+#: waeup/kofa/students/interfaces.py:184 waeup/kofa/students/interfaces.py:271
+#: waeup/kofa/students/interfaces.py:518
+msgid "Registration Number"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:331
+#: waeup/kofa/applicants/interfaces.py:499
+#: waeup/kofa/students/interfaces.py:163
 msgid "First Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:387
-#: waeup/kofa/students/interfaces.py:167
+#: waeup/kofa/applicants/interfaces.py:335
+#: waeup/kofa/students/interfaces.py:168
 msgid "Middle Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:391
-#: waeup/kofa/students/interfaces.py:172
+#: waeup/kofa/applicants/interfaces.py:339
+#: waeup/kofa/students/interfaces.py:173
 msgid "Last Name (Surname)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:395
-#: waeup/kofa/students/interfaces.py:218
+#: waeup/kofa/applicants/interfaces.py:343
+#: waeup/kofa/students/interfaces.py:219
 msgid "Date of Birth"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:400
-msgid "State/LGA"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:405
-#: waeup/kofa/students/interfaces.py:177
+#: waeup/kofa/applicants/interfaces.py:349
+#: waeup/kofa/students/interfaces.py:178
 msgid "Sex"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:411 waeup/kofa/interfaces.py:392
-#: waeup/kofa/interfaces.py:418 waeup/kofa/students/interfaces.py:504
+#: waeup/kofa/applicants/interfaces.py:354
+#: waeup/kofa/applicants/interfaces.py:437
+#: waeup/kofa/applicants/interfaces.py:504 waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:419 waeup/kofa/students/interfaces.py:524
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:416 waeup/kofa/interfaces.py:397
-#: waeup/kofa/interfaces.py:425 waeup/kofa/students/interfaces.py:208
+#: waeup/kofa/applicants/interfaces.py:359 waeup/kofa/interfaces.py:398
+#: waeup/kofa/interfaces.py:426 waeup/kofa/students/interfaces.py:209
 msgid "Phone"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:421
-#: waeup/kofa/applicants/interfaces.py:507
+#: waeup/kofa/applicants/interfaces.py:364
+#: waeup/kofa/applicants/interfaces.py:442
 msgid "1st Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:426
-#: waeup/kofa/applicants/interfaces.py:512
+#: waeup/kofa/applicants/interfaces.py:369
+#: waeup/kofa/applicants/interfaces.py:447
 msgid "2nd Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:431
-msgid "School Grades"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:441
-#: waeup/kofa/applicants/interfaces.py:517
+#: waeup/kofa/applicants/interfaces.py:381
+#: waeup/kofa/applicants/interfaces.py:468
+msgid "Notice"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:385
+#: waeup/kofa/applicants/interfaces.py:457
+msgid "Screening Venue"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:389
+#: waeup/kofa/applicants/interfaces.py:452
 msgid "Screening Score"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:445
-#: waeup/kofa/applicants/interfaces.py:522
-msgid "Screening Venue"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:449
-#: waeup/kofa/applicants/interfaces.py:527
+#: waeup/kofa/applicants/interfaces.py:393
+#: waeup/kofa/applicants/interfaces.py:462
 msgid "Admitted Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:455
-#: waeup/kofa/applicants/interfaces.py:534
-msgid "Notice"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:477
-#: waeup/kofa/students/interfaces.py:157
+#: waeup/kofa/applicants/interfaces.py:398
+#: waeup/kofa/students/interfaces.py:158
 #: waeup/kofa/browser/templates/showstudentspage.pt:4
 #: waeup/kofa/students/browser_templates/containerpage.pt:29
@@ -848,43 +866,34 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:482
+#: waeup/kofa/applicants/interfaces.py:403
 msgid "Form locked"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:561
-#: waeup/kofa/students/interfaces.py:484
+#: waeup/kofa/applicants/interfaces.py:514
+#: waeup/kofa/students/interfaces.py:504
 msgid "Payment Session"
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:110
-#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:23
-#: waeup/kofa/students/browser_templates/studycoursepage.pt:28
-msgid "Department:"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:121
-#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:15
-#: waeup/kofa/students/browser_templates/studycoursepage.pt:39
-msgid "Faculty:"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:186
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:26
-msgid "Admitted Course of Study:"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/applicants/pdf.py:204
+#: waeup/kofa/applicants/pdf.py:50
+msgid "Application Record"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/applicants/pdf.py:84
 msgid ""
-"<font size=10>Proceed to the login page of the portal and enter your new "
-"credentials: user name= ${a}, password = ${b}.</font>"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:210
-msgid "<font size=10>Change your password when you have  logged in.</font>"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:57
-msgid "Application Record"
+"Proceed to the login page of the portal and enter your new credentials: user "
+"name= ${a}, password = ${b}."
+msgstr ""
+
+#: waeup/kofa/applicants/pdf.py:91
+msgid "Change your password when you have logged in."
+msgstr ""
+
+#: waeup/kofa/applicants/utils.py:35
+msgid "Desired Study Courses"
+msgstr ""
+
+#: waeup/kofa/applicants/utils.py:36
+msgid "Process Data"
 msgstr ""
 
@@ -910,13 +919,13 @@
 
 #: waeup/kofa/applicants/viewlets.py:151 waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:256
+#: waeup/kofa/students/browser.py:268
 msgid "Create student record"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:168 waeup/kofa/students/viewlets.py:300
+#: waeup/kofa/applicants/viewlets.py:168 waeup/kofa/students/viewlets.py:321
 msgid "Download payment receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:183 waeup/kofa/students/viewlets.py:315
+#: waeup/kofa/applicants/viewlets.py:183 waeup/kofa/students/viewlets.py:336
 msgid "Request callback"
 msgstr ""
@@ -926,9 +935,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/viewlets.py:73 waeup/kofa/students/viewlets.py:512
+#: waeup/kofa/applicants/viewlets.py:73 waeup/kofa/students/viewlets.py:535
 msgid "My Data"
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:100 waeup/kofa/students/batching.py:141
+#: waeup/kofa/applicants/workflow.py:100 waeup/kofa/students/batching.py:142
 #: waeup/kofa/students/workflow.py:25
 msgid "Student record created"
@@ -962,5 +971,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:41 waeup/kofa/interfaces.py:72
+#: waeup/kofa/applicants/workflow.py:41 waeup/kofa/interfaces.py:73
 msgid "admitted"
 msgstr ""
@@ -970,5 +979,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:43 waeup/kofa/interfaces.py:71
+#: waeup/kofa/applicants/workflow.py:43 waeup/kofa/interfaces.py:72
 msgid "created"
 msgstr ""
@@ -1030,5 +1039,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:312
+#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:311
 msgid "Administration"
 msgstr ""
@@ -1039,5 +1048,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:389
+#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:388
 #: waeup/kofa/browser/viewlets.py:375 waeup/kofa/browser/viewlets.py:685
 msgid "Portal Users"
@@ -1059,5 +1068,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:106
+#: waeup/kofa/browser/pages.py:105
 msgid "Local role successfully removed: ${a}"
 msgstr ""
@@ -1097,11 +1106,11 @@
 msgstr ""
 
+#: waeup/kofa/browser/pages.py:115 waeup/kofa/hostels/browser.py:256
+#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:240
+msgid "No item selected."
+msgstr ""
+
 #: waeup/kofa/browser/pages.py:1155
 msgid "Log files can only be searched on Unix-based operating systems."
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:116 waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:228
-msgid "No item selected."
 msgstr ""
 
@@ -1185,12 +1194,12 @@
 
 #: waeup/kofa/browser/pages.py:1532 waeup/kofa/browser/pages.py:1551
-#: waeup/kofa/students/browser.py:98 waeup/kofa/students/export.py:22
-#: waeup/kofa/students/viewlets.py:472
+#: waeup/kofa/students/browser.py:100 waeup/kofa/students/export.py:40
+#: waeup/kofa/students/viewlets.py:495
 msgid "Students"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:155 waeup/kofa/browser/viewlets.py:322
-#: waeup/kofa/browser/templates/staffsitelayout.pt:28
-#: waeup/kofa/browser/templates/studentsitelayout.pt:33
+#: waeup/kofa/browser/pages.py:154 waeup/kofa/browser/viewlets.py:322
+#: waeup/kofa/browser/templates/staffsitelayout.pt:27
+#: waeup/kofa/browser/templates/studentsitelayout.pt:32
 msgid "Login"
 msgstr ""
@@ -1218,5 +1227,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:163
+#: waeup/kofa/browser/pages.py:162
 msgid "You logged in."
 msgstr ""
@@ -1244,10 +1253,10 @@
 msgstr ""
 
+#: waeup/kofa/browser/pages.py:180
+msgid "You entered wrong credentials."
+msgstr ""
+
 #: waeup/kofa/browser/pages.py:1808
 msgid "Edit certificate"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:181
-msgid "You entered wrong credentials."
 msgstr ""
 
@@ -1282,42 +1291,42 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:195
+#: waeup/kofa/browser/pages.py:194
 msgid "You have been logged out. Thanks for using WAeUP Kofa!"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:231
+#: waeup/kofa/browser/pages.py:230
 msgid "Contact ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:237 waeup/kofa/browser/pages.py:523
+#: waeup/kofa/browser/pages.py:236 waeup/kofa/browser/pages.py:523
 msgid "Send message now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:256 waeup/kofa/browser/pages.py:275
-#: waeup/kofa/browser/pages.py:540 waeup/kofa/students/browser.py:318
+#: waeup/kofa/browser/pages.py:255 waeup/kofa/browser/pages.py:274
+#: waeup/kofa/browser/pages.py:540 waeup/kofa/students/browser.py:330
 msgid "Your message has been sent."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:266
+#: waeup/kofa/browser/pages.py:265
 msgid "Send now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:277
+#: waeup/kofa/browser/pages.py:276
 msgid "A smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:302
+#: waeup/kofa/browser/pages.py:301
 msgid "<h1>Welcome to WAeUP.Kofa</h1>"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:390 waeup/kofa/hostels/browser.py:195
-#: waeup/kofa/students/viewlets.py:163 waeup/kofa/students/viewlets.py:171
-#: waeup/kofa/students/viewlets.py:226 waeup/kofa/students/viewlets.py:243
-#: waeup/kofa/students/viewlets.py:283
+#: waeup/kofa/browser/pages.py:389 waeup/kofa/hostels/browser.py:195
+#: waeup/kofa/students/viewlets.py:166 waeup/kofa/students/viewlets.py:174
+#: waeup/kofa/students/viewlets.py:247 waeup/kofa/students/viewlets.py:255
+#: waeup/kofa/students/viewlets.py:304
 msgid "Manage"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:391 waeup/kofa/browser/viewlets.py:180
+#: waeup/kofa/browser/pages.py:390 waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
 msgstr ""
@@ -1328,5 +1337,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:430 waeup/kofa/browser/pages.py:432
+#: waeup/kofa/browser/pages.py:431 waeup/kofa/browser/pages.py:433
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
@@ -1334,5 +1343,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:454
+#: waeup/kofa/browser/pages.py:455
 msgid "User account ${a} successfully added."
 msgstr ""
@@ -1348,5 +1357,5 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:521 waeup/kofa/students/browser.py:299
+#: waeup/kofa/browser/pages.py:521 waeup/kofa/students/browser.py:311
 msgid "Send message to ${a}"
 msgstr ""
@@ -1433,5 +1442,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:86
+#: waeup/kofa/browser/pages.py:85
 msgid "No local role selected."
 msgstr ""
@@ -1463,4 +1472,14 @@
 #: waeup/kofa/browser/pages.py:963
 msgid "Perform import"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/browser/pdf.py:127
+msgid "${footer_text} Page ${num1} of ${num2}"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/browser/pdf.py:336
+msgid "Date: ${a}"
 msgstr ""
 
@@ -1644,4 +1663,8 @@
 #: waeup/kofa/browser/templates/datacenterpage.pt:16
 msgid "Upload Date"
+msgstr ""
+
+#: waeup/kofa/browser/templates/default_waeup_display_form.pt:6
+msgid "Uploaded Files"
 msgstr ""
 
@@ -1683,15 +1706,20 @@
 
 #: waeup/kofa/browser/templates/facultypage.pt:1
-#: waeup/kofa/hostels/browser_templates/containerpage.pt:1
-msgid "There no subobjects registered yet."
+msgid "There are no subobjects registered yet."
+msgstr ""
+
+#: waeup/kofa/browser/templates/fileupload.pt:26
+#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:26
+msgid "Max. file size:"
 msgstr ""
 
 #: waeup/kofa/browser/templates/loginpage.pt:13
-#: waeup/kofa/browser/templates/usereditformpage.pt:8
+#: waeup/kofa/browser/templates/usereditformpage.pt:9
 #: waeup/kofa/students/browser_templates/basepage.pt:14
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:17
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:18
 #: waeup/kofa/students/browser_templates/change_password.pt:10
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:31
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:34
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:32
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:25
 msgid "Password:"
 msgstr ""
@@ -1711,5 +1739,5 @@
 msgstr ""
 
-#. Default: "Or simply forgot your student id or password? Then request a new password <strong><a href=\"changepw\"> here</a></strong>."
+#. Default: "Or simply forgot your student id, application id or password? Then request a new password <strong><a href=\"sendpw\"> here</a></strong>."
 #: waeup/kofa/browser/templates/loginpage.pt:44
 msgid "login_trouble3"
@@ -1762,46 +1790,46 @@
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:101
-#: waeup/kofa/browser/templates/studentsitelayout.pt:86
+#: waeup/kofa/browser/templates/staffsitelayout.pt:102
+#: waeup/kofa/browser/templates/studentsitelayout.pt:87
 msgid "Form Status:"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:114
-#: waeup/kofa/browser/templates/studentsitelayout.pt:100
+#: waeup/kofa/browser/templates/staffsitelayout.pt:115
+#: waeup/kofa/browser/templates/studentsitelayout.pt:101
 msgid "Back to top"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:116
-#: waeup/kofa/browser/templates/studentsitelayout.pt:102
+#: waeup/kofa/browser/templates/staffsitelayout.pt:117
+#: waeup/kofa/browser/templates/studentsitelayout.pt:103
 msgid "Kofa - Student Management System"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:119
-#: waeup/kofa/browser/templates/studentsitelayout.pt:105
+#: waeup/kofa/browser/templates/staffsitelayout.pt:120
+#: waeup/kofa/browser/templates/studentsitelayout.pt:106
 msgid "Copyright &copy; WAeUP Group 2008-2012"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:34
-#: waeup/kofa/browser/templates/studentsitelayout.pt:39
+#: waeup/kofa/browser/templates/staffsitelayout.pt:33
+#: waeup/kofa/browser/templates/studentsitelayout.pt:38
 msgid "Contact"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:40
-#: waeup/kofa/browser/templates/studentsitelayout.pt:45
+#: waeup/kofa/browser/templates/staffsitelayout.pt:39
+#: waeup/kofa/browser/templates/studentsitelayout.pt:44
 msgid "Logout"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:60
+#: waeup/kofa/browser/templates/staffsitelayout.pt:61
 msgid "Student Id:"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:64
+#: waeup/kofa/browser/templates/staffsitelayout.pt:65
 msgid "State:"
 msgstr ""
 
-#: waeup/kofa/browser/templates/usereditformpage.pt:14
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:23
+#: waeup/kofa/browser/templates/usereditformpage.pt:15
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:24
 #: waeup/kofa/students/browser_templates/change_password.pt:16
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:37
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:38
 msgid "Retype password:"
 msgstr ""
@@ -1815,5 +1843,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/viewlets.py:383 waeup/kofa/students/viewlets.py:155
+#: waeup/kofa/browser/viewlets.py:383 waeup/kofa/students/viewlets.py:158
 msgid "Send email"
 msgstr ""
@@ -1832,5 +1860,5 @@
 
 #: waeup/kofa/browser/viewlets.py:528 waeup/kofa/browser/viewlets.py:536
-msgid "Show batch logs"
+msgid "Show logs"
 msgstr ""
 
@@ -1852,6 +1880,6 @@
 
 #: waeup/kofa/browser/viewlets.py:91 waeup/kofa/browser/viewlets.py:160
-#: waeup/kofa/students/viewlets.py:218 waeup/kofa/students/viewlets.py:356
-#: waeup/kofa/students/viewlets.py:403
+#: waeup/kofa/students/viewlets.py:239 waeup/kofa/students/viewlets.py:379
+#: waeup/kofa/students/viewlets.py:426
 msgid "Edit"
 msgstr ""
@@ -1928,4 +1956,8 @@
 #: waeup/kofa/hostels/browser.py:95
 msgid "Block ${a}, Room ${b}, Bed ${c}"
+msgstr ""
+
+#: waeup/kofa/hostels/browser_templates/containerpage.pt:1
+msgid "There no subobjects registered yet."
 msgstr ""
 
@@ -1952,9 +1984,9 @@
 msgstr ""
 
-#: waeup/kofa/hostels/hostel.py:180
+#: waeup/kofa/hostels/hostel.py:185
 msgid "unreserved"
 msgstr ""
 
-#: waeup/kofa/hostels/hostel.py:187
+#: waeup/kofa/hostels/hostel.py:192
 msgid "reserved"
 msgstr ""
@@ -1988,5 +2020,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/interfaces.py:175 waeup/kofa/students/interfaces.py:445
+#: waeup/kofa/hostels/interfaces.py:175 waeup/kofa/students/interfaces.py:465
 msgid "Bed Type"
 msgstr ""
@@ -2144,41 +2176,41 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:185
+#: waeup/kofa/interfaces.py:186
 msgid "Subject"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:189
+#: waeup/kofa/interfaces.py:190
 msgid "Grade"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:323
+#: waeup/kofa/interfaces.py:324
 msgid "Processor name"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:327
-msgid "Import mode"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:352
+#: waeup/kofa/interfaces.py:328
+msgid "Import Mode"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:353
 msgid "Email Address:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:359
+#: waeup/kofa/interfaces.py:360
 msgid "Email to:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:366
+#: waeup/kofa/interfaces.py:367
 msgid "Subject:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:370
+#: waeup/kofa/interfaces.py:371
 msgid "Full Name:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:374
+#: waeup/kofa/interfaces.py:375
 msgid "Text:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:405
+#: waeup/kofa/interfaces.py:406
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2190,5 +2222,5 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:410
+#: waeup/kofa/interfaces.py:411
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2197,129 +2229,129 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:414
+#: waeup/kofa/interfaces.py:415
 msgid "Description/Notice"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:431
+#: waeup/kofa/interfaces.py:432
 msgid "Portal roles"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:474
+#: waeup/kofa/interfaces.py:477
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:475
+#: waeup/kofa/interfaces.py:478
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:480
+#: waeup/kofa/interfaces.py:483
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:486
+#: waeup/kofa/interfaces.py:489
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:493
+#: waeup/kofa/interfaces.py:496
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:505
+#: waeup/kofa/interfaces.py:508
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:513
+#: waeup/kofa/interfaces.py:516
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:521
+#: waeup/kofa/interfaces.py:524
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:527
+#: waeup/kofa/interfaces.py:530
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:534
+#: waeup/kofa/interfaces.py:537
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:535
+#: waeup/kofa/interfaces.py:538
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:540
+#: waeup/kofa/interfaces.py:543
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:547
+#: waeup/kofa/interfaces.py:550
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:554
+#: waeup/kofa/interfaces.py:557
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:563 waeup/kofa/interfaces.py:621
+#: waeup/kofa/interfaces.py:566 waeup/kofa/interfaces.py:624
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:571 waeup/kofa/payments/interfaces.py:30
+#: waeup/kofa/interfaces.py:574 waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:576
+#: waeup/kofa/interfaces.py:579
 msgid "Surcharge Portal Provider"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:582
+#: waeup/kofa/interfaces.py:585
 msgid "Surcharge Payment Gateway Provider"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:588 waeup/kofa/payments/interfaces.py:120
+#: waeup/kofa/interfaces.py:591 waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:594
+#: waeup/kofa/interfaces.py:597
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:600
+#: waeup/kofa/interfaces.py:603
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:606 waeup/kofa/payments/interfaces.py:36
+#: waeup/kofa/interfaces.py:609 waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:73
+#: waeup/kofa/interfaces.py:74
 msgid "clearance started"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:74
+#: waeup/kofa/interfaces.py:75
 msgid "clearance requested"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:75
+#: waeup/kofa/interfaces.py:76
 msgid "cleared"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:76
+#: waeup/kofa/interfaces.py:77
 msgid "school fee paid"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:77
+#: waeup/kofa/interfaces.py:78
 msgid "returning"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:78
+#: waeup/kofa/interfaces.py:79
 msgid "courses registered"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:79
+#: waeup/kofa/interfaces.py:80
 msgid "courses validated"
 msgstr ""
 
-#: waeup/kofa/objecthistory.py:71
+#: waeup/kofa/objecthistory.py:72
 msgid "by"
 msgstr ""
@@ -2407,6 +2439,6 @@
 #: waeup/kofa/payments/interfaces.py:76
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:10
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:84
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:51
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:86
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:42
 msgid "Payment Date"
 msgstr ""
@@ -2421,434 +2453,455 @@
 
 #. Default: ""
-#: waeup/kofa/students/batching.py:165
+#: waeup/kofa/students/batching.py:166
 msgid "State '${a}' set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1000
+#. Default: ""
+#: waeup/kofa/students/browser.py:1009
+msgid "${a}: Payments"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1054
+msgid "Add online payment"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1057
 msgid "Create ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1008 waeup/kofa/students/browser.py:1230
+#: waeup/kofa/students/browser.py:1065 waeup/kofa/students/browser.py:1292
 msgid "Your current session does not match accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1077
+#: waeup/kofa/students/browser.py:1075
+msgid "Study course data are incomplete."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1139
 msgid "This ticket has already been paid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1090 waeup/kofa/students/browser.py:1098
-#: waeup/kofa/students/browser.py:1106
+#: waeup/kofa/students/browser.py:1152 waeup/kofa/students/browser.py:1160
+#: waeup/kofa/students/browser.py:1168
 msgid "Valid callback received. ${a}"
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/browser.py:1160
+#: waeup/kofa/students/browser.py:121 waeup/kofa/students/viewlets.py:117
+#: waeup/kofa/students/viewlets.py:557
+msgid "Study Course"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/browser.py:1222
 msgid "${a}: Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1172
+#: waeup/kofa/students/browser.py:1234
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1179
+#: waeup/kofa/students/browser.py:1241
 msgid "No bed ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:119 waeup/kofa/students/viewlets.py:114
-#: waeup/kofa/students/viewlets.py:534
-msgid "Study Course"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1210
+#: waeup/kofa/students/browser.py:127 waeup/kofa/students/viewlets.py:123
+#: waeup/kofa/students/viewlets.py:558
+msgid "Payments"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1272
 msgid "Add bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1212
+#: waeup/kofa/students/browser.py:1274
 msgid "Create bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1220
+#: waeup/kofa/students/browser.py:1282
 msgid "Your data are incomplete."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1224
+#: waeup/kofa/students/browser.py:1286
 msgid "You are in the wrong registration state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1235
+#: waeup/kofa/students/browser.py:1297
 msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1246 waeup/kofa/students/browser.py:1543
-#: waeup/kofa/students/browser.py:1656
+#: waeup/kofa/students/browser.py:1308 waeup/kofa/students/browser.py:1602
+#: waeup/kofa/students/browser.py:1721
 msgid "Activation code is invalid."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:125 waeup/kofa/students/viewlets.py:120
-#: waeup/kofa/students/viewlets.py:535
-msgid "Payments"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1266 waeup/kofa/students/browser.py:1394
+#. Default: ""
+#: waeup/kofa/students/browser.py:1328 waeup/kofa/students/browser.py:1454
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1271 waeup/kofa/students/browser.py:1548
-#: waeup/kofa/students/browser.py:1661
+#: waeup/kofa/students/browser.py:1333 waeup/kofa/students/browser.py:1607
+#: waeup/kofa/students/browser.py:1726
 msgid "Activation code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1274 waeup/kofa/students/browser.py:1551
-#: waeup/kofa/students/browser.py:1664 waeup/kofa/students/browser.py:1923
+#: waeup/kofa/students/browser.py:1336 waeup/kofa/students/browser.py:1610
+#: waeup/kofa/students/browser.py:1729 waeup/kofa/students/browser.py:1997
 msgid "invalidated"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1279 waeup/kofa/students/browser.py:1555
-#: waeup/kofa/students/browser.py:1669
+#: waeup/kofa/students/browser.py:1341 waeup/kofa/students/browser.py:1614
+#: waeup/kofa/students/browser.py:1734
 msgid "You are not the owner of this access code."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1290 waeup/kofa/students/browser.py:1408
+#: waeup/kofa/students/browser.py:1352 waeup/kofa/students/browser.py:1468
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1299
+#: waeup/kofa/students/browser.py:1361
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1317
+#: waeup/kofa/students/browser.py:1377
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1333
+#: waeup/kofa/students/browser.py:1393
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1339
+#: waeup/kofa/students/browser.py:1399
 msgid "Bed Allocation: "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1366
+#: waeup/kofa/students/browser.py:142 waeup/kofa/students/viewlets.py:129
+msgid "Accommodation"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1426
 msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1372
+#: waeup/kofa/students/browser.py:1432
 msgid "Student can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:140 waeup/kofa/students/viewlets.py:126
-msgid "Accommodation"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1415
+#. Default: ""
+#: waeup/kofa/students/browser.py:1475
 msgid "Student relocated: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1434
+#: waeup/kofa/students/browser.py:1494
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1447
+#: waeup/kofa/students/browser.py:1506
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1462 waeup/kofa/students/viewlets.py:365
+#. Default: ""
+#: waeup/kofa/students/browser.py:151
+msgid "Bed Ticket ${a}"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1521 waeup/kofa/students/viewlets.py:388
 msgid "Change password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1476
+#: waeup/kofa/students/browser.py:1535
 msgid "Password changed."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1488
+#: waeup/kofa/students/browser.py:1547
 msgid "Upload portrait"
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/browser.py:149
-msgid "Bed Ticket ${a}"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1503 waeup/kofa/students/viewlets.py:389
+#: waeup/kofa/students/browser.py:1562 waeup/kofa/students/viewlets.py:412
 #: waeup/kofa/students/workflow.py:44
 msgid "Start clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1507
+#: waeup/kofa/students/browser.py:1566
 msgid "Start clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1524 waeup/kofa/students/browser.py:1645
+#: waeup/kofa/students/browser.py:1583 waeup/kofa/students/browser.py:1710
 msgid "Wrong state"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1528
+#: waeup/kofa/students/browser.py:1587
 msgid "No portrait uploaded."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1532
+#: waeup/kofa/students/browser.py:1591
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1559
+#: waeup/kofa/students/browser.py:1618
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1571
+#: waeup/kofa/students/browser.py:1628
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1583 waeup/kofa/students/browser.py:1597
+#: waeup/kofa/students/browser.py:1648 waeup/kofa/students/browser.py:1662
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1656
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1606 waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1671 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1607
+#: waeup/kofa/students/browser.py:1672
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1610
+#: waeup/kofa/students/browser.py:1675
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1619
+#: waeup/kofa/students/browser.py:1684
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1628
+#: waeup/kofa/students/browser.py:1693
 msgid "Clearance has been requested."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1637 waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:170
+msgid "Student Section"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1702 waeup/kofa/students/viewlets.py:441
 msgid "Start course registration"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1641
+#: waeup/kofa/students/browser.py:1706
 msgid "Start course registration now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1677
+#: waeup/kofa/students/browser.py:1742
 msgid "Course registration has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:168
-msgid "Student Section"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1696
+#. Default: ""
+#: waeup/kofa/students/browser.py:1761
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1705
+#: waeup/kofa/students/browser.py:1770
 msgid "Create course list now"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1744
+#: waeup/kofa/students/browser.py:1809
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1781
+#: waeup/kofa/students/browser.py:1846
 msgid "Register course list"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1785
+#: waeup/kofa/students/browser.py:1850
 msgid "Course list has been registered."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1831
-msgid "Change my password"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:184 waeup/kofa/students/browser.py:220
+#: waeup/kofa/students/browser.py:186 waeup/kofa/students/browser.py:226
 msgid "Empty search string"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1841
+#: waeup/kofa/students/browser.py:1896
+msgid "Send me a new password"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1906
 msgid "Get new login credentials"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1855
-msgid "No student record found."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1863
+#: waeup/kofa/students/browser.py:1923
+msgid "Application package not installed."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1929
+msgid "No record found."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1937
 msgid "You have successfully changed your password for the"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1868
+#: waeup/kofa/students/browser.py:1942
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1879
+#: waeup/kofa/students/browser.py:1953
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1882
+#: waeup/kofa/students/browser.py:1956
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1897
+#: waeup/kofa/students/browser.py:1971
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1905
+#: waeup/kofa/students/browser.py:1979
 msgid "Access code is invalid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1908
+#: waeup/kofa/students/browser.py:1982
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1914
+#: waeup/kofa/students/browser.py:1988
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1920
+#: waeup/kofa/students/browser.py:1994
 msgid "Access code has already been used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1929
+#: waeup/kofa/students/browser.py:2003
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:202 waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:208 waeup/kofa/students/viewlets.py:142
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:226 waeup/kofa/students/browser.py:1894
+#: waeup/kofa/students/browser.py:238 waeup/kofa/students/browser.py:1968
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:253 waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:265 waeup/kofa/students/viewlets.py:149
 msgid "Add student"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:261
+#: waeup/kofa/students/browser.py:273
 msgid "Student record created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:277
+#: waeup/kofa/students/browser.py:289
 msgid "${a}: Base Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:320 waeup/kofa/students/browser.py:1871
+#: waeup/kofa/students/browser.py:332 waeup/kofa/students/browser.py:1945
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:332
+#: waeup/kofa/students/browser.py:343
 msgid "Manage base data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:407
+#: waeup/kofa/students/browser.py:423
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:423 waeup/kofa/students/viewlets.py:104
-#: waeup/kofa/students/viewlets.py:532
+#: waeup/kofa/students/browser.py:446 waeup/kofa/students/viewlets.py:107
+#: waeup/kofa/students/viewlets.py:555
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
 msgid "Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:429
+#: waeup/kofa/students/browser.py:452
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:449
+#: waeup/kofa/students/browser.py:471
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:478
+#: waeup/kofa/students/browser.py:512
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:480 waeup/kofa/students/browser.py:504
+#: waeup/kofa/students/browser.py:514 waeup/kofa/students/browser.py:538
 msgid "Student is in wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:497
+#: waeup/kofa/students/browser.py:531
 msgid "Clearance has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:501
+#: waeup/kofa/students/browser.py:535
 msgid "Clearance request has been rejected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:527
+#: waeup/kofa/students/browser.py:561
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:537
-msgid "Manage personal data"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:557
+#: waeup/kofa/students/browser.py:571
+msgid "Edit personal data"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/browser.py:591
 msgid "${a}: Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:587
+#: waeup/kofa/students/browser.py:621
 msgid "Manage study course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:590 waeup/kofa/students/browser.py:631
+#: waeup/kofa/students/browser.py:624 waeup/kofa/students/browser.py:671
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:591 waeup/kofa/students/browser.py:617
+#: waeup/kofa/students/browser.py:625 waeup/kofa/students/browser.py:657
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:625
+#: waeup/kofa/students/browser.py:645
+msgid "Current level not available for certificate."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:665
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:627 waeup/kofa/students/browser.py:1714
+#: waeup/kofa/students/browser.py:667 waeup/kofa/students/browser.py:1779
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:637
+#: waeup/kofa/students/browser.py:677
 msgid "No study level selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:673
+#: waeup/kofa/students/browser.py:728
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:696
+#: waeup/kofa/students/browser.py:751
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:702
+#: waeup/kofa/students/browser.py:757
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:711
-msgid "Course Registration Slip  "
-msgstr ""
-
-#: waeup/kofa/students/browser.py:717
+#: waeup/kofa/students/browser.py:766
+msgid "Course Registration Slip"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:772
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -2857,5 +2910,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:720
+#: waeup/kofa/students/browser.py:775
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -2863,10 +2916,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:721
+#: waeup/kofa/students/browser.py:776
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:722
+#: waeup/kofa/students/browser.py:777
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -2874,5 +2927,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:723
+#: waeup/kofa/students/browser.py:778
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -2880,5 +2933,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:724 waeup/kofa/students/interfaces.py:389
+#: waeup/kofa/students/browser.py:779 waeup/kofa/students/interfaces.py:409
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2887,65 +2940,56 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:752 waeup/kofa/students/browser.py:781
-#: waeup/kofa/students/browser.py:866 waeup/kofa/students/browser.py:871
-#: waeup/kofa/students/browser.py:1754 waeup/kofa/students/browser.py:1804
+#: waeup/kofa/students/browser.py:808 waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:922 waeup/kofa/students/browser.py:927
+#: waeup/kofa/students/browser.py:1819 waeup/kofa/students/browser.py:1869
 msgid "Add course ticket"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:773
+#: waeup/kofa/students/browser.py:829
 msgid "Manage study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:791 waeup/kofa/students/browser.py:1764
+#: waeup/kofa/students/browser.py:847 waeup/kofa/students/browser.py:1829
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:815 waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:871 waeup/kofa/students/browser.py:893
 msgid "This level does not correspond current level."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:819
+#: waeup/kofa/students/browser.py:875
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:821 waeup/kofa/students/browser.py:849
+#: waeup/kofa/students/browser.py:877 waeup/kofa/students/browser.py:905
 msgid "Student is in the wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:842
+#: waeup/kofa/students/browser.py:898
 msgid "Course list request has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:846
+#: waeup/kofa/students/browser.py:902
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:886 waeup/kofa/students/browser.py:1817
+#: waeup/kofa/students/browser.py:943 waeup/kofa/students/browser.py:1882
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:888 waeup/kofa/students/browser.py:1819
+#: waeup/kofa/students/browser.py:945 waeup/kofa/students/browser.py:1884
 msgid "Successfully added ${a}."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:909
+#: waeup/kofa/students/browser.py:966
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:925
+#: waeup/kofa/students/browser.py:982
 msgid "Manage course ticket ${a}"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:952
-msgid "${a}: Payments"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:997
-msgid "Add online payment"
 msgstr ""
 
@@ -2954,11 +2998,6 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:29
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:30
 msgid "Registration Transition:"
-msgstr ""
-
-#. Default: "Please solve the captcha<br />to prevent misuse of this service:"
-#: waeup/kofa/students/browser_templates/changepw.pt:8
-msgid "solve_captcha"
 msgstr ""
 
@@ -3010,6 +3049,6 @@
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:14
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:25
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:87
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:54
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:89
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:45
 msgid "State"
 msgstr ""
@@ -3030,4 +3069,14 @@
 msgstr ""
 
+#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:15
+#: waeup/kofa/students/browser_templates/studycoursepage.pt:39
+msgid "Faculty:"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:23
+#: waeup/kofa/students/browser_templates/studycoursepage.pt:28
+msgid "Department:"
+msgstr ""
+
 #: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:31
 msgid "Semester:"
@@ -3046,32 +3095,36 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:20
-#: waeup/kofa/students/browser_templates/fileupload.pt:26
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
-msgid "Max. file size:"
-msgstr ""
-
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:11
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:87
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:43
+msgid "Category"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:12
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:88
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:44
+msgid "Item"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:8
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:84
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:40
+msgid "Payment Id"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:9
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:85
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:52
-msgid "Category"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:12
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:86
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:53
-msgid "Item"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:8
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:82
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:49
-msgid "Payment Id"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:9
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:83
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:50
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:41
 msgid "Creation Date"
+msgstr ""
+
+#. Default: "Enter the email address stored on Kofa. You can't change your email address here. If you've forgotten your email address or the email address stored in Kofa is wrong or no longer valid, use the enquiries form to request a change of address."
+#: waeup/kofa/students/browser_templates/sendpassword.pt:19
+msgid "email_address_problem"
+msgstr ""
+
+#. Default: "Please solve the captcha<br />to prevent misuse of this service:"
+#: waeup/kofa/students/browser_templates/sendpassword.pt:8
+msgid "solve_captcha"
 msgstr ""
 
@@ -3175,69 +3228,76 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:183 waeup/kofa/students/interfaces.py:259
-#: waeup/kofa/students/interfaces.py:498
-msgid "Registration Number"
-msgstr ""
-
-#: waeup/kofa/students/interfaces.py:190 waeup/kofa/students/interfaces.py:268
+#: waeup/kofa/students/export.py:139
+msgid "Student Study Levels"
+msgstr ""
+
+#: waeup/kofa/students/export.py:87
+msgid "Student Study Courses"
+msgstr ""
+
+#: waeup/kofa/students/interfaces.py:191 waeup/kofa/students/interfaces.py:280
 msgid "Matriculation Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:197
+#: waeup/kofa/students/interfaces.py:198
 msgid "PWD Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/students/interfaces.py:204
 msgid "Email"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:223
+#: waeup/kofa/students/interfaces.py:225
 msgid "Clearance form locked"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:228
+#: waeup/kofa/students/interfaces.py:230
 msgid "CLR Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:235
+#: waeup/kofa/students/interfaces.py:237
 msgid "Nationality"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:245
+#: waeup/kofa/students/interfaces.py:246
+msgid "Employer"
+msgstr ""
+
+#: waeup/kofa/students/interfaces.py:256
 msgid "Permanent Address"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:277
+#: waeup/kofa/students/interfaces.py:289
 #: waeup/kofa/browser/templates/showstudentspage.pt:7
 msgid "Certificate"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:283
+#: waeup/kofa/students/interfaces.py:295
 msgid "Entry Mode"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:290
+#: waeup/kofa/students/interfaces.py:302
 msgid "Entry Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:298 waeup/kofa/students/interfaces.py:337
+#: waeup/kofa/students/interfaces.py:310 waeup/kofa/students/interfaces.py:349
 #: waeup/kofa/browser/templates/showstudentspage.pt:8
 msgid "Current Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:305 waeup/kofa/students/interfaces.py:343
+#: waeup/kofa/students/interfaces.py:317 waeup/kofa/students/interfaces.py:355
 #: waeup/kofa/browser/templates/showstudentspage.pt:9
 msgid "Current Level"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:312 waeup/kofa/students/interfaces.py:331
+#: waeup/kofa/students/interfaces.py:324 waeup/kofa/students/interfaces.py:343
 msgid "Current Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:319
+#: waeup/kofa/students/interfaces.py:331
 msgid "Previous Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:357 waeup/kofa/students/interfaces.py:451
+#: waeup/kofa/students/interfaces.py:369 waeup/kofa/students/interfaces.py:471
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3245,9 +3305,9 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:363
+#: waeup/kofa/students/interfaces.py:375
 msgid "Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:382
+#: waeup/kofa/students/interfaces.py:402
 #: waeup/kofa/browser/templates/certificatepage.pt:30
 #: waeup/kofa/browser/templates/certificatemanagepage.pt:33
@@ -3255,13 +3315,13 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:396
+#: waeup/kofa/students/interfaces.py:416
 msgid "Automatical Creation"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:403
+#: waeup/kofa/students/interfaces.py:423
 msgid "Carry-over Course"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:422
+#: waeup/kofa/students/interfaces.py:442
 #: waeup/kofa/university/interfaces.py:299
 #: waeup/kofa/browser/templates/certificatepage.pt:29
@@ -3270,131 +3330,139 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:439
+#: waeup/kofa/students/interfaces.py:459
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:10
 msgid "Bed Coordinates"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:458
+#: waeup/kofa/students/interfaces.py:478
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:9
 msgid "Booking Date"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:464
+#: waeup/kofa/students/interfaces.py:484
 msgid "Booking Activation Code"
 msgstr ""
 
-#. Default: ""
-#: waeup/kofa/students/utils.py:167
+#: waeup/kofa/students/utils.py:182
+msgid "Scanned Documents"
+msgstr ""
+
+#: waeup/kofa/students/utils.py:190
+msgid "(not provided)"
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/students/utils.py:218
 msgid "<font size=10>${a} Page ${b} of ${c}</font>"
 msgstr ""
 
-#: waeup/kofa/students/utils.py:298 waeup/kofa/students/viewlets.py:71
-#: waeup/kofa/students/viewlets.py:99
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:6
+#: waeup/kofa/students/utils.py:333 waeup/kofa/students/viewlets.py:74
+#: waeup/kofa/students/viewlets.py:102
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:7
 msgid "Base Data"
 msgstr ""
 
-#: waeup/kofa/students/utils.py:329
-msgid "Scanned Documents"
-msgstr ""
-
-#: waeup/kofa/students/utils.py:382
+#: waeup/kofa/students/utils.py:368
 msgid "(not yet)"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:109 waeup/kofa/students/viewlets.py:533
+#: waeup/kofa/students/viewlets.py:112 waeup/kofa/students/viewlets.py:556
 msgid "Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:131 waeup/kofa/students/viewlets.py:537
+#: waeup/kofa/students/viewlets.py:134 waeup/kofa/students/viewlets.py:560
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:27
 msgid "History"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:179 waeup/kofa/students/workflow.py:72
+#: waeup/kofa/students/viewlets.py:182 waeup/kofa/students/workflow.py:72
 msgid "Clear student"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:194
+#: waeup/kofa/students/viewlets.py:197
 msgid "Reject clearance"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:210
+#: waeup/kofa/students/viewlets.py:213
 msgid "Download clearance slip"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:235
+#: waeup/kofa/students/viewlets.py:222 waeup/kofa/students/viewlets.py:231
+msgid "View"
+msgstr ""
+
+#: waeup/kofa/students/viewlets.py:263 waeup/kofa/students/workflow.py:128
+msgid "Validate courses"
+msgstr ""
+
+#: waeup/kofa/students/viewlets.py:279
+msgid "Reject courses"
+msgstr ""
+
+#: waeup/kofa/students/viewlets.py:296
 msgid "Download course registration slip"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:251 waeup/kofa/students/workflow.py:128
-msgid "Validate courses"
-msgstr ""
-
-#: waeup/kofa/students/viewlets.py:267
-msgid "Reject courses"
-msgstr ""
-
-#: waeup/kofa/students/viewlets.py:330
+#: waeup/kofa/students/viewlets.py:353
 msgid "Book accommodation"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:339
+#: waeup/kofa/students/viewlets.py:362
 msgid "Download bed allocation slip"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:348
+#: waeup/kofa/students/viewlets.py:371
 msgid "Relocate student"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:374
+#: waeup/kofa/students/viewlets.py:397
 msgid "Change portrait"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:432
+#: waeup/kofa/students/viewlets.py:455
 msgid "Add course list"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:450
+#: waeup/kofa/students/viewlets.py:473
 msgid "Add and remove courses"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:536
+#: waeup/kofa/students/viewlets.py:559
 msgid "Accommodation Data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:548
+#: waeup/kofa/students/viewlets.py:571
 msgid "${a} deleted."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:561
+#: waeup/kofa/students/viewlets.py:584
 msgid "File name has no extension."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:564
+#: waeup/kofa/students/viewlets.py:587
 msgid "File name contains more than one dot."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:571
+#: waeup/kofa/students/viewlets.py:594
 msgid "${a} file extension expected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:577
+#: waeup/kofa/students/viewlets.py:600
 msgid "Only the following extension are allowed: ${a}"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:583
+#: waeup/kofa/students/viewlets.py:606
 msgid "Uploaded file is too big."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/viewlets.py:590
+#: waeup/kofa/students/viewlets.py:613
 msgid "File ${a} uploaded."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:608
+#: waeup/kofa/students/viewlets.py:631
 #: waeup/kofa/browser/templates/datacenterlogspage.pt:10
 #: waeup/kofa/browser/templates/datacenterpage.pt:14
@@ -3403,84 +3471,84 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:609
+#: waeup/kofa/students/viewlets.py:632
 msgid "Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:632
+#: waeup/kofa/students/viewlets.py:655
 msgid "Upload new file"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:633
+#: waeup/kofa/students/viewlets.py:656
 msgid "Delete attachment"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:663
+#: waeup/kofa/students/viewlets.py:687
 msgid "No local file selected."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:677
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:8
+#: waeup/kofa/students/viewlets.py:701
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:9
 msgid "Passport Picture"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:688
+#: waeup/kofa/students/viewlets.py:712
 msgid "Passport Picture (jpg only)"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:703 waeup/kofa/students/viewlets.py:714
+#: waeup/kofa/students/viewlets.py:727 waeup/kofa/students/viewlets.py:738
 msgid "Birth Certificate"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:704 waeup/kofa/students/viewlets.py:715
+#: waeup/kofa/students/viewlets.py:728 waeup/kofa/students/viewlets.py:739
 msgid "Birth Certificate Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:724 waeup/kofa/students/viewlets.py:735
+#: waeup/kofa/students/viewlets.py:748 waeup/kofa/students/viewlets.py:759
 msgid "Acceptance Letter"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:725 waeup/kofa/students/viewlets.py:736
+#: waeup/kofa/students/viewlets.py:749 waeup/kofa/students/viewlets.py:760
 msgid "Acceptance Letter Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:85
+#: waeup/kofa/students/viewlets.py:88
 msgid "Application Slip"
 msgstr ""
 
-#: waeup/kofa/students/vocabularies.py:117
+#: waeup/kofa/students/vocabularies.py:116
 msgid "male"
 msgstr ""
 
-#: waeup/kofa/students/vocabularies.py:119
+#: waeup/kofa/students/vocabularies.py:118
 msgid "female"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:77
+#: waeup/kofa/students/vocabularies.py:76
 msgid "Error: level id ${value} out of range"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:88
+#: waeup/kofa/students/vocabularies.py:87
 msgid "${title} 2nd spillover"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:91
+#: waeup/kofa/students/vocabularies.py:90
 msgid "${title} 3rd spillover"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:94
+#: waeup/kofa/students/vocabularies.py:93
 msgid "${title} 1st spillover"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:96
+#: waeup/kofa/students/vocabularies.py:95
 msgid "${title} on 1st probation"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/vocabularies.py:98
+#: waeup/kofa/students/vocabularies.py:97
 msgid "${title} on 2nd probation"
 msgstr ""
@@ -3490,6 +3558,6 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:108
-msgid "Student record reset to 'returning'"
+#: waeup/kofa/students/workflow.py:108 waeup/kofa/students/workflow.py:143
+msgid "Reset to 'returning'"
 msgstr ""
 
@@ -3507,5 +3575,5 @@
 
 #: waeup/kofa/students/workflow.py:122 waeup/kofa/students/workflow.py:136
-msgid "Student record reset to 'paid'"
+msgid "Reset to 'paid'"
 msgstr ""
 
@@ -3518,8 +3586,4 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:143
-msgid "Returned"
-msgstr ""
-
 #: waeup/kofa/students/workflow.py:149
 msgid "Reset to validated"
@@ -3527,5 +3591,5 @@
 
 #: waeup/kofa/students/workflow.py:150
-msgid "Student record reset to 'validated'"
+msgid "Reset to 'validated'"
 msgstr ""
 
@@ -3547,5 +3611,5 @@
 
 #: waeup/kofa/students/workflow.py:38
-msgid "Student record reset"
+msgid "Reset to initial state"
 msgstr ""
 
@@ -3559,5 +3623,5 @@
 
 #: waeup/kofa/students/workflow.py:52
-msgid "Student record reset to 'admitted'"
+msgid "Reset to 'admitted'"
 msgstr ""
 
@@ -3571,5 +3635,5 @@
 
 #: waeup/kofa/students/workflow.py:66 waeup/kofa/students/workflow.py:80
-msgid "Student record reset to 'clearance'"
+msgid "Reset to 'clearance'"
 msgstr ""
 
@@ -3591,5 +3655,5 @@
 
 #: waeup/kofa/students/workflow.py:94
-msgid "Student record reset to 'cleared'"
+msgid "Reset to 'cleared'"
 msgstr ""
 
@@ -3726,4 +3790,8 @@
 msgstr ""
 
+#: waeup/kofa/university/vocabularies.py:38
+msgid "900 (Year 9)"
+msgstr ""
+
 #: waeup/kofa/utils/countries.py:10
 msgid "Albania"
@@ -4030,5 +4098,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/countries.py:169 waeup/kofa/utils/utils.py:47
+#: waeup/kofa/utils/countries.py:169 waeup/kofa/utils/utils.py:48
 msgid "Nigeria"
 msgstr ""
@@ -4682,5 +4750,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/countries.py:90 waeup/kofa/utils/utils.py:46
+#: waeup/kofa/utils/countries.py:90 waeup/kofa/utils/utils.py:47
 msgid "Germany"
 msgstr ""
@@ -4722,5 +4790,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:149
+#: waeup/kofa/utils/utils.py:151
 msgid ""
 "Fullname: ${a}\n"
@@ -4732,5 +4800,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:194
+#: waeup/kofa/utils/utils.py:201
 msgid ""
 "Dear ${a},\n"
@@ -4752,17 +4820,17 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:48
+#: waeup/kofa/utils/utils.py:49
 msgid "U.S."
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:117
+#: waeup/kofa/widgets/phonewidget.py:118
 msgid "Empty phone field(s)."
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:121
+#: waeup/kofa/widgets/phonewidget.py:122
 msgid "Int. prefix requires format '+NNN'"
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:127
+#: waeup/kofa/widgets/phonewidget.py:130
 msgid "Phone numbers may contain numbers only."
 msgstr ""
Index: /main/waeup.kofa/trunk/src/waeup/kofa/locales/waeup.kofa.pot
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/locales/waeup.kofa.pot	(revision 8196)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/waeup.kofa.pot	(revision 8197)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Mon Mar 26 11:33:10 2012\n"
+"POT-Creation-Date: Tue Apr 17 16:18:24 2012\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -24,12 +24,12 @@
 "Generated-By: zope/app/locales/extract.py\n"
 
-#: waeup/kofa/accesscodes/browser.py:100
-#: waeup/kofa/accesscodes/browser.py:113
-#: waeup/kofa/applicants/browser.py:79
-#: waeup/kofa/applicants/browser.py:129
-#: waeup/kofa/applicants/browser.py:181
-#: waeup/kofa/applicants/browser.py:252
-#: waeup/kofa/applicants/browser.py:253
-#: waeup/kofa/applicants/browser.py:336
+#: waeup/kofa/accesscodes/browser.py:101
+#: waeup/kofa/accesscodes/browser.py:114
+#: waeup/kofa/applicants/browser.py:81
+#: waeup/kofa/applicants/browser.py:131
+#: waeup/kofa/applicants/browser.py:180
+#: waeup/kofa/applicants/browser.py:249
+#: waeup/kofa/applicants/browser.py:250
+#: waeup/kofa/applicants/browser.py:331
 #: waeup/kofa/browser/pages.py:507
 #: waeup/kofa/browser/pages.py:712
@@ -59,150 +59,150 @@
 #: waeup/kofa/browser/pages.py:1902
 #: waeup/kofa/browser/pages.py:1954
-#: waeup/kofa/students/browser.py:589
-#: waeup/kofa/students/browser.py:590
-#: waeup/kofa/students/browser.py:751
-#: waeup/kofa/students/browser.py:753
-#: waeup/kofa/students/browser.py:893
+#: waeup/kofa/students/browser.py:623
+#: waeup/kofa/students/browser.py:624
+#: waeup/kofa/students/browser.py:807
+#: waeup/kofa/students/browser.py:809
+#: waeup/kofa/students/browser.py:950
 msgid "Cancel"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:102
+#: waeup/kofa/accesscodes/browser.py:103
 msgid "Batch creation cancelled."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:112
+#: waeup/kofa/accesscodes/browser.py:113
 msgid "Reimport"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:115
+#: waeup/kofa/accesscodes/browser.py:116
 msgid "Reimport Access Code Batches"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:120
+#: waeup/kofa/accesscodes/browser.py:121
 msgid "Reimport cancelled."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:126
+#: waeup/kofa/accesscodes/browser.py:127
 msgid "No file chosen. Action cancelled."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:136
+#: waeup/kofa/accesscodes/browser.py:137
 #. Default: ""
 msgid "This batch already exists: ${a}"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:139
+#: waeup/kofa/accesscodes/browser.py:140
 #. Default: ""
 msgid "Successfully reimported: ${a}"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:152
+#: waeup/kofa/accesscodes/browser.py:153
 msgid "Search and Manage Access Codes"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:153
+#: waeup/kofa/accesscodes/browser.py:154
 #: waeup/kofa/browser/pages.py:596
 #: waeup/kofa/browser/pages.py:1146
 #: waeup/kofa/browser/viewlets.py:190
-#: waeup/kofa/students/browser.py:169
-#: waeup/kofa/students/browser.py:203
+#: waeup/kofa/students/browser.py:171
+#: waeup/kofa/students/browser.py:209
 msgid "Search"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:154
+#: waeup/kofa/accesscodes/browser.py:155
 msgid "Disable ACs"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:155
+#: waeup/kofa/accesscodes/browser.py:156
 msgid "Enable ACs"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:180
+#: waeup/kofa/accesscodes/browser.py:181
 #: waeup/kofa/accesscodes/workflow.py:39
 msgid "disabled"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:182
+#: waeup/kofa/accesscodes/browser.py:183
 #. Default: ""
 msgid "${a} disabled."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:186
+#: waeup/kofa/accesscodes/browser.py:187
 #. Default: ""
 msgid "${a}: Disable transition not allowed."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:190
+#: waeup/kofa/accesscodes/browser.py:191
 msgid "re-enabled"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:192
+#: waeup/kofa/accesscodes/browser.py:193
 #. Default: ""
 msgid "${a} (re-)enabled."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:196
+#: waeup/kofa/accesscodes/browser.py:197
 #. Default: ""
 msgid "${a}: Re-enable transition not allowed."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:235
+#: waeup/kofa/accesscodes/browser.py:236
 msgid "Add Access Code Batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:244
+#: waeup/kofa/accesscodes/browser.py:245
 msgid "Reimport Access Code Batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:252
+#: waeup/kofa/accesscodes/browser.py:253
 msgid "Search Access Codes"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:261
+#: waeup/kofa/accesscodes/browser.py:262
 msgid "Access Codes"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:43
+#: waeup/kofa/accesscodes/browser.py:44
 msgid "Archive"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:44
+#: waeup/kofa/accesscodes/browser.py:45
 msgid "Archive and delete"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:46
-#: waeup/kofa/accesscodes/browser.py:206
-#: waeup/kofa/accesscodes/browser.py:226
+#: waeup/kofa/accesscodes/browser.py:47
+#: waeup/kofa/accesscodes/browser.py:207
+#: waeup/kofa/accesscodes/browser.py:227
 msgid "Access Code Batches"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:53
+#: waeup/kofa/accesscodes/browser.py:54
 msgid "No batch selected."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:61
+#: waeup/kofa/accesscodes/browser.py:62
 #. Default: ""
 msgid "Archived ${a} (${b})"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:68
+#: waeup/kofa/accesscodes/browser.py:69
 #. Default: ""
 msgid "Deleted batch ${a}"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:77
+#: waeup/kofa/accesscodes/browser.py:78
 msgid "Create Access Code Batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:83
+#: waeup/kofa/accesscodes/browser.py:84
 msgid "Create batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:91
+#: waeup/kofa/accesscodes/browser.py:92
 #. Default: ""
 msgid "Batch created (${a} entries)"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:93
+#: waeup/kofa/accesscodes/browser.py:94
 #. Default: ""
 msgid "Data written to ${a}"
@@ -364,20 +364,20 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:116
-#: waeup/kofa/applicants/browser.py:323
-#: waeup/kofa/applicants/browser.py:744
+#: waeup/kofa/applicants/browser.py:118
+#: waeup/kofa/applicants/browser.py:318
+#: waeup/kofa/applicants/browser.py:714
 msgid "Could not delete:"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:119
-#: waeup/kofa/applicants/browser.py:326
-#: waeup/kofa/applicants/browser.py:747
-#: waeup/kofa/browser/pages.py:137
-#: waeup/kofa/students/browser.py:241
-#: waeup/kofa/students/browser.py:647
-#: waeup/kofa/students/browser.py:801
-#: waeup/kofa/students/browser.py:979
-#: waeup/kofa/students/browser.py:1189
-#: waeup/kofa/students/browser.py:1776
+#: waeup/kofa/applicants/browser.py:121
+#: waeup/kofa/applicants/browser.py:321
+#: waeup/kofa/applicants/browser.py:717
+#: waeup/kofa/browser/pages.py:136
+#: waeup/kofa/students/browser.py:253
+#: waeup/kofa/students/browser.py:687
+#: waeup/kofa/students/browser.py:857
+#: waeup/kofa/students/browser.py:1036
+#: waeup/kofa/students/browser.py:1251
+#: waeup/kofa/students/browser.py:1841
 #. Default: ""
 msgid "Successfully removed: ${a}"
@@ -388,10 +388,10 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:177
+#: waeup/kofa/applicants/browser.py:176
 msgid "Added:"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:189
-#: waeup/kofa/applicants/export.py:78
+#: waeup/kofa/applicants/browser.py:188
+#: waeup/kofa/applicants/export.py:76
 #: waeup/kofa/applicants/viewlets.py:44
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:12
@@ -400,11 +400,11 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:252
-#: waeup/kofa/applicants/browser.py:299
-#: waeup/kofa/applicants/browser.py:653
-#: waeup/kofa/applicants/browser.py:687
-#: waeup/kofa/applicants/browser.py:790
-#: waeup/kofa/applicants/browser.py:793
-#: waeup/kofa/applicants/browser.py:837
+#: waeup/kofa/applicants/browser.py:249
+#: waeup/kofa/applicants/browser.py:294
+#: waeup/kofa/applicants/browser.py:619
+#: waeup/kofa/applicants/browser.py:657
+#: waeup/kofa/applicants/browser.py:759
+#: waeup/kofa/applicants/browser.py:762
+#: waeup/kofa/applicants/browser.py:806
 #: waeup/kofa/browser/pages.py:480
 #: waeup/kofa/browser/pages.py:635
@@ -422,30 +422,30 @@
 #: waeup/kofa/hostels/browser.py:231
 #: waeup/kofa/hostels/browser.py:318
-#: waeup/kofa/students/browser.py:358
-#: waeup/kofa/students/browser.py:463
-#: waeup/kofa/students/browser.py:540
-#: waeup/kofa/students/browser.py:589
-#: waeup/kofa/students/browser.py:605
-#: waeup/kofa/students/browser.py:751
-#: waeup/kofa/students/browser.py:776
-#: waeup/kofa/students/browser.py:1450
-#: waeup/kofa/students/browser.py:1465
-#: waeup/kofa/students/browser.py:1580
+#: waeup/kofa/students/browser.py:369
+#: waeup/kofa/students/browser.py:497
+#: waeup/kofa/students/browser.py:574
+#: waeup/kofa/students/browser.py:623
+#: waeup/kofa/students/browser.py:639
+#: waeup/kofa/students/browser.py:807
+#: waeup/kofa/students/browser.py:832
+#: waeup/kofa/students/browser.py:1509
+#: waeup/kofa/students/browser.py:1524
+#: waeup/kofa/students/browser.py:1645
 msgid "Save"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:253
-#: waeup/kofa/applicants/browser.py:331
-#: waeup/kofa/applicants/browser.py:360
+#: waeup/kofa/applicants/browser.py:250
+#: waeup/kofa/applicants/browser.py:326
+#: waeup/kofa/applicants/browser.py:354
 msgid "Add applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:263
+#: waeup/kofa/applicants/browser.py:258
 #: waeup/kofa/applicants/viewlets.py:95
 msgid "Manage applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:303
-#: waeup/kofa/applicants/browser.py:716
+#: waeup/kofa/applicants/browser.py:298
+#: waeup/kofa/applicants/browser.py:686
 #: waeup/kofa/browser/pages.py:1444
 #: waeup/kofa/browser/pages.py:1766
@@ -453,139 +453,152 @@
 #: waeup/kofa/browser/pages.py:1950
 #: waeup/kofa/hostels/browser.py:54
-#: waeup/kofa/students/browser.py:82
-#: waeup/kofa/students/browser.py:384
+#: waeup/kofa/students/browser.py:84
+#: waeup/kofa/students/browser.py:395
 msgid "Form has been saved."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:312
+#: waeup/kofa/applicants/browser.py:307
 msgid "No applicant selected!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:363
+#: waeup/kofa/applicants/browser.py:357
 msgid "Create application record"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:368
+#: waeup/kofa/applicants/browser.py:362
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:381
+#: waeup/kofa/applicants/browser.py:376
 msgid "Applicant"
 msgstr ""
 
+#: waeup/kofa/applicants/browser.py:395
+#: waeup/kofa/students/browser.py:295
+msgid "set"
+msgstr ""
+
 #: waeup/kofa/applicants/browser.py:396
-#: waeup/kofa/students/browser.py:283
-msgid "set"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:397
-#: waeup/kofa/students/browser.py:284
+#: waeup/kofa/students/browser.py:296
 msgid "unset"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:402
-#. Default: ""
-msgid "${a} Application Record ${b}"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:453
+#: waeup/kofa/applicants/browser.py:401
+#. Default: ""
+msgid "${a} <br /> Application Record ${b}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:452
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:460
-#: waeup/kofa/students/browser.py:1028
+#: waeup/kofa/applicants/browser.py:459
+#: waeup/kofa/students/browser.py:1091
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:473
+#: waeup/kofa/applicants/browser.py:472
+#: waeup/kofa/students/browser.py:1105
+msgid "Payment ticket created."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:499
+#: waeup/kofa/students/browser.py:1124
+#. Default: ""
+msgid "${a}: Online Payment Ticket ${b}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:527
+#: waeup/kofa/students/browser.py:1172
+msgid "Valid callback received."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:548
+msgid "Payment Data"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:554
+msgid "Online Payment Receipt"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:560
+msgid "Ticket not yet paid."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:594
+msgid "Uploaded image is too big!"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:599
+msgid "jpg file extension expected."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:619
+#: waeup/kofa/applicants/browser.py:762
+#: waeup/kofa/applicants/browser.py:814
+msgid "Final Submit"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:620
+#: waeup/kofa/applicants/browser.py:727
+#: waeup/kofa/applicants/browser.py:760
+#: waeup/kofa/applicants/browser.py:795
 #: waeup/kofa/students/browser.py:1042
-msgid "Payment ticket created."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:500
-#: waeup/kofa/students/browser.py:1061
-#. Default: ""
-msgid "${a}: Online Payment Ticket ${b}"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:528
-#: waeup/kofa/students/browser.py:1110
-msgid "Valid callback received."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:549
-msgid "Payment Data"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:555
-msgid "Online Payment Receipt"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:561
-msgid "Ticket not yet paid."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:626
-msgid "Uploaded image is too big!"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:63
+msgid "Add online payment ticket"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:620
+#: waeup/kofa/applicants/browser.py:732
+#: waeup/kofa/applicants/browser.py:760
+#: waeup/kofa/applicants/browser.py:763
+#: waeup/kofa/applicants/browser.py:800
+#: waeup/kofa/students/browser.py:809
+#: waeup/kofa/students/browser.py:841
+#: waeup/kofa/students/browser.py:1018
+#: waeup/kofa/students/browser.py:1823
+msgid "Remove selected tickets"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:643
+#. Default: ""
+msgid "${a} <br /> Application Form ${b}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:65
 msgid "Application Section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:631
-msgid "jpg file extension expected."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:653
-#: waeup/kofa/applicants/browser.py:793
-#: waeup/kofa/applicants/browser.py:845
-msgid "Final Submit"
-msgstr ""
-
 #: waeup/kofa/applicants/browser.py:654
-#: waeup/kofa/applicants/browser.py:757
-#: waeup/kofa/applicants/browser.py:791
-#: waeup/kofa/applicants/browser.py:826
-#: waeup/kofa/students/browser.py:985
-msgid "Add online payment ticket"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:654
-#: waeup/kofa/applicants/browser.py:762
-#: waeup/kofa/applicants/browser.py:791
-#: waeup/kofa/applicants/browser.py:794
-#: waeup/kofa/applicants/browser.py:831
-#: waeup/kofa/students/browser.py:753
-#: waeup/kofa/students/browser.py:785
-#: waeup/kofa/students/browser.py:961
-#: waeup/kofa/students/browser.py:1758
-msgid "Remove selected tickets"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:673
-#. Default: ""
-msgid "${a} Application Form ${b}"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:684
-#: waeup/kofa/students/browser.py:355
+#: waeup/kofa/students/browser.py:366
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:731
-#: waeup/kofa/students/browser.py:967
+#: waeup/kofa/applicants/browser.py:701
+#: waeup/kofa/students/browser.py:1024
 msgid "No payment selected."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:75
+#: waeup/kofa/applicants/browser.py:77
 #: waeup/kofa/applicants/viewlets.py:88
 msgid "Manage application section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:78
-#: waeup/kofa/applicants/browser.py:104
-#: waeup/kofa/applicants/browser.py:253
-#: waeup/kofa/applicants/browser.py:306
+#: waeup/kofa/applicants/browser.py:773
+#: waeup/kofa/students/browser.py:92
+msgid "The requested form is locked (read-only)."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:787
+msgid "No passport picture uploaded."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:789
+msgid "Passport picture confirmation box not ticked."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:80
+#: waeup/kofa/applicants/browser.py:106
+#: waeup/kofa/applicants/browser.py:250
+#: waeup/kofa/applicants/browser.py:301
 #: waeup/kofa/browser/pages.py:638
 #: waeup/kofa/browser/pages.py:679
@@ -595,21 +608,21 @@
 #: waeup/kofa/browser/pages.py:1436
 #: waeup/kofa/hostels/browser.py:131
-#: waeup/kofa/students/browser.py:204
-#: waeup/kofa/students/browser.py:1156
-#: waeup/kofa/students/browser.py:1169
+#: waeup/kofa/students/browser.py:210
+#: waeup/kofa/students/browser.py:1218
+#: waeup/kofa/students/browser.py:1231
 msgid "Remove selected"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:78
-#: waeup/kofa/applicants/browser.py:124
-#: waeup/kofa/applicants/browser.py:147
+#: waeup/kofa/applicants/browser.py:80
+#: waeup/kofa/applicants/browser.py:126
+#: waeup/kofa/applicants/browser.py:149
 #: waeup/kofa/applicants/browser.py:159
 msgid "Add applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:80
-#: waeup/kofa/applicants/browser.py:138
-#: waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:345
+#: waeup/kofa/applicants/browser.py:82
+#: waeup/kofa/applicants/browser.py:140
+#: waeup/kofa/applicants/browser.py:251
+#: waeup/kofa/applicants/browser.py:340
 #: waeup/kofa/browser/pages.py:1402
 #: waeup/kofa/browser/pages.py:1461
@@ -621,13 +634,13 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:804
-#: waeup/kofa/students/browser.py:90
-msgid "The requested form is locked (read-only)."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:81
-#: waeup/kofa/applicants/browser.py:134
-#: waeup/kofa/applicants/browser.py:255
-#: waeup/kofa/applicants/browser.py:341
+#: waeup/kofa/applicants/browser.py:826
+#: waeup/kofa/students/browser.py:1690
+msgid "This form cannot be submitted. Wrong state!"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:83
+#: waeup/kofa/applicants/browser.py:136
+#: waeup/kofa/applicants/browser.py:252
+#: waeup/kofa/applicants/browser.py:336
 #: waeup/kofa/browser/pages.py:1403
 #: waeup/kofa/browser/pages.py:1457
@@ -639,68 +652,72 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:818
-msgid "No passport picture uploaded."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:82
+#: waeup/kofa/applicants/browser.py:831
+msgid "Form has been submitted."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:84
 msgid "Applicants Containers"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:820
-msgid "Passport picture confirmation box not ticked."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:857
-#: waeup/kofa/students/browser.py:1625
-msgid "This form cannot be submitted. Wrong state!"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:862
-msgid "Form has been submitted."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:897
-#. Default: ""
-msgid "Register for ${a} Application"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:903
+#: waeup/kofa/applicants/browser.py:874
+#. Default: ""
+msgid "Apply for ${a}"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:880
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:908
+#: waeup/kofa/applicants/browser.py:885
 msgid "Application has ended."
 msgstr ""
 
+#: waeup/kofa/applicants/browser.py:894
+msgid "Get login credentials"
+msgstr ""
+
 #: waeup/kofa/applicants/browser.py:917
-msgid "Get login credentials"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:932
+msgid "An error occurred."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:923
+#: waeup/kofa/applicants/browser.py:934
+msgid "No application record found."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:926
+msgid "Your password has already been set. Please proceed to the login page."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:944
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:939
+#: waeup/kofa/applicants/browser.py:951
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:948
+#: waeup/kofa/applicants/browser.py:960
 msgid "Your registration was successful."
 msgstr ""
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:18
-msgid "Photograph"
-msgstr ""
-
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:43
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:17
+msgid "Admitted Course of Study:"
+msgstr ""
+
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:19
+msgid "Passport Photo:"
+msgstr ""
+
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:44
 msgid "Application Transition:"
 msgstr ""
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:59
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:60
 msgid "I confirm that the Passport Photograph uploaded on this form is a true picture of me."
 msgstr ""
 
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:74
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:43
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:76
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:34
 msgid "Acceptance Fee Payment Tickets"
 msgstr ""
@@ -720,4 +737,8 @@
 #: waeup/kofa/applicants/browser_templates/applicantregister.pt:18
 msgid "An account will be created for you and an email with your login credentials will be sent to the address provided."
+msgstr ""
+
+#: waeup/kofa/applicants/browser_templates/applicantregister.pt:22
+msgid "Your application record will be looked up and an email with your login credentials will be sent to the address provided."
 msgstr ""
 
@@ -747,18 +768,18 @@
 msgstr ""
 
-#: waeup/kofa/applicants/container.py:52
-msgid "Basic"
-msgstr ""
-
-#: waeup/kofa/applicants/container.py:55
-msgid "handles basic applicants"
-msgstr ""
-
 #: waeup/kofa/applicants/export.py:40
 msgid "Basic Applicants Containers"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:198
-#: waeup/kofa/students/browser.py:718
+#: waeup/kofa/applicants/interfaces.py:138
+msgid "Create Application Records"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:139
+msgid "Update Application Records"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:159
+#: waeup/kofa/students/browser.py:773
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -784,6 +805,6 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:205
-#: waeup/kofa/students/browser.py:719
+#: waeup/kofa/applicants/interfaces.py:165
+#: waeup/kofa/students/browser.py:774
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -804,130 +825,127 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:212
-#: waeup/kofa/applicants/interfaces.py:322
+#: waeup/kofa/applicants/interfaces.py:171
+#: waeup/kofa/applicants/interfaces.py:275
 msgid "Application Target"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:220
+#: waeup/kofa/applicants/interfaces.py:178
+#: waeup/kofa/applicants/interfaces.py:282
+msgid "Year of Entrance"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:185
+msgid "Application Mode"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:191
 msgid "Entry Level"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:227
-#: waeup/kofa/applicants/interfaces.py:330
-msgid "Year of Entrance"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:235
-#: waeup/kofa/applicants/interfaces.py:338
-msgid "Applicants Container Type"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:251
+#: waeup/kofa/applicants/interfaces.py:205
 msgid "Category for the grouping of certificates"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:258
+#: waeup/kofa/applicants/interfaces.py:211
 msgid "Human readable description in reST format"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:271
+#: waeup/kofa/applicants/interfaces.py:224
 msgid "Application Start Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:277
+#: waeup/kofa/applicants/interfaces.py:230
 msgid "Application Closing Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:283
+#: waeup/kofa/applicants/interfaces.py:236
 msgid "Forbid additions after deadline (enddate)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:366
+#: waeup/kofa/applicants/interfaces.py:315
 msgid "Applicant Id"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:371
-msgid "JAMB Registration Number"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:383
-#: waeup/kofa/students/interfaces.py:162
+#: waeup/kofa/applicants/interfaces.py:320
+#: waeup/kofa/students/interfaces.py:184
+#: waeup/kofa/students/interfaces.py:271
+#: waeup/kofa/students/interfaces.py:518
+msgid "Registration Number"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:331
+#: waeup/kofa/applicants/interfaces.py:499
+#: waeup/kofa/students/interfaces.py:163
 msgid "First Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:387
-#: waeup/kofa/students/interfaces.py:167
+#: waeup/kofa/applicants/interfaces.py:335
+#: waeup/kofa/students/interfaces.py:168
 msgid "Middle Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:391
-#: waeup/kofa/students/interfaces.py:172
+#: waeup/kofa/applicants/interfaces.py:339
+#: waeup/kofa/students/interfaces.py:173
 msgid "Last Name (Surname)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:395
-#: waeup/kofa/students/interfaces.py:218
+#: waeup/kofa/applicants/interfaces.py:343
+#: waeup/kofa/students/interfaces.py:219
 msgid "Date of Birth"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:400
-msgid "State/LGA"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:405
-#: waeup/kofa/students/interfaces.py:177
+#: waeup/kofa/applicants/interfaces.py:349
+#: waeup/kofa/students/interfaces.py:178
 msgid "Sex"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:411
-#: waeup/kofa/interfaces.py:392
-#: waeup/kofa/interfaces.py:418
-#: waeup/kofa/students/interfaces.py:504
+#: waeup/kofa/applicants/interfaces.py:354
+#: waeup/kofa/applicants/interfaces.py:437
+#: waeup/kofa/applicants/interfaces.py:504
+#: waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:419
+#: waeup/kofa/students/interfaces.py:524
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:416
-#: waeup/kofa/interfaces.py:397
-#: waeup/kofa/interfaces.py:425
-#: waeup/kofa/students/interfaces.py:208
+#: waeup/kofa/applicants/interfaces.py:359
+#: waeup/kofa/interfaces.py:398
+#: waeup/kofa/interfaces.py:426
+#: waeup/kofa/students/interfaces.py:209
 msgid "Phone"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:421
-#: waeup/kofa/applicants/interfaces.py:507
+#: waeup/kofa/applicants/interfaces.py:364
+#: waeup/kofa/applicants/interfaces.py:442
 msgid "1st Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:426
-#: waeup/kofa/applicants/interfaces.py:512
+#: waeup/kofa/applicants/interfaces.py:369
+#: waeup/kofa/applicants/interfaces.py:447
 msgid "2nd Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:431
-msgid "School Grades"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:441
-#: waeup/kofa/applicants/interfaces.py:517
+#: waeup/kofa/applicants/interfaces.py:381
+#: waeup/kofa/applicants/interfaces.py:468
+msgid "Notice"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:385
+#: waeup/kofa/applicants/interfaces.py:457
+msgid "Screening Venue"
+msgstr ""
+
+#: waeup/kofa/applicants/interfaces.py:389
+#: waeup/kofa/applicants/interfaces.py:452
 msgid "Screening Score"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:445
-#: waeup/kofa/applicants/interfaces.py:522
-msgid "Screening Venue"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:449
-#: waeup/kofa/applicants/interfaces.py:527
+#: waeup/kofa/applicants/interfaces.py:393
+#: waeup/kofa/applicants/interfaces.py:462
 msgid "Admitted Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:455
-#: waeup/kofa/applicants/interfaces.py:534
-msgid "Notice"
-msgstr ""
-
-#: waeup/kofa/applicants/interfaces.py:477
-#: waeup/kofa/students/interfaces.py:157
+#: waeup/kofa/applicants/interfaces.py:398
+#: waeup/kofa/students/interfaces.py:158
 #: waeup/kofa/browser/templates/showstudentspage.pt:4
 #: waeup/kofa/students/browser_templates/containerpage.pt:29
@@ -936,41 +954,32 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:482
+#: waeup/kofa/applicants/interfaces.py:403
 msgid "Form locked"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:561
-#: waeup/kofa/students/interfaces.py:484
+#: waeup/kofa/applicants/interfaces.py:514
+#: waeup/kofa/students/interfaces.py:504
 msgid "Payment Session"
 msgstr ""
 
-#: waeup/kofa/applicants/pdf.py:110
-#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:23
-#: waeup/kofa/students/browser_templates/studycoursepage.pt:28
-msgid "Department:"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:121
-#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:15
-#: waeup/kofa/students/browser_templates/studycoursepage.pt:39
-msgid "Faculty:"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:186
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:26
-msgid "Admitted Course of Study:"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:204
-#. Default: ""
-msgid "<font size=10>Proceed to the login page of the portal and enter your new credentials: user name= ${a}, password = ${b}.</font>"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:210
-msgid "<font size=10>Change your password when you have  logged in.</font>"
-msgstr ""
-
-#: waeup/kofa/applicants/pdf.py:57
+#: waeup/kofa/applicants/pdf.py:50
 msgid "Application Record"
+msgstr ""
+
+#: waeup/kofa/applicants/pdf.py:84
+#. Default: ""
+msgid "Proceed to the login page of the portal and enter your new credentials: user name= ${a}, password = ${b}."
+msgstr ""
+
+#: waeup/kofa/applicants/pdf.py:91
+msgid "Change your password when you have logged in."
+msgstr ""
+
+#: waeup/kofa/applicants/utils.py:35
+msgid "Desired Study Courses"
+msgstr ""
+
+#: waeup/kofa/applicants/utils.py:36
+msgid "Process Data"
 msgstr ""
 
@@ -997,15 +1006,15 @@
 #: waeup/kofa/applicants/viewlets.py:151
 #: waeup/kofa/applicants/workflow.py:99
-#: waeup/kofa/students/browser.py:256
+#: waeup/kofa/students/browser.py:268
 msgid "Create student record"
 msgstr ""
 
 #: waeup/kofa/applicants/viewlets.py:168
-#: waeup/kofa/students/viewlets.py:300
+#: waeup/kofa/students/viewlets.py:321
 msgid "Download payment receipt"
 msgstr ""
 
 #: waeup/kofa/applicants/viewlets.py:183
-#: waeup/kofa/students/viewlets.py:315
+#: waeup/kofa/students/viewlets.py:336
 msgid "Request callback"
 msgstr ""
@@ -1016,10 +1025,10 @@
 
 #: waeup/kofa/applicants/viewlets.py:73
-#: waeup/kofa/students/viewlets.py:512
+#: waeup/kofa/students/viewlets.py:535
 msgid "My Data"
 msgstr ""
 
 #: waeup/kofa/applicants/workflow.py:100
-#: waeup/kofa/students/batching.py:141
+#: waeup/kofa/students/batching.py:142
 #: waeup/kofa/students/workflow.py:25
 msgid "Student record created"
@@ -1058,5 +1067,5 @@
 
 #: waeup/kofa/applicants/workflow.py:41
-#: waeup/kofa/interfaces.py:72
+#: waeup/kofa/interfaces.py:73
 msgid "admitted"
 msgstr ""
@@ -1067,5 +1076,5 @@
 
 #: waeup/kofa/applicants/workflow.py:43
-#: waeup/kofa/interfaces.py:71
+#: waeup/kofa/interfaces.py:72
 msgid "created"
 msgstr ""
@@ -1131,5 +1140,5 @@
 
 #: waeup/kofa/browser/breadcrumbs.py:123
-#: waeup/kofa/browser/pages.py:312
+#: waeup/kofa/browser/pages.py:311
 msgid "Administration"
 msgstr ""
@@ -1142,5 +1151,5 @@
 
 #: waeup/kofa/browser/breadcrumbs.py:148
-#: waeup/kofa/browser/pages.py:389
+#: waeup/kofa/browser/pages.py:388
 #: waeup/kofa/browser/viewlets.py:375
 #: waeup/kofa/browser/viewlets.py:685
@@ -1164,5 +1173,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:106
+#: waeup/kofa/browser/pages.py:105
 #. Default: ""
 msgid "Local role successfully removed: ${a}"
@@ -1203,13 +1212,13 @@
 msgstr ""
 
+#: waeup/kofa/browser/pages.py:115
+#: waeup/kofa/hostels/browser.py:256
+#: waeup/kofa/hostels/browser.py:286
+#: waeup/kofa/students/browser.py:240
+msgid "No item selected."
+msgstr ""
+
 #: waeup/kofa/browser/pages.py:1155
 msgid "Log files can only be searched on Unix-based operating systems."
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:116
-#: waeup/kofa/hostels/browser.py:256
-#: waeup/kofa/hostels/browser.py:286
-#: waeup/kofa/students/browser.py:228
-msgid "No item selected."
 msgstr ""
 
@@ -1302,14 +1311,14 @@
 #: waeup/kofa/browser/pages.py:1532
 #: waeup/kofa/browser/pages.py:1551
-#: waeup/kofa/students/browser.py:98
-#: waeup/kofa/students/export.py:22
-#: waeup/kofa/students/viewlets.py:472
+#: waeup/kofa/students/browser.py:100
+#: waeup/kofa/students/export.py:40
+#: waeup/kofa/students/viewlets.py:495
 msgid "Students"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:155
+#: waeup/kofa/browser/pages.py:154
 #: waeup/kofa/browser/viewlets.py:322
-#: waeup/kofa/browser/templates/staffsitelayout.pt:28
-#: waeup/kofa/browser/templates/studentsitelayout.pt:33
+#: waeup/kofa/browser/templates/staffsitelayout.pt:27
+#: waeup/kofa/browser/templates/studentsitelayout.pt:32
 msgid "Login"
 msgstr ""
@@ -1344,5 +1353,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:163
+#: waeup/kofa/browser/pages.py:162
 msgid "You logged in."
 msgstr ""
@@ -1371,10 +1380,10 @@
 msgstr ""
 
+#: waeup/kofa/browser/pages.py:180
+msgid "You entered wrong credentials."
+msgstr ""
+
 #: waeup/kofa/browser/pages.py:1808
 msgid "Edit certificate"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:181
-msgid "You entered wrong credentials."
 msgstr ""
 
@@ -1414,48 +1423,48 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:195
+#: waeup/kofa/browser/pages.py:194
 msgid "You have been logged out. Thanks for using WAeUP Kofa!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:231
+#: waeup/kofa/browser/pages.py:230
 #. Default: ""
 msgid "Contact ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:237
+#: waeup/kofa/browser/pages.py:236
 #: waeup/kofa/browser/pages.py:523
 msgid "Send message now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:256
-#: waeup/kofa/browser/pages.py:275
+#: waeup/kofa/browser/pages.py:255
+#: waeup/kofa/browser/pages.py:274
 #: waeup/kofa/browser/pages.py:540
-#: waeup/kofa/students/browser.py:318
+#: waeup/kofa/students/browser.py:330
 msgid "Your message has been sent."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:266
+#: waeup/kofa/browser/pages.py:265
 msgid "Send now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:277
+#: waeup/kofa/browser/pages.py:276
 msgid "A smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:302
+#: waeup/kofa/browser/pages.py:301
 msgid "<h1>Welcome to WAeUP.Kofa</h1>"
 msgstr ""
 
+#: waeup/kofa/browser/pages.py:389
+#: waeup/kofa/hostels/browser.py:195
+#: waeup/kofa/students/viewlets.py:166
+#: waeup/kofa/students/viewlets.py:174
+#: waeup/kofa/students/viewlets.py:247
+#: waeup/kofa/students/viewlets.py:255
+#: waeup/kofa/students/viewlets.py:304
+msgid "Manage"
+msgstr ""
+
 #: waeup/kofa/browser/pages.py:390
-#: waeup/kofa/hostels/browser.py:195
-#: waeup/kofa/students/viewlets.py:163
-#: waeup/kofa/students/viewlets.py:171
-#: waeup/kofa/students/viewlets.py:226
-#: waeup/kofa/students/viewlets.py:243
-#: waeup/kofa/students/viewlets.py:283
-msgid "Manage"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:391
 #: waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
@@ -1467,11 +1476,11 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:430
-#: waeup/kofa/browser/pages.py:432
+#: waeup/kofa/browser/pages.py:431
+#: waeup/kofa/browser/pages.py:433
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:454
+#: waeup/kofa/browser/pages.py:455
 #. Default: ""
 msgid "User account ${a} successfully added."
@@ -1488,5 +1497,5 @@
 
 #: waeup/kofa/browser/pages.py:521
-#: waeup/kofa/students/browser.py:299
+#: waeup/kofa/students/browser.py:311
 #. Default: ""
 msgid "Send message to ${a}"
@@ -1582,5 +1591,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:86
+#: waeup/kofa/browser/pages.py:85
 msgid "No local role selected."
 msgstr ""
@@ -1613,4 +1622,14 @@
 #: waeup/kofa/browser/pages.py:963
 msgid "Perform import"
+msgstr ""
+
+#: waeup/kofa/browser/pdf.py:127
+#. Default: ""
+msgid "${footer_text} Page ${num1} of ${num2}"
+msgstr ""
+
+#: waeup/kofa/browser/pdf.py:336
+#. Default: ""
+msgid "Date: ${a}"
 msgstr ""
 
@@ -1787,4 +1806,8 @@
 #: waeup/kofa/browser/templates/datacenterpage.pt:16
 msgid "Upload Date"
+msgstr ""
+
+#: waeup/kofa/browser/templates/default_waeup_display_form.pt:6
+msgid "Uploaded Files"
 msgstr ""
 
@@ -1826,15 +1849,20 @@
 
 #: waeup/kofa/browser/templates/facultypage.pt:1
-#: waeup/kofa/hostels/browser_templates/containerpage.pt:1
-msgid "There no subobjects registered yet."
+msgid "There are no subobjects registered yet."
+msgstr ""
+
+#: waeup/kofa/browser/templates/fileupload.pt:26
+#: waeup/kofa/students/browser_templates/imageupload.pt:20
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:26
+msgid "Max. file size:"
 msgstr ""
 
 #: waeup/kofa/browser/templates/loginpage.pt:13
-#: waeup/kofa/browser/templates/usereditformpage.pt:8
+#: waeup/kofa/browser/templates/usereditformpage.pt:9
 #: waeup/kofa/students/browser_templates/basepage.pt:14
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:17
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:18
 #: waeup/kofa/students/browser_templates/change_password.pt:10
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:31
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:34
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:32
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:25
 msgid "Password:"
 msgstr ""
@@ -1855,5 +1883,5 @@
 
 #: waeup/kofa/browser/templates/loginpage.pt:44
-#. Default: "Or simply forgot your student id or password? Then request a new password <strong><a href=\"changepw\"> here</a></strong>."
+#. Default: "Or simply forgot your student id, application id or password? Then request a new password <strong><a href=\"sendpw\"> here</a></strong>."
 msgid "login_trouble3"
 msgstr ""
@@ -1905,46 +1933,46 @@
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:101
-#: waeup/kofa/browser/templates/studentsitelayout.pt:86
+#: waeup/kofa/browser/templates/staffsitelayout.pt:102
+#: waeup/kofa/browser/templates/studentsitelayout.pt:87
 msgid "Form Status:"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:114
-#: waeup/kofa/browser/templates/studentsitelayout.pt:100
+#: waeup/kofa/browser/templates/staffsitelayout.pt:115
+#: waeup/kofa/browser/templates/studentsitelayout.pt:101
 msgid "Back to top"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:116
-#: waeup/kofa/browser/templates/studentsitelayout.pt:102
+#: waeup/kofa/browser/templates/staffsitelayout.pt:117
+#: waeup/kofa/browser/templates/studentsitelayout.pt:103
 msgid "Kofa - Student Management System"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:119
-#: waeup/kofa/browser/templates/studentsitelayout.pt:105
+#: waeup/kofa/browser/templates/staffsitelayout.pt:120
+#: waeup/kofa/browser/templates/studentsitelayout.pt:106
 msgid "Copyright &copy; WAeUP Group 2008-2012"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:34
-#: waeup/kofa/browser/templates/studentsitelayout.pt:39
+#: waeup/kofa/browser/templates/staffsitelayout.pt:33
+#: waeup/kofa/browser/templates/studentsitelayout.pt:38
 msgid "Contact"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:40
-#: waeup/kofa/browser/templates/studentsitelayout.pt:45
+#: waeup/kofa/browser/templates/staffsitelayout.pt:39
+#: waeup/kofa/browser/templates/studentsitelayout.pt:44
 msgid "Logout"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:60
+#: waeup/kofa/browser/templates/staffsitelayout.pt:61
 msgid "Student Id:"
 msgstr ""
 
-#: waeup/kofa/browser/templates/staffsitelayout.pt:64
+#: waeup/kofa/browser/templates/staffsitelayout.pt:65
 msgid "State:"
 msgstr ""
 
-#: waeup/kofa/browser/templates/usereditformpage.pt:14
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:23
+#: waeup/kofa/browser/templates/usereditformpage.pt:15
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:24
 #: waeup/kofa/students/browser_templates/change_password.pt:16
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:37
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:38
 msgid "Retype password:"
 msgstr ""
@@ -1959,5 +1987,5 @@
 
 #: waeup/kofa/browser/viewlets.py:383
-#: waeup/kofa/students/viewlets.py:155
+#: waeup/kofa/students/viewlets.py:158
 msgid "Send email"
 msgstr ""
@@ -1978,5 +2006,5 @@
 #: waeup/kofa/browser/viewlets.py:528
 #: waeup/kofa/browser/viewlets.py:536
-msgid "Show batch logs"
+msgid "Show logs"
 msgstr ""
 
@@ -1999,7 +2027,7 @@
 #: waeup/kofa/browser/viewlets.py:91
 #: waeup/kofa/browser/viewlets.py:160
-#: waeup/kofa/students/viewlets.py:218
-#: waeup/kofa/students/viewlets.py:356
-#: waeup/kofa/students/viewlets.py:403
+#: waeup/kofa/students/viewlets.py:239
+#: waeup/kofa/students/viewlets.py:379
+#: waeup/kofa/students/viewlets.py:426
 msgid "Edit"
 msgstr ""
@@ -2081,4 +2109,8 @@
 #. Default: ""
 msgid "Block ${a}, Room ${b}, Bed ${c}"
+msgstr ""
+
+#: waeup/kofa/hostels/browser_templates/containerpage.pt:1
+msgid "There no subobjects registered yet."
 msgstr ""
 
@@ -2105,9 +2137,9 @@
 msgstr ""
 
-#: waeup/kofa/hostels/hostel.py:180
+#: waeup/kofa/hostels/hostel.py:185
 msgid "unreserved"
 msgstr ""
 
-#: waeup/kofa/hostels/hostel.py:187
+#: waeup/kofa/hostels/hostel.py:192
 msgid "reserved"
 msgstr ""
@@ -2142,5 +2174,5 @@
 
 #: waeup/kofa/hostels/interfaces.py:175
-#: waeup/kofa/students/interfaces.py:445
+#: waeup/kofa/students/interfaces.py:465
 msgid "Bed Type"
 msgstr ""
@@ -2299,41 +2331,41 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:185
+#: waeup/kofa/interfaces.py:186
 msgid "Subject"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:189
+#: waeup/kofa/interfaces.py:190
 msgid "Grade"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:323
+#: waeup/kofa/interfaces.py:324
 msgid "Processor name"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:327
-msgid "Import mode"
-msgstr ""
-
-#: waeup/kofa/interfaces.py:352
+#: waeup/kofa/interfaces.py:328
+msgid "Import Mode"
+msgstr ""
+
+#: waeup/kofa/interfaces.py:353
 msgid "Email Address:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:359
+#: waeup/kofa/interfaces.py:360
 msgid "Email to:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:366
+#: waeup/kofa/interfaces.py:367
 msgid "Subject:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:370
+#: waeup/kofa/interfaces.py:371
 msgid "Full Name:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:374
+#: waeup/kofa/interfaces.py:375
 msgid "Text:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:405
+#: waeup/kofa/interfaces.py:406
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2345,5 +2377,5 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:410
+#: waeup/kofa/interfaces.py:411
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2352,133 +2384,133 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:414
+#: waeup/kofa/interfaces.py:415
 msgid "Description/Notice"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:431
+#: waeup/kofa/interfaces.py:432
 msgid "Portal roles"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:474
+#: waeup/kofa/interfaces.py:477
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:475
+#: waeup/kofa/interfaces.py:478
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:480
+#: waeup/kofa/interfaces.py:483
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:486
+#: waeup/kofa/interfaces.py:489
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:493
+#: waeup/kofa/interfaces.py:496
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:505
+#: waeup/kofa/interfaces.py:508
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:513
+#: waeup/kofa/interfaces.py:516
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:521
+#: waeup/kofa/interfaces.py:524
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:527
+#: waeup/kofa/interfaces.py:530
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:534
+#: waeup/kofa/interfaces.py:537
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:535
+#: waeup/kofa/interfaces.py:538
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:540
+#: waeup/kofa/interfaces.py:543
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:547
+#: waeup/kofa/interfaces.py:550
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:554
+#: waeup/kofa/interfaces.py:557
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:563
-#: waeup/kofa/interfaces.py:621
+#: waeup/kofa/interfaces.py:566
+#: waeup/kofa/interfaces.py:624
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:571
+#: waeup/kofa/interfaces.py:574
 #: waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:576
+#: waeup/kofa/interfaces.py:579
 msgid "Surcharge Portal Provider"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:582
+#: waeup/kofa/interfaces.py:585
 msgid "Surcharge Payment Gateway Provider"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:588
+#: waeup/kofa/interfaces.py:591
 #: waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:594
+#: waeup/kofa/interfaces.py:597
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:600
+#: waeup/kofa/interfaces.py:603
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:606
+#: waeup/kofa/interfaces.py:609
 #: waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:73
+#: waeup/kofa/interfaces.py:74
 msgid "clearance started"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:74
+#: waeup/kofa/interfaces.py:75
 msgid "clearance requested"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:75
+#: waeup/kofa/interfaces.py:76
 msgid "cleared"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:76
+#: waeup/kofa/interfaces.py:77
 msgid "school fee paid"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:77
+#: waeup/kofa/interfaces.py:78
 msgid "returning"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:78
+#: waeup/kofa/interfaces.py:79
 msgid "courses registered"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:79
+#: waeup/kofa/interfaces.py:80
 msgid "courses validated"
 msgstr ""
 
-#: waeup/kofa/objecthistory.py:71
+#: waeup/kofa/objecthistory.py:72
 msgid "by"
 msgstr ""
@@ -2566,6 +2598,6 @@
 #: waeup/kofa/payments/interfaces.py:76
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:10
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:84
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:51
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:86
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:42
 msgid "Payment Date"
 msgstr ""
@@ -2579,463 +2611,484 @@
 msgstr ""
 
-#: waeup/kofa/students/batching.py:165
+#: waeup/kofa/students/batching.py:166
 #. Default: ""
 msgid "State '${a}' set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1000
+#: waeup/kofa/students/browser.py:1009
+#. Default: ""
+msgid "${a}: Payments"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1054
+msgid "Add online payment"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1057
 msgid "Create ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1008
-#: waeup/kofa/students/browser.py:1230
+#: waeup/kofa/students/browser.py:1065
+#: waeup/kofa/students/browser.py:1292
 msgid "Your current session does not match accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1077
+#: waeup/kofa/students/browser.py:1075
+msgid "Study course data are incomplete."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1139
 msgid "This ticket has already been paid."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1090
-#: waeup/kofa/students/browser.py:1098
-#: waeup/kofa/students/browser.py:1106
+#: waeup/kofa/students/browser.py:1152
+#: waeup/kofa/students/browser.py:1160
+#: waeup/kofa/students/browser.py:1168
 #. Default: ""
 msgid "Valid callback received. ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1160
+#: waeup/kofa/students/browser.py:121
+#: waeup/kofa/students/viewlets.py:117
+#: waeup/kofa/students/viewlets.py:557
+msgid "Study Course"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1222
 #. Default: ""
 msgid "${a}: Accommodation"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1172
+#: waeup/kofa/students/browser.py:1234
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1179
+#: waeup/kofa/students/browser.py:1241
 msgid "No bed ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:119
-#: waeup/kofa/students/viewlets.py:114
-#: waeup/kofa/students/viewlets.py:534
-msgid "Study Course"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1210
+#: waeup/kofa/students/browser.py:127
+#: waeup/kofa/students/viewlets.py:123
+#: waeup/kofa/students/viewlets.py:558
+msgid "Payments"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1272
 msgid "Add bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1212
+#: waeup/kofa/students/browser.py:1274
 msgid "Create bed ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1220
+#: waeup/kofa/students/browser.py:1282
 msgid "Your data are incomplete."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1224
+#: waeup/kofa/students/browser.py:1286
 msgid "You are in the wrong registration state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1235
+#: waeup/kofa/students/browser.py:1297
 msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1246
-#: waeup/kofa/students/browser.py:1543
-#: waeup/kofa/students/browser.py:1656
+#: waeup/kofa/students/browser.py:1308
+#: waeup/kofa/students/browser.py:1602
+#: waeup/kofa/students/browser.py:1721
 msgid "Activation code is invalid."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:125
-#: waeup/kofa/students/viewlets.py:120
-#: waeup/kofa/students/viewlets.py:535
-msgid "Payments"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1266
-#: waeup/kofa/students/browser.py:1394
+#: waeup/kofa/students/browser.py:1328
+#: waeup/kofa/students/browser.py:1454
 #. Default: ""
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1271
-#: waeup/kofa/students/browser.py:1548
-#: waeup/kofa/students/browser.py:1661
+#: waeup/kofa/students/browser.py:1333
+#: waeup/kofa/students/browser.py:1607
+#: waeup/kofa/students/browser.py:1726
 msgid "Activation code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1274
-#: waeup/kofa/students/browser.py:1551
-#: waeup/kofa/students/browser.py:1664
-#: waeup/kofa/students/browser.py:1923
+#: waeup/kofa/students/browser.py:1336
+#: waeup/kofa/students/browser.py:1610
+#: waeup/kofa/students/browser.py:1729
+#: waeup/kofa/students/browser.py:1997
 msgid "invalidated"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1279
-#: waeup/kofa/students/browser.py:1555
-#: waeup/kofa/students/browser.py:1669
+#: waeup/kofa/students/browser.py:1341
+#: waeup/kofa/students/browser.py:1614
+#: waeup/kofa/students/browser.py:1734
 msgid "You are not the owner of this access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1290
-#: waeup/kofa/students/browser.py:1408
+#: waeup/kofa/students/browser.py:1352
+#: waeup/kofa/students/browser.py:1468
 #. Default: ""
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1299
+#: waeup/kofa/students/browser.py:1361
 #. Default: ""
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1317
+#: waeup/kofa/students/browser.py:1377
 #. Default: ""
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1333
+#: waeup/kofa/students/browser.py:1393
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1339
+#: waeup/kofa/students/browser.py:1399
 msgid "Bed Allocation: "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1366
+#: waeup/kofa/students/browser.py:142
+#: waeup/kofa/students/viewlets.py:129
+msgid "Accommodation"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1426
 msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1372
+#: waeup/kofa/students/browser.py:1432
 msgid "Student can't be relocated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:140
-#: waeup/kofa/students/viewlets.py:126
-msgid "Accommodation"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1415
+#: waeup/kofa/students/browser.py:1475
 #. Default: ""
 msgid "Student relocated: ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1434
+#: waeup/kofa/students/browser.py:1494
 #. Default: ""
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1447
+#: waeup/kofa/students/browser.py:1506
 msgid "Edit base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1462
-#: waeup/kofa/students/viewlets.py:365
+#: waeup/kofa/students/browser.py:151
+#. Default: ""
+msgid "Bed Ticket ${a}"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1521
+#: waeup/kofa/students/viewlets.py:388
 msgid "Change password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1476
+#: waeup/kofa/students/browser.py:1535
 msgid "Password changed."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1488
+#: waeup/kofa/students/browser.py:1547
 msgid "Upload portrait"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:149
-#. Default: ""
-msgid "Bed Ticket ${a}"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1503
-#: waeup/kofa/students/viewlets.py:389
+#: waeup/kofa/students/browser.py:1562
+#: waeup/kofa/students/viewlets.py:412
 #: waeup/kofa/students/workflow.py:44
 msgid "Start clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1507
+#: waeup/kofa/students/browser.py:1566
 msgid "Start clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1524
-#: waeup/kofa/students/browser.py:1645
+#: waeup/kofa/students/browser.py:1583
+#: waeup/kofa/students/browser.py:1710
 msgid "Wrong state"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1528
+#: waeup/kofa/students/browser.py:1587
 msgid "No portrait uploaded."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1532
+#: waeup/kofa/students/browser.py:1591
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1559
+#: waeup/kofa/students/browser.py:1618
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1571
+#: waeup/kofa/students/browser.py:1628
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1583
-#: waeup/kofa/students/browser.py:1597
+#: waeup/kofa/students/browser.py:1648
+#: waeup/kofa/students/browser.py:1662
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1591
+#: waeup/kofa/students/browser.py:1656
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1606
+#: waeup/kofa/students/browser.py:1671
 #: waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1607
+#: waeup/kofa/students/browser.py:1672
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1610
+#: waeup/kofa/students/browser.py:1675
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1619
+#: waeup/kofa/students/browser.py:1684
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1628
+#: waeup/kofa/students/browser.py:1693
 msgid "Clearance has been requested."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1637
-#: waeup/kofa/students/viewlets.py:418
+#: waeup/kofa/students/browser.py:170
+msgid "Student Section"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1702
+#: waeup/kofa/students/viewlets.py:441
 msgid "Start course registration"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1641
+#: waeup/kofa/students/browser.py:1706
 msgid "Start course registration now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1677
+#: waeup/kofa/students/browser.py:1742
 msgid "Course registration has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:168
-msgid "Student Section"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1696
+#: waeup/kofa/students/browser.py:1761
 #. Default: ""
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1705
+#: waeup/kofa/students/browser.py:1770
 msgid "Create course list now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1744
+#: waeup/kofa/students/browser.py:1809
 #. Default: ""
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1781
+#: waeup/kofa/students/browser.py:1846
 msgid "Register course list"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1785
+#: waeup/kofa/students/browser.py:1850
 msgid "Course list has been registered."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1831
-msgid "Change my password"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:184
-#: waeup/kofa/students/browser.py:220
+#: waeup/kofa/students/browser.py:186
+#: waeup/kofa/students/browser.py:226
 msgid "Empty search string"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1841
+#: waeup/kofa/students/browser.py:1896
+msgid "Send me a new password"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1906
 msgid "Get new login credentials"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1855
-msgid "No student record found."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1863
+#: waeup/kofa/students/browser.py:1923
+msgid "Application package not installed."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1929
+msgid "No record found."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1937
 msgid "You have successfully changed your password for the"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1868
+#: waeup/kofa/students/browser.py:1942
 #. Default: ""
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1879
+#: waeup/kofa/students/browser.py:1953
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1882
+#: waeup/kofa/students/browser.py:1956
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1897
+#: waeup/kofa/students/browser.py:1971
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1905
+#: waeup/kofa/students/browser.py:1979
 msgid "Access code is invalid."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1908
+#: waeup/kofa/students/browser.py:1982
 #. Default: ""
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1914
+#: waeup/kofa/students/browser.py:1988
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1920
+#: waeup/kofa/students/browser.py:1994
 msgid "Access code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1929
+#: waeup/kofa/students/browser.py:2003
 #. Default: ""
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:202
-#: waeup/kofa/students/viewlets.py:139
+#: waeup/kofa/students/browser.py:208
+#: waeup/kofa/students/viewlets.py:142
 msgid "Manage student section"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:226
-#: waeup/kofa/students/browser.py:1894
+#: waeup/kofa/students/browser.py:238
+#: waeup/kofa/students/browser.py:1968
 msgid "No student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:253
-#: waeup/kofa/students/viewlets.py:146
+#: waeup/kofa/students/browser.py:265
+#: waeup/kofa/students/viewlets.py:149
 msgid "Add student"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:261
+#: waeup/kofa/students/browser.py:273
 msgid "Student record created."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:277
+#: waeup/kofa/students/browser.py:289
 #. Default: ""
 msgid "${a}: Base Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:320
-#: waeup/kofa/students/browser.py:1871
+#: waeup/kofa/students/browser.py:332
+#: waeup/kofa/students/browser.py:1945
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:332
+#: waeup/kofa/students/browser.py:343
 msgid "Manage base data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:407
+#: waeup/kofa/students/browser.py:423
 #. Default: ""
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:423
-#: waeup/kofa/students/viewlets.py:104
-#: waeup/kofa/students/viewlets.py:532
+#: waeup/kofa/students/browser.py:446
+#: waeup/kofa/students/viewlets.py:107
+#: waeup/kofa/students/viewlets.py:555
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
 msgid "Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:429
+#: waeup/kofa/students/browser.py:452
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:449
+#: waeup/kofa/students/browser.py:471
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:478
+#: waeup/kofa/students/browser.py:512
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:480
-#: waeup/kofa/students/browser.py:504
+#: waeup/kofa/students/browser.py:514
+#: waeup/kofa/students/browser.py:538
 msgid "Student is in wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:497
+#: waeup/kofa/students/browser.py:531
 msgid "Clearance has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:501
+#: waeup/kofa/students/browser.py:535
 msgid "Clearance request has been rejected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:527
+#: waeup/kofa/students/browser.py:561
 #. Default: ""
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:537
-msgid "Manage personal data"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:557
+#: waeup/kofa/students/browser.py:571
+msgid "Edit personal data"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:591
 #. Default: ""
 msgid "${a}: Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:587
+#: waeup/kofa/students/browser.py:621
 msgid "Manage study course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:590
-#: waeup/kofa/students/browser.py:631
+#: waeup/kofa/students/browser.py:624
+#: waeup/kofa/students/browser.py:671
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:591
-#: waeup/kofa/students/browser.py:617
+#: waeup/kofa/students/browser.py:625
+#: waeup/kofa/students/browser.py:657
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:625
+#: waeup/kofa/students/browser.py:645
+msgid "Current level not available for certificate."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:665
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:627
-#: waeup/kofa/students/browser.py:1714
+#: waeup/kofa/students/browser.py:667
+#: waeup/kofa/students/browser.py:1779
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:637
+#: waeup/kofa/students/browser.py:677
 msgid "No study level selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:673
+#: waeup/kofa/students/browser.py:728
 #. Default: ""
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:696
+#: waeup/kofa/students/browser.py:751
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:702
+#: waeup/kofa/students/browser.py:757
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:711
-msgid "Course Registration Slip  "
-msgstr ""
-
-#: waeup/kofa/students/browser.py:717
+#: waeup/kofa/students/browser.py:766
+msgid "Course Registration Slip"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:772
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -3044,5 +3097,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:720
+#: waeup/kofa/students/browser.py:775
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -3050,10 +3103,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:721
+#: waeup/kofa/students/browser.py:776
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:722
+#: waeup/kofa/students/browser.py:777
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -3061,5 +3114,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:723
+#: waeup/kofa/students/browser.py:778
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -3067,6 +3120,6 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:724
-#: waeup/kofa/students/interfaces.py:389
+#: waeup/kofa/students/browser.py:779
+#: waeup/kofa/students/interfaces.py:409
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -3075,73 +3128,64 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:752
-#: waeup/kofa/students/browser.py:781
-#: waeup/kofa/students/browser.py:866
+#: waeup/kofa/students/browser.py:808
+#: waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:922
+#: waeup/kofa/students/browser.py:927
+#: waeup/kofa/students/browser.py:1819
+#: waeup/kofa/students/browser.py:1869
+msgid "Add course ticket"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:829
+#. Default: ""
+msgid "Manage study level ${a}"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:847
+#: waeup/kofa/students/browser.py:1829
+msgid "No ticket selected."
+msgstr ""
+
 #: waeup/kofa/students/browser.py:871
-#: waeup/kofa/students/browser.py:1754
-#: waeup/kofa/students/browser.py:1804
-msgid "Add course ticket"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:773
-#. Default: ""
-msgid "Manage study level ${a}"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:791
-#: waeup/kofa/students/browser.py:1764
-msgid "No ticket selected."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:815
-#: waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:893
 msgid "This level does not correspond current level."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:819
+#: waeup/kofa/students/browser.py:875
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:821
-#: waeup/kofa/students/browser.py:849
+#: waeup/kofa/students/browser.py:877
+#: waeup/kofa/students/browser.py:905
 msgid "Student is in the wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:842
+#: waeup/kofa/students/browser.py:898
 msgid "Course list request has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:846
+#: waeup/kofa/students/browser.py:902
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:886
-#: waeup/kofa/students/browser.py:1817
+#: waeup/kofa/students/browser.py:943
+#: waeup/kofa/students/browser.py:1882
 msgid "The ticket exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:888
-#: waeup/kofa/students/browser.py:1819
+#: waeup/kofa/students/browser.py:945
+#: waeup/kofa/students/browser.py:1884
 #. Default: ""
 msgid "Successfully added ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:909
+#: waeup/kofa/students/browser.py:966
 #. Default: ""
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:925
+#: waeup/kofa/students/browser.py:982
 #. Default: ""
 msgid "Manage course ticket ${a}"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:952
-#. Default: ""
-msgid "${a}: Payments"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:997
-msgid "Add online payment"
 msgstr ""
 
@@ -3150,11 +3194,6 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:29
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:30
 msgid "Registration Transition:"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/changepw.pt:8
-#. Default: "Please solve the captcha<br />to prevent misuse of this service:"
-msgid "solve_captcha"
 msgstr ""
 
@@ -3206,6 +3245,6 @@
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:14
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:25
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:87
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:54
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:89
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:45
 msgid "State"
 msgstr ""
@@ -3226,4 +3265,14 @@
 msgstr ""
 
+#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:15
+#: waeup/kofa/students/browser_templates/studycoursepage.pt:39
+msgid "Faculty:"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:23
+#: waeup/kofa/students/browser_templates/studycoursepage.pt:28
+msgid "Department:"
+msgstr ""
+
 #: waeup/kofa/students/browser_templates/courseticketmanagepage.pt:31
 msgid "Semester:"
@@ -3242,32 +3291,36 @@
 msgstr ""
 
-#: waeup/kofa/students/browser_templates/imageupload.pt:20
-#: waeup/kofa/students/browser_templates/fileupload.pt:26
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:25
-msgid "Max. file size:"
-msgstr ""
-
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:11
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:87
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:43
+msgid "Category"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:12
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:88
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:44
+msgid "Item"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:8
+#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:84
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:40
+msgid "Payment Id"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:9
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:85
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:52
-msgid "Category"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:12
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:86
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:53
-msgid "Item"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:8
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:82
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:49
-msgid "Payment Id"
-msgstr ""
-
-#: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:9
-#: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:83
-#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:50
+#: waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt:41
 msgid "Creation Date"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/sendpassword.pt:19
+#. Default: "Enter the email address stored on Kofa. You can't change your email address here. If you've forgotten your email address or the email address stored in Kofa is wrong or no longer valid, use the enquiries form to request a change of address."
+msgid "email_address_problem"
+msgstr ""
+
+#: waeup/kofa/students/browser_templates/sendpassword.pt:8
+#. Default: "Please solve the captcha<br />to prevent misuse of this service:"
+msgid "solve_captcha"
 msgstr ""
 
@@ -3365,75 +3418,81 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:183
-#: waeup/kofa/students/interfaces.py:259
-#: waeup/kofa/students/interfaces.py:498
-msgid "Registration Number"
-msgstr ""
-
-#: waeup/kofa/students/interfaces.py:190
-#: waeup/kofa/students/interfaces.py:268
+#: waeup/kofa/students/export.py:139
+msgid "Student Study Levels"
+msgstr ""
+
+#: waeup/kofa/students/export.py:87
+msgid "Student Study Courses"
+msgstr ""
+
+#: waeup/kofa/students/interfaces.py:191
+#: waeup/kofa/students/interfaces.py:280
 msgid "Matriculation Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:197
+#: waeup/kofa/students/interfaces.py:198
 msgid "PWD Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/students/interfaces.py:204
 msgid "Email"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:223
+#: waeup/kofa/students/interfaces.py:225
 msgid "Clearance form locked"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:228
+#: waeup/kofa/students/interfaces.py:230
 msgid "CLR Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:235
+#: waeup/kofa/students/interfaces.py:237
 msgid "Nationality"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:245
+#: waeup/kofa/students/interfaces.py:246
+msgid "Employer"
+msgstr ""
+
+#: waeup/kofa/students/interfaces.py:256
 msgid "Permanent Address"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:277
+#: waeup/kofa/students/interfaces.py:289
 #: waeup/kofa/browser/templates/showstudentspage.pt:7
 msgid "Certificate"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:283
+#: waeup/kofa/students/interfaces.py:295
 msgid "Entry Mode"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:290
+#: waeup/kofa/students/interfaces.py:302
 msgid "Entry Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:298
-#: waeup/kofa/students/interfaces.py:337
+#: waeup/kofa/students/interfaces.py:310
+#: waeup/kofa/students/interfaces.py:349
 #: waeup/kofa/browser/templates/showstudentspage.pt:8
 msgid "Current Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:305
-#: waeup/kofa/students/interfaces.py:343
+#: waeup/kofa/students/interfaces.py:317
+#: waeup/kofa/students/interfaces.py:355
 #: waeup/kofa/browser/templates/showstudentspage.pt:9
 msgid "Current Level"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:312
+#: waeup/kofa/students/interfaces.py:324
+#: waeup/kofa/students/interfaces.py:343
+msgid "Current Verdict"
+msgstr ""
+
 #: waeup/kofa/students/interfaces.py:331
-msgid "Current Verdict"
-msgstr ""
-
-#: waeup/kofa/students/interfaces.py:319
 msgid "Previous Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:357
-#: waeup/kofa/students/interfaces.py:451
+#: waeup/kofa/students/interfaces.py:369
+#: waeup/kofa/students/interfaces.py:471
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3441,9 +3500,9 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:363
+#: waeup/kofa/students/interfaces.py:375
 msgid "Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:382
+#: waeup/kofa/students/interfaces.py:402
 #: waeup/kofa/browser/templates/certificatepage.pt:30
 #: waeup/kofa/browser/templates/certificatemanagepage.pt:33
@@ -3451,13 +3510,13 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:396
+#: waeup/kofa/students/interfaces.py:416
 msgid "Automatical Creation"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:403
+#: waeup/kofa/students/interfaces.py:423
 msgid "Carry-over Course"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:422
+#: waeup/kofa/students/interfaces.py:442
 #: waeup/kofa/university/interfaces.py:299
 #: waeup/kofa/browser/templates/certificatepage.pt:29
@@ -3466,136 +3525,145 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:439
+#: waeup/kofa/students/interfaces.py:459
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:10
 msgid "Bed Coordinates"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:458
+#: waeup/kofa/students/interfaces.py:478
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:9
 msgid "Booking Date"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:464
+#: waeup/kofa/students/interfaces.py:484
 msgid "Booking Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/utils.py:167
+#: waeup/kofa/students/utils.py:182
+msgid "Scanned Documents"
+msgstr ""
+
+#: waeup/kofa/students/utils.py:190
+msgid "(not provided)"
+msgstr ""
+
+#: waeup/kofa/students/utils.py:218
 #. Default: ""
 msgid "<font size=10>${a} Page ${b} of ${c}</font>"
 msgstr ""
 
-#: waeup/kofa/students/utils.py:298
-#: waeup/kofa/students/viewlets.py:71
-#: waeup/kofa/students/viewlets.py:99
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:6
+#: waeup/kofa/students/utils.py:333
+#: waeup/kofa/students/viewlets.py:74
+#: waeup/kofa/students/viewlets.py:102
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:7
 msgid "Base Data"
 msgstr ""
 
-#: waeup/kofa/students/utils.py:329
-msgid "Scanned Documents"
-msgstr ""
-
-#: waeup/kofa/students/utils.py:382
+#: waeup/kofa/students/utils.py:368
 msgid "(not yet)"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:109
-#: waeup/kofa/students/viewlets.py:533
+#: waeup/kofa/students/viewlets.py:112
+#: waeup/kofa/students/viewlets.py:556
 msgid "Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:131
-#: waeup/kofa/students/viewlets.py:537
+#: waeup/kofa/students/viewlets.py:134
+#: waeup/kofa/students/viewlets.py:560
 #: waeup/kofa/accesscodes/browser_templates/searchpage.pt:27
 msgid "History"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:179
+#: waeup/kofa/students/viewlets.py:182
 #: waeup/kofa/students/workflow.py:72
 msgid "Clear student"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:194
+#: waeup/kofa/students/viewlets.py:197
 msgid "Reject clearance"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:210
+#: waeup/kofa/students/viewlets.py:213
 msgid "Download clearance slip"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:235
-msgid "Download course registration slip"
-msgstr ""
-
-#: waeup/kofa/students/viewlets.py:251
+#: waeup/kofa/students/viewlets.py:222
+#: waeup/kofa/students/viewlets.py:231
+msgid "View"
+msgstr ""
+
+#: waeup/kofa/students/viewlets.py:263
 #: waeup/kofa/students/workflow.py:128
 msgid "Validate courses"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:267
+#: waeup/kofa/students/viewlets.py:279
 msgid "Reject courses"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:330
+#: waeup/kofa/students/viewlets.py:296
+msgid "Download course registration slip"
+msgstr ""
+
+#: waeup/kofa/students/viewlets.py:353
 msgid "Book accommodation"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:339
+#: waeup/kofa/students/viewlets.py:362
 msgid "Download bed allocation slip"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:348
+#: waeup/kofa/students/viewlets.py:371
 msgid "Relocate student"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:374
+#: waeup/kofa/students/viewlets.py:397
 msgid "Change portrait"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:432
+#: waeup/kofa/students/viewlets.py:455
 msgid "Add course list"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:450
+#: waeup/kofa/students/viewlets.py:473
 msgid "Add and remove courses"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:536
+#: waeup/kofa/students/viewlets.py:559
 msgid "Accommodation Data"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:548
+#: waeup/kofa/students/viewlets.py:571
 #. Default: ""
 msgid "${a} deleted."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:561
+#: waeup/kofa/students/viewlets.py:584
 msgid "File name has no extension."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:564
+#: waeup/kofa/students/viewlets.py:587
 msgid "File name contains more than one dot."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:571
+#: waeup/kofa/students/viewlets.py:594
 #. Default: ""
 msgid "${a} file extension expected."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:577
+#: waeup/kofa/students/viewlets.py:600
 #. Default: ""
 msgid "Only the following extension are allowed: ${a}"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:583
+#: waeup/kofa/students/viewlets.py:606
 msgid "Uploaded file is too big."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:590
+#: waeup/kofa/students/viewlets.py:613
 #. Default: ""
 msgid "File ${a} uploaded."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:608
+#: waeup/kofa/students/viewlets.py:631
 #: waeup/kofa/browser/templates/datacenterlogspage.pt:10
 #: waeup/kofa/browser/templates/datacenterpage.pt:14
@@ -3604,87 +3672,87 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:609
+#: waeup/kofa/students/viewlets.py:632
 msgid "Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:632
+#: waeup/kofa/students/viewlets.py:655
 msgid "Upload new file"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:633
+#: waeup/kofa/students/viewlets.py:656
 msgid "Delete attachment"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:663
+#: waeup/kofa/students/viewlets.py:687
 msgid "No local file selected."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:677
-#: waeup/kofa/students/browser_templates/basemanagepage.pt:8
+#: waeup/kofa/students/viewlets.py:701
+#: waeup/kofa/students/browser_templates/basemanagepage.pt:9
 msgid "Passport Picture"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:688
+#: waeup/kofa/students/viewlets.py:712
 msgid "Passport Picture (jpg only)"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:703
-#: waeup/kofa/students/viewlets.py:714
+#: waeup/kofa/students/viewlets.py:727
+#: waeup/kofa/students/viewlets.py:738
 msgid "Birth Certificate"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:704
-#: waeup/kofa/students/viewlets.py:715
+#: waeup/kofa/students/viewlets.py:728
+#: waeup/kofa/students/viewlets.py:739
 msgid "Birth Certificate Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:724
-#: waeup/kofa/students/viewlets.py:735
+#: waeup/kofa/students/viewlets.py:748
+#: waeup/kofa/students/viewlets.py:759
 msgid "Acceptance Letter"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:725
-#: waeup/kofa/students/viewlets.py:736
+#: waeup/kofa/students/viewlets.py:749
+#: waeup/kofa/students/viewlets.py:760
 msgid "Acceptance Letter Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:85
+#: waeup/kofa/students/viewlets.py:88
 msgid "Application Slip"
 msgstr ""
 
-#: waeup/kofa/students/vocabularies.py:117
+#: waeup/kofa/students/vocabularies.py:116
 msgid "male"
 msgstr ""
 
-#: waeup/kofa/students/vocabularies.py:119
+#: waeup/kofa/students/vocabularies.py:118
 msgid "female"
 msgstr ""
 
-#: waeup/kofa/students/vocabularies.py:77
+#: waeup/kofa/students/vocabularies.py:76
 #. Default: ""
 msgid "Error: level id ${value} out of range"
 msgstr ""
 
-#: waeup/kofa/students/vocabularies.py:88
+#: waeup/kofa/students/vocabularies.py:87
 #. Default: ""
 msgid "${title} 2nd spillover"
 msgstr ""
 
-#: waeup/kofa/students/vocabularies.py:91
+#: waeup/kofa/students/vocabularies.py:90
 #. Default: ""
 msgid "${title} 3rd spillover"
 msgstr ""
 
-#: waeup/kofa/students/vocabularies.py:94
+#: waeup/kofa/students/vocabularies.py:93
 #. Default: ""
 msgid "${title} 1st spillover"
 msgstr ""
 
-#: waeup/kofa/students/vocabularies.py:96
+#: waeup/kofa/students/vocabularies.py:95
 #. Default: ""
 msgid "${title} on 1st probation"
 msgstr ""
 
-#: waeup/kofa/students/vocabularies.py:98
+#: waeup/kofa/students/vocabularies.py:97
 #. Default: ""
 msgid "${title} on 2nd probation"
@@ -3696,5 +3764,6 @@
 
 #: waeup/kofa/students/workflow.py:108
-msgid "Student record reset to 'returning'"
+#: waeup/kofa/students/workflow.py:143
+msgid "Reset to 'returning'"
 msgstr ""
 
@@ -3714,5 +3783,5 @@
 #: waeup/kofa/students/workflow.py:122
 #: waeup/kofa/students/workflow.py:136
-msgid "Student record reset to 'paid'"
+msgid "Reset to 'paid'"
 msgstr ""
 
@@ -3725,8 +3794,4 @@
 msgstr ""
 
-#: waeup/kofa/students/workflow.py:143
-msgid "Returned"
-msgstr ""
-
 #: waeup/kofa/students/workflow.py:149
 msgid "Reset to validated"
@@ -3734,5 +3799,5 @@
 
 #: waeup/kofa/students/workflow.py:150
-msgid "Student record reset to 'validated'"
+msgid "Reset to 'validated'"
 msgstr ""
 
@@ -3754,5 +3819,5 @@
 
 #: waeup/kofa/students/workflow.py:38
-msgid "Student record reset"
+msgid "Reset to initial state"
 msgstr ""
 
@@ -3766,5 +3831,5 @@
 
 #: waeup/kofa/students/workflow.py:52
-msgid "Student record reset to 'admitted'"
+msgid "Reset to 'admitted'"
 msgstr ""
 
@@ -3780,5 +3845,5 @@
 #: waeup/kofa/students/workflow.py:66
 #: waeup/kofa/students/workflow.py:80
-msgid "Student record reset to 'clearance'"
+msgid "Reset to 'clearance'"
 msgstr ""
 
@@ -3802,5 +3867,5 @@
 
 #: waeup/kofa/students/workflow.py:94
-msgid "Student record reset to 'cleared'"
+msgid "Reset to 'cleared'"
 msgstr ""
 
@@ -3937,4 +4002,8 @@
 msgstr ""
 
+#: waeup/kofa/university/vocabularies.py:38
+msgid "900 (Year 9)"
+msgstr ""
+
 #: waeup/kofa/utils/countries.py:10
 msgid "Albania"
@@ -4242,5 +4311,5 @@
 
 #: waeup/kofa/utils/countries.py:169
-#: waeup/kofa/utils/utils.py:47
+#: waeup/kofa/utils/utils.py:48
 msgid "Nigeria"
 msgstr ""
@@ -4895,5 +4964,5 @@
 
 #: waeup/kofa/utils/countries.py:90
-#: waeup/kofa/utils/utils.py:46
+#: waeup/kofa/utils/utils.py:47
 msgid "Germany"
 msgstr ""
@@ -4935,5 +5004,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:149
+#: waeup/kofa/utils/utils.py:151
 msgid ""
 "Fullname: ${a}\n"
@@ -4945,5 +5014,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:194
+#: waeup/kofa/utils/utils.py:201
 msgid ""
 "Dear ${a},\n"
@@ -4965,17 +5034,17 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:48
+#: waeup/kofa/utils/utils.py:49
 msgid "U.S."
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:117
+#: waeup/kofa/widgets/phonewidget.py:118
 msgid "Empty phone field(s)."
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:121
+#: waeup/kofa/widgets/phonewidget.py:122
 msgid "Int. prefix requires format '+NNN'"
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:127
+#: waeup/kofa/widgets/phonewidget.py:130
 msgid "Phone numbers may contain numbers only."
 msgstr ""
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 8196)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/locales/yo/LC_MESSAGES/waeup.kofa.po	(revision 8197)
@@ -15,5 +15,5 @@
 msgstr ""
 "Project-Id-Version: WAeUP.Kofa\n"
-"POT-Creation-Date: Thu Apr 12 09:07:38 2012\n"
+"POT-Creation-Date: Tue Apr 17 16:18:24 2012\n"
 "PO-Revision-Date: 2012-03-09 07:17+0100\n"
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
@@ -28,161 +28,161 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: waeup/kofa/accesscodes/browser.py:100 waeup/kofa/accesscodes/browser.py:113
-#: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:132
-#: waeup/kofa/applicants/browser.py:183 waeup/kofa/applicants/browser.py:254
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:338
-#: waeup/kofa/browser/pages.py:510 waeup/kofa/browser/pages.py:716
-#: waeup/kofa/browser/pages.py:743 waeup/kofa/browser/pages.py:766
-#: waeup/kofa/browser/pages.py:813 waeup/kofa/browser/pages.py:843
-#: waeup/kofa/browser/pages.py:963 waeup/kofa/browser/pages.py:1191
-#: waeup/kofa/browser/pages.py:1328 waeup/kofa/browser/pages.py:1349
-#: waeup/kofa/browser/pages.py:1376 waeup/kofa/browser/pages.py:1404
-#: waeup/kofa/browser/pages.py:1405 waeup/kofa/browser/pages.py:1451
-#: waeup/kofa/browser/pages.py:1492 waeup/kofa/browser/pages.py:1571
-#: waeup/kofa/browser/pages.py:1572 waeup/kofa/browser/pages.py:1574
-#: waeup/kofa/browser/pages.py:1652 waeup/kofa/browser/pages.py:1697
-#: waeup/kofa/browser/pages.py:1735 waeup/kofa/browser/pages.py:1779
-#: waeup/kofa/browser/pages.py:1818 waeup/kofa/browser/pages.py:1820
-#: waeup/kofa/browser/pages.py:1855 waeup/kofa/browser/pages.py:1906
-#: waeup/kofa/browser/pages.py:1958 waeup/kofa/students/browser.py:627
-#: waeup/kofa/students/browser.py:628 waeup/kofa/students/browser.py:795
-#: waeup/kofa/students/browser.py:797 waeup/kofa/students/browser.py:937
+#: waeup/kofa/accesscodes/browser.py:101 waeup/kofa/accesscodes/browser.py:114
+#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:131
+#: waeup/kofa/applicants/browser.py:180 waeup/kofa/applicants/browser.py:249
+#: waeup/kofa/applicants/browser.py:250 waeup/kofa/applicants/browser.py:331
+#: waeup/kofa/browser/pages.py:507 waeup/kofa/browser/pages.py:712
+#: waeup/kofa/browser/pages.py:739 waeup/kofa/browser/pages.py:762
+#: waeup/kofa/browser/pages.py:809 waeup/kofa/browser/pages.py:839
+#: waeup/kofa/browser/pages.py:959 waeup/kofa/browser/pages.py:1187
+#: waeup/kofa/browser/pages.py:1324 waeup/kofa/browser/pages.py:1345
+#: waeup/kofa/browser/pages.py:1372 waeup/kofa/browser/pages.py:1400
+#: waeup/kofa/browser/pages.py:1401 waeup/kofa/browser/pages.py:1447
+#: waeup/kofa/browser/pages.py:1488 waeup/kofa/browser/pages.py:1567
+#: waeup/kofa/browser/pages.py:1568 waeup/kofa/browser/pages.py:1570
+#: waeup/kofa/browser/pages.py:1648 waeup/kofa/browser/pages.py:1693
+#: waeup/kofa/browser/pages.py:1731 waeup/kofa/browser/pages.py:1775
+#: waeup/kofa/browser/pages.py:1814 waeup/kofa/browser/pages.py:1816
+#: waeup/kofa/browser/pages.py:1851 waeup/kofa/browser/pages.py:1902
+#: waeup/kofa/browser/pages.py:1954 waeup/kofa/students/browser.py:623
+#: waeup/kofa/students/browser.py:624 waeup/kofa/students/browser.py:807
+#: waeup/kofa/students/browser.py:809 waeup/kofa/students/browser.py:950
 msgid "Cancel"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:102
+#: waeup/kofa/accesscodes/browser.py:103
 msgid "Batch creation cancelled."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:112
+#: waeup/kofa/accesscodes/browser.py:113
 msgid "Reimport"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:115
+#: waeup/kofa/accesscodes/browser.py:116
 msgid "Reimport Access Code Batches"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:120
+#: waeup/kofa/accesscodes/browser.py:121
 msgid "Reimport cancelled."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:126
+#: waeup/kofa/accesscodes/browser.py:127
 msgid "No file chosen. Action cancelled."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:136
+#: waeup/kofa/accesscodes/browser.py:137
 msgid "This batch already exists: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:139
+#: waeup/kofa/accesscodes/browser.py:140
 msgid "Successfully reimported: ${a}"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:152
+#: waeup/kofa/accesscodes/browser.py:153
 msgid "Search and Manage Access Codes"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:153 waeup/kofa/browser/pages.py:600
-#: waeup/kofa/browser/pages.py:1150 waeup/kofa/browser/viewlets.py:190
+#: waeup/kofa/accesscodes/browser.py:154 waeup/kofa/browser/pages.py:596
+#: waeup/kofa/browser/pages.py:1146 waeup/kofa/browser/viewlets.py:190
 #: waeup/kofa/students/browser.py:171 waeup/kofa/students/browser.py:209
 msgid "Search"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:154
+#: waeup/kofa/accesscodes/browser.py:155
 msgid "Disable ACs"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:155
+#: waeup/kofa/accesscodes/browser.py:156
 msgid "Enable ACs"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:180 waeup/kofa/accesscodes/workflow.py:39
+#: waeup/kofa/accesscodes/browser.py:181 waeup/kofa/accesscodes/workflow.py:39
 msgid "disabled"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:182
+#: waeup/kofa/accesscodes/browser.py:183
 msgid "${a} disabled."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:186
+#: waeup/kofa/accesscodes/browser.py:187
 msgid "${a}: Disable transition not allowed."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:190
+#: waeup/kofa/accesscodes/browser.py:191
 msgid "re-enabled"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:192
+#: waeup/kofa/accesscodes/browser.py:193
 msgid "${a} (re-)enabled."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:196
+#: waeup/kofa/accesscodes/browser.py:197
 msgid "${a}: Re-enable transition not allowed."
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:235
+#: waeup/kofa/accesscodes/browser.py:236
 msgid "Add Access Code Batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:244
+#: waeup/kofa/accesscodes/browser.py:245
 msgid "Reimport Access Code Batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:252
+#: waeup/kofa/accesscodes/browser.py:253
 msgid "Search Access Codes"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:261
+#: waeup/kofa/accesscodes/browser.py:262
 msgid "Access Codes"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:43
+#: waeup/kofa/accesscodes/browser.py:44
 msgid "Archive"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:44
+#: waeup/kofa/accesscodes/browser.py:45
 msgid "Archive and delete"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:46 waeup/kofa/accesscodes/browser.py:206
-#: waeup/kofa/accesscodes/browser.py:226
+#: waeup/kofa/accesscodes/browser.py:47 waeup/kofa/accesscodes/browser.py:207
+#: waeup/kofa/accesscodes/browser.py:227
 msgid "Access Code Batches"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:53
+#: waeup/kofa/accesscodes/browser.py:54
 msgid "No batch selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:61
+#: waeup/kofa/accesscodes/browser.py:62
 msgid "Archived ${a} (${b})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:68
+#: waeup/kofa/accesscodes/browser.py:69
 msgid "Deleted batch ${a}"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:77
+#: waeup/kofa/accesscodes/browser.py:78
 msgid "Create Access Code Batch"
 msgstr ""
 
-#: waeup/kofa/accesscodes/browser.py:83
+#: waeup/kofa/accesscodes/browser.py:84
 msgid "Create batch"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:91
+#: waeup/kofa/accesscodes/browser.py:92
 msgid "Batch created (${a} entries)"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/accesscodes/browser.py:93
+#: waeup/kofa/accesscodes/browser.py:94
 msgid "Data written to ${a}"
 msgstr ""
@@ -342,19 +342,19 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:119 waeup/kofa/applicants/browser.py:325
-#: waeup/kofa/applicants/browser.py:724
+#: waeup/kofa/applicants/browser.py:118 waeup/kofa/applicants/browser.py:318
+#: waeup/kofa/applicants/browser.py:714
 msgid "Could not delete:"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:122 waeup/kofa/applicants/browser.py:328
-#: waeup/kofa/applicants/browser.py:727 waeup/kofa/browser/pages.py:137
-#: waeup/kofa/students/browser.py:253 waeup/kofa/students/browser.py:691
-#: waeup/kofa/students/browser.py:845 waeup/kofa/students/browser.py:1023
-#: waeup/kofa/students/browser.py:1238 waeup/kofa/students/browser.py:1832
+#: waeup/kofa/applicants/browser.py:121 waeup/kofa/applicants/browser.py:321
+#: waeup/kofa/applicants/browser.py:717 waeup/kofa/browser/pages.py:136
+#: waeup/kofa/students/browser.py:253 waeup/kofa/students/browser.py:687
+#: waeup/kofa/students/browser.py:857 waeup/kofa/students/browser.py:1036
+#: waeup/kofa/students/browser.py:1251 waeup/kofa/students/browser.py:1841
 msgid "Successfully removed: ${a}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:171
+#: waeup/kofa/applicants/browser.py:168
 msgid ""
 "An applicants container for the same application type and entrance year "
@@ -362,9 +362,9 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:179
+#: waeup/kofa/applicants/browser.py:176
 msgid "Added:"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:191 waeup/kofa/applicants/export.py:76
+#: waeup/kofa/applicants/browser.py:188 waeup/kofa/applicants/export.py:76
 #: waeup/kofa/applicants/viewlets.py:44
 #: waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt:12
@@ -373,243 +373,243 @@
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:254 waeup/kofa/applicants/browser.py:301
-#: waeup/kofa/applicants/browser.py:629 waeup/kofa/applicants/browser.py:667
-#: waeup/kofa/applicants/browser.py:771 waeup/kofa/applicants/browser.py:774
-#: waeup/kofa/applicants/browser.py:818 waeup/kofa/browser/pages.py:483
-#: waeup/kofa/browser/pages.py:639 waeup/kofa/browser/pages.py:662
-#: waeup/kofa/browser/pages.py:736 waeup/kofa/browser/pages.py:1189
-#: waeup/kofa/browser/pages.py:1404 waeup/kofa/browser/pages.py:1445
-#: waeup/kofa/browser/pages.py:1571 waeup/kofa/browser/pages.py:1624
-#: waeup/kofa/browser/pages.py:1767 waeup/kofa/browser/pages.py:1818
-#: waeup/kofa/browser/pages.py:1839 waeup/kofa/hostels/browser.py:209
+#: waeup/kofa/applicants/browser.py:249 waeup/kofa/applicants/browser.py:294
+#: waeup/kofa/applicants/browser.py:619 waeup/kofa/applicants/browser.py:657
+#: waeup/kofa/applicants/browser.py:759 waeup/kofa/applicants/browser.py:762
+#: waeup/kofa/applicants/browser.py:806 waeup/kofa/browser/pages.py:480
+#: waeup/kofa/browser/pages.py:635 waeup/kofa/browser/pages.py:658
+#: waeup/kofa/browser/pages.py:732 waeup/kofa/browser/pages.py:1185
+#: waeup/kofa/browser/pages.py:1400 waeup/kofa/browser/pages.py:1441
+#: waeup/kofa/browser/pages.py:1567 waeup/kofa/browser/pages.py:1620
+#: waeup/kofa/browser/pages.py:1763 waeup/kofa/browser/pages.py:1814
+#: waeup/kofa/browser/pages.py:1835 waeup/kofa/hostels/browser.py:209
 #: waeup/kofa/hostels/browser.py:231 waeup/kofa/hostels/browser.py:318
-#: waeup/kofa/students/browser.py:370 waeup/kofa/students/browser.py:501
-#: waeup/kofa/students/browser.py:578 waeup/kofa/students/browser.py:627
-#: waeup/kofa/students/browser.py:643 waeup/kofa/students/browser.py:795
-#: waeup/kofa/students/browser.py:820 waeup/kofa/students/browser.py:1499
-#: waeup/kofa/students/browser.py:1514 waeup/kofa/students/browser.py:1636
+#: waeup/kofa/students/browser.py:369 waeup/kofa/students/browser.py:497
+#: waeup/kofa/students/browser.py:574 waeup/kofa/students/browser.py:623
+#: waeup/kofa/students/browser.py:639 waeup/kofa/students/browser.py:807
+#: waeup/kofa/students/browser.py:832 waeup/kofa/students/browser.py:1509
+#: waeup/kofa/students/browser.py:1524 waeup/kofa/students/browser.py:1645
 msgid "Save"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:333
+#: waeup/kofa/applicants/browser.py:250 waeup/kofa/applicants/browser.py:326
+#: waeup/kofa/applicants/browser.py:354
+msgid "Add applicant"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:258 waeup/kofa/applicants/viewlets.py:95
+msgid "Manage applicants container"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:298 waeup/kofa/applicants/browser.py:686
+#: waeup/kofa/browser/pages.py:1444 waeup/kofa/browser/pages.py:1766
+#: waeup/kofa/browser/pages.py:1838 waeup/kofa/browser/pages.py:1950
+#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:84
+#: waeup/kofa/students/browser.py:395
+msgid "Form has been saved."
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:307
+msgid "No applicant selected!"
+msgstr ""
+
+#: waeup/kofa/applicants/browser.py:357
+msgid "Create application record"
+msgstr ""
+
 #: waeup/kofa/applicants/browser.py:362
-msgid "Add applicant"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:265 waeup/kofa/applicants/viewlets.py:95
-msgid "Manage applicants container"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:305 waeup/kofa/applicants/browser.py:696
-#: waeup/kofa/browser/pages.py:1448 waeup/kofa/browser/pages.py:1770
-#: waeup/kofa/browser/pages.py:1842 waeup/kofa/browser/pages.py:1954
-#: waeup/kofa/hostels/browser.py:54 waeup/kofa/students/browser.py:84
-#: waeup/kofa/students/browser.py:396
-msgid "Form has been saved."
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:314
-msgid "No applicant selected!"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:365
-msgid "Create application record"
-msgstr ""
-
-#: waeup/kofa/applicants/browser.py:370
 msgid "Applicant record created."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:385
+#: waeup/kofa/applicants/browser.py:376
 msgid "Applicant"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:404 waeup/kofa/students/browser.py:295
+#: waeup/kofa/applicants/browser.py:395 waeup/kofa/students/browser.py:295
 msgid "set"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:405 waeup/kofa/students/browser.py:296
+#: waeup/kofa/applicants/browser.py:396 waeup/kofa/students/browser.py:296
 msgid "unset"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:410
+#: waeup/kofa/applicants/browser.py:401
 msgid "${a} <br /> Application Record ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:461
+#: waeup/kofa/applicants/browser.py:452
 msgid "Session configuration object is not available."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:468 waeup/kofa/students/browser.py:1078
+#: waeup/kofa/applicants/browser.py:459 waeup/kofa/students/browser.py:1091
 msgid "This type of payment has already been made."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:481 waeup/kofa/students/browser.py:1092
+#: waeup/kofa/applicants/browser.py:472 waeup/kofa/students/browser.py:1105
 msgid "Payment ticket created."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:508 waeup/kofa/students/browser.py:1111
+#: waeup/kofa/applicants/browser.py:499 waeup/kofa/students/browser.py:1124
 msgid "${a}: Online Payment Ticket ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:535 waeup/kofa/students/browser.py:1159
+#: waeup/kofa/applicants/browser.py:527 waeup/kofa/students/browser.py:1172
 msgid "Valid callback received."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:556
+#: waeup/kofa/applicants/browser.py:548
 msgid "Payment Data"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:562
+#: waeup/kofa/applicants/browser.py:554
 msgid "Online Payment Receipt"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:568
+#: waeup/kofa/applicants/browser.py:560
 msgid "Ticket not yet paid."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:602
+#: waeup/kofa/applicants/browser.py:594
 msgid "Uploaded image is too big!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:607
+#: waeup/kofa/applicants/browser.py:599
 msgid "jpg file extension expected."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:629 waeup/kofa/applicants/browser.py:774
-#: waeup/kofa/applicants/browser.py:826
+#: waeup/kofa/applicants/browser.py:619 waeup/kofa/applicants/browser.py:762
+#: waeup/kofa/applicants/browser.py:814
 msgid "Final Submit"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:630 waeup/kofa/applicants/browser.py:737
-#: waeup/kofa/applicants/browser.py:772 waeup/kofa/applicants/browser.py:807
-#: waeup/kofa/students/browser.py:1029
+#: waeup/kofa/applicants/browser.py:620 waeup/kofa/applicants/browser.py:727
+#: waeup/kofa/applicants/browser.py:760 waeup/kofa/applicants/browser.py:795
+#: waeup/kofa/students/browser.py:1042
 msgid "Add online payment ticket"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:630 waeup/kofa/applicants/browser.py:742
-#: waeup/kofa/applicants/browser.py:772 waeup/kofa/applicants/browser.py:775
-#: waeup/kofa/applicants/browser.py:812 waeup/kofa/students/browser.py:797
-#: waeup/kofa/students/browser.py:829 waeup/kofa/students/browser.py:1005
-#: waeup/kofa/students/browser.py:1814
+#: waeup/kofa/applicants/browser.py:620 waeup/kofa/applicants/browser.py:732
+#: waeup/kofa/applicants/browser.py:760 waeup/kofa/applicants/browser.py:763
+#: waeup/kofa/applicants/browser.py:800 waeup/kofa/students/browser.py:809
+#: waeup/kofa/students/browser.py:841 waeup/kofa/students/browser.py:1018
+#: waeup/kofa/students/browser.py:1823
 msgid "Remove selected tickets"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:653
+#: waeup/kofa/applicants/browser.py:643
 msgid "${a} <br /> Application Form ${b}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:66
+#: waeup/kofa/applicants/browser.py:65
 msgid "Application Section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:664 waeup/kofa/students/browser.py:367
+#: waeup/kofa/applicants/browser.py:654 waeup/kofa/students/browser.py:366
 msgid "No transition"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:711 waeup/kofa/students/browser.py:1011
+#: waeup/kofa/applicants/browser.py:701 waeup/kofa/students/browser.py:1024
 msgid "No payment selected."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:78 waeup/kofa/applicants/viewlets.py:88
+#: waeup/kofa/applicants/browser.py:77 waeup/kofa/applicants/viewlets.py:88
 msgid "Manage application section"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:785 waeup/kofa/students/browser.py:92
+#: waeup/kofa/applicants/browser.py:773 waeup/kofa/students/browser.py:92
 msgid "The requested form is locked (read-only)."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:799
+#: waeup/kofa/applicants/browser.py:787
 msgid "No passport picture uploaded."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:801
+#: waeup/kofa/applicants/browser.py:789
 msgid "Passport picture confirmation box not ticked."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:107
-#: waeup/kofa/applicants/browser.py:255 waeup/kofa/applicants/browser.py:308
-#: waeup/kofa/browser/pages.py:642 waeup/kofa/browser/pages.py:683
-#: waeup/kofa/browser/pages.py:1328 waeup/kofa/browser/pages.py:1339
-#: waeup/kofa/browser/pages.py:1405 waeup/kofa/browser/pages.py:1440
+#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:106
+#: waeup/kofa/applicants/browser.py:250 waeup/kofa/applicants/browser.py:301
+#: waeup/kofa/browser/pages.py:638 waeup/kofa/browser/pages.py:679
+#: waeup/kofa/browser/pages.py:1324 waeup/kofa/browser/pages.py:1335
+#: waeup/kofa/browser/pages.py:1401 waeup/kofa/browser/pages.py:1436
 #: waeup/kofa/hostels/browser.py:131 waeup/kofa/students/browser.py:210
-#: waeup/kofa/students/browser.py:1205 waeup/kofa/students/browser.py:1218
+#: waeup/kofa/students/browser.py:1218 waeup/kofa/students/browser.py:1231
 msgid "Remove selected"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:81 waeup/kofa/applicants/browser.py:127
-#: waeup/kofa/applicants/browser.py:150 waeup/kofa/applicants/browser.py:162
+#: waeup/kofa/applicants/browser.py:80 waeup/kofa/applicants/browser.py:126
+#: waeup/kofa/applicants/browser.py:149 waeup/kofa/applicants/browser.py:159
 msgid "Add applicants container"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:83 waeup/kofa/applicants/browser.py:141
-#: waeup/kofa/applicants/browser.py:256 waeup/kofa/applicants/browser.py:347
-#: waeup/kofa/browser/pages.py:1406 waeup/kofa/browser/pages.py:1465
-#: waeup/kofa/browser/pages.py:1575 waeup/kofa/browser/pages.py:1661
-#: waeup/kofa/browser/pages.py:1821 waeup/kofa/browser/pages.py:1878
+#: waeup/kofa/applicants/browser.py:82 waeup/kofa/applicants/browser.py:140
+#: waeup/kofa/applicants/browser.py:251 waeup/kofa/applicants/browser.py:340
+#: waeup/kofa/browser/pages.py:1402 waeup/kofa/browser/pages.py:1461
+#: waeup/kofa/browser/pages.py:1571 waeup/kofa/browser/pages.py:1657
+#: waeup/kofa/browser/pages.py:1817 waeup/kofa/browser/pages.py:1874
 msgid "Remove selected local roles"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:838 waeup/kofa/students/browser.py:1681
+#: waeup/kofa/applicants/browser.py:826 waeup/kofa/students/browser.py:1690
 msgid "This form cannot be submitted. Wrong state!"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:84 waeup/kofa/applicants/browser.py:137
-#: waeup/kofa/applicants/browser.py:257 waeup/kofa/applicants/browser.py:343
-#: waeup/kofa/browser/pages.py:1407 waeup/kofa/browser/pages.py:1461
-#: waeup/kofa/browser/pages.py:1576 waeup/kofa/browser/pages.py:1657
-#: waeup/kofa/browser/pages.py:1822 waeup/kofa/browser/pages.py:1874
+#: waeup/kofa/applicants/browser.py:83 waeup/kofa/applicants/browser.py:136
+#: waeup/kofa/applicants/browser.py:252 waeup/kofa/applicants/browser.py:336
+#: waeup/kofa/browser/pages.py:1403 waeup/kofa/browser/pages.py:1457
+#: waeup/kofa/browser/pages.py:1572 waeup/kofa/browser/pages.py:1653
+#: waeup/kofa/browser/pages.py:1818 waeup/kofa/browser/pages.py:1870
 msgid "Add local role"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:843
+#: waeup/kofa/applicants/browser.py:831
 msgid "Form has been submitted."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:85
+#: waeup/kofa/applicants/browser.py:84
 msgid "Applicants Containers"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/applicants/browser.py:887
+#: waeup/kofa/applicants/browser.py:874
 msgid "Apply for ${a}"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:893
+#: waeup/kofa/applicants/browser.py:880
 msgid "Application has not yet started."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:898
+#: waeup/kofa/applicants/browser.py:885
 msgid "Application has ended."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:907
+#: waeup/kofa/applicants/browser.py:894
 msgid "Get login credentials"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:930
+#: waeup/kofa/applicants/browser.py:917
 msgid "An error occurred."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:936 waeup/kofa/applicants/browser.py:947
+#: waeup/kofa/applicants/browser.py:923 waeup/kofa/applicants/browser.py:934
 msgid "No application record found."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:939
+#: waeup/kofa/applicants/browser.py:926
 msgid "Your password has already been set. Please proceed to the login page."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:957
+#: waeup/kofa/applicants/browser.py:944
 msgid "You have successfully been registered for the"
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:964
+#: waeup/kofa/applicants/browser.py:951
 msgid "Email could not been sent. Please retry later."
 msgstr ""
 
-#: waeup/kofa/applicants/browser.py:973
+#: waeup/kofa/applicants/browser.py:960
 msgid "Your registration was successful."
 msgstr ""
@@ -620,5 +620,5 @@
 
 #: waeup/kofa/applicants/browser_templates/applicanteditpage.pt:19
-msgid "Photograph:"
+msgid "Passport Photo:"
 msgstr ""
 
@@ -699,5 +699,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:159 waeup/kofa/students/browser.py:762
+#: waeup/kofa/applicants/interfaces.py:159 waeup/kofa/students/browser.py:773
 #: waeup/kofa/university/interfaces.py:38
 #: waeup/kofa/university/interfaces.py:66
@@ -723,5 +723,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:165 waeup/kofa/students/browser.py:763
+#: waeup/kofa/applicants/interfaces.py:165 waeup/kofa/students/browser.py:774
 #: waeup/kofa/university/interfaces.py:199
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:41
@@ -743,10 +743,10 @@
 
 #: waeup/kofa/applicants/interfaces.py:171
-#: waeup/kofa/applicants/interfaces.py:273
+#: waeup/kofa/applicants/interfaces.py:275
 msgid "Application Target"
 msgstr ""
 
 #: waeup/kofa/applicants/interfaces.py:178
-#: waeup/kofa/applicants/interfaces.py:280
+#: waeup/kofa/applicants/interfaces.py:282
 msgid "Year of Entrance"
 msgstr ""
@@ -772,92 +772,92 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:229
+#: waeup/kofa/applicants/interfaces.py:230
 msgid "Application Closing Date"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:234
+#: waeup/kofa/applicants/interfaces.py:236
 msgid "Forbid additions after deadline (enddate)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:313
+#: waeup/kofa/applicants/interfaces.py:315
 msgid "Applicant Id"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:318
-#: waeup/kofa/students/interfaces.py:183 waeup/kofa/students/interfaces.py:269
-#: waeup/kofa/students/interfaces.py:508
+#: waeup/kofa/applicants/interfaces.py:320
+#: waeup/kofa/students/interfaces.py:184 waeup/kofa/students/interfaces.py:271
+#: waeup/kofa/students/interfaces.py:518
 msgid "Registration Number"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:329
-#: waeup/kofa/applicants/interfaces.py:495
-#: waeup/kofa/students/interfaces.py:162
+#: waeup/kofa/applicants/interfaces.py:331
+#: waeup/kofa/applicants/interfaces.py:499
+#: waeup/kofa/students/interfaces.py:163
 msgid "First Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:333
-#: waeup/kofa/students/interfaces.py:167
+#: waeup/kofa/applicants/interfaces.py:335
+#: waeup/kofa/students/interfaces.py:168
 msgid "Middle Name"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:337
-#: waeup/kofa/students/interfaces.py:172
+#: waeup/kofa/applicants/interfaces.py:339
+#: waeup/kofa/students/interfaces.py:173
 msgid "Last Name (Surname)"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:341
-#: waeup/kofa/students/interfaces.py:218
+#: waeup/kofa/applicants/interfaces.py:343
+#: waeup/kofa/students/interfaces.py:219
 msgid "Date of Birth"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:345
-#: waeup/kofa/students/interfaces.py:177
+#: waeup/kofa/applicants/interfaces.py:349
+#: waeup/kofa/students/interfaces.py:178
 msgid "Sex"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:350
-#: waeup/kofa/applicants/interfaces.py:433
-#: waeup/kofa/applicants/interfaces.py:500 waeup/kofa/interfaces.py:392
-#: waeup/kofa/interfaces.py:418 waeup/kofa/students/interfaces.py:514
+#: waeup/kofa/applicants/interfaces.py:354
+#: waeup/kofa/applicants/interfaces.py:437
+#: waeup/kofa/applicants/interfaces.py:504 waeup/kofa/interfaces.py:393
+#: waeup/kofa/interfaces.py:419 waeup/kofa/students/interfaces.py:524
 msgid "Email Address"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:355 waeup/kofa/interfaces.py:397
-#: waeup/kofa/interfaces.py:425 waeup/kofa/students/interfaces.py:208
+#: waeup/kofa/applicants/interfaces.py:359 waeup/kofa/interfaces.py:398
+#: waeup/kofa/interfaces.py:426 waeup/kofa/students/interfaces.py:209
 msgid "Phone"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:360
-#: waeup/kofa/applicants/interfaces.py:438
+#: waeup/kofa/applicants/interfaces.py:364
+#: waeup/kofa/applicants/interfaces.py:442
 msgid "1st Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:365
-#: waeup/kofa/applicants/interfaces.py:443
+#: waeup/kofa/applicants/interfaces.py:369
+#: waeup/kofa/applicants/interfaces.py:447
 msgid "2nd Choice Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:377
-#: waeup/kofa/applicants/interfaces.py:464
+#: waeup/kofa/applicants/interfaces.py:381
+#: waeup/kofa/applicants/interfaces.py:468
 msgid "Notice"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:381
-#: waeup/kofa/applicants/interfaces.py:453
+#: waeup/kofa/applicants/interfaces.py:385
+#: waeup/kofa/applicants/interfaces.py:457
 msgid "Screening Venue"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:385
-#: waeup/kofa/applicants/interfaces.py:448
+#: waeup/kofa/applicants/interfaces.py:389
+#: waeup/kofa/applicants/interfaces.py:452
 msgid "Screening Score"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:389
-#: waeup/kofa/applicants/interfaces.py:458
+#: waeup/kofa/applicants/interfaces.py:393
+#: waeup/kofa/applicants/interfaces.py:462
 msgid "Admitted Course of Study"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:394
-#: waeup/kofa/students/interfaces.py:157
+#: waeup/kofa/applicants/interfaces.py:398
+#: waeup/kofa/students/interfaces.py:158
 #: waeup/kofa/browser/templates/showstudentspage.pt:4
 #: waeup/kofa/students/browser_templates/containerpage.pt:29
@@ -866,10 +866,10 @@
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:399
+#: waeup/kofa/applicants/interfaces.py:403
 msgid "Form locked"
 msgstr ""
 
-#: waeup/kofa/applicants/interfaces.py:510
-#: waeup/kofa/students/interfaces.py:494
+#: waeup/kofa/applicants/interfaces.py:514
+#: waeup/kofa/students/interfaces.py:504
 msgid "Payment Session"
 msgstr ""
@@ -939,5 +939,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:100 waeup/kofa/students/batching.py:141
+#: waeup/kofa/applicants/workflow.py:100 waeup/kofa/students/batching.py:142
 #: waeup/kofa/students/workflow.py:25
 msgid "Student record created"
@@ -971,5 +971,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:41 waeup/kofa/interfaces.py:72
+#: waeup/kofa/applicants/workflow.py:41 waeup/kofa/interfaces.py:73
 msgid "admitted"
 msgstr ""
@@ -979,5 +979,5 @@
 msgstr ""
 
-#: waeup/kofa/applicants/workflow.py:43 waeup/kofa/interfaces.py:71
+#: waeup/kofa/applicants/workflow.py:43 waeup/kofa/interfaces.py:72
 msgid "created"
 msgstr ""
@@ -1039,5 +1039,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:312
+#: waeup/kofa/browser/breadcrumbs.py:123 waeup/kofa/browser/pages.py:311
 msgid "Administration"
 msgstr ""
@@ -1048,11 +1048,11 @@
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:389
+#: waeup/kofa/browser/breadcrumbs.py:148 waeup/kofa/browser/pages.py:388
 #: waeup/kofa/browser/viewlets.py:375 waeup/kofa/browser/viewlets.py:685
 msgid "Portal Users"
 msgstr ""
 
-#: waeup/kofa/browser/breadcrumbs.py:155 waeup/kofa/browser/pages.py:756
-#: waeup/kofa/browser/pages.py:1148 waeup/kofa/browser/viewlets.py:393
+#: waeup/kofa/browser/breadcrumbs.py:155 waeup/kofa/browser/pages.py:752
+#: waeup/kofa/browser/pages.py:1144 waeup/kofa/browser/viewlets.py:393
 #: waeup/kofa/browser/viewlets.py:694
 msgid "Data Center"
@@ -1063,135 +1063,135 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1024
+#: waeup/kofa/browser/pages.py:1020
 msgid "Edit headers or replace imported file!"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:106
+#: waeup/kofa/browser/pages.py:105
 msgid "Local role successfully removed: ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1071
+#: waeup/kofa/browser/pages.py:1067
 msgid "View processing log"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1072
+#: waeup/kofa/browser/pages.py:1068
 msgid "Back to data center"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1116
+#: waeup/kofa/browser/pages.py:1112
 msgid "Processing of ${a} rows failed."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1118
+#: waeup/kofa/browser/pages.py:1114
 msgid "Successfully processed ${a} rows."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1126
+#: waeup/kofa/browser/pages.py:1122
 msgid "Show logfiles"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1128
+#: waeup/kofa/browser/pages.py:1124
 msgid "Back to Data Center"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1129
+#: waeup/kofa/browser/pages.py:1125
 msgid "Show"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1151
+#: waeup/kofa/browser/pages.py:1147
 msgid "Back"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1159
-msgid "Log files can only be searched on Unix-based operating systems."
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:116 waeup/kofa/hostels/browser.py:256
+#: waeup/kofa/browser/pages.py:115 waeup/kofa/hostels/browser.py:256
 #: waeup/kofa/hostels/browser.py:286 waeup/kofa/students/browser.py:240
 msgid "No item selected."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1187
+#: waeup/kofa/browser/pages.py:1155
+msgid "Log files can only be searched on Unix-based operating systems."
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1183
 msgid "Edit data center settings"
 msgstr ""
 
 #. Default: ""
+#: waeup/kofa/browser/pages.py:1203
+msgid "File already existed (not copied): ${a}"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:1206
+msgid "Given storage path cannot be used."
+msgstr ""
+
+#. Default: ""
 #: waeup/kofa/browser/pages.py:1207
-msgid "File already existed (not copied): ${a}"
+msgid "Error: ${a}"
 msgstr ""
 
 #: waeup/kofa/browser/pages.py:1210
-msgid "Given storage path cannot be used."
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/browser/pages.py:1211
-msgid "Error: ${a}"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:1214
 msgid "New storage path succefully set."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1223
+#: waeup/kofa/browser/pages.py:1219
 msgid "Download portal data as CSV file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1225
+#: waeup/kofa/browser/pages.py:1221
 msgid "Download"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1316
+#: waeup/kofa/browser/pages.py:1312
 msgid "Academic Section"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1328 waeup/kofa/browser/pages.py:1344
-#: waeup/kofa/browser/pages.py:1361 waeup/kofa/browser/pages.py:1365
+#: waeup/kofa/browser/pages.py:1324 waeup/kofa/browser/pages.py:1340
+#: waeup/kofa/browser/pages.py:1357 waeup/kofa/browser/pages.py:1361
 msgid "Add faculty"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1329 waeup/kofa/university/export.py:35
+#: waeup/kofa/browser/pages.py:1325 waeup/kofa/university/export.py:35
 msgid "Faculties"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1333 waeup/kofa/browser/viewlets.py:441
+#: waeup/kofa/browser/pages.py:1329 waeup/kofa/browser/viewlets.py:441
 msgid "Manage academic section"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1372
+#: waeup/kofa/browser/pages.py:1368
 msgid "The faculty code chosen already exists."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1393 waeup/kofa/browser/pages.py:1403
+#: waeup/kofa/browser/pages.py:1389 waeup/kofa/browser/pages.py:1399
 #: waeup/kofa/university/export.py:66
 msgid "Departments"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1405 waeup/kofa/browser/pages.py:1456
-#: waeup/kofa/browser/pages.py:1475 waeup/kofa/browser/pages.py:1479
+#: waeup/kofa/browser/pages.py:1401 waeup/kofa/browser/pages.py:1452
+#: waeup/kofa/browser/pages.py:1471 waeup/kofa/browser/pages.py:1475
 msgid "Add department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1413 waeup/kofa/browser/viewlets.py:457
+#: waeup/kofa/browser/pages.py:1409 waeup/kofa/browser/viewlets.py:457
 msgid "Manage faculty"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1486
+#: waeup/kofa/browser/pages.py:1482
 msgid "The code chosen already exists in this faculty."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1489
+#: waeup/kofa/browser/pages.py:1485
 msgid "Department ${a} added."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1506
+#: waeup/kofa/browser/pages.py:1502
 msgid "Courses and Certificates"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1536 waeup/kofa/browser/pages.py:1555
+#: waeup/kofa/browser/pages.py:1532 waeup/kofa/browser/pages.py:1551
 #: waeup/kofa/students/browser.py:100 waeup/kofa/students/export.py:40
 #: waeup/kofa/students/viewlets.py:495
@@ -1199,5 +1199,5 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:155 waeup/kofa/browser/viewlets.py:322
+#: waeup/kofa/browser/pages.py:154 waeup/kofa/browser/viewlets.py:322
 #: waeup/kofa/browser/templates/staffsitelayout.pt:27
 #: waeup/kofa/browser/templates/studentsitelayout.pt:32
@@ -1205,121 +1205,121 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1572 waeup/kofa/browser/pages.py:1630
+#: waeup/kofa/browser/pages.py:1568 waeup/kofa/browser/pages.py:1626
 msgid "Remove selected courses"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1572 waeup/kofa/browser/pages.py:1642
-#: waeup/kofa/browser/pages.py:1671 waeup/kofa/browser/pages.py:1675
+#: waeup/kofa/browser/pages.py:1568 waeup/kofa/browser/pages.py:1638
+#: waeup/kofa/browser/pages.py:1667 waeup/kofa/browser/pages.py:1671
 msgid "Add course"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1573 waeup/kofa/browser/pages.py:1636
+#: waeup/kofa/browser/pages.py:1569 waeup/kofa/browser/pages.py:1632
 msgid "Remove selected certificates"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1573 waeup/kofa/browser/pages.py:1647
-#: waeup/kofa/browser/pages.py:1708 waeup/kofa/browser/pages.py:1712
+#: waeup/kofa/browser/pages.py:1569 waeup/kofa/browser/pages.py:1643
+#: waeup/kofa/browser/pages.py:1704 waeup/kofa/browser/pages.py:1708
 msgid "Add certificate"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1582 waeup/kofa/browser/viewlets.py:464
+#: waeup/kofa/browser/pages.py:1578 waeup/kofa/browser/viewlets.py:464
 msgid "Manage department"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:163
+#: waeup/kofa/browser/pages.py:162
 msgid "You logged in."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1687
+#: waeup/kofa/browser/pages.py:1683
 msgid "A course with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1693
+#: waeup/kofa/browser/pages.py:1689
 msgid "Course ${a} successfully created."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1724
+#: waeup/kofa/browser/pages.py:1720
 msgid "A certificate with same code already exists: "
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:1730
+#: waeup/kofa/browser/pages.py:1726
 msgid "Certificate ${a} successfully created."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1762 waeup/kofa/browser/viewlets.py:481
+#: waeup/kofa/browser/pages.py:1758 waeup/kofa/browser/viewlets.py:481
 msgid "Edit course"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:181
+#: waeup/kofa/browser/pages.py:180
 msgid "You entered wrong credentials."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1812
+#: waeup/kofa/browser/pages.py:1808
 msgid "Edit certificate"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1819 waeup/kofa/browser/pages.py:1850
-#: waeup/kofa/browser/pages.py:1891 waeup/kofa/browser/pages.py:1893
+#: waeup/kofa/browser/pages.py:1815 waeup/kofa/browser/pages.py:1846
+#: waeup/kofa/browser/pages.py:1887 waeup/kofa/browser/pages.py:1889
 msgid "Add course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1820 waeup/kofa/browser/pages.py:1845
+#: waeup/kofa/browser/pages.py:1816 waeup/kofa/browser/pages.py:1841
 msgid "Remove selected course referrers"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1826 waeup/kofa/browser/viewlets.py:488
+#: waeup/kofa/browser/pages.py:1822 waeup/kofa/browser/viewlets.py:488
 msgid "Manage certificate"
 msgstr ""
 
+#: waeup/kofa/browser/pages.py:1894
+msgid "The chosen course referrer is already part of this certificate."
+msgstr ""
+
+#. Default: ""
 #: waeup/kofa/browser/pages.py:1898
-msgid "The chosen course referrer is already part of this certificate."
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/browser/pages.py:1902
 msgid "Course referrer ${a}_${b} added."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1939 waeup/kofa/browser/viewlets.py:505
+#: waeup/kofa/browser/pages.py:1935 waeup/kofa/browser/viewlets.py:505
 msgid "Edit course referrer"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:1942
+#: waeup/kofa/browser/pages.py:1938
 msgid "Save and return"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:195
+#: waeup/kofa/browser/pages.py:194
 msgid "You have been logged out. Thanks for using WAeUP Kofa!"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:231
+#: waeup/kofa/browser/pages.py:230
 msgid "Contact ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:237 waeup/kofa/browser/pages.py:526
+#: waeup/kofa/browser/pages.py:236 waeup/kofa/browser/pages.py:523
 msgid "Send message now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:256 waeup/kofa/browser/pages.py:275
-#: waeup/kofa/browser/pages.py:543 waeup/kofa/students/browser.py:330
+#: waeup/kofa/browser/pages.py:255 waeup/kofa/browser/pages.py:274
+#: waeup/kofa/browser/pages.py:540 waeup/kofa/students/browser.py:330
 msgid "Your message has been sent."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:266
+#: waeup/kofa/browser/pages.py:265
 msgid "Send now"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:277
+#: waeup/kofa/browser/pages.py:276
 msgid "A smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:302
+#: waeup/kofa/browser/pages.py:301
 msgid "<h1>Welcome to WAeUP.Kofa</h1>"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:390 waeup/kofa/hostels/browser.py:195
+#: waeup/kofa/browser/pages.py:389 waeup/kofa/hostels/browser.py:195
 #: waeup/kofa/students/viewlets.py:166 waeup/kofa/students/viewlets.py:174
 #: waeup/kofa/students/viewlets.py:247 waeup/kofa/students/viewlets.py:255
@@ -1328,14 +1328,14 @@
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:391 waeup/kofa/browser/viewlets.py:180
+#: waeup/kofa/browser/pages.py:390 waeup/kofa/browser/viewlets.py:180
 msgid "Remove"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:399
+#: waeup/kofa/browser/pages.py:398
 msgid "User account ${a} successfully deleted."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:433 waeup/kofa/browser/pages.py:435
+#: waeup/kofa/browser/pages.py:431 waeup/kofa/browser/pages.py:433
 #: waeup/kofa/browser/viewlets.py:515
 msgid "Add user"
@@ -1343,142 +1343,142 @@
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:457
+#: waeup/kofa/browser/pages.py:455
 msgid "User account ${a} successfully added."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:476
+#: waeup/kofa/browser/pages.py:473
 msgid "Edit user ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:507
+#: waeup/kofa/browser/pages.py:504
 msgid "User settings have been saved."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:524 waeup/kofa/students/browser.py:311
+#: waeup/kofa/browser/pages.py:521 waeup/kofa/students/browser.py:311
 msgid "Send message to ${a}"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:553 waeup/kofa/browser/viewlets.py:400
+#: waeup/kofa/browser/pages.py:550 waeup/kofa/browser/viewlets.py:400
 msgid "My Preferences"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:567 waeup/kofa/browser/viewlets.py:415
+#: waeup/kofa/browser/pages.py:563 waeup/kofa/browser/viewlets.py:415
 msgid "My Roles"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:598
+#: waeup/kofa/browser/pages.py:594
 msgid "Search Academic Section"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:625
+#: waeup/kofa/browser/pages.py:621
 msgid "View portal configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:638
+#: waeup/kofa/browser/pages.py:634
 msgid "Edit portal configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:639 waeup/kofa/browser/pages.py:688
+#: waeup/kofa/browser/pages.py:635 waeup/kofa/browser/pages.py:684
 msgid "Update plugins"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:641 waeup/kofa/browser/pages.py:669
+#: waeup/kofa/browser/pages.py:637 waeup/kofa/browser/pages.py:665
+#: waeup/kofa/browser/pages.py:696
+msgid "Add session configuration"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:662 waeup/kofa/browser/pages.py:735
+msgid "Settings have been saved."
+msgstr ""
+
+#. Default: ""
+#: waeup/kofa/browser/pages.py:676
+msgid "Session ${a} Configuration"
+msgstr ""
+
+#: waeup/kofa/browser/pages.py:687
+msgid "Plugins were updated. See log file for details."
+msgstr ""
+
 #: waeup/kofa/browser/pages.py:700
-msgid "Add session configuration"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:666 waeup/kofa/browser/pages.py:739
-msgid "Settings have been saved."
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/browser/pages.py:680
-msgid "Session ${a} Configuration"
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:691
-msgid "Plugins were updated. See log file for details."
-msgstr ""
-
-#: waeup/kofa/browser/pages.py:704
 msgid "Add Session Configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:711
+#: waeup/kofa/browser/pages.py:707
 msgid "The session chosen already exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pages.py:733
+#: waeup/kofa/browser/pages.py:729
 msgid "Edit academic session ${a} configuration"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:763
+#: waeup/kofa/browser/pages.py:759
 msgid "Upload file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:765
+#: waeup/kofa/browser/pages.py:761
 msgid "Upload"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:811 waeup/kofa/browser/pages.py:841
-#: waeup/kofa/browser/pages.py:961 waeup/kofa/browser/pages.py:1069
+#: waeup/kofa/browser/pages.py:807 waeup/kofa/browser/pages.py:837
+#: waeup/kofa/browser/pages.py:957 waeup/kofa/browser/pages.py:1065
 msgid "Process CSV file"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:825 waeup/kofa/browser/pages.py:926
-#: waeup/kofa/browser/pages.py:1045
+#: waeup/kofa/browser/pages.py:821 waeup/kofa/browser/pages.py:922
+#: waeup/kofa/browser/pages.py:1041
 msgid "Import aborted."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:844
+#: waeup/kofa/browser/pages.py:840
 msgid "Back to step 1"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:845
+#: waeup/kofa/browser/pages.py:841
 msgid "Proceed to step 3"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:86
+#: waeup/kofa/browser/pages.py:85
 msgid "No local role selected."
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:905
+#: waeup/kofa/browser/pages.py:901
 msgid "Double headers: each column name may only appear once. "
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:913
+#: waeup/kofa/browser/pages.py:909
 msgid "Replace imported file!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:938
+#: waeup/kofa/browser/pages.py:934
 msgid "Update mode only!"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:964 waeup/kofa/browser/pages.py:1190
+#: waeup/kofa/browser/pages.py:960 waeup/kofa/browser/pages.py:1186
 msgid "Reset"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:965
+#: waeup/kofa/browser/pages.py:961
 msgid "Set headerfields"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:966
+#: waeup/kofa/browser/pages.py:962
 msgid "Back to step 2"
 msgstr ""
 
-#: waeup/kofa/browser/pages.py:967
+#: waeup/kofa/browser/pages.py:963
 msgid "Perform import"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pdf.py:124
+#: waeup/kofa/browser/pdf.py:127
 msgid "${footer_text} Page ${num1} of ${num2}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/browser/pdf.py:332
+#: waeup/kofa/browser/pdf.py:336
 msgid "Date: ${a}"
 msgstr ""
@@ -1860,5 +1860,5 @@
 
 #: waeup/kofa/browser/viewlets.py:528 waeup/kofa/browser/viewlets.py:536
-msgid "Show batch logs"
+msgid "Show logs"
 msgstr ""
 
@@ -1984,9 +1984,9 @@
 msgstr ""
 
-#: waeup/kofa/hostels/hostel.py:180
+#: waeup/kofa/hostels/hostel.py:185
 msgid "unreserved"
 msgstr ""
 
-#: waeup/kofa/hostels/hostel.py:187
+#: waeup/kofa/hostels/hostel.py:192
 msgid "reserved"
 msgstr ""
@@ -2020,5 +2020,5 @@
 msgstr ""
 
-#: waeup/kofa/hostels/interfaces.py:175 waeup/kofa/students/interfaces.py:455
+#: waeup/kofa/hostels/interfaces.py:175 waeup/kofa/students/interfaces.py:465
 msgid "Bed Type"
 msgstr ""
@@ -2176,41 +2176,41 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:185
+#: waeup/kofa/interfaces.py:186
 msgid "Subject"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:189
+#: waeup/kofa/interfaces.py:190
 msgid "Grade"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:323
+#: waeup/kofa/interfaces.py:324
 msgid "Processor name"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:327
+#: waeup/kofa/interfaces.py:328
 msgid "Import Mode"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:352
+#: waeup/kofa/interfaces.py:353
 msgid "Email Address:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:359
+#: waeup/kofa/interfaces.py:360
 msgid "Email to:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:366
+#: waeup/kofa/interfaces.py:367
 msgid "Subject:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:370
+#: waeup/kofa/interfaces.py:371
 msgid "Full Name:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:374
+#: waeup/kofa/interfaces.py:375
 msgid "Text:"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:405
+#: waeup/kofa/interfaces.py:406
 #: waeup/kofa/browser/templates/departmentmanagepage.pt:97
 #: waeup/kofa/browser/templates/userscontainerpage.pt:4
@@ -2222,5 +2222,5 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:410
+#: waeup/kofa/interfaces.py:411
 #: waeup/kofa/students/browser_templates/containerpage.pt:33
 #: waeup/kofa/students/browser_templates/containermanagepage.pt:39
@@ -2229,129 +2229,129 @@
 msgstr ""
 
-#: waeup/kofa/interfaces.py:414
+#: waeup/kofa/interfaces.py:415
 msgid "Description/Notice"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:431
+#: waeup/kofa/interfaces.py:432
 msgid "Portal roles"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:476
+#: waeup/kofa/interfaces.py:477
 msgid "Name of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:477
+#: waeup/kofa/interfaces.py:478
 msgid "Sample University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:482
+#: waeup/kofa/interfaces.py:483
 msgid "Abbreviated Title of University"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:488
+#: waeup/kofa/interfaces.py:489
 msgid "Skin"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:495
+#: waeup/kofa/interfaces.py:496
 msgid "Content in reST format"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:507
+#: waeup/kofa/interfaces.py:508
 msgid "Accommodation Booking Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:515
+#: waeup/kofa/interfaces.py:516
 msgid "Allowed States for Accommodation Booking"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:523
+#: waeup/kofa/interfaces.py:524
 msgid "Name of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:529
+#: waeup/kofa/interfaces.py:530
 msgid "Email Address of Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:536
+#: waeup/kofa/interfaces.py:537
 msgid "Subject of Email to Administrator"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:537
+#: waeup/kofa/interfaces.py:538
 msgid "Kofa Contact"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:542
+#: waeup/kofa/interfaces.py:543
 msgid "SMTP mailer to use when sending mail"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:549
+#: waeup/kofa/interfaces.py:550
 msgid "Captcha used for public registration pages"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:556
+#: waeup/kofa/interfaces.py:557
 msgid "Carry-over Course Registration"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:565 waeup/kofa/interfaces.py:623
+#: waeup/kofa/interfaces.py:566 waeup/kofa/interfaces.py:624
 msgid "Academic Session"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:573 waeup/kofa/payments/interfaces.py:30
+#: waeup/kofa/interfaces.py:574 waeup/kofa/payments/interfaces.py:30
 msgid "School Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:578
+#: waeup/kofa/interfaces.py:579
 msgid "Surcharge Portal Provider"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:584
+#: waeup/kofa/interfaces.py:585
 msgid "Surcharge Payment Gateway Provider"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:590 waeup/kofa/payments/interfaces.py:120
+#: waeup/kofa/interfaces.py:591 waeup/kofa/payments/interfaces.py:120
 msgid "Surcharge 3"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:596
+#: waeup/kofa/interfaces.py:597
 msgid "Clearance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:602
+#: waeup/kofa/interfaces.py:603
 msgid "Booking Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:608 waeup/kofa/payments/interfaces.py:36
+#: waeup/kofa/interfaces.py:609 waeup/kofa/payments/interfaces.py:36
 msgid "Acceptance Fee"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:73
+#: waeup/kofa/interfaces.py:74
 msgid "clearance started"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:74
+#: waeup/kofa/interfaces.py:75
 msgid "clearance requested"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:75
+#: waeup/kofa/interfaces.py:76
 msgid "cleared"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:76
+#: waeup/kofa/interfaces.py:77
 msgid "school fee paid"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:77
+#: waeup/kofa/interfaces.py:78
 msgid "returning"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:78
+#: waeup/kofa/interfaces.py:79
 msgid "courses registered"
 msgstr ""
 
-#: waeup/kofa/interfaces.py:79
+#: waeup/kofa/interfaces.py:80
 msgid "courses validated"
 msgstr ""
 
-#: waeup/kofa/objecthistory.py:71
+#: waeup/kofa/objecthistory.py:72
 msgid "by"
 msgstr ""
@@ -2453,37 +2453,37 @@
 
 #. Default: ""
-#: waeup/kofa/students/batching.py:165
+#: waeup/kofa/students/batching.py:166
 msgid "State '${a}' set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1041
+#. Default: ""
+#: waeup/kofa/students/browser.py:1009
+msgid "${a}: Payments"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1054
 msgid "Add online payment"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1044
+#: waeup/kofa/students/browser.py:1057
 msgid "Create ticket"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1052 waeup/kofa/students/browser.py:1279
+#: waeup/kofa/students/browser.py:1065 waeup/kofa/students/browser.py:1292
 msgid "Your current session does not match accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1062
+#: waeup/kofa/students/browser.py:1075
 msgid "Study course data are incomplete."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1126
+#: waeup/kofa/students/browser.py:1139
 msgid "This ticket has already been paid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1139 waeup/kofa/students/browser.py:1147
-#: waeup/kofa/students/browser.py:1155
+#: waeup/kofa/students/browser.py:1152 waeup/kofa/students/browser.py:1160
+#: waeup/kofa/students/browser.py:1168
 msgid "Valid callback received. ${a}"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:1209
-msgid "${a}: Accommodation"
 msgstr ""
 
@@ -2493,22 +2493,15 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1221
+#. Default: ""
+#: waeup/kofa/students/browser.py:1222
+msgid "${a}: Accommodation"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1234
 msgid "You are not allowed to remove bed tickets."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1228
+#: waeup/kofa/students/browser.py:1241
 msgid "No bed ticket selected."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1259
-msgid "Add bed ticket"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1261
-msgid "Create bed ticket"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1269
-msgid "Your data are incomplete."
 msgstr ""
 
@@ -2518,62 +2511,70 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1273
+#: waeup/kofa/students/browser.py:1272
+msgid "Add bed ticket"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1274
+msgid "Create bed ticket"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1282
+msgid "Your data are incomplete."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1286
 msgid "You are in the wrong registration state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1284
+#: waeup/kofa/students/browser.py:1297
 msgid "You already booked a bed space in current accommodation session."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1295 waeup/kofa/students/browser.py:1592
-#: waeup/kofa/students/browser.py:1712
+#: waeup/kofa/students/browser.py:1308 waeup/kofa/students/browser.py:1602
+#: waeup/kofa/students/browser.py:1721
 msgid "Activation code is invalid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1315 waeup/kofa/students/browser.py:1443
+#: waeup/kofa/students/browser.py:1328 waeup/kofa/students/browser.py:1454
 msgid "There is no free bed in your category ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1320 waeup/kofa/students/browser.py:1597
-#: waeup/kofa/students/browser.py:1717
+#: waeup/kofa/students/browser.py:1333 waeup/kofa/students/browser.py:1607
+#: waeup/kofa/students/browser.py:1726
 msgid "Activation code has already been used."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1323 waeup/kofa/students/browser.py:1600
-#: waeup/kofa/students/browser.py:1720 waeup/kofa/students/browser.py:1988
+#: waeup/kofa/students/browser.py:1336 waeup/kofa/students/browser.py:1610
+#: waeup/kofa/students/browser.py:1729 waeup/kofa/students/browser.py:1997
 msgid "invalidated"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1328 waeup/kofa/students/browser.py:1604
-#: waeup/kofa/students/browser.py:1725
+#: waeup/kofa/students/browser.py:1341 waeup/kofa/students/browser.py:1614
+#: waeup/kofa/students/browser.py:1734
 msgid "You are not the owner of this access code."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1339 waeup/kofa/students/browser.py:1457
+#: waeup/kofa/students/browser.py:1352 waeup/kofa/students/browser.py:1468
 msgid "${a}, Block ${b}, Room ${c}, Bed ${d} (${e})"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1348
+#: waeup/kofa/students/browser.py:1361
 msgid "Bed ticket created and bed booked: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1366
+#: waeup/kofa/students/browser.py:1377
 msgid "Bed Ticket for Session ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1382
+#: waeup/kofa/students/browser.py:1393
 msgid "Bed Allocation Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1388
+#: waeup/kofa/students/browser.py:1399
 msgid "Bed Allocation: "
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1415
-msgid "Students in reserved beds can't be relocated."
 msgstr ""
 
@@ -2582,19 +2583,23 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1421
+#: waeup/kofa/students/browser.py:1426
+msgid "Students in reserved beds can't be relocated."
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1432
 msgid "Student can't be relocated."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1464
+#: waeup/kofa/students/browser.py:1475
 msgid "Student relocated: ${a}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1483
+#: waeup/kofa/students/browser.py:1494
 msgid "${a}: History"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1496
+#: waeup/kofa/students/browser.py:1506
 msgid "Edit base data"
 msgstr ""
@@ -2605,79 +2610,71 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1511 waeup/kofa/students/viewlets.py:388
+#: waeup/kofa/students/browser.py:1521 waeup/kofa/students/viewlets.py:388
 msgid "Change password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1525
+#: waeup/kofa/students/browser.py:1535
 msgid "Password changed."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1537
+#: waeup/kofa/students/browser.py:1547
 msgid "Upload portrait"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1552 waeup/kofa/students/viewlets.py:412
+#: waeup/kofa/students/browser.py:1562 waeup/kofa/students/viewlets.py:412
 #: waeup/kofa/students/workflow.py:44
 msgid "Start clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1556
+#: waeup/kofa/students/browser.py:1566
 msgid "Start clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1573 waeup/kofa/students/browser.py:1701
+#: waeup/kofa/students/browser.py:1583 waeup/kofa/students/browser.py:1710
 msgid "Wrong state"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1577
+#: waeup/kofa/students/browser.py:1587
 msgid "No portrait uploaded."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1581
+#: waeup/kofa/students/browser.py:1591
 msgid "Not all required fields filled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1608
+#: waeup/kofa/students/browser.py:1618
 msgid "Clearance process has been started."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1618
+#: waeup/kofa/students/browser.py:1628
 msgid "Edit clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1639 waeup/kofa/students/browser.py:1653
+#: waeup/kofa/students/browser.py:1648 waeup/kofa/students/browser.py:1662
 msgid "Clearance form has been saved."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1647
+#: waeup/kofa/students/browser.py:1656
 msgid "Save and request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1662 waeup/kofa/students/workflow.py:58
+#: waeup/kofa/students/browser.py:1671 waeup/kofa/students/workflow.py:58
 msgid "Request clearance"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1663
+#: waeup/kofa/students/browser.py:1672
 msgid "Enter the CLR access code used for starting clearance."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1666
+#: waeup/kofa/students/browser.py:1675
 msgid "Request clearance now"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1675
+#: waeup/kofa/students/browser.py:1684
 msgid "This isn't your CLR access code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1684
+#: waeup/kofa/students/browser.py:1693
 msgid "Clearance has been requested."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1693 waeup/kofa/students/viewlets.py:441
-msgid "Start course registration"
-msgstr ""
-
-#: waeup/kofa/students/browser.py:1697
-msgid "Start course registration now"
 msgstr ""
 
@@ -2686,27 +2683,35 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1733
+#: waeup/kofa/students/browser.py:1702 waeup/kofa/students/viewlets.py:441
+msgid "Start course registration"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1706
+msgid "Start course registration now"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:1742
 msgid "Course registration has been started."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1752
+#: waeup/kofa/students/browser.py:1761
 msgid "Add current level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1761
+#: waeup/kofa/students/browser.py:1770
 msgid "Create course list now"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1800
+#: waeup/kofa/students/browser.py:1809
 msgid "Add and remove course tickets of study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1837
+#: waeup/kofa/students/browser.py:1846
 msgid "Register course list"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1841
+#: waeup/kofa/students/browser.py:1850
 msgid "Course list has been registered."
 msgstr ""
@@ -2716,60 +2721,60 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1887
+#: waeup/kofa/students/browser.py:1896
 msgid "Send me a new password"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1897
+#: waeup/kofa/students/browser.py:1906
 msgid "Get new login credentials"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1914
+#: waeup/kofa/students/browser.py:1923
 msgid "Application package not installed."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1920
+#: waeup/kofa/students/browser.py:1929
 msgid "No record found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1928
+#: waeup/kofa/students/browser.py:1937
 msgid "You have successfully changed your password for the"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1933
+#: waeup/kofa/students/browser.py:1942
 msgid "An email with your user name and password has been sent to ${a}."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1944
+#: waeup/kofa/students/browser.py:1953
 msgid "Set password for first-time login"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1947
+#: waeup/kofa/students/browser.py:1956
 msgid "Set"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1962
+#: waeup/kofa/students/browser.py:1971
 msgid "More than one student found."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1970
+#: waeup/kofa/students/browser.py:1979
 msgid "Access code is invalid."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1973
+#: waeup/kofa/students/browser.py:1982
 msgid "Password has already been set. Your Student Id is ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1979
+#: waeup/kofa/students/browser.py:1988
 msgid "Password has already been set. You are using the wrong Access Code."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:1985
+#: waeup/kofa/students/browser.py:1994
 msgid "Access code has already been used."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:1994
+#: waeup/kofa/students/browser.py:2003
 msgid "Password has been set. Your Student Id is ${a}"
 msgstr ""
@@ -2779,5 +2784,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:238 waeup/kofa/students/browser.py:1959
+#: waeup/kofa/students/browser.py:238 waeup/kofa/students/browser.py:1968
 msgid "No student found."
 msgstr ""
@@ -2796,18 +2801,18 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:332 waeup/kofa/students/browser.py:1936
+#: waeup/kofa/students/browser.py:332 waeup/kofa/students/browser.py:1945
 msgid "An smtp server error occurred."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:344
+#: waeup/kofa/students/browser.py:343
 msgid "Manage base data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:425
+#: waeup/kofa/students/browser.py:423
 msgid "${a}: Clearance Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:449 waeup/kofa/students/viewlets.py:107
+#: waeup/kofa/students/browser.py:446 waeup/kofa/students/viewlets.py:107
 #: waeup/kofa/students/viewlets.py:555
 #: waeup/kofa/students/browser_templates/clearanceeditpage.pt:6
@@ -2815,88 +2820,88 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:455
+#: waeup/kofa/students/browser.py:452
 msgid "Clearance Slip of "
 msgstr ""
 
-#: waeup/kofa/students/browser.py:474
+#: waeup/kofa/students/browser.py:471
 msgid "Manage clearance data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:516
+#: waeup/kofa/students/browser.py:512
 msgid "Student has been cleared."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:518 waeup/kofa/students/browser.py:542
+#: waeup/kofa/students/browser.py:514 waeup/kofa/students/browser.py:538
 msgid "Student is in wrong state."
 msgstr ""
 
+#: waeup/kofa/students/browser.py:531
+msgid "Clearance has been annulled."
+msgstr ""
+
 #: waeup/kofa/students/browser.py:535
-msgid "Clearance has been annulled."
-msgstr ""
-
-#: waeup/kofa/students/browser.py:539
 msgid "Clearance request has been rejected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:565
+#: waeup/kofa/students/browser.py:561
 msgid "${a}: Personal Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:575
+#: waeup/kofa/students/browser.py:571
 msgid "Edit personal data"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:595
+#: waeup/kofa/students/browser.py:591
 msgid "${a}: Study Course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:625
+#: waeup/kofa/students/browser.py:621
 msgid "Manage study course"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:628 waeup/kofa/students/browser.py:675
+#: waeup/kofa/students/browser.py:624 waeup/kofa/students/browser.py:671
 msgid "Remove selected levels"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:629 waeup/kofa/students/browser.py:661
+#: waeup/kofa/students/browser.py:625 waeup/kofa/students/browser.py:657
 msgid "Add study level"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:649
+#: waeup/kofa/students/browser.py:645
 msgid "Current level not available for certificate."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:669
+#: waeup/kofa/students/browser.py:665
 msgid "Study level has been added."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:671 waeup/kofa/students/browser.py:1770
+#: waeup/kofa/students/browser.py:667 waeup/kofa/students/browser.py:1779
 msgid "This level exists."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:681
+#: waeup/kofa/students/browser.py:677
 msgid "No study level selected."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:717
+#: waeup/kofa/students/browser.py:728
 msgid "${a}: Study Level ${b}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:740
+#: waeup/kofa/students/browser.py:751
 msgid "Level Data"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:746
+#: waeup/kofa/students/browser.py:757
 msgid "Course List"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:755
-msgid "Course Registration Slip  "
-msgstr ""
-
-#: waeup/kofa/students/browser.py:761
+#: waeup/kofa/students/browser.py:766
+msgid "Course Registration Slip"
+msgstr ""
+
+#: waeup/kofa/students/browser.py:772
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:35
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:12
@@ -2905,5 +2910,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:764
+#: waeup/kofa/students/browser.py:775
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:38
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:36
@@ -2911,10 +2916,10 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:765
+#: waeup/kofa/students/browser.py:776
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:16
 msgid "Faculty"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:766
+#: waeup/kofa/students/browser.py:777
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:40
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:38
@@ -2922,5 +2927,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:767
+#: waeup/kofa/students/browser.py:778
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:41
 #: waeup/kofa/students/browser_templates/studylevelpage.pt:39
@@ -2928,5 +2933,5 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:768 waeup/kofa/students/interfaces.py:399
+#: waeup/kofa/students/browser.py:779 waeup/kofa/students/interfaces.py:409
 #: waeup/kofa/students/browser_templates/studylevelmanagepage.pt:42
 #: waeup/kofa/students/browser_templates/studyleveleditpage.pt:18
@@ -2935,61 +2940,56 @@
 msgstr ""
 
-#: waeup/kofa/students/browser.py:796 waeup/kofa/students/browser.py:825
-#: waeup/kofa/students/browser.py:910 waeup/kofa/students/browser.py:915
-#: waeup/kofa/students/browser.py:1810 waeup/kofa/students/browser.py:1860
+#: waeup/kofa/students/browser.py:808 waeup/kofa/students/browser.py:837
+#: waeup/kofa/students/browser.py:922 waeup/kofa/students/browser.py:927
+#: waeup/kofa/students/browser.py:1819 waeup/kofa/students/browser.py:1869
 msgid "Add course ticket"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:817
+#: waeup/kofa/students/browser.py:829
 msgid "Manage study level ${a}"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:835 waeup/kofa/students/browser.py:1820
+#: waeup/kofa/students/browser.py:847 waeup/kofa/students/browser.py:1829
 msgid "No ticket selected."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:859 waeup/kofa/students/browser.py:881
+#: waeup/kofa/students/browser.py:871 waeup/kofa/students/browser.py:893
 msgid "This level does not correspond current level."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:863
+#: waeup/kofa/students/browser.py:875
 msgid "Course list has been validated."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:865 waeup/kofa/students/browser.py:893
+#: waeup/kofa/students/browser.py:877 waeup/kofa/students/browser.py:905
 msgid "Student is in the wrong state."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:886
+#: waeup/kofa/students/browser.py:898
 msgid "Course list request has been annulled."
 msgstr ""
 
-#: waeup/kofa/students/browser.py:890
+#: waeup/kofa/students/browser.py:902
 msgid "Course list request has been rejected:"
 msgstr ""
 
-#: waeup/kofa/students/browser.py:930 waeup/kofa/students/browser.py:1873
+#: waeup/kofa/students/browser.py:943 waeup/kofa/students/browser.py:1882
 msgid "The ticket exists."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:932 waeup/kofa/students/browser.py:1875
+#: waeup/kofa/students/browser.py:945 waeup/kofa/students/browser.py:1884
 msgid "Successfully added ${a}."
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:953
+#: waeup/kofa/students/browser.py:966
 msgid "${a}: Course Ticket ${b}"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/browser.py:969
+#: waeup/kofa/students/browser.py:982
 msgid "Manage course ticket ${a}"
-msgstr ""
-
-#. Default: ""
-#: waeup/kofa/students/browser.py:996
-msgid "${a}: Payments"
 msgstr ""
 
@@ -3236,68 +3236,68 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:190 waeup/kofa/students/interfaces.py:278
+#: waeup/kofa/students/interfaces.py:191 waeup/kofa/students/interfaces.py:280
 msgid "Matriculation Number"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:197
+#: waeup/kofa/students/interfaces.py:198
 msgid "PWD Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:203
+#: waeup/kofa/students/interfaces.py:204
 msgid "Email"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:223
+#: waeup/kofa/students/interfaces.py:225
 msgid "Clearance form locked"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:228
+#: waeup/kofa/students/interfaces.py:230
 msgid "CLR Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:235
+#: waeup/kofa/students/interfaces.py:237
 msgid "Nationality"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:244
+#: waeup/kofa/students/interfaces.py:246
 msgid "Employer"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:254
+#: waeup/kofa/students/interfaces.py:256
 msgid "Permanent Address"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:287
+#: waeup/kofa/students/interfaces.py:289
 #: waeup/kofa/browser/templates/showstudentspage.pt:7
 msgid "Certificate"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:293
+#: waeup/kofa/students/interfaces.py:295
 msgid "Entry Mode"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:300
+#: waeup/kofa/students/interfaces.py:302
 msgid "Entry Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:308 waeup/kofa/students/interfaces.py:347
+#: waeup/kofa/students/interfaces.py:310 waeup/kofa/students/interfaces.py:349
 #: waeup/kofa/browser/templates/showstudentspage.pt:8
 msgid "Current Session"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:315 waeup/kofa/students/interfaces.py:353
+#: waeup/kofa/students/interfaces.py:317 waeup/kofa/students/interfaces.py:355
 #: waeup/kofa/browser/templates/showstudentspage.pt:9
 msgid "Current Level"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:322 waeup/kofa/students/interfaces.py:341
+#: waeup/kofa/students/interfaces.py:324 waeup/kofa/students/interfaces.py:343
 msgid "Current Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:329
+#: waeup/kofa/students/interfaces.py:331
 msgid "Previous Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:367 waeup/kofa/students/interfaces.py:461
+#: waeup/kofa/students/interfaces.py:369 waeup/kofa/students/interfaces.py:471
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:8
 #: waeup/kofa/students/browser_templates/paymentsmanagepage.pt:13
@@ -3305,9 +3305,9 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:373
+#: waeup/kofa/students/interfaces.py:375
 msgid "Verdict"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:392
+#: waeup/kofa/students/interfaces.py:402
 #: waeup/kofa/browser/templates/certificatepage.pt:30
 #: waeup/kofa/browser/templates/certificatemanagepage.pt:33
@@ -3315,13 +3315,13 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:406
+#: waeup/kofa/students/interfaces.py:416
 msgid "Automatical Creation"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:413
+#: waeup/kofa/students/interfaces.py:423
 msgid "Carry-over Course"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:432
+#: waeup/kofa/students/interfaces.py:442
 #: waeup/kofa/university/interfaces.py:299
 #: waeup/kofa/browser/templates/certificatepage.pt:29
@@ -3330,32 +3330,32 @@
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:449
+#: waeup/kofa/students/interfaces.py:459
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:10
 msgid "Bed Coordinates"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:468
+#: waeup/kofa/students/interfaces.py:478
 #: waeup/kofa/students/browser_templates/accommodationmanagepage.pt:9
 msgid "Booking Date"
 msgstr ""
 
-#: waeup/kofa/students/interfaces.py:474
+#: waeup/kofa/students/interfaces.py:484
 msgid "Booking Activation Code"
 msgstr ""
 
-#: waeup/kofa/students/utils.py:173
+#: waeup/kofa/students/utils.py:182
 msgid "Scanned Documents"
 msgstr ""
 
-#: waeup/kofa/students/utils.py:181
+#: waeup/kofa/students/utils.py:190
 msgid "(not provided)"
 msgstr ""
 
 #. Default: ""
-#: waeup/kofa/students/utils.py:208
+#: waeup/kofa/students/utils.py:218
 msgid "<font size=10>${a} Page ${b} of ${c}</font>"
 msgstr ""
 
-#: waeup/kofa/students/utils.py:323 waeup/kofa/students/viewlets.py:74
+#: waeup/kofa/students/utils.py:333 waeup/kofa/students/viewlets.py:74
 #: waeup/kofa/students/viewlets.py:102
 #: waeup/kofa/students/browser_templates/basemanagepage.pt:7
@@ -3363,5 +3363,5 @@
 msgstr ""
 
-#: waeup/kofa/students/utils.py:355
+#: waeup/kofa/students/utils.py:368
 msgid "(not yet)"
 msgstr ""
@@ -3483,30 +3483,30 @@
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:686
+#: waeup/kofa/students/viewlets.py:687
 msgid "No local file selected."
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:700
+#: waeup/kofa/students/viewlets.py:701
 #: waeup/kofa/students/browser_templates/basemanagepage.pt:9
 msgid "Passport Picture"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:711
+#: waeup/kofa/students/viewlets.py:712
 msgid "Passport Picture (jpg only)"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:726 waeup/kofa/students/viewlets.py:737
+#: waeup/kofa/students/viewlets.py:727 waeup/kofa/students/viewlets.py:738
 msgid "Birth Certificate"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:727 waeup/kofa/students/viewlets.py:738
+#: waeup/kofa/students/viewlets.py:728 waeup/kofa/students/viewlets.py:739
 msgid "Birth Certificate Scan"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:747 waeup/kofa/students/viewlets.py:758
+#: waeup/kofa/students/viewlets.py:748 waeup/kofa/students/viewlets.py:759
 msgid "Acceptance Letter"
 msgstr ""
 
-#: waeup/kofa/students/viewlets.py:748 waeup/kofa/students/viewlets.py:759
+#: waeup/kofa/students/viewlets.py:749 waeup/kofa/students/viewlets.py:760
 msgid "Acceptance Letter Scan"
 msgstr ""
@@ -4098,5 +4098,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/countries.py:169 waeup/kofa/utils/utils.py:47
+#: waeup/kofa/utils/countries.py:169 waeup/kofa/utils/utils.py:48
 msgid "Nigeria"
 msgstr ""
@@ -4750,5 +4750,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/countries.py:90 waeup/kofa/utils/utils.py:46
+#: waeup/kofa/utils/countries.py:90 waeup/kofa/utils/utils.py:47
 msgid "Germany"
 msgstr ""
@@ -4790,5 +4790,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:150
+#: waeup/kofa/utils/utils.py:151
 msgid ""
 "Fullname: ${a}\n"
@@ -4800,5 +4800,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:195
+#: waeup/kofa/utils/utils.py:201
 msgid ""
 "Dear ${a},\n"
@@ -4820,5 +4820,5 @@
 msgstr ""
 
-#: waeup/kofa/utils/utils.py:48
+#: waeup/kofa/utils/utils.py:49
 msgid "U.S."
 msgstr ""
@@ -4832,5 +4832,5 @@
 msgstr ""
 
-#: waeup/kofa/widgets/phonewidget.py:131
+#: waeup/kofa/widgets/phonewidget.py:130
 msgid "Phone numbers may contain numbers only."
 msgstr ""
