[Mpuls-commits] r478 - in wasko/trunk: . waskaweb/i18n waskaweb/i18n/de/LC_MESSAGES waskaweb/templates/documents

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Mon Apr 6 10:01:30 CEST 2009


Author: torsten
Date: 2009-04-06 10:01:23 +0200 (Mon, 06 Apr 2009)
New Revision: 478

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
   wasko/trunk/waskaweb/i18n/waskaweb.pot
   wasko/trunk/waskaweb/templates/documents/upload_body.mako
Log:
Set version string to 1.0.0-rc2


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-04-06 07:26:01 UTC (rev 477)
+++ wasko/trunk/ChangeLog.txt	2009-04-06 08:01:23 UTC (rev 478)
@@ -1,5 +1,12 @@
-2009-04-05	Torsten Irlaender  <torsten.irlaender at intevation.de> 
+2009-04-06	Torsten Irlaender  <torsten.irlaender at intevation.de> 
 
+	Set version string to 1.0.0-rc2
+
+	* waskaweb/i18n/waskaweb.pot
+	  waskaweb/i18n/de/LC_MESSAGES/waskaweb.po: Changed version string.
+	* waskaweb/templates/documents/upload_body.mako: Added magic enconding
+	  comment
+
 	Fix for issue127
 
 	* waskaweb/templates/caselifetime/overview.mako: Added links next to

Modified: wasko/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- wasko/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2009-04-06 07:26:01 UTC (rev 477)
+++ wasko/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2009-04-06 08:01:23 UTC (rev 478)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: waskaweb 0.0.0\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2008-09-24 14:51+0200\n"
+"POT-Creation-Date: 2009-04-06 09:50+0200\n"
 "PO-Revision-Date: 2007-10-14 20:33+0200\n"
 "Last-Translator: Torsten Irländer<torsten.irlaender at intevation.de>\n"
 "Language-Team: de <LL at li.org>\n"
@@ -188,236 +188,134 @@
 "Ihre Standard-Vertretung wurde gespeichert. Bitte klicken Sie auf OK, um "
 "fortzufahren."
 
-#: waskaweb/lib/evaluation.py:178
+#: waskaweb/lib/evaluation.py:183
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:37
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:15
 msgid "cm_eval_summary_header_1"
 msgstr "1.1. Verhältnis Beratungskunden/Aufnahmen in das Case-Management (CM)"
 
-#: waskaweb/lib/evaluation.py:234
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:44
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:73
+#: waskaweb/lib/evaluation.py:239
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:43
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:13
 msgid "cm_eval_summary_header_4"
 msgstr "2.1. Alters- und Geschlechterstruktur in %"
 
-#: waskaweb/lib/evaluation.py:285
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:45
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:140
+#: waskaweb/lib/evaluation.py:290
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:44
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:80
 msgid "cm_eval_summary_header_5"
 msgstr "2.2. Migrationshintergrund"
 
-#: waskaweb/lib/evaluation.py:335
+#: waskaweb/lib/evaluation.py:340
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:45
 msgid "cm_eval_header_access_youngster_to_agency"
 msgstr "1.2.1. Zugang des Jugendlichen zur Einrichtung"
 
-#: waskaweb/lib/evaluation.py:380
+#: waskaweb/lib/evaluation.py:385
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:75
 msgid "cm_eval_head_law_access_agency"
 msgstr "1.2.2. Angaben zum Rechtskreis beim Zugang zur Einrichtung"
 
-#: waskaweb/lib/evaluation.py:431
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:16
+#: waskaweb/lib/evaluation.py:436
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:76
 msgid "cm_eval_head_where_to_place_youngster"
 msgstr "3.2.1. Wohin wurden die Jugendlichen vermittlelt?"
 
-#: waskaweb/lib/evaluation.py:477
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:46
+#: waskaweb/lib/evaluation.py:482
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:106
 msgid "cm_eval_header_law_changed_after_place"
 msgstr "3.2.2. Angaben zum Rechtskreis nach der Vermittlung"
 
-#: waskaweb/lib/evaluation.py:552
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:108
+#: waskaweb/lib/evaluation.py:557
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:48
 msgid "cm_eval_header_on_age"
 msgstr "2.1.2. Angaben zur Altersverteilung"
 
-#: waskaweb/lib/evaluation.py:617
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:46
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:170
+#: waskaweb/lib/evaluation.py:622
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:45
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:110
 msgid "cm_eval_summary_header_6"
 msgstr "2.3. Förderbedarf"
 
-#: waskaweb/lib/evaluation.py:686
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:14
+#: waskaweb/lib/evaluation.py:691
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:16
 msgid "cm_eval_length_cm"
 msgstr "3.1.1. Verweildauer im CM"
 
-#: waskaweb/lib/evaluation.py:734
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:44
+#: waskaweb/lib/evaluation.py:739
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:46
 msgid "cm_eval_avg_length_cm"
 msgstr "3.1.2. Durchschnittliche Verweildauer in Wochen"
 
-#: waskaweb/lib/evaluation.py:784
+#: waskaweb/lib/evaluation.py:789
 msgid "cm_eval_header_graduation"
 msgstr "1.3. Höchster erreichte Schulanbschluss"
 
-#: waskaweb/lib/evaluation.py:834
+#: waskaweb/lib/evaluation.py:839
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:105
 msgid "cm_eval_header_work"
 msgstr "1.2.3. Status des Jugendlichen beim Zugang zur Einrichtung"
 
-#: waskaweb/lib/evaluation.py:843 waskaweb/lib/evaluation.py:989
+#: waskaweb/lib/evaluation.py:848 waskaweb/lib/evaluation.py:1014
 msgid "cm_eval_header_effort"
 msgstr "Aufschlüsselung der einzelnen Tätigkeiten"
 
-#: waskaweb/lib/evaluation.py:949
+#: waskaweb/lib/evaluation.py:974
 msgid "cm_eval_header_effort2"
 msgstr "Aufschlüsselung der einzelnen Tätigkeiten"
 
-#: waskaweb/lib/evaluation.py:966
+#: waskaweb/lib/evaluation.py:991
 msgid "cm_eval_header_avg_effort"
 msgstr "Durchschnittliche Dauer der Tätigkeiten"
 
-#: waskaweb/lib/evaluation.py:982
+#: waskaweb/lib/evaluation.py:1007
 msgid "cm_eval_header_avg_effort2"
 msgstr "Durchschnittliche Dauer der Tätigkeiten"
 
-#: waskaweb/lib/evaluation.py:1061
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:47
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:202
+#: waskaweb/lib/evaluation.py:1086
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:46
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:142
 msgid "cm_eval_summary_header_19"
 msgstr "2.4. Gemeldete Arbeitslose"
 
-#: waskaweb/lib/evaluation.py:1107
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:48
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:238
+#: waskaweb/lib/evaluation.py:1132
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:47
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:178
 msgid "cm_eval_summary_header_20"
 msgstr "2.5. Angaben zu Nicht-Erwerbspersonen"
 
-#: waskaweb/lib/evaluation.py:1181
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:49
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:262
+#: waskaweb/lib/evaluation.py:1214
 msgid "cm_eval_summary_header_21"
 msgstr "2.6. ESF-Stammblatt"
 
-#: waskaweb/lib/evaluation.py:1239
+#: waskaweb/lib/evaluation.py:1272
 msgid "cm_eval_summary_header_23"
-msgstr ""
+msgstr "Anzahl Jugendlicher ohne Abschluss"
 
-#: waskaweb/lib/renderer.py:251
-msgid "cm_rg_aid_overview_table_institution"
-msgstr "Institution"
+#: waskaweb/lib/evaluation_new.py:276
+#, python-format
+msgid "Eval No: %s"
+msgstr "Auswertung Nr. %s"
 
-#: waskaweb/lib/renderer.py:252
-msgid "cm_rg_aid_overview_table_offer_type"
-msgstr "Form"
+#: waskaweb/lib/evaluation_new.py:279
+msgid "No description available"
+msgstr "Keine Beschreibung verfügbar"
 
-#: waskaweb/lib/renderer.py:253
-msgid "cm_rg_aid_overview_table_actions"
-msgstr "Aktionen"
-
-#: waskaweb/lib/renderer.py:255
-msgid "cm_rg_aid_overview_table_edit"
-msgstr "Bearbeiten"
-
-#: waskaweb/lib/renderer.py:256
-msgid "cm_rg_aid_overview_table_goal"
-msgstr "Zielsetzung"
-
-#: waskaweb/lib/renderer.py:257 waskaweb/lib/renderer.py:258
-#: waskaweb/templates/administration/overview_user.mako:43
-#: waskaweb/templates/administration/overview_user.mako:60
-#: waskaweb/templates/administration/overview_usergroups.mako:34
-#: waskaweb/templates/administration/overview_usergroups.mako:43
-#: waskaweb/templates/appointments/appointmentlist.mako:3
-#: waskaweb/templates/casemanagement/appointmentlist.mako:3
-#: waskaweb/templates/casemanagement/caselist.mako:75
-#: waskaweb/templates/casemanagement/caselist.mako:134
-#: waskaweb/templates/casemanagement/reminderlist.mako:4
-#: waskaweb/templates/documents/case_overview.mako:42
-#: waskaweb/templates/documents/case_overview.mako:53
-#: waskaweb/templates/documents/global_overview.mako:39
-#: waskaweb/templates/documents/global_overview.mako:40
-#: waskaweb/templates/documents/global_overview.mako:51
-#: waskaweb/templates/documents/global_overview.mako:52
-#: waskaweb/templates/start/appointmentlist.mako:6
-#: waskaweb/templates/start/appointmentlist.mako:9
-#: waskaweb/templates/start/appointmentlist.mako:13
-#: waskaweb/templates/start/globalappointmentlist.mako:4
-#: waskaweb/templates/start/remindlist.mako:4
-msgid "cm_overview_a_show"
-msgstr "Anzeigen"
-
-#: waskaweb/lib/renderer.py:259 waskaweb/lib/renderer.py:260
-#: waskaweb/templates/administration/overview_user.mako:45
-#: waskaweb/templates/administration/overview_user.mako:62
-#: waskaweb/templates/administration/overview_usergroups.mako:35
-#: waskaweb/templates/administration/overview_usergroups.mako:44
-#: waskaweb/templates/appointments/appointmentlist.mako:5
-#: waskaweb/templates/casemanagement/agencylist.mako:32
-#: waskaweb/templates/casemanagement/agencylist.mako:42
-#: waskaweb/templates/casemanagement/appointmentlist.mako:5
-#: waskaweb/templates/casemanagement/caselist.mako:79
-#: waskaweb/templates/casemanagement/caselist.mako:89
-#: waskaweb/templates/casemanagement/caselist.mako:138
-#: waskaweb/templates/casemanagement/caselist.mako:148
-#: waskaweb/templates/casemanagement/reminderlist.mako:7
-#: waskaweb/templates/documents/case_overview.mako:44
-#: waskaweb/templates/documents/case_overview.mako:55
-#: waskaweb/templates/documents/global_overview.mako:42
-#: waskaweb/templates/documents/global_overview.mako:54
-msgid "cm_overview_a_delete"
-msgstr "Löschen"
-
-#: waskaweb/lib/renderer.py:261
-msgid "cm_rg_aid_overview_table_no_offer_found"
-msgstr "Keine Angebote gefunden"
-
-#: waskaweb/lib/renderer.py:262
-msgid "cm_rg_aid_overview_legend_legend"
-msgstr "Legende:"
-
-#: waskaweb/lib/renderer.py:263
-msgid "cm_rg_aid_overview_legend_bb"
-msgstr "(BB)"
-
-#: waskaweb/lib/renderer.py:264
-msgid "cm_rg_aid_overview_legend_common_educational_area"
-msgstr "Allgemein bildenden Bereich"
-
-#: waskaweb/lib/renderer.py:265
-msgid "cm_rg_aid_overview_legend_bv"
-msgstr "(BV)"
-
-#: waskaweb/lib/renderer.py:266
-msgid "cm_rg_aid_overview_legend_vocational_preparation"
-msgstr "Bereich der Berufsvorbereitung"
-
-#: waskaweb/lib/renderer.py:267
-msgid "cm_rg_aid_overview_legend_bq"
-msgstr "(BQ)"
-
-#: waskaweb/lib/renderer.py:268
-msgid "cm_rg_aid_overview_legend_qualifications"
-msgstr "Berufliche Qualifizierung"
-
-#: waskaweb/lib/renderer.py:269
-msgid "cm_rg_aid_overview_legend_lb"
-msgstr "(LB)"
-
-#: waskaweb/lib/renderer.py:270
-msgid "cm_rg_aid_overview_legend_life_skills"
-msgstr "Lebensbewältigung"
-
-#: waskaweb/lib/renderer.py:271
-msgid "cm_rg_aid_overview_legend_new_offer"
-msgstr "Neues Angebot hinzufügen"
-
-#: waskaweb/model/case.py:1117 waskaweb/model/case.py:1118
+#: waskaweb/model/case.py:1143 waskaweb/model/case.py:1144
 #: waskaweb/templates/casemanagement/caselist.mako:64
 #: waskaweb/templates/casemanagement/caselist.mako:123
 msgid "case_state_label_open"
 msgstr "Bearbeitbar"
 
-#: waskaweb/model/case.py:1119
+#: waskaweb/model/case.py:1145
 msgid "case_state_label_outstanding_delete"
 msgstr "Schwebend gelöscht"
 
-#: waskaweb/model/case.py:1120
+#: waskaweb/model/case.py:1146
 msgid "case_state_label_outstanding_anon"
 msgstr "Schwebend anonymisiert"
 
