[Mpuls-commits] r4646 - in base/trunk: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/templates/administration mpulsweb/templates/administration/dialogs mpulsweb/templates/appointments/dialogs mpulsweb/templates/settings mpulsweb/templates/settings/dialogs mpulsweb/templates/usersettings/dialogs

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Fri Feb 18 12:59:39 CET 2011 

Author: ludwig
Date: 2011-02-18 12:59:37 +0100 (Fri, 18 Feb 2011)
New Revision: 4646

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
   base/trunk/mpulsweb/i18n/mpulsweb.pot
   base/trunk/mpulsweb/templates/administration/delete_user_helper.mako
   base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako
   base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako
   base/trunk/mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako
   base/trunk/mpulsweb/templates/administration/dialogs/failed_delete_user.mako
   base/trunk/mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako
   base/trunk/mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako
   base/trunk/mpulsweb/templates/administration/dialogs/success_delete_user.mako
   base/trunk/mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako
   base/trunk/mpulsweb/templates/administration/dialogs/success_edit_user.mako
   base/trunk/mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako
   base/trunk/mpulsweb/templates/administration/dialogs/success_new_usergroup.mako
   base/trunk/mpulsweb/templates/administration/edit_user.mako
   base/trunk/mpulsweb/templates/administration/edit_usergroup.mako
   base/trunk/mpulsweb/templates/administration/new_user.mako
   base/trunk/mpulsweb/templates/administration/new_user_result.mako
   base/trunk/mpulsweb/templates/administration/new_usergroup.mako
   base/trunk/mpulsweb/templates/administration/overview_user.mako
   base/trunk/mpulsweb/templates/administration/overview_usergroups.mako
   base/trunk/mpulsweb/templates/administration/reset_password.mako
   base/trunk/mpulsweb/templates/administration/show_user.mako
   base/trunk/mpulsweb/templates/administration/show_usergroup.mako
   base/trunk/mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako
   base/trunk/mpulsweb/templates/settings/dialogs/success_edit.mako
   base/trunk/mpulsweb/templates/settings/edit.mako
   base/trunk/mpulsweb/templates/settings/show.mako
   base/trunk/mpulsweb/templates/usersettings/dialogs/notificate_setpassword.mako
Log:
update of msgids (part 5)

Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/ChangeLog	2011-02-18 11:59:37 UTC (rev 4646)
@@ -1,3 +1,34 @@
+2011-02-18  Ludwig Reiter <ludwig.reiter at intevation.de>
+	* mpulsweb/i18n/mpulsweb.pot
+	mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
+	mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako
+	mpulsweb/templates/administration/show_usergroup.mako
+	mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako
+	mpulsweb/templates/administration/dialogs/success_edit_user.mako
+	mpulsweb/templates/administration/dialogs/success_new_usergroup.mako
+	mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako
+	mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako
+	mpulsweb/templates/administration/dialogs/failed_delete_user.mako
+	mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako
+	mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako
+	mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako
+	mpulsweb/templates/administration/dialogs/success_delete_user.mako
+	mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako
+	mpulsweb/templates/administration/show_user.mako
+	mpulsweb/templates/administration/delete_user_helper.mako
+	mpulsweb/templates/administration/edit_usergroup.mako
+	mpulsweb/templates/administration/edit_user.mako
+	mpulsweb/templates/administration/new_usergroup.mako
+	mpulsweb/templates/administration/overview_user.mako
+	mpulsweb/templates/administration/overview_usergroups.mako
+	mpulsweb/templates/administration/reset_password.mako
+	mpulsweb/templates/administration/new_user_result.mako
+	mpulsweb/templates/administration/new_user.mako
+	mpulsweb/templates/usersettings/dialogs/notificate_setpassword.mako
+	mpulsweb/templates/settings/dialogs/success_edit.mako
+	mpulsweb/templates/settings/show.mako
+	mpulsweb/templates/settings/edit.mako: Update of msgids (Part 5) 
+
 2011-02-17  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-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po	2011-02-18 11:59:37 UTC (rev 4646)
@@ -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-17 15:25+0100\n"
+"PO-Revision-Date: 2011-02-18 12:54+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"
@@ -34,6 +34,7 @@
 msgstr "Bitte klicken Sie auf OK, um fortzufahren."
 
 #: mpulsweb/controllers/administration.py:26
+#: mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako:7
 msgid "Delete user?"
 msgstr "Benutzer löschen?"
 
@@ -45,6 +46,9 @@
 "die Daten unwiederbringlich verlieren?"
 
 #: mpulsweb/controllers/administration.py:28
+#: mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako:10
+#: mpulsweb/templates/administration/dialogs/success_delete_user.mako:7
+#: mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako:7
 msgid "User deleted!"
 msgstr "Benutzer gelöscht!"
 
@@ -55,6 +59,7 @@
 "fortzufahren."
 
 #: mpulsweb/controllers/administration.py:30
+#: mpulsweb/templates/administration/dialogs/failed_delete_user.mako:7
 msgid "User not deleted!"
 msgstr "Benutzer nicht gelöscht!"
 
@@ -1225,6 +1230,32 @@
 msgstr "Auswertungen"
 
 #: mpulsweb/templates/main.mako:168
