[Mpuls-commits] r4731 - in base/trunk: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/templates/casemanagement mpulsweb/templates/documents/dialogs mpulsweb/templates/privacy/dialogs mpulsweb/templates/settings mpulsweb/templates/usersettings
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Mar 1 12:54:22 CET 2011
Author: ludwig
Date: 2011-03-01 12:54:20 +0100 (Tue, 01 Mar 2011)
New Revision: 4731
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
base/trunk/mpulsweb/templates/casemanagement/new.mako
base/trunk/mpulsweb/templates/casemanagement/organisation.mako
base/trunk/mpulsweb/templates/documents/dialogs/delete_document_success.mako
base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako
base/trunk/mpulsweb/templates/settings/show.mako
base/trunk/mpulsweb/templates/usersettings/edit_standin.mako
Log:
Update of the msgids (part 18)
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2011-03-01 09:47:01 UTC (rev 4730)
+++ base/trunk/ChangeLog 2011-03-01 11:54:20 UTC (rev 4731)
@@ -1,3 +1,15 @@
+2011-03-01 Ludwig Reiter <ludwig.reiter at intevation.de>
+
+ * mpulsweb/i18n/mpulsweb.pot
+ mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
+ mpulsweb/templates/usersettings/edit_standin.mako
+ mpulsweb/templates/settings/show.mako
+ mpulsweb/templates/documents/dialogs/delete_document_success.mako
+ mpulsweb/templates/casemanagement/new.mako
+ mpulsweb/templates/casemanagement/organisation.mako
+ mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:
+ Update of the msgids (part 18)
+
2011-02-28 Torsten Irlaender <torsten at intevation.de>
* mpulsweb/templates/casemanagement/caselist.mako: Issue1533: Fixed
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-03-01 09:47:01 UTC (rev 4730)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-03-01 11:54:20 UTC (rev 4731)
@@ -8,7 +8,7 @@
"Project-Id-Version: mpulsweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
"POT-Creation-Date: 2009-10-08 09:54+0200\n"
-"PO-Revision-Date: 2011-02-28 14:43+0100\n"
+"PO-Revision-Date: 2011-03-01 12:50+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"
@@ -2092,6 +2092,7 @@
#: mpulsweb/templates/casemanagement/caselist.mako:157
#: mpulsweb/templates/casemanagement/caselist.mako:158
#: mpulsweb/templates/casemanagement/digest.mako:113
+#: mpulsweb/templates/casemanagement/organisation.mako:16
#: mpulsweb/templates/casemanagement/organisation.mako:49
#: mpulsweb/templates/casemanagement/organisation.mako:78
#: mpulsweb/templates/search/search.mako:39
@@ -2324,7 +2325,10 @@
msgstr "Fallakte anlegen"
#: mpulsweb/templates/casemanagement/new.mako:21
-msgid "cm_new_p_please_consider_statement"
+msgid ""
+"Please notice, that the acceptence statement is the base for entering "
+"personal data. Click on Print Statement. Use the Back button to get back "
+"to this page."
msgstr ""
"Bitte beachten Sie, dass die Einwilligungserklärung die Grundlage zur "
"Erfassung personenbezogener Daten ist. Klicken Sie hierzu auf die Auswahl"
@@ -2332,22 +2336,20 @@
"nach dem Drucken auf diese Seite zurückzukehren."
#: mpulsweb/templates/casemanagement/new.mako:24
-msgid "cm_new_con_acceptance_statement_true"
+msgid ""
+"The acceptence statement for entering, using and editing personal data "
+"has been obtained while initial meeting."
msgstr ""
"Die Einwilligungserklärung für die Erfassung, Verarbeitung und Nutzung "
"personenbezogener Daten wurde bereits zur Eingangsanamnese bzw. Beratung "
"vor dem Case Management eingeholt."
#: mpulsweb/templates/casemanagement/organisation.mako:15
-msgid "cm_organisation_con_whois_cm_replace"
+msgid "This page shows the main worker of a case document and his or her standin"
msgstr ""
"Diese Seite zeigt an, wer Hauptbearbeiterin / Hauptbearbeiter dieser "
"Fallakte ist und wer die Vertretung für die Bearbeitung übernimmt."
-#: mpulsweb/templates/casemanagement/organisation.mako:16
-msgid "Organisation_editor"
-msgstr "Bearbeiterin / Bearbeiter"
-
#: mpulsweb/templates/casemanagement/overview.mako:9
msgid "Case documents overview"
msgstr "Fallaktenübersicht"
@@ -2537,7 +2539,7 @@
#: mpulsweb/templates/documents/dialogs/delete_document_success.mako:5
#, fuzzy
-msgid "cm_np_delete_document_success"
+msgid "Deleted document!"
msgstr "Dokument gelöscht!"
#: mpulsweb/templates/documents/dialogs/failed_attachment.mako:6
@@ -2763,7 +2765,9 @@
msgstr "Fehlende Angabe zur Einwilligungserklärung"
#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:4
-msgid "statement_dialog_p_statement_no_explanation"
+msgid ""
+"The acceptance statement of the youth for work and usage of his data. You"
+" are resonsible for this."
msgstr ""
"Für die Fallakte liegt noch keine Einwilligungserklärung des Jugendlichen"
" zur Erfassung, Verarbeitung und Nutzung personenbezogener Daten seitens "
@@ -2771,7 +2775,10 @@
"Bestimmungen liegt in Ihrer Verantwortung."
#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:6
-msgid "statement_dialog_p_options"
+#, python-format
+msgid ""
+"Please notice that the acceptence statement needs to be written. For this"
+" use %s. Please choose:"
msgstr ""
"Bitte beachten Sie, dass die Einwilligungserklärung der schriftlichen "
"Form bedarf. Dazu steht Ihnen eine %s zur Verfügung.<br>Sie haben nun die"
@@ -2787,7 +2794,7 @@
msgstr "Eine Erklärung liegt vor"
#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:10
-msgid "Statement accepted_explanation"
+msgid ", when a statement is obtained."
msgstr ", wenn eine Einwilligungserklärung des Jugendlichen vorliegt."
#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:12
@@ -2796,7 +2803,7 @@
msgstr "Erklärung noch unklar"
#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:12
-msgid "Statement unclear_explanation"
+msgid ", when at the moment no statement is available, but should be obtained."
msgstr ""
", wenn zum jetzigen Zeitpunkt noch keine Erklärung vorliegt, aber noch "
"eingeholt werden soll."
@@ -2807,7 +2814,9 @@
msgstr "Eine Erklärung liegt nicht vor"
#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:14
-msgid "Statement declined_explanation"
+msgid ""
+", when no statement is available and wont be available. The case document"
+" will be made anonymous."
msgstr ""
", wenn keine Erklärung des Jugendlichen vorliegt und sicher nicht "
"vorliegen wird. Die Fallakte wird dann anonymisiert!"
@@ -2916,6 +2925,7 @@
#: mpulsweb/templates/settings/edit.mako:18
#: mpulsweb/templates/settings/edit.mako:24
+#: mpulsweb/templates/settings/show.mako:23
#: mpulsweb/templates/settings/dialogs/success_edit.mako:7
msgid "Edit settings"
msgstr "Einstellungen bearbeiten"
@@ -2972,12 +2982,8 @@
msgid "adm_header_showsettings"
msgstr "Einrichtungseinstellungen"
-#: mpulsweb/templates/settings/show.mako:23
-msgid "adm_actions_link_editsettings"
-msgstr "Einstellungen bearbeiten"
-
#: mpulsweb/templates/settings/show.mako:31
-msgid "adm_con_ss_view_agency"
+msgid "Here you can see institution wide settings."
msgstr "Hier können Sie die einrichtungsweiten Einstellungen sehen."
#: mpulsweb/templates/settings/show.mako:56
@@ -3076,7 +3082,11 @@
msgstr "Zurück zu: Anlagenübersicht"
#: mpulsweb/templates/usersettings/edit_standin.mako:18
-msgid "usrset_explain_changestandin"
+msgid ""
+"Here you can configure, which user at creation of a new case document is "
+"your standin. You can select a user or a group of users. These user have "
+"also access to this case document. This configuration has no effect on "
+"your current cases."
msgstr ""
"Hier können Sie einstellen, welche(r) MitarbeiterIn beim Anlegen einer "
"neuen Fallakte als Ihre Vertretung eingetragen wird. Es stehen sowohl "
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-03-01 09:47:01 UTC (rev 4730)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-03-01 11:54:20 UTC (rev 4731)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: mpulsweb 2.0.0-pre\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2011-02-28 14:43+0100\n"
+"POT-Creation-Date: 2011-03-01 12:50+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"
@@ -1892,6 +1892,7 @@
#: mpulsweb/templates/casemanagement/caselist.mako:157
#: mpulsweb/templates/casemanagement/caselist.mako:158
#: mpulsweb/templates/casemanagement/digest.mako:113
+#: mpulsweb/templates/casemanagement/organisation.mako:16
#: mpulsweb/templates/casemanagement/organisation.mako:49
#: mpulsweb/templates/casemanagement/organisation.mako:78
#: mpulsweb/templates/search/search.mako:39
@@ -2123,21 +2124,22 @@
msgstr ""
#: mpulsweb/templates/casemanagement/new.mako:21
-msgid "cm_new_p_please_consider_statement"
+msgid ""
+"Please notice, that the acceptence statement is the base for entering "
+"personal data. Click on Print Statement. Use the Back button to get back to "
+"this page."
msgstr ""
#: mpulsweb/templates/casemanagement/new.mako:24
-msgid "cm_new_con_acceptance_statement_true"
+msgid ""
+"The acceptence statement for entering, using and editing personal data has "
+"been obtained while initial meeting."
msgstr ""
#: mpulsweb/templates/casemanagement/organisation.mako:15
-msgid "cm_organisation_con_whois_cm_replace"
+msgid "This page shows the main worker of a case document and his or her standin"
msgstr ""
-#: mpulsweb/templates/casemanagement/organisation.mako:16
-msgid "Organisation_editor"
-msgstr ""
-
#: mpulsweb/templates/casemanagement/overview.mako:9
msgid "Case documents overview"
msgstr ""
@@ -2324,7 +2326,7 @@
msgstr ""
#: mpulsweb/templates/documents/dialogs/delete_document_success.mako:5
-msgid "cm_np_delete_document_success"
+msgid "Deleted document!"
msgstr ""
#: mpulsweb/templates/documents/dialogs/failed_attachment.mako:6
@@ -2545,11 +2547,16 @@
msgstr ""
#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:4
-msgid "statement_dialog_p_statement_no_explanation"
+msgid ""
+"The acceptance statement of the youth for work and usage of his data. You are"
+" resonsible for this."
msgstr ""
#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:6
-msgid "statement_dialog_p_options"
+#, python-format
+msgid ""
+"Please notice that the acceptence statement needs to be written. For this use"
+" %s. Please choose:"
msgstr ""
#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:6
@@ -2562,7 +2569,7 @@
msgstr ""
#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:10
-msgid "Statement accepted_explanation"
+msgid ", when a statement is obtained."
msgstr ""
#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:12
@@ -2571,7 +2578,7 @@
msgstr ""
#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:12
-msgid "Statement unclear_explanation"
+msgid ", when at the moment no statement is available, but should be obtained."
msgstr ""
#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:14
@@ -2580,7 +2587,9 @@
msgstr ""
#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:14
-msgid "Statement declined_explanation"
+msgid ""
+", when no statement is available and wont be available. The case document "
+"will be made anonymous."
msgstr ""
#: mpulsweb/templates/search/search.mako:7
@@ -2684,6 +2693,7 @@
#: mpulsweb/templates/settings/edit.mako:18
#: mpulsweb/templates/settings/edit.mako:24
+#: mpulsweb/templates/settings/show.mako:23
#: mpulsweb/templates/settings/dialogs/success_edit.mako:7
msgid "Edit settings"
msgstr ""
@@ -2732,12 +2742,8 @@
msgid "adm_header_showsettings"
msgstr ""
-#: mpulsweb/templates/settings/show.mako:23
-msgid "adm_actions_link_editsettings"
-msgstr ""
-
#: mpulsweb/templates/settings/show.mako:31
-msgid "adm_con_ss_view_agency"
+msgid "Here you can see institution wide settings."
msgstr ""
#: mpulsweb/templates/settings/show.mako:56
@@ -2830,7 +2836,11 @@
msgstr ""
#: mpulsweb/templates/usersettings/edit_standin.mako:18
-msgid "usrset_explain_changestandin"
+msgid ""
+"Here you can configure, which user at creation of a new case document is your"
+" standin. You can select a user or a group of users. These user have also "
+"access to this case document. This configuration has no effect on your "
+"current cases."
msgstr ""
#: mpulsweb/templates/usersettings/show_settings.mako:14
Modified: base/trunk/mpulsweb/templates/casemanagement/new.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/new.mako 2011-03-01 09:47:01 UTC (rev 4730)
+++ base/trunk/mpulsweb/templates/casemanagement/new.mako 2011-03-01 11:54:20 UTC (rev 4731)
@@ -18,10 +18,10 @@
projektspezifisches Template und passende Controller-Funktion</font></p>
</fieldset>
<div style="padding: 1em 0;">
- <p>${_('cm_new_p_please_consider_statement')}</p>
+ <p>${_('Please notice, that the acceptence statement is the base for entering personal data. Click on Print Statement. Use the Back button to get back to this page.')}</p>
</div>
<div class="waska_form_element w100">
- <input type="checkbox" id="statement_signed" name="statement_signed"><label for="statement_signed">${_('cm_new_con_acceptance_statement_true')}</label>
+ <input type="checkbox" id="statement_signed" name="statement_signed"><label for="statement_signed">${_('The acceptence statement for entering, using and editing personal data has been obtained while initial meeting.')}</label>
</div>
<div class="input_space">
<input type="submit" value="Erklärung drucken" name="print">
Modified: base/trunk/mpulsweb/templates/casemanagement/organisation.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/organisation.mako 2011-03-01 09:47:01 UTC (rev 4730)
+++ base/trunk/mpulsweb/templates/casemanagement/organisation.mako 2011-03-01 11:54:20 UTC (rev 4731)
@@ -12,8 +12,8 @@
${_('Organisation')}
</div>
</div>
-<p>${_('cm_organisation_con_whois_cm_replace')}</p>
-<h2>${_('Organisation_editor')}</h2>
+<p>${_('This page shows the main worker of a case document and his or her standin')}</p>
+<h2>${_('Editor')}</h2>
<table>
<tr>
<td class="label table_header_v table_width_mid_l">${_('Lastname')}</td><td class=" table_row_v table_description">${c.editor.last_name | F.NA}</td>
Modified: base/trunk/mpulsweb/templates/documents/dialogs/delete_document_success.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/delete_document_success.mako 2011-03-01 09:47:01 UTC (rev 4730)
+++ base/trunk/mpulsweb/templates/documents/dialogs/delete_document_success.mako 2011-03-01 11:54:20 UTC (rev 4731)
@@ -2,6 +2,6 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('Document overview')}</a></li>
- <li><a href="#">${_('cm_np_delete_document_success')}</a></li>
+ <li><a href="#">${_('Deleted document!')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako 2011-03-01 09:47:01 UTC (rev 4730)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako 2011-03-01 11:54:20 UTC (rev 4731)
@@ -1,17 +1,17 @@
## -*- coding: utf-8 -*-
<div class="dialog" />
<h1><img src="${h.url_for('/images/icons/info/info.png')}" alt="" width="48" height="48" />${_('Missing data for the statement')}</h1>
-<p>${_('statement_dialog_p_statement_no_explanation')}</p>
+<p>${_('The acceptance statement of the youth for work and usage of his data. You are resonsible for this.')}</p>
% if h.hasRole(['cm_ka']):
- <p>${h.literal(_('statement_dialog_p_options') % h.link_to(_('Printversion of this statement'), h.url_for(controller="/privacy", action="printStatement", id=c.ds_id)))}
+ <p>${h.literal(_('Please notice that the acceptence statement needs to be written. For this use %s. Please choose:') % h.link_to(_('Printversion of this statement'), h.url_for(controller="/privacy", action="printStatement", id=c.ds_id)))}
<ol>
<li>
- <strong>${_('Statement accepted')}</strong>${_('Statement accepted_explanation')}
+ <strong>${_('Statement accepted')}</strong>${_(', when a statement is obtained.')}
</li>
- <li><strong>${_('Statement unclear')}</strong>${_('Statement unclear_explanation')}
+ <li><strong>${_('Statement unclear')}</strong>${_(', when at the moment no statement is available, but should be obtained.')}
</li>
- <li><strong>${_('Statement declined')}</strong>${_('Statement declined_explanation')}
+ <li><strong>${_('Statement declined')}</strong>${_(', when no statement is available and wont be available. The case document will be made anonymous.')}
</li>
</ol>
</p>
Modified: base/trunk/mpulsweb/templates/settings/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/show.mako 2011-03-01 09:47:01 UTC (rev 4730)
+++ base/trunk/mpulsweb/templates/settings/show.mako 2011-03-01 11:54:20 UTC (rev 4731)
@@ -20,7 +20,7 @@
<ul>
<li>
<a href="${h.url_for(controller='/settings', action='edit')}">
- ${_('adm_actions_link_editsettings')}
+ ${_('Edit settings')}
</a>
</li>
</ul>
@@ -28,7 +28,7 @@
</div>
</div>
-<p>${_('adm_con_ss_view_agency')}</p>
+<p>${_('Here you can see institution wide settings.')}</p>
<table>
<tr>
<td class="label table_header_v table_width_name">
Modified: base/trunk/mpulsweb/templates/usersettings/edit_standin.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/edit_standin.mako 2011-03-01 09:47:01 UTC (rev 4730)
+++ base/trunk/mpulsweb/templates/usersettings/edit_standin.mako 2011-03-01 11:54:20 UTC (rev 4731)
@@ -15,7 +15,7 @@
</div>
${self.buildFormErrors()}
<div id="waska_form">
-<p>${_('usrset_explain_changestandin')}</p>
+<p>${_('Here you can configure, which user at creation of a new case document is your standin. You can select a user or a group of users. These user have also access to this case document. This configuration has no effect on your current cases.')}</p>
<br>
<form action="${h.url_for(action="editStandinAction")}" method="POST">
<div class="waska_form_element w100">
More information about the Mpuls-commits
mailing list