-#: waskaweb/model/case.py:1121
+#: waskaweb/model/case.py:1147
 msgid "case_state_label_anon"
 msgstr "Anonymisiert"
 
@@ -461,107 +359,108 @@
 msgid "logout_p_login_again"
 msgstr ", um sich erneut in WASKO anzumelden."
 
-#: waskaweb/templates/main.mako:78
+#: waskaweb/templates/main.mako:4
 msgid "statusbar_logininfo"
 msgstr "Angemeldet als"
 
-#: waskaweb/templates/main.mako:90 waskaweb/templates/main.mako:120
+#: waskaweb/templates/main.mako:16 waskaweb/templates/main.mako:46
 msgid "sm_menu_link_home"
 msgstr "Schwarzes Brett"
 
-#: waskaweb/templates/main.mako:91 waskaweb/templates/start/help.mako:4
+#: waskaweb/templates/main.mako:17 waskaweb/templates/start/help.mako:4
 msgid "sm_menu_link_help"
 msgstr "Hilfe"
 
-#: waskaweb/templates/main.mako:92
+#: waskaweb/templates/main.mako:18
 #: waskaweb/templates/usersettings/change_password.mako:4
 #: waskaweb/templates/usersettings/show_settings.mako:4
 msgid "sm_menu_link_settings"
 msgstr "Mein Konto"
 
-#: waskaweb/templates/main.mako:93 waskaweb/templates/start/responsible.mako:4
+#: waskaweb/templates/main.mako:19 waskaweb/templates/start/responsible.mako:4
 msgid "sm_menu_link_responsible"
 msgstr "Info"
 
-#: waskaweb/templates/main.mako:94
+#: waskaweb/templates/main.mako:20
 msgid "sm_menu_link_logout"
 msgstr "Abmelden"
 
-#: waskaweb/templates/main.mako:100 waskaweb/templates/main.mako:118
+#: waskaweb/templates/main.mako:26 waskaweb/templates/main.mako:44
 msgid "np_root"
 msgstr "Wasko Start"
 
-#: waskaweb/templates/main.mako:121
+#: waskaweb/templates/main.mako:47
 #: waskaweb/templates/appointments/dialogs/confirm.mako:4
 #: waskaweb/templates/appointments/dialogs/notificate_delete_appointment.mako:5
 #: waskaweb/templates/appointments/dialogs/success_delete_appointment.mako:5
+#: waskaweb/templates/caselifetime/dialogs/confirm_reopen.mako:5
 #: waskaweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako:5
 #: waskaweb/templates/casemanagement/dialogs/failed_delete_appointment.mako:6
 #: waskaweb/templates/casemanagement/dialogs/success_delete_appointment.mako:6
 msgid "menu_app_link_overview"
 msgstr "Termine"
 
-#: waskaweb/templates/main.mako:122
+#: waskaweb/templates/main.mako:48
 msgid "menu_doc_link_overview"
 msgstr "Dokumente"
 
-#: waskaweb/templates/main.mako:130 waskaweb/templates/main.mako:140
+#: waskaweb/templates/main.mako:56 waskaweb/templates/main.mako:66
 msgid "menu_header_cm"
 msgstr "Case-Management"
 
-#: waskaweb/templates/main.mako:132 waskaweb/templates/main.mako:142
+#: waskaweb/templates/main.mako:58 waskaweb/templates/main.mako:68
 msgid "menu_cm_link_overview"
 msgstr "Fallakten\t"
 
-#: waskaweb/templates/main.mako:133 waskaweb/templates/main.mako:147
+#: waskaweb/templates/main.mako:59
 #: waskaweb/templates/casemanagement/evaluation.mako:8
 msgid "cm_actions_link_evaluate"
 msgstr "Auswertung"
 
-#: waskaweb/templates/main.mako:144
+#: waskaweb/templates/main.mako:70
 msgid "menu_cm_link_new"
 msgstr "Fallakte anlegen"
 
-#: waskaweb/templates/main.mako:145
+#: waskaweb/templates/main.mako:71
 msgid "menu_cm_link_import"
 msgstr "Fallakte importieren"
 
-#: waskaweb/templates/main.mako:163
+#: waskaweb/templates/main.mako:90
 msgid "menu_header_adm"
 msgstr "Administration"
 
-#: waskaweb/templates/main.mako:165
+#: waskaweb/templates/main.mako:92
 msgid "menu_adm_link_useroverview"
 msgstr "Benutzer"
 
-#: waskaweb/templates/main.mako:168
+#: waskaweb/templates/main.mako:95
 msgid "menu_adm_link_usergroupoverview"
 msgstr "Benutzergruppen"
 
-#: waskaweb/templates/main.mako:171
+#: waskaweb/templates/main.mako:98
 msgid "menu_adm_link_showsettings"
 msgstr "Einrichtung"
 
-#: waskaweb/templates/main.mako:184
+#: waskaweb/templates/main.mako:111
 msgid "main_formular_input_error"
 msgstr "Fehlerhafte Formulareingabe"
 
-#: waskaweb/templates/main.mako:197
+#: waskaweb/templates/main.mako:124
 msgid "footer_title"
 msgstr "WASKO"
 
-#: waskaweb/templates/main.mako:197
+#: waskaweb/templates/main.mako:124
 msgid "footer_version"
-msgstr "30.03.2009 | Version 1.0-rc1"
+msgstr "06.04.2009 | Version 1.0.0-rc2"
 
-#: waskaweb/templates/main_login.mako:38
+#: waskaweb/templates/main_login.mako:39
 msgid "main_login_bmf_phrase"
 msgstr ""
-"Das Programm \"Schulverweigerung - Die 2. Chance\" wird vom Bundesministerium für Familie, "
-"Senioren, Frauen und Jugend aus Mitteln des Europäischen Sozialfonds "
-"gefördert."
+"Das Programm \"Schulverweigerung - Die 2. Chance\" wird vom "
+"Bundesministerium für Familie, Senioren, Frauen und Jugend aus Mitteln des "
+"Europäischen Sozialfonds gefördert."
 
-#: waskaweb/templates/main_login.mako:59
+#: waskaweb/templates/main_login.mako:60
 msgid "main_login_formular_input_error"
 msgstr "Fehlerhafte Formulareingabe"
 
@@ -977,6 +876,49 @@
 msgid "adm_overview_tbl_header_actions"
 msgstr "Aktionen"
 
+#: waskaweb/templates/administration/overview_user.mako:43
+#: waskaweb/templates/administration/overview_user.mako:60
+#: waskaweb/templates/administration/overview_usergroups.mako:34
+#: waskaweb/templates/administration/overview_usergroups.mako:43
+#: waskaweb/templates/appointments/appointmentlist.mako:3
+#: waskaweb/templates/casemanagement/appointmentlist.mako:3
+#: waskaweb/templates/casemanagement/caselist.mako:75
+#: waskaweb/templates/casemanagement/caselist.mako:134
+#: waskaweb/templates/casemanagement/reminderlist.mako:4
+#: waskaweb/templates/documents/case_overview.mako:42
+#: waskaweb/templates/documents/case_overview.mako:53
+#: waskaweb/templates/documents/global_overview.mako:39
+#: waskaweb/templates/documents/global_overview.mako:40
+#: waskaweb/templates/documents/global_overview.mako:51
+#: waskaweb/templates/documents/global_overview.mako:52
+#: waskaweb/templates/start/appointmentlist.mako:6
+#: waskaweb/templates/start/appointmentlist.mako:9
+#: waskaweb/templates/start/appointmentlist.mako:13
+#: waskaweb/templates/start/globalappointmentlist.mako:4
+#: waskaweb/templates/start/remindlist.mako:4
+msgid "cm_overview_a_show"
+msgstr "Anzeigen"
+
+#: waskaweb/templates/administration/overview_user.mako:45
+#: waskaweb/templates/administration/overview_user.mako:62
+#: waskaweb/templates/administration/overview_usergroups.mako:35
+#: waskaweb/templates/administration/overview_usergroups.mako:44
+#: waskaweb/templates/appointments/appointmentlist.mako:5
+#: waskaweb/templates/casemanagement/agencylist.mako:32
+#: waskaweb/templates/casemanagement/agencylist.mako:42
+#: waskaweb/templates/casemanagement/appointmentlist.mako:5
+#: waskaweb/templates/casemanagement/caselist.mako:79
+#: waskaweb/templates/casemanagement/caselist.mako:89
+#: waskaweb/templates/casemanagement/caselist.mako:138
+#: waskaweb/templates/casemanagement/caselist.mako:148
+#: waskaweb/templates/casemanagement/reminderlist.mako:7
+#: waskaweb/templates/documents/case_overview.mako:44
+#: waskaweb/templates/documents/case_overview.mako:55
+#: waskaweb/templates/documents/global_overview.mako:42
+#: waskaweb/templates/documents/global_overview.mako:54
+msgid "cm_overview_a_delete"
+msgstr "Löschen"
+
 #: waskaweb/templates/administration/overview_usergroups.mako:13
 msgid "adm_header_usergroup_overview"
 msgstr "Benutzergruppen"
@@ -1223,13 +1165,6 @@
 #: waskaweb/templates/appointments/new.mako:12
 #: waskaweb/templates/appointments/overview.mako:4
 #: waskaweb/templates/appointments/show.mako:4
-#: waskaweb/templates/appointments/beta/show_1.mako:4
-#: waskaweb/templates/appointments/beta/show_2.mako:4
-#: waskaweb/templates/appointments/beta/show_3.mako:4
-#: waskaweb/templates/appointments/beta/show_4.mako:4
-#: waskaweb/templates/appointments/beta/show_5.mako:4
-#: waskaweb/templates/appointments/beta/show_6.mako:4
-#: waskaweb/templates/appointments/beta/show_7.mako:4
 #: waskaweb/templates/appointments/dialogs/confirm.mako:5
 #: waskaweb/templates/appointments/dialogs/notificate_delete_appointment.mako:6
 #: waskaweb/templates/appointments/dialogs/success_create_appointment.mako:5
@@ -1323,12 +1258,6 @@
 
 #: waskaweb/templates/appointments/new.mako:23
 #: waskaweb/templates/appointments/show.mako:20
-#: waskaweb/templates/appointments/beta/show_10.mako:15
-#: waskaweb/templates/appointments/beta/show_5.mako:15
-#: waskaweb/templates/appointments/beta/show_6.mako:15
-#: waskaweb/templates/appointments/beta/show_7.mako:14
-#: waskaweb/templates/appointments/beta/show_8.mako:15
-#: waskaweb/templates/appointments/beta/show_9.mako:15
 #: waskaweb/templates/casemanagement/newAppointment.mako:24
 #: waskaweb/templates/casemanagement/showAppointment.mako:23
 msgid "menu_app_link_overview_back"
@@ -1364,31 +1293,11 @@
 msgstr "Aktionen"
 
 #: waskaweb/templates/appointments/show.mako:5
-#: waskaweb/templates/appointments/beta/show_1.mako:5
-#: waskaweb/templates/appointments/beta/show_10.mako:5
-#: waskaweb/templates/appointments/beta/show_2.mako:5
-#: waskaweb/templates/appointments/beta/show_3.mako:5
-#: waskaweb/templates/appointments/beta/show_4.mako:5
-#: waskaweb/templates/appointments/beta/show_5.mako:5
-#: waskaweb/templates/appointments/beta/show_6.mako:5
-#: waskaweb/templates/appointments/beta/show_7.mako:5
-#: waskaweb/templates/appointments/beta/show_8.mako:5
-#: waskaweb/templates/appointments/beta/show_9.mako:5
 #: waskaweb/templates/casemanagement/showAppointment.mako:6
 msgid "app_np_show"
 msgstr "Terminansicht"
 
 #: waskaweb/templates/appointments/show.mako:9
-#: waskaweb/templates/appointments/beta/show_1.mako:10
-#: waskaweb/templates/appointments/beta/show_10.mako:10
-#: waskaweb/templates/appointments/beta/show_2.mako:10
-#: waskaweb/templates/appointments/beta/show_3.mako:9
-#: waskaweb/templates/appointments/beta/show_4.mako:10
-#: waskaweb/templates/appointments/beta/show_5.mako:10
-#: waskaweb/templates/appointments/beta/show_6.mako:10
-#: waskaweb/templates/appointments/beta/show_7.mako:9
-#: waskaweb/templates/appointments/beta/show_8.mako:10
-#: waskaweb/templates/appointments/beta/show_9.mako:10
 #: waskaweb/templates/casemanagement/editAppointment.mako:18
 #: waskaweb/templates/casemanagement/showAppointment.mako:10
 msgid "app_header_show"
@@ -1418,20 +1327,6 @@
 msgid "app_table_description"
 msgstr "Beschreibung"
 
-#: waskaweb/templates/appointments/beta/show_1.mako:15
-#: waskaweb/templates/appointments/beta/show_2.mako:15
-#: waskaweb/templates/appointments/beta/show_3.mako:14
-#: waskaweb/templates/appointments/beta/show_4.mako:15
-msgid "sm_menu_link_home_back"
-msgstr "Zurück zu: Schwarzes Brett"
-
-#: waskaweb/templates/appointments/beta/show_10.mako:4
-#: waskaweb/templates/appointments/beta/show_8.mako:4
-#: waskaweb/templates/appointments/beta/show_9.mako:4
-#: waskaweb/templates/casemanagement/new_appointment.mako:6
-msgid "app_np_root"
-msgstr "Termine"
-
 #: waskaweb/templates/appointments/dialogs/confirm.mako:6
 #: waskaweb/templates/appointments/dialogs/notificate_delete_appointment.mako:7
 #: waskaweb/templates/appointments/dialogs/success_delete_appointment.mako:7
