[Mpuls-commits] r4720 - in base/trunk: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/templates/casemanagement mpulsweb/templates/dialogs mpulsweb/templates/documents mpulsweb/templates/documents/dialogs mpulsweb/templates/formularpage mpulsweb/templates/help mpulsweb/templates/home mpulsweb/templates/phase mpulsweb/templates/phase/dialogs mpulsweb/templates/privacy mpulsweb/templates/privacy/dialogs mpulsweb/templates/search mpulsweb/templates/settings

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Mon Feb 28 14:06:01 CET 2011 

Author: ludwig
Date: 2011-02-28 14:05:58 +0100 (Mon, 28 Feb 2011)
New Revision: 4720

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
   base/trunk/mpulsweb/i18n/mpulsweb.pot
   base/trunk/mpulsweb/templates/casemanagement/organisation.mako
   base/trunk/mpulsweb/templates/dialogs/confirm.mako
   base/trunk/mpulsweb/templates/dialogs/failed.mako
   base/trunk/mpulsweb/templates/dialogs/notification.mako
   base/trunk/mpulsweb/templates/dialogs/success.mako
   base/trunk/mpulsweb/templates/documents/case_new.mako
   base/trunk/mpulsweb/templates/documents/case_overview.mako
   base/trunk/mpulsweb/templates/documents/dialogs/confirm.mako
   base/trunk/mpulsweb/templates/documents/dialogs/delete_document_success.mako
   base/trunk/mpulsweb/templates/documents/dialogs/failed_attachment.mako
   base/trunk/mpulsweb/templates/documents/dialogs/failed_document.mako
   base/trunk/mpulsweb/templates/documents/dialogs/success_attachment.mako
   base/trunk/mpulsweb/templates/documents/dialogs/success_documents.mako
   base/trunk/mpulsweb/templates/documents/global_overview.mako
   base/trunk/mpulsweb/templates/documents/global_upload.mako
   base/trunk/mpulsweb/templates/formularpage/formular.mako
   base/trunk/mpulsweb/templates/help/help.mako
   base/trunk/mpulsweb/templates/home/home.mako
   base/trunk/mpulsweb/templates/home/remindlist.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/accept_success.mako
   base/trunk/mpulsweb/templates/privacy/dialogs/confirm.mako
   base/trunk/mpulsweb/templates/privacy/dialogs/decline_failed.mako
   base/trunk/mpulsweb/templates/privacy/dialogs/decline_success.mako
   base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako
   base/trunk/mpulsweb/templates/privacy/edit_statement.mako
   base/trunk/mpulsweb/templates/privacy/list_statements.mako
   base/trunk/mpulsweb/templates/search/search.mako
   base/trunk/mpulsweb/templates/settings/edit.mako
Log:
update of the msgids (part 16)

Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/ChangeLog	2011-02-28 13:05:58 UTC (rev 4720)
@@ -1,4 +1,40 @@
 2011-02-28  Ludwig Reiter <ludwig.reiter at intevation.de>
+
+	* mpulsweb/i18n/mpulsweb.pot
+	mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
+	mpulsweb/templates/dialogs/confirm.mako
+	mpulsweb/templates/dialogs/failed.mako
+	mpulsweb/templates/dialogs/notification.mako
+	mpulsweb/templates/dialogs/success.mako
+	mpulsweb/templates/formularpage/formular.mako
+	mpulsweb/templates/help/help.mako
+	mpulsweb/templates/home/remindlist.mako
+	mpulsweb/templates/home/home.mako
+	mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako
+	mpulsweb/templates/phase/phase.mako
+	mpulsweb/templates/settings/edit.mako
+	mpulsweb/templates/documents/dialogs/success_documents.mako
+	mpulsweb/templates/documents/dialogs/failed_attachment.mako
+	mpulsweb/templates/documents/dialogs/confirm.mako
+	mpulsweb/templates/documents/dialogs/success_attachment.mako
+	mpulsweb/templates/documents/dialogs/failed_document.mako
+	mpulsweb/templates/documents/dialogs/delete_document_success.mako
+	mpulsweb/templates/documents/case_overview.mako
+	mpulsweb/templates/documents/case_new.mako
+	mpulsweb/templates/documents/global_upload.mako
+	mpulsweb/templates/documents/global_overview.mako
+	mpulsweb/templates/search/search.mako
+	mpulsweb/templates/casemanagement/organisation.mako
+	mpulsweb/templates/privacy/edit_statement.mako
+	mpulsweb/templates/privacy/dialogs/missing_statement_body.mako
+	mpulsweb/templates/privacy/dialogs/decline_success.mako
+	mpulsweb/templates/privacy/dialogs/confirm.mako
+	mpulsweb/templates/privacy/dialogs/accept_success.mako
+	mpulsweb/templates/privacy/dialogs/decline_failed.mako
+	mpulsweb/templates/privacy/list_statements.mako:
+	Update of the msgids (part 16)
+
+2011-02-28  Ludwig Reiter <ludwig.reiter at intevation.de>
 	
 	* mpulsweb/i18n/mpulsweb.pot
 	mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po

Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po	2011-02-28 13:05:58 UTC (rev 4720)
@@ -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-28 12:35+0100\n"
+"PO-Revision-Date: 2011-02-28 14:03+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"
@@ -719,6 +719,7 @@
 msgstr "Dokument gelöscht!"
 
 #: mpulsweb/controllers/document.py:51
+#: mpulsweb/templates/documents/dialogs/confirm.mako:5
 msgid "Delete document?"
 msgstr "Dokument löschen?"
 
@@ -1342,6 +1343,7 @@
 #: mpulsweb/templates/administration/dialogs/success_delete_user.mako:6
 #: mpulsweb/templates/administration/dialogs/success_edit_user.mako:6
 #: mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako:6
+#: mpulsweb/templates/help/help.mako:6
 msgid "User overview"
 msgstr "Benutzerübersicht"
 
@@ -1579,6 +1581,7 @@
 #: mpulsweb/templates/administration/new_user_result.mako:74
 #: mpulsweb/templates/administration/show_user_body.mako:46
 #: mpulsweb/templates/administration/show_user_body.mako:56
+#: mpulsweb/templates/dialogs/confirm.mako:6
 #: mpulsweb/templates/evaluation/evaluate.mako:68
 #: mpulsweb/templates/settings/show.mako:63
 msgid "Yes"
@@ -1588,6 +1591,7 @@
 #: mpulsweb/templates/administration/new_user_result.mako:76
 #: mpulsweb/templates/administration/show_user_body.mako:48
 #: mpulsweb/templates/administration/show_user_body.mako:58
+#: mpulsweb/templates/dialogs/confirm.mako:7
 #: mpulsweb/templates/settings/show.mako:65
 msgid "No"
 msgstr "Nein"
@@ -1619,6 +1623,8 @@
 #: mpulsweb/templates/appointments/overview_body.mako:7
 #: mpulsweb/templates/appointments/remindlist_body.mako:7
 #: mpulsweb/templates/casemanagement/caselist.mako:89
+#: mpulsweb/templates/documents/case_overview.mako:42
+#: mpulsweb/templates/documents/global_overview.mako:28
 #: mpulsweb/templates/home/globalappointmentlist.mako:13
 #: mpulsweb/templates/logbook/overview.mako:101
 #: mpulsweb/templates/phase/phase.mako:28
