[Mpuls-commits] r4692 - in base/trunk: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/templates/administration mpulsweb/templates/appointments mpulsweb/templates/casemanagement mpulsweb/templates/home mpulsweb/templates/logbook
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Feb 23 13:42:28 CET 2011
Author: ludwig
Date: 2011-02-23 13:42:27 +0100 (Wed, 23 Feb 2011)
New Revision: 4692
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
base/trunk/mpulsweb/templates/administration/show_usergroup.mako
base/trunk/mpulsweb/templates/appointments/new.mako
base/trunk/mpulsweb/templates/appointments/overview.mako
base/trunk/mpulsweb/templates/appointments/overview_body.mako
base/trunk/mpulsweb/templates/appointments/remindlist_body.mako
base/trunk/mpulsweb/templates/appointments/show.mako
base/trunk/mpulsweb/templates/appointments/show_body.mako
base/trunk/mpulsweb/templates/casemanagement/appointments.mako
base/trunk/mpulsweb/templates/casemanagement/editAppointment.mako
base/trunk/mpulsweb/templates/casemanagement/newAppointment.mako
base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako
base/trunk/mpulsweb/templates/home/globalappointmentlist.mako
base/trunk/mpulsweb/templates/logbook/overview.mako
Log:
update of the msgids (part 11)
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2011-02-23 11:33:37 UTC (rev 4691)
+++ base/trunk/ChangeLog 2011-02-23 12:42:27 UTC (rev 4692)
@@ -2,6 +2,25 @@
* mpulsweb/i18n/mpulsweb.pot
mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
+ mpulsweb/templates/appointments/new.mako
+ mpulsweb/templates/appointments/show_body.mako
+ mpulsweb/templates/appointments/show.mako
+ mpulsweb/templates/appointments/overview_body.mako
+ mpulsweb/templates/appointments/overview.mako
+ mpulsweb/templates/appointments/remindlist_body.mako
+ mpulsweb/templates/administration/show_usergroup.mako
+ mpulsweb/templates/home/globalappointmentlist.mako
+ mpulsweb/templates/logbook/overview.mako
+ mpulsweb/templates/casemanagement/showAppointment.mako
+ mpulsweb/templates/casemanagement/editAppointment.mako
+ mpulsweb/templates/casemanagement/newAppointment.mako
+ mpulsweb/templates/casemanagement/appointments.mako:
+ Update of the msgids (part 11)
+
+2011-02-23 Ludwig Reiter <ludwig.reiter at intevation.de>
+
+ * mpulsweb/i18n/mpulsweb.pot
+ mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
mpulsweb/templates/administration/show_user.mako
mpulsweb/templates/administration/overview_user.mako
mpulsweb/templates/administration/overview_usergroups.mako
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-02-23 11:33:37 UTC (rev 4691)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-02-23 12:42:27 UTC (rev 4692)
@@ -8,7 +8,7 @@
"Project-Id-Version: mpulsweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
"POT-Creation-Date: 2009-10-08 09:54+0200\n"
-"PO-Revision-Date: 2011-02-23 12:22+0100\n"
+"PO-Revision-Date: 2011-02-23 13:38+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"
@@ -1368,6 +1368,10 @@
#: mpulsweb/templates/administration/new_user.mako:27
#: mpulsweb/templates/administration/new_user_result.mako:17
#: mpulsweb/templates/administration/show_user.mako:17
+#: mpulsweb/templates/appointments/new.mako:23
+#: mpulsweb/templates/appointments/show.mako:20
+#: mpulsweb/templates/casemanagement/newAppointment.mako:24
+#: mpulsweb/templates/casemanagement/showAppointment.mako:23
msgid "Back to: User overview"
msgstr "Zurück zu: Benutzeransicht"
@@ -1578,6 +1582,10 @@
#: mpulsweb/templates/administration/overview_user.mako:28
#: mpulsweb/templates/administration/overview_usergroups.mako:26
+#: mpulsweb/templates/appointments/overview_body.mako:7
+#: mpulsweb/templates/appointments/remindlist_body.mako:7
+#: mpulsweb/templates/home/globalappointmentlist.mako:13
+#: mpulsweb/templates/logbook/overview.mako:101
#: mpulsweb/templates/phase/phase.mako:28
msgid "Actions"
msgstr "Aktionen"
@@ -1677,13 +1685,11 @@
msgstr "Benutzergruppe anzeigen"
#: mpulsweb/templates/administration/show_usergroup.mako:17
-#, fuzzy
-#| msgid "adm_actions_link_editsettings"
-msgid "adm_actions_link_editusergroup"
+msgid "Edit user group"
msgstr "Einstellungen bearbeiten"
#: mpulsweb/templates/administration/show_usergroup.mako:47
-msgid "group_has_no_member"
+msgid "The user group has no members"
msgstr "Die Benutzergruppe hat keine Mitglieder"
#: mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako:7
@@ -1760,12 +1766,17 @@
#: mpulsweb/templates/appointments/edit_body.mako:59
#: mpulsweb/templates/appointments/edit_body.mako:62
+#: mpulsweb/templates/appointments/show_body.mako:25
msgid "Title"
msgstr "Titel"
#: mpulsweb/templates/appointments/edit_body.mako:68
#: mpulsweb/templates/appointments/edit_body.mako:71
+#: mpulsweb/templates/appointments/overview_body.mako:6
+#: mpulsweb/templates/appointments/remindlist_body.mako:6
+#: mpulsweb/templates/appointments/show_body.mako:29
#: mpulsweb/templates/evaluation/evaluate.mako:30
+#: mpulsweb/templates/home/globalappointmentlist.mako:12
msgid "Description"
msgstr "Beschreibung"
@@ -1774,88 +1785,53 @@
msgstr "Termin speichern"
#: mpulsweb/templates/appointments/new.mako:13
+#: mpulsweb/templates/appointments/new.mako:17
+#: mpulsweb/templates/appointments/overview.mako:14
#: mpulsweb/templates/appointments/dialogs/success_create_appointment.mako:7
+#: mpulsweb/templates/casemanagement/appointments.mako:16
#: mpulsweb/templates/casemanagement/newAppointment.mako:14
+#: mpulsweb/templates/casemanagement/newAppointment.mako:18
#: mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako:7
msgid "Create new event"
msgstr "Neuen Termin anlegen"
-#: mpulsweb/templates/appointments/new.mako:17
-#: mpulsweb/templates/casemanagement/newAppointment.mako:18
-msgid "cm_app_header_new"
-msgstr "Neuen Termin anlegen"
-
-#: mpulsweb/templates/appointments/new.mako:23
-#: mpulsweb/templates/appointments/show.mako:20
-#: mpulsweb/templates/casemanagement/newAppointment.mako:24
-#: mpulsweb/templates/casemanagement/showAppointment.mako:23
-msgid "menu_app_link_overview_back"
-msgstr "Zurück zu: Benutzerübersicht"
-
#: mpulsweb/templates/appointments/overview.mako:8
#: mpulsweb/templates/casemanagement/appointments.mako:10
-msgid "app_header_overview"
+msgid "Event overview"
msgstr "Terminübersicht"
-#: mpulsweb/templates/appointments/overview.mako:14
-#: mpulsweb/templates/casemanagement/appointments.mako:16
-msgid "app_actions_link_newappointment"
-msgstr "Neuen Termin anlegen"
-
#: mpulsweb/templates/appointments/overview_body.mako:5
#: mpulsweb/templates/appointments/remindlist_body.mako:5
#: mpulsweb/templates/home/globalappointmentlist.mako:11
-msgid "app_overview_tbl_header_date"
+msgid "Date"
msgstr "Datum"
-#: mpulsweb/templates/appointments/overview_body.mako:6
-#: mpulsweb/templates/appointments/remindlist_body.mako:6
-#: mpulsweb/templates/home/globalappointmentlist.mako:12
-msgid "app_overview_tbl_header_desc"
-msgstr "Beschreibung"
-
-#: mpulsweb/templates/appointments/overview_body.mako:7
-#: mpulsweb/templates/appointments/remindlist_body.mako:7
-#: mpulsweb/templates/home/globalappointmentlist.mako:13
-#: mpulsweb/templates/logbook/overview.mako:101
-msgid "app_overview_tbl_header_actions"
-msgstr "Aktionen"
-
#: mpulsweb/templates/appointments/show.mako:5
-#: mpulsweb/templates/casemanagement/showAppointment.mako:6
-msgid "app_np_show"
-msgstr "Terminansicht"
-
#: mpulsweb/templates/appointments/show.mako:9
#: mpulsweb/templates/casemanagement/editAppointment.mako:18
+#: mpulsweb/templates/casemanagement/showAppointment.mako:6
#: mpulsweb/templates/casemanagement/showAppointment.mako:10
-msgid "app_header_show"
+msgid "Event view"
msgstr "Terminansicht"
#: mpulsweb/templates/appointments/show.mako:16
-msgid "sm_menu_link_appointment_edit"
+msgid "Edit appointment"
msgstr "In Bearbeitung nehmen"
#: mpulsweb/templates/appointments/show_body.mako:5
-msgid "app_table_startdate"
+#: mpulsweb/templates/phase/phase.mako:95
+#: mpulsweb/templates/phase/phase.mako:97
+msgid "Start"
msgstr "Beginn"
#: mpulsweb/templates/appointments/show_body.mako:9
-msgid "app_table_enddate"
+msgid "End"
msgstr "Ende"
#: mpulsweb/templates/appointments/show_body.mako:13
-msgid "app_table_duration"
+msgid "Duration"
msgstr "Dauer"
-#: mpulsweb/templates/appointments/show_body.mako:25
-msgid "app_table_title"
-msgstr "Titel"
-
-#: mpulsweb/templates/appointments/show_body.mako:29
-msgid "app_table_description"
-msgstr "Beschreibung"
-
#: mpulsweb/templates/appointments/dialogs/confirm.mako:6
#: mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako:7
#: mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako:6
@@ -2833,11 +2809,6 @@
msgid "No required fields found"
msgstr "Keine Pflichtfelder gefunden"
-#: mpulsweb/templates/phase/phase.mako:95
-#: mpulsweb/templates/phase/phase.mako:97
-msgid "Start"
-msgstr "Starten"
-
#: mpulsweb/templates/phase/phase.mako:135
#: mpulsweb/templates/phase/phase.mako:137
msgid "Finish"
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-02-23 11:33:37 UTC (rev 4691)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-02-23 12:42:27 UTC (rev 4692)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: mpulsweb 2.0.0-pre\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2011-02-23 12:22+0100\n"
+"POT-Creation-Date: 2011-02-23 13:38+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"
@@ -1175,6 +1175,10 @@
#: mpulsweb/templates/administration/new_user.mako:27
#: mpulsweb/templates/administration/new_user_result.mako:17
#: mpulsweb/templates/administration/show_user.mako:17
+#: mpulsweb/templates/appointments/new.mako:23
+#: mpulsweb/templates/appointments/show.mako:20
+#: mpulsweb/templates/casemanagement/newAppointment.mako:24
+#: mpulsweb/templates/casemanagement/showAppointment.mako:23
msgid "Back to: User overview"
msgstr ""
@@ -1385,6 +1389,10 @@
#: mpulsweb/templates/administration/overview_user.mako:28
#: mpulsweb/templates/administration/overview_usergroups.mako:26
+#: mpulsweb/templates/appointments/overview_body.mako:7
+#: mpulsweb/templates/appointments/remindlist_body.mako:7
+#: mpulsweb/templates/home/globalappointmentlist.mako:13
+#: mpulsweb/templates/logbook/overview.mako:101
#: mpulsweb/templates/phase/phase.mako:28
msgid "Actions"
msgstr ""
@@ -1484,11 +1492,11 @@
msgstr ""
#: mpulsweb/templates/administration/show_usergroup.mako:17
-msgid "adm_actions_link_editusergroup"
+msgid "Edit user group"
msgstr ""
#: mpulsweb/templates/administration/show_usergroup.mako:47
-msgid "group_has_no_member"
+msgid "The user group has no members"
msgstr ""
#: mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako:7
@@ -1565,12 +1573,17 @@
#: mpulsweb/templates/appointments/edit_body.mako:59
#: mpulsweb/templates/appointments/edit_body.mako:62
+#: mpulsweb/templates/appointments/show_body.mako:25
msgid "Title"
msgstr ""
#: mpulsweb/templates/appointments/edit_body.mako:68
#: mpulsweb/templates/appointments/edit_body.mako:71
+#: mpulsweb/templates/appointments/overview_body.mako:6
+#: mpulsweb/templates/appointments/remindlist_body.mako:6
+#: mpulsweb/templates/appointments/show_body.mako:29
#: mpulsweb/templates/evaluation/evaluate.mako:30
+#: mpulsweb/templates/home/globalappointmentlist.mako:12
msgid "Description"
msgstr ""
@@ -1579,88 +1592,52 @@
msgstr ""
#: mpulsweb/templates/appointments/new.mako:13
+#: mpulsweb/templates/appointments/new.mako:17
+#: mpulsweb/templates/appointments/overview.mako:14
#: mpulsweb/templates/appointments/dialogs/success_create_appointment.mako:7
+#: mpulsweb/templates/casemanagement/appointments.mako:16
#: mpulsweb/templates/casemanagement/newAppointment.mako:14
+#: mpulsweb/templates/casemanagement/newAppointment.mako:18
#: mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako:7
msgid "Create new event"
msgstr ""
-#: mpulsweb/templates/appointments/new.mako:17
-#: mpulsweb/templates/casemanagement/newAppointment.mako:18
-msgid "cm_app_header_new"
-msgstr ""
-
-#: mpulsweb/templates/appointments/new.mako:23
-#: mpulsweb/templates/appointments/show.mako:20
-#: mpulsweb/templates/casemanagement/newAppointment.mako:24
-#: mpulsweb/templates/casemanagement/showAppointment.mako:23
-msgid "menu_app_link_overview_back"
-msgstr ""
-
#: mpulsweb/templates/appointments/overview.mako:8
#: mpulsweb/templates/casemanagement/appointments.mako:10
-msgid "app_header_overview"
+msgid "Event overview"
msgstr ""
-#: mpulsweb/templates/appointments/overview.mako:14
-#: mpulsweb/templates/casemanagement/appointments.mako:16
-msgid "app_actions_link_newappointment"
-msgstr ""
-
#: mpulsweb/templates/appointments/overview_body.mako:5
#: mpulsweb/templates/appointments/remindlist_body.mako:5
#: mpulsweb/templates/home/globalappointmentlist.mako:11
-msgid "app_overview_tbl_header_date"
+msgid "Date"
msgstr ""
-#: mpulsweb/templates/appointments/overview_body.mako:6
-#: mpulsweb/templates/appointments/remindlist_body.mako:6
-#: mpulsweb/templates/home/globalappointmentlist.mako:12
-msgid "app_overview_tbl_header_desc"
-msgstr ""
-
-#: mpulsweb/templates/appointments/overview_body.mako:7
-#: mpulsweb/templates/appointments/remindlist_body.mako:7
-#: mpulsweb/templates/home/globalappointmentlist.mako:13
-#: mpulsweb/templates/logbook/overview.mako:101
-msgid "app_overview_tbl_header_actions"
-msgstr ""
-
#: mpulsweb/templates/appointments/show.mako:5
-#: mpulsweb/templates/casemanagement/showAppointment.mako:6
-msgid "app_np_show"
-msgstr ""
-
#: mpulsweb/templates/appointments/show.mako:9
#: mpulsweb/templates/casemanagement/editAppointment.mako:18
+#: mpulsweb/templates/casemanagement/showAppointment.mako:6
#: mpulsweb/templates/casemanagement/showAppointment.mako:10
-msgid "app_header_show"
+msgid "Event view"
msgstr ""
#: mpulsweb/templates/appointments/show.mako:16
-msgid "sm_menu_link_appointment_edit"
+msgid "Edit appointment"
msgstr ""
#: mpulsweb/templates/appointments/show_body.mako:5
-msgid "app_table_startdate"
+#: mpulsweb/templates/phase/phase.mako:95 mpulsweb/templates/phase/phase.mako:97
+msgid "Start"
msgstr ""
#: mpulsweb/templates/appointments/show_body.mako:9
-msgid "app_table_enddate"
+msgid "End"
msgstr ""
#: mpulsweb/templates/appointments/show_body.mako:13
-msgid "app_table_duration"
+msgid "Duration"
msgstr ""
-#: mpulsweb/templates/appointments/show_body.mako:25
-msgid "app_table_title"
-msgstr ""
-
-#: mpulsweb/templates/appointments/show_body.mako:29
-msgid "app_table_description"
-msgstr ""
-
#: mpulsweb/templates/appointments/dialogs/confirm.mako:6
#: mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako:7
#: mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako:6
@@ -2619,10 +2596,6 @@
msgid "No required fields found"
msgstr ""
-#: mpulsweb/templates/phase/phase.mako:95 mpulsweb/templates/phase/phase.mako:97
-msgid "Start"
-msgstr ""
-
#: mpulsweb/templates/phase/phase.mako:135 mpulsweb/templates/phase/phase.mako:137
msgid "Finish"
msgstr ""
Modified: base/trunk/mpulsweb/templates/administration/show_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/show_usergroup.mako 2011-02-23 11:33:37 UTC (rev 4691)
+++ base/trunk/mpulsweb/templates/administration/show_usergroup.mako 2011-02-23 12:42:27 UTC (rev 4692)
@@ -14,7 +14,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='/administration', action='editUserGroup', id=c.group.id)}"> ${_('adm_actions_link_editusergroup')}</a> </li>
+ <li><a href="${h.url_for(controller='/administration', action='editUserGroup', id=c.group.id)}"> ${_('Edit user group')}</a> </li>
<li><a href="${h.url_for(controller='administration', action='overviewUserGroups')}"> ${_('Back to: Usergroup overview')}</a></li>
</ul>
</div>
@@ -44,7 +44,7 @@
% endfor
% if len(c.groupmember.getUserList()) <= 0:
<tr>
- <td>${_('group_has_no_member')}</td>
+ <td>${_('The user group has no members')}</td>
</tr>
% endif
</table>
Modified: base/trunk/mpulsweb/templates/appointments/new.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/new.mako 2011-02-23 11:33:37 UTC (rev 4691)
+++ base/trunk/mpulsweb/templates/appointments/new.mako 2011-02-23 12:42:27 UTC (rev 4692)
@@ -14,13 +14,13 @@
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
-${_('cm_app_header_new')}
+${_('Create new event')}
</div>
<div id="modusfield">
<div class="actions">
<ul>
<li>
- <a href="${h.url_for(controller='appointment', action='overview')}"> ${_('menu_app_link_overview_back')}</a>
+ <a href="${h.url_for(controller='appointment', action='overview')}"> ${_('Back to: User overview')}</a>
</li>
</ul>
</div>
Modified: base/trunk/mpulsweb/templates/appointments/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/overview.mako 2011-02-23 11:33:37 UTC (rev 4691)
+++ base/trunk/mpulsweb/templates/appointments/overview.mako 2011-02-23 12:42:27 UTC (rev 4692)
@@ -5,13 +5,13 @@
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
- ${_('app_header_overview')}
+ ${_('Event overview')}
</div>
% if h.hasRole(['admin_ka']):
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='/appointment', action='create')}"> ${_('app_actions_link_newappointment')}</a></li>
+ <li><a href="${h.url_for(controller='/appointment', action='create')}"> ${_('Create new event')}</a></li>
</ul>
</div>
</div>
Modified: base/trunk/mpulsweb/templates/appointments/overview_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/overview_body.mako 2011-02-23 11:33:37 UTC (rev 4691)
+++ base/trunk/mpulsweb/templates/appointments/overview_body.mako 2011-02-23 12:42:27 UTC (rev 4692)
@@ -2,9 +2,9 @@
<%! import mpulsweb.lib.helper.filters as F %>
<table class="appointment">
<tr>
- <th class="date table_header_h">${_('app_overview_tbl_header_date')}</th>
- <th class="title table_header_h">${_('app_overview_tbl_header_desc')}</th>
- <th class="action table_header_h">${_('app_overview_tbl_header_actions')}</th>
+ <th class="date table_header_h">${_('Date')}</th>
+ <th class="title table_header_h">${_('Description')}</th>
+ <th class="action table_header_h">${_('Actions')}</th>
</tr>
% for appointment in c.appointmentlist.getDatasets():
<tr>
Modified: base/trunk/mpulsweb/templates/appointments/remindlist_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/remindlist_body.mako 2011-02-23 11:33:37 UTC (rev 4691)
+++ base/trunk/mpulsweb/templates/appointments/remindlist_body.mako 2011-02-23 12:42:27 UTC (rev 4692)
@@ -2,9 +2,9 @@
<%! import mpulsweb.lib.helper.filters as F %>
<table class="appointment">
<tr>
- <th class="date table_header_h">${_('app_overview_tbl_header_date')}</th>
- <th class="title table_header_h">${_('app_overview_tbl_header_desc')}</th>
- <th class="action table_header_h">${_('app_overview_tbl_header_actions')}</th>
+ <th class="date table_header_h">${_('Date')}</th>
+ <th class="title table_header_h">${_('Description')}</th>
+ <th class="action table_header_h">${_('Actions')}</th>
</tr>
% for appointment in c.remindlist.getDatasets():
<tr>
Modified: base/trunk/mpulsweb/templates/appointments/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/show.mako 2011-02-23 11:33:37 UTC (rev 4691)
+++ base/trunk/mpulsweb/templates/appointments/show.mako 2011-02-23 12:42:27 UTC (rev 4692)
@@ -2,22 +2,22 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('Appointments list')}</a></li>
- <li><a href="${h.url_for(controller='/appointment', action='show')}"></a>${_('app_np_show')}</li>
+ <li><a href="${h.url_for(controller='/appointment', action='show')}"></a>${_('Event view')}</li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
- ${_('app_header_show')}
+ ${_('Event view')}
</div>
<div id="modusfield">
<div class="actions">
<ul>
% if h.hasRole(['admin_ka']):
<li>
- <a href="${h.url_for(controller='/appointment', action='edit', id=c.appointment.id)}">${_('sm_menu_link_appointment_edit')}</a>
+ <a href="${h.url_for(controller='/appointment', action='edit', id=c.appointment.id)}">${_('Edit appointment')}</a>
</li>
% endif
<li>
- <a href="${h.url_for(controller='/appointment', action='overview', id=c.appointment.case_id)}">${_('menu_app_link_overview_back')}</a>
+ <a href="${h.url_for(controller='/appointment', action='overview', id=c.appointment.case_id)}">${_('Back to: User overview')}</a>
</li>
</ul>
</div>
Modified: base/trunk/mpulsweb/templates/appointments/show_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/show_body.mako 2011-02-23 11:33:37 UTC (rev 4691)
+++ base/trunk/mpulsweb/templates/appointments/show_body.mako 2011-02-23 12:42:27 UTC (rev 4692)
@@ -2,15 +2,15 @@
<table>
<tbody>
<tr>
- <td class="label table_header_v table_width_long">${_('app_table_startdate')}</td>
+ <td class="label table_header_v table_width_long">${_('Start')}</td>
<td class="table_row_v">${h.dd_mm_yyyy_HH_MM(c.appointment.getStartDate())}</td>
</tr>
<tr>
- <td class="label">${_('app_table_enddate')}</td>
+ <td class="label">${_('End')}</td>
<td class="table_row_v_2">${h.dd_mm_yyyy_HH_MM(c.appointment.getEndDate()) | F.NA}</td>
</tr>
<tr>
- <td class="label table_header_v">${_('app_table_duration')}</td>
+ <td class="label table_header_v">${_('Duration')}</td>
<td class="table_row_v">${c.appointment.getDuration() | F.NA}</td>
</tr>
<tr>
@@ -22,11 +22,11 @@
% endif
</tr>
<tr>
- <td class="label table_header_v">${_('app_table_title')}</td>
+ <td class="label table_header_v">${_('Title')}</td>
<td class="table_row_v">${c.appointment.title | F.NA}</td>
</tr>
<tr>
- <td class="label">${_('app_table_description')}</td>
+ <td class="label">${_('Description')}</td>
<% description = F.nl_to_br(h.escape(F.NA(c.appointment.description))) %>
<td class="table_row_v_2">${description}</td>
</tr>
Modified: base/trunk/mpulsweb/templates/casemanagement/appointments.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/appointments.mako 2011-02-23 11:33:37 UTC (rev 4691)
+++ base/trunk/mpulsweb/templates/casemanagement/appointments.mako 2011-02-23 12:42:27 UTC (rev 4692)
@@ -7,13 +7,13 @@
<div id="content_header_small">
<div id="content_ueberschrift">
- ${_('app_header_overview')}
+ ${_('Event overview')}
</div>
% if h.hasRole(['cm_ka']) and session.get('case').getState().getState() == 1:
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='/caseappointment', action='new', id=session.get('case').id)}"> ${_('app_actions_link_newappointment')}</a></li>
+ <li><a href="${h.url_for(controller='/caseappointment', action='new', id=session.get('case').id)}"> ${_('Create new event')}</a></li>
</ul>
</div>
</div>
Modified: base/trunk/mpulsweb/templates/casemanagement/editAppointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/editAppointment.mako 2011-02-23 11:33:37 UTC (rev 4691)
+++ base/trunk/mpulsweb/templates/casemanagement/editAppointment.mako 2011-02-23 12:42:27 UTC (rev 4692)
@@ -15,7 +15,7 @@
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
- ${_('app_header_show')}
+ ${_('Event view')}
</div>
<div id="modusfield">
<div class="actions">
Modified: base/trunk/mpulsweb/templates/casemanagement/newAppointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/newAppointment.mako 2011-02-23 11:33:37 UTC (rev 4691)
+++ base/trunk/mpulsweb/templates/casemanagement/newAppointment.mako 2011-02-23 12:42:27 UTC (rev 4692)
@@ -15,13 +15,13 @@
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
-${_('cm_app_header_new')}
+${_('Create new event')}
</div>
<div id="modusfield">
<div class="actions">
<ul>
<li>
- <a href="${h.url_for(controller='/caseappointment', action='index', id=session['case'].id)}"> ${_('menu_app_link_overview_back')}</a>
+ <a href="${h.url_for(controller='/caseappointment', action='index', id=session['case'].id)}"> ${_('Back to: User overview')}</a>
</li>
</ul>
</div>
Modified: base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako 2011-02-23 11:33:37 UTC (rev 4691)
+++ base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako 2011-02-23 12:42:27 UTC (rev 4692)
@@ -3,11 +3,11 @@
${parent.buildNavipath()}
<li><a href="${h.url_for(controller='/case', action='select', id=c.appointment.case_id, confirmed=1)}">${_('cm_np_select')}</a></li>
<li><a href="${h.url_for(controller='/caseappointment', action='index', id=c.appointment.case_id)}">${_('Appointments list')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='show', id=c.appointment.id)}">${_('app_np_show')}</a></li>
+ <li><a href="${h.url_for(controller='/caseappointment', action='show', id=c.appointment.id)}">${_('Event view')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
- ${_('app_header_show')}
+ ${_('Event view')}
</div>
<div id="modusfield">
<div class="actions">
@@ -20,7 +20,7 @@
</li>
% endif
<li>
- <a href="${h.url_for(controller='/caseappointment', action='index', id=c.appointment.case_id)}">${_('menu_app_link_overview_back')}</a>
+ <a href="${h.url_for(controller='/caseappointment', action='index', id=c.appointment.case_id)}">${_('Back to: User overview')}</a>
</li>
</ul>
</div>
Modified: base/trunk/mpulsweb/templates/home/globalappointmentlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/home/globalappointmentlist.mako 2011-02-23 11:33:37 UTC (rev 4691)
+++ base/trunk/mpulsweb/templates/home/globalappointmentlist.mako 2011-02-23 12:42:27 UTC (rev 4692)
@@ -8,9 +8,9 @@
<table class="appointment">
<tr>
- <th class="date table_header_h">${_('app_overview_tbl_header_date')}</th>
- <th class="title table_header_h">${_('app_overview_tbl_header_desc')}</th>
- <th class="action table_header_h">${_('app_overview_tbl_header_actions')}</th>
+ <th class="date table_header_h">${_('Date')}</th>
+ <th class="title table_header_h">${_('Description')}</th>
+ <th class="action table_header_h">${_('Actions')}</th>
</tr>
% for appointment in c.globalappointmentlist.getDatasets():
<tr>
Modified: base/trunk/mpulsweb/templates/logbook/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/overview.mako 2011-02-23 11:33:37 UTC (rev 4691)
+++ base/trunk/mpulsweb/templates/logbook/overview.mako 2011-02-23 12:42:27 UTC (rev 4692)
@@ -98,7 +98,7 @@
width="10"
height="9"></a>
</th>
- <th class="action table_header_h">${_('app_overview_tbl_header_actions')}</th>
+ <th class="action table_header_h">${_('Actions')}</th>
</tr>
% if c.logbook.hasEntries():
% for entry in c.logbook.getEntries():
More information about the Mpuls-commits
mailing list