[Mpuls-commits] r4616 - in base/trunk/mpulsweb: controllers i18n i18n/de/LC_MESSAGES

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Mon Feb 14 15:44:49 CET 2011


Author: ludwig
Date: 2011-02-14 15:44:48 +0100 (Mon, 14 Feb 2011)
New Revision: 4616

Modified:
   base/trunk/mpulsweb/controllers/administration.py
   base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
   base/trunk/mpulsweb/i18n/mpulsweb.pot
Log:
Update translation msgids (admininsration dialog)


Modified: base/trunk/mpulsweb/controllers/administration.py
===================================================================
--- base/trunk/mpulsweb/controllers/administration.py	2011-02-14 13:42:38 UTC (rev 4615)
+++ base/trunk/mpulsweb/controllers/administration.py	2011-02-14 14:44:48 UTC (rev 4616)
@@ -19,42 +19,51 @@
 from mpulsweb.controllers.case_overview import default_phases
 
 
-RESET_PASSWORD_CONFIRM = _('adm_reset_user_password')
-RESET_PASSWORD_CONFIRM_QUESTION = _('adm_reset_user_password_question')
-EDIT_USER_SUCCESS_HEADER = _('adm_edit_user_header')
-EDIT_USER_SUCCESS_TEXT = _('adm_edit_user_text')
-DELETE_USER_CONFIRM = _('adm_delete_user_confirm_header')
-DELETE_USER_CONFIRM_QUESTION = _('adm_delete_user_confirm_text')
-DELETE_USER_SUCCESS_HEADER = _('adm_delete_user_success_header')
-DELETE_USER_SUCCESS_TEXT = _('adm_delete_user_success_text')
-DELETE_SELFUSER_FAILURE = _('adm_delete_selfuser_notification_header')
-DELETE_SELFUSER_FAILURE_TEXT = _('adm_delete_selfuser_notification_text')
-DELETE_USER_HASCASES = _(u'Der Benutzer konnte nicht gelöscht werden')
+RESET_PASSWORD_CONFIRM = _('Reset user password?')
+RESET_PASSWORD_CONFIRM_QUESTION = _('Confirm reset user password:')
+EDIT_USER_SUCCESS_HEADER = _('User configs saved!')
+EDIT_USER_SUCCESS_TEXT = _("Please click okay to continue.")
+DELETE_USER_CONFIRM = _('Delete user?')
+DELETE_USER_CONFIRM_QUESTION = _('Please confirm to delete user <strong>%s, %s</strong> (login: %s).')
+DELETE_USER_SUCCESS_HEADER = _('User deleted!')
+DELETE_USER_SUCCESS_TEXT = _('User sucessfully deleted. Click okay to continue.')
+DELETE_SELFUSER_FAILURE = _('User not deleted!')
+DELETE_SELFUSER_FAILURE_TEXT = _('Not possible to delete current login user. Click on okay to continue.')
+DELETE_USER_HASCASES = _(u'The user can not be deleted')
 DELETE_USER_HASCASES_TEXT = \
-_(u'Der Benutzer konnte nicht gelöscht werden, da dieser noch Bearbeiter'
-  u' von mindestens einen Fall ist. Bitte übertragen Sie zunächst'
-  u' sämtliche Fälle dieses Nutzers an einen anderen Bearbeiter und'
-  u' wiederholen Sie den Vorgang erneut. Klicken Sie auf "OK", um zur'
-  u' Benutzerübersicht zurück zu kehren.')
-DIALOG_CONFIRM_SETEDITOR = _('adm_set_editor_header')
-SETEDITOR_NOTIFICATION_SUCCESS = _('adm_set_editor_success_text')
-SETEDITOR_NOTIFICATION_SUCCESS_REST = _('adm_set_editor_success_text_rest')
-SETEDITOR_NOTIFICATION_SUCCESS_HEAD = _('adm_set_editor_success_text_head')
+  _(u'The user can not be deleted, because he is agent of at least one case.'
+    u' Please move all cases of this agent to a different agent and repeat'
+    u' the action. Click on \"OK\" to navigate back to the user overview.')
+DIALOG_CONFIRM_SETEDITOR = _('Assign case document')
+SETEDITOR_NOTIFICATION_SUCCESS = _('Case document assigned to %s, %s. Please click on OK to delete %s, %s.')
+SETEDITOR_NOTIFICATION_SUCCESS_REST = \
+  _(u'Case document assigned to %s, %s. %s, %s has more case documents.'
+    u' Please click on OK to continue.')
+SETEDITOR_NOTIFICATION_SUCCESS_HEAD = _('Case document assigned!')
 SETEDITOR_NOTIFICATION_SUCCESS_REST_HEAD = \
-                                  _('adm_set_editor_success_text_rest_head')
+  _('Case document assigned. More case documents exist!')
 
-NEW_USERGROUP_SUCCESS_HEADER = _('adm_new_usergroup_success_header')
-NEW_USERGROUP_SUCCESS_TEXT = _('adm_new_usergroup_success_text')
-NEW_USERGROUP_FAILURE_HEADER = _('adm_new_usergroup_failure_header')
-NEW_USERGROUP_FAILURE_TEXT = _('adm_new_usergroup_failure_text')
-EDIT_USERGROUP_SUCCESS_HEADER = _('adm_edit_usergroup_header')
-EDIT_USERGROUP_SUCCESS_TEXT = _('adm_edit_usergroup_text')
-DELETE_USERGROUP_CONFIRM = _('adm_delete_usergroup_confirm_header')
-DELETE_USERGROUP_CONFIRM_QUESTION = _('adm_delete_usergroup_confirm_text')
-DELETE_USERGROUP_SUCCESS_HEADER = _('adm_delete_usergroup_success_header')
-DELETE_USERGROUP_SUCCESS_TEXT = _('adm_delete_usergroup_success_text')
-DELETE_USERGROUP_FAILED_HEADER = _('adm_delete_usergroup_failure_header')
-DELETE_USERGROUP_FAILED_TEXT = _('adm_delete_usergroup_failure_text')
+NEW_USERGROUP_SUCCESS_HEADER = _('Create user group!')
+NEW_USERGROUP_SUCCESS_TEXT = \
+ _(u'User group successfully created. Please click on OK to continue to the'
+   u' user group overview')
+NEW_USERGROUP_FAILURE_HEADER = _('Failed to create user group!')
+NEW_USERGROUP_FAILURE_TEXT = _('Failed to create the user group.'
+  ' Please click on OK to continue in the user overview.')
+EDIT_USERGROUP_SUCCESS_HEADER =_('Edit user group!')
+EDIT_USERGROUP_SUCCESS_TEXT = \
+  _('The user group was successfully edited. Please click on OK '
+    'to continue in the user group overview.')
+DELETE_USERGROUP_CONFIRM = _('Delete user group?')
+DELETE_USERGROUP_CONFIRM_QUESTION = _('Do you want to delete the user group and lose the data?')
+DELETE_USERGROUP_SUCCESS_HEADER = _('User group deleted!')
+DELETE_USERGROUP_SUCCESS_TEXT = \
+  _('The user group was successfully deleted.'
+    ' Please click on OK to continue in the user group overview.')
+DELETE_USERGROUP_FAILED_HEADER = _('Failed to delete the user group!')
+DELETE_USERGROUP_FAILED_TEXT = \
+  _('Deletion of the user group failed. Please click on OK to continue'
+    ' in the user group overview.')
 
 
 log = logging.getLogger(__name__)

Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po	2011-02-14 13:42:38 UTC (rev 4615)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po	2011-02-14 14:44:48 UTC (rev 4616)
@@ -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-02-04 12:55+0100\n"
+"PO-Revision-Date: 2011-02-14 15:24+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"
@@ -18,62 +18,61 @@
 "Generated-By: Babel 0.9.4\n"
 
 #: mpulsweb/controllers/administration.py:22