@@ -1441,6 +1336,79 @@
 msgid "app_np_delete"
 msgstr "Termin löschen"
 
+#: waskaweb/templates/caselifetime/overview.mako:19
+#: waskaweb/templates/caselifetime/dialogs/confirm_reopen.mako:4
+#: waskaweb/templates/casemanagement/appointments.mako:4
+#: waskaweb/templates/casemanagement/digest.mako:6
+#: waskaweb/templates/casemanagement/editAppointment.mako:12
+#: waskaweb/templates/casemanagement/formular.mako:34
+#: waskaweb/templates/casemanagement/newAppointment.mako:12
+#: waskaweb/templates/casemanagement/newLogbookEntry.mako:8
+#: waskaweb/templates/casemanagement/new_appointment.mako:5
+#: waskaweb/templates/casemanagement/organisation.mako:6
+#: waskaweb/templates/casemanagement/phase.mako:6
+#: waskaweb/templates/casemanagement/showAppointment.mako:4
+#: waskaweb/templates/casemanagement/dialogs/confirm_anonymize.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_close.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete_aid.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako:4
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako:4
+#: waskaweb/templates/casemanagement/dialogs/confirm_markanonymize.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_markanonymizeFromOverview.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_open.mako:5
+#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:6
+#: waskaweb/templates/casemanagement/dialogs/failed_delete_appointment.mako:5
+#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete.mako:5
+#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete_from_overview.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_anonymize.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_case_close.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_create_appointment.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_delete_aid.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_delete_appointment.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_edit_appointment.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_markanonymize.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_set_phase.mako:6
+#: waskaweb/templates/documents/case_new.mako:5
+#: waskaweb/templates/documents/case_overview.mako:5
+#: waskaweb/templates/documents/dialogs/delete_attachment_success.mako:4
+#: waskaweb/templates/documents/dialogs/failed_attachment.mako:4
+#: waskaweb/templates/logbook/edit.mako:11
+#: waskaweb/templates/logbook/new.mako:11
+#: waskaweb/templates/logbook/overview.mako:6
+#: waskaweb/templates/logbook/overview_print.mako:6
+#: waskaweb/templates/logbook/show.mako:5
+#: waskaweb/templates/logbook/dialogs/confirm_delete_logbook_entry.mako:5
+#: waskaweb/templates/logbook/dialogs/failed_create_logbook_entry.mako:5
+#: waskaweb/templates/logbook/dialogs/failed_delete_logbook_entry.mako:5
+#: waskaweb/templates/logbook/dialogs/failed_save_logbook_entry.mako:5
+#: waskaweb/templates/logbook/dialogs/failed_show_logbook_entry.mako:5
+#: waskaweb/templates/logbook/dialogs/success_create_logbook_entry.mako:5
+#: waskaweb/templates/logbook/dialogs/success_delete_logbook_entry.mako:5
+#: waskaweb/templates/logbook/dialogs/success_save_logbook_entry.mako:5
+#: waskaweb/templates/statement/edit.mako:5
+#: waskaweb/templates/statement/list_statements.mako:6
+#: waskaweb/templates/statement/dialogs/confirm.mako:5
+#: waskaweb/templates/statement/dialogs/ee_accept_failed.mako:5
+#: waskaweb/templates/statement/dialogs/ee_accept_success.mako:5
+#: waskaweb/templates/statement/dialogs/ee_decline_failed.mako:5
+#: waskaweb/templates/statement/dialogs/ee_decline_success.mako:5
+msgid "cm_np_select"
+msgstr "Ausgewählte Fallakte"
+
+#: waskaweb/templates/caselifetime/overview.mako:20
+#: waskaweb/templates/casemanagement/main.mako:74
+msgid "Verwaltung"
+msgstr "Verwaltung"
+
+#: waskaweb/templates/caselifetime/overview.mako:25
+msgid "Case Management Prozess"
+msgstr "Case Management Prozess"
+
+#: waskaweb/templates/caselifetime/overview.mako:38
+msgid "Verwaltungsaufgaben"
+msgstr "Verwaltungsaufgaben"
+
+#: waskaweb/templates/caselifetime/dialogs/success_reopen.mako:5
 #: waskaweb/templates/casemanagement/agency_overview.mako:6
 #: waskaweb/templates/casemanagement/bundle_editor.mako:6
 #: waskaweb/templates/casemanagement/bundle_standin.mako:6
@@ -1449,10 +1417,12 @@
 #: waskaweb/templates/casemanagement/downloadXML.mako:6
 #: waskaweb/templates/casemanagement/evaluation.mako:4
 #: waskaweb/templates/casemanagement/main.mako:10
+#: waskaweb/templates/casemanagement/neuaufnahme.mako:5
 #: waskaweb/templates/casemanagement/new.mako:5
 #: waskaweb/templates/casemanagement/overview.mako:6
 #: waskaweb/templates/casemanagement/phase.mako:5
 #: waskaweb/templates/casemanagement/upload.mako:6
+#: waskaweb/templates/casemanagement/wiederaufnahme.mako:5
 #: waskaweb/templates/casemanagement/dialogs/alert.mako:5
 #: waskaweb/templates/casemanagement/dialogs/bundle_noselection.mako:5
 #: waskaweb/templates/casemanagement/dialogs/confirm.mako:5
@@ -1471,6 +1441,7 @@
 #: waskaweb/templates/casemanagement/dialogs/success_delete_cm.mako:5
 #: waskaweb/templates/casemanagement/dialogs/success_markdelete.mako:5
 #: waskaweb/templates/casemanagement/dialogs/success_restore.mako:5
+#: waskaweb/templates/casemanagement/evaluation/evaluation_adele.mako:6
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:6
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:6
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:6
@@ -1480,6 +1451,14 @@
 msgid "cm_np_root"
 msgstr "Case-Management"
 
+#: waskaweb/templates/caselifetime/dialogs/success_reopen.mako:6
+#: waskaweb/templates/casemanagement/dialogs/success_delete.mako:6
+#: waskaweb/templates/casemanagement/dialogs/success_delete_admin.mako:6
+#: waskaweb/templates/casemanagement/dialogs/success_delete_cm.mako:6
+#: waskaweb/templates/casemanagement/dialogs/success_markdelete.mako:6
+msgid "cm_np_delete_success"
+msgstr "Fallakte gelöscht!"
+
 #: waskaweb/templates/casemanagement/agency_overview.mako:7
 #: waskaweb/templates/casemanagement/main.mako:11
 #: waskaweb/templates/casemanagement/overview.mako:7
@@ -1515,63 +1494,6 @@
 msgid "cm_overview_tbl_header_actions"
 msgstr "Aktionen"
 
-#: waskaweb/templates/casemanagement/appointments.mako:4
-#: waskaweb/templates/casemanagement/digest.mako:6
-#: waskaweb/templates/casemanagement/editAppointment.mako:12
-#: waskaweb/templates/casemanagement/formular.mako:34
-#: waskaweb/templates/casemanagement/newAppointment.mako:12
-#: waskaweb/templates/casemanagement/newLogbookEntry.mako:8
-#: waskaweb/templates/casemanagement/new_appointment.mako:5
-#: waskaweb/templates/casemanagement/organisation.mako:6
-#: waskaweb/templates/casemanagement/phase.mako:6
-#: waskaweb/templates/casemanagement/showAppointment.mako:4
-#: waskaweb/templates/casemanagement/dialogs/confirm_anonymize.mako:5
-#: waskaweb/templates/casemanagement/dialogs/confirm_close.mako:5
-#: waskaweb/templates/casemanagement/dialogs/confirm_delete_aid.mako:5
-#: waskaweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako:4
-#: waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako:4
-#: waskaweb/templates/casemanagement/dialogs/confirm_markanonymize.mako:5
-#: waskaweb/templates/casemanagement/dialogs/confirm_markanonymizeFromOverview.mako:5
-#: waskaweb/templates/casemanagement/dialogs/confirm_open.mako:5
-#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:6
-#: waskaweb/templates/casemanagement/dialogs/failed_delete_appointment.mako:5
-#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete.mako:5
-#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete_from_overview.mako:5
-#: waskaweb/templates/casemanagement/dialogs/success_anonymize.mako:5
-#: waskaweb/templates/casemanagement/dialogs/success_case_close.mako:5
-#: waskaweb/templates/casemanagement/dialogs/success_create_appointment.mako:5
-#: waskaweb/templates/casemanagement/dialogs/success_delete_aid.mako:5
-#: waskaweb/templates/casemanagement/dialogs/success_delete_appointment.mako:5
-#: waskaweb/templates/casemanagement/dialogs/success_edit_appointment.mako:5
-#: waskaweb/templates/casemanagement/dialogs/success_markanonymize.mako:5
-#: waskaweb/templates/casemanagement/dialogs/success_set_phase.mako:6
-#: waskaweb/templates/documents/case_new.mako:5
-#: waskaweb/templates/documents/case_overview.mako:5
-#: waskaweb/templates/documents/dialogs/delete_attachment_success.mako:4
-#: waskaweb/templates/documents/dialogs/failed_attachment.mako:4
-#: waskaweb/templates/logbook/edit.mako:11
-#: waskaweb/templates/logbook/new.mako:11
-#: waskaweb/templates/logbook/overview.mako:6
-#: waskaweb/templates/logbook/overview_print.mako:6
-#: waskaweb/templates/logbook/show.mako:5
-#: waskaweb/templates/logbook/dialogs/confirm_delete_logbook_entry.mako:5
-#: waskaweb/templates/logbook/dialogs/failed_create_logbook_entry.mako:5
-#: waskaweb/templates/logbook/dialogs/failed_delete_logbook_entry.mako:5
-#: waskaweb/templates/logbook/dialogs/failed_save_logbook_entry.mako:5
-#: waskaweb/templates/logbook/dialogs/failed_show_logbook_entry.mako:5
-#: waskaweb/templates/logbook/dialogs/success_create_logbook_entry.mako:5
-#: waskaweb/templates/logbook/dialogs/success_delete_logbook_entry.mako:5
-#: waskaweb/templates/logbook/dialogs/success_save_logbook_entry.mako:5
-#: waskaweb/templates/statement/edit.mako:5
-#: waskaweb/templates/statement/list_statements.mako:6
-#: waskaweb/templates/statement/dialogs/confirm.mako:5
-#: waskaweb/templates/statement/dialogs/ee_accept_failed.mako:5
-#: waskaweb/templates/statement/dialogs/ee_accept_success.mako:5
-#: waskaweb/templates/statement/dialogs/ee_decline_failed.mako:5
-#: waskaweb/templates/statement/dialogs/ee_decline_success.mako:5
-msgid "cm_np_select"
-msgstr "Ausgewählte Fallakte"
-
 #: waskaweb/templates/casemanagement/bundle_editor.mako:7
 #: waskaweb/templates/casemanagement/dialogs/failed_seteditor.mako:5
 #: waskaweb/templates/casemanagement/dialogs/notificate_bundle_seteditor.mako:6
@@ -1698,59 +1620,64 @@
 msgid "cm_header_digest_youth"
 msgstr "Angaben zum Jugendlichen"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:54
-#: waskaweb/templates/casemanagement/digest_body.mako:108
+#: waskaweb/templates/casemanagement/digest_body.mako:57
+#: waskaweb/templates/casemanagement/digest_body.mako:120
+#: waskaweb/templates/casemanagement/digest_body.mako:160
 msgid "cm_digest_tbl_label_lastname"
 msgstr "Name"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:58
-#: waskaweb/templates/casemanagement/digest_body.mako:112
+#: waskaweb/templates/casemanagement/digest_body.mako:61
+#: waskaweb/templates/casemanagement/digest_body.mako:124
+#: waskaweb/templates/casemanagement/digest_body.mako:164
 msgid "cm_digest_tbl_label_firstname"
 msgstr "Vorname"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:62
+#: waskaweb/templates/casemanagement/digest_body.mako:65
 msgid "cm_digest_tbl_label_caseid"
 msgstr "Kundennummer"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:66
+#: waskaweb/templates/casemanagement/digest_body.mako:69
 msgid "cm_digest_tbl_label_age"
 msgstr "Alter"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:70
-#: waskaweb/templates/casemanagement/digest_body.mako:116
+#: waskaweb/templates/casemanagement/digest_body.mako:73
+#: waskaweb/templates/casemanagement/digest_body.mako:128
+#: waskaweb/templates/casemanagement/digest_body.mako:168
 msgid "cm_digest_tbl_label_email"
 msgstr "E-Mail"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:80
+#: waskaweb/templates/casemanagement/digest_body.mako:85
 msgid "cm_digest_tbl_label_street"
 msgstr "Straße"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:84
+#: waskaweb/templates/casemanagement/digest_body.mako:89
 msgid "cm_digest_tbl_label_plz"
 msgstr "PLZ"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:88
+#: waskaweb/templates/casemanagement/digest_body.mako:93
 msgid "cm_digest_tbl_label_city"
 msgstr "Ort"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:92
-#: waskaweb/templates/casemanagement/digest_body.mako:126
+#: waskaweb/templates/casemanagement/digest_body.mako:97
+#: waskaweb/templates/casemanagement/digest_body.mako:101
+#: waskaweb/templates/casemanagement/digest_body.mako:140
+#: waskaweb/templates/casemanagement/digest_body.mako:144
 msgid "cm_digest_tbl_label_telephone"
 msgstr "Telefon"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:96
-#: waskaweb/templates/casemanagement/digest_body.mako:130
-msgid "cm_digest_tbl_label_mobiletelephone"
-msgstr "Mobil"
-
-#: waskaweb/templates/casemanagement/digest_body.mako:100
+#: waskaweb/templates/casemanagement/digest_body.mako:105
 msgid "cm_digest_tbl_label_telephone_more"
 msgstr "Weitere Telefonnummern"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:105
