[Mpuls-commits] r4694 - in base/trunk: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/templates/auth mpulsweb/templates/casebundle mpulsweb/templates/casebundle/dialogs mpulsweb/templates/casemanagement mpulsweb/templates/casemanagement/dialogs mpulsweb/templates/phase mpulsweb/templates/phase/dialogs mpulsweb/templates/privacy/dialogs

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Thu Feb 24 10:10:49 CET 2011 

Author: ludwig
Date: 2011-02-24 10:10:31 +0100 (Thu, 24 Feb 2011)
New Revision: 4694

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
   base/trunk/mpulsweb/i18n/mpulsweb.pot
   base/trunk/mpulsweb/templates/auth/account_deactivated.mako
   base/trunk/mpulsweb/templates/auth/login.mako
   base/trunk/mpulsweb/templates/auth/logout.mako
   base/trunk/mpulsweb/templates/auth/main.mako
   base/trunk/mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako
   base/trunk/mpulsweb/templates/casebundle/dialogs/download_formletter.mako
   base/trunk/mpulsweb/templates/casebundle/dialogs/error.mako
   base/trunk/mpulsweb/templates/casebundle/dialogs/success_anonymize.mako
   base/trunk/mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako
   base/trunk/mpulsweb/templates/casebundle/dialogs/success_editor.mako
   base/trunk/mpulsweb/templates/casebundle/dialogs/success_markdelete.mako
   base/trunk/mpulsweb/templates/casebundle/dialogs/success_markevaluate.mako
   base/trunk/mpulsweb/templates/casebundle/dialogs/success_standin.mako
   base/trunk/mpulsweb/templates/casebundle/editor.mako
   base/trunk/mpulsweb/templates/casebundle/standin.mako
   base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm.mako
   base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako
   base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_export.mako
   base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako
   base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete.mako
   base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako
   base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako
   base/trunk/mpulsweb/templates/casemanagement/dialogs/success_export.mako
   base/trunk/mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako
   base/trunk/mpulsweb/templates/casemanagement/dialogs/success_restore.mako
   base/trunk/mpulsweb/templates/casemanagement/main.mako
   base/trunk/mpulsweb/templates/casemanagement/new.mako
   base/trunk/mpulsweb/templates/casemanagement/organisation.mako
   base/trunk/mpulsweb/templates/casemanagement/overview.mako
   base/trunk/mpulsweb/templates/casemanagement/upload.mako
   base/trunk/mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako
   base/trunk/mpulsweb/templates/phase/phase.mako
   base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement.mako
Log:
Update of the msgids (part 12)

Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/ChangeLog	2011-02-24 09:10:31 UTC (rev 4694)
@@ -1,3 +1,42 @@
+2011-02-24  Ludwig Reiter <ludwig.reiter at intevation.de>
+
+	* mpulsweb/i18n/mpulsweb.pot
+	mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
+	mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako
+	mpulsweb/templates/phase/phase.mako
+	mpulsweb/templates/auth/account_deactivated.mako
+	mpulsweb/templates/auth/logout.mako
+	mpulsweb/templates/auth/main.mako
+	mpulsweb/templates/auth/login.mako
+	mpulsweb/templates/casebundle/dialogs/error.mako
+	mpulsweb/templates/casebundle/dialogs/success_markevaluate.mako
+	mpulsweb/templates/casebundle/dialogs/download_formletter.mako
+	mpulsweb/templates/casebundle/dialogs/success_editor.mako
+	mpulsweb/templates/casebundle/dialogs/success_anonymize.mako
+	mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako
+	mpulsweb/templates/casebundle/dialogs/success_markdelete.mako
+	mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako
+	mpulsweb/templates/casebundle/dialogs/success_standin.mako
+	mpulsweb/templates/casebundle/standin.mako
+	mpulsweb/templates/casebundle/editor.mako
+	mpulsweb/templates/casemanagement/new.mako
+	mpulsweb/templates/casemanagement/dialogs/success_delete.mako
+	mpulsweb/templates/casemanagement/dialogs/confirm.mako
+	mpulsweb/templates/casemanagement/dialogs/confirm_export.mako
+	mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako
+	mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako
+	mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako
+	mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako
+	mpulsweb/templates/casemanagement/dialogs/success_export.mako
+	mpulsweb/templates/casemanagement/dialogs/success_restore.mako
+	mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako
+	mpulsweb/templates/casemanagement/organisation.mako
+	mpulsweb/templates/casemanagement/overview.mako
+	mpulsweb/templates/casemanagement/main.mako
+	mpulsweb/templates/casemanagement/upload.mako
+	mpulsweb/templates/privacy/dialogs/missing_statement.mako:
+	Update of the msgids (part 12)
+
 2011-02-23  Ludwig Reiter <ludwig.reiter at intevation.de>
 
 	* mpulsweb/i18n/mpulsweb.pot

Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po	2011-02-24 09:10:31 UTC (rev 4694)
@@ -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-23 13:38+0100\n"
+"PO-Revision-Date: 2011-02-24 10:05+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"
@@ -1200,7 +1200,34 @@
 msgid "Documents"
 msgstr "Dokumente"
 
