[Mpuls-commits] r4652 - in base/trunk: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/templates/administration mpulsweb/templates/settings mpulsweb/templates/usersettings
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Feb 18 15:44:10 CET 2011
Author: ludwig
Date: 2011-02-18 15:44:08 +0100 (Fri, 18 Feb 2011)
New Revision: 4652
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
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/show_user_body.mako
base/trunk/mpulsweb/templates/administration/show_usergroup.mako
base/trunk/mpulsweb/templates/settings/edit.mako
base/trunk/mpulsweb/templates/settings/show.mako
base/trunk/mpulsweb/templates/usersettings/change_password.mako
base/trunk/mpulsweb/templates/usersettings/change_password_login.mako
Log:
update of the msgids (part 7)
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2011-02-18 14:02:46 UTC (rev 4651)
+++ base/trunk/ChangeLog 2011-02-18 14:44:08 UTC (rev 4652)
@@ -2,6 +2,22 @@
* mpulsweb/i18n/mpulsweb.pot
mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
+ mpulsweb/templates/administration/show_user_body.mako
+ mpulsweb/templates/administration/show_usergroup.mako
+ mpulsweb/templates/administration/edit_usergroup.mako
+ mpulsweb/templates/administration/edit_user.mako
+ mpulsweb/templates/administration/new_usergroup.mako
+ mpulsweb/templates/administration/new_user_result.mako
+ mpulsweb/templates/administration/new_user.mako
+ mpulsweb/templates/usersettings/change_password_login.mako
+ mpulsweb/templates/usersettings/change_password.mako
+ mpulsweb/templates/settings/show.mako
+ mpulsweb/templates/settings/edit.mako: Update of the msgids(part 7)
+
+2011-02-18 Ludwig Reiter <ludwig.reiter at intevation.de>
+
+ * mpulsweb/i18n/mpulsweb.pot
+ mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
mpulsweb/templates/administration/delete_user_helper.mako
mpulsweb/templates/casebundle/editor.mako
mpulsweb/templates/casemanagement/organisation.mako:
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-02-18 14:02:46 UTC (rev 4651)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-02-18 14:44:08 UTC (rev 4652)
@@ -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-18 14:38+0100\n"
+"PO-Revision-Date: 2011-02-18 15:40+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"
@@ -86,6 +86,8 @@
"zu kehren."
#: mpulsweb/controllers/administration.py:37
+#: mpulsweb/templates/settings/edit.mako:79
+#: mpulsweb/templates/settings/show.mako:60
msgid "Assign case document"
msgstr "Fallakten übertragen"
@@ -1371,57 +1373,63 @@
#: mpulsweb/templates/administration/new_user.mako:40
#: mpulsweb/templates/administration/new_user_result.mako:22
#: mpulsweb/templates/administration/show_user_body.mako:2
-msgid "adm_form_legend_personal"
+msgid "Information about personal"
msgstr "Angaben zur Person"
#: mpulsweb/templates/administration/edit_user.mako:45
#: mpulsweb/templates/administration/edit_user.mako:48
#: mpulsweb/templates/administration/new_user.mako:44
#: mpulsweb/templates/administration/new_user.mako:50
-msgid "adm_form_user_firstname"
+#: mpulsweb/templates/administration/new_user_result.mako:26
+#: mpulsweb/templates/administration/show_user_body.mako:5
+msgid "Forename"
msgstr "Vorname"
#: mpulsweb/templates/administration/edit_user.mako:55
#: mpulsweb/templates/administration/edit_user.mako:58
#: mpulsweb/templates/administration/new_user.mako:58
#: mpulsweb/templates/administration/new_user.mako:64
-msgid "adm_form_user_lastname"
+msgid "Surname"
msgstr "Nachname"
#: mpulsweb/templates/administration/edit_user.mako:66
#: mpulsweb/templates/administration/new_user.mako:70
-msgid "adm_form_user_telephone"
+#: mpulsweb/templates/administration/new_user_result.mako:34
+#: mpulsweb/templates/administration/show_user_body.mako:13
+msgid "Phone"
msgstr "Telefon"
#: mpulsweb/templates/administration/edit_user.mako:70
-msgid "adm_form_user_roomnumer"
+#: mpulsweb/templates/administration/new_user_result.mako:38
+#: mpulsweb/templates/administration/show_user_body.mako:17
+msgid "Roomnumber"
msgstr "Raumnummer"
#: mpulsweb/templates/administration/edit_user.mako:76
#: mpulsweb/templates/administration/new_user.mako:79
-msgid "adm_form_user_branchoffice"
+msgid "Branchoffice"
msgstr "Filiale"
#: mpulsweb/templates/administration/edit_user.mako:85
#: mpulsweb/templates/administration/new_user.mako:85
#: mpulsweb/templates/administration/new_user_result.mako:46
#: mpulsweb/templates/usersettings/change_password_login.mako:17
-msgid "adm_form_legend_login"
+msgid "Information about login"
msgstr "Angaben zum Konto"
#: mpulsweb/templates/administration/edit_user.mako:103
#: mpulsweb/templates/administration/new_user.mako:112
-msgid "adm_form_user_activated"
+msgid "User is allowed to activate"
msgstr "Benutzer darf sich anmelden"
#: mpulsweb/templates/administration/edit_user.mako:111
#: mpulsweb/templates/administration/new_user.mako:116
-msgid "adm_form_user_newpass"
+msgid "User must set password at next login."
msgstr "Benutzer muss bei der nächsten Anmeldung das Passwort setzen"
#: mpulsweb/templates/administration/edit_user.mako:114
#: mpulsweb/templates/administration/new_user.mako:119
-msgid "adm_form_user_submit"
+msgid "Save user"
msgstr "Benutzer speichern"
#: mpulsweb/templates/administration/edit_usergroup.mako:11
@@ -1450,24 +1458,24 @@
#: mpulsweb/templates/administration/edit_usergroup.mako:33
#: mpulsweb/templates/administration/new_usergroup.mako:32
-msgid "adm_form_legend_groupdata"
+msgid "Information about usergroup"
msgstr "Angaben zur Benutzergruppe"
#: mpulsweb/templates/administration/edit_usergroup.mako:36
#: mpulsweb/templates/administration/edit_usergroup.mako:39
#: mpulsweb/templates/administration/new_usergroup.mako:35
#: mpulsweb/templates/administration/new_usergroup.mako:38
-msgid "adm_form_usergroup_name"
+msgid "Usergroup name"
msgstr "Benutzergruppenname"
#: mpulsweb/templates/administration/edit_usergroup.mako:44
#: mpulsweb/templates/administration/show_usergroup.mako:25
-msgid "adm_form_legende_groupmember"
+msgid "Memebr of a group"
msgstr "Mitglieder der Gruppe"
#: mpulsweb/templates/administration/edit_usergroup.mako:73
#: mpulsweb/templates/administration/new_usergroup.mako:43
-msgid "adm_form_usergroup_submit"
+msgid "Save usergroup"
msgstr "Benutzergruppe speichern"
#: mpulsweb/templates/administration/new_user.mako:16
@@ -1478,82 +1486,75 @@
msgstr "Neuen Benutzer anlegen"
#: mpulsweb/templates/administration/new_user.mako:75
-msgid "adm_form_user_room"
+msgid "Room"
msgstr "Raumnummer"
#: mpulsweb/templates/administration/new_user.mako:89
#: mpulsweb/templates/administration/new_user.mako:95
-msgid "adm_form_user_login"
+#: mpulsweb/templates/administration/new_user_result.mako:49
+#: mpulsweb/templates/administration/show_user_body.mako:34
+#: mpulsweb/templates/auth/login.mako:58
+msgid "Login"
msgstr "Anmeldekennung"
#: mpulsweb/templates/administration/new_user.mako:101
-msgid "adm_form_user_role"
+msgid "User role"
msgstr "Benutzerrolle"
#: mpulsweb/templates/administration/new_user_result.mako:12
-msgid "adm_header_newuser_Result"
+msgid "User data of the new created user"
msgstr "Benutzerdaten des neu angelegten Benutzers"
#: mpulsweb/templates/administration/new_user_result.mako:23
-msgid "adm_form_new_user_notice"
+msgid "Please give login name and password to the user."
msgstr "Bitte geben Sie Anmeldekennung und Passwort an den neuen Nutzer weiter."
-#: mpulsweb/templates/administration/new_user_result.mako:26
-msgid "adm_form_label_forename"
-msgstr "Vorname"
-
#: mpulsweb/templates/administration/new_user_result.mako:30
-msgid "adm_form_label_name"
+#: mpulsweb/templates/administration/show_user_body.mako:9
+#: mpulsweb/templates/evaluation/evaluate.mako:26
+msgid "Name"
msgstr "Name"
-#: mpulsweb/templates/administration/new_user_result.mako:34
-msgid "adm_form_label_phone"
-msgstr "Telefon"
-
-#: mpulsweb/templates/administration/new_user_result.mako:38
-msgid "adm_form_label_room"
-msgstr "Raumnummer"
-
#: mpulsweb/templates/administration/new_user_result.mako:42
-msgid "adm_form_label_agency"
+#: mpulsweb/templates/administration/show_user_body.mako:21
+msgid "Institution"
msgstr "Einrichtung"
-#: mpulsweb/templates/administration/new_user_result.mako:49
-msgid "adm_form_label_login"
-msgstr "Anmeldekennung"
-
#: mpulsweb/templates/administration/new_user_result.mako:53
-msgid "adm_form_label_password"
+msgid "Password"
msgstr "Passwort"
#: mpulsweb/templates/administration/new_user_result.mako:57
-msgid "adm_form_label_role"
+#: mpulsweb/templates/administration/show_user_body.mako:38
+msgid "Role"
msgstr "Rolle"
#: mpulsweb/templates/administration/new_user_result.mako:61
-msgid "adm_form_label_activated"
+#: mpulsweb/templates/administration/show_user_body.mako:43
+msgid "Activated"
msgstr "Aktiviert"
#: mpulsweb/templates/administration/new_user_result.mako:64
-msgid "adm_form_is_activated_yes"
+#: 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/evaluation/evaluate.mako:68
+#: mpulsweb/templates/settings/show.mako:63
+msgid "Yes"
msgstr "Ja"
#: mpulsweb/templates/administration/new_user_result.mako:66
-msgid "adm_form_is_activated_no"
+#: 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/settings/show.mako:65
+msgid "No"
msgstr "Nein"
#: mpulsweb/templates/administration/new_user_result.mako:71
-msgid "adm_form_label_login_pw"
+msgid "Ask for password at login"
msgstr "Bei Anmeldung neues Passwort verlangen"
-#: mpulsweb/templates/administration/new_user_result.mako:74
-msgid "adm_form_needs_pw_yes"
-msgstr "Ja"
-
-#: mpulsweb/templates/administration/new_user_result.mako:76
-msgid "adm_form_needs_pw_no"
-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
@@ -1676,58 +1677,16 @@
msgid "adm_actions_link_edituser"
msgstr "In Bearbeitung nehmen"
-#: mpulsweb/templates/administration/show_user_body.mako:5
-msgid "adm_form_table_forename"
-msgstr "Vorname"
-
-#: mpulsweb/templates/administration/show_user_body.mako:9
-msgid "adm_form_table_name"
-msgstr "Name"
-
-#: mpulsweb/templates/administration/show_user_body.mako:13
-msgid "adm_form_table_phone"
-msgstr "Telefon"
-
-#: mpulsweb/templates/administration/show_user_body.mako:17
-msgid "adm_form_table_room"
-msgstr "Raumnummer"
-
-#: mpulsweb/templates/administration/show_user_body.mako:21
-msgid "adm_form_table_agency"
-msgstr "Einrichtung"
-
#: mpulsweb/templates/administration/show_user_body.mako:26
-msgid "adm_form_table_replace"
+msgid "Replace"
msgstr "Vertretung"
#: mpulsweb/templates/administration/show_user_body.mako:31
-msgid "adm_form_header_login"
+msgid "Login settings"
msgstr "Angaben zum Konto"
-#: mpulsweb/templates/administration/show_user_body.mako:34
-msgid "adm_form_table_login"
-msgstr "Anmeldekennung"
-
-#: mpulsweb/templates/administration/show_user_body.mako:38
-msgid "adm_form_table_role"
-msgstr "Rolle"
-
-#: mpulsweb/templates/administration/show_user_body.mako:43
-msgid "adm_form_table_activated"
-msgstr "Aktiviert"
-
-#: mpulsweb/templates/administration/show_user_body.mako:46
-#: mpulsweb/templates/administration/show_user_body.mako:56
-msgid "adm_form_table_yes"
-msgstr "Ja"
-
-#: mpulsweb/templates/administration/show_user_body.mako:48
-#: mpulsweb/templates/administration/show_user_body.mako:58
-msgid "adm_form_table_no"
-msgstr "Nein"
-
#: mpulsweb/templates/administration/show_user_body.mako:53
-msgid "adm_form_label_new_login_new_pw"
+msgid "Ask for new password at login"
msgstr "Bei Anmeldung neues Passwort verlangen"
#: mpulsweb/templates/administration/show_usergroup.mako:8
@@ -1961,10 +1920,6 @@
msgid "login_label_pw"
msgstr "Passwort:"
-#: mpulsweb/templates/auth/login.mako:58
-msgid "Login"
-msgstr "Anmelden"
-
#: mpulsweb/templates/auth/logout.mako:3
#, python-format
msgid "%s Abmeldung"
@@ -2739,10 +2694,6 @@
msgid "Evaluation configuration"
msgstr "Auswertungskonfiguration"
-#: mpulsweb/templates/evaluation/evaluate.mako:26
-msgid "Name"
-msgstr "Name"
-
#: mpulsweb/templates/evaluation/evaluate.mako:30
msgid "Description"
msgstr "Beschreibung"
@@ -2752,10 +2703,6 @@
msgstr "Filter"
#: mpulsweb/templates/evaluation/evaluate.mako:68
-msgid "Yes"
-msgstr "Ja"
-
-#: mpulsweb/templates/evaluation/evaluate.mako:68
msgid "Reset"
msgstr "Zurücksetzen"
@@ -3115,19 +3062,19 @@
#: mpulsweb/templates/settings/edit.mako:4
#: mpulsweb/templates/settings/edit.mako:48
#: mpulsweb/templates/settings/show.mako:35
-msgid "adm_form_settings_kaname"
+msgid "Name of the institution"
msgstr "Name der Einrichtung"
#: mpulsweb/templates/settings/edit.mako:5
#: mpulsweb/templates/settings/edit.mako:56
#: mpulsweb/templates/settings/show.mako:48
-msgid "adm_form_settings_fkz"
+msgid "Formular number of the institution"
msgstr "Antragsnummer der Einrichtung"
#: mpulsweb/templates/settings/edit.mako:6
#: mpulsweb/templates/settings/edit.mako:64
#: mpulsweb/templates/settings/show.mako:52
-msgid "adm_form_settings_max_savetime"
+msgid "Automatic review after days"
msgstr "Automatische Wiedervorlage nach Tagen"
#: mpulsweb/templates/settings/edit.mako:15
@@ -3156,7 +3103,7 @@
#: mpulsweb/templates/settings/edit.mako:52
#: mpulsweb/templates/settings/show.mako:42
-msgid "adm_form_settings_kaadress"
+msgid "Address of the institution"
msgstr "Adresse der Einrichtung"
#: mpulsweb/templates/settings/edit.mako:61
@@ -3175,11 +3122,6 @@
"Kriterium kann es weitere Bedingungen geben ab wann eine Wiedervorlage "
"erstellt wird. Weitere Bedingungen: %s"
-#: mpulsweb/templates/settings/edit.mako:79
-#: mpulsweb/templates/settings/show.mako:60
-msgid "adm_form_settings_anontransfer"
-msgstr "Fallakten übermitteln"
-
#: mpulsweb/templates/settings/edit.mako:82
msgid ""
"If this option is activated, anonymized cases are transmitted for "
@@ -3192,7 +3134,7 @@
" Adressen."
#: mpulsweb/templates/settings/edit.mako:87
-msgid "adm_form_settings_save"
+msgid "Save settings"
msgstr "Einstellungen speichern"
#: mpulsweb/templates/settings/show.mako:16
@@ -3211,14 +3153,6 @@
msgid "additional conditions for reminders"
msgstr "Weitere Bedingungen für automatische Wiedervorlagen"
-#: mpulsweb/templates/settings/show.mako:63
-msgid "adm_form_settings_anontransfer_yes"
-msgstr "Ja"
-
-#: mpulsweb/templates/settings/show.mako:65
-msgid "adm_form_settings_anontransfer_no"
-msgstr "Nein"
-
#: mpulsweb/templates/settings/dialogs/success_edit.mako:8
msgid "Settings saved!"
msgstr "Einstellungen gespeichert!"
@@ -3258,19 +3192,19 @@
#: mpulsweb/templates/usersettings/change_password.mako:37
#: mpulsweb/templates/usersettings/change_password_login.mako:20
#: mpulsweb/templates/usersettings/change_password_login.mako:23
-msgid "adm_form_newuser_passwd"
+msgid "Enter new password"
msgstr "Neues Passwort eingeben"
#: mpulsweb/templates/usersettings/change_password.mako:43
#: mpulsweb/templates/usersettings/change_password.mako:46
#: mpulsweb/templates/usersettings/change_password_login.mako:29
#: mpulsweb/templates/usersettings/change_password_login.mako:32
-msgid "adm_form_newuser_passwd_confirm"
+msgid "Repeat pasword"
msgstr "Neues Passwort wiederholen"
#: mpulsweb/templates/usersettings/change_password.mako:53
#: mpulsweb/templates/usersettings/change_password_login.mako:38
-msgid "adm_form_changepassword_submit"
+msgid "Save"
msgstr "Speichern"
#: mpulsweb/templates/usersettings/change_password_login.mako:5
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-02-18 14:02:46 UTC (rev 4651)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-02-18 14:44:08 UTC (rev 4652)
@@ -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-18 14:38+0100\n"
+"POT-Creation-Date: 2011-02-18 15:40+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"
@@ -75,6 +75,8 @@
msgstr ""
#: mpulsweb/controllers/administration.py:37
+#: mpulsweb/templates/settings/edit.mako:79
+#: mpulsweb/templates/settings/show.mako:60
msgid "Assign case document"
msgstr ""
@@ -1178,57 +1180,63 @@
#: mpulsweb/templates/administration/new_user.mako:40
#: mpulsweb/templates/administration/new_user_result.mako:22
#: mpulsweb/templates/administration/show_user_body.mako:2
-msgid "adm_form_legend_personal"
+msgid "Information about personal"
msgstr ""
#: mpulsweb/templates/administration/edit_user.mako:45
#: mpulsweb/templates/administration/edit_user.mako:48
#: mpulsweb/templates/administration/new_user.mako:44
#: mpulsweb/templates/administration/new_user.mako:50
-msgid "adm_form_user_firstname"
+#: mpulsweb/templates/administration/new_user_result.mako:26
+#: mpulsweb/templates/administration/show_user_body.mako:5
+msgid "Forename"
msgstr ""
#: mpulsweb/templates/administration/edit_user.mako:55
#: mpulsweb/templates/administration/edit_user.mako:58
#: mpulsweb/templates/administration/new_user.mako:58
#: mpulsweb/templates/administration/new_user.mako:64
-msgid "adm_form_user_lastname"
+msgid "Surname"
msgstr ""
#: mpulsweb/templates/administration/edit_user.mako:66
#: mpulsweb/templates/administration/new_user.mako:70
-msgid "adm_form_user_telephone"
+#: mpulsweb/templates/administration/new_user_result.mako:34
+#: mpulsweb/templates/administration/show_user_body.mako:13
+msgid "Phone"
msgstr ""
#: mpulsweb/templates/administration/edit_user.mako:70
-msgid "adm_form_user_roomnumer"
+#: mpulsweb/templates/administration/new_user_result.mako:38
+#: mpulsweb/templates/administration/show_user_body.mako:17
+msgid "Roomnumber"
msgstr ""
#: mpulsweb/templates/administration/edit_user.mako:76
#: mpulsweb/templates/administration/new_user.mako:79
-msgid "adm_form_user_branchoffice"
+msgid "Branchoffice"
msgstr ""
#: mpulsweb/templates/administration/edit_user.mako:85
#: mpulsweb/templates/administration/new_user.mako:85
#: mpulsweb/templates/administration/new_user_result.mako:46
#: mpulsweb/templates/usersettings/change_password_login.mako:17
-msgid "adm_form_legend_login"
+msgid "Information about login"
msgstr ""
#: mpulsweb/templates/administration/edit_user.mako:103
#: mpulsweb/templates/administration/new_user.mako:112
-msgid "adm_form_user_activated"
+msgid "User is allowed to activate"
msgstr ""
#: mpulsweb/templates/administration/edit_user.mako:111
#: mpulsweb/templates/administration/new_user.mako:116
-msgid "adm_form_user_newpass"
+msgid "User must set password at next login."
msgstr ""
#: mpulsweb/templates/administration/edit_user.mako:114
#: mpulsweb/templates/administration/new_user.mako:119
-msgid "adm_form_user_submit"
+msgid "Save user"
msgstr ""
#: mpulsweb/templates/administration/edit_usergroup.mako:11
@@ -1257,24 +1265,24 @@
#: mpulsweb/templates/administration/edit_usergroup.mako:33
#: mpulsweb/templates/administration/new_usergroup.mako:32
-msgid "adm_form_legend_groupdata"
+msgid "Information about usergroup"
msgstr ""
#: mpulsweb/templates/administration/edit_usergroup.mako:36
#: mpulsweb/templates/administration/edit_usergroup.mako:39
#: mpulsweb/templates/administration/new_usergroup.mako:35
#: mpulsweb/templates/administration/new_usergroup.mako:38
-msgid "adm_form_usergroup_name"
+msgid "Usergroup name"
msgstr ""
#: mpulsweb/templates/administration/edit_usergroup.mako:44
#: mpulsweb/templates/administration/show_usergroup.mako:25
-msgid "adm_form_legende_groupmember"
+msgid "Memebr of a group"
msgstr ""
#: mpulsweb/templates/administration/edit_usergroup.mako:73
#: mpulsweb/templates/administration/new_usergroup.mako:43
-msgid "adm_form_usergroup_submit"
+msgid "Save usergroup"
msgstr ""
#: mpulsweb/templates/administration/new_user.mako:16
@@ -1285,82 +1293,75 @@
msgstr ""
#: mpulsweb/templates/administration/new_user.mako:75
-msgid "adm_form_user_room"
+msgid "Room"
msgstr ""
#: mpulsweb/templates/administration/new_user.mako:89
#: mpulsweb/templates/administration/new_user.mako:95
-msgid "adm_form_user_login"
+#: mpulsweb/templates/administration/new_user_result.mako:49
+#: mpulsweb/templates/administration/show_user_body.mako:34
+#: mpulsweb/templates/auth/login.mako:58
+msgid "Login"
msgstr ""
#: mpulsweb/templates/administration/new_user.mako:101
-msgid "adm_form_user_role"
+msgid "User role"
msgstr ""
#: mpulsweb/templates/administration/new_user_result.mako:12
-msgid "adm_header_newuser_Result"
+msgid "User data of the new created user"
msgstr ""
#: mpulsweb/templates/administration/new_user_result.mako:23
-msgid "adm_form_new_user_notice"
+msgid "Please give login name and password to the user."
msgstr ""
-#: mpulsweb/templates/administration/new_user_result.mako:26
-msgid "adm_form_label_forename"
-msgstr ""
-
#: mpulsweb/templates/administration/new_user_result.mako:30
-msgid "adm_form_label_name"
+#: mpulsweb/templates/administration/show_user_body.mako:9
+#: mpulsweb/templates/evaluation/evaluate.mako:26
+msgid "Name"
msgstr ""
-#: mpulsweb/templates/administration/new_user_result.mako:34
-msgid "adm_form_label_phone"
-msgstr ""
-
-#: mpulsweb/templates/administration/new_user_result.mako:38
-msgid "adm_form_label_room"
-msgstr ""
-
#: mpulsweb/templates/administration/new_user_result.mako:42
-msgid "adm_form_label_agency"
+#: mpulsweb/templates/administration/show_user_body.mako:21
+msgid "Institution"
msgstr ""
-#: mpulsweb/templates/administration/new_user_result.mako:49
-msgid "adm_form_label_login"
-msgstr ""
-
#: mpulsweb/templates/administration/new_user_result.mako:53
-msgid "adm_form_label_password"
+msgid "Password"
msgstr ""
#: mpulsweb/templates/administration/new_user_result.mako:57
-msgid "adm_form_label_role"
+#: mpulsweb/templates/administration/show_user_body.mako:38
+msgid "Role"
msgstr ""
#: mpulsweb/templates/administration/new_user_result.mako:61
-msgid "adm_form_label_activated"
+#: mpulsweb/templates/administration/show_user_body.mako:43
+msgid "Activated"
msgstr ""
#: mpulsweb/templates/administration/new_user_result.mako:64
-msgid "adm_form_is_activated_yes"
+#: 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/evaluation/evaluate.mako:68
+#: mpulsweb/templates/settings/show.mako:63
+msgid "Yes"
msgstr ""
#: mpulsweb/templates/administration/new_user_result.mako:66
-msgid "adm_form_is_activated_no"
+#: 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/settings/show.mako:65
+msgid "No"
msgstr ""
#: mpulsweb/templates/administration/new_user_result.mako:71
-msgid "adm_form_label_login_pw"
+msgid "Ask for password at login"
msgstr ""
-#: mpulsweb/templates/administration/new_user_result.mako:74
-msgid "adm_form_needs_pw_yes"
-msgstr ""
-
-#: mpulsweb/templates/administration/new_user_result.mako:76
-msgid "adm_form_needs_pw_no"
-msgstr ""
-
#: mpulsweb/templates/administration/new_usergroup.mako:11
#: mpulsweb/templates/administration/new_usergroup.mako:15
#: mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako:7
@@ -1483,58 +1484,16 @@
msgid "adm_actions_link_edituser"
msgstr ""
-#: mpulsweb/templates/administration/show_user_body.mako:5
-msgid "adm_form_table_forename"
-msgstr ""
-
-#: mpulsweb/templates/administration/show_user_body.mako:9
-msgid "adm_form_table_name"
-msgstr ""
-
-#: mpulsweb/templates/administration/show_user_body.mako:13
-msgid "adm_form_table_phone"
-msgstr ""
-
-#: mpulsweb/templates/administration/show_user_body.mako:17
-msgid "adm_form_table_room"
-msgstr ""
-
-#: mpulsweb/templates/administration/show_user_body.mako:21
-msgid "adm_form_table_agency"
-msgstr ""
-
#: mpulsweb/templates/administration/show_user_body.mako:26
-msgid "adm_form_table_replace"
+msgid "Replace"
msgstr ""
#: mpulsweb/templates/administration/show_user_body.mako:31
-msgid "adm_form_header_login"
+msgid "Login settings"
msgstr ""
-#: mpulsweb/templates/administration/show_user_body.mako:34
-msgid "adm_form_table_login"
-msgstr ""
-
-#: mpulsweb/templates/administration/show_user_body.mako:38
-msgid "adm_form_table_role"
-msgstr ""
-
-#: mpulsweb/templates/administration/show_user_body.mako:43
-msgid "adm_form_table_activated"
-msgstr ""
-
-#: mpulsweb/templates/administration/show_user_body.mako:46
-#: mpulsweb/templates/administration/show_user_body.mako:56
-msgid "adm_form_table_yes"
-msgstr ""
-
-#: mpulsweb/templates/administration/show_user_body.mako:48
-#: mpulsweb/templates/administration/show_user_body.mako:58
-msgid "adm_form_table_no"
-msgstr ""
-
#: mpulsweb/templates/administration/show_user_body.mako:53
-msgid "adm_form_label_new_login_new_pw"
+msgid "Ask for new password at login"
msgstr ""
#: mpulsweb/templates/administration/show_usergroup.mako:8
@@ -1765,10 +1724,6 @@
msgid "login_label_pw"
msgstr ""
-#: mpulsweb/templates/auth/login.mako:58
-msgid "Login"
-msgstr ""
-
#: mpulsweb/templates/auth/logout.mako:3
#, python-format
msgid "%s Abmeldung"
@@ -2526,10 +2481,6 @@
msgid "Evaluation configuration"
msgstr ""
-#: mpulsweb/templates/evaluation/evaluate.mako:26
-msgid "Name"
-msgstr ""
-
#: mpulsweb/templates/evaluation/evaluate.mako:30
msgid "Description"
msgstr ""
@@ -2539,10 +2490,6 @@
msgstr ""
#: mpulsweb/templates/evaluation/evaluate.mako:68
-msgid "Yes"
-msgstr ""
-
-#: mpulsweb/templates/evaluation/evaluate.mako:68
msgid "Reset"
msgstr ""
@@ -2883,17 +2830,17 @@
#: mpulsweb/templates/settings/edit.mako:4 mpulsweb/templates/settings/edit.mako:48
#: mpulsweb/templates/settings/show.mako:35
-msgid "adm_form_settings_kaname"
+msgid "Name of the institution"
msgstr ""
#: mpulsweb/templates/settings/edit.mako:5 mpulsweb/templates/settings/edit.mako:56
#: mpulsweb/templates/settings/show.mako:48
-msgid "adm_form_settings_fkz"
+msgid "Formular number of the institution"
msgstr ""
#: mpulsweb/templates/settings/edit.mako:6 mpulsweb/templates/settings/edit.mako:64
#: mpulsweb/templates/settings/show.mako:52
-msgid "adm_form_settings_max_savetime"
+msgid "Automatic review after days"
msgstr ""
#: mpulsweb/templates/settings/edit.mako:15
@@ -2922,7 +2869,7 @@
#: mpulsweb/templates/settings/edit.mako:52
#: mpulsweb/templates/settings/show.mako:42
-msgid "adm_form_settings_kaadress"
+msgid "Address of the institution"
msgstr ""
#: mpulsweb/templates/settings/edit.mako:61
@@ -2937,11 +2884,6 @@
"conditions when a reminder is created. Further condition: %s"
msgstr ""
-#: mpulsweb/templates/settings/edit.mako:79
-#: mpulsweb/templates/settings/show.mako:60
-msgid "adm_form_settings_anontransfer"
-msgstr ""
-
#: mpulsweb/templates/settings/edit.mako:82
msgid ""
"If this option is activated, anonymized cases are transmitted for evaluation "
@@ -2950,7 +2892,7 @@
msgstr ""
#: mpulsweb/templates/settings/edit.mako:87
-msgid "adm_form_settings_save"
+msgid "Save settings"
msgstr ""
#: mpulsweb/templates/settings/show.mako:16
@@ -2969,14 +2911,6 @@
msgid "additional conditions for reminders"
msgstr ""
-#: mpulsweb/templates/settings/show.mako:63
-msgid "adm_form_settings_anontransfer_yes"
-msgstr ""
-
-#: mpulsweb/templates/settings/show.mako:65
-msgid "adm_form_settings_anontransfer_no"
-msgstr ""
-
#: mpulsweb/templates/settings/dialogs/success_edit.mako:8
msgid "Settings saved!"
msgstr ""
@@ -3014,19 +2948,19 @@
#: mpulsweb/templates/usersettings/change_password.mako:37
#: mpulsweb/templates/usersettings/change_password_login.mako:20
#: mpulsweb/templates/usersettings/change_password_login.mako:23
-msgid "adm_form_newuser_passwd"
+msgid "Enter new password"
msgstr ""
#: mpulsweb/templates/usersettings/change_password.mako:43
#: mpulsweb/templates/usersettings/change_password.mako:46
#: mpulsweb/templates/usersettings/change_password_login.mako:29
#: mpulsweb/templates/usersettings/change_password_login.mako:32
-msgid "adm_form_newuser_passwd_confirm"
+msgid "Repeat pasword"
msgstr ""
#: mpulsweb/templates/usersettings/change_password.mako:53
#: mpulsweb/templates/usersettings/change_password_login.mako:38
-msgid "adm_form_changepassword_submit"
+msgid "Save"
msgstr ""
#: mpulsweb/templates/usersettings/change_password_login.mako:5
Modified: base/trunk/mpulsweb/templates/administration/edit_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/edit_user.mako 2011-02-18 14:02:46 UTC (rev 4651)
+++ base/trunk/mpulsweb/templates/administration/edit_user.mako 2011-02-18 14:44:08 UTC (rev 4652)
@@ -1,11 +1,11 @@
<%inherit file="../main.mako" />
<%! import mpulsweb.lib.helper.filters as F %>
<%
- formular_labels = {'firstname' : 'adm_form_user_firstname',
- 'lastname' : 'adm_form_user_lastname',
- 'login' : 'adm_form_user_login',
- 'passwd' : 'adm_form_newuser_passwd',
- 'passwd2' : 'adm_form_newuser_passwd_confirm'
+ formular_labels = {'firstname' : 'Forename',
+ 'lastname' : 'Surname',
+ 'login' : 'Login',
+ 'passwd' : 'Enter new password',
+ 'passwd2' : 'Repeat pasword'
}
%>
<%def name="buildNavipath()">
@@ -36,26 +36,26 @@
<fieldset>
- <legend>${_('adm_form_legend_personal')}</legend>
+ <legend>${_('Information about personal')}</legend>
<table>
<tr>
<td>
% if c.form_errors.get('firstname'):
- <label for="firstname" class="error_font">${_('adm_form_user_firstname')}</label><br>
+ <label for="firstname" class="error_font">${_('Forename')}</label><br>
<input type="text" class="field error_box" id="firstname" name="firstname" value="${c.form_result.get('firstname', c.uo.first_name)}" maxlength="64">
% else:
- <label for="firstname">${_('adm_form_user_firstname')}</label><br>
+ <label for="firstname">${_('Forename')}</label><br>
<input type="text" class="field" id="firstname" name="firstname" value="${c.form_result.get('firstname', c.uo.first_name)}" maxlength="64">
% endif
</td>
<td>
% if c.form_errors.get('lastname'):
- <label for="lastname" class="error_font">${_('adm_form_user_lastname')}</label><br>
+ <label for="lastname" class="error_font">${_('Surname')}</label><br>
<input type="text" class="field error_box" id="lastname" name="lastname" value="${c.form_result.get('lastname', c.uo.last_name)}" maxlength="64">
% else:
- <label for="lastname">${_('adm_form_user_lastname')}</label><br>
+ <label for="lastname">${_('Surname')}</label><br>
<input type="text" class="field" id="lastname" name="lastname" value="${c.form_result.get('lastname', c.uo.last_name)}" maxlength="64">
% endif
</td>
@@ -63,17 +63,17 @@
<tr>
<td>
- <label for="telephone">${_('adm_form_user_telephone')}</label><br>
+ <label for="telephone">${_('Phone')}</label><br>
<input type="text" class="field" id="telephone" name="telephone" value="${c.form_result.get('telephone', c.uo.telephone)}" maxlength="32">
</td>
<td>
- <label for="room">${_('adm_form_user_roomnumer')}</label><br>
+ <label for="room">${_('Roomnumber')}</label><br>
<input type="text" class="field" id="room" name="room" value="${c.form_result.get('room', c.uo.room)}" maxlength="16">
</td>
</tr>
<tr>
<td>
- <label for="branchoffice">${_('adm_form_user_branchoffice')}</label><br>
+ <label for="branchoffice">${_('Branchoffice')}</label><br>
<input type="text" class="field" id="branchoffice" name="branchoffice" value="${c.form_result.get('branchoffice', c.uo.branchoffice)}" maxlength="64">
</td>
<td></td>
@@ -82,7 +82,7 @@
</fieldset>
- <fieldset><legend>${_('adm_form_legend_login')}</legend>
+ <fieldset><legend>${_('Information about login')}</legend>
<table>
<tr>
<td class="label table_header_v table_width_mid_s">Anmeldekennung</td>
@@ -100,7 +100,7 @@
% else:
<input type="checkbox" name="activated" id="activated">
% endif
- <label for="activated">${_('adm_form_user_activated')}</label>
+ <label for="activated">${_('User is allowed to activate')}</label>
</div>
<div class="waska_form_element w100">
% if c.uo.needsNewPass():
@@ -108,10 +108,10 @@
% else:
<input type="checkbox" name="newpass" id="newpass">
% endif
- <label for="newpass">${_('adm_form_user_newpass')}</label>
+ <label for="newpass">${_('User must set password at next login.')}</label>
</div>
<div id="admin_edit_user_submit" class="waska_form_element w100">
- <input type="submit" value="${_('adm_form_user_submit')}">
+ <input type="submit" value="${_('Save user')}">
</div>
<input type="hidden" value="${c.form_errors.get('uid', c.uo.id)| F.NA}" name="uid">
</form>
Modified: base/trunk/mpulsweb/templates/administration/edit_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/edit_usergroup.mako 2011-02-18 14:02:46 UTC (rev 4651)
+++ base/trunk/mpulsweb/templates/administration/edit_usergroup.mako 2011-02-18 14:44:08 UTC (rev 4652)
@@ -2,7 +2,7 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%inherit file="../main.mako" />
<%
- formular_labels = {'name' : 'adm_form_usergroup_name'
+ formular_labels = {'name' : 'Usergroup name'
}
%>
<%def name="buildNavipath()">
@@ -30,18 +30,18 @@
<div id="waska_form">
<form action="${h.url_for(controller='/administration', action='editUserGroupAction')}" method="POST">
<input type="hidden" name="id">
- <fieldset><legend>${_('adm_form_legend_groupdata')}</legend>
+ <fieldset><legend>${_('Information about usergroup')}</legend>
<div class="w25">
% if c.form_errors.get('name'):
- <label for="name" class="error_font">${_('adm_form_usergroup_name')}</label><br>
+ <label for="name" class="error_font">${_('Usergroup name')}</label><br>
<input type="text" class="field error_box" id="name" name="name" maxlength="128">
% else:
- <label for="name">${_('adm_form_usergroup_name')}</label><br>
+ <label for="name">${_('Usergroup name')}</label><br>
<input type="text" class="field" id="name" name="name" maxlength="128">
% endif
</div>
</fieldset>
- <fieldset><legend>${_('adm_form_legende_groupmember')}</legend>
+ <fieldset><legend>${_('Memebr of a group')}</legend>
<table>
<tr>
<th class="table_header_h table_checkbox"> </th>
@@ -70,7 +70,7 @@
% endfor
</table>
</fieldset>
- <input type="submit" value="${_('adm_form_usergroup_submit')}">
+ <input type="submit" value="${_('Save usergroup')}">
</form>
</div>
</div>
Modified: base/trunk/mpulsweb/templates/administration/new_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_user.mako 2011-02-18 14:02:46 UTC (rev 4651)
+++ base/trunk/mpulsweb/templates/administration/new_user.mako 2011-02-18 14:44:08 UTC (rev 4652)
@@ -1,11 +1,11 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
<%
- formular_labels = {'firstname' : 'adm_form_user_firstname',
- 'lastname' : 'adm_form_user_lastname',
- 'login' : 'adm_form_user_login',
- 'passwd' : 'adm_form_newuser_passwd',
- 'passwd2' : 'adm_form_newuser_passwd_confirm'
+ formular_labels = {'firstname' : 'Forename',
+ 'lastname' : 'Surname',
+ 'login' : 'Login',
+ 'passwd' : 'Enter new password',
+ 'passwd2' : 'Repeat pasword'
}
%>
@@ -37,17 +37,17 @@
<div id="waska_form">
<form action="${h.url_for(controller='/administration', action='newUserAction')}"
method="POST">
- <fieldset><legend>${_('adm_form_legend_personal')}</legend>
+ <fieldset><legend>${_('Information about personal')}</legend>
<div class="w25">
% if c.form_errors.get('firstname'):
<label for="firstname" class="error_font">
- ${_('adm_form_user_firstname')}
+ ${_('Forename')}
</label>
<br>
<input type="text" class="field error_box" id="firstname"
name="firstname" maxlength="60">
% else:
- <label for="firstname">${_('adm_form_user_firstname')}</label><br>
+ <label for="firstname">${_('Forename')}</label><br>
<input type="text" class="field" id="firstname" name="firstname"
maxlength="64">
% endif
@@ -55,50 +55,50 @@
<div class="w75">
% if c.form_errors.get('lastname'):
<label for="lastname" class="error_font">
- ${_('adm_form_user_lastname')}
+ ${_('Surname')}
</label>
<br>
<input type="text" class="field error_box" id="lasttname"
name="lastname" maxlength="64">
% else:
- <label for="lastname">${_('adm_form_user_lastname')}</label><br>
+ <label for="lastname">${_('Surname')}</label><br>
<input type="text" class="field" id="lasttname" name="lastname"
maxlength="64">
% endif
</div>
<div class="w25">
- <label for="telephone">${_('adm_form_user_telephone')}</label><br>
+ <label for="telephone">${_('Phone')}</label><br>
<input type="text" class="field" id="telephone" name="telephone"
maxlength="32">
</div>
<div class="w75">
- <label for="room">${_('adm_form_user_room')}</label><br>
+ <label for="room">${_('Room')}</label><br>
<input type="text" class="field" id="room" name="room" maxlength="16">
</div>
<div class="w100">
- <label for="branchoffice">${_('adm_form_user_branchoffice')}</label>
+ <label for="branchoffice">${_('Branchoffice')}</label>
<br>
<input type="text" class="field" id="branchoffice" name="branchoffice"
maxlength="64">
</div>
</fieldset>
- <fieldset><legend>${_('adm_form_legend_login')}</legend>
+ <fieldset><legend>${_('Information about login')}</legend>
<div class="w25">
% if c.form_errors.get('login'):
<label for="login" class="error_font">
- ${_('adm_form_user_login')}
+ ${_('Login')}
</label>
<br>
<input type="text" class="field error_box" id="login" name="login"
maxlength="64">
% else:
- <label for="login">${_('adm_form_user_login')}</label><br>
+ <label for="login">${_('Login')}</label><br>
<input type="text" class="field" id="login" name="login"
maxlength="64">
% endif
</div>
<div class="w50">
- <label for="role">${_('adm_form_user_role')}</label><br>
+ <label for="role">${_('User role')}</label><br>
<select name="role" id="role">
% if h.getLogin() != 'adm':
<option value="CM" >${_('role_user')}</option>
@@ -109,14 +109,14 @@
<div class="w100">
<input type="checkbox" name="activated" id="activated" value="1"
checked>
- <label for="activated">${_('adm_form_user_activated')}</label>
+ <label for="activated">${_('User is allowed to activate')}</label>
</div>
<div class="w100">
<input type="checkbox" name="newpass" id="newpass" value="1" checked>
- <label for="newpass">${_('adm_form_user_newpass')}</label>
+ <label for="newpass">${_('User must set password at next login.')}</label>
</div>
</fieldset>
- <input type="submit" value="${_('adm_form_user_submit')}">
+ <input type="submit" value="${_('Save user')}">
</form>
</div>
</div>
Modified: base/trunk/mpulsweb/templates/administration/new_user_result.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_user_result.mako 2011-02-18 14:02:46 UTC (rev 4651)
+++ base/trunk/mpulsweb/templates/administration/new_user_result.mako 2011-02-18 14:44:08 UTC (rev 4652)
@@ -9,7 +9,7 @@
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
-${_('adm_header_newuser_Result')}
+${_('User data of the new created user')}
</div>
<div id="modusfield">
<div class="actions">
@@ -19,61 +19,61 @@
</div>
</div>
</div>
-<h2>${_('adm_form_legend_personal')}</h2>
-<p>${_('adm_form_new_user_notice')}</p>
+<h2>${_('Information about personal')}</h2>
+<p>${_('Please give login name and password to the user.')}</p>
<table>
<tr>
- <td class="label table_header_v table_width_long">${_('adm_form_label_forename')}</td>
+ <td class="label table_header_v table_width_long">${_('Forename')}</td>
<td class="table_row_v table_description">${c.uo.first_name| F.NA}</td>
</tr>
<tr>
- <td class="label">${_('adm_form_label_name')}</td>
+ <td class="label">${_('Name')}</td>
<td class="table_row_v_2">${c.uo.last_name| F.NA}</td>
</tr>
<tr>
- <td class="label table_header_v">${_('adm_form_label_phone')}</td>
+ <td class="label table_header_v">${_('Phone')}</td>
<td class="table_row_v table_description">${c.uo.telephone| F.NA}</td>
</tr>
<tr>
- <td class="label">${_('adm_form_label_room')}</td>
+ <td class="label">${_('Roomnumber')}</td>
<td class="table_row_v_2">${c.uo.room| F.NA}</td>
</tr>
<tr>
- <td class="label table_header_v table_width_long">${_('adm_form_label_agency')}</td>
+ <td class="label table_header_v table_width_long">${_('Institution')}</td>
<td class="table_row_v table_description">${c.uo.branchoffice| F.NA}</td>
</tr>
</table>
-<h2>${_('adm_form_legend_login')}</h2>
+<h2>${_('Information about login')}</h2>
<table>
<tr>
- <td class="label table_header_v table_width_long">${_('adm_form_label_login')}</td>
+ <td class="label table_header_v table_width_long">${_('Login')}</td>
<td class="table_row_v table_description"><span id="newpassword">${c.uo.getLogin()| F.NA}</span></td>
</tr>
<tr>
- <td class="label">${_('adm_form_label_password')}</td>
+ <td class="label">${_('Password')}</td>
<td class="table_row_v_2"><span id="newpassword">${c.user_password}</span></td>
</tr>
<tr>
- <td class="label table_header_v">${_('adm_form_label_role')}</td>
+ <td class="label table_header_v">${_('Role')}</td>
<td class="table_row_v table_description">${c.uo.role| F.NA}</td>
</tr>
<tr>
- <td class="label">${_('adm_form_label_activated')}</td>
+ <td class="label">${_('Activated')}</td>
<td class="table_row_v_2">
% if c.uo.isActivated():
- ${_('adm_form_is_activated_yes')}
+ ${_('Yes')}
% else:
- ${_('adm_form_is_activated_no')}
+ ${_('No')}
% endif
</td>
</tr>
<tr>
- <td class="label table_header_v table_width_long">${_('adm_form_label_login_pw')}</td>
+ <td class="label table_header_v table_width_long">${_('Ask for password at login')}</td>
<td class="table_row_v table_description">
% if c.uo.needsNewPass():
- ${_('adm_form_needs_pw_yes')}
+ ${_('Yes')}
% else:
- ${_('adm_form_needs_pw_no')}
+ ${_('No')}
% endif
</td>
</tr>
Modified: base/trunk/mpulsweb/templates/administration/new_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_usergroup.mako 2011-02-18 14:02:46 UTC (rev 4651)
+++ base/trunk/mpulsweb/templates/administration/new_usergroup.mako 2011-02-18 14:44:08 UTC (rev 4652)
@@ -1,7 +1,7 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
<%
- formular_labels = {'name' : 'adm_form_usergroup_name'
+ formular_labels = {'name' : 'Usergroup name'
}
%>
<%def name="buildNavipath()">
@@ -29,18 +29,18 @@
<div id="waska_form">
<form action="${h.url_for(controller='/administration', action='newUserGroupAction')}"
method="POST">
- <fieldset><legend>${_('adm_form_legend_groupdata')}</legend>
+ <fieldset><legend>${_('Information about usergroup')}</legend>
<div class="w25">
% if c.form_errors.get('name'):
- <label for="name" class="error_font">${_('adm_form_usergroup_name')}</label><br>
+ <label for="name" class="error_font">${_('Usergroup name')}</label><br>
<input type="text" class="field error_box" id="name" name="name" maxlength="128">
% else:
- <label for="name">${_('adm_form_usergroup_name')}</label><br>
+ <label for="name">${_('Usergroup name')}</label><br>
<input type="text" class="field" id="name" name="name" maxlength="128">
% endif
</div>
</fieldset>
-<input type="submit" value="${_('adm_form_usergroup_submit')}">
+<input type="submit" value="${_('Save usergroup')}">
</form>
</div>
</div>
Modified: base/trunk/mpulsweb/templates/administration/show_user_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/show_user_body.mako 2011-02-18 14:02:46 UTC (rev 4651)
+++ base/trunk/mpulsweb/templates/administration/show_user_body.mako 2011-02-18 14:44:08 UTC (rev 4652)
@@ -1,61 +1,61 @@
<%! import mpulsweb.lib.helper.filters as F %>
-<h2>${_('adm_form_legend_personal')}</h2>
+<h2>${_('Information about personal')}</h2>
<table>
<tr>
- <td class="label table_header_v table_width_long">${_('adm_form_table_forename')}</td>
+ <td class="label table_header_v table_width_long">${_('Forename')}</td>
<td class="table_row_v table_description">${c.uo.first_name | F.NA}</td>
</tr>
<tr>
- <td class="label">${_('adm_form_table_name')}</td>
+ <td class="label">${_('Name')}</td>
<td class="table_row_v_2">${c.uo.last_name | F.NA}</td>
</tr>
<tr>
- <td class="label table_header_v">${_('adm_form_table_phone')}</td>
+ <td class="label table_header_v">${_('Phone')}</td>
<td class="table_row_v">${c.uo.telephone | F.NA}</td>
</tr>
<tr>
- <td class="label">${_('adm_form_table_room')}</td>
+ <td class="label">${_('Roomnumber')}</td>
<td class="table_row_v_2">${c.uo.room | F.NA}</td>
</tr>
<tr>
- <td class="label table_header_v">${_('adm_form_table_agency')}</td>
+ <td class="label table_header_v">${_('Institution')}</td>
<td class="table_row_v">${c.uo.branchoffice | F.NA}</td>
</tr>
% if g.mpuls_config.is_enabled('case-module', 'organisation'):
<tr>
- <td class="label">${_('adm_form_table_replace')}</td>
+ <td class="label">${_('Replace')}</td>
<td class="table_row_v_2">${c.vuo.name | F.NA}</td>
</tr>
% endif
</table>
-<h2>${_('adm_form_header_login')}</h2>
+<h2>${_('Login settings')}</h2>
<table>
<tr>
- <td class="label table_header_v table_width_long">${_('adm_form_table_login')}</td>
+ <td class="label table_header_v table_width_long">${_('Login')}</td>
<td class="table_row_v table_description">${c.uo.getLogin()}</td>
</tr>
<tr>
- <td class="label">${_('adm_form_table_role')}</td>
+ <td class="label">${_('Role')}</td>
<td class="table_row_v_2">${c.uo.getRole()}</td>
</tr>
% if h.hasRole(['admin_ka']):
<tr>
- <td class="label table_header_v table_width_mid_l">${_('adm_form_table_activated')}</td>
+ <td class="label table_header_v table_width_mid_l">${_('Activated')}</td>
<td class="table_row_v">
% if c.uo.isActivated():
- ${_('adm_form_table_yes')}
+ ${_('Yes')}
% else:
- ${_('adm_form_table_no')}
+ ${_('No')}
% endif
</td>
</tr>
<tr>
- <td class="label table_width_long">${_('adm_form_label_new_login_new_pw')}</td>
+ <td class="label table_width_long">${_('Ask for new password at login')}</td>
<td class="table_row_v_2">
% if c.uo.needsNewPass():
- ${_('adm_form_table_yes')}
+ ${_('Yes')}
% else:
- ${_('adm_form_table_no')}
+ ${_('No')}
% endif
</td>
</tr>
Modified: base/trunk/mpulsweb/templates/administration/show_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/show_usergroup.mako 2011-02-18 14:02:46 UTC (rev 4651)
+++ base/trunk/mpulsweb/templates/administration/show_usergroup.mako 2011-02-18 14:44:08 UTC (rev 4652)
@@ -22,7 +22,7 @@
</div>
-<h2>${_('adm_form_legende_groupmember')} "${c.group.name | F.NA}"</h2>
+<h2>${_('Memebr of a group')} "${c.group.name | F.NA}"</h2>
<table>
<tr>
<th class="table_header_h table_description">Mitarbeiterin / Mitarbeiter</th>
Modified: base/trunk/mpulsweb/templates/settings/edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/edit.mako 2011-02-18 14:02:46 UTC (rev 4651)
+++ base/trunk/mpulsweb/templates/settings/edit.mako 2011-02-18 14:44:08 UTC (rev 4652)
@@ -1,9 +1,9 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
<%
- formular_labels = {'ka_name': _('adm_form_settings_kaname'),
- 'fkz': _('adm_form_settings_fkz'),
- 'max_speicherdauer': _('adm_form_settings_max_savetime')
+ formular_labels = {'ka_name': _('Name of the institution'),
+ 'fkz': _('Formular number of the institution'),
+ 'max_speicherdauer': _('Automatic review after days')
}
%>
<%def name="buildNavipath()">
@@ -45,15 +45,15 @@
<fieldset>
<legend>${_('Specification for agency')}</legend>
<div class="waska_form_element w30">
- <label for="ka_name">${_('adm_form_settings_kaname')}</label>
+ <label for="ka_name">${_('Name of the institution')}</label>
<input type="text" class="field" id="ka_name" name="ka_name" value="" maxlength="60">
</div>
<div class="waska_form_element w30">
- <label for="ka_adresse">${_('adm_form_settings_kaadress')}</label>
+ <label for="ka_adresse">${_('Address of the institution')}</label>
<input type="text" class="field" id="ka_adresse" name="ka_adresse" value="" maxlength="120">
</div>
<div class="waska_form_element w30">
- <label for="fkz">${_('adm_form_settings_fkz')}</label>
+ <label for="fkz">${_('Formular number of the institution')}</label>
<input type="text" id="fkz" name="fkz" value="" maxlength="60">
</div>
</fieldset>
@@ -61,7 +61,7 @@
<legend>${_('Specification for cases')}</legend>
<div class="waska_form_element w100">
<label for="max_speicherdauer">
- ${_('adm_form_settings_max_savetime')}
+ ${_('Automatic review after days')}
</label>
<input type="text" id="max_speicherdauer" name="max_speicherdauer" value="" maxlength="4">
<p class="info">
@@ -76,7 +76,7 @@
% endif
<input id="anon_transfer" name="anon_transfer" type="checkbox"/>
<label for="anon_transfer">
- ${_('adm_form_settings_anontransfer')}
+ ${_('Assign case document')}
</label>
<p>
${_('If this option is activated, anonymized cases are transmitted for evaluation purpose to a central agency. Anonymized cases do to not contain any personal data such as name or addresses.')}
@@ -84,7 +84,7 @@
</div>
</fieldset>
<div id="admin_edit_settings_submit" class="waska_form_element w100">
- <input type="submit" value="${_('adm_form_settings_save')}">
+ <input type="submit" value="${_('Save settings')}">
</div>
</form>
</div>
Modified: base/trunk/mpulsweb/templates/settings/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/show.mako 2011-02-18 14:02:46 UTC (rev 4651)
+++ base/trunk/mpulsweb/templates/settings/show.mako 2011-02-18 14:44:08 UTC (rev 4652)
@@ -32,24 +32,24 @@
<table>
<tr>
<td class="label table_header_v table_width_name">
- ${_('adm_form_settings_kaname')}
+ ${_('Name of the institution')}
</td>
<td class="table_row_v table_description">${c.agency.getName()| F.NA}
</td>
</tr>
<tr>
<td class="label table_width_name">
- ${_('adm_form_settings_kaadress')}
+ ${_('Address of the institution')}
</td>
<td class="table_description">${c.agency.getAddress()| F.NA}
</td>
</tr>
<tr>
- <td class="label table_header_v">${_('adm_form_settings_fkz')}</td>
+ <td class="label table_header_v">${_('Formular number of the institution')}</td>
<td class="table_row_v_2 table_header_v">${c.agency.getFKZ()| F.NA}</td>
</tr>
<tr>
- <td class="label">${_('adm_form_settings_max_savetime')}</td>
+ <td class="label">${_('Automatic review after days')}</td>
<td class="">${c.agency.getMaxSavetime()| F.NA}</td>
</tr>
<tr>
@@ -57,12 +57,12 @@
<td class="table_row_v">${h.literal(g.mpuls_config.get('case', 'reminderconditiondesc'))}</td>
</tr>
<tr>
- <td class="label table_header">${_('adm_form_settings_anontransfer')}</td>
+ <td class="label table_header">${_('Assign case document')}</td>
<td class="table_row_v_2">
% if c.agency.isAnonTransfer():
- ${_('adm_form_settings_anontransfer_yes')}
+ ${_('Yes')}
% else:
- ${_('adm_form_settings_anontransfer_no')}
+ ${_('No')}
% endif
</td>
</tr>
Modified: base/trunk/mpulsweb/templates/usersettings/change_password.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/change_password.mako 2011-02-18 14:02:46 UTC (rev 4651)
+++ base/trunk/mpulsweb/templates/usersettings/change_password.mako 2011-02-18 14:44:08 UTC (rev 4652)
@@ -8,8 +8,8 @@
</a></li>
</%def>
<%
- formular_labels = {'passwd' : 'adm_form_newuser_passwd',
- 'passwd2' : 'adm_form_newuser_passwd_confirm'
+ formular_labels = {'passwd' : 'Enter new password',
+ 'passwd2' : 'Repeat pasword'
}
%>
<div id="content_header_small">
@@ -31,26 +31,26 @@
<form action="${h.url_for(controller="usersettings", action="changePasswordAction")}" method="POST">
<div>
% if c.form_errors.get('passwd'):
- <label class="import_label" for="passwd" class="error_font"><strong class="import_number">1. </strong>${_('adm_form_newuser_passwd')}:</label>
+ <label class="import_label" for="passwd" class="error_font"><strong class="import_number">1. </strong>${_('Enter new password')}:</label>
<input type="password" class="field error_box" id="passwd" name="passwd">
% else:
- <label class="import_label" for="passwd"><strong class="import_number">1. </strong>${_('adm_form_newuser_passwd')}:</label>
+ <label class="import_label" for="passwd"><strong class="import_number">1. </strong>${_('Enter new password')}:</label>
<input type="password" class="field" id="passwd" name="passwd">
% endif
</div>
<div>
% if c.form_errors.get('passwd2'):
- <label class="import_label" for="passwd2" class="error_font"><strong class="import_number">2. </strong>${_('adm_form_newuser_passwd_confirm')}:</label>
+ <label class="import_label" for="passwd2" class="error_font"><strong class="import_number">2. </strong>${_('Repeat pasword')}:</label>
<input type="password" class="field error_box" id="passwd2" name="passwd2">
% else:
- <label class="import_label" for="passwd2"><strong class="import_number">2. </strong>${_('adm_form_newuser_passwd_confirm')}:</label>
+ <label class="import_label" for="passwd2"><strong class="import_number">2. </strong>${_('Repeat pasword')}:</label>
<input type="password" class="field" id="passwd2" name="passwd2">
% endif
</div>
<div>
<input type="hidden" name="uid" value="${h.getUserId()}">
<label class="import_label" for="passwd2"><strong class="import_number">3. </strong>Neues Passwort speichern:</label>
- <input id="account_pw_sub" class="btn_space" type="submit" value="${_('adm_form_changepassword_submit')}">
+ <input id="account_pw_sub" class="btn_space" type="submit" value="${_('Save')}">
</div>
</form>
</div>
Modified: base/trunk/mpulsweb/templates/usersettings/change_password_login.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/change_password_login.mako 2011-02-18 14:02:46 UTC (rev 4651)
+++ base/trunk/mpulsweb/templates/usersettings/change_password_login.mako 2011-02-18 14:44:08 UTC (rev 4652)
@@ -14,28 +14,28 @@
</p>
<div id="waska_form_login">
<form action="${h.url_for(controller="/usersettings", action="changePasswordOnLoginAction")}" method="POST" autocomplete="off">
- <fieldset><legend>${_('adm_form_legend_login')}</legend>
+ <fieldset><legend>${_('Information about login')}</legend>
<div class="waska_form_element w50">
% if c.form_errors.get('passwd'):
- <label for="passwd" class="error_font">${_('adm_form_newuser_passwd')}</label><br>
+ <label for="passwd" class="error_font">${_('Enter new password')}</label><br>
<input type="password" class="field error_box" id="passwd" name="passwd">
% else:
- <label for="passwd">${_('adm_form_newuser_passwd')}</label><br>
+ <label for="passwd">${_('Enter new password')}</label><br>
<input type="password" class="field" id="passwd" name="passwd">
% endif
</div>
<div class="waska_form_element w50">
% if c.form_errors.get('passwd2'):
- <label for="passwd2" class="error_font">${_('adm_form_newuser_passwd_confirm')}</label><br>
+ <label for="passwd2" class="error_font">${_('Repeat pasword')}</label><br>
<input type="password" class="field error_box" id="passwd2" name="passwd2">
% else:
- <label for="passwd2">${_('adm_form_newuser_passwd_confirm')}</label><br>
+ <label for="passwd2">${_('Repeat pasword')}</label><br>
<input type="password" class="field" id="passwd2" name="passwd2">
% endif
</div>
</fieldset>
<input type="hidden" name="uid" value="${h.getUserId()}">
- <input type="submit" value="${_('adm_form_changepassword_submit')}">
+ <input type="submit" value="${_('Save')}">
</form>
</div>
</div>
More information about the Mpuls-commits
mailing list