+#: mpulsweb/templates/administration/delete_user_helper.mako:6
+#: mpulsweb/templates/administration/edit_user.mako:13
+#: mpulsweb/templates/administration/edit_usergroup.mako:10
+#: mpulsweb/templates/administration/new_user.mako:14
+#: mpulsweb/templates/administration/new_user_result.mako:6
+#: mpulsweb/templates/administration/new_usergroup.mako:9
+#: mpulsweb/templates/administration/overview_user.mako:6
+#: mpulsweb/templates/administration/overview_usergroups.mako:6
+#: mpulsweb/templates/administration/reset_password.mako:6
+#: mpulsweb/templates/administration/show_user.mako:5
+#: mpulsweb/templates/administration/show_usergroup.mako:6
+#: mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako:5
+#: mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako:5
+#: mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako:5
+#: mpulsweb/templates/administration/dialogs/failed_delete_user.mako:5
+#: mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako:5
+#: mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako:5
+#: mpulsweb/templates/administration/dialogs/success_delete_user.mako:5
+#: mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako:5
+#: mpulsweb/templates/administration/dialogs/success_edit_user.mako:5
+#: mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako:5
+#: mpulsweb/templates/administration/dialogs/success_new_usergroup.mako:5
+#: mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako:5
+#: mpulsweb/templates/settings/edit.mako:12
+#: mpulsweb/templates/settings/show.mako:7
+#: mpulsweb/templates/settings/dialogs/success_edit.mako:5
 msgid "Administration"
 msgstr "Administration"
 
@@ -1262,35 +1293,6 @@
 msgid "Switch dataset:"
 msgstr "Ansicht wechseln:"
 
-#: mpulsweb/templates/administration/delete_user_helper.mako:6
-#: mpulsweb/templates/administration/edit_user.mako:13
-#: mpulsweb/templates/administration/edit_usergroup.mako:10
-#: mpulsweb/templates/administration/new_user.mako:14
-#: mpulsweb/templates/administration/new_user_result.mako:6
-#: mpulsweb/templates/administration/new_usergroup.mako:9
-#: mpulsweb/templates/administration/overview_user.mako:6
-#: mpulsweb/templates/administration/overview_usergroups.mako:6
-#: mpulsweb/templates/administration/reset_password.mako:6
-#: mpulsweb/templates/administration/show_user.mako:5
-#: mpulsweb/templates/administration/show_usergroup.mako:6
-#: mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako:5
-#: mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako:5
-#: mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako:5
-#: mpulsweb/templates/administration/dialogs/failed_delete_user.mako:5
-#: mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako:5
-#: mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako:5
-#: mpulsweb/templates/administration/dialogs/success_delete_user.mako:5
-#: mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako:5
-#: mpulsweb/templates/administration/dialogs/success_edit_user.mako:5
-#: mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako:5
-#: mpulsweb/templates/administration/dialogs/success_new_usergroup.mako:5
-#: mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako:5
-#: mpulsweb/templates/settings/edit.mako:12
-#: mpulsweb/templates/settings/show.mako:7
-#: mpulsweb/templates/settings/dialogs/success_edit.mako:5
-msgid "adm_np_root"
-msgstr "Administration"
-
 #: mpulsweb/templates/administration/delete_user_helper.mako:7
 #: mpulsweb/templates/administration/edit_user.mako:14
 #: mpulsweb/templates/administration/new_user.mako:15
@@ -1306,19 +1308,19 @@
 #: 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
-msgid "adm_np_overview"
+msgid "User overview"
 msgstr "Benutzerübersicht"
 
 #: mpulsweb/templates/administration/delete_user_helper.mako:8
 #: mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako:8
 #: mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako:7
-msgid "adm_np_deleteuser"
+msgid "Delete user"
 msgstr "Benutzer löschen"
 
 #: mpulsweb/templates/administration/delete_user_helper.mako:9
 #: mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako:9
 #: mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako:8
-msgid "adm_np_deleteuser_helper"
+msgid "Delete helper user"
 msgstr "Assistent Benutzer löschen"
 
 #: mpulsweb/templates/administration/delete_user_helper.mako:13
@@ -1344,20 +1346,17 @@
 #: mpulsweb/templates/administration/show_user.mako:7
 #: mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako:7
 #: mpulsweb/templates/administration/dialogs/success_edit_user.mako:7
-msgid "adm_np_showuser"
+msgid "Show user"
 msgstr "Benutzer anzeigen"
 
 #: mpulsweb/templates/administration/edit_user.mako:16
+#: mpulsweb/templates/administration/edit_user.mako:20
 #: mpulsweb/templates/administration/dialogs/success_edit_user.mako:8
-msgid "adm_np_edituser"
+msgid "Edit user"
 msgstr "Benutzer bearbeiten"
 
-#: mpulsweb/templates/administration/edit_user.mako:20
-msgid "adm_header_edituser"
-msgstr "Benutzer bearbeiten"
-
 #: mpulsweb/templates/administration/edit_user.mako:25
-msgid "adm_actions_link_userpassreset"
+msgid "Reset user password"
 msgstr "Benutzerpasswort zurücksetzen"
 
 #: mpulsweb/templates/administration/edit_user.mako:26
@@ -1427,23 +1426,21 @@
 #: mpulsweb/templates/administration/edit_usergroup.mako:11
 #: mpulsweb/templates/administration/new_usergroup.mako:10
 #: mpulsweb/templates/administration/overview_usergroups.mako:7
+#: mpulsweb/templates/administration/show_usergroup.mako:12
 #: mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako:6
 #: mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako:6
 #: mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako:6
 #: mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako:6
 #: mpulsweb/templates/administration/dialogs/success_new_usergroup.mako:6
-msgid "adm_np_usergroup_overview"
+msgid "Usergroup overview"
 msgstr "Benutzergruppenübersicht"
 
 #: mpulsweb/templates/administration/edit_usergroup.mako:12
+#: mpulsweb/templates/administration/edit_usergroup.mako:16
 #: mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako:7
-msgid "adm_np_editusergroup"
+msgid "Edit usergroup"
 msgstr "Benutzergruppe bearbeiten"
 
