[Mpuls-commits] r4641 - in base/trunk: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/model mpulsweb/templates mpulsweb/templates/appointments/dialogs mpulsweb/templates/casemanagement mpulsweb/templates/casemanagement/dialogs mpulsweb/templates/usersettings mpulsweb.egg-info

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Thu Feb 17 13:00:55 CET 2011


Author: ludwig
Date: 2011-02-17 13:00:51 +0100 (Thu, 17 Feb 2011)
New Revision: 4641

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb.egg-info/PKG-INFO
   base/trunk/mpulsweb.egg-info/SOURCES.txt
   base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
   base/trunk/mpulsweb/i18n/mpulsweb.pot
   base/trunk/mpulsweb/model/case.py
   base/trunk/mpulsweb/templates/appointments/dialogs/confirm.mako
   base/trunk/mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako
   base/trunk/mpulsweb/templates/base.mako
   base/trunk/mpulsweb/templates/casemanagement/caselist.mako
   base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako
   base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako
   base/trunk/mpulsweb/templates/main.mako
   base/trunk/mpulsweb/templates/usersettings/change_password.mako
   base/trunk/mpulsweb/templates/usersettings/show_settings.mako
Log:
update of the msgids (part 3)

Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-02-17 10:45:31 UTC (rev 4640)
+++ base/trunk/ChangeLog	2011-02-17 12:00:51 UTC (rev 4641)
@@ -1,5 +1,23 @@
 2011-02-17  Ludwig Reiter <ludwig.reiter at intevation.de>
+	
+	* mpulsweb.egg-info/SOURCES.txt,
+	mpulsweb.egg-info/PKG-INFO,
+	mpulsweb/i18n/mpulsweb.pot,
+	mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po,
+	mpulsweb/model/case.py,
+	mpulsweb/templates/appointments/dialogs/confirm.mako,
+	mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako,
+	mpulsweb/templates/usersettings/show_settings.mako,
+	mpulsweb/templates/usersettings/change_password.mako,
+	mpulsweb/templates/base.mako,
+	mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako,
+	mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako,
+	mpulsweb/templates/casemanagement/caselist.mako,
+	mpulsweb/templates/main.mako: Update of msgids (Part 3)
 
+
+2011-02-17  Ludwig Reiter <ludwig.reiter at intevation.de>
+
 	* mpulsweb/i18n/mpulsweb.pot
 	  mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
 	  mpulsweb/controllers/usersettings.py

Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po	2011-02-17 10:45:31 UTC (rev 4640)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po	2011-02-17 12:00:51 UTC (rev 4641)
@@ -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 11:39+0100\n"
+"PO-Revision-Date: 2011-02-17 12:56+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"
@@ -204,7 +204,7 @@
 msgid "No help available"
 msgstr "Keine Hilfe verfügbar"
 
-#: mpulsweb/controllers/annotations.py:36
+#: mpulsweb/controllers/annotations.py:36 mpulsweb/templates/main.mako:48
 #: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:16
 #: mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako:14
 msgid "Help"
@@ -1042,19 +1042,20 @@
 #: mpulsweb/model/case.py:1297 mpulsweb/model/case.py:1298
 #: mpulsweb/templates/casemanagement/caselist.mako:173
 #: mpulsweb/templates/casemanagement/caselist.mako:174
-msgid "case_state_label_open"
+#: mpulsweb/templates/search/search.mako:66
+msgid "Editable"
 msgstr "Bearbeitbar"
 
 #: mpulsweb/model/case.py:1299
-msgid "case_state_label_outstanding_delete"
+msgid "Outstanding deleted"
 msgstr "Schwebend gelöscht"
 
 #: mpulsweb/model/case.py:1300
-msgid "case_state_label_outstanding_anon"
+msgid "Outstanding made anonymous"
 msgstr "Schwebend anonymisiert"
 
 #: mpulsweb/model/case.py:1301
-msgid "case_state_label_anon"
+msgid "Make anonymous"
 msgstr "Anonymisiert"
 
 #: mpulsweb/model/case.py:1450
@@ -1137,7 +1138,7 @@
 msgstr "Super-Administration"
 
 #: mpulsweb/templates/base.mako:6 mpulsweb/templates/main.mako:208
-msgid "main_formular_input_error"
+msgid "Wrong formular input"
 msgstr "Fehlerhafte Formulareingabe"
 
 #: mpulsweb/templates/base.mako:75