-msgid "adm_reset_user_password"
+msgid "Reset user password?"
 msgstr "Benutzerpasswort zurücksetzen?"
 
 #: mpulsweb/controllers/administration.py:23
-msgid "adm_reset_user_password_question"
+msgid "Confirm reset user password:"
 msgstr "Wollen Sie wirklich das Passwort für folgenden Benutzer zurücksetzen:"
 
 #: mpulsweb/controllers/administration.py:24
-msgid "adm_edit_user_header"
+msgid "User configs saved!"
 msgstr "Benutzereinstellungen gespeichert!"
 
 #: mpulsweb/controllers/administration.py:25
-msgid "adm_edit_user_text"
+msgid "Please click okay to continue."
 msgstr "Bitte klicken Sie auf OK, um fortzufahren."
 
 #: mpulsweb/controllers/administration.py:26
-msgid "adm_delete_user_confirm_header"
+msgid "Delete user?"
 msgstr "Benutzer löschen?"
 
 #: mpulsweb/controllers/administration.py:27
-msgid "adm_delete_user_confirm_text"
+#, python-format
+msgid "Please confirm to delete user <strong>%s, %s</strong> (login: %s)."
 msgstr ""
 "Wollen Sie den Benutzer <strong>%s, %s</strong> (login: %s) löschen und "
 "die Daten unwiederbringlich verlieren?"
 
 #: mpulsweb/controllers/administration.py:28
-msgid "adm_delete_user_success_header"
+msgid "User deleted!"
 msgstr "Benutzer gelöscht!"
 
 #: mpulsweb/controllers/administration.py:29
-msgid "adm_delete_user_success_text"
+msgid "User sucessfully deleted. Click okay to continue."
 msgstr ""
 "Der Benutzer wurde erfolgreich gelöscht. Bitte klicken Sie auf OK um "
 "fortzufahren."
 
 #: mpulsweb/controllers/administration.py:30
-msgid "adm_delete_selfuser_notification_header"
+msgid "User not deleted!"
 msgstr "Benutzer nicht gelöscht!"
 
 #: mpulsweb/controllers/administration.py:31
-msgid "adm_delete_selfuser_notification_text"
+msgid "Not possible to delete current login user. Click on okay to continue."
 msgstr ""
 "Es ist nicht möglich den aktuell angemeldeten Nutzer zu löschen. Bitte "
 "klicken Sie auf OK, um fortzufahren."
 
 #: mpulsweb/controllers/administration.py:32
-msgid "Der Benutzer konnte nicht gelöscht werden"
+msgid "The user can not be deleted"
 msgstr "Der Benutzer konnte nicht gelöscht werden"
 
 #: mpulsweb/controllers/administration.py:34
 msgid ""
-"Der Benutzer konnte nicht gelöscht werden, da dieser noch Bearbeiter von "
-"mindestens einen Fall ist. Bitte übertragen Sie zunächst sämtliche Fälle "
-"dieses Nutzers an einen anderen Bearbeiter und wiederholen Sie den "
-"Vorgang erneut. Klicken Sie auf \"OK\", um zur Benutzerübersicht zurück "
-"zu kehren."
+"The user can not be deleted, because he is agent of at least one case. "
+"Please move all cases of this agent to a different agent and repeat the "
+"action. Click on \"OK\" to navigate back to the user overview."
 msgstr ""
 "Der Benutzer konnte nicht gelöscht werden, da dieser noch Bearbeiter von "
 "mindestens einen Fall ist. Bitte übertragen Sie zunächst sämtliche Fälle "
@@ -81,86 +80,102 @@
 "Vorgang erneut. Klicken Sie auf \"OK\", um zur Benutzerübersicht zurück "
 "zu kehren."
 
-#: mpulsweb/controllers/administration.py:39
-msgid "adm_set_editor_header"
+#: mpulsweb/controllers/administration.py:37
+msgid "Assign case document"
 msgstr "Fallakten übertragen"
 
-#: mpulsweb/controllers/administration.py:40
-msgid "adm_set_editor_success_text"
+#: mpulsweb/controllers/administration.py:38
+#, python-format
+msgid "Case document assigned to %s, %s. Please click on OK to delete %s, %s."
 msgstr ""
 "Fallakten wurden an %s, %s übertragen. Bitte klicken Sie auf OK, um %s, "
 "%s zu löschen."
 
-#: mpulsweb/controllers/administration.py:41
-msgid "adm_set_editor_success_text_rest"
+#: mpulsweb/controllers/administration.py:40
+msgid ""
+"Case document assigned to %s, %s. %s, %s has more case documents. Please "
+"click on OK to continue."
 msgstr ""
 "Fallakten wurden an %s, %s übertragen. %s, %s verfügt weiterhin über "
 "Fallakten. Bitte klicken Sie auf OK, um fortzufahren."
 
 #: mpulsweb/controllers/administration.py:42
-msgid "adm_set_editor_success_text_head"
+msgid "Case document assigned!"
 msgstr "Fallakten übertragen!"
 
 #: mpulsweb/controllers/administration.py:44
-msgid "adm_set_editor_success_text_rest_head"
+msgid "Case document assigned. More case documents exist!"
 msgstr "Fallakten übertragen. Weitere Fallakten vorhanden!"
 
 #: mpulsweb/controllers/administration.py:46
-msgid "adm_new_usergroup_success_header"
+msgid "Create user group!"
 msgstr "Benutzergruppe angelegt!"
 
-#: mpulsweb/controllers/administration.py:47
-msgid "adm_new_usergroup_success_text"
+#: mpulsweb/controllers/administration.py:48
+msgid ""
+"User group successfully created. Please click on OK to continue to the "
+"user group overview"
 msgstr ""
 "Die Benutzergruppe wurde erfolgreich angelegt. Bitte klicken Sie auf OK, "
 "um zur Benutzergruppenübersicht fortzufahren."
 
-#: mpulsweb/controllers/administration.py:48
-msgid "adm_new_usergroup_failure_header"
+#: mpulsweb/controllers/administration.py:50
+msgid "Failed to create user group!"
 msgstr "Benutzergruppe nicht angelegt!"
 
-#: mpulsweb/controllers/administration.py:49
-msgid "adm_new_usergroup_failure_text"
+#: mpulsweb/controllers/administration.py:51
+msgid ""
+"Failed to create the user group. Please click on OK to continue in the "
+"user overview."
 msgstr ""
 "Beim Anlegen der Benutzergruppe ist ein Fehler aufgetreten. Bitte klicken"
 " Sie auf OK, um zur Benutzergruppenübersicht fortzufahren."
 
-#: mpulsweb/controllers/administration.py:50
-msgid "adm_edit_usergroup_header"
+#: mpulsweb/controllers/administration.py:53
+msgid "Edit user group!"
 msgstr "Benutzergruppe bearbeitet!"
 
-#: mpulsweb/controllers/administration.py:51
-msgid "adm_edit_usergroup_text"
+#: mpulsweb/controllers/administration.py:55
+#, fuzzy
+#| msgid "" "The user group was successfully edited. Please click on OK \"\n"
+#| "\"to continue in the user group overview."
+msgid ""
+"The user group was successfully edited. Please click on OK to continue in"
+" the user group overview."
 msgstr ""
 "Die Benutzergruppe wurde erfolgreich bearbeitet. Bitte klicken Sie auf "
 "OK, um zur Benutzergruppenübersicht fortzufahren."
 