+#: waskaweb/templates/casemanagement/digest_body.mako:113
 msgid "cm_header_digest_parent"
 msgstr "Angaben zum Erziehungsberechtigten"
 
+#: waskaweb/templates/casemanagement/digest_body.mako:180
+#: waskaweb/templates/casemanagement/digest_body.mako:184
+msgid "Telefon"
+msgstr "Telefon"
+
 #: waskaweb/templates/casemanagement/downloadCSV.mako:7
 #: waskaweb/templates/casemanagement/downloadXLS.mako:7
 #: waskaweb/templates/casemanagement/downloadXML.mako:7
@@ -1791,25 +1718,21 @@
 msgstr "Fallaktenansicht"
 
 #: waskaweb/templates/casemanagement/formular.mako:17
-#: waskaweb/templates/casemanagement/formular.mako:83
+#: waskaweb/templates/casemanagement/formular.mako:66
 msgid "cm_actions_link_show"
 msgstr "Bearbeitung beenden"
 
 #: waskaweb/templates/casemanagement/formular.mako:19
-#: waskaweb/templates/casemanagement/formular.mako:85
+#: waskaweb/templates/casemanagement/formular.mako:68
 msgid "cm_actions_link_edit"
 msgstr "In Bearbeitung nehmen"
 
 #: waskaweb/templates/casemanagement/formular.mako:22
-#: waskaweb/templates/casemanagement/formular.mako:91
+#: waskaweb/templates/casemanagement/formular.mako:74
 msgid "cm_actions_link_printout"
 msgstr "Druckversion"
 
-#: waskaweb/templates/casemanagement/formular.mako:41
-msgid "cm_error_header_false_forminput"
-msgstr "Fehlerhafte Formulareingabe"
-
-#: waskaweb/templates/casemanagement/formular.mako:88
+#: waskaweb/templates/casemanagement/formular.mako:71
 msgid "cm_actions_link_printoutAidPlanStatement"
 msgstr "Förderplan drucken"
 
@@ -1822,7 +1745,7 @@
 msgstr "Name"
 
 #: waskaweb/templates/casemanagement/main.mako:22
-#: waskaweb/templates/casemanagement/phase.mako:16
+#: waskaweb/templates/casemanagement/phase.mako:21
 msgid "cm_info_phase"
 msgstr "Phase"
 
@@ -1884,34 +1807,37 @@
 
 #: waskaweb/templates/casemanagement/main.mako:73
 #: waskaweb/templates/casemanagement/phase.mako:7
-#: waskaweb/templates/casemanagement/phase.mako:10
+#: waskaweb/templates/casemanagement/phase.mako:15
 #: waskaweb/templates/casemanagement/dialogs/success_set_phase.mako:7
 msgid "case_cm_phase"
 msgstr "Phase im CM"
 
-#: waskaweb/templates/casemanagement/main.mako:74
+#: waskaweb/templates/casemanagement/main.mako:75
 msgid "cm_menu_link_organisation"
 msgstr "Organisation"
 
-#: waskaweb/templates/casemanagement/main.mako:75
+#: waskaweb/templates/casemanagement/main.mako:76
 msgid "cm_menu_link_appointment"
 msgstr "Termine"
 
-#: waskaweb/templates/casemanagement/main.mako:77
+#: waskaweb/templates/casemanagement/main.mako:78
 msgid "cm_menu_link_documents"
 msgstr "Anlagen"
 
-#: waskaweb/templates/casemanagement/main.mako:83
+#: waskaweb/templates/casemanagement/main.mako:84
 msgid "cm_menu_header_structure"
 msgstr "Gliederung"
 
+#: waskaweb/templates/casemanagement/neuaufnahme.mako:6
 #: waskaweb/templates/casemanagement/new.mako:6
+#: waskaweb/templates/casemanagement/wiederaufnahme.mako:6
 #: waskaweb/templates/casemanagement/dialogs/alert.mako:6
+#: waskaweb/templates/casemanagement/dialogs/failed_create_case.mako:5
 #: waskaweb/templates/casemanagement/static_form/statement.mako:6
 msgid "cm_np_new"
 msgstr "Fallakte anlegen"
 
-#: waskaweb/templates/casemanagement/new.mako:32
+#: waskaweb/templates/casemanagement/new.mako:53
 msgid "cm_new_p_please_consider_statement"
 msgstr ""
 "Bitte beachten Sie, dass die Einverständniserklärung die Grundlage zur "
@@ -1919,13 +1845,17 @@
 "Auswahl 'Erklärung drucken'. Bitte nutzen Sie den 'Zurück'-Knopf Ihres "
 "Browsers, um nach dem Drucken auf diese Seite zurückzukehren."
 
-#: waskaweb/templates/casemanagement/new.mako:35
+#: waskaweb/templates/casemanagement/new.mako:56
 msgid "cm_new_con_acceptance_statement_true"
 msgstr ""
 "Die Einwilligungserklärung für die Erfassung, Verarbeitung und Nutzung "
 "personenbezogener Daten wurde bereits zur Eingangsamnese bzw. Beratung vor "
 "dem Case Management eingeholt."
 
+#: waskaweb/templates/casemanagement/new_appointment.mako:6
+msgid "app_np_root"
+msgstr "Termine"
+
 #: waskaweb/templates/casemanagement/new_appointment.mako:17
 msgid "cm_menu_link_appointment_back"
 msgstr "Zurück zu: Terminübersicht"
@@ -1964,23 +1894,23 @@
 #: waskaweb/templates/casemanagement/overview.mako:11
 msgid "cm_overview_con_list_dossiers_admin"
 msgstr ""
-"Hier wird eine Auflistung aller Fallakten der Einrichtung bzw. der "
-"Fälle des angemeldeten Benutzers angezeigt"
+"Hier wird eine Auflistung aller Fallakten der Einrichtung bzw. der Fälle des "
+"angemeldeten Benutzers angezeigt"
 
 #: waskaweb/templates/casemanagement/overview.mako:15
 msgid "cm_overview_con_list_dossiers_cm"
 msgstr ""
 "Hier wird eine Auflistung der Fälle des angemeldeten Benutzers angezeigt"
 
-#: waskaweb/templates/casemanagement/phase.mako:18
+#: waskaweb/templates/casemanagement/phase.mako:23
 msgid "case_cm_phase_required_fields"
 msgstr "Pflichtfelder"
 
-#: waskaweb/templates/casemanagement/phase.mako:19
+#: waskaweb/templates/casemanagement/phase.mako:24
 msgid "case_cm_phase_time"
 msgstr "Zeitpunkt"
 
-#: waskaweb/templates/casemanagement/phase.mako:22
+#: waskaweb/templates/casemanagement/phase.mako:27
 msgid "case_cm_phase_change"
 msgstr "Phasenwechsel"
 
@@ -1999,8 +1929,7 @@
 msgid "cm_header_import"
 msgstr "Fallakte importieren"
 
-#: waskaweb/templates/casemanagement/upload.mako:22
-#: waskaweb/templates/casemanagement/upload.mako:34
+#: waskaweb/templates/casemanagement/upload.mako:20
 msgid "cm_from_import_submit"
 msgstr "Importieren"
 
@@ -2018,6 +1947,7 @@
 #: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete.mako:6
 #: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete_from_overview.mako:6
 #: waskaweb/templates/casemanagement/dialogs/failed_xml_import.mako:5
+#: waskaweb/templates/casemanagement/dialogs/failed_xml_import2.mako:6
 #: waskaweb/templates/casemanagement/dialogs/success_anonymize.mako:6
 #: waskaweb/templates/casemanagement/dialogs/success_bundle_anonymize.mako:6
 #: waskaweb/templates/casemanagement/dialogs/success_markanonymize.mako:6
@@ -2092,6 +2022,13 @@
 msgid "agency_np_bundled_export_failed"
 msgstr "Exportieren fehlgeschlagen"
 
+#: waskaweb/templates/casemanagement/dialogs/failed_xml_import2.mako:24
+#: waskaweb/templates/dialogs/alert.mako:6
+#: waskaweb/templates/dialogs/failed.mako:6
+#: waskaweb/templates/dialogs/success.mako:6
+msgid "dialog_header_confirm_option_ok"
+msgstr "OK"
+
 #: waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako:7
 msgid "cm_np_import_failed"
 msgstr "Import fehlgeschlagen!"
@@ -2100,13 +2037,6 @@
 msgid "cm_np_close_success"
 msgstr "Fallakte abgeschlossen!"
 
-#: waskaweb/templates/casemanagement/dialogs/success_delete.mako:6
-#: waskaweb/templates/casemanagement/dialogs/success_delete_admin.mako:6
-#: waskaweb/templates/casemanagement/dialogs/success_delete_cm.mako:6
-#: waskaweb/templates/casemanagement/dialogs/success_markdelete.mako:6
-msgid "cm_np_delete_success"
-msgstr "Fallakte gelöscht!"
-
 #: waskaweb/templates/casemanagement/dialogs/success_delete_agency.mako:7
 msgid "agency_np_bundled_delete_success"
 msgstr "Einrichtungen gelöscht!"
@@ -2147,23 +2077,23 @@
 msgid "eval_group_header_incm"
 msgstr "2. Auswertungen über Jugendliche im Case-Management"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:43
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:13
-msgid "cm_eval_summary_header_3"
-msgstr "3.1. Verweildauer im CM"
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:51
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:50
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:10
 msgid "eval_group_header_finished"
 msgstr "3. Auswertungen über Jugendliche, die das CM abgeschlossen haben"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:53
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:52
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:15
+msgid "cm_eval_summary_header_3"
+msgstr "3.1. Verweildauer im CM"
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:53
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:75
 msgid "cm_eval_summary_header_7"
 msgstr "3.2. Vermittlung"
 
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:55
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:78
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:138
 msgid "cm_eval_summary_header_15"
 msgstr "3.3. Zeitaufwände"
 
@@ -2198,19 +2128,18 @@
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:104
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:134
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:166
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:43
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:70
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:47
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:107
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:137
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:167
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:139
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:175
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:199
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:235
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:259
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:264
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:45
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:75
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:81
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:84
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:72
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:105
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:135
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:141
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:144
 msgid "cm_eval_table_to_overview"
 msgstr "Zur Übersicht"
 
@@ -2221,19 +2150,18 @@
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:104
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:134
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:166
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:43
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:70
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:47
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:107
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:137
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:167
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:139
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:175
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:199
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:235
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:259
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:264
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:45
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:75
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:81
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:84
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:72
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:105
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:135
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:141
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:144
 msgid "cm_eval_table_export_analysis"
 msgstr "Auswertung exportieren"
 
@@ -2254,14 +2182,14 @@
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:79
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:109
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:141
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:78
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:112
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:144
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:174
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:206
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:242
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:20
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:50
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:18
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:52
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:84
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:114
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:146
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:182
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:80
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:110
 msgid "cm_eval_table_number"
 msgstr "Anzahl"
 
@@ -2270,14 +2198,14 @@
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:80
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:110
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:142
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:79
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:113
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:145
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:175
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:207
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:243
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:21
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:51
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:19
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:53
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:85
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:115
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:147
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:183
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:81
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:111
 msgid "cm_eval_table_percent"
 msgstr "Prozent"
 
@@ -2317,72 +2245,53 @@
 "aufgenommen, wenn für den Jugendlichen die Phase des Case-Management "
 "begonnen wurde.</strong>"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:17
-msgid "cm_eval_table_month"
-msgstr "Woche"
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:18
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:47
-msgid "cm_eval_table_completed"
-msgstr "Abgeschlossen"
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:19
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:48
-msgid "cm_eval_table_early_completed"
-msgstr "vorz. Abgeschlossen"
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:20
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:49
-msgid "cm_eval_table_aborted"
-msgstr "Abgebrochen"
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:74
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:14
 msgid "cm_eval_header_on_gender"
 msgstr "2.1.1. Angaben zur Geschlechtsstruktur"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:17
 msgid "cm_eval_table_gender"
 msgstr "Geschlecht"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:83
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:23
 msgid "cm_eval_label_male"
 msgstr "männlich"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:89
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:29
 msgid "cm_eval_label_female"
 msgstr "weiblich"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:95
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:35
 msgid "cm_eval_label_intersexual"
 msgstr "intersexuell"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:101
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:41
 msgid "cm_eval_label_unknown"
 msgstr "Keine Angabe"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:111
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:51
 msgid "cm_eval_table_age"
 msgstr "Alter"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:143
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:205
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:241
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:83
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:145
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:181
 msgid "cm_eval_table_category"
 msgstr "Kategorie"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:149
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:89
 msgid "cm_eval_label_migration_background"
 msgstr "Migrationshintergrund"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:155
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:95
 msgid "cm_eval_label_no_migration_background"
 msgstr "Kein Migrationshintergrund"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:161
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:101
 msgid "cm_eval_label_ka_migration_background"
 msgstr "Keine Angabe"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:173
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:113
 msgid "cm_eval_table_offer"
 msgstr "Angebot"
 
@@ -2394,10 +2303,29 @@
 "als abgeschlossen, wenn die Phase des Case-Management abgeschlossen wurde."
 
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:19
+msgid "cm_eval_table_month"
+msgstr "Woche"
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:20
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:49
+msgid "cm_eval_table_completed"
+msgstr "Abgeschlossen"
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:21
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:50
+msgid "cm_eval_table_early_completed"
+msgstr "vorz. Abgeschlossen"
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:22
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:51
+msgid "cm_eval_table_aborted"
+msgstr "Abgebrochen"
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:79
 msgid "cm_eval_table_place"
 msgstr "Vermittlung"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:49
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:109
 msgid "cm_eval_table_law_change"
 msgstr "Rechtskreis"
 