@@ -1153,30 +1154,26 @@
 "gelöscht werden."
 
 #: mpulsweb/templates/main.mako:5
-msgid "statusbar_logininfo"
+msgid "Login as"
 msgstr "Angemeldet als"
 
 #: mpulsweb/templates/main.mako:8 mpulsweb/templates/main.mako:18
 #: mpulsweb/templates/main.mako:36
 #: mpulsweb/templates/usersettings/change_password.mako:6
 #: mpulsweb/templates/usersettings/show_settings.mako:4
-msgid "sm_menu_link_settings"
+msgid "My Account"
 msgstr "Mein Konto"
 
 #: mpulsweb/templates/main.mako:28 mpulsweb/templates/main.mako:83
-msgid "sm_menu_link_home"
+msgid "Black board"
 msgstr "Schwarzes Brett"
 
 #: mpulsweb/templates/main.mako:43 mpulsweb/templates/main.mako:223
-msgid "sm_menu_link_responsible"
+msgid "Info"
 msgstr "Info"
 
-#: mpulsweb/templates/main.mako:48
-msgid "sm_menu_link_help"
-msgstr "Hilfe"
-
 #: mpulsweb/templates/main.mako:53
-msgid "sm_menu_link_logout"
+msgid "Logout"
 msgstr "Abmelden"
 
 #: mpulsweb/templates/main.mako:61 mpulsweb/templates/main.mako:79
@@ -1189,27 +1186,27 @@
 #: mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako:5
 #: mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako:5
 #: mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako:6
-msgid "menu_app_link_overview"
+msgid "Events"
 msgstr "Termine"
 
 #: mpulsweb/templates/main.mako:100
-msgid "menu_doc_link_overview"
+msgid "Documents"
 msgstr "Dokumente"
 
 #: mpulsweb/templates/main.mako:111
-msgid "menu_header_cm"
+msgid "Case Management"
 msgstr "Case Management"
 
-#: mpulsweb/templates/main.mako:116 mpulsweb/templates/help/help.mako:6
-msgid "menu_cm_link_overview"
+#: mpulsweb/templates/main.mako:116
+msgid "Case documents\t"
 msgstr "Fallakten\t"
 
 #: mpulsweb/templates/main.mako:122
-msgid "menu_cm_link_new"
+msgid "New case document"
 msgstr "Fallakte anlegen"
 
 #: mpulsweb/templates/main.mako:128
-msgid "menu_cm_link_import"
+msgid "Import case document"
 msgstr "Fallakte importieren"
 
 #: mpulsweb/templates/main.mako:141
@@ -1885,8 +1882,10 @@
 #: mpulsweb/templates/appointments/show.mako:20
 #: mpulsweb/templates/casemanagement/newAppointment.mako:24
 #: mpulsweb/templates/casemanagement/showAppointment.mako:23
+#, fuzzy
+#| msgid "menu_adm_link_useroverview_back"
 msgid "menu_app_link_overview_back"
-msgstr "Zurück zu: Terminübersicht"
+msgstr "Zurück zu: Benutzerübersicht"
 
 #: mpulsweb/templates/appointments/overview.mako:8
 #: mpulsweb/templates/casemanagement/appointments.mako:10
@@ -2260,7 +2259,7 @@
 
 #: mpulsweb/templates/casemanagement/caselist.mako:194
 #: mpulsweb/templates/casemanagement/caselist.mako:195
-msgid "case_state_label_anonym"
+msgid "Make anonymousym"
 msgstr "Anonymisiert"
 
 #: mpulsweb/templates/casemanagement/caselist.mako:218
@@ -2742,8 +2741,10 @@
 msgstr "Neues Dokument hinzufügen "
 
 #: mpulsweb/templates/documents/global_upload.mako:18
+#, fuzzy
+#| msgid "menu_adm_link_useroverview_back"
 msgid "menu_doc_link_overview_back"
-msgstr "Zurück zu: Dokumentenübersicht"
+msgstr "Zurück zu: Benutzerübersicht"
 
 #: mpulsweb/templates/documents/dialogs/confirm.mako:5
 msgid "doc_np_delete"
@@ -2858,6 +2859,12 @@
 msgid "Helppage for %s"
 msgstr "Hilfe für %s"
 