@@ -2085,6 +2091,8 @@
 #: mpulsweb/templates/casemanagement/caselist.mako:157
 #: mpulsweb/templates/casemanagement/caselist.mako:158
 #: mpulsweb/templates/casemanagement/digest.mako:113
+#: mpulsweb/templates/casemanagement/organisation.mako:49
+#: mpulsweb/templates/casemanagement/organisation.mako:78
 #: mpulsweb/templates/search/search.mako:39
 msgid "Editor"
 msgstr "Bearbeiter"
@@ -2339,11 +2347,6 @@
 msgid "Organisation_editor"
 msgstr "Bearbeiterin / Bearbeiter"
 
-#: mpulsweb/templates/casemanagement/organisation.mako:49
-#: mpulsweb/templates/casemanagement/organisation.mako:78
-msgid "cm_organisation_table_cm"
-msgstr "Mitarbeiterin / Mitarbeiter"
-
 #: mpulsweb/templates/casemanagement/overview.mako:9
 msgid "Case documents overview"
 msgstr "Fallaktenübersicht"
@@ -2449,34 +2452,28 @@
 msgid "Restore successfully!"
 msgstr "Wiederherstellen erfolgreich!"
 
-#: mpulsweb/templates/dialogs/confirm.mako:6
-msgid "dialog_header_confirm_option_yes"
-msgstr "Ja"
-
-#: mpulsweb/templates/dialogs/confirm.mako:7
-msgid "dialog_header_confirm_option_no"
-msgstr "Nein"
-
 #: mpulsweb/templates/dialogs/failed.mako:6
+#: mpulsweb/templates/dialogs/notification.mako:6
 #: mpulsweb/templates/dialogs/success.mako:8
 #: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:20
-msgid "dialog_header_confirm_option_ok"
+#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:25
+msgid "OK"
 msgstr "OK"
 
-#: mpulsweb/templates/dialogs/notification.mako:6
-msgid "dialog_header_notification_option_ok"
-msgstr "OK"
-
 #: mpulsweb/templates/documents/case_new.mako:17
-msgid "cm_np_doc_upload"
+#: mpulsweb/templates/documents/case_overview.mako:25
+#: mpulsweb/templates/documents/dialogs/success_attachment.mako:5
+msgid "Add attachment"
 msgstr "Anlage hinzufügen"
 
 #: mpulsweb/templates/documents/case_new.mako:24
-msgid "cm_header_doc_new"
+#: mpulsweb/templates/documents/global_overview.mako:16
+#: mpulsweb/templates/documents/global_upload.mako:11
+msgid "Add new document"
 msgstr "Neue Anlage hinzufügen"
 
 #: mpulsweb/templates/documents/case_new.mako:31
-msgid "cm_menu_link_document_back"
+msgid "Back to: Attachment overview"
 msgstr "Zurück zu: Anlagenübersicht"
 
 #: mpulsweb/templates/documents/case_new.mako:47
@@ -2485,6 +2482,8 @@
 msgstr "Datei"
 
 #: mpulsweb/templates/documents/case_new.mako:58
+#: mpulsweb/templates/documents/case_overview.mako:36
+#: mpulsweb/templates/documents/global_overview.mako:26
 #: mpulsweb/templates/documents/global_upload.mako:46
 msgid "Filename"
 msgstr "Dateiname"
@@ -2501,89 +2500,52 @@
 
 #: mpulsweb/templates/documents/case_new.mako:97
 #: mpulsweb/templates/documents/global_upload.mako:84
-msgid "doc_form_upload_submit"
+msgid "Submit"
 msgstr "Hinzufügen"
 
 #: mpulsweb/templates/documents/case_overview.mako:19
-msgid "cm_header_doc_overview"
+#: mpulsweb/templates/documents/global_overview.mako:6
+#: mpulsweb/templates/documents/global_overview.mako:10
+#: mpulsweb/templates/documents/global_upload.mako:5
+#: mpulsweb/templates/documents/dialogs/confirm.mako:4
+#: mpulsweb/templates/documents/dialogs/delete_document_success.mako:4
+#: mpulsweb/templates/documents/dialogs/failed_document.mako:4
+#: mpulsweb/templates/documents/dialogs/success_documents.mako:4
+msgid "Document overview"
 msgstr "Anlagenübersicht"
 
-#: mpulsweb/templates/documents/case_overview.mako:25
-msgid "cm_actions_link_doc_new"
-msgstr "Neue Anlage hinzufügen"
-
-#: mpulsweb/templates/documents/case_overview.mako:36
-#: mpulsweb/templates/documents/global_overview.mako:26
-msgid "doc_overview_tbl_header_filename"
-msgstr "Dateiname"
-
 #: mpulsweb/templates/documents/case_overview.mako:39
 #: mpulsweb/templates/documents/global_overview.mako:27
-msgid "doc_overview_tbl_header_filesize"
+msgid "Filesize"
 msgstr "Dateigröße"
 
-#: mpulsweb/templates/documents/case_overview.mako:42
-#: mpulsweb/templates/documents/global_overview.mako:28
-msgid "doc_overview_tbl_header_actions"
-msgstr "Aktionen"
-
 #: mpulsweb/templates/documents/case_overview.mako:71
 #: mpulsweb/templates/documents/global_overview.mako:73
-msgid "doc_overview_nofilesfound"
+msgid "No files found"
 msgstr "Es wurden keine Dateien gefunden"
 
-#: mpulsweb/templates/documents/global_overview.mako:6
-#: mpulsweb/templates/documents/global_upload.mako:5
-#: mpulsweb/templates/documents/dialogs/confirm.mako:4
-#: mpulsweb/templates/documents/dialogs/delete_document_success.mako:4
-#: mpulsweb/templates/documents/dialogs/failed_document.mako:4
-#: mpulsweb/templates/documents/dialogs/success_documents.mako:4
-msgid "doc_np_overview"
-msgstr "Dokumentenübersicht"
-
-#: mpulsweb/templates/documents/global_overview.mako:10
-msgid "doc_header_overview"
-msgstr "Dokumentenübersicht"
-
-#: mpulsweb/templates/documents/global_overview.mako:16
-msgid "doc_actions_link_new"
-msgstr "Neues Dokument hinzufügen"
-
 #: mpulsweb/templates/documents/global_upload.mako:6
 #: mpulsweb/templates/documents/dialogs/failed_document.mako:5
 #: mpulsweb/templates/documents/dialogs/success_documents.mako:5
-msgid "doc_np_upload"
+msgid "Add document"
 msgstr "Dokument hinzufügen"
 
-#: mpulsweb/templates/documents/global_upload.mako:11
-msgid "doc_header_new"
-msgstr "Neues Dokument hinzufügen "
-
 #: mpulsweb/templates/documents/global_upload.mako:18
-msgid "menu_doc_link_overview_back"
+msgid "Back to: user overview"
 msgstr "Zurück zu: Benutzerübersicht"
 
-#: mpulsweb/templates/documents/dialogs/confirm.mako:5
-msgid "doc_np_delete"
-msgstr "Dokument löschen?"
-
 #: mpulsweb/templates/documents/dialogs/delete_document_success.mako:5
 #, fuzzy