@@ -2405,12 +2333,6 @@
 msgid "dialog_header_alert"
 msgstr "Achtung!"
 
-#: waskaweb/templates/dialogs/alert.mako:6
-#: waskaweb/templates/dialogs/failed.mako:6
-#: waskaweb/templates/dialogs/success.mako:6
-msgid "dialog_header_confirm_option_ok"
-msgstr "OK"
-
 #: waskaweb/templates/dialogs/alert.mako:7
 msgid "dialog_header_confirm_option_cancel"
 msgstr "Abbrechen"
@@ -2449,7 +2371,7 @@
 
 #: waskaweb/templates/documents/case_new.mako:31
 #: waskaweb/templates/documents/global_upload.mako:28
-#: waskaweb/templates/documents/upload_body.mako:8
+#: waskaweb/templates/documents/upload_body.mako:10
 msgid "doc_form_upload_submit"
 msgstr "Hinzufügen"
 
@@ -2513,7 +2435,7 @@
 msgstr "Zurück zu: Dokumentenübersicht"
 
 #: waskaweb/templates/documents/global_upload.mako:25
-#: waskaweb/templates/documents/upload_body.mako:5
+#: waskaweb/templates/documents/upload_body.mako:7
 msgid "doc_form_upload_label_file"
 msgstr "Dokument auswählen:"
 
@@ -2579,25 +2501,12 @@
 "vorgeschlagen."
 
 #: waskaweb/templates/statement/list_statements.mako:24
-msgid "statement_header_fp"
-msgstr "Vereinbarung Förderplan"
-
-#: waskaweb/templates/statement/list_statements.mako:26
-msgid "statement_explaination_fp"
-msgstr ""
-"Vereinbarung zwischen dem Jugendlichen und der Einrichtung über einen "
-"gemeinsam ausgearbeiteten Förderplan im Rahmen des Case-Managements. Es ist "
-"eine eigene Einverständniserklärung des Jugendlichen und ggf. der "
-"Erziehungsberechtigen einzuholen, wenn der Förderplan bzw. Daten an eine "
-"andere Hilfeinstitution weitergeleitet werden"
-
-#: waskaweb/templates/statement/list_statements.mako:33
 msgid "statement_header_ud"
 msgstr ""
 "Einwilligungserklärung zur Übermittlung von personenbezogenen Daten an die "
 "Einrichtung"
 
-#: waskaweb/templates/statement/list_statements.mako:35
+#: waskaweb/templates/statement/list_statements.mako:26
 msgid "statement_explaination_ud"
 msgstr ""
 "Erklärung zur Schweigepflichtsentbindung von Vertrauenspersonen mit "
@@ -2760,6 +2669,74 @@
 msgid "adm_np_changepassword"
 msgstr "Benutzerpasswort geändert!"
 
+#~ msgid "cm_rg_aid_overview_table_institution"
+#~ msgstr "Institution"
+
+#~ msgid "cm_rg_aid_overview_table_offer_type"
+#~ msgstr "Form"
+
+#~ msgid "cm_rg_aid_overview_table_actions"
+#~ msgstr "Aktionen"
+
+#~ msgid "cm_rg_aid_overview_table_edit"
+#~ msgstr "Bearbeiten"
+
+#~ msgid "cm_rg_aid_overview_table_goal"
+#~ msgstr "Zielsetzung"
+
+#~ msgid "cm_rg_aid_overview_table_no_offer_found"
+#~ msgstr "Keine Angebote gefunden"
+
+#~ msgid "cm_rg_aid_overview_legend_legend"
+#~ msgstr "Legende:"
+
+#~ msgid "cm_rg_aid_overview_legend_bb"
+#~ msgstr "(BB)"
+
+#~ msgid "cm_rg_aid_overview_legend_common_educational_area"
+#~ msgstr "Allgemein bildenden Bereich"
+
+#~ msgid "cm_rg_aid_overview_legend_bv"
+#~ msgstr "(BV)"
+
+#~ msgid "cm_rg_aid_overview_legend_vocational_preparation"
+#~ msgstr "Bereich der Berufsvorbereitung"
+
+#~ msgid "cm_rg_aid_overview_legend_bq"
+#~ msgstr "(BQ)"
+
+#~ msgid "cm_rg_aid_overview_legend_qualifications"
+#~ msgstr "Berufliche Qualifizierung"
+
+#~ msgid "cm_rg_aid_overview_legend_lb"
+#~ msgstr "(LB)"
+
+#~ msgid "cm_rg_aid_overview_legend_life_skills"
+#~ msgstr "Lebensbewältigung"
+
+#~ msgid "cm_rg_aid_overview_legend_new_offer"
+#~ msgstr "Neues Angebot hinzufügen"
+
+#~ msgid "sm_menu_link_home_back"
+#~ msgstr "Zurück zu: Schwarzes Brett"
+
+#~ msgid "cm_digest_tbl_label_mobiletelephone"
+#~ msgstr "Mobil"
+
+#~ msgid "cm_error_header_false_forminput"
+#~ msgstr "Fehlerhafte Formulareingabe"
+
+#~ msgid "statement_header_fp"
+#~ msgstr "Vereinbarung Förderplan"
+
+#~ msgid "statement_explaination_fp"
+#~ msgstr ""
+#~ "Vereinbarung zwischen dem Jugendlichen und der Einrichtung über einen "
+#~ "gemeinsam ausgearbeiteten Förderplan im Rahmen des Case-Managements. Es "
+#~ "ist eine eigene Einverständniserklärung des Jugendlichen und ggf. der "
+#~ "Erziehungsberechtigen einzuholen, wenn der Förderplan bzw. Daten an eine "
+#~ "andere Hilfeinstitution weitergeleitet werden"
+
 #~ msgid "responsible_info_sponsorship"
 #~ msgstr "Information zur Trägerschaft"
 
@@ -2793,9 +2770,9 @@
 #~ msgid "cm_evaluate_result_note"
 #~ msgstr ""
 #~ "Durch die folgenden Auswertungen können Sie einige wichtige Aussagen über "
-#~ "die Jugendlichen in Ihrer Einrichtung treffen. Die Auswertungen "
-#~ "beziehen sich sowohl auf alle im System erfassten Jugendlichen als auch "
-#~ "nur auf die Jugendlichen, die sich im Case-Management befinden oder Case-"
+#~ "die Jugendlichen in Ihrer Einrichtung treffen. Die Auswertungen beziehen "
+#~ "sich sowohl auf alle im System erfassten Jugendlichen als auch nur auf "
+#~ "die Jugendlichen, die sich im Case-Management befinden oder Case-"
 #~ "Management abgeschlossen haben. Neben den nachfolgenden "
 #~ "Auswertungsfunktionen besteht die Möglichkeit des Datenexports und der "
 #~ "differenzierten Auswertungen in anderen Programmen."
@@ -2812,9 +2789,9 @@
 
 #~ msgid "cm_eval_note_access_youngster_to_agency"
 #~ msgstr ""
-#~ "(Hinweis: Bei den Zugängen zur Einrichtung werden sowohl formelle "
-#~ "bzw. institutionalisierte Wege (z.B. Schule, Jugendamt) als auch "
-#~ "informelle Wege (z.B. Lehrer, Freunde) ermittelt.)"
+#~ "(Hinweis: Bei den Zugängen zur Einrichtung werden sowohl formelle bzw. "
+#~ "institutionalisierte Wege (z.B. Schule, Jugendamt) als auch informelle "
+#~ "Wege (z.B. Lehrer, Freunde) ermittelt.)"
 
 #~ msgid "cm_eval_note_ka_migration_background"
 #~ msgstr ""

Modified: wasko/trunk/waskaweb/i18n/waskaweb.pot
===================================================================
--- wasko/trunk/waskaweb/i18n/waskaweb.pot	2009-04-06 07:26:01 UTC (rev 477)
+++ wasko/trunk/waskaweb/i18n/waskaweb.pot	2009-04-06 08:01:23 UTC (rev 478)
@@ -1,21 +1,21 @@
 # Translations template for waskaweb.
-# Copyright (C) 2008 ORGANIZATION
+# Copyright (C) 2009 ORGANIZATION
 # This file is distributed under the same license as the waskaweb project.
-# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: waskaweb 0.0.0\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2008-09-24 14:51+0200\n"
+"POT-Creation-Date: 2009-04-06 09:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.1\n"
+"Generated-By: Babel 0.9.4\n"
 
 #: waskaweb/controllers/administration.py:46
 msgid "adm_reset_user_password"
@@ -159,236 +159,134 @@
 msgid "adm_edit_standin_success_text"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:178
+#: waskaweb/lib/evaluation.py:183
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:37
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:15
 msgid "cm_eval_summary_header_1"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:234
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:44
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:73
+#: waskaweb/lib/evaluation.py:239
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:43
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:13
 msgid "cm_eval_summary_header_4"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:285
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:45
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:140
+#: waskaweb/lib/evaluation.py:290
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:44
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:80
 msgid "cm_eval_summary_header_5"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:335
+#: waskaweb/lib/evaluation.py:340
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:45
 msgid "cm_eval_header_access_youngster_to_agency"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:380
+#: waskaweb/lib/evaluation.py:385
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:75
 msgid "cm_eval_head_law_access_agency"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:431
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:16
+#: waskaweb/lib/evaluation.py:436
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:76
 msgid "cm_eval_head_where_to_place_youngster"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:477
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:46
+#: waskaweb/lib/evaluation.py:482
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:106
 msgid "cm_eval_header_law_changed_after_place"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:552
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:108
+#: waskaweb/lib/evaluation.py:557
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:48
 msgid "cm_eval_header_on_age"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:617
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:46
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:170
+#: waskaweb/lib/evaluation.py:622
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:45
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:110
 msgid "cm_eval_summary_header_6"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:686
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:14
+#: waskaweb/lib/evaluation.py:691
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:16
 msgid "cm_eval_length_cm"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:734
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:44
+#: waskaweb/lib/evaluation.py:739
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:46
 msgid "cm_eval_avg_length_cm"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:784
+#: waskaweb/lib/evaluation.py:789
 msgid "cm_eval_header_graduation"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:834
+#: waskaweb/lib/evaluation.py:839
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:105
 msgid "cm_eval_header_work"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:843 waskaweb/lib/evaluation.py:989
+#: waskaweb/lib/evaluation.py:848 waskaweb/lib/evaluation.py:1014
 msgid "cm_eval_header_effort"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:949
+#: waskaweb/lib/evaluation.py:974
 msgid "cm_eval_header_effort2"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:966
+#: waskaweb/lib/evaluation.py:991
 msgid "cm_eval_header_avg_effort"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:982
+#: waskaweb/lib/evaluation.py:1007
 msgid "cm_eval_header_avg_effort2"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:1061
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:47
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:202
+#: waskaweb/lib/evaluation.py:1086
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:46
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:142
 msgid "cm_eval_summary_header_19"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:1107
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:48
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:238
+#: waskaweb/lib/evaluation.py:1132
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:47
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:178
 msgid "cm_eval_summary_header_20"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:1181
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:49
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:262
+#: waskaweb/lib/evaluation.py:1214
 msgid "cm_eval_summary_header_21"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:1239
+#: waskaweb/lib/evaluation.py:1272
 msgid "cm_eval_summary_header_23"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:251