+#: mpulsweb/templates/help/help.mako:6
+#, fuzzy
+#| msgid "menu_adm_link_useroverview"
+msgid "menu_cm_link_overview"
+msgstr "Benutzer"
+
 #: mpulsweb/templates/help/help.mako:91
 msgid "Common help"
 msgstr "Allgemeine Hilfe"
@@ -3099,10 +3106,6 @@
 msgid "Editable cases"
 msgstr "Bearbeitbare Fallakten"
 
-#: mpulsweb/templates/search/search.mako:66
-msgid "Editable"
-msgstr "Bearbeitbare"
-
 #: mpulsweb/templates/search/search.mako:69
 msgid "Almost deleted"
 msgstr "Schwebend gelöscht"
@@ -3293,8 +3296,7 @@
 msgstr "Benutzerpasswort ändern"
 
 #: mpulsweb/templates/usersettings/change_password.mako:22
-#: mpulsweb/templates/usersettings/edit_standin.mako:11
-msgid "sm_menu_link_settings_back"
+msgid "Back to: My Account"
 msgstr "Zurück zu: Mein Konto"
 
 #: mpulsweb/templates/usersettings/change_password.mako:34
@@ -3348,6 +3350,12 @@
 msgid "usrset_header_changestandin"
 msgstr "Vertretung setzen"
 
+#: mpulsweb/templates/usersettings/edit_standin.mako:11
+#, fuzzy
+#| msgid "cm_menu_link_document_back"
+msgid "sm_menu_link_settings_back"
+msgstr "Zurück zu: Anlagenübersicht"
+
 #: mpulsweb/templates/usersettings/edit_standin.mako:18
 msgid "usrset_explain_changestandin"
 msgstr ""
@@ -3382,3 +3390,9 @@
 msgid "adm_np_changepassword"
 msgstr "Benutzerpasswort geändert!"
 
+#~ msgid "Back to: Events"
+#~ msgstr "Zurück zu: Terminübersicht"
+
+#~ msgid "Back to: Documents"
+#~ msgstr "Zurück zu: Dokumentenübersicht"
+

Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot	2011-02-17 10:45:31 UTC (rev 4640)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot	2011-02-17 12:00:51 UTC (rev 4641)
@@ -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 11:38+0100\n"
+"POT-Creation-Date: 2011-02-17 12:56+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"
@@ -164,7 +164,7 @@
 msgid "No help available"
 msgstr ""
 
-#: mpulsweb/controllers/annotations.py:36
+#: mpulsweb/controllers/annotations.py:36 mpulsweb/templates/main.mako:48
 #: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:16
 #: mpulsweb/templates/phase/dialogs/success_halfautomatic_set_phase.mako:14
 msgid "Help"
@@ -870,19 +870,20 @@
 #: mpulsweb/model/case.py:1297 mpulsweb/model/case.py:1298
 #: mpulsweb/templates/casemanagement/caselist.mako:173
 #: mpulsweb/templates/casemanagement/caselist.mako:174
-msgid "case_state_label_open"
+#: mpulsweb/templates/search/search.mako:66
+msgid "Editable"
 msgstr ""
 
 #: mpulsweb/model/case.py:1299
-msgid "case_state_label_outstanding_delete"
+msgid "Outstanding deleted"
 msgstr ""
 
 #: mpulsweb/model/case.py:1300
-msgid "case_state_label_outstanding_anon"
+msgid "Outstanding made anonymous"
 msgstr ""
 
 #: mpulsweb/model/case.py:1301
-msgid "case_state_label_anon"
+msgid "Make anonymous"
 msgstr ""
 
 #: mpulsweb/model/case.py:1450
@@ -956,7 +957,7 @@
 msgstr ""
 
 #: mpulsweb/templates/base.mako:6 mpulsweb/templates/main.mako:208
-msgid "main_formular_input_error"
+msgid "Wrong formular input"
 msgstr ""
 
 #: mpulsweb/templates/base.mako:75
@@ -968,30 +969,26 @@
 msgstr ""
 
 #: mpulsweb/templates/main.mako:5
-msgid "statusbar_logininfo"
+msgid "Login as"
 msgstr ""
 
 #: mpulsweb/templates/main.mako:8 mpulsweb/templates/main.mako:18
 #: mpulsweb/templates/main.mako:36
 #: mpulsweb/templates/usersettings/change_password.mako:6
 #: mpulsweb/templates/usersettings/show_settings.mako:4
