[Mpuls-commits] r4644 - in base/trunk: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/templates mpulsweb/templates/administration
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Feb 17 15:31:51 CET 2011
Author: ludwig
Date: 2011-02-17 15:31:48 +0100 (Thu, 17 Feb 2011)
New Revision: 4644
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
base/trunk/mpulsweb/templates/administration/edit_user.mako
base/trunk/mpulsweb/templates/administration/edit_usergroup.mako
base/trunk/mpulsweb/templates/administration/new_user.mako
base/trunk/mpulsweb/templates/administration/new_user_result.mako
base/trunk/mpulsweb/templates/administration/new_usergroup.mako
base/trunk/mpulsweb/templates/administration/show_user.mako
base/trunk/mpulsweb/templates/administration/show_usergroup.mako
base/trunk/mpulsweb/templates/main.mako
Log:
update of msgids (part4)
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2011-02-17 12:04:38 UTC (rev 4643)
+++ base/trunk/ChangeLog 2011-02-17 14:31:48 UTC (rev 4644)
@@ -1,4 +1,17 @@
2011-02-17 Ludwig Reiter <ludwig.reiter at intevation.de>
+
+ * mpulsweb/i18n/mpulsweb.pot,
+ mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po,
+ mpulsweb/templates/administration/show_usergroup.mako,
+ mpulsweb/templates/administration/show_user.mako,
+ mpulsweb/templates/administration/edit_usergroup.mako,
+ mpulsweb/templates/administration/edit_user.mako,
+ mpulsweb/templates/administration/new_usergroup.mako,
+ mpulsweb/templates/administration/new_user_result.mako,
+ mpulsweb/templates/administration/new_user.mako,
+ mpulsweb/templates/main.mako: Update of msgids (Part 4).
+
+2011-02-17 Ludwig Reiter <ludwig.reiter at intevation.de>
* mpulsweb.egg-info/SOURCES.txt,
mpulsweb.egg-info/PKG-INFO,
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-02-17 12:04:38 UTC (rev 4643)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-02-17 14:31:48 UTC (rev 4644)
@@ -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 12:56+0100\n"
+"PO-Revision-Date: 2011-02-17 15:25+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"
@@ -1225,19 +1225,19 @@
msgstr "Auswertungen"
#: mpulsweb/templates/main.mako:168
-msgid "menu_header_adm"
+msgid "Administration"
msgstr "Administration"
#: mpulsweb/templates/main.mako:173
-msgid "menu_adm_link_useroverview"
+msgid "User"
msgstr "Benutzer"
#: mpulsweb/templates/main.mako:179
-msgid "menu_adm_link_usergroupoverview"
+msgid "Usergroup"
msgstr "Benutzergruppen"
#: mpulsweb/templates/main.mako:184
-msgid "menu_adm_link_showsettings"
+msgid "Settings"
msgstr "Einrichtung"
#: mpulsweb/templates/main.mako:264 mpulsweb/templates/annotations/main.mako:33
@@ -1361,7 +1361,10 @@
msgstr "Benutzerpasswort zurücksetzen"
#: mpulsweb/templates/administration/edit_user.mako:26
-msgid "menu_adm_link_useredit_back"
+#: mpulsweb/templates/administration/new_user.mako:27
+#: mpulsweb/templates/administration/new_user_result.mako:17
+#: mpulsweb/templates/administration/show_user.mako:17
+msgid "Back to: User overview"
msgstr "Zurück zu: Benutzeransicht"
#: mpulsweb/templates/administration/edit_user.mako:39
@@ -1444,7 +1447,7 @@
#: mpulsweb/templates/administration/edit_usergroup.mako:21
#: mpulsweb/templates/administration/new_usergroup.mako:20
#: mpulsweb/templates/administration/show_usergroup.mako:18
-msgid "menu_adm_link_usergroupoverview_back"
+msgid "Back to: Usergroup overview"
msgstr "Zurück zu: Benutzergruppenübersicht"
#: mpulsweb/templates/administration/edit_usergroup.mako:33
@@ -1478,12 +1481,6 @@
msgid "adm_header_newuser"
msgstr "Neuen Benutzer anlegen"
-#: mpulsweb/templates/administration/new_user.mako:27
-#: mpulsweb/templates/administration/new_user_result.mako:17
-#: mpulsweb/templates/administration/show_user.mako:17
-msgid "menu_adm_link_useroverview_back"
-msgstr "Zurück zu: Benutzerübersicht"
-
#: mpulsweb/templates/administration/new_user.mako:75
msgid "adm_form_user_room"
msgstr "Raumnummer"
@@ -1883,7 +1880,6 @@
#: 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: Benutzerübersicht"
@@ -2742,7 +2738,6 @@
#: mpulsweb/templates/documents/global_upload.mako:18
#, fuzzy
-#| msgid "menu_adm_link_useroverview_back"
msgid "menu_doc_link_overview_back"
msgstr "Zurück zu: Benutzerübersicht"
@@ -2861,7 +2856,6 @@
#: mpulsweb/templates/help/help.mako:6
#, fuzzy
-#| msgid "menu_adm_link_useroverview"
msgid "menu_cm_link_overview"
msgstr "Benutzer"
@@ -3352,7 +3346,6 @@
#: 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"
@@ -3390,9 +3383,3 @@
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 12:04:38 UTC (rev 4643)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-02-17 14:31:48 UTC (rev 4644)
@@ -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 12:56+0100\n"
+"POT-Creation-Date: 2011-02-17 15:25+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"
@@ -1039,19 +1039,19 @@
msgstr ""
#: mpulsweb/templates/main.mako:168
-msgid "menu_header_adm"
+msgid "Administration"
msgstr ""
#: mpulsweb/templates/main.mako:173
-msgid "menu_adm_link_useroverview"
+msgid "User"
msgstr ""
#: mpulsweb/templates/main.mako:179
-msgid "menu_adm_link_usergroupoverview"
+msgid "Usergroup"
msgstr ""
#: mpulsweb/templates/main.mako:184
-msgid "menu_adm_link_showsettings"
+msgid "Settings"
msgstr ""
#: mpulsweb/templates/main.mako:264 mpulsweb/templates/annotations/main.mako:33
@@ -1168,7 +1168,10 @@
msgstr ""
#: mpulsweb/templates/administration/edit_user.mako:26
-msgid "menu_adm_link_useredit_back"
+#: mpulsweb/templates/administration/new_user.mako:27
+#: mpulsweb/templates/administration/new_user_result.mako:17
+#: mpulsweb/templates/administration/show_user.mako:17
+msgid "Back to: User overview"
msgstr ""
#: mpulsweb/templates/administration/edit_user.mako:39
@@ -1251,7 +1254,7 @@
#: mpulsweb/templates/administration/edit_usergroup.mako:21
#: mpulsweb/templates/administration/new_usergroup.mako:20
#: mpulsweb/templates/administration/show_usergroup.mako:18
-msgid "menu_adm_link_usergroupoverview_back"
+msgid "Back to: Usergroup overview"
msgstr ""
#: mpulsweb/templates/administration/edit_usergroup.mako:33
@@ -1285,12 +1288,6 @@
msgid "adm_header_newuser"
msgstr ""
-#: mpulsweb/templates/administration/new_user.mako:27
-#: mpulsweb/templates/administration/new_user_result.mako:17
-#: mpulsweb/templates/administration/show_user.mako:17
-msgid "menu_adm_link_useroverview_back"
-msgstr ""
-
#: mpulsweb/templates/administration/new_user.mako:75
msgid "adm_form_user_room"
msgstr ""
Modified: base/trunk/mpulsweb/templates/administration/edit_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/edit_user.mako 2011-02-17 12:04:38 UTC (rev 4643)
+++ base/trunk/mpulsweb/templates/administration/edit_user.mako 2011-02-17 14:31:48 UTC (rev 4644)
@@ -23,7 +23,7 @@
<div class="actions">
<ul>
<li> <a href="${h.url_for(controller='/administration', action='resetUserPassword', id=c.uo.id)}"> ${_('adm_actions_link_userpassreset')}</a> </li>
- <li> <a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}"> ${_('menu_adm_link_useredit_back')} </a></li>
+ <li> <a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}"> ${_('Back to: User overview')} </a></li>
</ul>
</div>
</div>
Modified: base/trunk/mpulsweb/templates/administration/edit_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/edit_usergroup.mako 2011-02-17 12:04:38 UTC (rev 4643)
+++ base/trunk/mpulsweb/templates/administration/edit_usergroup.mako 2011-02-17 14:31:48 UTC (rev 4644)
@@ -18,7 +18,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='administration', action='overviewUserGroups')}"> ${_('menu_adm_link_usergroupoverview_back')}
+ <li><a href="${h.url_for(controller='administration', action='overviewUserGroups')}"> ${_('Back to: Usergroup overview')}
</a>
</li>
</ul>
Modified: base/trunk/mpulsweb/templates/administration/new_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_user.mako 2011-02-17 12:04:38 UTC (rev 4643)
+++ base/trunk/mpulsweb/templates/administration/new_user.mako 2011-02-17 14:31:48 UTC (rev 4644)
@@ -24,7 +24,7 @@
<li>
<a href="${h.url_for(controller='administration',
action='overviewUser')}">
- ${_('menu_adm_link_useroverview_back')}
+ ${_('Back to: User overview')}
</a>
</li>
</ul>
Modified: base/trunk/mpulsweb/templates/administration/new_user_result.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_user_result.mako 2011-02-17 12:04:38 UTC (rev 4643)
+++ base/trunk/mpulsweb/templates/administration/new_user_result.mako 2011-02-17 14:31:48 UTC (rev 4644)
@@ -14,7 +14,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='administration', action='overviewUser')}"> ${_('menu_adm_link_useroverview_back')}</a></li>
+ <li><a href="${h.url_for(controller='administration', action='overviewUser')}"> ${_('Back to: User overview')}</a></li>
</ul>
</div>
</div>
Modified: base/trunk/mpulsweb/templates/administration/new_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_usergroup.mako 2011-02-17 12:04:38 UTC (rev 4643)
+++ base/trunk/mpulsweb/templates/administration/new_usergroup.mako 2011-02-17 14:31:48 UTC (rev 4644)
@@ -17,7 +17,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='administration', action='overviewUserGroups')}"> ${_('menu_adm_link_usergroupoverview_back')}
+ <li><a href="${h.url_for(controller='administration', action='overviewUserGroups')}"> ${_('Back to: Usergroup overview')}
</a>
</li>
</ul>
Modified: base/trunk/mpulsweb/templates/administration/show_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/show_user.mako 2011-02-17 12:04:38 UTC (rev 4643)
+++ base/trunk/mpulsweb/templates/administration/show_user.mako 2011-02-17 14:31:48 UTC (rev 4644)
@@ -14,7 +14,7 @@
<div class="actions">
<ul>
<li> <a href="${h.url_for(controller='/administration', action='editUser', id=c.uo.id)}"> ${_('adm_actions_link_edituser')}</a> </li>
- <li><a href="${h.url_for(controller='administration', action='overviewUser')}"> ${_('menu_adm_link_useroverview_back')}</a></li>
+ <li><a href="${h.url_for(controller='administration', action='overviewUser')}"> ${_('Back to: User overview')}</a></li>
</ul>
</div>
</div>
Modified: base/trunk/mpulsweb/templates/administration/show_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/show_usergroup.mako 2011-02-17 12:04:38 UTC (rev 4643)
+++ base/trunk/mpulsweb/templates/administration/show_usergroup.mako 2011-02-17 14:31:48 UTC (rev 4644)
@@ -15,7 +15,7 @@
<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='overviewUserGroups')}"> ${_('menu_adm_link_usergroupoverview_back')}</a></li>
+ <li><a href="${h.url_for(controller='administration', action='overviewUserGroups')}"> ${_('Back to: Usergroup overview')}</a></li>
</ul>
</div>
</div>
Modified: base/trunk/mpulsweb/templates/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/main.mako 2011-02-17 12:04:38 UTC (rev 4643)
+++ base/trunk/mpulsweb/templates/main.mako 2011-02-17 14:31:48 UTC (rev 4644)
@@ -165,23 +165,23 @@
% if h.hasRole(['admin_ka']) and g.mpuls_config.is_enabled('module', 'administration'):
<div class="menu">
<div class="actions">
- <h1>${_('menu_header_adm')}</h1>
+ <h1>${_('Administration')}</h1>
<ul>
<li>
<a href="${h.url_for(controller='/administration',
action='overviewUser')}">
- ${_('menu_adm_link_useroverview')}
+ ${_('User')}
</a>
</li>
<li>
<a href="${h.url_for(controller='/administration',
action='overviewUserGroups')}">
- ${_('menu_adm_link_usergroupoverview')}
+ ${_('Usergroup')}
</a>
</li>
<li>
<a href="${h.url_for(controller='/settings')}">
- ${_('menu_adm_link_showsettings')}
+ ${_('Settings')}
</a>
</li>
</ul>
More information about the Mpuls-commits
mailing list