[Erp5-report] r23429 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplat...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Sep 4 18:24:33 CEST 2008
Author: yusei
Date: Thu Sep 4 18:24:30 2008
New Revision: 23429
URL: http://svn.erp5.org?rev=23429&view=rev
Log:
2008-09-04 yusei
* Update English messages.
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_contributeContent.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doAction.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/login_form.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/reset_password_form.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_contributeContent.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_contributeContent.xml?rev=23429&r1=23428&r2=23429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_contributeContent.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_contributeContent.xml Thu Sep 4 18:24:30 2008
@@ -130,10 +130,10 @@
editable_mode=0))\n
# successful ingestion, show appropriate message\n
if merged_content is not None and merged_content is not new_content:\n
- msg = context.Base_translateString(\'Document successfully updated\')\n
+ msg = context.Base_translateString(\'Document successfully updated.\')\n
target = merged_content\n
else:\n
- msg = context.Base_translateString(\'Document successfully created\')\n
+ msg = context.Base_translateString(\'Document successfully created.\')\n
target = new_content\n
\n
return target.Base_redirect(\'view\',\n
@@ -234,6 +234,12 @@
<value> <string>ERP5Site_contributeContent</string> </value>
</item>
<item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doAction.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doAction.xml?rev=23429&r1=23428&r2=23429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doAction.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doAction.xml Thu Sep 4 18:24:30 2008
@@ -101,7 +101,7 @@
new_content = context.newContent(portal_type=type_name,\n
container=context,\n
id=str(new_id))\n
- preserved_parameters[\'portal_status_message\'] = Base_translateString("Object Created.")\n
+ preserved_parameters[\'portal_status_message\'] = Base_translateString("Object created.")\n
preserved_parameters[\'editable_mode\'] = 1\n
redirect_url = \'%s/view\' % (new_content.absolute_url(), )\n
# The created object is not a part of the selection, so prevent from displaying the selection navigation controls\n
@@ -118,10 +118,10 @@
new_content_id = new_content_list[0][\'new_id\']\n
new_content = context[new_content_id]\n
new_content.makeTemplateInstance()\n
- preserved_parameters[\'portal_status_message\'] = Base_translateString("Template Created.")\n
+ preserved_parameters[\'portal_status_message\'] = Base_translateString("Template created.")\n
redirect_url = \'%s/view\' % ( new_content.absolute_url(), )\n
else:\n
- preserved_parameters[\'portal_status_message\'] = Base_translateString("Template Does not Exist.")\n
+ preserved_parameters[\'portal_status_message\'] = Base_translateString("Template does not exist.")\n
redirect_url = \'%s/view\' % (context.absolute_url(), )\n
else:\n
redirect_url = request[\'ACTUAL_URL\']\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml?rev=23429&r1=23428&r2=23429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml Thu Sep 4 18:24:30 2008
@@ -323,7 +323,7 @@
class="inspect_object" title="Inspect object" href="Base_viewInspectionReport"\n
i18n:attributes="title" i18n:domain="ui">\n
<span class="image"></span>\n
- <span class="description" i18n:translate="" i18n:domain="ui">Inspect object</span>\n
+ <span class="description" i18n:translate="" i18n:domain="ui">Inspect Object</span>\n
</a>\n
<a tal:condition="here/hasActivity | nothing" class="activity_pending"\n
title="Activity Pending"\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/login_form.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/login_form.xml?rev=23429&r1=23428&r2=23429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/login_form.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/login_form.xml Thu Sep 4 18:24:30 2008
@@ -70,8 +70,8 @@
<h1 i18n:translate="" i18n:domain="ui">Log in</h1>\n
</tal:block>\n
<tal:block tal:condition="python: request.get(\'came_from\', None) is not None">\n
- <h1 i18n:translate="" i18n:domain="ui">You do not have enough permissions to access this page</h1>\n
- <p i18n:translate="" i18n:domain="ui">You can log in with another user name or\n
+ <h1 i18n:translate="" i18n:domain="ui">You do not have enough permissions to access this page.</h1>\n
+ <p i18n:translate="" i18n:domain="ui">You can login with another user name or\n
<span i18n:name="go-back"><a href="javascript:history.back();" i18n:translate="">go back</a></span>.\n
</p>\n
</tal:block>\n
@@ -114,7 +114,7 @@
<script type="text/javascript">setFocus()</script>\n
<p i18n:translate="" i18n:domain="ui">Having trouble logging in? Make sure to enable cookies in your web browser.</p>\n
<p i18n:translate="" i18n:domain="ui">Do not forget to logout or exit your browser when you are done.</p>\n
- <p i18n:translate="" i18n:domain="ui">Setting the \'Remember my name\' option will set a cookie with your username, so that when you next log in, your user name will already be filled in for you.</p>\n
+ <p i18n:translate="" i18n:domain="ui">Setting the \'Remember my name\' option will set a cookie with your username, so that when you login next time, your user name will already be filled in for you.</p>\n
</div>\n
</tal:block>\n
</tal:block>\n
@@ -140,6 +140,12 @@
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
</dictionary>
</pickle>
</record>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml?rev=23429&r1=23428&r2=23429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml Thu Sep 4 18:24:30 2008
@@ -62,7 +62,7 @@
user_actions actions/user;"\n
tal:attributes="onChange string:submitAction(this.form,\'Base_doFavorite\')">\n
<option selected="selected" value=""\n
- i18n:translate="" i18n:domain="ui">My favourites</option>\n
+ i18n:translate="" i18n:domain="ui">My Favourites</option>\n
<tal:block tal:repeat="action ordered_global_actions">\n
<option tal:condition="action/disabled"\n
disabled="disabled">-- <tal:block tal:content="action/title" i18n:translate="" i18n:domain="ui" /> --</option>\n
@@ -97,7 +97,7 @@
<select name="select_module"\n
tal:define="module_list here/ERP5Site_getModuleItemList;"\n
tal:attributes="onChange string:submitAction(this.form,\'Base_doModule\')">\n
- <option selected="selected" value="" i18n:translate="" i18n:domain="ui">ERP5 Modules</option>\n
+ <option selected="selected" value="" i18n:translate="" i18n:domain="ui">Modules</option>\n
<option tal:repeat="module module_list"\n
tal:attributes="value python: module[1]"\n
tal:content="python: module[0]"\n
@@ -116,7 +116,7 @@
<select name="select_language"\n
tal:attributes="onChange string:submitAction(this.form,\'Base_doLanguage\')">\n
<option value=""\n
- i18n:translate="" i18n:domain="ui">My language</option>\n
+ i18n:translate="" i18n:domain="ui">My Language</option>\n
<option tal:repeat="language python: here.Localizer.get_languages_map()"\n
tal:omit-tag="nothing"\n
tal:attributes="value language/id;\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/reset_password_form.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/reset_password_form.xml?rev=23429&r1=23428&r2=23429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/reset_password_form.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/reset_password_form.xml Thu Sep 4 18:24:30 2008
@@ -187,10 +187,10 @@
<tal:block metal:use-macro="here/main_template/macros/master">\n
<tal:block metal:fill-slot="main">\n
<div class="content login">\n
- <h1 i18n:translate="">Reset Password</h1>\n
+ <h1 i18n:translate="" i18n:domain="ui">Reset Password</h1>\n
\n
- <p i18n:translate="">\n
- Fill your login and new password\n
+ <p i18n:translate="" i18n:domain="ui">\n
+ Fill your login and new password.\n
</p>\n
\t\n
<fieldset id="fieldset_left" class="left">\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml?rev=23429&r1=23428&r2=23429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml Thu Sep 4 18:24:30 2008
@@ -135,7 +135,7 @@
</div>\n
<div id="logged_in_as">\n
<tal:block tal:condition="not: portal/portal_membership/isAnonymousUser">\n
- <span class="logged_txt" i18n:translate="" i18n:domain="ui">Logged In as :</span>\n
+ <span class="logged_txt" i18n:translate="" i18n:domain="ui">Logged in as :</span>\n
<tal:block tal:replace="python:portal.portal_membership.getAuthenticatedMember().getUserName()" />\n
</tal:block>\n
</div>\n
@@ -143,7 +143,7 @@
<div tal:content="request/portal_status_message | nothing" id="transition_message" />\n
<div id="information_area" tal:condition="python: request.has_key(\'field_errors\')" \n
i18n:translate="" i18n:domain="ui">\n
- Input data has errors. Please look at error messages below.\n
+ Input data has errors. Please look at the error messages below.\n
</div>\n
</div>\n
<div id="master">\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log?rev=23429&r1=23428&r2=23429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log Thu Sep 4 18:24:30 2008
@@ -1,3 +1,6 @@
+2008-09-04 yusei
+* Update English messages.
+
2008-09-03 yusei
* Fixed i18n markup in login_form.
* Remove text which is not suitable for translation.
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=23429&r1=23428&r2=23429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Thu Sep 4 18:24:30 2008
@@ -1,1 +1,1 @@
-596
+597
More information about the Erp5-report
mailing list