-#| msgid "Delete case?_document_success"
 msgid "cm_np_delete_document_success"
 msgstr "Dokument gelöscht!"
 
 #: mpulsweb/templates/documents/dialogs/failed_attachment.mako:6
 #: mpulsweb/templates/documents/dialogs/failed_document.mako:6
-msgid "cm_np_doc_failed"
+msgid "Error while adding attachment"
 msgstr "Fehler beim Hinzufügen"
 
-#: mpulsweb/templates/documents/dialogs/success_attachment.mako:5
-msgid "cm_np_attachment_success"
-msgstr "Anlage hinzugefügt"
-
 #: mpulsweb/templates/documents/dialogs/success_documents.mako:6
-msgid "cm_np_doc_success"
+msgid "Attachment added"
 msgstr "Dokument hinzugefügt"
 
 #: mpulsweb/templates/error/error.mako:3
@@ -2654,11 +2616,11 @@
 msgstr "Exportiere CSV"
 
 #: mpulsweb/templates/formularpage/formular.mako:40
-msgid "cm_actions_link_edit"
+msgid "Edit"
 msgstr "In Bearbeitung nehmen"
 
 #: mpulsweb/templates/formularpage/formular.mako:44
-msgid "cm_actions_link_show"
+msgid "Close editing"
 msgstr "Bearbeitung beenden"
 
 #: mpulsweb/templates/help/help.mako:4
@@ -2666,10 +2628,6 @@
 msgid "Helppage for %s"
 msgstr "Hilfe für %s"
 
-#: mpulsweb/templates/help/help.mako:6
-msgid "menu_cm_link_overview"
-msgstr "Benutzer"
-
 #: mpulsweb/templates/help/help.mako:91
 msgid "Common help"
 msgstr "Allgemeine Hilfe"
@@ -2679,7 +2637,7 @@
 msgstr "Für weitere Hilfe greifen Sie bitte auf die Anwendungshandbücher zurück."
 
 #: mpulsweb/templates/home/home.mako:6
-msgid "start_header_blackboard"
+msgid "Black Board"
 msgstr "Schwarzes Brett"
 
 #: mpulsweb/templates/home/home.mako:11
@@ -2724,7 +2682,7 @@
 
 #: mpulsweb/templates/home/remindlist.mako:18
 #: mpulsweb/templates/home/remindlist.mako:19
-msgid "cm_overview_a_keepactive"
+msgid "Keep longer activated"
 msgstr "Aufbewahrung verlängern"
 
 #: mpulsweb/templates/info/info.mako:4
@@ -2737,11 +2695,11 @@
 msgstr "löschen"
 
 #: mpulsweb/templates/phase/phase.mako:23
-msgid "Phase in CM_required_fields"
+msgid "Required fields"
 msgstr "Pflichtfelder"
 
 #: mpulsweb/templates/phase/phase.mako:24
-msgid "Phase in CM_time"
+msgid "Time"
 msgstr "Zeitpunkt"
 
 #: mpulsweb/templates/phase/phase.mako:57
@@ -2778,11 +2736,11 @@
 #: mpulsweb/templates/privacy/dialogs/confirm.mako:6
 #: mpulsweb/templates/privacy/dialogs/decline_failed.mako:6
 #: mpulsweb/templates/privacy/dialogs/decline_success.mako:6
-msgid "statement_np_edit"
+msgid "Edit acceptance statement"
 msgstr "Einwilligungserklärung setzen"
 
 #: mpulsweb/templates/privacy/list_statements.mako:7
-msgid "statement_np_list_statements"
+msgid "List statements"
 msgstr "Verfügbare Erklärungen"
 
 #: mpulsweb/templates/privacy/list_statements.mako:9
@@ -2800,7 +2758,7 @@
 msgstr "Fallakte anzeigen"
 
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:3
-msgid "statement_dialog_header_statement_no"
+msgid "Missing data for the statement"
 msgstr "Fehlende Angabe zur Einwilligungserklärung"
 
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:4
@@ -2819,45 +2777,42 @@
 " Möglichkeit eine Angabe zur Einwilligungserklärung zu geben. Wählen Sie:"
 
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:6
-msgid "statement_edit_a_statement_form_printversion"
+msgid "Printversion of this statement"
 msgstr " Druckversion dieser Erklärung"
 
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:10
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:19
-msgid "statement_dialog_li_statement_accepted"
+msgid "Statement accepted"
 msgstr "Eine Erklärung liegt vor"
 
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:10
-msgid "statement_dialog_li_statement_accepted_explanation"
+msgid "Statement accepted_explanation"
 msgstr ", wenn eine Einwilligungserklärung des Jugendlichen vorliegt."
 
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:12
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:20
-msgid "statement_dialog_li_statement_unclear"
+msgid "Statement unclear"
 msgstr "Erklärung noch unklar"
 
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:12
-msgid "statement_dialog_li_statement_unclear_explanation"
+msgid "Statement unclear_explanation"
 msgstr ""
 ", wenn zum jetzigen Zeitpunkt noch keine Erklärung vorliegt, aber noch "
 "eingeholt werden soll."
 
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:14
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:21
-msgid "statement_dialog_li_statement_declined"
+msgid "Statement declined"
 msgstr "Eine Erklärung liegt nicht vor"
 
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:14
-msgid "statement_dialog_li_statement_declined_explanation"
+msgid "Statement declined_explanation"
 msgstr ""
 ", wenn keine Erklärung des Jugendlichen vorliegt und sicher nicht "
 "vorliegen wird. Die Fallakte wird dann anonymisiert!"
 
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:25
-msgid "statement_dialog_a_ok"
-msgstr "OK"
-
 #: mpulsweb/templates/search/search.mako:7
+#: mpulsweb/templates/search/search.mako:232
 msgid "Search"
 msgstr "Suche"
 
@@ -2934,10 +2889,6 @@
 msgid "Unspecified"
 msgstr "Keine Angabe"
 
-#: mpulsweb/templates/search/search.mako:232
-msgid "cm_form_overview_search_submit"
-msgstr "Suchen"
-
 #: mpulsweb/templates/settings/edit.mako:4
 #: mpulsweb/templates/settings/edit.mako:48
 #: mpulsweb/templates/settings/show.mako:35
@@ -2969,11 +2920,11 @@
 msgstr "Einstellungen bearbeiten"
 
 #: mpulsweb/templates/settings/edit.mako:32
-msgid "adm_actions_link_showsettings"
+msgid "Back to: institution settings"
 msgstr "Zurück zu: Einrichtungseinstellungen"
 
 #: mpulsweb/templates/settings/edit.mako:42
-msgid "adm_con_es_editsettings"
+msgid "Edit institution settings."
 msgstr "Hier können Sie die einrichtungsweiten Einstellungen bearbeiten."
 
 #: mpulsweb/templates/settings/edit.mako:46

Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot	2011-02-28 13:05:58 UTC (rev 4720)
@@ -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-28 12:35+0100\n"
+"POT-Creation-Date: 2011-02-28 14:03+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"
@@ -594,6 +594,7 @@
 msgstr ""
 
 #: mpulsweb/controllers/document.py:51
