[Mpuls-commits] r4653 - in jmd/trunk: . jmdstrukturweb/i18n/de/LC_MESSAGES jmdstrukturweb/templates/auth jmdweb/i18n/de/LC_MESSAGES jmdweb/templates/auth jmdweb/templates/settings
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Feb 18 15:46:33 CET 2011
Author: ludwig
Date: 2011-02-18 15:46:32 +0100 (Fri, 18 Feb 2011)
New Revision: 4653
Modified:
jmd/trunk/ChangeLog
jmd/trunk/jmdstrukturweb/i18n/de/LC_MESSAGES/mpulsweb.po
jmd/trunk/jmdstrukturweb/templates/auth/main.mako
jmd/trunk/jmdweb/i18n/de/LC_MESSAGES/jmdweb.po
jmd/trunk/jmdweb/i18n/de/LC_MESSAGES/mpulsweb.po
jmd/trunk/jmdweb/templates/auth/main.mako
jmd/trunk/jmdweb/templates/settings/edit.mako
jmd/trunk/jmdweb/templates/settings/show.mako
Log:
update of the msgids (part 7)
Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog 2011-02-18 14:44:08 UTC (rev 4652)
+++ jmd/trunk/ChangeLog 2011-02-18 14:46:32 UTC (rev 4653)
@@ -1,5 +1,15 @@
2011-02-18 Ludwig Reiter <ludwig.reiter at intevation.de>
+ * jmdweb/i18n/de/LC_MESSAGES/jmdweb.po
+ jmdweb/i18n/de/LC_MESSAGES/mpulsweb.po
+ jmdweb/templates/settings/show.mako
+ jmdweb/templates/settings/edit.mako
+ jmdweb/templates/auth/main.mako
+ jmdstrukturweb/i18n/de/LC_MESSAGES/mpulsweb.po
+ jmdstrukturweb/templates/auth/main.mako: Update of the msgids (part7)
+
+2011-02-18 Ludwig Reiter <ludwig.reiter at intevation.de>
+
* jmdstrukturweb/i18n/de/LC_MESSAGES/mpulsweb.po:
Update of msgids (Part 6).
Modified: jmd/trunk/jmdstrukturweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- jmd/trunk/jmdstrukturweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-02-18 14:44:08 UTC (rev 4652)
+++ jmd/trunk/jmdstrukturweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-02-18 14:46:32 UTC (rev 4653)
@@ -662,7 +662,7 @@
#: mpulsweb/templates/settings/edit.mako:119
#: mpulsweb/templates/settings/show.mako:60
-msgid "adm_form_settings_anontransfer"
+msgid "Assign case document"
msgstr "JMD-Statistiken übermitteln"
#: mpulsweb/templates/settings/edit.mako:122
Modified: jmd/trunk/jmdstrukturweb/templates/auth/main.mako
===================================================================
--- jmd/trunk/jmdstrukturweb/templates/auth/main.mako 2011-02-18 14:44:08 UTC (rev 4652)
+++ jmd/trunk/jmdstrukturweb/templates/auth/main.mako 2011-02-18 14:46:32 UTC (rev 4653)
@@ -30,8 +30,8 @@
<%
# Please fill this dictionary in the templates if you want to substitute
# the formular identifier
- formular_labels = {'passwd': 'adm_form_newuser_passwd',
- 'passwd2': 'adm_form_newuser_passwd_confirm'
+ formular_labels = {'passwd': 'Enter new password',
+ 'passwd2': 'Repeat pasword'
}
%>
% if len(c.form_errors) > 0:
Modified: jmd/trunk/jmdweb/i18n/de/LC_MESSAGES/jmdweb.po
===================================================================
--- jmd/trunk/jmdweb/i18n/de/LC_MESSAGES/jmdweb.po 2011-02-18 14:44:08 UTC (rev 4652)
+++ jmd/trunk/jmdweb/i18n/de/LC_MESSAGES/jmdweb.po 2011-02-18 14:46:32 UTC (rev 4653)
@@ -250,16 +250,16 @@
#: jmdweb/templates/settings/edit.mako:4 jmdweb/templates/settings/edit.mako:48
#: jmdweb/templates/settings/show.mako:35
-msgid "adm_form_settings_kaname"
+msgid "Name of the institution"
msgstr ""
#: jmdweb/templates/settings/edit.mako:5
-msgid "adm_form_settings_fkz"
+msgid "Formular number of the institution"
msgstr ""
#: jmdweb/templates/settings/edit.mako:6 jmdweb/templates/settings/edit.mako:76
#: jmdweb/templates/settings/show.mako:48
-msgid "adm_form_settings_max_savetime"
+msgid "Automatic review after days"
msgstr ""
#: jmdweb/templates/settings/edit.mako:12 jmdweb/templates/settings/show.mako:7
@@ -294,7 +294,7 @@
#: jmdweb/templates/settings/edit.mako:60
#: jmdweb/templates/settings/show.mako:42
-msgid "adm_form_settings_kaadress"
+msgid "Address of the institution"
msgstr ""
#: jmdweb/templates/settings/edit.mako:73
@@ -311,7 +311,7 @@
#: jmdweb/templates/settings/edit.mako:107
#: jmdweb/templates/settings/show.mako:56
-msgid "adm_form_settings_anontransfer"
+msgid "Assign case document"
msgstr ""
#: jmdweb/templates/settings/edit.mako:110
@@ -322,7 +322,7 @@
msgstr ""
#: jmdweb/templates/settings/edit.mako:115
-msgid "adm_form_settings_save"
+msgid "Save settings"
msgstr ""
#: jmdweb/templates/settings/show.mako:16
@@ -342,10 +342,10 @@
msgstr ""
#: jmdweb/templates/settings/show.mako:59
-msgid "adm_form_settings_anontransfer_yes"
+msgid "Yes"
msgstr ""
#: jmdweb/templates/settings/show.mako:61
-msgid "adm_form_settings_anontransfer_no"
+msgid "No"
msgstr ""
Modified: jmd/trunk/jmdweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- jmd/trunk/jmdweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-02-18 14:44:08 UTC (rev 4652)
+++ jmd/trunk/jmdweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-02-18 14:46:32 UTC (rev 4653)
@@ -84,11 +84,11 @@
msgstr "Logo JMD"
#: mpulsweb/templates/administration/new_user_result.mako:42
-msgid "adm_form_label_agency"
+msgid "Institution"
msgstr "JMD"
#: mpulsweb/templates/administration/show_user_body.mako:21
-msgid "adm_form_table_agency"
+msgid "Institution"
msgstr "JMD"
#: mpulsweb/templates/casebundle/editor.mako:6
@@ -208,13 +208,13 @@
#: 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 des JMD"
#: 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 des JMD"
#: mpulsweb/templates/settings/edit.mako:15
@@ -233,7 +233,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 des JMD"
#: mpulsweb/templates/settings/edit.mako:82
Modified: jmd/trunk/jmdweb/templates/auth/main.mako
===================================================================
--- jmd/trunk/jmdweb/templates/auth/main.mako 2011-02-18 14:44:08 UTC (rev 4652)
+++ jmd/trunk/jmdweb/templates/auth/main.mako 2011-02-18 14:46:32 UTC (rev 4653)
@@ -30,8 +30,8 @@
<%
# Please fill this dictionary in the templates if you want to substitute
# the formular identifier
- formular_labels = {'passwd': 'adm_form_newuser_passwd',
- 'passwd2': 'adm_form_newuser_passwd_confirm'
+ formular_labels = {'passwd': 'Enter new password',
+ 'passwd2': 'Repeat pasword'
}
%>
% if len(c.form_errors) > 0:
Modified: jmd/trunk/jmdweb/templates/settings/edit.mako
===================================================================
--- jmd/trunk/jmdweb/templates/settings/edit.mako 2011-02-18 14:44:08 UTC (rev 4652)
+++ jmd/trunk/jmdweb/templates/settings/edit.mako 2011-02-18 14:46:32 UTC (rev 4653)
@@ -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,7 +45,7 @@
<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>
% if c.form_errors.get('ka_name'):
<input type="text" class="field error_box" id="ka_name"
value="${c.form_result.get('ka_name', c.agency.getName())}"
@@ -57,7 +57,7 @@
% endif
</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>
% if c.form_errors.get('ka_adresse'):
<input type="text" class="field error_box" id="ka_adresse"
value="${c.form_result.get('ka_adresse', c.agency.getAddress())}"
@@ -73,7 +73,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>
% if c.form_errors.get('max_speicherdauer'):
<input type="text" class="error_box" id="max_speicherdauer"
@@ -104,7 +104,7 @@
<input id="anon_transfer" name="anon_transfer" type="checkbox"/>
% endif
<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.')}
@@ -112,7 +112,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: jmd/trunk/jmdweb/templates/settings/show.mako
===================================================================
--- jmd/trunk/jmdweb/templates/settings/show.mako 2011-02-18 14:44:08 UTC (rev 4652)
+++ jmd/trunk/jmdweb/templates/settings/show.mako 2011-02-18 14:46:32 UTC (rev 4653)
@@ -32,20 +32,20 @@
<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_max_savetime')}</td>
+ <td class="label table_header_v">${_('Automatic review after days')}</td>
<td class="table_row_v">${c.agency.getMaxSavetime()| F.NA}</td>
</tr>
<tr>
@@ -53,12 +53,12 @@
<td class="">${h.literal(g.mpuls_config.get('case', 'reminderconditiondesc'))}</td>
</tr>
<tr>
- <td class="label table_header_v">${_('adm_form_settings_anontransfer')}</td>
+ <td class="label table_header_v">${_('Assign case document')}</td>
<td class="table_row_v">
% if c.agency.isAnonTransfer():
- ${_('adm_form_settings_anontransfer_yes')}
+ ${_('Yes')}
% else:
- ${_('adm_form_settings_anontransfer_no')}
+ ${_('No')}
% endif
</td>
</tr>
More information about the Mpuls-commits
mailing list