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