-#: mpulsweb/templates/main.mako:111
+#: mpulsweb/templates/main.mako:111 mpulsweb/templates/casebundle/editor.mako:6
+#: mpulsweb/templates/casebundle/standin.mako:6
+#: mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako:5
+#: mpulsweb/templates/casebundle/dialogs/download_formletter.mako:5
+#: mpulsweb/templates/casebundle/dialogs/error.mako:5
+#: mpulsweb/templates/casebundle/dialogs/success_anonymize.mako:5
+#: mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako:5
+#: mpulsweb/templates/casebundle/dialogs/success_editor.mako:5
+#: mpulsweb/templates/casebundle/dialogs/success_markdelete.mako:5
+#: mpulsweb/templates/casebundle/dialogs/success_markevaluate.mako:5
+#: mpulsweb/templates/casebundle/dialogs/success_standin.mako:5
+#: mpulsweb/templates/casemanagement/main.mako:12
+#: mpulsweb/templates/casemanagement/new.mako:6
+#: mpulsweb/templates/casemanagement/overview.mako:6
+#: mpulsweb/templates/casemanagement/upload.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/confirm.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/confirm_export.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/success_delete.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako:4
+#: mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/success_export.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/success_restore.mako:5
+#: mpulsweb/templates/phase/phase.mako:5
+#: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:6
+#: mpulsweb/templates/privacy/dialogs/missing_statement.mako:5
 msgid "Case Management"
 msgstr "Case Management"
 
@@ -1840,15 +1867,15 @@
 msgstr "Termin löschen"
 
 #: mpulsweb/templates/auth/account_deactivated.mako:3
-msgid "adm_header_account_deactivated"
+msgid "This account has been deactivated"
 msgstr "Dieses Konto wurde deaktiviert"
 
 #: mpulsweb/templates/auth/account_deactivated.mako:4
-msgid "adm_con_ad_account_deactivated"
+msgid "This account has been deactivated."
 msgstr "Dieser Account wurde deaktiviert."
 
 #: mpulsweb/templates/auth/account_deactivated.mako:5
-msgid "adm_con_ad_contact_admin"
+msgid "Please contact your administrator"
 msgstr ""
 "Bitte setzen Sie sich in dieser Angelegenheit mit der Administration in "
 "Verbindung"
@@ -1859,23 +1886,23 @@
 msgstr "%s Anmeldung"
 
 #: mpulsweb/templates/auth/login.mako:9
-msgid "login_input_error"
+msgid "Wrong Input"
 msgstr "Falsche Eingabe"
 
 #: mpulsweb/templates/auth/login.mako:11
