[Mpuls-commits] r4725 - in base/trunk: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/templates/usersettings
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Feb 28 14:46:20 CET 2011
Author: ludwig
Date: 2011-02-28 14:46:18 +0100 (Mon, 28 Feb 2011)
New Revision: 4725
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
base/trunk/mpulsweb/templates/usersettings/change_password.mako
base/trunk/mpulsweb/templates/usersettings/change_password_login.mako
base/trunk/mpulsweb/templates/usersettings/edit_standin.mako
base/trunk/mpulsweb/templates/usersettings/show_settings.mako
Log:
Update of the msgids (part 17)
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2011-02-28 13:11:46 UTC (rev 4724)
+++ base/trunk/ChangeLog 2011-02-28 13:46:18 UTC (rev 4725)
@@ -2,6 +2,16 @@
* mpulsweb/i18n/mpulsweb.pot
mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
+ mpulsweb/templates/usersettings/change_password_login.mako
+ mpulsweb/templates/usersettings/show_settings.mako
+ mpulsweb/templates/usersettings/edit_standin.mako
+ mpulsweb/templates/usersettings/change_password.mako:
+ Update of the msgids (part 17)
+
+2011-02-28 Ludwig Reiter <ludwig.reiter at intevation.de>
+
+ * mpulsweb/i18n/mpulsweb.pot
+ mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
mpulsweb/templates/dialogs/confirm.mako
mpulsweb/templates/dialogs/failed.mako
mpulsweb/templates/dialogs/notification.mako
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-02-28 13:11:46 UTC (rev 4724)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-02-28 13:46:18 UTC (rev 4725)
@@ -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:03+0100\n"
+"PO-Revision-Date: 2011-02-28 14:43+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"
@@ -1976,6 +1976,7 @@
#: mpulsweb/templates/casemanagement/caselist.mako:165
#: mpulsweb/templates/casemanagement/organisation.mako:42
#: mpulsweb/templates/search/search.mako:50
+#: mpulsweb/templates/usersettings/edit_standin.mako:23
msgid "Standin"
msgstr "Vertretung"
@@ -3011,7 +3012,7 @@
#: mpulsweb/templates/usersettings/change_password.mako:7
#: mpulsweb/templates/usersettings/change_password.mako:17
-msgid "adm_header_changepassword"
+msgid "Change password"
msgstr "Benutzerpasswort ändern"
#: mpulsweb/templates/usersettings/change_password.mako:22
@@ -3038,39 +3039,40 @@
msgstr "Speichern"
#: mpulsweb/templates/usersettings/change_password_login.mako:5
-msgid "adm_header_changepassword_needed"
+msgid "Change password needed"
msgstr "Passwortänderung erforderlich"
#: mpulsweb/templates/usersettings/change_password_login.mako:7
-msgid "usersettings_p_set_new_pw"
+msgid "You have to set a new password. This can have following reasons:"
msgstr "Sie müssen Ihr Passwort neu setzen. Dies kann folgende Ursachen haben:"
#: mpulsweb/templates/usersettings/change_password_login.mako:9
-msgid "usersettings_li_set_new_pw_first_login"
+msgid "You login for the first time with initial password on the system."
msgstr ""
"Sie melden sich zum ersten Mal mit einem initialen Passwort auf dem "
"System an."
#: mpulsweb/templates/usersettings/change_password_login.mako:10
-msgid "usersettings_li_set_new_pw_same_pw"
+msgid "You used the same password for a long time. So it has become invalid."
msgstr ""
"Sie haben über einen langen Zeitraum das selbe Passwort verwendet. Dies "
"ist aus Gründen der Sicherheit nicht zulässig."
#: mpulsweb/templates/usersettings/change_password_login.mako:11
-msgid "usersettings_li_set_new_pw_adm_pw_force"
+msgid "The password has been reset by the administration."
msgstr "Das Passwort wurde durch die Administration zurückgesetzt."
#: mpulsweb/templates/usersettings/change_password_login.mako:13
-msgid "usersettings_p_insert_new_pw"
+msgid "Please insert the new password."
msgstr "Bitte geben Sie nun das von Ihnen gewünschte Passwort ein."
#: mpulsweb/templates/usersettings/edit_standin.mako:6
-msgid "usrset_header_changestandin"
+#: mpulsweb/templates/usersettings/edit_standin.mako:40
+msgid "Change standin"
msgstr "Vertretung setzen"
#: mpulsweb/templates/usersettings/edit_standin.mako:11
-msgid "sm_menu_link_settings_back"
+msgid "Back to: Settings"
msgstr "Zurück zu: Anlagenübersicht"
#: mpulsweb/templates/usersettings/edit_standin.mako:18
@@ -3083,24 +3085,16 @@
"angelegte Fallakten. Diese Einstellung hat keine Auswirkung auf bereits "
"von Ihnen angelegte Fallakten."
-#: mpulsweb/templates/usersettings/edit_standin.mako:23
-msgid "usrset_form_changestandin_standin"
-msgstr "VertreterIn"
-
-#: mpulsweb/templates/usersettings/edit_standin.mako:40
-msgid "usrset_form_changestandin_submit"
-msgstr "Vertretung setzen"
-
#: mpulsweb/templates/usersettings/show_settings.mako:14
-msgid "usersettings_a_change_pw"
+msgid "Change user password"
msgstr "Benutzerpasswort ändern"
#: mpulsweb/templates/usersettings/show_settings.mako:18
-msgid "usersettings_a_change_replace"
+msgid "Replace standin"
msgstr "Vertretung ändern"
#: mpulsweb/templates/usersettings/show_settings.mako:25
-msgid "usersettings_p_overview_personal_data"
+msgid "You see an overview of your personal data."
msgstr "Hier sehen sie eine Übersicht Ihrer persönlichen Daten."
#: mpulsweb/templates/usersettings/dialogs/notificate_setpassword.mako:5
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-02-28 13:11:46 UTC (rev 4724)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-02-28 13:46:18 UTC (rev 4725)
@@ -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:03+0100\n"
+"POT-Creation-Date: 2011-02-28 14:43+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"
@@ -1778,6 +1778,7 @@
#: mpulsweb/templates/casemanagement/caselist.mako:165
#: mpulsweb/templates/casemanagement/organisation.mako:42
#: mpulsweb/templates/search/search.mako:50
+#: mpulsweb/templates/usersettings/edit_standin.mako:23
msgid "Standin"
msgstr ""
@@ -2769,7 +2770,7 @@
#: mpulsweb/templates/usersettings/change_password.mako:7
#: mpulsweb/templates/usersettings/change_password.mako:17
-msgid "adm_header_changepassword"
+msgid "Change password"
msgstr ""
#: mpulsweb/templates/usersettings/change_password.mako:22
@@ -2796,59 +2797,52 @@
msgstr ""
#: mpulsweb/templates/usersettings/change_password_login.mako:5
-msgid "adm_header_changepassword_needed"
+msgid "Change password needed"
msgstr ""
#: mpulsweb/templates/usersettings/change_password_login.mako:7
-msgid "usersettings_p_set_new_pw"
+msgid "You have to set a new password. This can have following reasons:"
msgstr ""
#: mpulsweb/templates/usersettings/change_password_login.mako:9
-msgid "usersettings_li_set_new_pw_first_login"
+msgid "You login for the first time with initial password on the system."
msgstr ""
#: mpulsweb/templates/usersettings/change_password_login.mako:10
-msgid "usersettings_li_set_new_pw_same_pw"
+msgid "You used the same password for a long time. So it has become invalid."
msgstr ""
#: mpulsweb/templates/usersettings/change_password_login.mako:11
-msgid "usersettings_li_set_new_pw_adm_pw_force"
+msgid "The password has been reset by the administration."
msgstr ""
#: mpulsweb/templates/usersettings/change_password_login.mako:13
-msgid "usersettings_p_insert_new_pw"
+msgid "Please insert the new password."
msgstr ""
#: mpulsweb/templates/usersettings/edit_standin.mako:6
-msgid "usrset_header_changestandin"
+#: mpulsweb/templates/usersettings/edit_standin.mako:40
+msgid "Change standin"
msgstr ""
#: mpulsweb/templates/usersettings/edit_standin.mako:11
-msgid "sm_menu_link_settings_back"
+msgid "Back to: Settings"
msgstr ""
#: mpulsweb/templates/usersettings/edit_standin.mako:18
msgid "usrset_explain_changestandin"
msgstr ""
-#: mpulsweb/templates/usersettings/edit_standin.mako:23
-msgid "usrset_form_changestandin_standin"
-msgstr ""
-
-#: mpulsweb/templates/usersettings/edit_standin.mako:40
-msgid "usrset_form_changestandin_submit"
-msgstr ""
-
#: mpulsweb/templates/usersettings/show_settings.mako:14
-msgid "usersettings_a_change_pw"
+msgid "Change user password"
msgstr ""
#: mpulsweb/templates/usersettings/show_settings.mako:18
-msgid "usersettings_a_change_replace"
+msgid "Replace standin"
msgstr ""
#: mpulsweb/templates/usersettings/show_settings.mako:25
-msgid "usersettings_p_overview_personal_data"
+msgid "You see an overview of your personal data."
msgstr ""
#: mpulsweb/templates/usersettings/dialogs/notificate_setpassword.mako:5
Modified: base/trunk/mpulsweb/templates/usersettings/change_password.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/change_password.mako 2011-02-28 13:11:46 UTC (rev 4724)
+++ base/trunk/mpulsweb/templates/usersettings/change_password.mako 2011-02-28 13:46:18 UTC (rev 4725)
@@ -4,7 +4,7 @@
<li><a href="${h.url_for(controller='/usersettings', action='showSettings',
id=h.getUserId())}"
onclick="return checkModification();">${_('My Account')}</a></li>
- <li><a href="#" onclick="return checkModification();">${_('adm_header_changepassword')}
+ <li><a href="#" onclick="return checkModification();">${_('Change password')}
</a></li>
</%def>
<%
@@ -14,7 +14,7 @@
%>
<div id="content_header_small">
<div id="content_ueberschrift">
- ${_('adm_header_changepassword')}
+ ${_('Change password')}
</div>
<div id="modusfield">
<div class="actions">
Modified: base/trunk/mpulsweb/templates/usersettings/change_password_login.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/change_password_login.mako 2011-02-28 13:11:46 UTC (rev 4724)
+++ base/trunk/mpulsweb/templates/usersettings/change_password_login.mako 2011-02-28 13:46:18 UTC (rev 4725)
@@ -2,15 +2,15 @@
<%inherit file="../auth/main.mako" />
<div id="waska_form_login">
<div id="waska_form_login_pw">
-<h1>${_('adm_header_changepassword_needed')}</h1>
+<h1>${_('Change password needed')}</h1>
${self.buildFormErrors()}
-<p>${_('usersettings_p_set_new_pw')}<p>
+<p>${_('You have to set a new password. This can have following reasons:')}<p>
<ul>
- <li>${_('usersettings_li_set_new_pw_first_login')}</li>
- <li>${_('usersettings_li_set_new_pw_same_pw')}</li>
- <li>${_('usersettings_li_set_new_pw_adm_pw_force')}</li>
+ <li>${_('You login for the first time with initial password on the system.')}</li>
+ <li>${_('You used the same password for a long time. So it has become invalid.')}</li>
+ <li>${_('The password has been reset by the administration.')}</li>
</ul>
-<p>${_('usersettings_p_insert_new_pw')}
+<p>${_('Please insert the new password.')}
</p>
<div id="waska_form_login">
<form action="${h.url_for(controller="/usersettings", action="changePasswordOnLoginAction")}" method="POST" autocomplete="off">
Modified: base/trunk/mpulsweb/templates/usersettings/edit_standin.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/edit_standin.mako 2011-02-28 13:11:46 UTC (rev 4724)
+++ base/trunk/mpulsweb/templates/usersettings/edit_standin.mako 2011-02-28 13:46:18 UTC (rev 4725)
@@ -3,12 +3,12 @@
<%! import mpulsweb.lib.helper.filters as F %>
<div id="content_header_small">
<div id="content_ueberschrift">
- ${_('usrset_header_changestandin')}
+ ${_('Change standin')}
</div>
<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: Settings')}</a></li>
</ul>
</div>
</div>
@@ -20,7 +20,7 @@
<form action="${h.url_for(action="editStandinAction")}" method="POST">
<div class="waska_form_element w100">
<label
- for="standin">${_('usrset_form_changestandin_standin')}</label><br>
+ for="standin">${_('Standin')}</label><br>
<select name="standin" id="standin">
% for g in c.grouplist:
% if g.id == c.uo.standin:
@@ -37,6 +37,6 @@
</select>
</div>
<input type="hidden" name="uid" value="${h.getUserId()}">
- <input class="btn_space" type="submit" value="${_('usrset_form_changestandin_submit')}">
+ <input class="btn_space" type="submit" value="${_('Change standin')}">
</form>
</div>
Modified: base/trunk/mpulsweb/templates/usersettings/show_settings.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/show_settings.mako 2011-02-28 13:11:46 UTC (rev 4724)
+++ base/trunk/mpulsweb/templates/usersettings/show_settings.mako 2011-02-28 13:46:18 UTC (rev 4725)
@@ -11,16 +11,16 @@
<div class="actions">
<ul>
% if g.mpuls_config.is_enabled('module', 'administration'):
- <li><a href="${h.url_for(controller='/usersettings', action='changePassword', id=h.getUserId())}"> ${_('usersettings_a_change_pw')}</a></li>
+ <li><a href="${h.url_for(controller='/usersettings', action='changePassword', id=h.getUserId())}"> ${_('Change user password')}</a></li>
% endif
% if h.hasRole(['cm_ka']):
% if g.mpuls_config.is_enabled('case-module', 'organisation'):
- <li><a href="${h.url_for(controller='/usersettings', action='editStandin', id=h.getUserId())}"> ${_('usersettings_a_change_replace')}</a></li>
+ <li><a href="${h.url_for(controller='/usersettings', action='editStandin', id=h.getUserId())}"> ${_('Replace standin')}</a></li>
% endif
% endif
</ul>
</div>
</div>
</div>
-<p>${_('usersettings_p_overview_personal_data')}</p>
+<p>${_('You see an overview of your personal data.')}</p>
<%include file="../administration/show_user_body.mako" />
More information about the Mpuls-commits
mailing list