+#: mpulsweb/templates/documents/dialogs/confirm.mako:5
 msgid "Delete document?"
 msgstr ""
 
@@ -1153,6 +1154,7 @@
 #: mpulsweb/templates/administration/dialogs/success_delete_user.mako:6
 #: mpulsweb/templates/administration/dialogs/success_edit_user.mako:6
 #: mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako:6
+#: mpulsweb/templates/help/help.mako:6
 msgid "User overview"
 msgstr ""
 
@@ -1386,6 +1388,7 @@
 #: mpulsweb/templates/administration/new_user_result.mako:74
 #: mpulsweb/templates/administration/show_user_body.mako:46
 #: mpulsweb/templates/administration/show_user_body.mako:56
+#: mpulsweb/templates/dialogs/confirm.mako:6
 #: mpulsweb/templates/evaluation/evaluate.mako:68
 #: mpulsweb/templates/settings/show.mako:63
 msgid "Yes"
@@ -1395,6 +1398,7 @@
 #: mpulsweb/templates/administration/new_user_result.mako:76
 #: mpulsweb/templates/administration/show_user_body.mako:48
 #: mpulsweb/templates/administration/show_user_body.mako:58
+#: mpulsweb/templates/dialogs/confirm.mako:7
 #: mpulsweb/templates/settings/show.mako:65
 msgid "No"
 msgstr ""
@@ -1426,6 +1430,8 @@
 #: mpulsweb/templates/appointments/overview_body.mako:7
 #: mpulsweb/templates/appointments/remindlist_body.mako:7
 #: mpulsweb/templates/casemanagement/caselist.mako:89
+#: mpulsweb/templates/documents/case_overview.mako:42
+#: mpulsweb/templates/documents/global_overview.mako:28
 #: mpulsweb/templates/home/globalappointmentlist.mako:13
 #: mpulsweb/templates/logbook/overview.mako:101
 #: mpulsweb/templates/phase/phase.mako:28
@@ -1885,6 +1891,8 @@
 #: mpulsweb/templates/casemanagement/caselist.mako:157
 #: mpulsweb/templates/casemanagement/caselist.mako:158
 #: mpulsweb/templates/casemanagement/digest.mako:113
+#: mpulsweb/templates/casemanagement/organisation.mako:49
+#: mpulsweb/templates/casemanagement/organisation.mako:78
 #: mpulsweb/templates/search/search.mako:39
 msgid "Editor"
 msgstr ""
@@ -2129,11 +2137,6 @@
 msgid "Organisation_editor"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/organisation.mako:49
-#: mpulsweb/templates/casemanagement/organisation.mako:78
-msgid "cm_organisation_table_cm"
-msgstr ""
-
 #: mpulsweb/templates/casemanagement/overview.mako:9
 msgid "Case documents overview"
 msgstr ""
@@ -2237,34 +2240,28 @@
 msgid "Restore successfully!"
 msgstr ""
 
-#: mpulsweb/templates/dialogs/confirm.mako:6
-msgid "dialog_header_confirm_option_yes"
-msgstr ""
-
-#: mpulsweb/templates/dialogs/confirm.mako:7
-msgid "dialog_header_confirm_option_no"
-msgstr ""
-
 #: mpulsweb/templates/dialogs/failed.mako:6
+#: mpulsweb/templates/dialogs/notification.mako:6
 #: mpulsweb/templates/dialogs/success.mako:8
 #: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:20
-msgid "dialog_header_confirm_option_ok"
+#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:25
+msgid "OK"
 msgstr ""
 
-#: mpulsweb/templates/dialogs/notification.mako:6
-msgid "dialog_header_notification_option_ok"
-msgstr ""
-
 #: mpulsweb/templates/documents/case_new.mako:17
-msgid "cm_np_doc_upload"
+#: mpulsweb/templates/documents/case_overview.mako:25
+#: mpulsweb/templates/documents/dialogs/success_attachment.mako:5
+msgid "Add attachment"
 msgstr ""
 
 #: mpulsweb/templates/documents/case_new.mako:24
-msgid "cm_header_doc_new"
+#: mpulsweb/templates/documents/global_overview.mako:16
+#: mpulsweb/templates/documents/global_upload.mako:11
+msgid "Add new document"
 msgstr ""
 
 #: mpulsweb/templates/documents/case_new.mako:31
-msgid "cm_menu_link_document_back"
+msgid "Back to: Attachment overview"
 msgstr ""
 
 #: mpulsweb/templates/documents/case_new.mako:47
@@ -2273,6 +2270,8 @@
 msgstr ""
 
 #: mpulsweb/templates/documents/case_new.mako:58
+#: mpulsweb/templates/documents/case_overview.mako:36
+#: mpulsweb/templates/documents/global_overview.mako:26
 #: mpulsweb/templates/documents/global_upload.mako:46
 msgid "Filename"
 msgstr ""
@@ -2289,87 +2288,51 @@
 
 #: mpulsweb/templates/documents/case_new.mako:97
 #: mpulsweb/templates/documents/global_upload.mako:84
-msgid "doc_form_upload_submit"
+msgid "Submit"
 msgstr ""
 
 #: mpulsweb/templates/documents/case_overview.mako:19
-msgid "cm_header_doc_overview"
-msgstr ""
-
-#: mpulsweb/templates/documents/case_overview.mako:25
-msgid "cm_actions_link_doc_new"
-msgstr ""
-
-#: mpulsweb/templates/documents/case_overview.mako:36
-#: mpulsweb/templates/documents/global_overview.mako:26
-msgid "doc_overview_tbl_header_filename"
-msgstr ""
-
-#: mpulsweb/templates/documents/case_overview.mako:39
-#: mpulsweb/templates/documents/global_overview.mako:27
-msgid "doc_overview_tbl_header_filesize"
-msgstr ""
-
-#: mpulsweb/templates/documents/case_overview.mako:42
-#: mpulsweb/templates/documents/global_overview.mako:28
-msgid "doc_overview_tbl_header_actions"
-msgstr ""
-
-#: mpulsweb/templates/documents/case_overview.mako:71
-#: mpulsweb/templates/documents/global_overview.mako:73
-msgid "doc_overview_nofilesfound"
-msgstr ""
-
 #: mpulsweb/templates/documents/global_overview.mako:6
+#: mpulsweb/templates/documents/global_overview.mako:10
 #: mpulsweb/templates/documents/global_upload.mako:5
 #: mpulsweb/templates/documents/dialogs/confirm.mako:4
 #: mpulsweb/templates/documents/dialogs/delete_document_success.mako:4
 #: mpulsweb/templates/documents/dialogs/failed_document.mako:4
 #: mpulsweb/templates/documents/dialogs/success_documents.mako:4
-msgid "doc_np_overview"
+msgid "Document overview"
 msgstr ""
 
-#: mpulsweb/templates/documents/global_overview.mako:10
-msgid "doc_header_overview"
+#: mpulsweb/templates/documents/case_overview.mako:39
+#: mpulsweb/templates/documents/global_overview.mako:27
+msgid "Filesize"
 msgstr ""
 