-#: mpulsweb/controllers/administration.py:52
-msgid "adm_delete_usergroup_confirm_header"
+#: mpulsweb/controllers/administration.py:57
+msgid "Delete user group?"
 msgstr "Benutzergruppe löschen?"
 
-#: mpulsweb/controllers/administration.py:53
-msgid "adm_delete_usergroup_confirm_text"
+#: mpulsweb/controllers/administration.py:58
+msgid "Do you want to delete the user group and lose the data?"
 msgstr ""
 "Wollen Sie die Benutzergruppe löschen und die Daten unwiederbringlich "
 "verlieren?"
 
-#: mpulsweb/controllers/administration.py:54
-msgid "adm_delete_usergroup_success_header"
+#: mpulsweb/controllers/administration.py:59
+msgid "User group deleted!"
 msgstr "Benutzergruppe gelöscht!"
 
-#: mpulsweb/controllers/administration.py:55
-msgid "adm_delete_usergroup_success_text"
+#: mpulsweb/controllers/administration.py:61
+msgid ""
+"The user group was successfully deleted. Please click on OK to continue "
+"in the user group overview."
 msgstr ""
 "Die Benutzergruppe wurde erfolgreich gelöscht. Bitte klicken Sie auf OK, "
 "um zur Benutzergruppenübersicht fortzufahren."
 
-#: mpulsweb/controllers/administration.py:56
-msgid "adm_delete_usergroup_failure_header"
+#: mpulsweb/controllers/administration.py:63
+msgid "Failed to delete the user group!"
 msgstr "Benutzergruppe nicht gelöscht!"
 
-#: mpulsweb/controllers/administration.py:57
-msgid "adm_delete_usergroup_failure_text"
+#: mpulsweb/controllers/administration.py:65
+msgid ""
+"Deletion of the user group failed. Please click on OK to continue in the "
+"user group overview."
 msgstr ""
 "Bei dem Löschen der Benutzergruppe ist ein Fehler aufgetreten. Bitte "
 "klicken Sie auf OK, um zur Benutzergruppenübersicht fortzufahren."
@@ -245,7 +260,7 @@
 msgid "The appointment was successfully edited"
 msgstr "Der Termin wurde erfolgreich bearbeitet."
 
-#: mpulsweb/controllers/case.py:35
+#: mpulsweb/controllers/case.py:36
 msgid ""
 "Do you really want to anonymise the case and\n"
 "irrecovably lose the associated personal data? After it the case will\n"
@@ -257,14 +272,14 @@
 "zur Bearbeitung zur Verfügung. Die anonymisierte Fallakte wird weiterhin "
 "in der Auswertung berücksichtigt werden."
 
-#: mpulsweb/controllers/case.py:57 mpulsweb/controllers/case_bundle.py:276
+#: mpulsweb/controllers/case.py:58 mpulsweb/controllers/case_bundle.py:276
 #: mpulsweb/controllers/case_bundle.py:307
 msgid "Delete case?"
 msgid_plural "Delete cases?"
 msgstr[0] "Fallakte löschen?"
 msgstr[1] "Fallakten löschen?"
 
-#: mpulsweb/controllers/case.py:58
+#: mpulsweb/controllers/case.py:59
 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"
@@ -276,7 +291,7 @@
 "<em>für Auswertungen nicht mehr berücksichtigt</em>!<br><br>Die Akte "
 "jetzt vom Server löschen?"
 
-#: mpulsweb/controllers/case.py:62
+#: mpulsweb/controllers/case.py:63
 msgid ""
 "Do you really want to mark this case for deletion?\n"
 "The case will not be editable afterwards, and submited to the "
@@ -287,13 +302,13 @@
 "steht Ihnen danach nicht mehr zur Bearbeitung zur Verfügung und wird der "
 "Administration zum Löschen vorgelegt."
 
-#: mpulsweb/controllers/case.py:69 mpulsweb/controllers/case_bundle.py:421
+#: mpulsweb/controllers/case.py:70 mpulsweb/controllers/case_bundle.py:421
 msgid "Restore case?"
 msgid_plural "Restore cases?"
 msgstr[0] "Fallakte wiederherstellen?"
 msgstr[1] "Fallakten wiederherstellen?"
 
-#: mpulsweb/controllers/case.py:70
+#: mpulsweb/controllers/case.py:71
 msgid ""
 "Do you really want to restore the case? The case\n"
 "will be editable afterwards again for the users."
@@ -301,11 +316,11 @@
 "Wollen Sie wirklich die Fallakte wiederherstellen? Die Fallakte ist "
 "danach wieder für die Nutzer bearbeitbar."
 
-#: mpulsweb/controllers/case.py:73
+#: mpulsweb/controllers/case.py:74
 msgid "Case(s) imported!"
 msgstr "Fallakte(n) importiert!"
 
-#: mpulsweb/controllers/case.py:74
+#: mpulsweb/controllers/case.py:75
 msgid ""
 "The file was imported successfully.\n"
 "Click on \"OK\" to open the case overview."
@@ -313,11 +328,11 @@
 "Die Datei wurde erfolgreich importiert. Klicken Sie auf \"OK\", um die "
 "Fallaktenübersicht zu öffnen."
 
-#: mpulsweb/controllers/case.py:77
+#: mpulsweb/controllers/case.py:78
 msgid "Case(s) not imported!"
 msgstr "Fallakte(n) nicht importiert!"
 
-#: mpulsweb/controllers/case.py:78
+#: mpulsweb/controllers/case.py:79
 msgid ""
 "An error occurred during the import.\n"
 "Click 'OK' to return to the import dialog."
@@ -325,14 +340,14 @@
 "Bei dem Import ist ein Fehler aufgetreten. Klicken Sie auf \"OK\", um zu "
 "dem Importdialog zurückzukehren."
 
-#: mpulsweb/controllers/case.py:215 mpulsweb/model/case.py:1310
+#: mpulsweb/controllers/case.py:216 mpulsweb/model/case.py:1334
 #: mpulsweb/model/phase.py:299
 #: mpulsweb/templates/casemanagement/caselist.mako:144
 #: mpulsweb/templates/phase/phase.mako:51
 msgid "Running"
 msgstr "laufend"
 
-#: mpulsweb/controllers/case.py:217 mpulsweb/model/case.py:1312
+#: mpulsweb/controllers/case.py:218 mpulsweb/model/case.py:1336
 #: mpulsweb/model/phase.py:301
 #: mpulsweb/templates/casemanagement/caselist.mako:147
 #: mpulsweb/templates/phase/phase.mako:53
@@ -340,11 +355,11 @@
 msgid "Finished"
 msgstr "beendet"
 
-#: mpulsweb/controllers/case.py:406
+#: mpulsweb/controllers/case.py:393
 msgid "Case copied!"
 msgstr "Fallakte kopiert"
 
-#: mpulsweb/controllers/case.py:407
+#: mpulsweb/controllers/case.py:394
 msgid ""
 "The case was succussfully copied and is now available in the case "
 "overview. Click on \"OK\" to open the case overview."
@@ -353,11 +368,11 @@
 "Fallaktenübersicht zur Verfügung. Klicken Sie auf \"OK\", um die "
 "Fallaktenübersicht zu öffnen."
 
-#: mpulsweb/controllers/case.py:413
+#: mpulsweb/controllers/case.py:400
 msgid "Copy case?"
 msgstr "Fallakte kopieren?"
 
-#: mpulsweb/controllers/case.py:414
+#: mpulsweb/controllers/case.py:401
 msgid ""
 "Do you really want to copy this case? All data will be copied in the new "
 "case."