-#: mpulsweb/templates/administration/edit_usergroup.mako:16
-msgid "adm_header_editusergroup"
-msgstr "Benutzergruppe bearbeiten"
-
 #: mpulsweb/templates/administration/edit_usergroup.mako:21
 #: mpulsweb/templates/administration/new_usergroup.mako:20
 #: mpulsweb/templates/administration/show_usergroup.mako:18
@@ -1473,14 +1470,12 @@
 msgstr "Benutzergruppe speichern"
 
 #: mpulsweb/templates/administration/new_user.mako:16
+#: mpulsweb/templates/administration/new_user.mako:20
 #: mpulsweb/templates/administration/new_user_result.mako:8
-msgid "adm_np_newuser"
+#: mpulsweb/templates/home/home.mako:14
+msgid "Create new user"
 msgstr "Neuen Benutzer anlegen"
 
-#: mpulsweb/templates/administration/new_user.mako:20
-msgid "adm_header_newuser"
-msgstr "Neuen Benutzer anlegen"
-
 #: mpulsweb/templates/administration/new_user.mako:75
 msgid "adm_form_user_room"
 msgstr "Raumnummer"
@@ -1559,15 +1554,12 @@
 msgstr "Nein"
 
 #: mpulsweb/templates/administration/new_usergroup.mako:11
+#: mpulsweb/templates/administration/new_usergroup.mako:15
 #: mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako:7
 #: mpulsweb/templates/administration/dialogs/success_new_usergroup.mako:7
-msgid "adm_np_newusergroup"
+msgid "Create new usergroup"
 msgstr "Neue Benutzergruppe anlegen"
 
-#: mpulsweb/templates/administration/new_usergroup.mako:15
-msgid "adm_header_newusergroup"
-msgstr "Neue Benutzergruppe anlegen"
-
 #: mpulsweb/templates/administration/overview_user.mako:13
 msgid "adm_header_overview"
 msgstr "Benutzerübersicht"
@@ -1652,11 +1644,11 @@
 
 #: mpulsweb/templates/administration/reset_password.mako:9
 #: mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako:8
-msgid "adm_np_resetpassword"
+msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
 #: mpulsweb/templates/administration/reset_password.mako:15
-msgid "adm_header_resetpassword"
+msgid "User password reset!"
 msgstr "Benutzerpasswort zurückgesetzt!"
 
 #: mpulsweb/templates/administration/reset_password.mako:16
@@ -1738,13 +1730,9 @@
 msgstr "Bei Anmeldung neues Passwort verlangen"
 
 #: mpulsweb/templates/administration/show_usergroup.mako:8
-msgid "adm_np_showusergroup"
+msgid "Show usergroup"
 msgstr "Benutzergruppe anzeigen"
 
-#: mpulsweb/templates/administration/show_usergroup.mako:12
-msgid "adm_header_showusergroup"
-msgstr "Benutzergruppenansicht"
-
 #: mpulsweb/templates/administration/show_usergroup.mako:17
 msgid "adm_actions_link_editusergroup"
 msgstr "In Bearbeitung nehmen"
@@ -1753,34 +1741,17 @@
 msgid "group_has_no_member"
 msgstr "Die Benutzergruppe hat keine Mitglieder"
 
-#: mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako:7
-msgid "adm_np_delteuser"
-msgstr "Benutzer löschen?"
-
-#: mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako:10
-msgid "adm_np_delteuser_success"
-msgstr "Benutzer gelöscht!"
-
 #: mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako:7
 #: mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako:7
-msgid "adm_np_deleteusergroup"
+msgid "Delete usergroup?"
 msgstr "Benutzergruppe löschen"
 
-#: mpulsweb/templates/administration/dialogs/failed_delete_user.mako:7
-msgid "adm_np_failed_deleteuser"
-msgstr "Benutzer nicht gelöscht!"
-
 #: mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako:9
-msgid "adm_np_deleteuser_helper_set_editor"
+msgid "Case document assigned"
 msgstr "Fallakte übertragen"
 
-#: mpulsweb/templates/administration/dialogs/success_delete_user.mako:7
-#: mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako:7
-msgid "adm_np_success_deleteuser"
-msgstr "Benutzer gelöscht!"
-
 #: mpulsweb/templates/administration/dialogs/success_edit_user.mako:9
-msgid "adm_np_edituser_success"
+msgid "User saved!"
 msgstr "Benutzer gespeichert!"
 
 #: mpulsweb/templates/appointments/edit.mako:12
@@ -2879,10 +2850,6 @@
 msgid "Under the menu item \"User\" you can"
 msgstr "Im Menüpunkt \"Benutzer\" können sie"
 
-#: mpulsweb/templates/home/home.mako:14
-msgid "Create new user"
-msgstr "Neue Benutzer anlegen"
-
 #: mpulsweb/templates/home/home.mako:15
 msgid "Organise already existing user"
 msgstr "Bereits vorhandene Benutzer verwalten"
@@ -3169,18 +3136,15 @@
 #: mpulsweb/templates/settings/edit.mako:15
 #: mpulsweb/templates/settings/show.mako:10
 #: mpulsweb/templates/settings/dialogs/success_edit.mako:6
-msgid "adm_np_showsettings"
+msgid "Show settings"
 msgstr "Einrichtungseinstellungen"
 
 #: mpulsweb/templates/settings/edit.mako:18
+#: mpulsweb/templates/settings/edit.mako:24
 #: mpulsweb/templates/settings/dialogs/success_edit.mako:7
-msgid "adm_np_editsettings"
+msgid "Edit settings"
 msgstr "Einstellungen bearbeiten"
 