-msgid "sm_menu_link_settings"
+msgid "My Account"
 msgstr ""
 
 #: mpulsweb/templates/main.mako:28 mpulsweb/templates/main.mako:83
-msgid "sm_menu_link_home"
+msgid "Black board"
 msgstr ""
 
 #: mpulsweb/templates/main.mako:43 mpulsweb/templates/main.mako:223
-msgid "sm_menu_link_responsible"
+msgid "Info"
 msgstr ""
 
-#: mpulsweb/templates/main.mako:48
-msgid "sm_menu_link_help"
-msgstr ""
-
 #: mpulsweb/templates/main.mako:53
-msgid "sm_menu_link_logout"
+msgid "Logout"
 msgstr ""
 
 #: mpulsweb/templates/main.mako:61 mpulsweb/templates/main.mako:79
@@ -1004,27 +1001,27 @@
 #: mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako:5
 #: mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako:5
 #: mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako:6
-msgid "menu_app_link_overview"
+msgid "Events"
 msgstr ""
 
 #: mpulsweb/templates/main.mako:100
-msgid "menu_doc_link_overview"
+msgid "Documents"
 msgstr ""
 
 #: mpulsweb/templates/main.mako:111
-msgid "menu_header_cm"
+msgid "Case Management"
 msgstr ""
 
-#: mpulsweb/templates/main.mako:116 mpulsweb/templates/help/help.mako:6
-msgid "menu_cm_link_overview"
+#: mpulsweb/templates/main.mako:116
+msgid "Case documents\t"
 msgstr ""
 
 #: mpulsweb/templates/main.mako:122
-msgid "menu_cm_link_new"
+msgid "New case document"
 msgstr ""
 
 #: mpulsweb/templates/main.mako:128
-msgid "menu_cm_link_import"
+msgid "Import case document"
 msgstr ""
 
 #: mpulsweb/templates/main.mako:141
@@ -2061,7 +2058,7 @@
 
 #: mpulsweb/templates/casemanagement/caselist.mako:194
 #: mpulsweb/templates/casemanagement/caselist.mako:195
-msgid "case_state_label_anonym"
+msgid "Make anonymousym"
 msgstr ""
 
 #: mpulsweb/templates/casemanagement/caselist.mako:218
@@ -2647,6 +2644,10 @@
 msgid "Helppage for %s"
 msgstr ""
 
+#: mpulsweb/templates/help/help.mako:6
+msgid "menu_cm_link_overview"
+msgstr ""
+
 #: mpulsweb/templates/help/help.mako:91
 msgid "Common help"
 msgstr ""
@@ -2871,10 +2872,6 @@
 msgid "Editable cases"
 msgstr ""
 
-#: mpulsweb/templates/search/search.mako:66
-msgid "Editable"
-msgstr ""
-
 #: mpulsweb/templates/search/search.mako:69
 msgid "Almost deleted"
 msgstr ""
@@ -3052,8 +3049,7 @@
 msgstr ""
 
 #: mpulsweb/templates/usersettings/change_password.mako:22
-#: mpulsweb/templates/usersettings/edit_standin.mako:11
-msgid "sm_menu_link_settings_back"
+msgid "Back to: My Account"
 msgstr ""
 
 #: mpulsweb/templates/usersettings/change_password.mako:34
@@ -3103,6 +3099,10 @@
 msgid "usrset_header_changestandin"
 msgstr ""
 
+#: mpulsweb/templates/usersettings/edit_standin.mako:11
+msgid "sm_menu_link_settings_back"
+msgstr ""
+
 #: mpulsweb/templates/usersettings/edit_standin.mako:18
 msgid "usrset_explain_changestandin"
 msgstr ""

Modified: base/trunk/mpulsweb/model/case.py
===================================================================
--- base/trunk/mpulsweb/model/case.py	2011-02-17 10:45:31 UTC (rev 4640)
+++ base/trunk/mpulsweb/model/case.py	2011-02-17 12:00:51 UTC (rev 4641)
@@ -1294,11 +1294,11 @@
             db.recycleConnection(conn, cur)
 
     def getStateLabel(self):