@@ -365,11 +380,11 @@
 "Wollen Sie wirklich die Fallakten kopieren? Sämtliche Daten der Fallakte "
 "werden dann in einer neuen Fallakte übernommen."
 
-#: mpulsweb/controllers/case.py:552
+#: mpulsweb/controllers/case.py:539
 msgid "Case storage extended"
 msgstr "Aufbewahrung verlängert"
 
-#: mpulsweb/controllers/case.py:553
+#: mpulsweb/controllers/case.py:540
 msgid "Please click on \"OK\" to continue"
 msgstr ""
 "Die maximale Aufbewahrungsdauer wurde erfolgreich verlängert. Bitte "
@@ -718,11 +733,11 @@
 "Auswertungen werden auf diese Agenturen beschränkt. Bitte klicken sie auf"
 " OK um fortzufahren."
 
-#: mpulsweb/controllers/formularpage.py:251
+#: mpulsweb/controllers/formularpage.py:196
 msgid "Phase automatically changed"
 msgstr "Phase automatisch gewechselt"
 
-#: mpulsweb/controllers/formularpage.py:252
+#: mpulsweb/controllers/formularpage.py:197
 #, python-format
 msgid ""
 "The phase of the case was changed automatically             after "
@@ -734,11 +749,11 @@
 "Bitte klicken Sie auf 'Ok', um mit der Bearbeitung der Fallakte "
 "fortzufahren."
 
-#: mpulsweb/controllers/formularpage.py:255
+#: mpulsweb/controllers/formularpage.py:200
 msgid "Change phase?"
 msgstr "Phase wechseln?"
 
-#: mpulsweb/controllers/formularpage.py:256
+#: mpulsweb/controllers/formularpage.py:201
 #, python-format
 msgid ""
 "After checking the filled out required fields, it             seems that "
@@ -957,12 +972,12 @@
 msgid "Table"
 msgstr "Tabelle"
 
-#: mpulsweb/lib/helpers.py:154 mpulsweb/lib/helpers.py:159
+#: mpulsweb/lib/helpers.py:90 mpulsweb/lib/helpers.py:95
 #: mpulsweb/templates/casemanagement/digest.mako:162
 msgid "unknown"
 msgstr "unbekannt"
 
-#: mpulsweb/lib/helpers.py:242
+#: mpulsweb/lib/helpers.py:178
 msgid "Userpersmissions"
 msgstr "Benutzerberechtigungen"
 
@@ -976,86 +991,6 @@
 msgid "Open page"
 msgstr "Öffne Seite"
 
-#: mpulsweb/lib/renderer.py:206 mpulsweb/lib/renderer.py:230
-msgid "Save"
-msgstr "Speichern"
-
-#: mpulsweb/lib/renderer.py:212 mpulsweb/lib/renderer.py:236
-msgid "Save and proceed"
-msgstr "Speichern und Weiter"
-
-#: mpulsweb/lib/renderer.py:427
-msgid "Delete RG"
-msgstr "Eintrag löschen"
-
-#: mpulsweb/lib/renderer.py:444 mpulsweb/lib/renderer.py:1103
-#: mpulsweb/lib/renderer.py:1104
-msgid "Add new RG"
-msgstr "Neuen Eintrag hinzufügen"
-
-#: mpulsweb/lib/renderer.py:463
-msgid "Select first"
-msgstr "Wähle Erstes"
-
-#: mpulsweb/lib/renderer.py:469
-msgid "Select previous"
-msgstr "Wähle Vorheriges"
-
-#: mpulsweb/lib/renderer.py:475
-msgid "Select next"
-msgstr "Wähle Nächstes"
-
-#: mpulsweb/lib/renderer.py:481
-msgid "Select last"
-msgstr "Wähle Letztes"
-
-#: mpulsweb/lib/renderer.py:490
-msgid "Create new"
-msgstr "Erstelle neu"
-
-#: mpulsweb/lib/renderer.py:496
-msgid "Delete"
-msgstr "Löschen"
-
-#: mpulsweb/lib/renderer.py:1026 mpulsweb/templates/evaluation/evaluate.mako:30
-msgid "Description"
-msgstr "Beschreibung"
-
-#: mpulsweb/lib/renderer.py:1027 mpulsweb/templates/phase/phase.mako:28
-msgid "Actions"
-msgstr "Aktionen"
-
-#: mpulsweb/lib/renderer.py:1076
-msgid "view"
-msgstr "Ansehen"
-
-#: mpulsweb/lib/renderer.py:1085 mpulsweb/templates/logbook/overview.mako:120
-#: mpulsweb/templates/logbook/overview.mako:121
-msgid "delete"
-msgstr "löschen"
-
-#: mpulsweb/lib/renderer.py:1115
-msgid "Item found"
-msgid_plural "Items found"
-msgstr[0] "Eintrag gefunden"
-msgstr[1] "Einträge gefunden"
-
-#: mpulsweb/lib/renderer.py:1152
-msgid "Formular errors"
-msgstr "Fehlerhafte Formulareingabe"
-
-#: mpulsweb/lib/renderer.py:1154
-msgid "Formular notices"
-msgstr "Formular Hinweise"
-
-#: mpulsweb/lib/renderer.py:1158
-msgid "Formular warnings"
-msgstr "Formular Warnungen"
-
-#: mpulsweb/lib/renderer.py:1192
-msgid "Restore last valid value"
-msgstr "Stelle letzten gültigen Wert wieder her"
-
 #: mpulsweb/lib/validators.py:91
 msgid "Es existiert bereits eine Datei mit dem Namen"
 msgstr "Es existiert bereits eine Datei mit dem Namen"
@@ -1078,37 +1013,41 @@
 msgid "< 1 week"
 msgstr "< 1 Woche"
 
-#: mpulsweb/model/case.py:1262 mpulsweb/model/case.py:1263
+#: mpulsweb/model/case.py:1030
+msgid "Error on fetching data for formletter"
+msgstr "Fehler beim Laden der Daten für Serienbrieffunktion"
+
+#: mpulsweb/model/case.py:1286 mpulsweb/model/case.py:1287
 #: mpulsweb/templates/casemanagement/caselist.mako:173
 #: mpulsweb/templates/casemanagement/caselist.mako:174
 msgid "case_state_label_open"
 msgstr "Bearbeitbar"
 
-#: mpulsweb/model/case.py:1264
+#: mpulsweb/model/case.py:1288
 msgid "case_state_label_outstanding_delete"
 msgstr "Schwebend gelöscht"
 
-#: mpulsweb/model/case.py:1265
+#: mpulsweb/model/case.py:1289
 msgid "case_state_label_outstanding_anon"
 msgstr "Schwebend anonymisiert"
 
-#: mpulsweb/model/case.py:1266
+#: mpulsweb/model/case.py:1290
 msgid "case_state_label_anon"
 msgstr "Anonymisiert"
 
-#: mpulsweb/model/case.py:1400
+#: mpulsweb/model/case.py:1439
 #, python-format
 msgid "The case with UUID '%s' could not be imported due to rule violations"
 msgstr ""
 "Der Fall mit der UUID '%s' konnte wegen Regelverletzungen nicht "
 "importiert werden."
 
-#: mpulsweb/model/case.py:1429
+#: mpulsweb/model/case.py:1469
 #, python-format
 msgid "The case with UUID '%s' was anonymized already."
 msgstr "Der Fall mit der UUID '%s' wurde bereits anonymisiert."
 
-#: mpulsweb/model/case.py:1432
+#: mpulsweb/model/case.py:1472
 #, python-format
 msgid ""
 "The case with UUID '%s' is either marked for anonymization or marked for "
@@ -1117,7 +1056,7 @@
 "Der Fall mit der UUID '%s' ist entweder schwebend anonymisiert oder "
 "schwebend gelöscht."
 