-#: mpulsweb/templates/settings/edit.mako:24
-msgid "adm_header_editsettings"
-msgstr "Einstellungen bearbeiten"
-
 #: mpulsweb/templates/settings/edit.mako:32
 msgid "adm_actions_link_showsettings"
 msgstr "Zurück zu: Einrichtungseinstellungen"
@@ -3259,7 +3223,7 @@
 msgstr "Nein"
 
 #: mpulsweb/templates/settings/dialogs/success_edit.mako:8
-msgid "adm_np_editsettings_success"
+msgid "Settings saved!"
 msgstr "Einstellungen gespeichert!"
 
 #: mpulsweb/templates/tags/tags.mako:20
@@ -3380,6 +3344,6 @@
 msgstr "Hier sehen sie eine Übersicht Ihrer persönlichen Daten."
 
 #: mpulsweb/templates/usersettings/dialogs/notificate_setpassword.mako:5
-msgid "adm_np_changepassword"
+msgid "Change user password!"
 msgstr "Benutzerpasswort geändert!"
 

Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot	2011-02-18 11:59:37 UTC (rev 4646)
@@ -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-17 15:25+0100\n"
+"POT-Creation-Date: 2011-02-18 12:53+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"
@@ -34,6 +34,7 @@
 msgstr ""
 
 #: mpulsweb/controllers/administration.py:26
+#: mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako:7
 msgid "Delete user?"
 msgstr ""
 
@@ -43,6 +44,9 @@
 msgstr ""
 
 #: mpulsweb/controllers/administration.py:28
+#: mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako:10
+#: mpulsweb/templates/administration/dialogs/success_delete_user.mako:7
+#: mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako:7
 msgid "User deleted!"
 msgstr ""
 
@@ -51,6 +55,7 @@
 msgstr ""
 
 #: mpulsweb/controllers/administration.py:30
+#: mpulsweb/templates/administration/dialogs/failed_delete_user.mako:7
 msgid "User not deleted!"
 msgstr ""
 
@@ -1039,6 +1044,31 @@
 msgstr ""
 
 #: mpulsweb/templates/main.mako:168
+#: mpulsweb/templates/administration/delete_user_helper.mako:6
+#: mpulsweb/templates/administration/edit_user.mako:13
+#: mpulsweb/templates/administration/edit_usergroup.mako:10
+#: mpulsweb/templates/administration/new_user.mako:14
+#: mpulsweb/templates/administration/new_user_result.mako:6
+#: mpulsweb/templates/administration/new_usergroup.mako:9
+#: mpulsweb/templates/administration/overview_user.mako:6
+#: mpulsweb/templates/administration/overview_usergroups.mako:6
+#: mpulsweb/templates/administration/reset_password.mako:6
+#: mpulsweb/templates/administration/show_user.mako:5
+#: mpulsweb/templates/administration/show_usergroup.mako:6
+#: mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako:5
+#: mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako:5
+#: mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako:5
+#: mpulsweb/templates/administration/dialogs/failed_delete_user.mako:5
+#: mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako:5
+#: mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako:5
+#: mpulsweb/templates/administration/dialogs/success_delete_user.mako:5
+#: mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako:5
+#: mpulsweb/templates/administration/dialogs/success_edit_user.mako:5
+#: mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako:5
+#: mpulsweb/templates/administration/dialogs/success_new_usergroup.mako:5
+#: mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako:5
+#: mpulsweb/templates/settings/edit.mako:12 mpulsweb/templates/settings/show.mako:7
+#: mpulsweb/templates/settings/dialogs/success_edit.mako:5
 msgid "Administration"
 msgstr ""
 
@@ -1074,34 +1104,6 @@
 msgid "Switch dataset:"
 msgstr ""
 
-#: mpulsweb/templates/administration/delete_user_helper.mako:6
-#: mpulsweb/templates/administration/edit_user.mako:13
-#: mpulsweb/templates/administration/edit_usergroup.mako:10
-#: mpulsweb/templates/administration/new_user.mako:14
-#: mpulsweb/templates/administration/new_user_result.mako:6
-#: mpulsweb/templates/administration/new_usergroup.mako:9
-#: mpulsweb/templates/administration/overview_user.mako:6
-#: mpulsweb/templates/administration/overview_usergroups.mako:6
-#: mpulsweb/templates/administration/reset_password.mako:6
-#: mpulsweb/templates/administration/show_user.mako:5
-#: mpulsweb/templates/administration/show_usergroup.mako:6
-#: mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako:5
-#: mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako:5
-#: mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako:5
-#: mpulsweb/templates/administration/dialogs/failed_delete_user.mako:5
-#: mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako:5
-#: mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako:5
-#: mpulsweb/templates/administration/dialogs/success_delete_user.mako:5
-#: mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako:5
-#: mpulsweb/templates/administration/dialogs/success_edit_user.mako:5
-#: mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako:5
-#: mpulsweb/templates/administration/dialogs/success_new_usergroup.mako:5
-#: mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako:5
-#: mpulsweb/templates/settings/edit.mako:12 mpulsweb/templates/settings/show.mako:7
-#: mpulsweb/templates/settings/dialogs/success_edit.mako:5
-msgid "adm_np_root"
-msgstr ""
-
 #: mpulsweb/templates/administration/delete_user_helper.mako:7
 #: mpulsweb/templates/administration/edit_user.mako:14
 #: mpulsweb/templates/administration/new_user.mako:15
@@ -1117,19 +1119,19 @@
 #: 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
-msgid "adm_np_overview"
+msgid "User overview"
 msgstr ""
 
 #: mpulsweb/templates/administration/delete_user_helper.mako:8
 #: mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako:8
 #: mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako:7