-msgid "login_input_error_message"
+msgid "Login or Password not correct"
 msgstr "Anmeldekennung und/oder Passwort sind nicht korrekt"
 
 #: mpulsweb/templates/auth/login.mako:18
-msgid "login_p_insert_pw_and_identifier"
+msgid "Please enter identifier and password to login."
 msgstr "Geben Sie bitte Anmeldekennung und Passwort ein, um sich anzumelden."
 
 #: mpulsweb/templates/auth/login.mako:24
-msgid "login_label_identifier"
+msgid "Identifier:"
 msgstr "Anmeldekennung:"
 
 #: mpulsweb/templates/auth/login.mako:32
-msgid "login_label_pw"
+msgid "Password:"
 msgstr "Passwort:"
 
 #: mpulsweb/templates/auth/logout.mako:3
@@ -1888,67 +1915,37 @@
 msgstr "Sie haben sich erfolgreich abgemeldet. Bitte klicken Sie auf"
 
 #: mpulsweb/templates/auth/logout.mako:6
-msgid "logout_a_login"
+msgid "login"
 msgstr "anmelden"
 
 #: mpulsweb/templates/auth/logout.mako:6
-msgid "logout_p_login_again"
+msgid ", to login again."
 msgstr ", um sich erneut anzumelden."
 
 #: mpulsweb/templates/auth/main.mako:13
-msgid "main_login_bmf_phrase"
+#, python-format
+msgid "BMF-phrase %s"
 msgstr ""
 "Das Programm %s wird vom Bundesministerium für Familie, Senioren, Frauen "
 "und Jugend aus Mitteln des Europäischen Sozialfonds gefördert."
 
 #: mpulsweb/templates/auth/main.mako:35
-msgid "main_login_formular_input_error"
+msgid "Formular input error"
 msgstr "Fehlerhafte Formulareingabe"
 
-#: mpulsweb/templates/casebundle/editor.mako:6
-#: mpulsweb/templates/casebundle/standin.mako:6
-#: mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako:5
-#: mpulsweb/templates/casebundle/dialogs/download_formletter.mako:5
-#: mpulsweb/templates/casebundle/dialogs/error.mako:5
-#: mpulsweb/templates/casebundle/dialogs/success_anonymize.mako:5
-#: mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako:5
-#: mpulsweb/templates/casebundle/dialogs/success_editor.mako:5
-#: mpulsweb/templates/casebundle/dialogs/success_markdelete.mako:5
-#: mpulsweb/templates/casebundle/dialogs/success_markevaluate.mako:5
-#: mpulsweb/templates/casebundle/dialogs/success_standin.mako:5
-#: mpulsweb/templates/casemanagement/main.mako:12
-#: mpulsweb/templates/casemanagement/new.mako:6
-#: mpulsweb/templates/casemanagement/overview.mako:6
-#: mpulsweb/templates/casemanagement/upload.mako:5
-#: mpulsweb/templates/casemanagement/dialogs/confirm.mako:5
-#: mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako:5
-#: mpulsweb/templates/casemanagement/dialogs/confirm_export.mako:5
-#: mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako:5
-#: mpulsweb/templates/casemanagement/dialogs/success_delete.mako:5
-#: mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako:4
-#: mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako:5
-#: mpulsweb/templates/casemanagement/dialogs/success_export.mako:5
-#: mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako:5
-#: mpulsweb/templates/casemanagement/dialogs/success_restore.mako:5
-#: mpulsweb/templates/phase/phase.mako:5
-#: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:6
-#: mpulsweb/templates/privacy/dialogs/missing_statement.mako:5
-msgid "cm_np_root"
-msgstr "Case Management"
-
 #: mpulsweb/templates/casebundle/editor.mako:7
 #: mpulsweb/templates/casebundle/dialogs/success_editor.mako:6