-#: mpulsweb/model/case.py:1464
+#: mpulsweb/model/case.py:1504
 #, python-format
 msgid "The XML file has the version '%s', but supported is only version '%s'"
 msgstr ""
@@ -1142,10 +1081,12 @@
 msgstr "Dieses Feld ist fehlerhaft und benötigt einer weiteren Bearbeitung"
 
 #: mpulsweb/model/user.py:332
+#: mpulsweb/templates/administration/new_user.mako:104
 msgid "role_user"
 msgstr "Bearbeitung"
 
-#: mpulsweb/model/user.py:334
+#: mpulsweb/model/user.py:334 mpulsweb/model/user.py:349
+#: mpulsweb/templates/administration/new_user.mako:106
 msgid "role_admin"
 msgstr "Administration"
 
@@ -1620,15 +1561,7 @@
 msgid "adm_overview_tbl_header_actions"
 msgstr "Aktionen"
 
-#: mpulsweb/templates/administration/overview_user.mako:43
-msgid "Role Administrator"
-msgstr "Adminitratorin, Administrator"
-
-#: mpulsweb/templates/administration/overview_user.mako:45
-msgid "Role Case Manager"
-msgstr "Case Managerin, Case Manager"
-
-#: mpulsweb/templates/administration/overview_user.mako:48
+#: mpulsweb/templates/administration/overview_user.mako:49
 #: mpulsweb/templates/administration/overview_usergroups.mako:41
 #: mpulsweb/templates/appointments/appointmentlist.mako:3
 #: mpulsweb/templates/casemanagement/appointmentlist.mako:7
@@ -1651,7 +1584,7 @@
 msgid "cm_overview_a_show"
 msgstr "Anzeigen"
 
-#: mpulsweb/templates/administration/overview_user.mako:50
+#: mpulsweb/templates/administration/overview_user.mako:51
 #: mpulsweb/templates/administration/overview_usergroups.mako:42
 #: mpulsweb/templates/appointments/appointmentlist.mako:5
 #: mpulsweb/templates/casemanagement/appointmentlist.mako:14
@@ -2198,6 +2131,7 @@
 #: mpulsweb/templates/privacy/dialogs/decline_failed.mako:5
 #: mpulsweb/templates/privacy/dialogs/decline_success.mako:5
 #: mpulsweb/templates/repeatgroup/dialogs/confirm_delete_rg_entry.mako:8
+#: mpulsweb/templates/statements/list.mako:6
 #: mpulsweb/templates/tags/tags.mako:6
 msgid "cm_np_select"
 msgstr "Ausgewählte Fallakte"
@@ -2397,7 +2331,8 @@
 msgstr "Fallakte anonymisieren"
 
 #: mpulsweb/templates/casemanagement/main.mako:70
-#: mpulsweb/templates/casemanagement/main.mako:186
+#: mpulsweb/templates/statements/list.mako:7
+#: mpulsweb/templates/statements/statements.mako:4
 msgid "statement_list_statement"
 msgstr "Verfügbare Erklärungen"
 
@@ -2410,12 +2345,12 @@
 msgstr "Zurück zur Übersicht"
 
 #: mpulsweb/templates/casemanagement/main.mako:95
-#: mpulsweb/templates/casemanagement/main.mako:202
+#: mpulsweb/templates/casemanagement/main.mako:199
 msgid "cm_menu_link_digest"
 msgstr "Zusammenfassung"
 
 #: mpulsweb/templates/casemanagement/main.mako:101
-#: mpulsweb/templates/casemanagement/main.mako:209
+#: mpulsweb/templates/casemanagement/main.mako:206
 #: mpulsweb/templates/phase/phase.mako:7 mpulsweb/templates/phase/phase.mako:14
 #: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:7
 #: mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako:7
@@ -2428,7 +2363,7 @@
 msgstr "Weitere Optionen"
 
 #: mpulsweb/templates/casemanagement/main.mako:126
-#: mpulsweb/templates/casemanagement/main.mako:215
+#: mpulsweb/templates/casemanagement/main.mako:212
 msgid "cm_menu_link_organisation"
 msgstr "Organisation"
 
@@ -2438,16 +2373,16 @@
 msgstr "Auswertungshinweise"
 
 #: mpulsweb/templates/casemanagement/main.mako:146
-#: mpulsweb/templates/casemanagement/main.mako:222
+#: mpulsweb/templates/casemanagement/main.mako:219
 msgid "cm_menu_link_appointment"
 msgstr "Termine"
 
-#: mpulsweb/templates/casemanagement/main.mako:155
+#: mpulsweb/templates/casemanagement/main.mako:154
 msgid "cm_menu_link_create_reminder"
 msgstr "Wiedervorlage anlegen"
 
 #: mpulsweb/templates/casemanagement/main.mako:164
-#: mpulsweb/templates/casemanagement/main.mako:238
+#: mpulsweb/templates/casemanagement/main.mako:235
 msgid "cm_menu_link_documents"
 msgstr "Anlagen"
 
@@ -2459,11 +2394,11 @@
 msgid "cm_menu_link_print"
 msgstr "Akte drucken"
 
-#: mpulsweb/templates/casemanagement/main.mako:196
+#: mpulsweb/templates/casemanagement/main.mako:193
 msgid "cm_menu_header_seperator"
 msgstr "Überblick"
 
-#: mpulsweb/templates/casemanagement/main.mako:247
+#: mpulsweb/templates/casemanagement/main.mako:244
 msgid "cm_menu_header_structure"
 msgstr "Gliederung"
 
@@ -2796,6 +2731,10 @@
 msgid "Name"
 msgstr "Name"
 
+#: mpulsweb/templates/evaluation/evaluate.mako:30
+msgid "Description"
+msgstr "Beschreibung"
+
 #: mpulsweb/templates/evaluation/evaluate.mako:66
 msgid "Filter"
 msgstr "Filter"
@@ -2936,6 +2875,11 @@
 msgid "Default infopage"
 msgstr "Vorgabe Info-Seite"
 
+#: mpulsweb/templates/logbook/overview.mako:120
+#: mpulsweb/templates/logbook/overview.mako:121
+msgid "delete"
+msgstr "löschen"
+
 #: mpulsweb/templates/phase/phase.mako:23
 msgid "case_cm_phase_required_fields"
 msgstr "Pflichtfelder"
@@ -2944,6 +2888,10 @@
 msgid "case_cm_phase_time"
 msgstr "Zeitpunkt"
 
+#: mpulsweb/templates/phase/phase.mako:28
+msgid "Actions"
+msgstr "Aktionen"
+
 #: mpulsweb/templates/phase/phase.mako:57
 msgid "Not yet started"
 msgstr "noch nicht gestartet"
@@ -2991,10 +2939,12 @@
 msgstr "Verfügbare Erklärungen"
 
 #: mpulsweb/templates/privacy/list_statements.mako:9
+#: mpulsweb/templates/statements/list.mako:9
 msgid "Avaliable statements"
 msgstr "Verfügbare Erklärungen"
 
 #: mpulsweb/templates/privacy/list_statements.mako:11
+#: mpulsweb/templates/statements/list.mako:11
 msgid "No statements available"
 msgstr "Keine Erklärungen verfügbar"
 
@@ -3372,3 +3322,59 @@
 msgid "adm_np_changepassword"
 msgstr "Benutzerpasswort geändert!"
 