-#: mpulsweb/templates/documents/global_overview.mako:16
-msgid "doc_actions_link_new"
+#: mpulsweb/templates/documents/case_overview.mako:71
+#: mpulsweb/templates/documents/global_overview.mako:73
+msgid "No files found"
 msgstr ""
 
 #: mpulsweb/templates/documents/global_upload.mako:6
 #: mpulsweb/templates/documents/dialogs/failed_document.mako:5
 #: mpulsweb/templates/documents/dialogs/success_documents.mako:5
-msgid "doc_np_upload"
+msgid "Add document"
 msgstr ""
 
-#: mpulsweb/templates/documents/global_upload.mako:11
-msgid "doc_header_new"
-msgstr ""
-
 #: mpulsweb/templates/documents/global_upload.mako:18
-msgid "menu_doc_link_overview_back"
+msgid "Back to: user overview"
 msgstr ""
 
-#: mpulsweb/templates/documents/dialogs/confirm.mako:5
-msgid "doc_np_delete"
-msgstr ""
-
 #: mpulsweb/templates/documents/dialogs/delete_document_success.mako:5
 msgid "cm_np_delete_document_success"
 msgstr ""
 
 #: mpulsweb/templates/documents/dialogs/failed_attachment.mako:6
 #: mpulsweb/templates/documents/dialogs/failed_document.mako:6
-msgid "cm_np_doc_failed"
+msgid "Error while adding attachment"
 msgstr ""
 
-#: mpulsweb/templates/documents/dialogs/success_attachment.mako:5
-msgid "cm_np_attachment_success"
-msgstr ""
-
 #: mpulsweb/templates/documents/dialogs/success_documents.mako:6
-msgid "cm_np_doc_success"
+msgid "Attachment added"
 msgstr ""
 
 #: mpulsweb/templates/error/error.mako:3
@@ -2440,11 +2403,11 @@
 msgstr ""
 
 #: mpulsweb/templates/formularpage/formular.mako:40
-msgid "cm_actions_link_edit"
+msgid "Edit"
 msgstr ""
 
 #: mpulsweb/templates/formularpage/formular.mako:44
-msgid "cm_actions_link_show"
+msgid "Close editing"
 msgstr ""
 
 #: mpulsweb/templates/help/help.mako:4
@@ -2452,10 +2415,6 @@
 msgid "Helppage for %s"
 msgstr ""
 
-#: mpulsweb/templates/help/help.mako:6
-msgid "menu_cm_link_overview"
-msgstr ""
-
 #: mpulsweb/templates/help/help.mako:91
 msgid "Common help"
 msgstr ""
@@ -2465,7 +2424,7 @@
 msgstr ""
 
 #: mpulsweb/templates/home/home.mako:6
-msgid "start_header_blackboard"
+msgid "Black Board"
 msgstr ""
 
 #: mpulsweb/templates/home/home.mako:11
@@ -2510,7 +2469,7 @@
 
 #: mpulsweb/templates/home/remindlist.mako:18
 #: mpulsweb/templates/home/remindlist.mako:19
-msgid "cm_overview_a_keepactive"
+msgid "Keep longer activated"
 msgstr ""
 
 #: mpulsweb/templates/info/info.mako:4
@@ -2523,11 +2482,11 @@
 msgstr ""
 
 #: mpulsweb/templates/phase/phase.mako:23
-msgid "Phase in CM_required_fields"
+msgid "Required fields"
 msgstr ""
 
 #: mpulsweb/templates/phase/phase.mako:24
-msgid "Phase in CM_time"
+msgid "Time"
 msgstr ""
 
 #: mpulsweb/templates/phase/phase.mako:57
@@ -2559,11 +2518,11 @@
 #: mpulsweb/templates/privacy/dialogs/confirm.mako:6
 #: mpulsweb/templates/privacy/dialogs/decline_failed.mako:6
 #: mpulsweb/templates/privacy/dialogs/decline_success.mako:6
-msgid "statement_np_edit"
+msgid "Edit acceptance statement"
 msgstr ""
 
 #: mpulsweb/templates/privacy/list_statements.mako:7
-msgid "statement_np_list_statements"
+msgid "List statements"
 msgstr ""
 
 #: mpulsweb/templates/privacy/list_statements.mako:9
@@ -2581,7 +2540,7 @@
 msgstr ""
 
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:3
-msgid "statement_dialog_header_statement_no"
+msgid "Missing data for the statement"
 msgstr ""
 
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:4
@@ -2593,41 +2552,38 @@
 msgstr ""
 
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:6
-msgid "statement_edit_a_statement_form_printversion"
+msgid "Printversion of this statement"
 msgstr ""
 
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:10
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:19
-msgid "statement_dialog_li_statement_accepted"
+msgid "Statement accepted"
 msgstr ""
 
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:10
-msgid "statement_dialog_li_statement_accepted_explanation"
+msgid "Statement accepted_explanation"
 msgstr ""
 
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:12
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:20
-msgid "statement_dialog_li_statement_unclear"
+msgid "Statement unclear"
 msgstr ""
 
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:12
-msgid "statement_dialog_li_statement_unclear_explanation"
+msgid "Statement unclear_explanation"
 msgstr ""
 
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:14
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:21
-msgid "statement_dialog_li_statement_declined"
+msgid "Statement declined"
 msgstr ""
 
 #: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:14
-msgid "statement_dialog_li_statement_declined_explanation"
+msgid "Statement declined_explanation"
 msgstr ""
 
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:25
-msgid "statement_dialog_a_ok"
-msgstr ""
-
 #: mpulsweb/templates/search/search.mako:7
+#: mpulsweb/templates/search/search.mako:232
 msgid "Search"
 msgstr ""
 
@@ -2704,10 +2660,6 @@
 msgid "Unspecified"
 msgstr ""
 
-#: mpulsweb/templates/search/search.mako:232
-msgid "cm_form_overview_search_submit"
-msgstr ""
-
 #: mpulsweb/templates/settings/edit.mako:4 mpulsweb/templates/settings/edit.mako:48
 #: mpulsweb/templates/settings/show.mako:35
 msgid "Name of the institution"
@@ -2736,11 +2688,11 @@
 msgstr ""
 
 #: mpulsweb/templates/settings/edit.mako:32
-msgid "adm_actions_link_showsettings"
+msgid "Back to: institution settings"
 msgstr ""
 
 #: mpulsweb/templates/settings/edit.mako:42
-msgid "adm_con_es_editsettings"
+msgid "Edit institution settings."
 msgstr ""
 
 #: mpulsweb/templates/settings/edit.mako:46

Modified: base/trunk/mpulsweb/templates/casemanagement/organisation.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/organisation.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/casemanagement/organisation.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -46,7 +46,7 @@
 <table>
   <tr>
     <th class="table_header_h table_checkbox">&nbsp;</th>
-    <th class="table_header_h table_description">${_('cm_organisation_table_cm')}</th>
+    <th class="table_header_h table_description">${_('Editor')}</th>
   </tr>
   <% idset = True %>
   % for group in c.group_list:
@@ -75,7 +75,7 @@
 % else:
 <table>
   <tr>
-    <th class="table_width_long table_header_h">${_('cm_organisation_table_cm')}</th>
+    <th class="table_width_long table_header_h">${_('Editor')}</th>
   </tr>
   <% idset = 0 %>
   % for group in c.group_list2:

Modified: base/trunk/mpulsweb/templates/dialogs/confirm.mako
===================================================================
--- base/trunk/mpulsweb/templates/dialogs/confirm.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/dialogs/confirm.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -3,6 +3,6 @@
 <div class="dialog">
 <h1><img src="${h.url_for('/images/icons/info/question.png')}" alt="achtung" width="48" height="48">${c.dialog_title or c.confirm_for}</h1>
 <p>${h.literal(c.dialog_text or c.question)}</p>
-<a class="button" href="${c.url_yes}">${_('dialog_header_confirm_option_yes')}</a>
-<a class="button" href="${c.url_no}">${_('dialog_header_confirm_option_no')}</a>
+<a class="button" href="${c.url_yes}">${_('Yes')}</a>
+<a class="button" href="${c.url_no}">${_('No')}</a>
 </div>

Modified: base/trunk/mpulsweb/templates/dialogs/failed.mako
===================================================================
--- base/trunk/mpulsweb/templates/dialogs/failed.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/dialogs/failed.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -3,5 +3,5 @@
 <div class="dialog" />
 <h1><img src="${h.url_for('/images/icons/info/failure.png')}" alt="Fehler" width="48" height="48"/>${c.dialog_title | F.NA}</h1>
 <p>${h.literal(c.dialog_text) | F.NA}</p>
-<a class="button" href="${c.url_ok}">${_('dialog_header_confirm_option_ok')}</a>
+<a class="button" href="${c.url_ok}">${_('OK')}</a>
 </div>

Modified: base/trunk/mpulsweb/templates/dialogs/notification.mako
===================================================================
--- base/trunk/mpulsweb/templates/dialogs/notification.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/dialogs/notification.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -3,5 +3,5 @@
 <div class="dialog" />
 <h1><img src="${h.url_for('/images/icons/info/alert.png')}" alt="Achtung"/>${c.dialog_title}</h1>
 <p>${c.dialog_text}</p>
-<a class="button" href="${c.url_ok}">${_('dialog_header_notification_option_ok')}</a>
+<a class="button" href="${c.url_ok}">${_('OK')}</a>
 </div>

Modified: base/trunk/mpulsweb/templates/dialogs/success.mako
===================================================================
--- base/trunk/mpulsweb/templates/dialogs/success.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/dialogs/success.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -5,5 +5,5 @@
     width="48"
     height="48">${c.dialog_title or c.success_for | F.NA}</h1>
 <p>${c.dialog_text or c.success_text | F.NA}</p>
-<a class="button" href="${c.url_ok}">${_('dialog_header_confirm_option_ok')}</a>
+<a class="button" href="${c.url_ok}">${_('OK')}</a>
 </div>

Modified: base/trunk/mpulsweb/templates/documents/case_new.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/case_new.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/documents/case_new.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -14,21 +14,21 @@
   </li>
   <li>
     <a href="${h.url_for(controller='/casedocument', action='new')}">
-      ${_('cm_np_doc_upload')}
+      ${_('Add attachment')}
     </a>
   </li>
 </%def>
 
 <div id="content_header_small">
   <div id="content_ueberschrift">
-    ${_('cm_header_doc_new')}
+    ${_('Add new document')}
   </div>
   <div id="modusfield">
     <div class="actions">
       <ul>
 	<li>
           <a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">
-            ${_('cm_menu_link_document_back')}
+            ${_('Back to: Attachment overview')}
           </a>
         </li>
       </ul>
@@ -94,7 +94,7 @@
       <td class=""></td>
       <td colspan="2">
         ${h.hidden('case', value=session.get('case').id)}
-        ${h.submit('upload', _('doc_form_upload_submit'))}
+        ${h.submit('upload', _('Submit'))}
       </td>
     </tr>
   </table>

Modified: base/trunk/mpulsweb/templates/documents/case_overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/case_overview.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/documents/case_overview.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -16,13 +16,13 @@
 
 <div id="content_header_small">
   <div id="content_ueberschrift">
-    ${_('cm_header_doc_overview')}
+    ${_('Document overview')}
   </div>
   % if h.hasRole(['cm_ka']) and session.get('case').getState().getState() == 1:
     <div id="modusfield">
       <div class="actions">
 	<ul>
-	  <li><a href="${h.url_for(controller='/casedocument', action='new')}">${_('cm_actions_link_doc_new')}</a></li>
+	  <li><a href="${h.url_for(controller='/casedocument', action='new')}">${_('Add attachment')}</a></li>
 	</ul>
       </div>
     </div>
@@ -33,13 +33,13 @@
 <table>
   <tr>
     <th class="table_header_h table_description">
-      ${_('doc_overview_tbl_header_filename')}
+      ${_('Filename')}
     </th>
     <th class="number_field table_header_h table_date">
-      ${_('doc_overview_tbl_header_filesize')}
+      ${_('Filesize')}
     </th>
     <th class="table_header_h actions">
-      ${_('doc_overview_tbl_header_actions')}
+      ${_('Actions')}
     </th>
   </tr>
   % if len(c.files) > 0:
@@ -68,7 +68,7 @@
   % else:
     <tr>
       <td colspan="3">
-        ${_('doc_overview_nofilesfound')}
+        ${_('No files found')}
       </td>
     </tr>
   % endif

Modified: base/trunk/mpulsweb/templates/documents/dialogs/confirm.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/confirm.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/documents/dialogs/confirm.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -1,7 +1,7 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/document', action='overview')}">${_('doc_np_overview')}</a></li>
-	<li><a href="#">${_('doc_np_delete')}</a></li>
+	<li><a href="${h.url_for(controller='/document', action='overview')}">${_('Document overview')}</a></li>
+	<li><a href="#">${_('Delete document?')}</a></li>
 </%def>
 <%include file="../../dialogs/confirm.mako" />

Modified: base/trunk/mpulsweb/templates/documents/dialogs/delete_document_success.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/delete_document_success.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/documents/dialogs/delete_document_success.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -1,7 +1,7 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('doc_np_overview')}</a></li>
+        <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('Document overview')}</a></li>
 	<li><a href="#">${_('cm_np_delete_document_success')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/documents/dialogs/failed_attachment.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/failed_attachment.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/documents/dialogs/failed_attachment.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -3,6 +3,6 @@
 	${parent.buildNavipath()}
         <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
 	<li><a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">${_('Documents overview')}</a></li>
-	<li><a href="#">${_('cm_np_doc_failed')}</a></li>
+	<li><a href="#">${_('Error while adding attachment')}</a></li>
 </%def>
 <%include file="../../dialogs/failed.mako" />

Modified: base/trunk/mpulsweb/templates/documents/dialogs/failed_document.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/failed_document.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/documents/dialogs/failed_document.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -1,8 +1,8 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('doc_np_overview')}</a></li>
-	<li><a href="${h.url_for(controller='/document', action='globalUpload')}">${_('doc_np_upload')}</a></li>
-	<li><a href="#">${_('cm_np_doc_failed')}</a></li>
+        <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('Document overview')}</a></li>
+	<li><a href="${h.url_for(controller='/document', action='globalUpload')}">${_('Add document')}</a></li>
+	<li><a href="#">${_('Error while adding attachment')}</a></li>
 </%def>
 <%include file="../../dialogs/failed.mako" />