-msgid "cm_rg_aid_overview_table_institution"
+#: waskaweb/lib/evaluation_new.py:276
+#, python-format
+msgid "Eval No: %s"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:252
-msgid "cm_rg_aid_overview_table_offer_type"
+#: waskaweb/lib/evaluation_new.py:279
+msgid "No description available"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:253
-msgid "cm_rg_aid_overview_table_actions"
-msgstr ""
-
-#: waskaweb/lib/renderer.py:255
-msgid "cm_rg_aid_overview_table_edit"
-msgstr ""
-
-#: waskaweb/lib/renderer.py:256
-msgid "cm_rg_aid_overview_table_goal"
-msgstr ""
-
-#: waskaweb/lib/renderer.py:257 waskaweb/lib/renderer.py:258
-#: waskaweb/templates/administration/overview_user.mako:43
-#: waskaweb/templates/administration/overview_user.mako:60
-#: waskaweb/templates/administration/overview_usergroups.mako:34
-#: waskaweb/templates/administration/overview_usergroups.mako:43
-#: waskaweb/templates/appointments/appointmentlist.mako:3
-#: waskaweb/templates/casemanagement/appointmentlist.mako:3
-#: waskaweb/templates/casemanagement/caselist.mako:75
-#: waskaweb/templates/casemanagement/caselist.mako:134
-#: waskaweb/templates/casemanagement/reminderlist.mako:4
-#: waskaweb/templates/documents/case_overview.mako:42
-#: waskaweb/templates/documents/case_overview.mako:53
-#: waskaweb/templates/documents/global_overview.mako:39
-#: waskaweb/templates/documents/global_overview.mako:40
-#: waskaweb/templates/documents/global_overview.mako:51
-#: waskaweb/templates/documents/global_overview.mako:52
-#: waskaweb/templates/start/appointmentlist.mako:6
-#: waskaweb/templates/start/appointmentlist.mako:9
-#: waskaweb/templates/start/appointmentlist.mako:13
-#: waskaweb/templates/start/globalappointmentlist.mako:4
-#: waskaweb/templates/start/remindlist.mako:4
-msgid "cm_overview_a_show"
-msgstr ""
-
-#: waskaweb/lib/renderer.py:259 waskaweb/lib/renderer.py:260
-#: waskaweb/templates/administration/overview_user.mako:45
-#: waskaweb/templates/administration/overview_user.mako:62
-#: waskaweb/templates/administration/overview_usergroups.mako:35
-#: waskaweb/templates/administration/overview_usergroups.mako:44
-#: waskaweb/templates/appointments/appointmentlist.mako:5
-#: waskaweb/templates/casemanagement/agencylist.mako:32
-#: waskaweb/templates/casemanagement/agencylist.mako:42
-#: waskaweb/templates/casemanagement/appointmentlist.mako:5
-#: waskaweb/templates/casemanagement/caselist.mako:79
-#: waskaweb/templates/casemanagement/caselist.mako:89
-#: waskaweb/templates/casemanagement/caselist.mako:138
-#: waskaweb/templates/casemanagement/caselist.mako:148
-#: waskaweb/templates/casemanagement/reminderlist.mako:7
-#: waskaweb/templates/documents/case_overview.mako:44
-#: waskaweb/templates/documents/case_overview.mako:55
-#: waskaweb/templates/documents/global_overview.mako:42
-#: waskaweb/templates/documents/global_overview.mako:54
-msgid "cm_overview_a_delete"
-msgstr ""
-
-#: waskaweb/lib/renderer.py:261
-msgid "cm_rg_aid_overview_table_no_offer_found"
-msgstr ""
-
-#: waskaweb/lib/renderer.py:262
-msgid "cm_rg_aid_overview_legend_legend"
-msgstr ""
-
-#: waskaweb/lib/renderer.py:263
-msgid "cm_rg_aid_overview_legend_bb"
-msgstr ""
-
-#: waskaweb/lib/renderer.py:264
-msgid "cm_rg_aid_overview_legend_common_educational_area"
-msgstr ""
-
-#: waskaweb/lib/renderer.py:265
-msgid "cm_rg_aid_overview_legend_bv"
-msgstr ""
-
-#: waskaweb/lib/renderer.py:266
-msgid "cm_rg_aid_overview_legend_vocational_preparation"
-msgstr ""
-
-#: waskaweb/lib/renderer.py:267
-msgid "cm_rg_aid_overview_legend_bq"
-msgstr ""
-
-#: waskaweb/lib/renderer.py:268
-msgid "cm_rg_aid_overview_legend_qualifications"
-msgstr ""
-
-#: waskaweb/lib/renderer.py:269
-msgid "cm_rg_aid_overview_legend_lb"
-msgstr ""
-
-#: waskaweb/lib/renderer.py:270
-msgid "cm_rg_aid_overview_legend_life_skills"
-msgstr ""
-
-#: waskaweb/lib/renderer.py:271
-msgid "cm_rg_aid_overview_legend_new_offer"
-msgstr ""
-
-#: waskaweb/model/case.py:1117 waskaweb/model/case.py:1118
+#: waskaweb/model/case.py:1143 waskaweb/model/case.py:1144
 #: waskaweb/templates/casemanagement/caselist.mako:64
 #: waskaweb/templates/casemanagement/caselist.mako:123
 msgid "case_state_label_open"
 msgstr ""
 
-#: waskaweb/model/case.py:1119
+#: waskaweb/model/case.py:1145
 msgid "case_state_label_outstanding_delete"
 msgstr ""
 
-#: waskaweb/model/case.py:1120
+#: waskaweb/model/case.py:1146
 msgid "case_state_label_outstanding_anon"
 msgstr ""
 
-#: waskaweb/model/case.py:1121
+#: waskaweb/model/case.py:1147
 msgid "case_state_label_anon"
 msgstr ""
 
@@ -432,104 +330,105 @@
 msgid "logout_p_login_again"
 msgstr ""
 
-#: waskaweb/templates/main.mako:78
+#: waskaweb/templates/main.mako:4
 msgid "statusbar_logininfo"
 msgstr ""
 
-#: waskaweb/templates/main.mako:90 waskaweb/templates/main.mako:120
+#: waskaweb/templates/main.mako:16 waskaweb/templates/main.mako:46
 msgid "sm_menu_link_home"
 msgstr ""
 
-#: waskaweb/templates/main.mako:91 waskaweb/templates/start/help.mako:4
+#: waskaweb/templates/main.mako:17 waskaweb/templates/start/help.mako:4
 msgid "sm_menu_link_help"
 msgstr ""
 
-#: waskaweb/templates/main.mako:92
+#: waskaweb/templates/main.mako:18
 #: waskaweb/templates/usersettings/change_password.mako:4
 #: waskaweb/templates/usersettings/show_settings.mako:4
 msgid "sm_menu_link_settings"
 msgstr ""
 
-#: waskaweb/templates/main.mako:93 waskaweb/templates/start/responsible.mako:4
+#: waskaweb/templates/main.mako:19 waskaweb/templates/start/responsible.mako:4
 msgid "sm_menu_link_responsible"
 msgstr ""
 
-#: waskaweb/templates/main.mako:94
+#: waskaweb/templates/main.mako:20
 msgid "sm_menu_link_logout"
 msgstr ""
 
-#: waskaweb/templates/main.mako:100 waskaweb/templates/main.mako:118
+#: waskaweb/templates/main.mako:26 waskaweb/templates/main.mako:44
 msgid "np_root"
 msgstr ""
 
-#: waskaweb/templates/main.mako:121
+#: waskaweb/templates/main.mako:47
 #: waskaweb/templates/appointments/dialogs/confirm.mako:4
 #: waskaweb/templates/appointments/dialogs/notificate_delete_appointment.mako:5
 #: waskaweb/templates/appointments/dialogs/success_delete_appointment.mako:5
+#: waskaweb/templates/caselifetime/dialogs/confirm_reopen.mako:5
 #: waskaweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako:5
 #: waskaweb/templates/casemanagement/dialogs/failed_delete_appointment.mako:6
 #: waskaweb/templates/casemanagement/dialogs/success_delete_appointment.mako:6
 msgid "menu_app_link_overview"
 msgstr ""
 
-#: waskaweb/templates/main.mako:122
+#: waskaweb/templates/main.mako:48
 msgid "menu_doc_link_overview"
 msgstr ""
 
-#: waskaweb/templates/main.mako:130 waskaweb/templates/main.mako:140
+#: waskaweb/templates/main.mako:56 waskaweb/templates/main.mako:66
 msgid "menu_header_cm"
 msgstr ""
 
-#: waskaweb/templates/main.mako:132 waskaweb/templates/main.mako:142
+#: waskaweb/templates/main.mako:58 waskaweb/templates/main.mako:68
 msgid "menu_cm_link_overview"
 msgstr ""
 
-#: waskaweb/templates/main.mako:133 waskaweb/templates/main.mako:147
+#: waskaweb/templates/main.mako:59
 #: waskaweb/templates/casemanagement/evaluation.mako:8
 msgid "cm_actions_link_evaluate"
 msgstr ""
 
-#: waskaweb/templates/main.mako:144
+#: waskaweb/templates/main.mako:70
 msgid "menu_cm_link_new"
 msgstr ""
 
-#: waskaweb/templates/main.mako:145
+#: waskaweb/templates/main.mako:71
 msgid "menu_cm_link_import"
 msgstr ""
 
-#: waskaweb/templates/main.mako:163
+#: waskaweb/templates/main.mako:90
 msgid "menu_header_adm"
 msgstr ""
 
-#: waskaweb/templates/main.mako:165
+#: waskaweb/templates/main.mako:92
 msgid "menu_adm_link_useroverview"
 msgstr ""
 
-#: waskaweb/templates/main.mako:168
+#: waskaweb/templates/main.mako:95
 msgid "menu_adm_link_usergroupoverview"
 msgstr ""
 
-#: waskaweb/templates/main.mako:171
+#: waskaweb/templates/main.mako:98
 msgid "menu_adm_link_showsettings"
 msgstr ""
 
-#: waskaweb/templates/main.mako:184
+#: waskaweb/templates/main.mako:111
 msgid "main_formular_input_error"
 msgstr ""
 
-#: waskaweb/templates/main.mako:197
+#: waskaweb/templates/main.mako:124
 msgid "footer_title"
 msgstr ""
 
-#: waskaweb/templates/main.mako:197
+#: waskaweb/templates/main.mako:124
 msgid "footer_version"
 msgstr ""
 
-#: waskaweb/templates/main_login.mako:38
+#: waskaweb/templates/main_login.mako:39
 msgid "main_login_bmf_phrase"
 msgstr ""
 
-#: waskaweb/templates/main_login.mako:59
+#: waskaweb/templates/main_login.mako:60
 msgid "main_login_formular_input_error"
 msgstr ""
 
@@ -938,6 +837,49 @@
 msgid "adm_overview_tbl_header_actions"
 msgstr ""
 
+#: waskaweb/templates/administration/overview_user.mako:43
+#: waskaweb/templates/administration/overview_user.mako:60
+#: waskaweb/templates/administration/overview_usergroups.mako:34
+#: waskaweb/templates/administration/overview_usergroups.mako:43
+#: waskaweb/templates/appointments/appointmentlist.mako:3
+#: waskaweb/templates/casemanagement/appointmentlist.mako:3
+#: waskaweb/templates/casemanagement/caselist.mako:75
+#: waskaweb/templates/casemanagement/caselist.mako:134
+#: waskaweb/templates/casemanagement/reminderlist.mako:4
+#: waskaweb/templates/documents/case_overview.mako:42
+#: waskaweb/templates/documents/case_overview.mako:53
+#: waskaweb/templates/documents/global_overview.mako:39
+#: waskaweb/templates/documents/global_overview.mako:40
+#: waskaweb/templates/documents/global_overview.mako:51
+#: waskaweb/templates/documents/global_overview.mako:52
+#: waskaweb/templates/start/appointmentlist.mako:6
+#: waskaweb/templates/start/appointmentlist.mako:9
+#: waskaweb/templates/start/appointmentlist.mako:13
+#: waskaweb/templates/start/globalappointmentlist.mako:4
+#: waskaweb/templates/start/remindlist.mako:4
+msgid "cm_overview_a_show"
+msgstr ""
+
+#: waskaweb/templates/administration/overview_user.mako:45
+#: waskaweb/templates/administration/overview_user.mako:62
+#: waskaweb/templates/administration/overview_usergroups.mako:35
+#: waskaweb/templates/administration/overview_usergroups.mako:44
+#: waskaweb/templates/appointments/appointmentlist.mako:5
+#: waskaweb/templates/casemanagement/agencylist.mako:32
+#: waskaweb/templates/casemanagement/agencylist.mako:42
+#: waskaweb/templates/casemanagement/appointmentlist.mako:5
+#: waskaweb/templates/casemanagement/caselist.mako:79
+#: waskaweb/templates/casemanagement/caselist.mako:89
+#: waskaweb/templates/casemanagement/caselist.mako:138
+#: waskaweb/templates/casemanagement/caselist.mako:148
+#: waskaweb/templates/casemanagement/reminderlist.mako:7
+#: waskaweb/templates/documents/case_overview.mako:44
+#: waskaweb/templates/documents/case_overview.mako:55
+#: waskaweb/templates/documents/global_overview.mako:42
+#: waskaweb/templates/documents/global_overview.mako:54
+msgid "cm_overview_a_delete"
+msgstr ""
+
 #: waskaweb/templates/administration/overview_usergroups.mako:13
 msgid "adm_header_usergroup_overview"
 msgstr ""
@@ -1184,13 +1126,6 @@
 #: waskaweb/templates/appointments/new.mako:12
 #: waskaweb/templates/appointments/overview.mako:4
 #: waskaweb/templates/appointments/show.mako:4
-#: waskaweb/templates/appointments/beta/show_1.mako:4
-#: waskaweb/templates/appointments/beta/show_2.mako:4
-#: waskaweb/templates/appointments/beta/show_3.mako:4
-#: waskaweb/templates/appointments/beta/show_4.mako:4
-#: waskaweb/templates/appointments/beta/show_5.mako:4
-#: waskaweb/templates/appointments/beta/show_6.mako:4
-#: waskaweb/templates/appointments/beta/show_7.mako:4
 #: waskaweb/templates/appointments/dialogs/confirm.mako:5
 #: waskaweb/templates/appointments/dialogs/notificate_delete_appointment.mako:6
 #: waskaweb/templates/appointments/dialogs/success_create_appointment.mako:5
@@ -1284,12 +1219,6 @@
 
 #: waskaweb/templates/appointments/new.mako:23
 #: waskaweb/templates/appointments/show.mako:20
-#: waskaweb/templates/appointments/beta/show_10.mako:15
-#: waskaweb/templates/appointments/beta/show_5.mako:15
-#: waskaweb/templates/appointments/beta/show_6.mako:15
-#: waskaweb/templates/appointments/beta/show_7.mako:14
-#: waskaweb/templates/appointments/beta/show_8.mako:15
-#: waskaweb/templates/appointments/beta/show_9.mako:15
 #: waskaweb/templates/casemanagement/newAppointment.mako:24
 #: waskaweb/templates/casemanagement/showAppointment.mako:23
 msgid "menu_app_link_overview_back"
@@ -1325,31 +1254,11 @@
 msgstr ""
 
 #: waskaweb/templates/appointments/show.mako:5
-#: waskaweb/templates/appointments/beta/show_1.mako:5
-#: waskaweb/templates/appointments/beta/show_10.mako:5
-#: waskaweb/templates/appointments/beta/show_2.mako:5
-#: waskaweb/templates/appointments/beta/show_3.mako:5
-#: waskaweb/templates/appointments/beta/show_4.mako:5
-#: waskaweb/templates/appointments/beta/show_5.mako:5
-#: waskaweb/templates/appointments/beta/show_6.mako:5
-#: waskaweb/templates/appointments/beta/show_7.mako:5
-#: waskaweb/templates/appointments/beta/show_8.mako:5
-#: waskaweb/templates/appointments/beta/show_9.mako:5
 #: waskaweb/templates/casemanagement/showAppointment.mako:6
 msgid "app_np_show"
 msgstr ""
 
 #: waskaweb/templates/appointments/show.mako:9