-        state_labels = {'1': _('case_state_label_open'),
-                        '2': _('case_state_label_open'),
-                        '3': _('case_state_label_outstanding_delete'),
-                        '4': _('case_state_label_outstanding_anon'),
-                        '5': _('case_state_label_anon'),
+        state_labels = {'1': _('Editable'),
+                        '2': _('Editable'),
+                        '3': _('Outstanding deleted'),
+                        '4': _('Outstanding made anonymous'),
+                        '5': _('Make anonymous'),
                         }
         return state_labels.get(str(self.state))
 

Modified: base/trunk/mpulsweb/templates/appointments/dialogs/confirm.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/dialogs/confirm.mako	2011-02-17 10:45:31 UTC (rev 4640)
+++ base/trunk/mpulsweb/templates/appointments/dialogs/confirm.mako	2011-02-17 12:00:51 UTC (rev 4641)
@@ -1,7 +1,7 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-        <li><a href="${h.url_for(controller='/appointment')}">${_('menu_app_link_overview')}</a></li>
+        <li><a href="${h.url_for(controller='/appointment')}">${_('Events')}</a></li>
 	<li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('app_np_list')}</a></li>
 	<li><a href="#">${_('app_np_delete')}</a></li>
 </%def>

Modified: base/trunk/mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako	2011-02-17 10:45:31 UTC (rev 4640)
+++ base/trunk/mpulsweb/templates/appointments/dialogs/success_delete_appointment.mako	2011-02-17 12:00:51 UTC (rev 4641)
@@ -2,7 +2,7 @@
 <%inherit file="../../main.mako" />
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
-	<li><a href="${h.url_for(controller='/appointment')}">${_('menu_app_link_overview')}</a></li>
+	<li><a href="${h.url_for(controller='/appointment')}">${_('Events')}</a></li>
 	<li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('app_np_list')}</a></li>
 	<li><a href="#">${_('app_np_delete')}</a></li>
 </%def>

Modified: base/trunk/mpulsweb/templates/base.mako
===================================================================
--- base/trunk/mpulsweb/templates/base.mako	2011-02-17 10:45:31 UTC (rev 4640)
+++ base/trunk/mpulsweb/templates/base.mako	2011-02-17 12:00:51 UTC (rev 4641)
@@ -3,7 +3,7 @@
   <% formular_labels = labels or {} %>
   % if len(c.form_errors) > 0:
     <div class="form_errors">
-      <h1><a name="error_list">${_('main_formular_input_error')}</a></h1>
+      <h1><a name="error_list">${_('Wrong formular input')}</a></h1>
       <ul>
         % for key, value in c.form_errors.iteritems():
           <li>${_(formular_labels.get(key, '%s' % key))}: ${value}</li>

Modified: base/trunk/mpulsweb/templates/casemanagement/caselist.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/caselist.mako	2011-02-17 10:45:31 UTC (rev 4640)
+++ base/trunk/mpulsweb/templates/casemanagement/caselist.mako	2011-02-17 12:00:51 UTC (rev 4641)
@@ -170,8 +170,8 @@
   % if case.getState().getState() in (1,2):
     <img src    = "${h.url_for('/images/icons/edit_22.png')}"
          border = "0"
-         alt    = "${_('case_state_label_open')}"
-         title  = "${_('case_state_label_open')}"
+         alt    = "${_('Editable')}"
+         title  = "${_('Editable')}"
          width  = "22"
          height = "22">
   % elif case.getState().getState() == 3:
@@ -191,8 +191,8 @@
   % elif case.getState().getState() == 5:
     <img src    = "${h.url_for('/images/icons/anonymise_inactive_22.png')}"
          border = "0"
-         alt    = "${_('case_state_label_anonym')}"
-         title  = "${_('case_state_label_anonym')}"
+         alt    = "${_('Make anonymousym')}"
+         title  = "${_('Make anonymousym')}"
          width  = "22"
          height = "22">
   % endif

Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako	2011-02-17 10:45:31 UTC (rev 4640)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako	2011-02-17 12:00:51 UTC (rev 4641)
@@ -2,7 +2,7 @@
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
         <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
-	<li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('menu_app_link_overview')}</a></li>
+	<li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('Events')}</a></li>
 	<li><a href="#">${_('app_np_delete')}</a></li>
 </%def>
 <%include file="../../dialogs/confirm.mako" />

Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako	2011-02-17 10:45:31 UTC (rev 4640)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako	2011-02-17 12:00:51 UTC (rev 4641)
@@ -3,7 +3,7 @@
 <%def name="buildNavipath()">
 	${parent.buildNavipath()}
         <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