-msgid "cm_np_bundled_editor"
+msgid "Editor assigned"
 msgstr "Bearbeitung übertragen"
 
 #: mpulsweb/templates/casebundle/editor.mako:12
 #: mpulsweb/templates/casebundle/standin.mako:12
 #: mpulsweb/templates/casemanagement/organisation.mako:12
-msgid "cm_header_organisation"
+msgid "Organisation"
 msgstr "Organisation"
 
 #: mpulsweb/templates/casebundle/editor.mako:15
-msgid "cm_bundle_editor_explain"
+msgid "Please choose a new editor for the document"
 msgstr "Bitte wählen Sie den neuen Bearbeiter für die folgenden Akten aus"
 
 #: mpulsweb/templates/casebundle/standin.mako:7
@@ -2360,7 +2357,7 @@
 "Fallakte ist und wer die Vertretung für die Bearbeitung übernimmt."
 
 #: mpulsweb/templates/casemanagement/organisation.mako:16
-msgid "cm_header_organisation_editor"
+msgid "Organisation_editor"
 msgstr "Bearbeiterin / Bearbeiter"
 
 #: mpulsweb/templates/casemanagement/organisation.mako:19

Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot	2011-02-24 09:10:31 UTC (rev 4694)
@@ -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-23 13:38+0100\n"
+"POT-Creation-Date: 2011-02-24 10:05+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"
@@ -1015,7 +1015,34 @@
 msgid "Documents"
 msgstr ""
 
-#: mpulsweb/templates/main.mako:111
+#: mpulsweb/templates/main.mako:111 mpulsweb/templates/casebundle/editor.mako:6
+#: mpulsweb/templates/casebundle/standin.mako:6
+#: mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako:5
+#: mpulsweb/templates/casebundle/dialogs/download_formletter.mako:5
+#: mpulsweb/templates/casebundle/dialogs/error.mako:5
+#: mpulsweb/templates/casebundle/dialogs/success_anonymize.mako:5
+#: mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako:5
+#: mpulsweb/templates/casebundle/dialogs/success_editor.mako:5
+#: mpulsweb/templates/casebundle/dialogs/success_markdelete.mako:5
+#: mpulsweb/templates/casebundle/dialogs/success_markevaluate.mako:5
+#: mpulsweb/templates/casebundle/dialogs/success_standin.mako:5
+#: mpulsweb/templates/casemanagement/main.mako:12
+#: mpulsweb/templates/casemanagement/new.mako:6
+#: mpulsweb/templates/casemanagement/overview.mako:6
+#: mpulsweb/templates/casemanagement/upload.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/confirm.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/confirm_export.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/success_delete.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako:4
+#: mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/success_export.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako:5
+#: mpulsweb/templates/casemanagement/dialogs/success_restore.mako:5
+#: mpulsweb/templates/phase/phase.mako:5
+#: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:6
+#: mpulsweb/templates/privacy/dialogs/missing_statement.mako:5
 msgid "Case Management"
 msgstr ""
 
@@ -1646,15 +1673,15 @@
 msgstr ""
 
 #: mpulsweb/templates/auth/account_deactivated.mako:3
-msgid "adm_header_account_deactivated"
+msgid "This account has been deactivated"
 msgstr ""
 
 #: mpulsweb/templates/auth/account_deactivated.mako:4
-msgid "adm_con_ad_account_deactivated"
+msgid "This account has been deactivated."
 msgstr ""
 
 #: mpulsweb/templates/auth/account_deactivated.mako:5
-msgid "adm_con_ad_contact_admin"
+msgid "Please contact your administrator"
 msgstr ""
 
 #: mpulsweb/templates/auth/login.mako:4
@@ -1663,23 +1690,23 @@
 msgstr ""
 
 #: mpulsweb/templates/auth/login.mako:9
-msgid "login_input_error"
+msgid "Wrong Input"
 msgstr ""
 
 #: mpulsweb/templates/auth/login.mako:11