Modified: base/trunk/mpulsweb/templates/documents/dialogs/success_attachment.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/success_attachment.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/documents/dialogs/success_attachment.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -2,6 +2,6 @@
 <%def name="buildNavipath()">
 	${parent.buildNavipath()} 
         <li><a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">${_('Attachment overview')}</a></li>
-	<li><a href="#">${_('cm_np_attachment_success')}</a></li>
+	<li><a href="#">${_('Add attachment')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/documents/dialogs/success_documents.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/success_documents.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/documents/dialogs/success_documents.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -1,8 +1,8 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('doc_np_overview')}</a></li>
-	<li><a href="${h.url_for(controller='/document', action='globalUpload')}">${_('doc_np_upload')}</a></li>
-	<li><a href="#">${_('cm_np_doc_success')}</a></li>
+        <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('Document overview')}</a></li>
+	<li><a href="${h.url_for(controller='/document', action='globalUpload')}">${_('Add document')}</a></li>
+	<li><a href="#">${_('Attachment added')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/documents/global_overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/global_overview.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/documents/global_overview.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -3,17 +3,17 @@
 <%!  import mpulsweb.lib.helper.filters as F %>
 <%def name="buildNavipath()">
 		${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('doc_np_overview')}</a></li>
+	<li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('Document overview')}</a></li>
 </%def>
 <div id="content_header_small">
   <div id="content_ueberschrift">
-${_('doc_header_overview')}
+${_('Document overview')}
   </div>
 % if h.hasRole(['admin_ka']):
   <div id="modusfield">
     <div class="actions">
         <ul>
-            <li><a href="${h.url_for(controller='/document', action='globalUpload')}"> ${_('doc_actions_link_new')}</a></li>
+            <li><a href="${h.url_for(controller='/document', action='globalUpload')}"> ${_('Add new document')}</a></li>
         </ul>
     </div>
 
@@ -23,9 +23,9 @@
 
 <table class="hovertable">
   <tr class="table_header_h">
-    <th class="table_description">${_('doc_overview_tbl_header_filename')}</th>
-    <th class="number_field table_date">${_('doc_overview_tbl_header_filesize')}</th>
-    <th class="table_action">${_('doc_overview_tbl_header_actions')}</th>
+    <th class="table_description">${_('Filename')}</th>
+    <th class="number_field table_date">${_('Filesize')}</th>
+    <th class="table_action">${_('Actions')}</th>
   </tr>
   <% idset = 0 %>
 % if len(c.files) > 0:
@@ -70,7 +70,7 @@
 % else:
   <tr>
     <td colspan="3">
-      ${_('doc_overview_nofilesfound')}
+      ${_('No files found')}
     </td>
   </tr>
 % endif

Modified: base/trunk/mpulsweb/templates/documents/global_upload.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/global_upload.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/documents/global_upload.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -2,20 +2,20 @@
 <%inherit file="../main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('doc_np_overview')}</a></li>
-  <li><a href="${h.url_for(controller='/document', action='globalUpload')}">${_('doc_np_upload')}</a></li>
+  <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('Document overview')}</a></li>
+  <li><a href="${h.url_for(controller='/document', action='globalUpload')}">${_('Add document')}</a></li>
 </%def>
 
 <div id="content_header_small">
   <div id="content_ueberschrift">
-    ${_('doc_header_new')}
+    ${_('Add new document')}
   </div>
   <div id="modusfield">
     <div class="actions">
       <ul>
 	<li>
           <a href="${h.url_for(controller='document', action='globalOverview')}">
-            ${_('menu_doc_link_overview_back')}
+            ${_('Back to: user overview')}
           </a>
         </li>
       </ul>
@@ -81,7 +81,7 @@
     <tr>
       <td class=""></td>
       <td colspan="2">
-        ${h.submit('upload', _('doc_form_upload_submit'))}
+        ${h.submit('upload', _('Submit'))}
       </td>
     </tr>
   </table>

Modified: base/trunk/mpulsweb/templates/formularpage/formular.mako
===================================================================
--- base/trunk/mpulsweb/templates/formularpage/formular.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/formularpage/formular.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -37,11 +37,11 @@
           % if session.get('render_mode') == 'ro':
             <li><a href="${h.url_for(controller='/formularpage', action='edit',
                                      id=c.page_id)}" 
-                   onclick="return checkModification();"> ${_('cm_actions_link_edit')}</a></li>
+                   onclick="return checkModification();"> ${_('Edit')}</a></li>
           % else:
             <li><a href="${h.url_for(controller='/formularpage', action='show',
                                      id=c.page_id)}" 
-                   onclick="return checkModification();"> ${_('cm_actions_link_show')}</a></li>
+                   onclick="return checkModification();"> ${_('Close editing')}</a></li>
           % endif
         % endif
         <li><a href="${h.url_for(controller='/formularpage', action='printout',

Modified: base/trunk/mpulsweb/templates/help/help.mako
===================================================================
--- base/trunk/mpulsweb/templates/help/help.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/help/help.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -3,7 +3,7 @@
 <%inherit file="../main.mako" />
 <h1>${_('Helppage for %s') % h.get_app_title()}</h1>
 % if g.mpuls_config.is_enabled('module', 'casemanagement'):
-<h2>${_('menu_cm_link_overview')}</h2>
+<h2>${_('User overview')}</h2>
 <ul>
   <li>
     <strong>Pflichtfelder</strong>

Modified: base/trunk/mpulsweb/templates/home/home.mako
===================================================================
--- base/trunk/mpulsweb/templates/home/home.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/home/home.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -3,7 +3,7 @@
 <%inherit file="../main.mako" />
 <div id="content_header_small">
   <div id="content_ueberschrift">
-    ${_('start_header_blackboard')}
+    ${_('Black Board')}
   </div>
 </div>
 % if (h.getLogin() == 'adm'): 

Modified: base/trunk/mpulsweb/templates/home/remindlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/home/remindlist.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/home/remindlist.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -15,6 +15,6 @@
          border = "0"
          width  = "22"
          height = "22"
-         alt    = "${_('cm_overview_a_keepactive')}" 
-         title  = "${_('cm_overview_a_keepactive')}"></a>
+         alt    = "${_('Keep longer activated')}" 
+         title  = "${_('Keep longer activated')}"></a>
 </%def>

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-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -17,6 +17,6 @@
   </p>
 </div>
 <br>
-<a class="button" href="${c.url_ok}">${_('dialog_header_confirm_option_ok')}</a>
+<a class="button" href="${c.url_ok}">${_('OK')}</a>
 <a class="button" href="${h.url_for(controller='/case', action='printAll', id=session.get('case').id, confirmed=0)}" target="_blank">Drucken</a>
 </div>

Modified: base/trunk/mpulsweb/templates/phase/phase.mako
===================================================================
--- base/trunk/mpulsweb/templates/phase/phase.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/phase/phase.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -20,8 +20,8 @@
       <tr>
         <th>${_('Phase')}</th>
         <th width="25px">&nbsp;</th>
-        <th width="50%">${_('Phase in CM_required_fields')}</th>
-        <th>${_('Phase in CM_time')}</th>
+        <th width="50%">${_('Required fields')}</th>
+        <th>${_('Time')}</th>
         % if c.show_actions:
           <th class="actions">
             % if is_allowed:

Modified: base/trunk/mpulsweb/templates/privacy/dialogs/accept_success.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/accept_success.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/accept_success.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -3,6 +3,6 @@
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
   <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
-  <li><a href="${h.url_for(controller='/case', action='setStatement', id=session.get('case').id, confirmed=0)}">${_('statement_np_edit')}</a></li>
+  <li><a href="${h.url_for(controller='/case', action='setStatement', id=session.get('case').id, confirmed=0)}">${_('Edit acceptance statement')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/privacy/dialogs/confirm.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/confirm.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/confirm.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -3,6 +3,6 @@
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
   <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
-  <li><a href="#">${_('statement_np_edit')}</a></li>
+  <li><a href="#">${_('Edit acceptance statement')}</a></li>
 </%def>
 <%include file="../../dialogs/confirm.mako" />

Modified: base/trunk/mpulsweb/templates/privacy/dialogs/decline_failed.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/decline_failed.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/decline_failed.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -3,6 +3,6 @@
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
   <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
-  <li><a href="${h.url_for(controller='/case', action='setStatement', id=session.get('case').id, confirmed=0)}">${_('statement_np_edit')}</a></li>
+  <li><a href="${h.url_for(controller='/case', action='setStatement', id=session.get('case').id, confirmed=0)}">${_('Edit acceptance statement')}</a></li>
 </%def>
 <%include file="../../dialogs/failed.mako" />

Modified: base/trunk/mpulsweb/templates/privacy/dialogs/decline_success.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/decline_success.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/decline_success.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -3,6 +3,6 @@
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
   <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
-  <li><a href="${h.url_for(controller='/case', action='setStatement', id=session.get('case').id, confirmed=0)}">${_('statement_np_edit')}</a></li>
+  <li><a href="${h.url_for(controller='/case', action='setStatement', id=session.get('case').id, confirmed=0)}">${_('Edit acceptance statement')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -1,28 +1,28 @@
 ## -*- coding: utf-8 -*- 
 <div class="dialog" />
-<h1><img src="${h.url_for('/images/icons/info/info.png')}" alt="" width="48" height="48" />${_('statement_dialog_header_statement_no')}</h1>
+<h1><img src="${h.url_for('/images/icons/info/info.png')}" alt="" width="48" height="48" />${_('Missing data for the statement')}</h1>
 <p>${_('statement_dialog_p_statement_no_explanation')}</p>
 % if h.hasRole(['cm_ka']):
-  <p>${h.literal(_('statement_dialog_p_options') % h.link_to(_('statement_edit_a_statement_form_printversion'), h.url_for(controller="/privacy", action="printStatement", id=c.ds_id)))}
+  <p>${h.literal(_('statement_dialog_p_options') % h.link_to(_('Printversion of this statement'), h.url_for(controller="/privacy", action="printStatement", id=c.ds_id)))}
 
     <ol>
       <li>
-        <strong>${_('statement_dialog_li_statement_accepted')}</strong>${_('statement_dialog_li_statement_accepted_explanation')}
+        <strong>${_('Statement accepted')}</strong>${_('Statement accepted_explanation')}
       </li>
-      <li><strong>${_('statement_dialog_li_statement_unclear')}</strong>${_('statement_dialog_li_statement_unclear_explanation')}
+      <li><strong>${_('Statement unclear')}</strong>${_('Statement unclear_explanation')}
       </li>
-      <li><strong>${_('statement_dialog_li_statement_declined')}</strong>${_('statement_dialog_li_statement_declined_explanation')}
+      <li><strong>${_('Statement declined')}</strong>${_('Statement declined_explanation')}
       </li>
     </ol>
   </p>
   <p>
-    <a class="button" href="${h.url_for(controller="privacy", action="accept", id=c.ds_id, confirmed=0)}">${_('statement_dialog_li_statement_accepted')}</a>
-    <a class="button" href="${c.targeturl}">${_('statement_dialog_li_statement_unclear')}</a>
-    <a class="button" href="${h.url_for(controller="privacy", action="decline", id=c.ds_id, confirmed=0)}">${_('statement_dialog_li_statement_declined')}</a>
+    <a class="button" href="${h.url_for(controller="privacy", action="accept", id=c.ds_id, confirmed=0)}">${_('Statement accepted')}</a>
+    <a class="button" href="${c.targeturl}">${_('Statement unclear')}</a>
+    <a class="button" href="${h.url_for(controller="privacy", action="decline", id=c.ds_id, confirmed=0)}">${_('Statement declined')}</a>
   </p>
 % else:
   <p>
-    <a class="button" href="${h.url_for(controller='/case', action='select', id=c.ds_id, confirmed=1)}">${_('statement_dialog_a_ok')}</a>
+    <a class="button" href="${h.url_for(controller='/case', action='select', id=c.ds_id, confirmed=1)}">${_('OK')}</a>
   </p>
 % endif
 

Modified: base/trunk/mpulsweb/templates/privacy/edit_statement.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/edit_statement.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/privacy/edit_statement.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -3,6 +3,6 @@
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
   <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
-  <li><a href="#">${_('statement_np_edit')}</a></li>
+  <li><a href="#">${_('Edit acceptance statement')}</a></li>
 </%def>
 <%include file="dialogs/missing_statement_body.mako" />

Modified: base/trunk/mpulsweb/templates/privacy/list_statements.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/list_statements.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/privacy/list_statements.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -4,7 +4,7 @@
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
   <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
-  <li><a href="${h.url_for(controller='/privacy', action='listStatements')}">${_('statement_np_list_statements')}</a></li>
+  <li><a href="${h.url_for(controller='/privacy', action='listStatements')}">${_('List statements')}</a></li>
 </%def>
 <h1>${_('Avaliable statements')}</h1>
 <div class="widget container">

Modified: base/trunk/mpulsweb/templates/search/search.mako
===================================================================
--- base/trunk/mpulsweb/templates/search/search.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/search/search.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -229,7 +229,7 @@
       <tr>
         <td class=""></td>
         <td colspan="2">
-          <input type="submit" value="${_('cm_form_overview_search_submit')}">
+          <input type="submit" value="${_('Search')}">
           ${self.buildSearchExtend()}
           ${self.buildSearchReset()}
         </td>

Modified: base/trunk/mpulsweb/templates/settings/edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/edit.mako	2011-02-28 11:43:16 UTC (rev 4719)
+++ base/trunk/mpulsweb/templates/settings/edit.mako	2011-02-28 13:05:58 UTC (rev 4720)
@@ -29,7 +29,7 @@
         <li>
           <a href="${h.url_for(controller='settings',
                                action='show')}">
-            ${_('adm_actions_link_showsettings')}
+            ${_('Back to: institution settings')}
           </a>
         </li>
       </ul>
@@ -39,7 +39,7 @@
 
 ${self.buildFormErrors(formular_labels)}
 <div id="admin_edit_settings">
-  <p>${_('adm_con_es_editsettings')}</p>
+  <p>${_('Edit institution settings.')}</p>
   <div class="waska_form">
     <form action="${h.url_for(controller='/settings', action='editAction')}" method="POST">
       <fieldset>

More information about the Mpuls-commits mailing list