-	<li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('menu_app_link_overview')}</a></li>
+	<li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('Events')}</a></li>
 	<li><a href="#">${_('app_np_delete')}</a></li>
 </%def>
 <%include file="../../dialogs/success.mako" />

Modified: base/trunk/mpulsweb/templates/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/main.mako	2011-02-17 10:45:31 UTC (rev 4640)
+++ base/trunk/mpulsweb/templates/main.mako	2011-02-17 12:00:51 UTC (rev 4641)
@@ -2,10 +2,10 @@
 <%inherit file="base.mako" />
 <%def name="buildStatusBar()">
   <div id="statusbar">
-    ${_('statusbar_logininfo')}:
+    ${_('Login as')}:
         <a href="${h.url_for(controller='/usersettings', action='showSettings',
                              id=h.getUserId())}"
-           title="${_('sm_menu_link_settings')}"
+           title="${_('My Account')}"
            onclick="return checkModification();">
     % if h.getLogin() != 'adm':
         <strong>${h.getUserFullname()}</strong></a> (${h.getRole()})
@@ -15,7 +15,7 @@
     <!--|
     <a href="${h.url_for(controller='/usersettings', action='showSettings',
                              id=h.getUserId())}"
-           onclick="return checkModification();">${_('sm_menu_link_settings')}</a>-->
+           onclick="return checkModification();">${_('My Account')}</a>-->
   </div>
 </%def>
 
@@ -25,7 +25,7 @@
       <li>
         <a href="${h.url_for(controller='/')}"
            onclick="return checkModification();">
-          ${_('sm_menu_link_home')}
+          ${_('Black board')}
         </a>
       </li>
       % if g.mpuls_config.is_enabled('module', 'administration'):
@@ -33,24 +33,24 @@
         <a href="${h.url_for(controller='/usersettings', action='showSettings',
                              id=h.getUserId())}"
            onclick="return checkModification();">
-          ${_('sm_menu_link_settings')}
+          ${_('My Account')}
         </a>
       </li>
       % endif
       <!--<li>
         <a href="${h.url_for(controller='/info')}"
            onclick="return checkModification();">
-          ${_('sm_menu_link_responsible')}</a>
+          ${_('Info')}</a>
       </li>-->
       <li>
           <a href="${h.url_for(controller='/help')}"
            onclick="return checkModification();">
-           ${_('sm_menu_link_help')}</a>
+           ${_('Help')}</a>
       </li>
       <li>
         <a href="${h.url_for(controller='/auth', action='logout')}"
            onclick="return checkModification();">
-          ${_('sm_menu_link_logout')}</a>
+          ${_('Logout')}</a>
       </li>
     </ul>
   </div>
@@ -80,7 +80,7 @@
           <ul>
             <li>
               <a href="${h.url_for(controller='/')}">
-                ${_('sm_menu_link_home')}
+                ${_('Black board')}
               </a>
             </li>
             ## APPOINTMENTS 
@@ -88,7 +88,7 @@
               <li>
                 <a href="${h.url_for(controller='/appointment',
                                      action='overview')}">
-                  ${_('menu_app_link_overview')}
+                  ${_('Events')}
                 </a>
               </li>
             % endif
@@ -97,7 +97,7 @@
               <li>
                 <a href="${h.url_for(controller='/document', 
                                      action='globalOverview')}">
-                  ${_('menu_doc_link_overview')}
+                  ${_('Documents')}
                 </a>
               </li>
             % endif
@@ -108,24 +108,24 @@
     <div class="menu">
       <div class="actions">
         % if g.mpuls_config.is_enabled('module', 'casemanagement'):
-          <h1>${_('menu_header_cm')}</h1>
+          <h1>${_('Case Management')}</h1>
           <ul>
             <li>
               <a href="${h.url_for(controller='/case_overview',
                                    action='overview')}">
-                ${_('menu_cm_link_overview')}
+                ${_('Case documents	')}
               </a>
             </li>
             % if h.hasRole(['cm_ka']):
               <li>
                 <a href="${h.url_for(controller='/case', action='new')}">
-                  ${_('menu_cm_link_new')}
+                  ${_('New case document')}
                 </a> 
               </li>
               % if g.mpuls_config.is_enabled('case-module', 'import'):
                 <li>
                   <a href="${h.url_for(controller='/case', action='importCase')}">
