[Mpuls-commits] r2386 - in wasko/branches/2.0: jmdweb/templates/casemanagement mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/templates/casemanagement
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Apr 15 18:07:16 CEST 2010
Author: torsten
Date: 2010-04-15 18:07:11 +0200 (Thu, 15 Apr 2010)
New Revision: 2386
Added:
wasko/branches/2.0/mpulsweb/templates/casemanagement/new.mako
Removed:
wasko/branches/2.0/jmdweb/templates/casemanagement/new.mako
Modified:
wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot
Log:
Wald #1380: ?\195?\156bersetzung eingef?\195?\188gt
Deleted: wasko/branches/2.0/jmdweb/templates/casemanagement/new.mako
===================================================================
--- wasko/branches/2.0/jmdweb/templates/casemanagement/new.mako 2010-04-15 15:43:49 UTC (rev 2385)
+++ wasko/branches/2.0/jmdweb/templates/casemanagement/new.mako 2010-04-15 16:07:11 UTC (rev 2386)
@@ -1,121 +0,0 @@
-## -*- coding: utf-8 -*-
-<%inherit file="../main.mako" />
-
-<%def name="buildNavipath()">
- ${parent.buildNavipath()}
- <li><a href="/case/">${_('cm_np_root')}</a></li>
- <li><a href="/case/">${_('cm_np_new')}</a></li>
-</%def>
-
-<div class="waska_form">
- <form id="waska_form" action="/case/newAction" accept-charset="UTF-8"
- name="waska_form" method="POST">
- <h1>Neue Fallakte anlegen</h1>
- <fieldset>
- <legend>Basisdaten</legend>
- <table>
- <tr>
- <td class="label">
- <label for="name">Name:</label>
- </td>
- <td>
- <input class="field" type="text" size="50" maxlength="60"
- name="name" id="name" value="${c.case.last_name or ""}">
- </td>
- </tr>
- <tr>
- <td class="label">
- <label for="vorname">Vorname:</label>
- </td>
- <td>
- <input class="field" type="text" size="50" maxlength="60"
- name="vorname" id="vorname"
- value="${c.case.first_name or ""}">
- </td>
- </tr>
- ##<tr>
- ## <td class="label">
- ## <label for="addresse_strasse">Strasse:</label>
- ## </td>
- ## <td>
- ## <input class="field" type="text" size="50" maxlength="60"
- ## name="addresse_strasse" id="addresse_strasse"
- ## value="${c.case.street or ""}">
- ## </td>
- ##</tr>
- ##<tr>
- ## <td class="label">
- ## <label for="addresse_strassenr">Strasse Nr.:</label>
- ## </td>
- ## <td>
- ## <input class="field" type="text" size="50" maxlength="60"
- ## name="addresse_strassenr" id="addresse_strassenr"
- ## value="${c.case.streetnr or ""}">
- ## </td>
- ##</tr>
- ##<tr>
- ## <td class="label">
- ## <label for="addresse_plz">PLZ:</label>
- ## </td>
- ## <td>
- ## <input class="field" type="text" size="50" maxlength="60"
- ## name="addresse_plz" id="addresse_plz"
- ## value="${c.case.plz or ""}">
- ## </td>
- ##</tr>
- ##<tr>
- ## <td class="label">
- ## <label for="addresse_ort">Ort:</label>
- ## </td>
- ## <td>
- ## <input class="field" type="text" size="50" maxlength="60"
- ## name="addresse_ort" id="addresse_ort"
- ## value="${c.case.city or ""}">
- ## </td>
- ##</tr>
- </table>
- </fieldset>
- <div style="padding: 1em 0;">
- <p>${_('cm_new_p_please_consider_statement')}</p>
- </div>
- ##<div class="waska_form_element w100">
- ## Als PDF-Version verfügbare Einverständniserklärungen zum
- ## handschriftlichen Ausfüllen:
- ## <table>
- ## <tr>
- ## <td class="table_row_h">
- ## Arabisch <a href="/documents/ee_ar.pdf">download</a>
- ## </td>
- ## <td class="table_row_h">
- ## Englisch <a href="/documents/ee_en.pdf">download</a>
- ## </td>
- ## </tr>
- ## <tr>
- ## <td>Polnisch <a href="/documents/ee_pl.pdf">download</a></td>
- ## <td>Russisch <a href="/documents/ee_ru.pdf">download</a></td>
- ## </tr>
- ## <tr>
- ## <td class="table_row_h">
- ## Türkisch <a href="/documents/ee_tr.pdf">download</a>
- ## </td>
- ## <td class="table_row_h">
- ## Deutsch
- ## (Einwilligungserklärung ohne Hinweise zu Teilnehmernachweisen)
- ## <a href="/documents/ee_de_ohnetn.pdf">download</a>
- ## </td>
- ## </tr>
- ## </table>
- ##</div>
- <div class="waska_form_element w100">
- <input type="checkbox" id="statement_signed" name="statement_signed">
- <label for="statement_signed">
- ${_('cm_new_con_acceptance_statement_true')}
- </label>
- </div>
- <div class="input_space">
- <input type="hidden" name="page" value="page_1">
- <input type="submit" value="Erklärung drucken" name="print">
- <input type="submit" value="Fallakte anlegen" name="save">
- </div>
- </form>
-</div>
Modified: wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2010-04-15 15:43:49 UTC (rev 2385)
+++ wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2010-04-15 16:07:11 UTC (rev 2386)
@@ -8,8 +8,8 @@
"Project-Id-Version: mpulsweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
"POT-Creation-Date: 2009-10-08 09:54+0200\n"
-"PO-Revision-Date: 2010-04-15 12:51+0100\n"
-"Last-Translator: Roland Geider <roland.geider at intevation.de>\n"
+"PO-Revision-Date: 2010-04-15 18:04+0100\n"
+"Last-Translator: Torsten Irländer <torsten.irlaender at intevation.de>\n"
"Language-Team: de <LL at li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"MIME-Version: 1.0\n"
@@ -159,6 +159,14 @@
msgid "Evaluation relevant field"
msgstr "Auswertungsrelevantes Feld"
+#: mpulsweb/controllers/case.py:381
+msgid "Case storage extended"
+msgstr "Aufbewahrung verlängert"
+
+#: mpulsweb/controllers/case.py:382
+msgid "Please click on \"OK\" to continue"
+msgstr "Die maximale Aufbewahrungsdauer wurde erfolgreich verlängert. Bitte klicken Sie auf \"OK\", um fortzufahren."
+
#: mpulsweb/controllers/evaluate.py:106
#: mpulsweb/controllers/evaluate.py:225
msgid "Error: Evaluation failed"
@@ -206,89 +214,86 @@
#: mpulsweb/lib/navigation.py:169
#: mpulsweb/lib/navigation.py:180
-#: mpulsweb/lib/navigation.py:188
+#: mpulsweb/lib/navigation.py:190
msgid "entry"
msgstr "Eintrag"
#: mpulsweb/lib/navigation.py:169
#: mpulsweb/lib/navigation.py:180
-#: mpulsweb/lib/navigation.py:188
+#: mpulsweb/lib/navigation.py:190
msgid "Open page"
msgstr "Öffne Seite"
-#: mpulsweb/lib/renderer.py:237
-#: mpulsweb/lib/renderer.py:258
+#: mpulsweb/lib/renderer.py:242
+#: mpulsweb/lib/renderer.py:271
msgid "Save"
msgstr "Speichern"
-#: mpulsweb/lib/renderer.py:241
-#: mpulsweb/lib/renderer.py:263
+#: mpulsweb/lib/renderer.py:250
+#: mpulsweb/lib/renderer.py:279
msgid "Save and proceed"
msgstr "Speichern und Weiter"
-#: mpulsweb/lib/renderer.py:421
-#: mpulsweb/lib/renderer.py:485
-msgid "Delete"
-msgstr "Löschen"
-
-#: mpulsweb/lib/renderer.py:434
-#: mpulsweb/lib/renderer.py:437
-#: mpulsweb/lib/renderer.py:480
-msgid "Create new"
-msgstr "Erstelle neu"
-
-#: mpulsweb/lib/renderer.py:457
+#: mpulsweb/lib/renderer.py:470
msgid "Select first"
msgstr "Wähle Erstes"
-#: mpulsweb/lib/renderer.py:462
+#: mpulsweb/lib/renderer.py:475
msgid "Select previous"
msgstr "Wähle Vorheriges"
-#: mpulsweb/lib/renderer.py:467
+#: mpulsweb/lib/renderer.py:480
msgid "Select next"
msgstr "Wähle Nächstes"
-#: mpulsweb/lib/renderer.py:472
+#: mpulsweb/lib/renderer.py:485
msgid "Select last"
msgstr "Wähle Letztes"
-#: mpulsweb/lib/renderer.py:922
+#: mpulsweb/lib/renderer.py:493
+msgid "Create new"
+msgstr "Erstelle neu"
+
+#: mpulsweb/lib/renderer.py:498
+msgid "Delete"
+msgstr "Löschen"
+
+#: mpulsweb/lib/renderer.py:938
#: mpulsweb/templates/evaluation/evaluate.mako:24
#: mpulsweb/templates/evaluation/evaluate_adele.mako:24
msgid "Description"
msgstr "Beschreibung"
-#: mpulsweb/lib/renderer.py:923
+#: mpulsweb/lib/renderer.py:939
#: mpulsweb/templates/phase/phase.mako:27
msgid "Actions"
msgstr "Aktionen"
-#: mpulsweb/lib/renderer.py:955
+#: mpulsweb/lib/renderer.py:971
msgid "view"
msgstr "Ansehen"
-#: mpulsweb/lib/renderer.py:961
+#: mpulsweb/lib/renderer.py:977
msgid "delete"
msgstr "löschen"
-#: mpulsweb/lib/renderer.py:968
+#: mpulsweb/lib/renderer.py:984
msgid "Items found"
msgstr "Einträge gefunden"
-#: mpulsweb/lib/renderer.py:975
+#: mpulsweb/lib/renderer.py:991
msgid "Create new item"
msgstr "Erstelle neuen Eintrag"
-#: mpulsweb/lib/renderer.py:991
+#: mpulsweb/lib/renderer.py:1007
msgid "Formular errors"
msgstr "Fehlerhafte Formulareingabe"
-#: mpulsweb/lib/renderer.py:993
+#: mpulsweb/lib/renderer.py:1009
msgid "Formular warnings"
msgstr "Formular Warnungen"
-#: mpulsweb/lib/renderer.py:1021
+#: mpulsweb/lib/renderer.py:1037
msgid "Restore last valid value"
msgstr "Stelle letzten gültigen Wert wieder her"
@@ -305,42 +310,42 @@
msgid "Startdatum muss vor oder gleich dem Enddatum liegen"
msgstr "Startdatum muss vor oder gleich dem Enddatum liegen"
-#: mpulsweb/model/case.py:1061
-#: mpulsweb/model/case.py:1062
+#: mpulsweb/model/case.py:1072
+#: mpulsweb/model/case.py:1073
#: mpulsweb/templates/casemanagement/caselist.mako:104
#: mpulsweb/templates/casemanagement/caselist.mako:105
msgid "case_state_label_open"
msgstr "Bearbeitbar"
-#: mpulsweb/model/case.py:1063
+#: mpulsweb/model/case.py:1074
msgid "case_state_label_outstanding_delete"
msgstr "Schwebend gelöscht"
-#: mpulsweb/model/case.py:1064
+#: mpulsweb/model/case.py:1075
msgid "case_state_label_outstanding_anon"
msgstr "Schwebend anonymisiert"
-#: mpulsweb/model/case.py:1065
+#: mpulsweb/model/case.py:1076
msgid "case_state_label_anon"
msgstr "Anonymisiert"
-#: mpulsweb/model/case.py:1119
+#: mpulsweb/model/case.py:1130
#: mpulsweb/templates/phase/phase.mako:40
msgid "Running"
msgstr "Laufend"
-#: mpulsweb/model/case.py:1121
+#: mpulsweb/model/case.py:1132
#: mpulsweb/templates/phase/phase.mako:42
#: mpulsweb/templates/phase/phase.mako:44
msgid "Finished"
msgstr "Beendet"
-#: mpulsweb/model/phase.py:241
+#: mpulsweb/model/phase.py:246
msgid "No required fields found"
msgstr "Keine Pflichtfelder gefunden"
#: mpulsweb/templates/base.mako:6
-#: mpulsweb/templates/main.mako:201
+#: mpulsweb/templates/main.mako:202
msgid "main_formular_input_error"
msgstr "Fehlerhafte Formulareingabe"
@@ -348,42 +353,43 @@
msgid "statusbar_logininfo"
msgstr "Angemeldet als"
-#: mpulsweb/templates/main.mako:17
-#: mpulsweb/templates/main.mako:34
+#: mpulsweb/templates/main.mako:8
+#: mpulsweb/templates/main.mako:18
+#: mpulsweb/templates/main.mako:35
#: mpulsweb/templates/usersettings/change_password.mako:4
#: mpulsweb/templates/usersettings/show_settings.mako:4
msgid "sm_menu_link_settings"
msgstr "Mein Konto"
-#: mpulsweb/templates/main.mako:27
-#: mpulsweb/templates/main.mako:92
+#: mpulsweb/templates/main.mako:28
+#: mpulsweb/templates/main.mako:93
msgid "sm_menu_link_home"
msgstr "Schwarzes Brett"
-#: mpulsweb/templates/main.mako:40
-#: mpulsweb/templates/main.mako:216
+#: mpulsweb/templates/main.mako:41
+#: mpulsweb/templates/main.mako:217
msgid "sm_menu_link_responsible"
msgstr "Info"
-#: mpulsweb/templates/main.mako:45
-#: mpulsweb/templates/main.mako:48
+#: mpulsweb/templates/main.mako:46
#: mpulsweb/templates/main.mako:49
+#: mpulsweb/templates/main.mako:50
msgid "sm_menu_link_help"
msgstr "Hilfe"
-#: mpulsweb/templates/main.mako:56
-#: mpulsweb/templates/main.mako:59
+#: mpulsweb/templates/main.mako:57
#: mpulsweb/templates/main.mako:60
+#: mpulsweb/templates/main.mako:61
msgid "sm_menu_link_logout"
msgstr "Abmelden"
-#: mpulsweb/templates/main.mako:70
-#: mpulsweb/templates/main.mako:88
+#: mpulsweb/templates/main.mako:71
+#: mpulsweb/templates/main.mako:89
#, python-format
msgid "%s Start"
msgstr "%s Start"
-#: mpulsweb/templates/main.mako:100
+#: mpulsweb/templates/main.mako:101
#: mpulsweb/templates/appointments/dialogs/confirm.mako:4
#: mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako:5
#: mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako:5
@@ -391,45 +397,45 @@
msgid "menu_app_link_overview"
msgstr "Termine"
-#: mpulsweb/templates/main.mako:109
+#: mpulsweb/templates/main.mako:110
msgid "menu_doc_link_overview"
msgstr "Dokumente"
-#: mpulsweb/templates/main.mako:120
+#: mpulsweb/templates/main.mako:121
msgid "menu_header_cm"
msgstr "Case-Management"
-#: mpulsweb/templates/main.mako:125
+#: mpulsweb/templates/main.mako:126
msgid "menu_cm_link_overview"
msgstr "Fallakten\t"
-#: mpulsweb/templates/main.mako:131
+#: mpulsweb/templates/main.mako:132
msgid "menu_cm_link_new"
msgstr "Fallakte anlegen"
-#: mpulsweb/templates/main.mako:137
+#: mpulsweb/templates/main.mako:138
msgid "menu_cm_link_import"
msgstr "Fallakte importieren"
-#: mpulsweb/templates/main.mako:149
+#: mpulsweb/templates/main.mako:150
#: mpulsweb/templates/evaluation/evaluate.mako:69
#: mpulsweb/templates/evaluation/evaluate_adele.mako:68
msgid "Evaluations"
msgstr "Auswertungen"
-#: mpulsweb/templates/main.mako:162
+#: mpulsweb/templates/main.mako:163
msgid "menu_header_adm"
msgstr "Administration"
-#: mpulsweb/templates/main.mako:167
+#: mpulsweb/templates/main.mako:168
msgid "menu_adm_link_useroverview"
msgstr "Benutzer"
-#: mpulsweb/templates/main.mako:173
+#: mpulsweb/templates/main.mako:174
msgid "menu_adm_link_usergroupoverview"
msgstr "Benutzergruppen"
-#: mpulsweb/templates/main.mako:178
+#: mpulsweb/templates/main.mako:179
msgid "menu_adm_link_showsettings"
msgstr "Einrichtung"
@@ -533,59 +539,59 @@
msgid "menu_adm_link_useredit_back"
msgstr "Zurück zu: Benutzeransicht"
-#: mpulsweb/templates/administration/edit_user.mako:35
+#: mpulsweb/templates/administration/edit_user.mako:38
#: mpulsweb/templates/administration/new_user.mako:39
#: mpulsweb/templates/administration/new_user_result.mako:22
#: mpulsweb/templates/administration/show_user_body.mako:2
msgid "adm_form_legend_personal"
msgstr "Angaben zur Person"
-#: mpulsweb/templates/administration/edit_user.mako:38
-#: mpulsweb/templates/administration/edit_user.mako:41
+#: mpulsweb/templates/administration/edit_user.mako:44
+#: mpulsweb/templates/administration/edit_user.mako:47
#: mpulsweb/templates/administration/new_user.mako:43
#: mpulsweb/templates/administration/new_user.mako:49
msgid "adm_form_user_firstname"
msgstr "Vorname"
-#: mpulsweb/templates/administration/edit_user.mako:47
-#: mpulsweb/templates/administration/edit_user.mako:50
+#: mpulsweb/templates/administration/edit_user.mako:54
+#: mpulsweb/templates/administration/edit_user.mako:57
#: mpulsweb/templates/administration/new_user.mako:57
#: mpulsweb/templates/administration/new_user.mako:63
msgid "adm_form_user_lastname"
msgstr "Nachname"
-#: mpulsweb/templates/administration/edit_user.mako:56
+#: mpulsweb/templates/administration/edit_user.mako:65
#: mpulsweb/templates/administration/new_user.mako:69
msgid "adm_form_user_telephone"
msgstr "Telefon"
-#: mpulsweb/templates/administration/edit_user.mako:61
+#: mpulsweb/templates/administration/edit_user.mako:69
msgid "adm_form_user_roomnumer"
msgstr "Raumnummer"
-#: mpulsweb/templates/administration/edit_user.mako:66
+#: mpulsweb/templates/administration/edit_user.mako:75
#: mpulsweb/templates/administration/new_user.mako:78
msgid "adm_form_user_branchoffice"
msgstr "Filiale"
-#: mpulsweb/templates/administration/edit_user.mako:70
+#: mpulsweb/templates/administration/edit_user.mako:84
#: mpulsweb/templates/administration/new_user.mako:84
#: mpulsweb/templates/administration/new_user_result.mako:46
#: mpulsweb/templates/usersettings/change_password_login.mako:17
msgid "adm_form_legend_login"
msgstr "Angaben zum Konto"
-#: mpulsweb/templates/administration/edit_user.mako:88
+#: mpulsweb/templates/administration/edit_user.mako:102
#: mpulsweb/templates/administration/new_user.mako:111
msgid "adm_form_user_activated"
msgstr "Benutzer darf sich anmelden"
-#: mpulsweb/templates/administration/edit_user.mako:96
+#: mpulsweb/templates/administration/edit_user.mako:110
#: mpulsweb/templates/administration/new_user.mako:115
msgid "adm_form_user_newpass"
msgstr "Benutzer muss bei der nächsten Anmeldung das Passwort setzen"
-#: mpulsweb/templates/administration/edit_user.mako:99
+#: mpulsweb/templates/administration/edit_user.mako:113
#: mpulsweb/templates/administration/new_user.mako:118
msgid "adm_form_user_submit"
msgstr "Benutzer speichern"
@@ -1251,6 +1257,7 @@
#: mpulsweb/templates/casebundle/dialogs/success_markdelete.mako:5
#: mpulsweb/templates/casebundle/dialogs/success_standin.mako:5
#: mpulsweb/templates/casemanagement/main.mako:8
+#: mpulsweb/templates/casemanagement/new.mako:6
#: mpulsweb/templates/casemanagement/overview.mako:6
#: mpulsweb/templates/casemanagement/dialogs/confirm.mako:5
#: mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako:5
@@ -1258,6 +1265,7 @@
#: mpulsweb/templates/casemanagement/dialogs/success_delete.mako:5
#: mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako:4
#: mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako:5
#: mpulsweb/templates/casemanagement/dialogs/success_restore.mako:5
#: mpulsweb/templates/phase/phase.mako:5
#: mpulsweb/templates/privacy/dialogs/missing_statement.mako:5
@@ -1537,6 +1545,19 @@
msgid "cm_menu_header_structure"
msgstr "Gliederung"
+#: mpulsweb/templates/casemanagement/new.mako:7
+#| msgid "cm_np_show"
+msgid "cm_np_new"
+msgstr "Fallakte anlegen"
+
+#: mpulsweb/templates/casemanagement/new.mako:79
+msgid "cm_new_p_please_consider_statement"
+msgstr "Bitte beachten Sie, dass die Einverständniserklärung die Grundlage zur Erfassung personenbezogener Daten ist. Bitte klicken Sie hierzu auf die Auswahl 'Erklärung drucken'. Bitte nutzen Sie den 'Zurück'-Knopf Ihres Browsers, um nach dem Drucken auf diese Seite zurückzukehren."
+
+#: mpulsweb/templates/casemanagement/new.mako:112
+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"
+
#: mpulsweb/templates/casemanagement/organisation.mako:7
msgid "cm_np_organisation"
msgstr "Organisation"
@@ -1649,6 +1670,11 @@
msgid "cm_np_delete_attachment_success"
msgstr "Anlage gelöscht!"
+#: mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako:6
+#| msgid "cm_np_delete_success"
+msgid "cm_np_keepactive_success"
+msgstr "Aufbewahrung verlängert"
+
#: mpulsweb/templates/casemanagement/dialogs/success_restore.mako:6
msgid "cm_np_restore_success"
msgstr "Wiederherstellen erfolgreich!"
@@ -2120,6 +2146,3 @@
msgid "adm_np_changepassword"
msgstr "Benutzerpasswort geändert!"
-#~ msgid "Duration"
-#~ msgstr "Dauer"
-
Modified: wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot 2010-04-15 15:43:49 UTC (rev 2385)
+++ wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot 2010-04-15 16:07:11 UTC (rev 2386)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: mpulsweb 0.1\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2010-04-14 10:35+0200\n"
+"POT-Creation-Date: 2010-04-15 17:58+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"
@@ -162,6 +162,14 @@
msgid "Evaluation relevant field"
msgstr ""
+#: mpulsweb/controllers/case.py:381
+msgid "Case storage extended"
+msgstr ""
+
+#: mpulsweb/controllers/case.py:382
+msgid "Please click on \"OK\" to continue"
+msgstr ""
+
#: mpulsweb/controllers/evaluate.py:106 mpulsweb/controllers/evaluate.py:225
msgid "Error: Evaluation failed"
msgstr ""
@@ -207,82 +215,81 @@
msgstr ""
#: mpulsweb/lib/navigation.py:169 mpulsweb/lib/navigation.py:180
-#: mpulsweb/lib/navigation.py:188
+#: mpulsweb/lib/navigation.py:190
msgid "entry"
msgstr ""
#: mpulsweb/lib/navigation.py:169 mpulsweb/lib/navigation.py:180
-#: mpulsweb/lib/navigation.py:188
+#: mpulsweb/lib/navigation.py:190
msgid "Open page"
msgstr ""
-#: mpulsweb/lib/renderer.py:237 mpulsweb/lib/renderer.py:258
+#: mpulsweb/lib/renderer.py:242 mpulsweb/lib/renderer.py:271
msgid "Save"
msgstr ""
-#: mpulsweb/lib/renderer.py:241 mpulsweb/lib/renderer.py:263
+#: mpulsweb/lib/renderer.py:250 mpulsweb/lib/renderer.py:279
msgid "Save and proceed"
msgstr ""
-#: mpulsweb/lib/renderer.py:421 mpulsweb/lib/renderer.py:485
-msgid "Delete"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:434 mpulsweb/lib/renderer.py:437
-#: mpulsweb/lib/renderer.py:480
-msgid "Create new"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:457
+#: mpulsweb/lib/renderer.py:470
msgid "Select first"
msgstr ""
-#: mpulsweb/lib/renderer.py:462
+#: mpulsweb/lib/renderer.py:475
msgid "Select previous"
msgstr ""
-#: mpulsweb/lib/renderer.py:467
+#: mpulsweb/lib/renderer.py:480
msgid "Select next"
msgstr ""
-#: mpulsweb/lib/renderer.py:472
+#: mpulsweb/lib/renderer.py:485
msgid "Select last"
msgstr ""
-#: mpulsweb/lib/renderer.py:922 mpulsweb/templates/evaluation/evaluate.mako:24
+#: mpulsweb/lib/renderer.py:493
+msgid "Create new"
+msgstr ""
+
+#: mpulsweb/lib/renderer.py:498
+msgid "Delete"
+msgstr ""
+
+#: mpulsweb/lib/renderer.py:938 mpulsweb/templates/evaluation/evaluate.mako:24
#: mpulsweb/templates/evaluation/evaluate_adele.mako:24
msgid "Description"
msgstr ""
-#: mpulsweb/lib/renderer.py:923 mpulsweb/templates/phase/phase.mako:27
+#: mpulsweb/lib/renderer.py:939 mpulsweb/templates/phase/phase.mako:27
msgid "Actions"
msgstr ""
-#: mpulsweb/lib/renderer.py:955
+#: mpulsweb/lib/renderer.py:971
msgid "view"
msgstr ""
-#: mpulsweb/lib/renderer.py:961
+#: mpulsweb/lib/renderer.py:977
msgid "delete"
msgstr ""
-#: mpulsweb/lib/renderer.py:968
+#: mpulsweb/lib/renderer.py:984
msgid "Items found"
msgstr ""
-#: mpulsweb/lib/renderer.py:975
+#: mpulsweb/lib/renderer.py:991
msgid "Create new item"
msgstr ""
-#: mpulsweb/lib/renderer.py:991
+#: mpulsweb/lib/renderer.py:1007
msgid "Formular errors"
msgstr ""
-#: mpulsweb/lib/renderer.py:993
+#: mpulsweb/lib/renderer.py:1009
msgid "Formular warnings"
msgstr ""
-#: mpulsweb/lib/renderer.py:1021
+#: mpulsweb/lib/renderer.py:1037
msgid "Restore last valid value"
msgstr ""
@@ -298,38 +305,38 @@
msgid "Startdatum muss vor oder gleich dem Enddatum liegen"
msgstr ""
-#: mpulsweb/model/case.py:1061 mpulsweb/model/case.py:1062
+#: mpulsweb/model/case.py:1072 mpulsweb/model/case.py:1073
#: mpulsweb/templates/casemanagement/caselist.mako:104
#: mpulsweb/templates/casemanagement/caselist.mako:105
msgid "case_state_label_open"
msgstr ""
-#: mpulsweb/model/case.py:1063
+#: mpulsweb/model/case.py:1074
msgid "case_state_label_outstanding_delete"
msgstr ""
-#: mpulsweb/model/case.py:1064
+#: mpulsweb/model/case.py:1075
msgid "case_state_label_outstanding_anon"
msgstr ""
-#: mpulsweb/model/case.py:1065
+#: mpulsweb/model/case.py:1076
msgid "case_state_label_anon"
msgstr ""
-#: mpulsweb/model/case.py:1119 mpulsweb/templates/phase/phase.mako:40
+#: mpulsweb/model/case.py:1130 mpulsweb/templates/phase/phase.mako:40
msgid "Running"
msgstr ""
-#: mpulsweb/model/case.py:1121 mpulsweb/templates/phase/phase.mako:42
+#: mpulsweb/model/case.py:1132 mpulsweb/templates/phase/phase.mako:42
#: mpulsweb/templates/phase/phase.mako:44
msgid "Finished"
msgstr ""
-#: mpulsweb/model/phase.py:241
+#: mpulsweb/model/phase.py:246
msgid "No required fields found"
msgstr ""
-#: mpulsweb/templates/base.mako:6 mpulsweb/templates/main.mako:201
+#: mpulsweb/templates/base.mako:6 mpulsweb/templates/main.mako:202
msgid "main_formular_input_error"
msgstr ""
@@ -337,36 +344,37 @@
msgid "statusbar_logininfo"
msgstr ""
-#: mpulsweb/templates/main.mako:17 mpulsweb/templates/main.mako:34
+#: mpulsweb/templates/main.mako:8 mpulsweb/templates/main.mako:18
+#: mpulsweb/templates/main.mako:35
#: mpulsweb/templates/usersettings/change_password.mako:4
#: mpulsweb/templates/usersettings/show_settings.mako:4
msgid "sm_menu_link_settings"
msgstr ""
-#: mpulsweb/templates/main.mako:27 mpulsweb/templates/main.mako:92
+#: mpulsweb/templates/main.mako:28 mpulsweb/templates/main.mako:93
msgid "sm_menu_link_home"
msgstr ""
-#: mpulsweb/templates/main.mako:40 mpulsweb/templates/main.mako:216
+#: mpulsweb/templates/main.mako:41 mpulsweb/templates/main.mako:217
msgid "sm_menu_link_responsible"
msgstr ""
-#: mpulsweb/templates/main.mako:45 mpulsweb/templates/main.mako:48
-#: mpulsweb/templates/main.mako:49
+#: mpulsweb/templates/main.mako:46 mpulsweb/templates/main.mako:49
+#: mpulsweb/templates/main.mako:50
msgid "sm_menu_link_help"
msgstr ""
-#: mpulsweb/templates/main.mako:56 mpulsweb/templates/main.mako:59
-#: mpulsweb/templates/main.mako:60
+#: mpulsweb/templates/main.mako:57 mpulsweb/templates/main.mako:60
+#: mpulsweb/templates/main.mako:61
msgid "sm_menu_link_logout"
msgstr ""
-#: mpulsweb/templates/main.mako:70 mpulsweb/templates/main.mako:88
+#: mpulsweb/templates/main.mako:71 mpulsweb/templates/main.mako:89
#, python-format
msgid "%s Start"
msgstr ""
-#: mpulsweb/templates/main.mako:100
+#: mpulsweb/templates/main.mako:101
#: mpulsweb/templates/appointments/dialogs/confirm.mako:4
#: mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako:5
#: mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako:5
@@ -374,44 +382,44 @@
msgid "menu_app_link_overview"
msgstr ""
-#: mpulsweb/templates/main.mako:109
+#: mpulsweb/templates/main.mako:110
msgid "menu_doc_link_overview"
msgstr ""
-#: mpulsweb/templates/main.mako:120
+#: mpulsweb/templates/main.mako:121
msgid "menu_header_cm"
msgstr ""
-#: mpulsweb/templates/main.mako:125
+#: mpulsweb/templates/main.mako:126
msgid "menu_cm_link_overview"
msgstr ""
-#: mpulsweb/templates/main.mako:131
+#: mpulsweb/templates/main.mako:132
msgid "menu_cm_link_new"
msgstr ""
-#: mpulsweb/templates/main.mako:137
+#: mpulsweb/templates/main.mako:138
msgid "menu_cm_link_import"
msgstr ""
-#: mpulsweb/templates/main.mako:149 mpulsweb/templates/evaluation/evaluate.mako:69
+#: mpulsweb/templates/main.mako:150 mpulsweb/templates/evaluation/evaluate.mako:69
#: mpulsweb/templates/evaluation/evaluate_adele.mako:68
msgid "Evaluations"
msgstr ""
-#: mpulsweb/templates/main.mako:162
+#: mpulsweb/templates/main.mako:163
msgid "menu_header_adm"
msgstr ""
-#: mpulsweb/templates/main.mako:167
+#: mpulsweb/templates/main.mako:168
msgid "menu_adm_link_useroverview"
msgstr ""
-#: mpulsweb/templates/main.mako:173
+#: mpulsweb/templates/main.mako:174
msgid "menu_adm_link_usergroupoverview"
msgstr ""
-#: mpulsweb/templates/main.mako:178
+#: mpulsweb/templates/main.mako:179
msgid "menu_adm_link_showsettings"
msgstr ""
@@ -514,59 +522,59 @@
msgid "menu_adm_link_useredit_back"
msgstr ""
-#: mpulsweb/templates/administration/edit_user.mako:35
+#: mpulsweb/templates/administration/edit_user.mako:38
#: mpulsweb/templates/administration/new_user.mako:39
#: mpulsweb/templates/administration/new_user_result.mako:22
#: mpulsweb/templates/administration/show_user_body.mako:2
msgid "adm_form_legend_personal"
msgstr ""
-#: mpulsweb/templates/administration/edit_user.mako:38
-#: mpulsweb/templates/administration/edit_user.mako:41
+#: mpulsweb/templates/administration/edit_user.mako:44
+#: mpulsweb/templates/administration/edit_user.mako:47
#: mpulsweb/templates/administration/new_user.mako:43
#: mpulsweb/templates/administration/new_user.mako:49
msgid "adm_form_user_firstname"
msgstr ""
-#: mpulsweb/templates/administration/edit_user.mako:47
-#: mpulsweb/templates/administration/edit_user.mako:50
+#: mpulsweb/templates/administration/edit_user.mako:54
+#: mpulsweb/templates/administration/edit_user.mako:57
#: mpulsweb/templates/administration/new_user.mako:57
#: mpulsweb/templates/administration/new_user.mako:63
msgid "adm_form_user_lastname"
msgstr ""
-#: mpulsweb/templates/administration/edit_user.mako:56
+#: mpulsweb/templates/administration/edit_user.mako:65
#: mpulsweb/templates/administration/new_user.mako:69
msgid "adm_form_user_telephone"
msgstr ""
-#: mpulsweb/templates/administration/edit_user.mako:61
+#: mpulsweb/templates/administration/edit_user.mako:69
msgid "adm_form_user_roomnumer"
msgstr ""
-#: mpulsweb/templates/administration/edit_user.mako:66
+#: mpulsweb/templates/administration/edit_user.mako:75
#: mpulsweb/templates/administration/new_user.mako:78
msgid "adm_form_user_branchoffice"
msgstr ""
-#: mpulsweb/templates/administration/edit_user.mako:70
+#: mpulsweb/templates/administration/edit_user.mako:84
#: mpulsweb/templates/administration/new_user.mako:84
#: mpulsweb/templates/administration/new_user_result.mako:46
#: mpulsweb/templates/usersettings/change_password_login.mako:17
msgid "adm_form_legend_login"
msgstr ""
-#: mpulsweb/templates/administration/edit_user.mako:88
+#: mpulsweb/templates/administration/edit_user.mako:102
#: mpulsweb/templates/administration/new_user.mako:111
msgid "adm_form_user_activated"
msgstr ""
-#: mpulsweb/templates/administration/edit_user.mako:96
+#: mpulsweb/templates/administration/edit_user.mako:110
#: mpulsweb/templates/administration/new_user.mako:115
msgid "adm_form_user_newpass"
msgstr ""
-#: mpulsweb/templates/administration/edit_user.mako:99
+#: mpulsweb/templates/administration/edit_user.mako:113
#: mpulsweb/templates/administration/new_user.mako:118
msgid "adm_form_user_submit"
msgstr ""
@@ -1230,6 +1238,7 @@
#: mpulsweb/templates/casebundle/dialogs/success_markdelete.mako:5
#: mpulsweb/templates/casebundle/dialogs/success_standin.mako:5
#: mpulsweb/templates/casemanagement/main.mako:8
+#: mpulsweb/templates/casemanagement/new.mako:6
#: mpulsweb/templates/casemanagement/overview.mako:6
#: mpulsweb/templates/casemanagement/dialogs/confirm.mako:5
#: mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako:5
@@ -1237,6 +1246,7 @@
#: mpulsweb/templates/casemanagement/dialogs/success_delete.mako:5
#: mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako:4
#: mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako:5
#: mpulsweb/templates/casemanagement/dialogs/success_restore.mako:5
#: mpulsweb/templates/phase/phase.mako:5
#: mpulsweb/templates/privacy/dialogs/missing_statement.mako:5
@@ -1514,6 +1524,18 @@
msgid "cm_menu_header_structure"
msgstr ""
+#: mpulsweb/templates/casemanagement/new.mako:7
+msgid "cm_np_new"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/new.mako:79
+msgid "cm_new_p_please_consider_statement"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/new.mako:112
+msgid "cm_new_con_acceptance_statement_true"
+msgstr ""
+
#: mpulsweb/templates/casemanagement/organisation.mako:7
msgid "cm_np_organisation"
msgstr ""
@@ -1626,6 +1648,10 @@
msgid "cm_np_delete_attachment_success"
msgstr ""
+#: mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako:6
+msgid "cm_np_keepactive_success"
+msgstr ""
+
#: mpulsweb/templates/casemanagement/dialogs/success_restore.mako:6
msgid "cm_np_restore_success"
msgstr ""
Copied: wasko/branches/2.0/mpulsweb/templates/casemanagement/new.mako (from rev 2385, wasko/branches/2.0/jmdweb/templates/casemanagement/new.mako)
Property changes on: wasko/branches/2.0/mpulsweb/templates/casemanagement/new.mako
___________________________________________________________________
Name: svn:mergeinfo
+
More information about the Mpuls-commits
mailing list