-msgid "login_input_error_message"
+msgid "Login or Password not correct"
 msgstr ""
 
 #: mpulsweb/templates/auth/login.mako:18
-msgid "login_p_insert_pw_and_identifier"
+msgid "Please enter identifier and password to login."
 msgstr ""
 
 #: mpulsweb/templates/auth/login.mako:24
-msgid "login_label_identifier"
+msgid "Identifier:"
 msgstr ""
 
 #: mpulsweb/templates/auth/login.mako:32
-msgid "login_label_pw"
+msgid "Password:"
 msgstr ""
 
 #: mpulsweb/templates/auth/logout.mako:3
@@ -1692,65 +1719,35 @@
 msgstr ""
 
 #: mpulsweb/templates/auth/logout.mako:6
-msgid "logout_a_login"
+msgid "login"
 msgstr ""
 
 #: mpulsweb/templates/auth/logout.mako:6
-msgid "logout_p_login_again"
+msgid ", to login again."
 msgstr ""
 
 #: mpulsweb/templates/auth/main.mako:13
-msgid "main_login_bmf_phrase"
+#, python-format
+msgid "BMF-phrase %s"
 msgstr ""
 
 #: mpulsweb/templates/auth/main.mako:35
-msgid "main_login_formular_input_error"
+msgid "Formular input error"
 msgstr ""
 
-#: mpulsweb/templates/casebundle/editor.mako:6
-#: mpulsweb/templates/casebundle/standin.mako:6
-#: mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako:5
-#: mpulsweb/templates/casebundle/dialogs/download_formletter.mako:5
-#: mpulsweb/templates/casebundle/dialogs/error.mako:5
-#: mpulsweb/templates/casebundle/dialogs/success_anonymize.mako:5
-#: mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako:5
-#: mpulsweb/templates/casebundle/dialogs/success_editor.mako:5
-#: mpulsweb/templates/casebundle/dialogs/success_markdelete.mako:5
-#: mpulsweb/templates/casebundle/dialogs/success_markevaluate.mako:5
-#: mpulsweb/templates/casebundle/dialogs/success_standin.mako:5
-#: mpulsweb/templates/casemanagement/main.mako:12
-#: mpulsweb/templates/casemanagement/new.mako:6
-#: mpulsweb/templates/casemanagement/overview.mako:6
-#: mpulsweb/templates/casemanagement/upload.mako:5
-#: mpulsweb/templates/casemanagement/dialogs/confirm.mako:5
-#: mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako:5
-#: mpulsweb/templates/casemanagement/dialogs/confirm_export.mako:5
-#: mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako:5
-#: mpulsweb/templates/casemanagement/dialogs/success_delete.mako:5
-#: mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako:4
-#: mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako:5
-#: mpulsweb/templates/casemanagement/dialogs/success_export.mako:5
-#: mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako:5
-#: mpulsweb/templates/casemanagement/dialogs/success_restore.mako:5
-#: mpulsweb/templates/phase/phase.mako:5
-#: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:6
-#: mpulsweb/templates/privacy/dialogs/missing_statement.mako:5
-msgid "cm_np_root"
-msgstr ""
-
 #: mpulsweb/templates/casebundle/editor.mako:7
 #: mpulsweb/templates/casebundle/dialogs/success_editor.mako:6
-msgid "cm_np_bundled_editor"
+msgid "Editor assigned"
 msgstr ""
 
 #: mpulsweb/templates/casebundle/editor.mako:12
 #: mpulsweb/templates/casebundle/standin.mako:12
 #: mpulsweb/templates/casemanagement/organisation.mako:12
-msgid "cm_header_organisation"
+msgid "Organisation"
 msgstr ""
 
 #: mpulsweb/templates/casebundle/editor.mako:15
