[Mpuls-commits] r5174 - in base/trunk: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/templates/phase/dialogs
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Jul 19 11:12:27 CEST 2011
Author: torsten
Date: 2011-07-19 11:12:24 +0200 (Tue, 19 Jul 2011)
New Revision: 5174
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako
Log:
Issue2262: Changed layout of phase-change dialog. In phase of halfautomatic change show additional link to continue editing the case.
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2011-07-19 07:32:35 UTC (rev 5173)
+++ base/trunk/ChangeLog 2011-07-19 09:12:24 UTC (rev 5174)
@@ -4,6 +4,9 @@
Issue 2262: Changed dialog for half automatic phase change. Removed
infotext to print out the case for the client. This hint is shown
after the phase has been changed.
+ * mpulsweb/templates/phase/dialogs/success_set_phase.mako: Issue2262:
+ Changed layout of phase-change dialog. In phase of halfautomatic
+ change show additional link to continue editing the case.
2011-07-18 Roland Geider <roland.geider at intevation.de>
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-07-19 07:32:35 UTC (rev 5173)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-07-19 09:12:24 UTC (rev 5174)
@@ -8,7 +8,7 @@
"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: 2011-06-06 11:24+0200\n"
+"PO-Revision-Date: 2011-07-19 11:09+0200\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"
@@ -160,7 +160,6 @@
#: mpulsweb/controllers/administration.py:440
#, fuzzy
-#| msgid "Failed to create user group!"
msgid "Failed to delete the user group!"
msgstr "Benutzergruppe nicht angelegt!"
@@ -180,7 +179,6 @@
#: mpulsweb/controllers/annotations.py:33 mpulsweb/templates/main.mako:48
#: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:16
-#: mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako:14
#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:15
msgid "Help"
msgstr "Hilfe"
@@ -279,8 +277,8 @@
msgstr "Die Fallakte wurde zum Löschen an die Administration weitergeleitet."
#: mpulsweb/controllers/case.py:79 mpulsweb/controllers/case.py:102
-#: mpulsweb/controllers/case_bundle.py:280
-#: mpulsweb/controllers/case_bundle.py:311
+#: mpulsweb/controllers/case_bundle.py:282
+#: mpulsweb/controllers/case_bundle.py:313
#: mpulsweb/templates/casemanagement/dialogs/confirm.mako:6
#: mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako:6
msgid "Delete case?"
@@ -303,7 +301,7 @@
msgid "Click on OK to continue."
msgstr "Bitte klicken Sie \"OK\", um fortzufahren."
-#: mpulsweb/controllers/case.py:103 mpulsweb/controllers/case_bundle.py:318
+#: mpulsweb/controllers/case.py:103 mpulsweb/controllers/case_bundle.py:320
msgid ""
"Warning! On deleting the case all data will be erased\n"
"irrecoverable!<br>Only delete the case if this case is <b>not needed for\n"
@@ -406,19 +404,19 @@
"zur Bearbeitung zur Verfügung. Die anonymisierte Fallakte wird weiterhin "
"in der Auswertung berücksichtigt werden."
-#: mpulsweb/controllers/case.py:239 mpulsweb/controllers/case_bundle.py:420
+#: mpulsweb/controllers/case.py:239 mpulsweb/controllers/case_bundle.py:422
msgid "Case restored!"
msgid_plural "Cases restored!"
msgstr[0] "Fallakte wiederhergestellt!"
msgstr[1] "Fallakten wiederhergestellt!"
-#: mpulsweb/controllers/case.py:240 mpulsweb/controllers/case_bundle.py:273
-#: mpulsweb/controllers/case_bundle.py:305
-#: mpulsweb/controllers/case_bundle.py:348
-#: mpulsweb/controllers/case_bundle.py:387
-#: mpulsweb/controllers/case_bundle.py:424
-#: mpulsweb/controllers/case_bundle.py:458
-#: mpulsweb/controllers/case_bundle.py:481
+#: mpulsweb/controllers/case.py:240 mpulsweb/controllers/case_bundle.py:275
+#: mpulsweb/controllers/case_bundle.py:307
+#: mpulsweb/controllers/case_bundle.py:350
+#: mpulsweb/controllers/case_bundle.py:389
+#: mpulsweb/controllers/case_bundle.py:426
+#: mpulsweb/controllers/case_bundle.py:460
+#: mpulsweb/controllers/case_bundle.py:483
#: mpulsweb/controllers/casedocument.py:57
#: mpulsweb/controllers/casedocument.py:98 mpulsweb/controllers/document.py:76
#: mpulsweb/controllers/document.py:118 mpulsweb/controllers/usersettings.py:92
@@ -426,7 +424,7 @@
msgid "Please click OK to continue."
msgstr "Bitte klicken Sie auf OK, um fortzufahren."
-#: mpulsweb/controllers/case.py:245 mpulsweb/controllers/case_bundle.py:430
+#: mpulsweb/controllers/case.py:245 mpulsweb/controllers/case_bundle.py:432
#: mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako:6
msgid "Restore case?"
msgid_plural "Restore cases?"
@@ -529,11 +527,11 @@
"Auswertungen werden auf diese Fallakten beschränkt. Bitte klicken sie auf"
" OK um fortzufahren."
-#: mpulsweb/controllers/case_bundle.py:242
+#: mpulsweb/controllers/case_bundle.py:244
msgid "No valid cases in the selection!"
msgstr "Keine gültigen Fälle in der Auswahl!"
-#: mpulsweb/controllers/case_bundle.py:243
+#: mpulsweb/controllers/case_bundle.py:245
msgid ""
"The selected action can not be executed\n"
"on any of the cases in your selection. Please make sure that the cases "
@@ -545,12 +543,12 @@
"Fallakten in einem Zustand befinden, aus dem Sie die Aktion ausführen "
"können."
-#: mpulsweb/controllers/case_bundle.py:253
+#: mpulsweb/controllers/case_bundle.py:255
#: mpulsweb/controllers/evaluation_overview.py:179
msgid "No action specified for the selection"
msgstr "Keine Aktion für die Auswahl angegeben!"
-#: mpulsweb/controllers/case_bundle.py:254
+#: mpulsweb/controllers/case_bundle.py:256
#: mpulsweb/controllers/evaluation_overview.py:180
msgid ""
"You have not selected any action for the\n"
@@ -561,47 +559,47 @@
"OK, um zur Fallaktenübersicht zu gelangen und dort eine Aktion aus dem "
"Auswahlfeld auszuwählen."
-#: mpulsweb/controllers/case_bundle.py:268
+#: mpulsweb/controllers/case_bundle.py:270
msgid "Case deleted!"
msgid_plural "Cases deleted!"
msgstr[0] "Fallakte gelöscht!"
msgstr[1] "Fallakten gelöscht!"
-#: mpulsweb/controllers/case_bundle.py:269
+#: mpulsweb/controllers/case_bundle.py:271
#, python-format
msgid "%s case was successfully cleared for deletion."
msgid_plural "%s cases were successfully cleared for deletion."
msgstr[0] "Es wurde %s Fallakte erfolgreich zum Löschen freigegeben."
msgstr[1] "Es wurden %s Fallakten erfolgreich zum Löschen freigegeben."
-#: mpulsweb/controllers/case_bundle.py:285
-#: mpulsweb/controllers/case_bundle.py:316
+#: mpulsweb/controllers/case_bundle.py:287
+#: mpulsweb/controllers/case_bundle.py:318
#, python-format
msgid "Do you really want to delete the following case?%s"
msgid_plural "Do you really want to delete the following cases?%s"
msgstr[0] "Wollen Sie wirklich die folgende Fallakte löschen?%s"
msgstr[1] "Wollen Sie wirklich die folgenden Fallakten löschen?%s"
-#: mpulsweb/controllers/case_bundle.py:299
+#: mpulsweb/controllers/case_bundle.py:301
msgid "Case successfully deleted."
msgid_plural "Cases successfully deleted."
msgstr[0] "Akte gelöscht!"
msgstr[1] "Akten gelöscht!"
-#: mpulsweb/controllers/case_bundle.py:302
+#: mpulsweb/controllers/case_bundle.py:304
#, python-format
msgid "%s case was successfully deleted."
msgid_plural "%s cases were successfully deleted."
msgstr[0] "Es wurde %s Akte gelöscht."
msgstr[1] "Es wurden %s Akten gelöscht."
-#: mpulsweb/controllers/case_bundle.py:336
+#: mpulsweb/controllers/case_bundle.py:338
msgid "Case successfully cleared for anonymisation!"
msgid_plural "Cases successfully cleared for anonymisation!"
msgstr[0] "Fallakte wurde zur Anonymisierung freigegeben!"
msgstr[1] "Fallakten wurden zur Anonymisierung freigegeben!"
-#: mpulsweb/controllers/case_bundle.py:342
+#: mpulsweb/controllers/case_bundle.py:344
#, python-format
msgid ""
"%s case was cleared for anonymisation. It will be presented to the "
@@ -616,13 +614,13 @@
"Es wurden %s Fallakten zur Anonymisierung freigegeben. Sie liegen der "
"Administration zur endgültigen Anonymisierung vor."
-#: mpulsweb/controllers/case_bundle.py:355
+#: mpulsweb/controllers/case_bundle.py:357
msgid "Clear case for anonymisation?"
msgid_plural "Clear cases for anonymisation?"
msgstr[0] "Fallakte zur Anonymisierung freigeben?"
msgstr[1] "Fallakten zur Anonymisierung freigeben?"
-#: mpulsweb/controllers/case_bundle.py:367
+#: mpulsweb/controllers/case_bundle.py:369
#, python-format
msgid ""
"Do you really want to clear the following case for anonymisation? The "
@@ -642,26 +640,26 @@
"Die Fallakten stehen Ihnen danach nicht mehr zur Bearbeitung zur "
"Verfügung und werden der Administration zur Anonymisierung vorgelegt.%s"
-#: mpulsweb/controllers/case_bundle.py:381
+#: mpulsweb/controllers/case_bundle.py:383
msgid "Case anonymised!"
msgid_plural "Cases anonymised!"
msgstr[0] "Fallakte anonymisiert!"
msgstr[1] "Fallakten anonymisiert!"
-#: mpulsweb/controllers/case_bundle.py:384
+#: mpulsweb/controllers/case_bundle.py:386
#, python-format
msgid "%s case was successfully anonymised."
msgid_plural "%s cases were successfully anonymised."
msgstr[0] "Es wurde %s Akte anonymisiert."
msgstr[1] "Es wurden %s Akten anonymisiert."
-#: mpulsweb/controllers/case_bundle.py:393
+#: mpulsweb/controllers/case_bundle.py:395
msgid "Anonymise case?"
msgid_plural "Anonymise cases?"
msgstr[0] "Fallakte anonymisieren?"
msgstr[1] "Fallakten anonymisieren?"
-#: mpulsweb/controllers/case_bundle.py:405
+#: mpulsweb/controllers/case_bundle.py:407
#, python-format
msgid ""
"Do you really want to anonymise the case and irrevocably lose its "
@@ -682,14 +680,14 @@
"mehr zur Bearbeitung zur Verfügung. Die anonymisierten Fallakten werden "
"weiterhin in der Auswertung berücksichtigt werden.%s"
-#: mpulsweb/controllers/case_bundle.py:422
+#: mpulsweb/controllers/case_bundle.py:424
#, python-format
msgid "%s was successfully restored."
msgid_plural "%s were successfully restored."
msgstr[0] "Es wurde %s Fallakte erfolgreich wiederhergestellt."
msgstr[1] "Es wurden %s Fallakten erfolgreich wiederhergestellt."
-#: mpulsweb/controllers/case_bundle.py:436
+#: mpulsweb/controllers/case_bundle.py:438
#, python-format
msgid ""
"Do you really want to restore the following case? It will be available "
@@ -704,47 +702,47 @@
"Wollen Sie wirklich die folgenden Fallakten wiederherstellen? Die "
"Fallakten stehen danach wieder zur Bearbeitung zur Verfügung. %s"
-#: mpulsweb/controllers/case_bundle.py:453
+#: mpulsweb/controllers/case_bundle.py:455
msgid "Editor appointed!"
msgstr "Bearbeitung übertragen!"
-#: mpulsweb/controllers/case_bundle.py:455
+#: mpulsweb/controllers/case_bundle.py:457
#, python-format
msgid "%s case was successfully transferred to %s %s"
msgid_plural "%s cases were successfully transferred to %s %s"
msgstr[0] "Es wurde %s Fallakte erfolgreich an %s %s übertragen."
msgstr[1] "Es wurden %s Fallakten erfolgreich an %s %s übertragen."
-#: mpulsweb/controllers/case_bundle.py:476
+#: mpulsweb/controllers/case_bundle.py:478
msgid "Stand-in appointed!"
msgstr "Vertretung zugewiesen!"
-#: mpulsweb/controllers/case_bundle.py:478
+#: mpulsweb/controllers/case_bundle.py:480
#, python-format
msgid "%s case was successfully assigned to a substitute."
msgid_plural "%s cases were successfully assigned to a substitute."
msgstr[0] "Es wurde für %s Fallakte erfolgreich die Vertretung zugewiesen."
msgstr[1] "Es wurden für %s Fallakten erfolgreich die Vertretung zugewiesen."
-#: mpulsweb/controllers/case_bundle.py:507
+#: mpulsweb/controllers/case_bundle.py:509
msgid "Export case?"
msgid_plural "Export cases?"
msgstr[0] "Fallakte exportieren?"
msgstr[1] "Fallakten exportieren?"
-#: mpulsweb/controllers/case_bundle.py:542 mpulsweb/lib/helpers.py:89
+#: mpulsweb/controllers/case_bundle.py:544 mpulsweb/lib/helpers.py:89
#: mpulsweb/lib/helpers.py:94 mpulsweb/templates/casemanagement/digest.mako:166
msgid "unknown"
msgstr "unbekannt"
-#: mpulsweb/controllers/case_bundle.py:546
+#: mpulsweb/controllers/case_bundle.py:548
#, python-format
msgid "%d Case was marked for %s"
msgid_plural "%d Cases were marked for %s"
msgstr[0] "%d Fallakte wurde für den '%s' markiert."
msgstr[1] "%d Fallakten wurden für den '%s' markiert."
-#: mpulsweb/controllers/case_bundle.py:549
+#: mpulsweb/controllers/case_bundle.py:551
#, python-format
msgid ""
"%d case can be exported. Please click on 'Download' to download the "
@@ -966,8 +964,8 @@
"The phase could be changed successfully. Please follow the "
"shown steps to reach the phase overview."
msgstr ""
-"Die Phase konnte erfolgreich gewechselt werden. Bitte folgen Sie den "
-"aufgeführten Schritten, um zur Phasenübersicht fortzufahren."
+"Die Phase konnte erfolgreich gewechselt werden. Bitte wählen Sie eine "
+"der aufgeführten Optionen, um fortzufahren."
#: mpulsweb/controllers/privacy.py:63
msgid "Privacy statement set!"
@@ -1125,7 +1123,7 @@
msgid "Open page"
msgstr "Öffne Seite"
-#: mpulsweb/lib/security.py:375 mpulsweb/lib/security.py:391
+#: mpulsweb/lib/security.py:382 mpulsweb/lib/security.py:398
msgid "You are not authorised to look at the requested document."
msgstr "Sie sind nicht authorisiert, das angeforderte Dokument anzuschauen."
@@ -1192,7 +1190,7 @@
#: mpulsweb/model/case.py:1317 mpulsweb/model/case.py:1318
#: mpulsweb/templates/casemanagement/caselist.mako:181
#: mpulsweb/templates/casemanagement/caselist.mako:182
-#: mpulsweb/templates/search/search.mako:65
+#: mpulsweb/templates/search/search.mako:75
msgid "Editable"
msgstr "Bearbeitbar"
@@ -1287,7 +1285,7 @@
msgid "role_initialadmin"
msgstr "Super-Administration"
-#: mpulsweb/templates/base.mako:6 mpulsweb/templates/main.mako:208
+#: mpulsweb/templates/base.mako:6 mpulsweb/templates/main.mako:210
msgid "Wrong formular input"
msgstr "Fehlerhafte Formulareingabe"
@@ -1318,7 +1316,7 @@
msgid "Black board"
msgstr "Schwarzes Brett"
-#: mpulsweb/templates/main.mako:43 mpulsweb/templates/main.mako:223
+#: mpulsweb/templates/main.mako:43 mpulsweb/templates/main.mako:225
msgid "Info"
msgstr "Info"
@@ -1378,30 +1376,30 @@
msgid "Case documents\t"
msgstr "Fallakten\t"
-#: mpulsweb/templates/main.mako:122
+#: mpulsweb/templates/main.mako:123
msgid "New case document"
msgstr "Fallakte anlegen"
-#: mpulsweb/templates/main.mako:128
+#: mpulsweb/templates/main.mako:130
msgid "Import case document"
msgstr "Fallakte importieren"
-#: mpulsweb/templates/main.mako:141
+#: mpulsweb/templates/main.mako:143
msgid "Overview"
msgstr "Übersicht"
-#: mpulsweb/templates/main.mako:145 mpulsweb/templates/auth/login.mako:17
+#: mpulsweb/templates/main.mako:147 mpulsweb/templates/auth/login.mako:17
#: mpulsweb/templates/auth/login.mako:46
msgid "Agency"
msgstr "Einrichtung"
-#: mpulsweb/templates/main.mako:155
+#: mpulsweb/templates/main.mako:157
#: mpulsweb/templates/evaluation/evaluate.mako:81
#: mpulsweb/templates/help/help.mako:53
msgid "Evaluations"
msgstr "Auswertungen"
-#: mpulsweb/templates/main.mako:168
+#: mpulsweb/templates/main.mako:170
#: mpulsweb/templates/administration/delete_user_helper.mako:6
#: mpulsweb/templates/administration/edit_user.mako:13
#: mpulsweb/templates/administration/edit_usergroup.mako:10
@@ -1431,52 +1429,52 @@
msgid "Administration"
msgstr "Administration"
-#: mpulsweb/templates/main.mako:173
+#: mpulsweb/templates/main.mako:175
msgid "User"
msgstr "Benutzer"
-#: mpulsweb/templates/main.mako:179
+#: mpulsweb/templates/main.mako:181
msgid "Usergroup"
msgstr "Benutzergruppen"
-#: mpulsweb/templates/main.mako:184
+#: mpulsweb/templates/main.mako:186
msgid "Settings"
msgstr "Einrichtung"
-#: mpulsweb/templates/main.mako:243
+#: mpulsweb/templates/main.mako:245
msgid "Go to main menu directly"
msgstr "Direkt zum Hauptmenü springen"
-#: mpulsweb/templates/main.mako:245
+#: mpulsweb/templates/main.mako:247
msgid "Go to main menu"
msgstr "Zum Hauptmenü springen"
-#: mpulsweb/templates/main.mako:249
+#: mpulsweb/templates/main.mako:251
msgid "Go to domain menu directly"
msgstr "Direkt zum Bereichsmenü springen"
-#: mpulsweb/templates/main.mako:251
+#: mpulsweb/templates/main.mako:253
msgid "Go to domain menu"
msgstr "Zum Bereichsmenü springen"
-#: mpulsweb/templates/main.mako:255
+#: mpulsweb/templates/main.mako:257
msgid "Go to content directly"
msgstr "Direkt zum Inhalt springen"
-#: mpulsweb/templates/main.mako:256
+#: mpulsweb/templates/main.mako:258
msgid "Go to content"
msgstr "Zum Inhalt springen"
-#: mpulsweb/templates/main.mako:264 mpulsweb/templates/annotations/main.mako:33
+#: mpulsweb/templates/main.mako:266 mpulsweb/templates/annotations/main.mako:33
#: mpulsweb/templates/auth/main.mako:6
msgid "Logo agency"
msgstr "Logo Einrichtung"
-#: mpulsweb/templates/main.mako:291
+#: mpulsweb/templates/main.mako:293
msgid "Notice"
msgstr "Hinweis"
-#: mpulsweb/templates/main.mako:292
+#: mpulsweb/templates/main.mako:294
#, python-format
msgid ""
"This session will be automatically terminated at %s. Please make sure you"
@@ -1772,7 +1770,7 @@
#: mpulsweb/templates/administration/show_user_body.mako:56
#: mpulsweb/templates/dialogs/confirm.mako:6
#: mpulsweb/templates/evaluation/evaluate.mako:68
-#: mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako:18
+#: mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako:13
#: mpulsweb/templates/settings/show.mako:63
msgid "Yes"
msgstr "Ja"
@@ -1782,7 +1780,7 @@
#: mpulsweb/templates/administration/show_user_body.mako:48
#: mpulsweb/templates/administration/show_user_body.mako:58
#: mpulsweb/templates/dialogs/confirm.mako:7
-#: mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako:19
+#: mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako:14
#: mpulsweb/templates/settings/show.mako:65
msgid "No"
msgstr "Nein"
@@ -1815,7 +1813,7 @@
#: mpulsweb/templates/appointments/remindlist_body.mako:7
#: mpulsweb/templates/casemanagement/caselist.mako:96
#: mpulsweb/templates/documents/case_overview.mako:42
-#: mpulsweb/templates/documents/global_overview.mako:28
+#: mpulsweb/templates/documents/global_overview.mako:33
#: mpulsweb/templates/home/globalappointmentlist.mako:13
#: mpulsweb/templates/logbook/overview.mako:101
#: mpulsweb/templates/phase/phase.mako:28
@@ -1830,11 +1828,10 @@
#: mpulsweb/templates/casemanagement/caselist.mako:216
#: mpulsweb/templates/casemanagement/reminderlist.mako:6
#: mpulsweb/templates/casemanagement/reminderlist.mako:7
-#: mpulsweb/templates/documents/case_overview.mako:57
-#: mpulsweb/templates/documents/global_overview.mako:43
-#: mpulsweb/templates/documents/global_overview.mako:44
-#: mpulsweb/templates/documents/global_overview.mako:60
-#: mpulsweb/templates/documents/global_overview.mako:61
+#: mpulsweb/templates/documents/case_overview.mako:63
+#: mpulsweb/templates/documents/case_overview.mako:64
+#: mpulsweb/templates/documents/global_overview.mako:53
+#: mpulsweb/templates/documents/global_overview.mako:54
#: mpulsweb/templates/home/caseappointmentlist.mako:7
#: mpulsweb/templates/home/caseappointmentlist.mako:11
#: mpulsweb/templates/home/caseappointmentlist.mako:15
@@ -1858,10 +1855,9 @@
#: mpulsweb/templates/casemanagement/overview.mako:44
#: mpulsweb/templates/casemanagement/reminderlist.mako:12
#: mpulsweb/templates/casemanagement/reminderlist.mako:13
-#: mpulsweb/templates/documents/case_overview.mako:61
-#: mpulsweb/templates/documents/case_overview.mako:62
-#: mpulsweb/templates/documents/global_overview.mako:46
-#: mpulsweb/templates/documents/global_overview.mako:63
+#: mpulsweb/templates/documents/case_overview.mako:69
+#: mpulsweb/templates/documents/case_overview.mako:70
+#: mpulsweb/templates/documents/global_overview.mako:59
msgid "Delete"
msgstr "Löschen"
@@ -2229,7 +2225,7 @@
#: mpulsweb/templates/casemanagement/caselist.mako:172
#: mpulsweb/templates/casemanagement/caselist.mako:173
#: mpulsweb/templates/casemanagement/organisation.mako:42
-#: mpulsweb/templates/search/search.mako:50
+#: mpulsweb/templates/search/search.mako:60
#: mpulsweb/templates/usersettings/edit_standin.mako:23
msgid "Standin"
msgstr "Vertretung"
@@ -2270,7 +2266,7 @@
#: mpulsweb/templates/logbook/overview.mako:47
#: mpulsweb/templates/logbook/overview_print.mako:32
#: mpulsweb/templates/logbook/show.mako:37
-#: mpulsweb/templates/search/search.mako:39
+#: mpulsweb/templates/search/search.mako:49
msgid "Editor"
msgstr "Bearbeiter"
@@ -2403,7 +2399,7 @@
#: mpulsweb/templates/casemanagement/caselist.mako:93
#: mpulsweb/templates/casemanagement/main.mako:28
-#: mpulsweb/templates/search/search.mako:61
+#: mpulsweb/templates/search/search.mako:71
msgid "Status"
msgstr "Status"
@@ -2483,7 +2479,7 @@
#: mpulsweb/templates/evaluation/evaluate.mako:34
#: mpulsweb/templates/phase/phase.mako:21
#: mpulsweb/templates/phase/phase.mako:156
-#: mpulsweb/templates/search/search.mako:85
+#: mpulsweb/templates/search/search.mako:95
msgid "Phase"
msgstr "Phase"
@@ -2496,12 +2492,12 @@
msgstr "Start- und Enddatum"
#: mpulsweb/templates/casemanagement/digest.mako:157
-#: mpulsweb/templates/search/search.mako:98
+#: mpulsweb/templates/search/search.mako:108
msgid "Start date"
msgstr "Startdatum"
#: mpulsweb/templates/casemanagement/digest.mako:158
-#: mpulsweb/templates/search/search.mako:107
+#: mpulsweb/templates/search/search.mako:117
msgid "End date"
msgstr "Enddatum"
@@ -2729,19 +2725,19 @@
#: mpulsweb/templates/casemanagement/search.mako:9
#: mpulsweb/templates/evaluation/search.mako:11
#: mpulsweb/templates/evaluation/search.mako:14
-#: mpulsweb/templates/search/search.mako:246
+#: mpulsweb/templates/search/search.mako:256
msgid "Reset search"
msgstr "Suche zurücksetzen"
#: mpulsweb/templates/casemanagement/search.mako:14
#: mpulsweb/templates/evaluation/search.mako:19
-#: mpulsweb/templates/search/search.mako:250
+#: mpulsweb/templates/search/search.mako:260
msgid "Hide extended search"
msgstr "Erweiterte Suche ausblenden"
#: mpulsweb/templates/casemanagement/search.mako:17
#: mpulsweb/templates/evaluation/search.mako:22
-#: mpulsweb/templates/search/search.mako:252
+#: mpulsweb/templates/search/search.mako:262
msgid "Show extended search"
msgstr "Erweiterte Suche einblenden"
@@ -2913,7 +2909,7 @@
#: mpulsweb/templates/documents/case_new.mako:58
#: mpulsweb/templates/documents/case_overview.mako:36
-#: mpulsweb/templates/documents/global_overview.mako:26
+#: mpulsweb/templates/documents/global_overview.mako:27
#: mpulsweb/templates/documents/global_upload.mako:46
msgid "Filename"
msgstr "Dateiname"
@@ -2966,12 +2962,12 @@
msgstr "Anlagenübersicht"
#: mpulsweb/templates/documents/case_overview.mako:39
-#: mpulsweb/templates/documents/global_overview.mako:27
+#: mpulsweb/templates/documents/global_overview.mako:30
msgid "Filesize"
msgstr "Dateigröße"
-#: mpulsweb/templates/documents/case_overview.mako:71
-#: mpulsweb/templates/documents/global_overview.mako:73
+#: mpulsweb/templates/documents/case_overview.mako:79
+#: mpulsweb/templates/documents/global_overview.mako:68
msgid "No files found"
msgstr "Es wurden keine Dateien gefunden"
@@ -3333,7 +3329,6 @@
msgstr "Gesamt"
#: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:16
-#: mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako:14
#, python-format
msgid ""
"Please consider, that the case should be given to the client in printed "
@@ -3344,8 +3339,7 @@
"Informationen dazu finden Sie in der %s"
#: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:21
-#: mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako:20
-#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:19
+#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:17
msgid "Print"
msgstr "Drucken"
@@ -3358,27 +3352,14 @@
"Form dem jungen Menschen ausgehändigt werden sollte. Weitere "
"Informationen dazu finden Sie in der "
-#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:18
-msgid "Print case document:"
-msgstr "Fallakte drucken:"
+#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:22
+msgid "Continue editing"
+msgstr "Mit der Bearbeitung fortfahren"
-#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:23
-msgid "Documenting the modus change in the case journal"
-msgstr "Phasenwechsel im Falltagebuch dokumentieren"
-
#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:24
-msgid "Case logbook"
-msgstr "Falltagebuch"
-
-#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:30
-#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:32
msgid "Back to phase overview"
msgstr "Zur Phasenübersicht zurückkehren"
-#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:34
-msgid "Phase overview"
-msgstr "Phasenübersicht"
-
#: mpulsweb/templates/privacy/edit_statement.mako:6
#: mpulsweb/templates/privacy/dialogs/accept_success.mako:6
#: mpulsweb/templates/privacy/dialogs/confirm.mako:6
@@ -3466,145 +3447,145 @@
", wenn keine Erklärung des Jugendlichen vorliegt und sicher nicht "
"vorliegen wird. Die Fallakte wird dann anonymisiert!"
-#: mpulsweb/templates/search/search.mako:7
-#: mpulsweb/templates/search/search.mako:230
+#: mpulsweb/templates/search/search.mako:15
+#: mpulsweb/templates/search/search.mako:240
msgid "Search"
msgstr "Suche"
-#: mpulsweb/templates/search/search.mako:12
-#: mpulsweb/templates/search/search.mako:34
+#: mpulsweb/templates/search/search.mako:22
+#: mpulsweb/templates/search/search.mako:44
msgid "Responsibility"
msgstr "Verantwortlichkeit"
-#: mpulsweb/templates/search/search.mako:15
+#: mpulsweb/templates/search/search.mako:25
msgid "All users"
msgstr "Alle Benutzer"
-#: mpulsweb/templates/search/search.mako:25
+#: mpulsweb/templates/search/search.mako:35
msgid "Branch"
msgstr "Filiale"
-#: mpulsweb/templates/search/search.mako:38
+#: mpulsweb/templates/search/search.mako:48
msgid "Own cases"
msgstr "Eigene Fallakten"
-#: mpulsweb/templates/search/search.mako:42
+#: mpulsweb/templates/search/search.mako:52
msgid "Own"
msgstr "Eigene"
-#: mpulsweb/templates/search/search.mako:46
+#: mpulsweb/templates/search/search.mako:56
msgid "Standin cases"
msgstr "Vertretungsfälle"
-#: mpulsweb/templates/search/search.mako:65
+#: mpulsweb/templates/search/search.mako:75
msgid "Editable cases"
msgstr "Bearbeitbare Fallakten"
-#: mpulsweb/templates/search/search.mako:68
+#: mpulsweb/templates/search/search.mako:78
msgid "Almost deleted"
msgstr "Schwebend gelöscht"
-#: mpulsweb/templates/search/search.mako:73
+#: mpulsweb/templates/search/search.mako:83
msgid "Almost anonymized"
msgstr "Schwebend anonymisiert"
-#: mpulsweb/templates/search/search.mako:77
+#: mpulsweb/templates/search/search.mako:87
msgid "Anonymized"
msgstr "Anonymisiert"
-#: mpulsweb/templates/search/search.mako:118
+#: mpulsweb/templates/search/search.mako:128
msgid "Federal state"
msgstr "Bundesland"
-#: mpulsweb/templates/search/search.mako:120
+#: mpulsweb/templates/search/search.mako:130
msgid "Select all"
msgstr "Alles auswählen"
-#: mpulsweb/templates/search/search.mako:121
+#: mpulsweb/templates/search/search.mako:131
msgid "Deselect all"
msgstr "Alles abwählen"
-#: mpulsweb/templates/search/search.mako:127
+#: mpulsweb/templates/search/search.mako:137
msgid "Baden-Württemberg"
msgstr "Baden-Württemberg"
-#: mpulsweb/templates/search/search.mako:131
+#: mpulsweb/templates/search/search.mako:141
msgid "Bavaria"
msgstr "Bayern"
-#: mpulsweb/templates/search/search.mako:135
+#: mpulsweb/templates/search/search.mako:145
msgid "Berlin"
msgstr "Berlin"
-#: mpulsweb/templates/search/search.mako:141
+#: mpulsweb/templates/search/search.mako:151
msgid "Brandenburg"
msgstr "Brandenburg"
-#: mpulsweb/templates/search/search.mako:145
+#: mpulsweb/templates/search/search.mako:155
msgid "Bremen"
msgstr "Bremen"
-#: mpulsweb/templates/search/search.mako:149
+#: mpulsweb/templates/search/search.mako:159
msgid "Hamburg"
msgstr "Hamburg"
-#: mpulsweb/templates/search/search.mako:155
+#: mpulsweb/templates/search/search.mako:165
msgid "Hesse"
msgstr "Hessen"
-#: mpulsweb/templates/search/search.mako:159
+#: mpulsweb/templates/search/search.mako:169
msgid "Mecklenburg-Western Pomerania"
msgstr "Mecklenburg-Vorpommern"
-#: mpulsweb/templates/search/search.mako:163
+#: mpulsweb/templates/search/search.mako:173
msgid "Lower Saxony"
msgstr "Niedersachsen"
-#: mpulsweb/templates/search/search.mako:169
+#: mpulsweb/templates/search/search.mako:179
msgid "North Rhine-Westphalia"
msgstr "Nordrhein-Westfalen"
-#: mpulsweb/templates/search/search.mako:173
+#: mpulsweb/templates/search/search.mako:183
msgid "Rhineland-Palatinate"
msgstr "Rheinland-Pfalz"
-#: mpulsweb/templates/search/search.mako:177
+#: mpulsweb/templates/search/search.mako:187
msgid "Saarland"
msgstr "Saarland"
-#: mpulsweb/templates/search/search.mako:183
+#: mpulsweb/templates/search/search.mako:193
msgid "Saxony"
msgstr "Sachsen"
-#: mpulsweb/templates/search/search.mako:187
+#: mpulsweb/templates/search/search.mako:197
msgid "Saxony-Anhalt"
msgstr "Sachsen-Anhalt"
-#: mpulsweb/templates/search/search.mako:191
+#: mpulsweb/templates/search/search.mako:201
msgid "Schleswig-Holstein"
msgstr "Schleswig-Holstein"
-#: mpulsweb/templates/search/search.mako:197
+#: mpulsweb/templates/search/search.mako:207
msgid "Thuringia"
msgstr "Thüringen"
-#: mpulsweb/templates/search/search.mako:207
+#: mpulsweb/templates/search/search.mako:217
msgid "Gender"
msgstr "Geschlecht"
-#: mpulsweb/templates/search/search.mako:210
+#: mpulsweb/templates/search/search.mako:220
msgid "All"
msgstr "Alle"
-#: mpulsweb/templates/search/search.mako:211
+#: mpulsweb/templates/search/search.mako:221
msgid "Female"
msgstr "Weiblich"
-#: mpulsweb/templates/search/search.mako:212
+#: mpulsweb/templates/search/search.mako:222
msgid "Male"
msgstr "Männlich"
-#: mpulsweb/templates/search/search.mako:213
+#: mpulsweb/templates/search/search.mako:223
msgid "Unspecified"
msgstr "Keine Angabe"
@@ -3814,3 +3795,18 @@
msgid "Change user password!"
msgstr "Benutzerpasswort geändert!"
+#~ msgid "Print case document:"
+#~ msgstr "Fallakte drucken:"
+
+#~ msgid "Documenting the modus change in the case journal"
+#~ msgstr "Phasenwechsel im Falltagebuch dokumentieren"
+
+#~ msgid "Case logbook"
+#~ msgstr "Falltagebuch"
+
+#~ msgid "Continue"
+#~ msgstr "Fortfahren"
+
+#~ msgid "Phase overview"
+#~ msgstr "Phasenübersicht"
+
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-07-19 07:32:35 UTC (rev 5173)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-07-19 09:12:24 UTC (rev 5174)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: mpulsweb 2.0.0-pre\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2011-06-06 11:24+0200\n"
+"POT-Creation-Date: 2011-07-19 11:06+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"
@@ -155,7 +155,6 @@
#: mpulsweb/controllers/annotations.py:33 mpulsweb/templates/main.mako:48
#: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:16
-#: mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako:14
#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:15
msgid "Help"
msgstr ""
@@ -239,7 +238,7 @@
msgstr ""
#: mpulsweb/controllers/case.py:79 mpulsweb/controllers/case.py:102
-#: mpulsweb/controllers/case_bundle.py:280 mpulsweb/controllers/case_bundle.py:311
+#: mpulsweb/controllers/case_bundle.py:282 mpulsweb/controllers/case_bundle.py:313
#: mpulsweb/templates/casemanagement/dialogs/confirm.mako:6
#: mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako:6
msgid "Delete case?"
@@ -258,7 +257,7 @@
msgid "Click on OK to continue."
msgstr ""
-#: mpulsweb/controllers/case.py:103 mpulsweb/controllers/case_bundle.py:318
+#: mpulsweb/controllers/case.py:103 mpulsweb/controllers/case_bundle.py:320
msgid ""
"Warning! On deleting the case all data will be erased\n"
"irrecoverable!<br>Only delete the case if this case is <b>not needed for\n"
@@ -334,23 +333,23 @@
"the analysis."
msgstr ""
-#: mpulsweb/controllers/case.py:239 mpulsweb/controllers/case_bundle.py:420
+#: mpulsweb/controllers/case.py:239 mpulsweb/controllers/case_bundle.py:422
msgid "Case restored!"
msgid_plural "Cases restored!"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case.py:240 mpulsweb/controllers/case_bundle.py:273
-#: mpulsweb/controllers/case_bundle.py:305 mpulsweb/controllers/case_bundle.py:348
-#: mpulsweb/controllers/case_bundle.py:387 mpulsweb/controllers/case_bundle.py:424
-#: mpulsweb/controllers/case_bundle.py:458 mpulsweb/controllers/case_bundle.py:481
+#: mpulsweb/controllers/case.py:240 mpulsweb/controllers/case_bundle.py:275
+#: mpulsweb/controllers/case_bundle.py:307 mpulsweb/controllers/case_bundle.py:350
+#: mpulsweb/controllers/case_bundle.py:389 mpulsweb/controllers/case_bundle.py:426
+#: mpulsweb/controllers/case_bundle.py:460 mpulsweb/controllers/case_bundle.py:483
#: mpulsweb/controllers/casedocument.py:57 mpulsweb/controllers/casedocument.py:98
#: mpulsweb/controllers/document.py:76 mpulsweb/controllers/document.py:118
#: mpulsweb/controllers/usersettings.py:92 mpulsweb/controllers/usersettings.py:127
msgid "Please click OK to continue."
msgstr ""
-#: mpulsweb/controllers/case.py:245 mpulsweb/controllers/case_bundle.py:430
+#: mpulsweb/controllers/case.py:245 mpulsweb/controllers/case_bundle.py:432
#: mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako:6
msgid "Restore case?"
msgid_plural "Restore cases?"
@@ -430,23 +429,23 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:242
+#: mpulsweb/controllers/case_bundle.py:244
msgid "No valid cases in the selection!"
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:243
+#: mpulsweb/controllers/case_bundle.py:245
msgid ""
"The selected action can not be executed\n"
"on any of the cases in your selection. Please make sure that the cases are\n"
"in a state from which you can execute the selected action."
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:253
+#: mpulsweb/controllers/case_bundle.py:255
#: mpulsweb/controllers/evaluation_overview.py:179
msgid "No action specified for the selection"
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:254
+#: mpulsweb/controllers/case_bundle.py:256
#: mpulsweb/controllers/evaluation_overview.py:180
msgid ""
"You have not selected any action for the\n"
@@ -454,46 +453,46 @@
"an action from the drop down menu."
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:268
+#: mpulsweb/controllers/case_bundle.py:270
msgid "Case deleted!"
msgid_plural "Cases deleted!"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:269
+#: mpulsweb/controllers/case_bundle.py:271
#, python-format
msgid "%s case was successfully cleared for deletion."
msgid_plural "%s cases were successfully cleared for deletion."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:285 mpulsweb/controllers/case_bundle.py:316
+#: mpulsweb/controllers/case_bundle.py:287 mpulsweb/controllers/case_bundle.py:318
#, python-format
msgid "Do you really want to delete the following case?%s"
msgid_plural "Do you really want to delete the following cases?%s"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:299
+#: mpulsweb/controllers/case_bundle.py:301
msgid "Case successfully deleted."
msgid_plural "Cases successfully deleted."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:302
+#: mpulsweb/controllers/case_bundle.py:304
#, python-format
msgid "%s case was successfully deleted."
msgid_plural "%s cases were successfully deleted."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:336
+#: mpulsweb/controllers/case_bundle.py:338
msgid "Case successfully cleared for anonymisation!"
msgid_plural "Cases successfully cleared for anonymisation!"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:342
+#: mpulsweb/controllers/case_bundle.py:344
#, python-format
msgid ""
"%s case was cleared for anonymisation. It will be presented to the "
@@ -504,13 +503,13 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:355
+#: mpulsweb/controllers/case_bundle.py:357
msgid "Clear case for anonymisation?"
msgid_plural "Clear cases for anonymisation?"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:367
+#: mpulsweb/controllers/case_bundle.py:369
#, python-format
msgid ""
"Do you really want to clear the following case for anonymisation? The case "
@@ -523,26 +522,26 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:381
+#: mpulsweb/controllers/case_bundle.py:383
msgid "Case anonymised!"
msgid_plural "Cases anonymised!"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:384
+#: mpulsweb/controllers/case_bundle.py:386
#, python-format
msgid "%s case was successfully anonymised."
msgid_plural "%s cases were successfully anonymised."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:393
+#: mpulsweb/controllers/case_bundle.py:395
msgid "Anonymise case?"
msgid_plural "Anonymise cases?"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:405
+#: mpulsweb/controllers/case_bundle.py:407
#, python-format
msgid ""
"Do you really want to anonymise the case and irrevocably lose its personal "
@@ -555,14 +554,14 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:422
+#: mpulsweb/controllers/case_bundle.py:424
#, python-format
msgid "%s was successfully restored."
msgid_plural "%s were successfully restored."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:436
+#: mpulsweb/controllers/case_bundle.py:438
#, python-format
msgid ""
"Do you really want to restore the following case? It will be available again "
@@ -573,47 +572,47 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:453
+#: mpulsweb/controllers/case_bundle.py:455
msgid "Editor appointed!"
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:455
+#: mpulsweb/controllers/case_bundle.py:457
#, python-format
msgid "%s case was successfully transferred to %s %s"
msgid_plural "%s cases were successfully transferred to %s %s"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:476
+#: mpulsweb/controllers/case_bundle.py:478
msgid "Stand-in appointed!"
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:478
+#: mpulsweb/controllers/case_bundle.py:480
#, python-format
msgid "%s case was successfully assigned to a substitute."
msgid_plural "%s cases were successfully assigned to a substitute."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:507
+#: mpulsweb/controllers/case_bundle.py:509
msgid "Export case?"
msgid_plural "Export cases?"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:542 mpulsweb/lib/helpers.py:89
+#: mpulsweb/controllers/case_bundle.py:544 mpulsweb/lib/helpers.py:89
#: mpulsweb/lib/helpers.py:94 mpulsweb/templates/casemanagement/digest.mako:166
msgid "unknown"
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:546
+#: mpulsweb/controllers/case_bundle.py:548
#, python-format
msgid "%d Case was marked for %s"
msgid_plural "%d Cases were marked for %s"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:549
+#: mpulsweb/controllers/case_bundle.py:551
#, python-format
msgid ""
"%d case can be exported. Please click on 'Download' to download the exported "
@@ -927,7 +926,7 @@
msgid "Open page"
msgstr ""
-#: mpulsweb/lib/security.py:375 mpulsweb/lib/security.py:391
+#: mpulsweb/lib/security.py:382 mpulsweb/lib/security.py:398
msgid "You are not authorised to look at the requested document."
msgstr ""
@@ -986,7 +985,7 @@
#: mpulsweb/model/case.py:1317 mpulsweb/model/case.py:1318
#: mpulsweb/templates/casemanagement/caselist.mako:181
#: mpulsweb/templates/casemanagement/caselist.mako:182
-#: mpulsweb/templates/search/search.mako:65
+#: mpulsweb/templates/search/search.mako:75
msgid "Editable"
msgstr ""
@@ -1072,7 +1071,7 @@
msgid "role_initialadmin"
msgstr ""
-#: mpulsweb/templates/base.mako:6 mpulsweb/templates/main.mako:208
+#: mpulsweb/templates/base.mako:6 mpulsweb/templates/main.mako:210
msgid "Wrong formular input"
msgstr ""
@@ -1099,7 +1098,7 @@
msgid "Black board"
msgstr ""
-#: mpulsweb/templates/main.mako:43 mpulsweb/templates/main.mako:223
+#: mpulsweb/templates/main.mako:43 mpulsweb/templates/main.mako:225
msgid "Info"
msgstr ""
@@ -1159,29 +1158,29 @@
msgid "Case documents\t"
msgstr ""
-#: mpulsweb/templates/main.mako:122
+#: mpulsweb/templates/main.mako:123
msgid "New case document"
msgstr ""
-#: mpulsweb/templates/main.mako:128
+#: mpulsweb/templates/main.mako:130
msgid "Import case document"
msgstr ""
-#: mpulsweb/templates/main.mako:141
+#: mpulsweb/templates/main.mako:143
msgid "Overview"
msgstr ""
-#: mpulsweb/templates/main.mako:145 mpulsweb/templates/auth/login.mako:17
+#: mpulsweb/templates/main.mako:147 mpulsweb/templates/auth/login.mako:17
#: mpulsweb/templates/auth/login.mako:46
msgid "Agency"
msgstr ""
-#: mpulsweb/templates/main.mako:155 mpulsweb/templates/evaluation/evaluate.mako:81
+#: mpulsweb/templates/main.mako:157 mpulsweb/templates/evaluation/evaluate.mako:81
#: mpulsweb/templates/help/help.mako:53
msgid "Evaluations"
msgstr ""
-#: mpulsweb/templates/main.mako:168
+#: mpulsweb/templates/main.mako:170
#: mpulsweb/templates/administration/delete_user_helper.mako:6
#: mpulsweb/templates/administration/edit_user.mako:13
#: mpulsweb/templates/administration/edit_usergroup.mako:10
@@ -1210,52 +1209,52 @@
msgid "Administration"
msgstr ""
-#: mpulsweb/templates/main.mako:173
+#: mpulsweb/templates/main.mako:175
msgid "User"
msgstr ""
-#: mpulsweb/templates/main.mako:179
+#: mpulsweb/templates/main.mako:181
msgid "Usergroup"
msgstr ""
-#: mpulsweb/templates/main.mako:184
+#: mpulsweb/templates/main.mako:186
msgid "Settings"
msgstr ""
-#: mpulsweb/templates/main.mako:243
+#: mpulsweb/templates/main.mako:245
msgid "Go to main menu directly"
msgstr ""
-#: mpulsweb/templates/main.mako:245
+#: mpulsweb/templates/main.mako:247
msgid "Go to main menu"
msgstr ""
-#: mpulsweb/templates/main.mako:249
+#: mpulsweb/templates/main.mako:251
msgid "Go to domain menu directly"
msgstr ""
-#: mpulsweb/templates/main.mako:251
+#: mpulsweb/templates/main.mako:253
msgid "Go to domain menu"
msgstr ""
-#: mpulsweb/templates/main.mako:255
+#: mpulsweb/templates/main.mako:257
msgid "Go to content directly"
msgstr ""
-#: mpulsweb/templates/main.mako:256
+#: mpulsweb/templates/main.mako:258
msgid "Go to content"
msgstr ""
-#: mpulsweb/templates/main.mako:264 mpulsweb/templates/annotations/main.mako:33
+#: mpulsweb/templates/main.mako:266 mpulsweb/templates/annotations/main.mako:33
#: mpulsweb/templates/auth/main.mako:6
msgid "Logo agency"
msgstr ""
-#: mpulsweb/templates/main.mako:291
+#: mpulsweb/templates/main.mako:293
msgid "Notice"
msgstr ""
-#: mpulsweb/templates/main.mako:292
+#: mpulsweb/templates/main.mako:294
#, python-format
msgid ""
"This session will be automatically terminated at %s. Please make sure you "
@@ -1545,7 +1544,7 @@
#: mpulsweb/templates/administration/show_user_body.mako:56
#: mpulsweb/templates/dialogs/confirm.mako:6
#: mpulsweb/templates/evaluation/evaluate.mako:68
-#: mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako:18
+#: mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako:13
#: mpulsweb/templates/settings/show.mako:63
msgid "Yes"
msgstr ""
@@ -1555,7 +1554,7 @@
#: mpulsweb/templates/administration/show_user_body.mako:48
#: mpulsweb/templates/administration/show_user_body.mako:58
#: mpulsweb/templates/dialogs/confirm.mako:7
-#: mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako:19
+#: mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako:14
#: mpulsweb/templates/settings/show.mako:65
msgid "No"
msgstr ""
@@ -1588,7 +1587,7 @@
#: mpulsweb/templates/appointments/remindlist_body.mako:7
#: mpulsweb/templates/casemanagement/caselist.mako:96
#: mpulsweb/templates/documents/case_overview.mako:42
-#: mpulsweb/templates/documents/global_overview.mako:28
+#: mpulsweb/templates/documents/global_overview.mako:33
#: mpulsweb/templates/home/globalappointmentlist.mako:13
#: mpulsweb/templates/logbook/overview.mako:101
#: mpulsweb/templates/phase/phase.mako:28
@@ -1603,11 +1602,10 @@
#: mpulsweb/templates/casemanagement/caselist.mako:216
#: mpulsweb/templates/casemanagement/reminderlist.mako:6
#: mpulsweb/templates/casemanagement/reminderlist.mako:7
-#: mpulsweb/templates/documents/case_overview.mako:57
-#: mpulsweb/templates/documents/global_overview.mako:43
-#: mpulsweb/templates/documents/global_overview.mako:44
-#: mpulsweb/templates/documents/global_overview.mako:60
-#: mpulsweb/templates/documents/global_overview.mako:61
+#: mpulsweb/templates/documents/case_overview.mako:63
+#: mpulsweb/templates/documents/case_overview.mako:64
+#: mpulsweb/templates/documents/global_overview.mako:53
+#: mpulsweb/templates/documents/global_overview.mako:54
#: mpulsweb/templates/home/caseappointmentlist.mako:7
#: mpulsweb/templates/home/caseappointmentlist.mako:11
#: mpulsweb/templates/home/caseappointmentlist.mako:15
@@ -1631,10 +1629,9 @@
#: mpulsweb/templates/casemanagement/overview.mako:44
#: mpulsweb/templates/casemanagement/reminderlist.mako:12
#: mpulsweb/templates/casemanagement/reminderlist.mako:13
-#: mpulsweb/templates/documents/case_overview.mako:61
-#: mpulsweb/templates/documents/case_overview.mako:62
-#: mpulsweb/templates/documents/global_overview.mako:46
-#: mpulsweb/templates/documents/global_overview.mako:63
+#: mpulsweb/templates/documents/case_overview.mako:69
+#: mpulsweb/templates/documents/case_overview.mako:70
+#: mpulsweb/templates/documents/global_overview.mako:59
msgid "Delete"
msgstr ""
@@ -1997,7 +1994,7 @@
#: mpulsweb/templates/casemanagement/caselist.mako:172
#: mpulsweb/templates/casemanagement/caselist.mako:173
#: mpulsweb/templates/casemanagement/organisation.mako:42
-#: mpulsweb/templates/search/search.mako:50
+#: mpulsweb/templates/search/search.mako:60
#: mpulsweb/templates/usersettings/edit_standin.mako:23
msgid "Standin"
msgstr ""
@@ -2037,7 +2034,7 @@
#: mpulsweb/templates/casemanagement/organisation.mako:78
#: mpulsweb/templates/logbook/overview.mako:47
#: mpulsweb/templates/logbook/overview_print.mako:32
-#: mpulsweb/templates/logbook/show.mako:37 mpulsweb/templates/search/search.mako:39
+#: mpulsweb/templates/logbook/show.mako:37 mpulsweb/templates/search/search.mako:49
msgid "Editor"
msgstr ""
@@ -2168,7 +2165,7 @@
#: mpulsweb/templates/casemanagement/caselist.mako:93
#: mpulsweb/templates/casemanagement/main.mako:28
-#: mpulsweb/templates/search/search.mako:61
+#: mpulsweb/templates/search/search.mako:71
msgid "Status"
msgstr ""
@@ -2247,7 +2244,7 @@
#: mpulsweb/templates/casemanagement/main.mako:27
#: mpulsweb/templates/evaluation/evaluate.mako:34
#: mpulsweb/templates/phase/phase.mako:21 mpulsweb/templates/phase/phase.mako:156
-#: mpulsweb/templates/search/search.mako:85
+#: mpulsweb/templates/search/search.mako:95
msgid "Phase"
msgstr ""
@@ -2260,12 +2257,12 @@
msgstr ""
#: mpulsweb/templates/casemanagement/digest.mako:157
-#: mpulsweb/templates/search/search.mako:98
+#: mpulsweb/templates/search/search.mako:108
msgid "Start date"
msgstr ""
#: mpulsweb/templates/casemanagement/digest.mako:158
-#: mpulsweb/templates/search/search.mako:107
+#: mpulsweb/templates/search/search.mako:117
msgid "End date"
msgstr ""
@@ -2478,19 +2475,19 @@
#: mpulsweb/templates/casemanagement/search.mako:9
#: mpulsweb/templates/evaluation/search.mako:11
#: mpulsweb/templates/evaluation/search.mako:14
-#: mpulsweb/templates/search/search.mako:246
+#: mpulsweb/templates/search/search.mako:256
msgid "Reset search"
msgstr ""
#: mpulsweb/templates/casemanagement/search.mako:14
#: mpulsweb/templates/evaluation/search.mako:19
-#: mpulsweb/templates/search/search.mako:250
+#: mpulsweb/templates/search/search.mako:260
msgid "Hide extended search"
msgstr ""
#: mpulsweb/templates/casemanagement/search.mako:17
#: mpulsweb/templates/evaluation/search.mako:22
-#: mpulsweb/templates/search/search.mako:252
+#: mpulsweb/templates/search/search.mako:262
msgid "Show extended search"
msgstr ""
@@ -2650,7 +2647,7 @@
#: mpulsweb/templates/documents/case_new.mako:58
#: mpulsweb/templates/documents/case_overview.mako:36
-#: mpulsweb/templates/documents/global_overview.mako:26
+#: mpulsweb/templates/documents/global_overview.mako:27
#: mpulsweb/templates/documents/global_upload.mako:46
msgid "Filename"
msgstr ""
@@ -2697,12 +2694,12 @@
msgstr ""
#: mpulsweb/templates/documents/case_overview.mako:39
-#: mpulsweb/templates/documents/global_overview.mako:27
+#: mpulsweb/templates/documents/global_overview.mako:30
msgid "Filesize"
msgstr ""
-#: mpulsweb/templates/documents/case_overview.mako:71
-#: mpulsweb/templates/documents/global_overview.mako:73
+#: mpulsweb/templates/documents/case_overview.mako:79
+#: mpulsweb/templates/documents/global_overview.mako:68
msgid "No files found"
msgstr ""
@@ -3058,7 +3055,6 @@
msgstr ""
#: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:16
-#: mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako:14
#, python-format
msgid ""
"Please consider, that the case should be given to the client in printed form "
@@ -3066,8 +3062,7 @@
msgstr ""
#: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:21
-#: mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako:20
-#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:19
+#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:17
msgid "Print"
msgstr ""
@@ -3077,27 +3072,14 @@
" to the young person. Further information you will find in"
msgstr ""
-#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:18
-msgid "Print case document:"
+#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:22
+msgid "Continue editing"
msgstr ""
-#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:23
-msgid "Documenting the modus change in the case journal"
-msgstr ""
-
#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:24
-msgid "Case logbook"
-msgstr ""
-
-#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:30
-#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:32
msgid "Back to phase overview"
msgstr ""
-#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:34
-msgid "Phase overview"
-msgstr ""
-
#: mpulsweb/templates/privacy/edit_statement.mako:6
#: mpulsweb/templates/privacy/dialogs/accept_success.mako:6
#: mpulsweb/templates/privacy/dialogs/confirm.mako:6
@@ -3174,145 +3156,145 @@
"will be made anonymous."
msgstr ""
-#: mpulsweb/templates/search/search.mako:7
-#: mpulsweb/templates/search/search.mako:230
+#: mpulsweb/templates/search/search.mako:15
+#: mpulsweb/templates/search/search.mako:240
msgid "Search"
msgstr ""
-#: mpulsweb/templates/search/search.mako:12
-#: mpulsweb/templates/search/search.mako:34
+#: mpulsweb/templates/search/search.mako:22
+#: mpulsweb/templates/search/search.mako:44
msgid "Responsibility"
msgstr ""
-#: mpulsweb/templates/search/search.mako:15
+#: mpulsweb/templates/search/search.mako:25
msgid "All users"
msgstr ""
-#: mpulsweb/templates/search/search.mako:25
+#: mpulsweb/templates/search/search.mako:35
msgid "Branch"
msgstr ""
-#: mpulsweb/templates/search/search.mako:38
+#: mpulsweb/templates/search/search.mako:48
msgid "Own cases"
msgstr ""
-#: mpulsweb/templates/search/search.mako:42
+#: mpulsweb/templates/search/search.mako:52
msgid "Own"
msgstr ""
-#: mpulsweb/templates/search/search.mako:46
+#: mpulsweb/templates/search/search.mako:56
msgid "Standin cases"
msgstr ""
-#: mpulsweb/templates/search/search.mako:65
+#: mpulsweb/templates/search/search.mako:75
msgid "Editable cases"
msgstr ""
-#: mpulsweb/templates/search/search.mako:68
+#: mpulsweb/templates/search/search.mako:78
msgid "Almost deleted"
msgstr ""
-#: mpulsweb/templates/search/search.mako:73
+#: mpulsweb/templates/search/search.mako:83
msgid "Almost anonymized"
msgstr ""
-#: mpulsweb/templates/search/search.mako:77
+#: mpulsweb/templates/search/search.mako:87
msgid "Anonymized"
msgstr ""
-#: mpulsweb/templates/search/search.mako:118
+#: mpulsweb/templates/search/search.mako:128
msgid "Federal state"
msgstr ""
-#: mpulsweb/templates/search/search.mako:120
+#: mpulsweb/templates/search/search.mako:130
msgid "Select all"
msgstr ""
-#: mpulsweb/templates/search/search.mako:121
+#: mpulsweb/templates/search/search.mako:131
msgid "Deselect all"
msgstr ""
-#: mpulsweb/templates/search/search.mako:127
+#: mpulsweb/templates/search/search.mako:137
msgid "Baden-Württemberg"
msgstr ""
-#: mpulsweb/templates/search/search.mako:131
+#: mpulsweb/templates/search/search.mako:141
msgid "Bavaria"
msgstr ""
-#: mpulsweb/templates/search/search.mako:135
+#: mpulsweb/templates/search/search.mako:145
msgid "Berlin"
msgstr ""
-#: mpulsweb/templates/search/search.mako:141
+#: mpulsweb/templates/search/search.mako:151
msgid "Brandenburg"
msgstr ""
-#: mpulsweb/templates/search/search.mako:145
+#: mpulsweb/templates/search/search.mako:155
msgid "Bremen"
msgstr ""
-#: mpulsweb/templates/search/search.mako:149
+#: mpulsweb/templates/search/search.mako:159
msgid "Hamburg"
msgstr ""
-#: mpulsweb/templates/search/search.mako:155
+#: mpulsweb/templates/search/search.mako:165
msgid "Hesse"
msgstr ""
-#: mpulsweb/templates/search/search.mako:159
+#: mpulsweb/templates/search/search.mako:169
msgid "Mecklenburg-Western Pomerania"
msgstr ""
-#: mpulsweb/templates/search/search.mako:163
+#: mpulsweb/templates/search/search.mako:173
msgid "Lower Saxony"
msgstr ""
-#: mpulsweb/templates/search/search.mako:169
+#: mpulsweb/templates/search/search.mako:179
msgid "North Rhine-Westphalia"
msgstr ""
-#: mpulsweb/templates/search/search.mako:173
+#: mpulsweb/templates/search/search.mako:183
msgid "Rhineland-Palatinate"
msgstr ""
-#: mpulsweb/templates/search/search.mako:177
+#: mpulsweb/templates/search/search.mako:187
msgid "Saarland"
msgstr ""
-#: mpulsweb/templates/search/search.mako:183
+#: mpulsweb/templates/search/search.mako:193
msgid "Saxony"
msgstr ""
-#: mpulsweb/templates/search/search.mako:187
+#: mpulsweb/templates/search/search.mako:197
msgid "Saxony-Anhalt"
msgstr ""
-#: mpulsweb/templates/search/search.mako:191
+#: mpulsweb/templates/search/search.mako:201
msgid "Schleswig-Holstein"
msgstr ""
-#: mpulsweb/templates/search/search.mako:197
+#: mpulsweb/templates/search/search.mako:207
msgid "Thuringia"
msgstr ""
-#: mpulsweb/templates/search/search.mako:207
+#: mpulsweb/templates/search/search.mako:217
msgid "Gender"
msgstr ""
-#: mpulsweb/templates/search/search.mako:210
+#: mpulsweb/templates/search/search.mako:220
msgid "All"
msgstr ""
-#: mpulsweb/templates/search/search.mako:211
+#: mpulsweb/templates/search/search.mako:221
msgid "Female"
msgstr ""
-#: mpulsweb/templates/search/search.mako:212
+#: mpulsweb/templates/search/search.mako:222
msgid "Male"
msgstr ""
-#: mpulsweb/templates/search/search.mako:213
+#: mpulsweb/templates/search/search.mako:223
msgid "Unspecified"
msgstr ""
Modified: base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako
===================================================================
--- base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako 2011-07-19 07:32:35 UTC (rev 5173)
+++ base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako 2011-07-19 09:12:24 UTC (rev 5174)
@@ -14,24 +14,13 @@
${_('Please remember: If the modus changes a printed case file has to be delivered to the young person. Further information you will find in')}
<a href="${h.url_for(controller='/annotations', action='help', id='datenschutz_veraenderte_daten')}" target="_blank">${_('Help')}</a>
</p>
- <p class="import_p">
- <strong class="import_number">1.</strong> ${_('Print case document:')}
<a class="button import" href="${h.url_for(controller='/case', action='printAll', id=session.get('case').id, confirmed=0)}" target="_blank">${_('Print')}</a>
- </p>
- % if g.mpuls_config.is_enabled('case-module', 'phase'):
- <p class="import_p">
- <strong class="export_number">2.</strong> ${_('Documenting the modus change in the case journal')}:
- <a class="button import" href="${h.url_for(controller='/logbook', action='new', id=session.get('case').id)}">${_('Case logbook')}</a>
- </p>
- % endif
- <p><strong>oder</strong></p>
- <p class="import_p">
- % if g.mpuls_config.is_enabled('case-module', 'phase'):
- <strong class="export_number">3.</strong> ${_('Back to phase overview')}:
- % else:
- <strong class="export_number">2.</strong> ${_('Back to phase overview')}:
- % endif
- <a class="button import" href="${c.url_ok}">${_('Phase overview')}</a>
- </p>
</div>
+ <br/>
+ <div>
+ % if g.mpuls_config.is_enabled('phases', 'changemode') == 1:
+ <a class="button import" href="${h.url_for(controller='/formularpage', action='edit', id=session.get('navigation.selectedpage'))}">${_('Continue editing')}</a>
+ %endif
+ <a class="button import" href="${c.url_ok}">${_('Back to phase overview')}</a>
+ </div>
</div>
More information about the Mpuls-commits
mailing list