+#~ msgid "Save"
+#~ msgstr "Speichern"
+
+#~ msgid "Save and proceed"
+#~ msgstr "Speichern und Weiter"
+
+#~ msgid "Delete RG"
+#~ msgstr "Eintrag löschen"
+
+#~ msgid "Add new RG"
+#~ msgstr "Neuen Eintrag hinzufügen"
+
+#~ msgid "Select first"
+#~ msgstr "Wähle Erstes"
+
+#~ msgid "Select previous"
+#~ msgstr "Wähle Vorheriges"
+
+#~ msgid "Select next"
+#~ msgstr "Wähle Nächstes"
+
+#~ msgid "Select last"
+#~ msgstr "Wähle Letztes"
+
+#~ msgid "Create new"
+#~ msgstr "Erstelle neu"
+
+#~ msgid "Delete"
+#~ msgstr "Löschen"
+
+#~ msgid "view"
+#~ msgstr "Ansehen"
+
+#~ msgid "Item found"
+#~ msgid_plural "Items found"
+#~ msgstr[0] "Eintrag gefunden"
+#~ msgstr[1] "Einträge gefunden"
+
+#~ msgid "Formular errors"
+#~ msgstr "Fehlerhafte Formulareingabe"
+
+#~ msgid "Formular notices"
+#~ msgstr "Formular Hinweise"
+
+#~ msgid "Formular warnings"
+#~ msgstr "Formular Warnungen"
+
+#~ msgid "Restore last valid value"
+#~ msgstr "Stelle letzten gültigen Wert wieder her"
+
+#~ msgid "Role Administrator"
+#~ msgstr "Adminitratorin, Administrator"
+
+#~ msgid "Role Case Manager"
+#~ msgstr "Case Managerin, Case Manager"
+

Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot	2011-02-14 13:42:38 UTC (rev 4615)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot	2011-02-14 14:44:48 UTC (rev 4616)
@@ -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-02-04 12:52+0100\n"
+"POT-Creation-Date: 2011-02-14 15:22+0100\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"
@@ -18,123 +18,137 @@
 "Generated-By: Babel 0.9.4\n"
 
 #: mpulsweb/controllers/administration.py:22
-msgid "adm_reset_user_password"
+msgid "Reset user password?"
 msgstr ""
 
 #: mpulsweb/controllers/administration.py:23
-msgid "adm_reset_user_password_question"
+msgid "Confirm reset user password:"
 msgstr ""
 
 #: mpulsweb/controllers/administration.py:24
-msgid "adm_edit_user_header"
+msgid "User configs saved!"
 msgstr ""
 
 #: mpulsweb/controllers/administration.py:25
-msgid "adm_edit_user_text"
+msgid "Please click okay to continue."
 msgstr ""
 
 #: mpulsweb/controllers/administration.py:26
-msgid "adm_delete_user_confirm_header"
+msgid "Delete user?"
 msgstr ""
 
 #: mpulsweb/controllers/administration.py:27
-msgid "adm_delete_user_confirm_text"
+#, python-format
+msgid "Please confirm to delete user <strong>%s, %s</strong> (login: %s)."
 msgstr ""
 
 #: mpulsweb/controllers/administration.py:28
-msgid "adm_delete_user_success_header"
+msgid "User deleted!"
 msgstr ""
 
 #: mpulsweb/controllers/administration.py:29
-msgid "adm_delete_user_success_text"
+msgid "User sucessfully deleted. Click okay to continue."
 msgstr ""
 
 #: mpulsweb/controllers/administration.py:30
-msgid "adm_delete_selfuser_notification_header"
+msgid "User not deleted!"
 msgstr ""
 
 #: mpulsweb/controllers/administration.py:31
-msgid "adm_delete_selfuser_notification_text"
+msgid "Not possible to delete current login user. Click on okay to continue."
 msgstr ""
 
 #: mpulsweb/controllers/administration.py:32
-msgid "Der Benutzer konnte nicht gelöscht werden"
+msgid "The user can not be deleted"
 msgstr ""
 
 #: mpulsweb/controllers/administration.py:34
 msgid ""
-"Der Benutzer konnte nicht gelöscht werden, da dieser noch Bearbeiter von "
-"mindestens einen Fall ist. Bitte übertragen Sie zunächst sämtliche Fälle "
-"dieses Nutzers an einen anderen Bearbeiter und wiederholen Sie den Vorgang "
-"erneut. Klicken Sie auf \"OK\", um zur Benutzerübersicht zurück zu kehren."
+"The user can not be deleted, because he is agent of at least one case. Please"
+" move all cases of this agent to a different agent and repeat the action. "
+"Click on \"OK\" to navigate back to the user overview."
 msgstr ""
 
-#: mpulsweb/controllers/administration.py:39
-msgid "adm_set_editor_header"
+#: mpulsweb/controllers/administration.py:37
+msgid "Assign case document"
 msgstr ""
 
-#: mpulsweb/controllers/administration.py:40
-msgid "adm_set_editor_success_text"
+#: mpulsweb/controllers/administration.py:38
+#, python-format
+msgid "Case document assigned to %s, %s. Please click on OK to delete %s, %s."
 msgstr ""
 
-#: mpulsweb/controllers/administration.py:41
-msgid "adm_set_editor_success_text_rest"
+#: mpulsweb/controllers/administration.py:40
+#, python-format
+msgid ""
+"Case document assigned to %s, %s. %s, %s has more case documents. Please "
+"click on OK to continue."
 msgstr ""
 
 #: mpulsweb/controllers/administration.py:42
-msgid "adm_set_editor_success_text_head"
+msgid "Case document assigned!"
 msgstr ""
 
 #: mpulsweb/controllers/administration.py:44
-msgid "adm_set_editor_success_text_rest_head"
+msgid "Case document assigned. More case documents exist!"
 msgstr ""
 
 #: mpulsweb/controllers/administration.py:46
-msgid "adm_new_usergroup_success_header"
+msgid "Create user group!"
 msgstr ""
 
-#: mpulsweb/controllers/administration.py:47
-msgid "adm_new_usergroup_success_text"
+#: mpulsweb/controllers/administration.py:48
+msgid ""
+"User group successfully created. Please click on OK to continue to the user "
+"group overview"
 msgstr ""
 
-#: mpulsweb/controllers/administration.py:48
-msgid "adm_new_usergroup_failure_header"
+#: mpulsweb/controllers/administration.py:50
+msgid "Failed to create user group!"
 msgstr ""
 
-#: mpulsweb/controllers/administration.py:49
-msgid "adm_new_usergroup_failure_text"
+#: mpulsweb/controllers/administration.py:51
+msgid ""
+"Failed to create the user group. Please click on OK to continue in the user "
+"overview."
 msgstr ""
 
-#: mpulsweb/controllers/administration.py:50
-msgid "adm_edit_usergroup_header"
+#: mpulsweb/controllers/administration.py:53
+msgid "Edit user group!"
 msgstr ""
 
-#: mpulsweb/controllers/administration.py:51
-msgid "adm_edit_usergroup_text"
+#: mpulsweb/controllers/administration.py:55
+msgid ""
+"The user group was successfully edited. Please click on OK to continue in the"
+" user group overview."
 msgstr ""
 
-#: mpulsweb/controllers/administration.py:52
-msgid "adm_delete_usergroup_confirm_header"
+#: mpulsweb/controllers/administration.py:57
+msgid "Delete user group?"
 msgstr ""
 
-#: mpulsweb/controllers/administration.py:53
-msgid "adm_delete_usergroup_confirm_text"
+#: mpulsweb/controllers/administration.py:58
+msgid "Do you want to delete the user group and lose the data?"
 msgstr ""
 
-#: mpulsweb/controllers/administration.py:54
-msgid "adm_delete_usergroup_success_header"
+#: mpulsweb/controllers/administration.py:59
+msgid "User group deleted!"
 msgstr ""
 