-msgid "cm_bundle_editor_explain"
+msgid "Please choose a new editor for the document"
 msgstr ""
 
 #: mpulsweb/templates/casebundle/standin.mako:7
@@ -2150,7 +2147,7 @@
 msgstr ""
 
 #: mpulsweb/templates/casemanagement/organisation.mako:16
-msgid "cm_header_organisation_editor"
+msgid "Organisation_editor"
 msgstr ""
 
 #: mpulsweb/templates/casemanagement/organisation.mako:19

Modified: base/trunk/mpulsweb/templates/auth/account_deactivated.mako
===================================================================
--- base/trunk/mpulsweb/templates/auth/account_deactivated.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/auth/account_deactivated.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -1,6 +1,6 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="main.mako" />
-<h1>${_('adm_header_account_deactivated')}</h1>
-<p>${_('adm_con_ad_account_deactivated')}
-${_('adm_con_ad_contact_admin')} 
+<h1>${_('This account has been deactivated')}</h1>
+<p>${_('This account has been deactivated.')}
+${_('Please contact your administrator')} 
 </p>

Modified: base/trunk/mpulsweb/templates/auth/login.mako
===================================================================
--- base/trunk/mpulsweb/templates/auth/login.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/auth/login.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -6,22 +6,22 @@
 
   % if c.login_failed:
     <div class="form_errors">
-      <a name="error_list"><h1>${_('login_input_error')}</h1></a>
+      <a name="error_list"><h1>${_('Wrong Input')}</h1></a>
       <ul>
-        <li>${_('login_input_error_message')}</li>
+        <li>${_('Login or Password not correct')}</li>
       </ul>
     </div>
   % endif
 
   <p>
     <strong>${_('Agency')}: ${h.getKAName()}</strong><br>
-    ${_('login_p_insert_pw_and_identifier')}
+    ${_('Please enter identifier and password to login.')}
   </p>
 
   <form name="login" action="${h.url_for(controller='/auth', action='loginAction')}" 
   accept-charset="UTF-8" method="POST">
     <div class="label">
-      <label for="username">${_('login_label_identifier')}</label>
+      <label for="username">${_('Identifier:')}</label>
     </div>
     <div class="input">
        <input id="username" type="text" size="20" name="username" maxlength="64">
@@ -29,7 +29,7 @@
     <div class="clearer"></div>
 
     <div class="label">
-      <label for="password">${_('login_label_pw')}</label>
+      <label for="password">${_('Password:')}</label>
     </div>
     <div class="input">
       <input type="password" size="20" id="password" name="password">

Modified: base/trunk/mpulsweb/templates/auth/logout.mako
===================================================================
--- base/trunk/mpulsweb/templates/auth/logout.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/auth/logout.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -3,6 +3,6 @@
 <h1>${_('%s Abmeldung') % h.get_app_title()}</h1>
 <div id="waska_form_login">
   <p>
-    ${_('logout_p_logout successful')} <a href="${h.url_for('/')}">${_('logout_a_login')}</a>${_('logout_p_login_again')}
+    ${_('logout_p_logout successful')} <a href="${h.url_for('/')}">${_('login')}</a>${_(', to login again.')}
   </p>
 </div>

Modified: base/trunk/mpulsweb/templates/auth/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/auth/main.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/auth/main.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -10,7 +10,7 @@
     ${next.body()}
   </div>
   <div id="footer_login">
-    <p>${_('main_login_bmf_phrase') % h.get_app_title()}</p>
+    <p>${_('BMF-phrase %s') % h.get_app_title()}</p>
      <a target="_blank" href="http://www.bmfsfj.de">
       <img src="${h.url_for('/images/logos/BMFSFJ_C_M_web.jpg')}" 
         alt="Logo Bundesministerium f&#252;r Familie, Senioren, Frauen und Jugend" border="0">
@@ -32,7 +32,7 @@
     %>
   % if len(c.form_errors) > 0:
   <div class="form_errors">