-#: waskaweb/templates/appointments/beta/show_1.mako:10
-#: waskaweb/templates/appointments/beta/show_10.mako:10
-#: waskaweb/templates/appointments/beta/show_2.mako:10
-#: waskaweb/templates/appointments/beta/show_3.mako:9
-#: waskaweb/templates/appointments/beta/show_4.mako:10
-#: waskaweb/templates/appointments/beta/show_5.mako:10
-#: waskaweb/templates/appointments/beta/show_6.mako:10
-#: waskaweb/templates/appointments/beta/show_7.mako:9
-#: waskaweb/templates/appointments/beta/show_8.mako:10
-#: waskaweb/templates/appointments/beta/show_9.mako:10
 #: waskaweb/templates/casemanagement/editAppointment.mako:18
 #: waskaweb/templates/casemanagement/showAppointment.mako:10
 msgid "app_header_show"
@@ -1379,20 +1288,6 @@
 msgid "app_table_description"
 msgstr ""
 
-#: waskaweb/templates/appointments/beta/show_1.mako:15
-#: waskaweb/templates/appointments/beta/show_2.mako:15
-#: waskaweb/templates/appointments/beta/show_3.mako:14
-#: waskaweb/templates/appointments/beta/show_4.mako:15
-msgid "sm_menu_link_home_back"
-msgstr ""
-
-#: waskaweb/templates/appointments/beta/show_10.mako:4
-#: waskaweb/templates/appointments/beta/show_8.mako:4
-#: waskaweb/templates/appointments/beta/show_9.mako:4
-#: waskaweb/templates/casemanagement/new_appointment.mako:6
-msgid "app_np_root"
-msgstr ""
-
 #: waskaweb/templates/appointments/dialogs/confirm.mako:6
 #: waskaweb/templates/appointments/dialogs/notificate_delete_appointment.mako:7
 #: waskaweb/templates/appointments/dialogs/success_delete_appointment.mako:7
@@ -1402,6 +1297,78 @@
 msgid "app_np_delete"
 msgstr ""
 
+#: waskaweb/templates/caselifetime/overview.mako:19
+#: waskaweb/templates/caselifetime/dialogs/confirm_reopen.mako:4
+#: waskaweb/templates/casemanagement/appointments.mako:4
+#: waskaweb/templates/casemanagement/digest.mako:6
+#: waskaweb/templates/casemanagement/editAppointment.mako:12
+#: waskaweb/templates/casemanagement/formular.mako:34
+#: waskaweb/templates/casemanagement/newAppointment.mako:12
+#: waskaweb/templates/casemanagement/newLogbookEntry.mako:8
+#: waskaweb/templates/casemanagement/new_appointment.mako:5
+#: waskaweb/templates/casemanagement/organisation.mako:6
+#: waskaweb/templates/casemanagement/phase.mako:6
+#: waskaweb/templates/casemanagement/showAppointment.mako:4
+#: waskaweb/templates/casemanagement/dialogs/confirm_anonymize.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_close.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete_aid.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako:4
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako:4
+#: waskaweb/templates/casemanagement/dialogs/confirm_markanonymize.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_markanonymizeFromOverview.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_open.mako:5
+#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:6
+#: waskaweb/templates/casemanagement/dialogs/failed_delete_appointment.mako:5
+#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete.mako:5
+#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete_from_overview.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_anonymize.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_case_close.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_create_appointment.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_delete_aid.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_delete_appointment.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_edit_appointment.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_markanonymize.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_set_phase.mako:6
+#: waskaweb/templates/documents/case_new.mako:5
+#: waskaweb/templates/documents/case_overview.mako:5
+#: waskaweb/templates/documents/dialogs/delete_attachment_success.mako:4
+#: waskaweb/templates/documents/dialogs/failed_attachment.mako:4
+#: waskaweb/templates/logbook/edit.mako:11 waskaweb/templates/logbook/new.mako:11
+#: waskaweb/templates/logbook/overview.mako:6
+#: waskaweb/templates/logbook/overview_print.mako:6
+#: waskaweb/templates/logbook/show.mako:5
+#: waskaweb/templates/logbook/dialogs/confirm_delete_logbook_entry.mako:5
+#: waskaweb/templates/logbook/dialogs/failed_create_logbook_entry.mako:5
+#: waskaweb/templates/logbook/dialogs/failed_delete_logbook_entry.mako:5
+#: waskaweb/templates/logbook/dialogs/failed_save_logbook_entry.mako:5
+#: waskaweb/templates/logbook/dialogs/failed_show_logbook_entry.mako:5
+#: waskaweb/templates/logbook/dialogs/success_create_logbook_entry.mako:5
+#: waskaweb/templates/logbook/dialogs/success_delete_logbook_entry.mako:5
+#: waskaweb/templates/logbook/dialogs/success_save_logbook_entry.mako:5
+#: waskaweb/templates/statement/edit.mako:5
+#: waskaweb/templates/statement/list_statements.mako:6
+#: waskaweb/templates/statement/dialogs/confirm.mako:5
+#: waskaweb/templates/statement/dialogs/ee_accept_failed.mako:5
+#: waskaweb/templates/statement/dialogs/ee_accept_success.mako:5
+#: waskaweb/templates/statement/dialogs/ee_decline_failed.mako:5
+#: waskaweb/templates/statement/dialogs/ee_decline_success.mako:5
+msgid "cm_np_select"
+msgstr ""
+
+#: waskaweb/templates/caselifetime/overview.mako:20
+#: waskaweb/templates/casemanagement/main.mako:74
+msgid "Verwaltung"
+msgstr ""
+
+#: waskaweb/templates/caselifetime/overview.mako:25
+msgid "Case Management Prozess"
+msgstr ""
+
+#: waskaweb/templates/caselifetime/overview.mako:38
+msgid "Verwaltungsaufgaben"
+msgstr ""
+
+#: waskaweb/templates/caselifetime/dialogs/success_reopen.mako:5
 #: waskaweb/templates/casemanagement/agency_overview.mako:6
 #: waskaweb/templates/casemanagement/bundle_editor.mako:6
 #: waskaweb/templates/casemanagement/bundle_standin.mako:6
@@ -1410,10 +1377,12 @@
 #: waskaweb/templates/casemanagement/downloadXML.mako:6
 #: waskaweb/templates/casemanagement/evaluation.mako:4
 #: waskaweb/templates/casemanagement/main.mako:10
+#: waskaweb/templates/casemanagement/neuaufnahme.mako:5
 #: waskaweb/templates/casemanagement/new.mako:5
 #: waskaweb/templates/casemanagement/overview.mako:6
 #: waskaweb/templates/casemanagement/phase.mako:5
 #: waskaweb/templates/casemanagement/upload.mako:6
+#: waskaweb/templates/casemanagement/wiederaufnahme.mako:5
 #: waskaweb/templates/casemanagement/dialogs/alert.mako:5
 #: waskaweb/templates/casemanagement/dialogs/bundle_noselection.mako:5
 #: waskaweb/templates/casemanagement/dialogs/confirm.mako:5
@@ -1432,6 +1401,7 @@
 #: waskaweb/templates/casemanagement/dialogs/success_delete_cm.mako:5
 #: waskaweb/templates/casemanagement/dialogs/success_markdelete.mako:5
 #: waskaweb/templates/casemanagement/dialogs/success_restore.mako:5
+#: waskaweb/templates/casemanagement/evaluation/evaluation_adele.mako:6
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:6
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:6
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:6
@@ -1441,6 +1411,14 @@
 msgid "cm_np_root"
 msgstr ""
 
+#: waskaweb/templates/caselifetime/dialogs/success_reopen.mako:6
+#: waskaweb/templates/casemanagement/dialogs/success_delete.mako:6
+#: waskaweb/templates/casemanagement/dialogs/success_delete_admin.mako:6
+#: waskaweb/templates/casemanagement/dialogs/success_delete_cm.mako:6
+#: waskaweb/templates/casemanagement/dialogs/success_markdelete.mako:6
+msgid "cm_np_delete_success"
+msgstr ""
+
 #: waskaweb/templates/casemanagement/agency_overview.mako:7
 #: waskaweb/templates/casemanagement/main.mako:11
 #: waskaweb/templates/casemanagement/overview.mako:7
@@ -1476,62 +1454,6 @@
 msgid "cm_overview_tbl_header_actions"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/appointments.mako:4
-#: waskaweb/templates/casemanagement/digest.mako:6
-#: waskaweb/templates/casemanagement/editAppointment.mako:12
-#: waskaweb/templates/casemanagement/formular.mako:34
-#: waskaweb/templates/casemanagement/newAppointment.mako:12
-#: waskaweb/templates/casemanagement/newLogbookEntry.mako:8
-#: waskaweb/templates/casemanagement/new_appointment.mako:5
-#: waskaweb/templates/casemanagement/organisation.mako:6
-#: waskaweb/templates/casemanagement/phase.mako:6
-#: waskaweb/templates/casemanagement/showAppointment.mako:4
-#: waskaweb/templates/casemanagement/dialogs/confirm_anonymize.mako:5
-#: waskaweb/templates/casemanagement/dialogs/confirm_close.mako:5
-#: waskaweb/templates/casemanagement/dialogs/confirm_delete_aid.mako:5
-#: waskaweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako:4
-#: waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako:4
-#: waskaweb/templates/casemanagement/dialogs/confirm_markanonymize.mako:5
-#: waskaweb/templates/casemanagement/dialogs/confirm_markanonymizeFromOverview.mako:5
-#: waskaweb/templates/casemanagement/dialogs/confirm_open.mako:5
-#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:6
-#: waskaweb/templates/casemanagement/dialogs/failed_delete_appointment.mako:5
-#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete.mako:5
-#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete_from_overview.mako:5
-#: waskaweb/templates/casemanagement/dialogs/success_anonymize.mako:5
-#: waskaweb/templates/casemanagement/dialogs/success_case_close.mako:5
-#: waskaweb/templates/casemanagement/dialogs/success_create_appointment.mako:5
-#: waskaweb/templates/casemanagement/dialogs/success_delete_aid.mako:5
-#: waskaweb/templates/casemanagement/dialogs/success_delete_appointment.mako:5
-#: waskaweb/templates/casemanagement/dialogs/success_edit_appointment.mako:5
-#: waskaweb/templates/casemanagement/dialogs/success_markanonymize.mako:5
-#: waskaweb/templates/casemanagement/dialogs/success_set_phase.mako:6
-#: waskaweb/templates/documents/case_new.mako:5
-#: waskaweb/templates/documents/case_overview.mako:5
-#: waskaweb/templates/documents/dialogs/delete_attachment_success.mako:4
-#: waskaweb/templates/documents/dialogs/failed_attachment.mako:4
-#: waskaweb/templates/logbook/edit.mako:11 waskaweb/templates/logbook/new.mako:11
-#: waskaweb/templates/logbook/overview.mako:6
-#: waskaweb/templates/logbook/overview_print.mako:6
-#: waskaweb/templates/logbook/show.mako:5
-#: waskaweb/templates/logbook/dialogs/confirm_delete_logbook_entry.mako:5
-#: waskaweb/templates/logbook/dialogs/failed_create_logbook_entry.mako:5
-#: waskaweb/templates/logbook/dialogs/failed_delete_logbook_entry.mako:5
-#: waskaweb/templates/logbook/dialogs/failed_save_logbook_entry.mako:5
-#: waskaweb/templates/logbook/dialogs/failed_show_logbook_entry.mako:5
-#: waskaweb/templates/logbook/dialogs/success_create_logbook_entry.mako:5
-#: waskaweb/templates/logbook/dialogs/success_delete_logbook_entry.mako:5
-#: waskaweb/templates/logbook/dialogs/success_save_logbook_entry.mako:5
-#: waskaweb/templates/statement/edit.mako:5
-#: waskaweb/templates/statement/list_statements.mako:6
-#: waskaweb/templates/statement/dialogs/confirm.mako:5
-#: waskaweb/templates/statement/dialogs/ee_accept_failed.mako:5
-#: waskaweb/templates/statement/dialogs/ee_accept_success.mako:5
-#: waskaweb/templates/statement/dialogs/ee_decline_failed.mako:5
-#: waskaweb/templates/statement/dialogs/ee_decline_success.mako:5
-msgid "cm_np_select"
-msgstr ""
-
 #: waskaweb/templates/casemanagement/bundle_editor.mako:7
 #: waskaweb/templates/casemanagement/dialogs/failed_seteditor.mako:5
 #: waskaweb/templates/casemanagement/dialogs/notificate_bundle_seteditor.mako:6
@@ -1656,59 +1578,64 @@
 msgid "cm_header_digest_youth"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:54
-#: waskaweb/templates/casemanagement/digest_body.mako:108
+#: waskaweb/templates/casemanagement/digest_body.mako:57
+#: waskaweb/templates/casemanagement/digest_body.mako:120
+#: waskaweb/templates/casemanagement/digest_body.mako:160
 msgid "cm_digest_tbl_label_lastname"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:58
-#: waskaweb/templates/casemanagement/digest_body.mako:112
+#: waskaweb/templates/casemanagement/digest_body.mako:61
+#: waskaweb/templates/casemanagement/digest_body.mako:124
+#: waskaweb/templates/casemanagement/digest_body.mako:164
 msgid "cm_digest_tbl_label_firstname"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:62
+#: waskaweb/templates/casemanagement/digest_body.mako:65
 msgid "cm_digest_tbl_label_caseid"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:66