-msgid "adm_np_deleteuser"
+msgid "Delete user"
 msgstr ""
 
 #: mpulsweb/templates/administration/delete_user_helper.mako:9
 #: mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako:9
 #: mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako:8
-msgid "adm_np_deleteuser_helper"
+msgid "Delete helper user"
 msgstr ""
 
 #: mpulsweb/templates/administration/delete_user_helper.mako:13
@@ -1151,20 +1153,17 @@
 #: mpulsweb/templates/administration/show_user.mako:7
 #: mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako:7
 #: mpulsweb/templates/administration/dialogs/success_edit_user.mako:7
-msgid "adm_np_showuser"
+msgid "Show user"
 msgstr ""
 
 #: mpulsweb/templates/administration/edit_user.mako:16
+#: mpulsweb/templates/administration/edit_user.mako:20
 #: mpulsweb/templates/administration/dialogs/success_edit_user.mako:8
-msgid "adm_np_edituser"
+msgid "Edit user"
 msgstr ""
 
-#: mpulsweb/templates/administration/edit_user.mako:20
-msgid "adm_header_edituser"
-msgstr ""
-
 #: mpulsweb/templates/administration/edit_user.mako:25
-msgid "adm_actions_link_userpassreset"
+msgid "Reset user password"
 msgstr ""
 
 #: mpulsweb/templates/administration/edit_user.mako:26
@@ -1234,23 +1233,21 @@
 #: mpulsweb/templates/administration/edit_usergroup.mako:11
 #: mpulsweb/templates/administration/new_usergroup.mako:10
 #: mpulsweb/templates/administration/overview_usergroups.mako:7
+#: mpulsweb/templates/administration/show_usergroup.mako:12
 #: mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako:6
 #: mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako:6
 #: mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako:6
 #: mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako:6
 #: mpulsweb/templates/administration/dialogs/success_new_usergroup.mako:6
-msgid "adm_np_usergroup_overview"
+msgid "Usergroup overview"
 msgstr ""
 
 #: mpulsweb/templates/administration/edit_usergroup.mako:12
+#: mpulsweb/templates/administration/edit_usergroup.mako:16
 #: mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako:7
-msgid "adm_np_editusergroup"
+msgid "Edit usergroup"
 msgstr ""
 
-#: mpulsweb/templates/administration/edit_usergroup.mako:16
-msgid "adm_header_editusergroup"
-msgstr ""
-
 #: mpulsweb/templates/administration/edit_usergroup.mako:21
 #: mpulsweb/templates/administration/new_usergroup.mako:20
 #: mpulsweb/templates/administration/show_usergroup.mako:18
@@ -1280,14 +1277,12 @@
 msgstr ""
 
 #: mpulsweb/templates/administration/new_user.mako:16
+#: mpulsweb/templates/administration/new_user.mako:20
 #: mpulsweb/templates/administration/new_user_result.mako:8
-msgid "adm_np_newuser"
+#: mpulsweb/templates/home/home.mako:14
+msgid "Create new user"
 msgstr ""
 
-#: mpulsweb/templates/administration/new_user.mako:20
-msgid "adm_header_newuser"
-msgstr ""
-
 #: mpulsweb/templates/administration/new_user.mako:75
 msgid "adm_form_user_room"
 msgstr ""
@@ -1366,15 +1361,12 @@
 msgstr ""
 
 #: mpulsweb/templates/administration/new_usergroup.mako:11
+#: mpulsweb/templates/administration/new_usergroup.mako:15
 #: mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako:7
 #: mpulsweb/templates/administration/dialogs/success_new_usergroup.mako:7
-msgid "adm_np_newusergroup"
+msgid "Create new usergroup"
 msgstr ""
 
-#: mpulsweb/templates/administration/new_usergroup.mako:15
-msgid "adm_header_newusergroup"
-msgstr ""
-
 #: mpulsweb/templates/administration/overview_user.mako:13
 msgid "adm_header_overview"
 msgstr ""
@@ -1459,11 +1451,11 @@
 
 #: mpulsweb/templates/administration/reset_password.mako:9
 #: mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako:8
-msgid "adm_np_resetpassword"
+msgid "Reset password"
 msgstr ""
 
 #: mpulsweb/templates/administration/reset_password.mako:15
-msgid "adm_header_resetpassword"
+msgid "User password reset!"
 msgstr ""
 
 #: mpulsweb/templates/administration/reset_password.mako:16
@@ -1545,13 +1537,9 @@
 msgstr ""
 
 #: mpulsweb/templates/administration/show_usergroup.mako:8
-msgid "adm_np_showusergroup"
+msgid "Show usergroup"
 msgstr ""
 
-#: mpulsweb/templates/administration/show_usergroup.mako:12
-msgid "adm_header_showusergroup"
-msgstr ""
-
 #: mpulsweb/templates/administration/show_usergroup.mako:17
 msgid "adm_actions_link_editusergroup"
 msgstr ""
@@ -1560,34 +1548,17 @@
 msgid "group_has_no_member"
 msgstr ""
 
-#: mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako:7
-msgid "adm_np_delteuser"
-msgstr ""
-
-#: mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako:10
-msgid "adm_np_delteuser_success"
-msgstr ""
-
 #: mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako:7
 #: mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako:7
-msgid "adm_np_deleteusergroup"
+msgid "Delete usergroup?"
 msgstr ""
 
-#: mpulsweb/templates/administration/dialogs/failed_delete_user.mako:7
-msgid "adm_np_failed_deleteuser"
-msgstr ""
-
 #: mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako:9
-msgid "adm_np_deleteuser_helper_set_editor"
+msgid "Case document assigned"
 msgstr ""
 