-    <a name="error_list"><h1>${_('main_login_formular_input_error')}</h1></a>
+    <a name="error_list"><h1>${_('Formular input error')}</h1></a>
     <ul>
       % for key, value in c.form_errors.iteritems():
         <li>${_(formular_labels.get(key, '%s' % key))}: ${value}</li>

Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="/main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+  <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
   <li><a href="#">${_('cm_np_anonymize')}</a></li>
 </%def>
 <%include file="../../dialogs/confirm.mako" />

Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/download_formletter.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/download_formletter.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/download_formletter.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+	<li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
 	<li><a href="#">${_('formletter')}</a></li>
 </%def>
 <div class="dialog">

Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/error.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/error.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/error.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+  <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
   <li><a href="#">Aktion für mehrere Fallakten durchführen</a></li>
 </%def>
 <%include file="../../dialogs/notification.mako" />

Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/success_anonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/success_anonymize.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/success_anonymize.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="/main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+  <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
   <li><a href="#">${_('cm_np_anonymize')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="/main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+        <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
 	<li><a href="#">${_('cm_np_delete_success')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/success_editor.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/success_editor.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/success_editor.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
-        <li>${_('cm_np_bundled_editor')}</li>
+        <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
+        <li>${_('Editor assigned')}</li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/success_markdelete.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/success_markdelete.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/success_markdelete.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="/main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+        <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
 	<li><a href="#">${_('cm_np_delete_success')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/success_markevaluate.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/success_markevaluate.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/success_markevaluate.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="/main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+        <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
 	<li><a href="#">${_("Mark cases for evaluation")}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/success_standin.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/success_standin.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/success_standin.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+        <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
         <li>${_('cm_np_bundled_standin')}</li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/casebundle/editor.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/editor.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casebundle/editor.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -3,16 +3,16 @@
 <%!  import mpulsweb.lib.helper.filters as F %>
 <%def name="buildNavipath()">
     ${parent.buildNavipath()}
-    <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
-    <li>${_('cm_np_bundled_editor')}</li>
+    <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
+    <li>${_('Editor assigned')}</li>
 </%def>
 
 <div id="content_header_small">
   <div id="content_ueberschrift">
-${_('cm_header_organisation')}
+${_('Organisation')}
   </div>
 </div>
-<p>${_('cm_bundle_editor_explain')}:</p>
+<p>${_('Please choose a new editor for the document')}:</p>
 <ul>
 % for case in c.case_list:
   <li>${case.last_name | F.NA}, ${case.first_name | F.NA}</li>

Modified: base/trunk/mpulsweb/templates/casebundle/standin.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/standin.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casebundle/standin.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -3,13 +3,13 @@
 <%!  import mpulsweb.lib.helper.filters as F %>
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+  <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
   <li>${_('cm_np_bundled_standin')}</li>
 </%def>
 
 <div id="content_header_small">
   <div id="content_ueberschrift">
-${_('cm_header_organisation')}
+${_('Organisation')}
   </div>
 </div>
 <h2>${_('cm_header_standin')}</h2>

Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+	<li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
 	<li><a href="#">${_('cm_np_delete')}</a></li>
 </%def>
 <%include file="../../dialogs/confirm.mako" />

Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+	<li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
 	<li><a href="#">${_('cm_np_delete')}</a></li>
 </%def>
 <%include file="../../dialogs/confirm.mako" />

Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_export.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_export.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_export.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+	<li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
 	<li><a href="#">${_('cm_np_export')}</a></li>
 </%def>
 <div class="dialog">

Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+	<li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
 	<li><a href="#">${_('cm_np_restore')}</a></li>
 </%def>
 <%include file="../../dialogs/confirm.mako" />

Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="/main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+        <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
 	<li><a href="#">${_('cm_np_delete_success')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -1,7 +1,7 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+        <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
         <li><a href="${h.url_for(controller='/case', action='case_overview')}">${_('cm_np_overview')}</a></li>
         <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
 	<li><a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">${_('cm_np_doc_overview')}</a></li>

Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="/main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+        <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
 	<li><a href="#">${_('cm_np_delete_success')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_export.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_export.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_export.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="/main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+        <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
 	<li><a href="#">${_('cm_np_export_success')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="/main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+        <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
 	<li><a href="#">${_('cm_np_keepactive_success')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_restore.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_restore.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_restore.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="/main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+        <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
 	<li><a href="#">${_('cm_np_restore_success')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/casemanagement/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/main.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casemanagement/main.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -9,7 +9,7 @@
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
   <li><a href="${h.url_for(controller='case')}"
-         onclick="return checkModification();">${_('cm_np_root')}</a></li>
+         onclick="return checkModification();">${_('Case Management')}</a></li>
   <li><a href="${h.url_for(controller='case_overview', action='overview')}" 
          onclick="return checkModification();">${_('cm_np_overview')}</a></li>
 </%def>

Modified: base/trunk/mpulsweb/templates/casemanagement/new.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/new.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casemanagement/new.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -3,7 +3,7 @@
 
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+  <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
   <li><a href="${h.url_for(controller='/case', action='new2')}">${_('cm_np_new')}</a></li>
 </%def>
 

Modified: base/trunk/mpulsweb/templates/casemanagement/organisation.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/organisation.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casemanagement/organisation.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -9,11 +9,11 @@
 
 <div id="content_header_small">
   <div id="content_ueberschrift">
-${_('cm_header_organisation')}
+${_('Organisation')}
   </div>
 </div>
 <p>${_('cm_organisation_con_whois_cm_replace')}</p>
-<h2>${_('cm_header_organisation_editor')}</h2>
+<h2>${_('Organisation_editor')}</h2>
 <table>
   <tr>
     <td class="label table_header_v table_width_mid_l">${_('cm_organisation_tbl_label_lastname')}</td><td class=" table_row_v table_description">${c.editor.last_name | F.NA}</td>

Modified: base/trunk/mpulsweb/templates/casemanagement/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/overview.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casemanagement/overview.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -3,7 +3,7 @@
 <%!  import mpulsweb.lib.helper.filters as F %>
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+  <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
   <li><a href="${h.url_for(controller='/case_overview')}">${_('cm_np_overview')}</a></li>
 </%def>
 <h1>${_('cm_header_overview')}</h1>

Modified: base/trunk/mpulsweb/templates/casemanagement/upload.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/upload.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/casemanagement/upload.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="../main.mako" />
 <%def name="buildNavipath()">
 		${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+	<li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
 	<li><a href="${h.url_for(controller='/case', action='import')}">${_('Import cases')}</a></li>
 </%def>
 <h1>${_('XML Import')}</h1>

Modified: base/trunk/mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako
===================================================================
--- base/trunk/mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -3,7 +3,7 @@
 <%inherit file="/main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+        <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
         <li><a href="#">${_('case_cm_phase')}</a></li>
 </%def>
 <div class="dialog">

Modified: base/trunk/mpulsweb/templates/phase/phase.mako
===================================================================
--- base/trunk/mpulsweb/templates/phase/phase.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/phase/phase.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="../casemanagement/main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+  <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
   <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id)}">${_('cm_np_select')}</a></li>
   <li><a href="#">${_('case_cm_phase')}</a></li>
 </%def>

Modified: base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement.mako	2011-02-23 12:44:33 UTC (rev 4693)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement.mako	2011-02-24 09:10:31 UTC (rev 4694)
@@ -2,7 +2,7 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+  <li><a href="${h.url_for(controller='/case')}">${_('Case Management')}</a></li>
   <li><a href="${h.url_for(controller='/case_overview')}">${_('cm_np_overview')}</a></li>
   <li><a href="#">${_('cm_np_show')}</a></li>
 </%def>

More information about the Mpuls-commits mailing list