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 8141)
+++ 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 ""