-#: mpulsweb/templates/administration/dialogs/success_delete_user.mako:7
-#: mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako:7
-msgid "adm_np_success_deleteuser"
-msgstr ""
-
 #: mpulsweb/templates/administration/dialogs/success_edit_user.mako:9
-msgid "adm_np_edituser_success"
+msgid "User saved!"
 msgstr ""
 
 #: mpulsweb/templates/appointments/edit.mako:12
@@ -2665,10 +2636,6 @@
 msgid "Under the menu item \"User\" you can"
 msgstr ""
 
-#: mpulsweb/templates/home/home.mako:14
-msgid "Create new user"
-msgstr ""
-
 #: mpulsweb/templates/home/home.mako:15
 msgid "Organise already existing user"
 msgstr ""
@@ -2935,18 +2902,15 @@
 #: mpulsweb/templates/settings/edit.mako:15
 #: mpulsweb/templates/settings/show.mako:10
 #: mpulsweb/templates/settings/dialogs/success_edit.mako:6
-msgid "adm_np_showsettings"
+msgid "Show settings"
 msgstr ""
 
 #: mpulsweb/templates/settings/edit.mako:18
+#: mpulsweb/templates/settings/edit.mako:24
 #: mpulsweb/templates/settings/dialogs/success_edit.mako:7
-msgid "adm_np_editsettings"
+msgid "Edit settings"
 msgstr ""
 
-#: mpulsweb/templates/settings/edit.mako:24
-msgid "adm_header_editsettings"
-msgstr ""
-
 #: mpulsweb/templates/settings/edit.mako:32
 msgid "adm_actions_link_showsettings"
 msgstr ""
@@ -3017,7 +2981,7 @@
 msgstr ""
 
 #: mpulsweb/templates/settings/dialogs/success_edit.mako:8
-msgid "adm_np_editsettings_success"
+msgid "Settings saved!"
 msgstr ""
 
 #: mpulsweb/templates/tags/tags.mako:20
@@ -3125,6 +3089,6 @@
 msgstr ""
 
 #: mpulsweb/templates/usersettings/dialogs/notificate_setpassword.mako:5
-msgid "adm_np_changepassword"
+msgid "Change user password!"
 msgstr ""
 

Modified: base/trunk/mpulsweb/templates/administration/delete_user_helper.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/delete_user_helper.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/delete_user_helper.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -3,10 +3,10 @@
 <%!  import mpulsweb.lib.helper.filters as F %>
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id)}">${_('adm_np_deleteuser')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('adm_np_deleteuser_helper')}</a></li>
+  <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id)}">${_('Delete user')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('Delete helper user')}</a></li>
 </%def>
 <div id="content_header_small">
   <div id="content_ueberschrift">

Modified: base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -2,11 +2,11 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-	<li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
-	<li><a href="#">${_('adm_np_delteuser')}</a></li>
-        <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id)}">${_('adm_np_deleteuser')}</a></li>
-        <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('adm_np_deleteuser_helper')}</a></li>i
-        <li><a href="#">${_('adm_np_delteuser_success')}</a></li>
+	<li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+	<li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+	<li><a href="#">${_('Delete user?')}</a></li>
+        <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id)}">${_('Delete user')}</a></li>
+        <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('Delete helper user')}</a></li>i
+        <li><a href="#">${_('User deleted!')}</a></li>
 </%def>
 <%include file="../../dialogs/confirm.mako" />

Modified: base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -2,8 +2,8 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='deleteUserGroup')}">${_('adm_np_deleteusergroup')}</a></li>
+  <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='deleteUserGroup')}">${_('Delete usergroup?')}</a></li>
 </%def>
 <%include file="../../dialogs/confirm.mako" />

Modified: base/trunk/mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -2,9 +2,9 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-	<li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
-	<li><a href="${h.url_for(controller='/administration', action='showUser')}">${_('adm_np_showuser')}</a></li>
-	<li><a href="#">${_('adm_np_resetpassword')}</a></li>
+	<li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+	<li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+	<li><a href="${h.url_for(controller='/administration', action='showUser')}">${_('Show user')}</a></li>
+	<li><a href="#">${_('Reset password')}</a></li>
 </%def>
 <%include file="../../dialogs/confirm.mako" />

Modified: base/trunk/mpulsweb/templates/administration/dialogs/failed_delete_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/failed_delete_user.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/dialogs/failed_delete_user.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -2,8 +2,8 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/case')}">${_('adm_np_root')}</a></li>
-        <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
-	<li><a href="#">${_('adm_np_failed_deleteuser')}</a></li>
+	<li><a href="${h.url_for(controller='/case')}">${_('Administration')}</a></li>
+        <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+	<li><a href="#">${_('User not deleted!')}</a></li>
 </%def>
 <%include file="../../dialogs/failed.mako" />

Modified: base/trunk/mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -2,8 +2,8 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='newUserGroup')}">${_('adm_np_newusergroup')}</a></li>
+  <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='newUserGroup')}">${_('Create new usergroup')}</a></li>
 </%def>
 <%include file="../../dialogs/failed.mako" />