-#: mpulsweb/controllers/administration.py:55
-msgid "adm_delete_usergroup_success_text"
+#: mpulsweb/controllers/administration.py:61
+msgid ""
+"The user group was successfully deleted. Please click on OK to continue in "
+"the user group overview."
 msgstr ""
 
-#: mpulsweb/controllers/administration.py:56
-msgid "adm_delete_usergroup_failure_header"
+#: mpulsweb/controllers/administration.py:63
+msgid "Failed to delete the user group!"
 msgstr ""
 
-#: mpulsweb/controllers/administration.py:57
-msgid "adm_delete_usergroup_failure_text"
+#: mpulsweb/controllers/administration.py:65
+msgid ""
+"Deletion of the user group failed. Please click on OK to continue in the user"
+" group overview."
 msgstr ""
 
 #: mpulsweb/controllers/annotations.py:13
@@ -202,7 +216,7 @@
 msgid "The appointment was successfully edited"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:35
+#: mpulsweb/controllers/case.py:36
 msgid ""
 "Do you really want to anonymise the case and\n"
 "irrecovably lose the associated personal data? After it the case will\n"
@@ -210,14 +224,14 @@
 "the analysis."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:57 mpulsweb/controllers/case_bundle.py:276
+#: mpulsweb/controllers/case.py:58 mpulsweb/controllers/case_bundle.py:276
 #: mpulsweb/controllers/case_bundle.py:307
 msgid "Delete case?"
 msgid_plural "Delete cases?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case.py:58
+#: mpulsweb/controllers/case.py:59
 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"
@@ -225,80 +239,80 @@
 "server?"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:62
+#: mpulsweb/controllers/case.py:63
 msgid ""
 "Do you really want to mark this case for deletion?\n"
 "The case will not be editable afterwards, and submited to the administration\n"
 "for deletion."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:69 mpulsweb/controllers/case_bundle.py:421
+#: mpulsweb/controllers/case.py:70 mpulsweb/controllers/case_bundle.py:421
 msgid "Restore case?"
 msgid_plural "Restore cases?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case.py:70
+#: mpulsweb/controllers/case.py:71
 msgid ""
 "Do you really want to restore the case? The case\n"
 "will be editable afterwards again for the users."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:73
+#: mpulsweb/controllers/case.py:74
 msgid "Case(s) imported!"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:74
+#: mpulsweb/controllers/case.py:75
 msgid ""
 "The file was imported successfully.\n"
 "Click on \"OK\" to open the case overview."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:77
+#: mpulsweb/controllers/case.py:78
 msgid "Case(s) not imported!"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:78
+#: mpulsweb/controllers/case.py:79
 msgid ""
 "An error occurred during the import.\n"
 "Click 'OK' to return to the import dialog."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:215 mpulsweb/model/case.py:1310
+#: mpulsweb/controllers/case.py:216 mpulsweb/model/case.py:1334
 #: mpulsweb/model/phase.py:299 mpulsweb/templates/casemanagement/caselist.mako:144
 #: mpulsweb/templates/phase/phase.mako:51
 msgid "Running"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:217 mpulsweb/model/case.py:1312
+#: mpulsweb/controllers/case.py:218 mpulsweb/model/case.py:1336
 #: mpulsweb/model/phase.py:301 mpulsweb/templates/casemanagement/caselist.mako:147
 #: mpulsweb/templates/phase/phase.mako:53 mpulsweb/templates/phase/phase.mako:55
 msgid "Finished"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:406
+#: mpulsweb/controllers/case.py:393
 msgid "Case copied!"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:407
+#: mpulsweb/controllers/case.py:394
 msgid ""
 "The case was succussfully copied and is now available in the case overview. "
 "Click on \"OK\" to open the case overview."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:413
+#: mpulsweb/controllers/case.py:400
 msgid "Copy case?"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:414
+#: mpulsweb/controllers/case.py:401
 msgid "Do you really want to copy this case? All data will be copied in the new case."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:552
+#: mpulsweb/controllers/case.py:539
 msgid "Case storage extended"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:553
+#: mpulsweb/controllers/case.py:540
 msgid "Please click on \"OK\" to continue"
 msgstr ""
 
@@ -586,11 +600,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/formularpage.py:251
+#: mpulsweb/controllers/formularpage.py:196
 msgid "Phase automatically changed"
 msgstr ""
 
-#: mpulsweb/controllers/formularpage.py:252
+#: mpulsweb/controllers/formularpage.py:197
 #, python-format
 msgid ""
 "The phase of the case was changed automatically             after checking "
@@ -598,11 +612,11 @@
 "             Please click on 'Ok', to proceed editing the case."
 msgstr ""
 
-#: mpulsweb/controllers/formularpage.py:255
+#: mpulsweb/controllers/formularpage.py:200
 msgid "Change phase?"
 msgstr ""
 
-#: mpulsweb/controllers/formularpage.py:256
+#: mpulsweb/controllers/formularpage.py:201
 #, python-format
 msgid ""
 "After checking the filled out required fields, it             seems that a "
@@ -790,12 +804,12 @@
 msgid "Table"
 msgstr ""
 
-#: mpulsweb/lib/helpers.py:154 mpulsweb/lib/helpers.py:159
+#: mpulsweb/lib/helpers.py:90 mpulsweb/lib/helpers.py:95
 #: mpulsweb/templates/casemanagement/digest.mako:162
 msgid "unknown"
 msgstr ""
 
-#: mpulsweb/lib/helpers.py:242
+#: mpulsweb/lib/helpers.py:178
 msgid "Userpersmissions"
 msgstr ""
 
@@ -809,86 +823,6 @@
 msgid "Open page"
 msgstr ""
 
-#: mpulsweb/lib/renderer.py:206 mpulsweb/lib/renderer.py:230
-msgid "Save"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:212 mpulsweb/lib/renderer.py:236
-msgid "Save and proceed"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:427
-msgid "Delete RG"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:444 mpulsweb/lib/renderer.py:1103
-#: mpulsweb/lib/renderer.py:1104
-msgid "Add new RG"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:463
-msgid "Select first"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:469
-msgid "Select previous"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:475
-msgid "Select next"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:481
-msgid "Select last"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:490
-msgid "Create new"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:496
-msgid "Delete"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:1026 mpulsweb/templates/evaluation/evaluate.mako:30
-msgid "Description"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:1027 mpulsweb/templates/phase/phase.mako:28
-msgid "Actions"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:1076
-msgid "view"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:1085 mpulsweb/templates/logbook/overview.mako:120
-#: mpulsweb/templates/logbook/overview.mako:121
-msgid "delete"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:1115
-msgid "Item found"
-msgid_plural "Items found"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mpulsweb/lib/renderer.py:1152
-msgid "Formular errors"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:1154
-msgid "Formular notices"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:1158
-msgid "Formular warnings"
-msgstr ""
-
-#: mpulsweb/lib/renderer.py:1192
-msgid "Restore last valid value"
-msgstr ""
-
 #: mpulsweb/lib/validators.py:91
 msgid "Es existiert bereits eine Datei mit dem Namen"
 msgstr ""
@@ -911,42 +845,46 @@
 msgid "< 1 week"
 msgstr ""
 
-#: mpulsweb/model/case.py:1262 mpulsweb/model/case.py:1263
+#: mpulsweb/model/case.py:1030
+msgid "Error on fetching data for formletter"
+msgstr ""
+
+#: mpulsweb/model/case.py:1286 mpulsweb/model/case.py:1287
 #: mpulsweb/templates/casemanagement/caselist.mako:173
 #: mpulsweb/templates/casemanagement/caselist.mako:174
 msgid "case_state_label_open"
 msgstr ""
 