-                    ${_('menu_cm_link_import')}
+                    ${_('Import case document')}
                   </a>
                 </li>
               % endif
@@ -205,7 +205,7 @@
   <% formular_labels = labels or {} %>
   % if len(c.form_errors) > 0:
     <div class="form_errors">
-      <h1><a name="error_list">${_('main_formular_input_error')}</a></h1>
+      <h1><a name="error_list">${_('Wrong formular input')}</a></h1>
       <ul>
         % for key, value in c.form_errors.iteritems():
           <li>${_(formular_labels.get(key, '%s' % key))}: ${value}</li>
@@ -220,7 +220,7 @@
     <div id="version_str">
     <a href="${h.url_for(controller='/info')}"
            onclick="return checkModification();">
-          ${_('sm_menu_link_responsible')}</a>
+          ${_('Info')}</a>
       | ${g.mpuls_config.get_app_name()}
       | ${g.mpuls_config.get_releasedate()}
       | ${g.mpuls_config.get_app_version()}

Modified: base/trunk/mpulsweb/templates/usersettings/change_password.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/change_password.mako	2011-02-17 10:45:31 UTC (rev 4640)
+++ base/trunk/mpulsweb/templates/usersettings/change_password.mako	2011-02-17 12:00:51 UTC (rev 4641)
@@ -3,7 +3,7 @@
 <%def name="buildNavipath()">
   <li><a href="${h.url_for(controller='/usersettings', action='showSettings',
                            id=h.getUserId())}"
-         onclick="return checkModification();">${_('sm_menu_link_settings')}</a></li>
+         onclick="return checkModification();">${_('My Account')}</a></li>
   <li><a href="#" onclick="return checkModification();">${_('adm_header_changepassword')}
 </a></li>
 </%def>
@@ -19,7 +19,7 @@
   <div id="modusfield">
     <div class="actions">
 	<ul>
-		<li><a href="${h.url_for(controller='usersettings', action='showSettings', id=h.getUserId())}"> ${_('sm_menu_link_settings_back')}</a></li>
+		<li><a href="${h.url_for(controller='usersettings', action='showSettings', id=h.getUserId())}"> ${_('Back to: My Account')}</a></li>
 	</ul>
     </div>
   </div>

Modified: base/trunk/mpulsweb/templates/usersettings/show_settings.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/show_settings.mako	2011-02-17 10:45:31 UTC (rev 4640)
+++ base/trunk/mpulsweb/templates/usersettings/show_settings.mako	2011-02-17 12:00:51 UTC (rev 4641)
@@ -1,7 +1,7 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="../main.mako" />
 <%def name="buildNavipath()">
-  <li><a href="#" onclick="return checkModification();">${_('sm_menu_link_settings')}</a></li>
+  <li><a href="#" onclick="return checkModification();">${_('My Account')}</a></li>
 </%def>
 <div id="content_header_small">
   <div id="content_ueberschrift">

Modified: base/trunk/mpulsweb.egg-info/PKG-INFO
===================================================================
--- base/trunk/mpulsweb.egg-info/PKG-INFO	2011-02-17 10:45:31 UTC (rev 4640)
+++ base/trunk/mpulsweb.egg-info/PKG-INFO	2011-02-17 12:00:51 UTC (rev 4641)
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: mpulsweb
-Version: 2.0.0-predev-r4515
+Version: 2.0.0-predev-r4614
 Summary: mpuls ist ein Web-Applikations-Rahmen zur Verwaltung                  von elektronischen Fallakten (Schwerpunkt Sozialinformatik)
 Home-page: http://wald.intevation.org/projects/mpuls/
 Author: Intevation GmbH

Modified: base/trunk/mpulsweb.egg-info/SOURCES.txt
===================================================================
--- base/trunk/mpulsweb.egg-info/SOURCES.txt	2011-02-17 10:45:31 UTC (rev 4640)
+++ base/trunk/mpulsweb.egg-info/SOURCES.txt	2011-02-17 12:00:51 UTC (rev 4641)
@@ -30,6 +30,21 @@
 mpulsweb/commands/__init__.py
 mpulsweb/commands/db/__init__.py
 mpulsweb/commands/db/common.py