Modified: base/trunk/mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -2,10 +2,10 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-	<li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
-        <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id)}">${_('adm_np_deleteuser')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('adm_np_deleteuser_helper')}</a></li>
-	<li><a href="#">${_('adm_np_deleteuser_helper_set_editor')}</a></li>
+	<li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+	<li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+        <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id)}">${_('Delete user')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('Delete helper user')}</a></li>
+	<li><a href="#">${_('Case document assigned')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/administration/dialogs/success_delete_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/success_delete_user.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_delete_user.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -2,8 +2,8 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/case')}">${_('adm_np_root')}</a></li>
-        <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
-	<li><a href="#">${_('adm_np_success_deleteuser')}</a></li>
+	<li><a href="${h.url_for(controller='/case')}">${_('Administration')}</a></li>
+        <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+	<li><a href="#">${_('User deleted!')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -2,8 +2,8 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='deleteUserGroup')}">${_('adm_np_deleteusergroup')}</a></li>
+  <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='deleteUserGroup')}">${_('Delete usergroup?')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/administration/dialogs/success_edit_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/success_edit_user.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_edit_user.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -2,10 +2,10 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/case')}">${_('adm_np_root')}</a></li>
-        <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
-        <li><a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}">${_('adm_np_showuser')}</a></li>
-	<li><a href="${h.url_for(controller='/administration', action='editUser')}">${_('adm_np_edituser')}</a></li>
-        <li><a href="#">${_('adm_np_edituser_success')}</a></li>
+	<li><a href="${h.url_for(controller='/case')}">${_('Administration')}</a></li>
+        <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+        <li><a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}">${_('Show user')}</a></li>
+	<li><a href="${h.url_for(controller='/administration', action='editUser')}">${_('Edit user')}</a></li>
+        <li><a href="#">${_('User saved!')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -2,8 +2,8 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='editUserGroup', id=c.group.id)}">${_('adm_np_editusergroup')}</a></li>
+  <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='editUserGroup', id=c.group.id)}">${_('Edit usergroup')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/administration/dialogs/success_new_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/success_new_usergroup.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_new_usergroup.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -2,8 +2,8 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='newUserGroup')}">${_('adm_np_newusergroup')}</a></li>
+  <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='newUserGroup')}">${_('Create new usergroup')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/administration/edit_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/edit_user.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/edit_user.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -10,19 +10,19 @@
 %>
 <%def name="buildNavipath()">
 		${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-	<li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
-        <li><a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}">${_('adm_np_showuser')}</a></li>
-	<li><a href="${h.url_for(controller='/administration', action='editUser')}">${_('adm_np_edituser')}</a></li>
+	<li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+	<li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+        <li><a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}">${_('Show user')}</a></li>
+	<li><a href="${h.url_for(controller='/administration', action='editUser')}">${_('Edit user')}</a></li>
 </%def>
 <div id="content_header_small">
   <div id="content_ueberschrift">
-${_('adm_header_edituser')}
+${_('Edit user')}
   </div>
   <div id="modusfield">
     <div class="actions">
 	<ul>
-		<li> <a href="${h.url_for(controller='/administration', action='resetUserPassword', id=c.uo.id)}"> ${_('adm_actions_link_userpassreset')}</a> </li>
+		<li> <a href="${h.url_for(controller='/administration', action='resetUserPassword', id=c.uo.id)}"> ${_('Reset user password')}</a> </li>
 		<li> <a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}">  ${_('Back to: User overview')} </a></li>
 	</ul>
     </div>

Modified: base/trunk/mpulsweb/templates/administration/edit_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/edit_usergroup.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/edit_usergroup.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -7,13 +7,13 @@
 %>
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='editUserGroup', id=c.group.id)}">${_('adm_np_editusergroup')}</a></li>
+  <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='editUserGroup', id=c.group.id)}">${_('Edit usergroup')}</a></li>
 </%def>
 <div id="content_header_small">
   <div id="content_ueberschrift">
- ${_('adm_header_editusergroup')}
+ ${_('Edit usergroup')}
   </div>
   <div id="modusfield">
     <div class="actions">

Modified: base/trunk/mpulsweb/templates/administration/new_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_user.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/new_user.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -11,13 +11,13 @@
 
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='newUser')}">${_('adm_np_newuser')}</a></li>
+  <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='newUser')}">${_('Create new user')}</a></li>
 </%def>
 
 <div id="content_header_small">
-  <div id="content_ueberschrift">${_('adm_header_newuser')}</div>
+  <div id="content_ueberschrift">${_('Create new user')}</div>
   <div id="modusfield">
     <div class="actions">
       <ul>

Modified: base/trunk/mpulsweb/templates/administration/new_user_result.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_user_result.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/new_user_result.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -3,9 +3,9 @@
 <%!  import mpulsweb.lib.helper.filters as F %>
 <%def name="buildNavipath()">
 		${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-	<li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
-	<li><a href="${h.url_for(controller='/administration', action='newUser')}">${_('adm_np_newuser')}</a></li>
+	<li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+	<li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+	<li><a href="${h.url_for(controller='/administration', action='newUser')}">${_('Create new user')}</a></li>
 </%def>
 <div id="content_header_small">
   <div id="content_ueberschrift">

Modified: base/trunk/mpulsweb/templates/administration/new_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_usergroup.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/new_usergroup.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -6,13 +6,13 @@
 %>
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='newUserGroup')}">${_('adm_np_newusergroup')}</a></li>
+  <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='newUserGroup')}">${_('Create new usergroup')}</a></li>
 </%def>
 <div id="content_header_small">
   <div id="content_ueberschrift">
- ${_('adm_header_newusergroup')}
+ ${_('Create new usergroup')}
   </div>
   <div id="modusfield">
     <div class="actions">

Modified: base/trunk/mpulsweb/templates/administration/overview_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/overview_user.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/overview_user.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -3,8 +3,8 @@
 <%!  import mpulsweb.lib.helper.filters as F %>
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
+  <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
 </%def>
 
 

Modified: base/trunk/mpulsweb/templates/administration/overview_usergroups.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/overview_usergroups.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/overview_usergroups.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -3,8 +3,8 @@
 <%!  import mpulsweb.lib.helper.filters as F %>
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
+  <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
 </%def>
 
 