+#: waskaweb/templates/casemanagement/digest_body.mako:69
 msgid "cm_digest_tbl_label_age"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:70
-#: waskaweb/templates/casemanagement/digest_body.mako:116
+#: waskaweb/templates/casemanagement/digest_body.mako:73
+#: waskaweb/templates/casemanagement/digest_body.mako:128
+#: waskaweb/templates/casemanagement/digest_body.mako:168
 msgid "cm_digest_tbl_label_email"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:80
+#: waskaweb/templates/casemanagement/digest_body.mako:85
 msgid "cm_digest_tbl_label_street"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:84
+#: waskaweb/templates/casemanagement/digest_body.mako:89
 msgid "cm_digest_tbl_label_plz"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:88
+#: waskaweb/templates/casemanagement/digest_body.mako:93
 msgid "cm_digest_tbl_label_city"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:92
-#: waskaweb/templates/casemanagement/digest_body.mako:126
+#: waskaweb/templates/casemanagement/digest_body.mako:97
+#: waskaweb/templates/casemanagement/digest_body.mako:101
+#: waskaweb/templates/casemanagement/digest_body.mako:140
+#: waskaweb/templates/casemanagement/digest_body.mako:144
 msgid "cm_digest_tbl_label_telephone"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:96
-#: waskaweb/templates/casemanagement/digest_body.mako:130
-msgid "cm_digest_tbl_label_mobiletelephone"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/digest_body.mako:100
+#: waskaweb/templates/casemanagement/digest_body.mako:105
 msgid "cm_digest_tbl_label_telephone_more"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:105
+#: waskaweb/templates/casemanagement/digest_body.mako:113
 msgid "cm_header_digest_parent"
 msgstr ""
 
+#: waskaweb/templates/casemanagement/digest_body.mako:180
+#: waskaweb/templates/casemanagement/digest_body.mako:184
+msgid "Telefon"
+msgstr ""
+
 #: waskaweb/templates/casemanagement/downloadCSV.mako:7
 #: waskaweb/templates/casemanagement/downloadXLS.mako:7
 #: waskaweb/templates/casemanagement/downloadXML.mako:7
@@ -1749,25 +1676,21 @@
 msgstr ""
 
 #: waskaweb/templates/casemanagement/formular.mako:17
-#: waskaweb/templates/casemanagement/formular.mako:83
+#: waskaweb/templates/casemanagement/formular.mako:66
 msgid "cm_actions_link_show"
 msgstr ""
 
 #: waskaweb/templates/casemanagement/formular.mako:19
-#: waskaweb/templates/casemanagement/formular.mako:85
+#: waskaweb/templates/casemanagement/formular.mako:68
 msgid "cm_actions_link_edit"
 msgstr ""
 
 #: waskaweb/templates/casemanagement/formular.mako:22
-#: waskaweb/templates/casemanagement/formular.mako:91
+#: waskaweb/templates/casemanagement/formular.mako:74
 msgid "cm_actions_link_printout"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/formular.mako:41
-msgid "cm_error_header_false_forminput"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/formular.mako:88
+#: waskaweb/templates/casemanagement/formular.mako:71
 msgid "cm_actions_link_printoutAidPlanStatement"
 msgstr ""
 
@@ -1780,7 +1703,7 @@
 msgstr ""
 
 #: waskaweb/templates/casemanagement/main.mako:22
-#: waskaweb/templates/casemanagement/phase.mako:16
+#: waskaweb/templates/casemanagement/phase.mako:21
 msgid "cm_info_phase"
 msgstr ""
 
@@ -1842,41 +1765,48 @@
 
 #: waskaweb/templates/casemanagement/main.mako:73
 #: waskaweb/templates/casemanagement/phase.mako:7
-#: waskaweb/templates/casemanagement/phase.mako:10
+#: waskaweb/templates/casemanagement/phase.mako:15
 #: waskaweb/templates/casemanagement/dialogs/success_set_phase.mako:7
 msgid "case_cm_phase"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/main.mako:74
+#: waskaweb/templates/casemanagement/main.mako:75
 msgid "cm_menu_link_organisation"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/main.mako:75
+#: waskaweb/templates/casemanagement/main.mako:76
 msgid "cm_menu_link_appointment"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/main.mako:77
+#: waskaweb/templates/casemanagement/main.mako:78
 msgid "cm_menu_link_documents"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/main.mako:83
+#: waskaweb/templates/casemanagement/main.mako:84
 msgid "cm_menu_header_structure"
 msgstr ""
 
+#: waskaweb/templates/casemanagement/neuaufnahme.mako:6
 #: waskaweb/templates/casemanagement/new.mako:6
+#: waskaweb/templates/casemanagement/wiederaufnahme.mako:6
 #: waskaweb/templates/casemanagement/dialogs/alert.mako:6
+#: waskaweb/templates/casemanagement/dialogs/failed_create_case.mako:5
 #: waskaweb/templates/casemanagement/static_form/statement.mako:6
 msgid "cm_np_new"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/new.mako:32
+#: waskaweb/templates/casemanagement/new.mako:53
 msgid "cm_new_p_please_consider_statement"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/new.mako:35
+#: waskaweb/templates/casemanagement/new.mako:56
 msgid "cm_new_con_acceptance_statement_true"
 msgstr ""
 
+#: waskaweb/templates/casemanagement/new_appointment.mako:6
+msgid "app_np_root"
+msgstr ""
+
 #: waskaweb/templates/casemanagement/new_appointment.mako:17
 msgid "cm_menu_link_appointment_back"
 msgstr ""
@@ -1918,15 +1848,15 @@
 msgid "cm_overview_con_list_dossiers_cm"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/phase.mako:18
+#: waskaweb/templates/casemanagement/phase.mako:23
 msgid "case_cm_phase_required_fields"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/phase.mako:19
+#: waskaweb/templates/casemanagement/phase.mako:24
 msgid "case_cm_phase_time"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/phase.mako:22
+#: waskaweb/templates/casemanagement/phase.mako:27
 msgid "case_cm_phase_change"
 msgstr ""
 
@@ -1945,8 +1875,7 @@
 msgid "cm_header_import"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/upload.mako:22
-#: waskaweb/templates/casemanagement/upload.mako:34
+#: waskaweb/templates/casemanagement/upload.mako:20
 msgid "cm_from_import_submit"
 msgstr ""
 
@@ -1964,6 +1893,7 @@
 #: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete.mako:6
 #: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete_from_overview.mako:6
 #: waskaweb/templates/casemanagement/dialogs/failed_xml_import.mako:5
+#: waskaweb/templates/casemanagement/dialogs/failed_xml_import2.mako:6
 #: waskaweb/templates/casemanagement/dialogs/success_anonymize.mako:6
 #: waskaweb/templates/casemanagement/dialogs/success_bundle_anonymize.mako:6
 #: waskaweb/templates/casemanagement/dialogs/success_markanonymize.mako:6
@@ -2038,6 +1968,12 @@
 msgid "agency_np_bundled_export_failed"
 msgstr ""
 
+#: waskaweb/templates/casemanagement/dialogs/failed_xml_import2.mako:24
+#: waskaweb/templates/dialogs/alert.mako:6 waskaweb/templates/dialogs/failed.mako:6
+#: waskaweb/templates/dialogs/success.mako:6
+msgid "dialog_header_confirm_option_ok"
+msgstr ""
+
 #: waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako:7
 msgid "cm_np_import_failed"
 msgstr ""
@@ -2046,13 +1982,6 @@
 msgid "cm_np_close_success"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/dialogs/success_delete.mako:6
-#: waskaweb/templates/casemanagement/dialogs/success_delete_admin.mako:6
-#: waskaweb/templates/casemanagement/dialogs/success_delete_cm.mako:6
-#: waskaweb/templates/casemanagement/dialogs/success_markdelete.mako:6
-msgid "cm_np_delete_success"
-msgstr ""
-
 #: waskaweb/templates/casemanagement/dialogs/success_delete_agency.mako:7
 msgid "agency_np_bundled_delete_success"
 msgstr ""
@@ -2093,23 +2022,23 @@
 msgid "eval_group_header_incm"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:43
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:13
-msgid "cm_eval_summary_header_3"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:51
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:50
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:10
 msgid "eval_group_header_finished"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:53
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:52
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:15
+msgid "cm_eval_summary_header_3"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:53
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:75
 msgid "cm_eval_summary_header_7"
 msgstr ""
 
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:55
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:78
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:138
 msgid "cm_eval_summary_header_15"
 msgstr ""
 
@@ -2141,19 +2070,18 @@
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:104
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:134
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:166
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:43
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:70
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:47
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:107
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:137
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:167
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:139
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:175
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:199
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:235
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:259
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:264
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:45
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:75
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:81
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:84
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:72
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:105
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:135
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:141
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:144
 msgid "cm_eval_table_to_overview"
 msgstr ""
 
@@ -2164,19 +2092,18 @@
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:104
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:134
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:166
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:43
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:70
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:47
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:107
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:137
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:167
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:139
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:175
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:199
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:235
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:259
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:264
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:45
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:75
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:81
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:84
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:72
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:105
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:135
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:141
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:144
 msgid "cm_eval_table_export_analysis"
 msgstr ""
 
@@ -2193,14 +2120,14 @@
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:79
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:109
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:141
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:78
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:112
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:144
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:174
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:206
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:242
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:20
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:50
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:18
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:52
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:84
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:114
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:146
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:182
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:80
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:110
 msgid "cm_eval_table_number"
 msgstr ""
 
@@ -2209,14 +2136,14 @@
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:80
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:110
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:142
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:79
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:113
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:145
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:175
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:207
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:243
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:21
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:51
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:19
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:53
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:85
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:115
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:147
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:183
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:81
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:111
 msgid "cm_eval_table_percent"
 msgstr ""
 
@@ -2252,72 +2179,53 @@
 msgid "eval_group_note_incm"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:17
-msgid "cm_eval_table_month"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:18
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:47
-msgid "cm_eval_table_completed"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:19
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:48
-msgid "cm_eval_table_early_completed"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:20
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:49
-msgid "cm_eval_table_aborted"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:74
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:14
 msgid "cm_eval_header_on_gender"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:17
 msgid "cm_eval_table_gender"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:83
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:23
 msgid "cm_eval_label_male"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:89
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:29
 msgid "cm_eval_label_female"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:95
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:35
 msgid "cm_eval_label_intersexual"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:101
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:41
 msgid "cm_eval_label_unknown"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:111
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:51
 msgid "cm_eval_table_age"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:143
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:205
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:241
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:83
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:145
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:181
 msgid "cm_eval_table_category"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:149
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:89
 msgid "cm_eval_label_migration_background"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:155
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:95
 msgid "cm_eval_label_no_migration_background"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:161
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:101
 msgid "cm_eval_label_ka_migration_background"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:173
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:113
 msgid "cm_eval_table_offer"
 msgstr ""
 
@@ -2326,10 +2234,29 @@
 msgstr ""
 
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:19
-msgid "cm_eval_table_place"
+msgid "cm_eval_table_month"
 msgstr ""
 
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:20
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:49
+msgid "cm_eval_table_completed"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:21
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:50
+msgid "cm_eval_table_early_completed"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:22
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:51
+msgid "cm_eval_table_aborted"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:79
+msgid "cm_eval_table_place"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:109
 msgid "cm_eval_table_law_change"
 msgstr ""
 
@@ -2337,11 +2264,6 @@
 msgid "dialog_header_alert"
 msgstr ""
 
-#: waskaweb/templates/dialogs/alert.mako:6 waskaweb/templates/dialogs/failed.mako:6
-#: waskaweb/templates/dialogs/success.mako:6
-msgid "dialog_header_confirm_option_ok"
-msgstr ""
-
 #: waskaweb/templates/dialogs/alert.mako:7
 msgid "dialog_header_confirm_option_cancel"
 msgstr ""
@@ -2380,7 +2302,7 @@
 
 #: waskaweb/templates/documents/case_new.mako:31
 #: waskaweb/templates/documents/global_upload.mako:28
-#: waskaweb/templates/documents/upload_body.mako:8
+#: waskaweb/templates/documents/upload_body.mako:10
 msgid "doc_form_upload_submit"
 msgstr ""
 
@@ -2444,7 +2366,7 @@
 msgstr ""
 
 #: waskaweb/templates/documents/global_upload.mako:25
-#: waskaweb/templates/documents/upload_body.mako:5
+#: waskaweb/templates/documents/upload_body.mako:7
 msgid "doc_form_upload_label_file"
 msgstr ""
 
@@ -2503,18 +2425,10 @@
 msgstr ""
 
 #: waskaweb/templates/statement/list_statements.mako:24
-msgid "statement_header_fp"
-msgstr ""
-
-#: waskaweb/templates/statement/list_statements.mako:26
-msgid "statement_explaination_fp"
-msgstr ""
-
-#: waskaweb/templates/statement/list_statements.mako:33
 msgid "statement_header_ud"
 msgstr ""
 
-#: waskaweb/templates/statement/list_statements.mako:35
+#: waskaweb/templates/statement/list_statements.mako:26
 msgid "statement_explaination_ud"
 msgstr ""
 

Modified: wasko/trunk/waskaweb/templates/documents/upload_body.mako
===================================================================
--- wasko/trunk/waskaweb/templates/documents/upload_body.mako	2009-04-06 07:26:01 UTC (rev 477)
+++ wasko/trunk/waskaweb/templates/documents/upload_body.mako	2009-04-06 08:01:23 UTC (rev 478)
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
 <div id="document">
 <p>Bereits existente Dateien mit gleichem Namen werden überschrieben!</p>
 <div id="waska_form">



More information about the Mpuls-commits mailing list