+mpulsweb/commands/db/scripts/mpuls-create-db.sql
+mpulsweb/commands/db/scripts/mpuls-create-tables.txt
+mpulsweb/commands/db/scripts/mpuls-create-tables.txt.old
+mpulsweb/commands/db/scripts/mpuls-init-cluster.sql
+mpulsweb/commands/db/scripts/mpuls-init-db.sql
+mpulsweb/commands/db/scripts/install/00_preconditions.sql
+mpulsweb/commands/db/scripts/install/01_user.sql
+mpulsweb/commands/db/scripts/install/02_datamodel.sql
+mpulsweb/commands/db/scripts/install/03_configuration.sql
+mpulsweb/commands/db/scripts/install/04_documents.sql
+mpulsweb/commands/db/scripts/install/05_appointments.sql
+mpulsweb/commands/db/scripts/install/06_logbook.sql
+mpulsweb/commands/db/scripts/install/07_news.sql
+mpulsweb/commands/db/scripts/install/08_tags.sql
+mpulsweb/commands/db/scripts/install/09_helpers.sql
 mpulsweb/config/__init__.py
 mpulsweb/config/environment.py
 mpulsweb/config/importer.py
@@ -60,6 +75,7 @@
 mpulsweb/controllers/privacy.py
 mpulsweb/controllers/repeatgroup.py
 mpulsweb/controllers/settings.py
+mpulsweb/controllers/statement.py
 mpulsweb/controllers/tags.py
 mpulsweb/controllers/usersettings.py
 mpulsweb/i18n/mpulsweb.pot
@@ -73,9 +89,9 @@
 mpulsweb/lib/dialogs.py
 mpulsweb/lib/evaluation.py
 mpulsweb/lib/export.py
+mpulsweb/lib/formedrenderer.py
 mpulsweb/lib/helpers.py
 mpulsweb/lib/navigation.py
-mpulsweb/lib/renderer.py
 mpulsweb/lib/search.py
 mpulsweb/lib/security.py
 mpulsweb/lib/session.py
@@ -127,6 +143,7 @@
 mpulsweb/public/images/icons/open_active_22.png
 mpulsweb/public/images/icons/phase-running-22.png
 mpulsweb/public/images/icons/phase-stop-22.png
+mpulsweb/public/images/icons/refresh_active_16.png
 mpulsweb/public/images/icons/refresh_active_22.png
 mpulsweb/public/images/icons/sort_asc.png
 mpulsweb/public/images/icons/sort_asc_active.png
@@ -143,6 +160,8 @@
 mpulsweb/public/images/icons/case_status/c_running.png
 mpulsweb/public/images/icons/case_status/e_finished.png
 mpulsweb/public/images/icons/case_status/e_running.png
+mpulsweb/public/images/icons/case_status/f_finished.png
+mpulsweb/public/images/icons/case_status/f_running.png
 mpulsweb/public/images/icons/case_status/n_finished.png
 mpulsweb/public/images/icons/case_status/n_running.png
 mpulsweb/public/images/icons/case_status/u_finished.png
@@ -220,6 +239,8 @@
 mpulsweb/public/images/svg/case_status/c_stopped.svg
 mpulsweb/public/images/svg/case_status/e_running.svg
 mpulsweb/public/images/svg/case_status/e_stopped.svg
+mpulsweb/public/images/svg/case_status/f_running.svg
+mpulsweb/public/images/svg/case_status/f_stopped.svg
 mpulsweb/public/images/svg/case_status/n_running.svg
 mpulsweb/public/images/svg/case_status/n_stopped.svg
 mpulsweb/public/images/svg/case_status/u_running.svg
@@ -1336,6 +1357,8 @@
 mpulsweb/templates/settings/edit.mako
 mpulsweb/templates/settings/show.mako
 mpulsweb/templates/settings/dialogs/success_edit.mako
+mpulsweb/templates/statements/list.mako
+mpulsweb/templates/statements/statements.mako
 mpulsweb/templates/tags/tags.mako
 mpulsweb/templates/usersettings/change_password.mako
 mpulsweb/templates/usersettings/change_password_login.mako
@@ -1356,4 +1379,5 @@
 mpulsweb/tests/functional/test_logbook.py
 mpulsweb/tests/functional/test_mpuls.py
 mpulsweb/tests/functional/test_phase.py
+mpulsweb/tests/functional/test_statement.py
 mpulsweb/tests/functional/test_usersettings.py
\ No newline at end of file



More information about the Mpuls-commits mailing list