Modified: base/trunk/mpulsweb/templates/administration/reset_password.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/reset_password.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/reset_password.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -3,16 +3,16 @@
 <%!  import mpulsweb.lib.helper.filters as F %>
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-	<li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
-	<li><a href="${h.url_for(controller='/administration', action='showUser')}">${_('adm_np_showuser')}</a></li>
-	<li><a href="#">${_('adm_np_resetpassword')}</a></li>
+	<li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+	<li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+	<li><a href="${h.url_for(controller='/administration', action='showUser')}">${_('Show user')}</a></li>
+	<li><a href="#">${_('Reset password')}</a></li>
 </%def>
 <div class="dialog">
 <h1><img src="${h.url_for('/images/icons/info/confirmation.png')}"
     alt="Bestäntigung"
     width="48"
-    height="48"> ${_('adm_header_resetpassword')}</h1>
+    height="48"> ${_('User password reset!')}</h1>
 <p>${_('adm_con_rp_the_password')} <strong>${c.uo.first_name| F.NA} ${c.uo.last_name| F.NA}</strong> ${_('adm_con_rp_has_been_changed')}<br>
 ${_('adm_con_rp_new_pw')} <strong>${h.literal(c.new_password)}</strong></p>
 <a class="button" href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_con_rp_to_useroverview')}</a>

Modified: base/trunk/mpulsweb/templates/administration/show_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/show_user.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/show_user.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -2,9 +2,9 @@
 <%inherit file="../main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}">${_('adm_np_showuser')}</a></li>
+  <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}">${_('Show user')}</a></li>
 </%def>
 <div id="content_header_small">
   <div id="content_ueberschrift">

Modified: base/trunk/mpulsweb/templates/administration/show_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/show_usergroup.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/administration/show_usergroup.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -3,13 +3,13 @@
 <%inherit file="../main.mako" />
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
-  <li><a href="${h.url_for(controller='/administration', action='showUserGroup', id=c.group.id)}">${_('adm_np_showusergroup')}</a></li>
+  <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+  <li><a href="${h.url_for(controller='/administration', action='showUserGroup', id=c.group.id)}">${_('Show usergroup')}</a></li>
 </%def>
 <div id="content_header_small">
   <div id="content_ueberschrift">
- ${_('adm_header_showusergroup')}
+ ${_('Usergroup overview')}
   </div>
   <div id="modusfield">
     <div class="actions">

Modified: base/trunk/mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/appointments/dialogs/failed_delete_appointment.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -2,8 +2,8 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/case')}">${_('adm_np_root')}</a></li>
-        <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
-	<li><a href="#">${_('adm_np_success_deleteuser')}</a></li>
+	<li><a href="${h.url_for(controller='/case')}">${_('Administration')}</a></li>
+        <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+	<li><a href="#">${_('User deleted!')}</a></li>
 </%def>
 <%include file="../../dialogs/failed.mako" />

Modified: base/trunk/mpulsweb/templates/settings/dialogs/success_edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/dialogs/success_edit.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/settings/dialogs/success_edit.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -2,9 +2,9 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
-	<li><a href="${h.url_for(controller='/administration', action='showSettings')}">${_('adm_np_showsettings')}</a></li>
-        <li><a href="${h.url_for(controller='/administration', action='editSettings')}">${_('adm_np_editsettings')}</a></li>
-        <li><a href="#">${_('adm_np_editsettings_success')}</a></li>
+        <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
+	<li><a href="${h.url_for(controller='/administration', action='showSettings')}">${_('Show settings')}</a></li>
+        <li><a href="${h.url_for(controller='/administration', action='editSettings')}">${_('Edit settings')}</a></li>
+        <li><a href="#">${_('Settings saved!')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/settings/edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/edit.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/settings/edit.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -9,19 +9,19 @@
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
   <li>
-    <a href="${h.url_for(controller='/settings')}">${_('adm_np_root')}</a>
+    <a href="${h.url_for(controller='/settings')}">${_('Administration')}</a>
   </li>
   <li>
-    <a href="${h.url_for(controller='/settings', action='show')}">${_('adm_np_showsettings')}</a>
+    <a href="${h.url_for(controller='/settings', action='show')}">${_('Show settings')}</a>
   </li>
   <li>
-    <a href="${h.url_for(controller='/settings', action='edit')}">${_('adm_np_editsettings')}</a>
+    <a href="${h.url_for(controller='/settings', action='edit')}">${_('Edit settings')}</a>
   </li>
 </%def>
 
 <div id="content_header_small">
   <div id="content_ueberschrift">
-    ${_('adm_header_editsettings')}
+    ${_('Edit settings')}
   </div>
   <div id="modusfield">
     <div class="actions">

Modified: base/trunk/mpulsweb/templates/settings/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/show.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/settings/show.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -4,10 +4,10 @@
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
   <li>
-    <a href="${h.url_for(controller='/settings')}">${_('adm_np_root')}</a>
+    <a href="${h.url_for(controller='/settings')}">${_('Administration')}</a>
   </li>
   <li>
-    <a href="${h.url_for(controller='/settings', action='show')}">${_('adm_np_showsettings')}</a>
+    <a href="${h.url_for(controller='/settings', action='show')}">${_('Show settings')}</a>
   </li>
 </%def>
 

Modified: base/trunk/mpulsweb/templates/usersettings/dialogs/notificate_setpassword.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/dialogs/notificate_setpassword.mako	2011-02-17 14:33:59 UTC (rev 4645)
+++ base/trunk/mpulsweb/templates/usersettings/dialogs/notificate_setpassword.mako	2011-02-18 11:59:37 UTC (rev 4646)
@@ -2,6 +2,6 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="#">${_('adm_np_changepassword')}</a></li>
+	<li><a href="#">${_('Change user password!')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

More information about the Mpuls-commits mailing list