-#: mpulsweb/model/case.py:1264
+#: mpulsweb/model/case.py:1288
 msgid "case_state_label_outstanding_delete"
 msgstr ""
 
-#: mpulsweb/model/case.py:1265
+#: mpulsweb/model/case.py:1289
 msgid "case_state_label_outstanding_anon"
 msgstr ""
 
-#: mpulsweb/model/case.py:1266
+#: mpulsweb/model/case.py:1290
 msgid "case_state_label_anon"
 msgstr ""
 
-#: mpulsweb/model/case.py:1400
+#: mpulsweb/model/case.py:1439
 #, python-format
 msgid "The case with UUID '%s' could not be imported due to rule violations"
 msgstr ""
 
-#: mpulsweb/model/case.py:1429
+#: mpulsweb/model/case.py:1469
 #, python-format
 msgid "The case with UUID '%s' was anonymized already."
 msgstr ""
 
-#: mpulsweb/model/case.py:1432
+#: mpulsweb/model/case.py:1472
 #, python-format
 msgid ""
 "The case with UUID '%s' is either marked for anonymization or marked for "
 "deletion."
 msgstr ""
 
-#: mpulsweb/model/case.py:1464
+#: mpulsweb/model/case.py:1504
 #, python-format
 msgid "The XML file has the version '%s', but supported is only version '%s'"
 msgstr ""
@@ -966,11 +904,12 @@
 msgid "Field is not OK and requires further editing"
 msgstr ""
 
-#: mpulsweb/model/user.py:332
+#: mpulsweb/model/user.py:332 mpulsweb/templates/administration/new_user.mako:104
 msgid "role_user"
 msgstr ""
 
-#: mpulsweb/model/user.py:334
+#: mpulsweb/model/user.py:334 mpulsweb/model/user.py:349
+#: mpulsweb/templates/administration/new_user.mako:106
 msgid "role_admin"
 msgstr ""
 
@@ -1433,15 +1372,7 @@
 msgid "adm_overview_tbl_header_actions"
 msgstr ""
 
-#: mpulsweb/templates/administration/overview_user.mako:43
-msgid "Role Administrator"
-msgstr ""
-
-#: mpulsweb/templates/administration/overview_user.mako:45
-msgid "Role Case Manager"
-msgstr ""
-
-#: mpulsweb/templates/administration/overview_user.mako:48
+#: mpulsweb/templates/administration/overview_user.mako:49
 #: mpulsweb/templates/administration/overview_usergroups.mako:41
 #: mpulsweb/templates/appointments/appointmentlist.mako:3
 #: mpulsweb/templates/casemanagement/appointmentlist.mako:7
@@ -1464,7 +1395,7 @@
 msgid "cm_overview_a_show"
 msgstr ""
 
-#: mpulsweb/templates/administration/overview_user.mako:50
+#: mpulsweb/templates/administration/overview_user.mako:51
 #: mpulsweb/templates/administration/overview_usergroups.mako:42
 #: mpulsweb/templates/appointments/appointmentlist.mako:5
 #: mpulsweb/templates/casemanagement/appointmentlist.mako:14
@@ -2006,7 +1937,7 @@
 #: mpulsweb/templates/privacy/dialogs/decline_failed.mako:5
 #: mpulsweb/templates/privacy/dialogs/decline_success.mako:5
 #: mpulsweb/templates/repeatgroup/dialogs/confirm_delete_rg_entry.mako:8
-#: mpulsweb/templates/tags/tags.mako:6
+#: mpulsweb/templates/statements/list.mako:6 mpulsweb/templates/tags/tags.mako:6
 msgid "cm_np_select"
 msgstr ""
 
@@ -2204,7 +2135,8 @@
 msgstr ""
 
 #: mpulsweb/templates/casemanagement/main.mako:70
-#: mpulsweb/templates/casemanagement/main.mako:186
+#: mpulsweb/templates/statements/list.mako:7
+#: mpulsweb/templates/statements/statements.mako:4
 msgid "statement_list_statement"
 msgstr ""
 
@@ -2217,12 +2149,12 @@
 msgstr ""
 
 #: mpulsweb/templates/casemanagement/main.mako:95
-#: mpulsweb/templates/casemanagement/main.mako:202
+#: mpulsweb/templates/casemanagement/main.mako:199
 msgid "cm_menu_link_digest"
 msgstr ""
 
 #: mpulsweb/templates/casemanagement/main.mako:101
-#: mpulsweb/templates/casemanagement/main.mako:209
+#: mpulsweb/templates/casemanagement/main.mako:206
 #: mpulsweb/templates/phase/phase.mako:7 mpulsweb/templates/phase/phase.mako:14
 #: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:7
 #: mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako:7
@@ -2235,7 +2167,7 @@
 msgstr ""
 
 #: mpulsweb/templates/casemanagement/main.mako:126
-#: mpulsweb/templates/casemanagement/main.mako:215
+#: mpulsweb/templates/casemanagement/main.mako:212
 msgid "cm_menu_link_organisation"
 msgstr ""
 
@@ -2245,16 +2177,16 @@
 msgstr ""
 
 #: mpulsweb/templates/casemanagement/main.mako:146
-#: mpulsweb/templates/casemanagement/main.mako:222
+#: mpulsweb/templates/casemanagement/main.mako:219
 msgid "cm_menu_link_appointment"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/main.mako:155
+#: mpulsweb/templates/casemanagement/main.mako:154
 msgid "cm_menu_link_create_reminder"
 msgstr ""
 
 #: mpulsweb/templates/casemanagement/main.mako:164
-#: mpulsweb/templates/casemanagement/main.mako:238
+#: mpulsweb/templates/casemanagement/main.mako:235
 msgid "cm_menu_link_documents"
 msgstr ""
 
@@ -2266,11 +2198,11 @@
 msgid "cm_menu_link_print"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/main.mako:196
+#: mpulsweb/templates/casemanagement/main.mako:193
 msgid "cm_menu_header_seperator"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/main.mako:247
+#: mpulsweb/templates/casemanagement/main.mako:244
 msgid "cm_menu_header_structure"
 msgstr ""
 
@@ -2592,6 +2524,10 @@
 msgid "Name"
 msgstr ""
 
+#: mpulsweb/templates/evaluation/evaluate.mako:30
+msgid "Description"
+msgstr ""
+
 #: mpulsweb/templates/evaluation/evaluate.mako:66
 msgid "Filter"
 msgstr ""
@@ -2732,6 +2668,11 @@
 msgid "Default infopage"
 msgstr ""
 
+#: mpulsweb/templates/logbook/overview.mako:120
+#: mpulsweb/templates/logbook/overview.mako:121
+msgid "delete"
+msgstr ""
+
 #: mpulsweb/templates/phase/phase.mako:23
 msgid "case_cm_phase_required_fields"
 msgstr ""
@@ -2740,6 +2681,10 @@
 msgid "case_cm_phase_time"
 msgstr ""
 
+#: mpulsweb/templates/phase/phase.mako:28
+msgid "Actions"
+msgstr ""
+
 #: mpulsweb/templates/phase/phase.mako:57
 msgid "Not yet started"
 msgstr ""
@@ -2781,10 +2726,12 @@
 msgstr ""
 
 #: mpulsweb/templates/privacy/list_statements.mako:9
+#: mpulsweb/templates/statements/list.mako:9
 msgid "Avaliable statements"
 msgstr ""
 
 #: mpulsweb/templates/privacy/list_statements.mako:11
+#: mpulsweb/templates/statements/list.mako:11
 msgid "No statements available"
 msgstr ""
 



More information about the Mpuls-commits mailing list