Commit f3fa9537 authored by Yusei Tahara's avatar Yusei Tahara

2008-09-04 yusei

* Update English messages.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23430 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 050e9090
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Resolve SVN conflicted files</string> </value> <value> <string>Resolve SVN Conflicted Files</string> </value>
</item> </item>
<item> <item>
<key> <string>visible</string> </key> <key> <string>visible</string> </key>
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Clean SVN unversioned files</string> </value> <value> <string>Clean SVN Unversioned Files</string> </value>
</item> </item>
<item> <item>
<key> <string>visible</string> </key> <key> <string>visible</string> </key>
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>View SVN Repository Infos</string> </value> <value> <string>View SVN Repository Information</string> </value>
</item> </item>
<item> <item>
<key> <string>visible</string> </key> <key> <string>visible</string> </key>
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Generate pot file</string> </value> <value> <string>Generate POT File</string> </value>
</item> </item>
<item> <item>
<key> <string>visible</string> </key> <key> <string>visible</string> </key>
......
...@@ -115,7 +115,7 @@ portal.portal_notifications.sendMessage(sender=sender,\n ...@@ -115,7 +115,7 @@ portal.portal_notifications.sendMessage(sender=sender,\n
message=body)\n message=body)\n
\n \n
# Redirect to even\n # Redirect to even\n
portal_status_message = translateString("New ${portal_type} Added.",\n portal_status_message = translateString("New ${portal_type} added.",\n
mapping = dict(portal_type = translateString(portal_type)))\n mapping = dict(portal_type = translateString(portal_type)))\n
return document.Base_redirect(\'view\', keep_items = dict(portal_status_message=portal_status_message), **kw)\n return document.Base_redirect(\'view\', keep_items = dict(portal_status_message=portal_status_message), **kw)\n
</string> </value> </string> </value>
...@@ -207,6 +207,12 @@ return document.Base_redirect(\'view\', keep_items = dict(portal_status_message= ...@@ -207,6 +207,12 @@ return document.Base_redirect(\'view\', keep_items = dict(portal_status_message=
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Bug_newFile</string> </value> <value> <string>Bug_newFile</string> </value>
</item> </item>
<item>
<key> <string>uid</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>warnings</string> </key> <key> <string>warnings</string> </key>
<value> <value>
......
...@@ -98,12 +98,12 @@ else:\n ...@@ -98,12 +98,12 @@ else:\n
commit_recurs = removed\n commit_recurs = removed\n
\n \n
if changelog is None :\n if changelog is None :\n
request.set(\'portal_status_message\', translateString(\'Please set a ChangeLog Message\'))\n request.set(\'portal_status_message\', translateString(\'Please set a ChangeLog message.\'))\n
request.set(\'cancel_url\', context.absolute_url() + \'/BusinessTemplate_viewSvnStatus?do_extract=False&portal_status_message=Commit%20cancelled.\')\n request.set(\'cancel_url\', context.absolute_url() + \'/BusinessTemplate_viewSvnStatus?do_extract=False&portal_status_message=Commit%20cancelled.\')\n
return context.asContext(added=added, modified=modified, removed=removed).BusinessTemplate_viewSvnChangelog()\n return context.asContext(added=added, modified=modified, removed=removed).BusinessTemplate_viewSvnChangelog()\n
\n \n
if changelog.strip() == \'\' :\n if changelog.strip() == \'\' :\n
request.set(\'portal_status_message\', translateString("Error: ChangeLog Message can not be empty"))\n request.set(\'portal_status_message\', translateString("Error: ChangeLog message can not be empty."))\n
request.set(\'cancel_url\', context.absolute_url() + \'/BusinessTemplate_viewSvnStatus?do_extract=False&portal_status_message=Commit%20cancelled.\')\n request.set(\'cancel_url\', context.absolute_url() + \'/BusinessTemplate_viewSvnStatus?do_extract=False&portal_status_message=Commit%20cancelled.\')\n
return context.asContext(added=added, modified=modified, removed=removed).BusinessTemplate_viewSvnChangelog()\n return context.asContext(added=added, modified=modified, removed=removed).BusinessTemplate_viewSvnChangelog()\n
\n \n
...@@ -123,7 +123,7 @@ except SubversionLoginError, error1 :\n ...@@ -123,7 +123,7 @@ except SubversionLoginError, error1 :\n
\n \n
return request.RESPONSE.redirect(\'%s/view?%s\' % (\n return request.RESPONSE.redirect(\'%s/view?%s\' % (\n
context.absolute_url(),\n context.absolute_url(),\n
make_query(portal_status_message=translateString(\'Files commited successfully\'))))\n make_query(portal_status_message=translateString(\'Files commited successfully.\'))))\n
]]></string> </value> ]]></string> </value>
......
...@@ -46,6 +46,16 @@ ...@@ -46,6 +46,16 @@
<key> <string>action</string> </key> <key> <string>action</string> </key>
<value> <string>BusinessTemplate_doSvnMultiDiff</string> </value> <value> <string>BusinessTemplate_doSvnMultiDiff</string> </value>
</item> </item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>edit_order</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>encoding</string> </key> <key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value> <value> <string>UTF-8</string> </value>
...@@ -122,7 +132,13 @@ ...@@ -122,7 +132,13 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>View Diff between revisions</string> </value> <value> <string>View Diff between Revisions</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
<value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>unicode_mode</string> </key> <key> <string>unicode_mode</string> </key>
......
2008-09-04 yusei
* Update English messages.
2008-09-03 yusei 2008-09-03 yusei
* Don't extract title from field if tales expression was used. * Don't extract title from field if tales expression was used.
......
361 362
\ No newline at end of file \ No newline at end of file
...@@ -70,8 +70,8 @@ ...@@ -70,8 +70,8 @@
return [\n return [\n
(\'\', \'\'),\n (\'\', \'\'),\n
(translateString(\'List of Documents\'), \'list\'),\n (translateString(\'List of Documents\'), \'list\'),\n
(translateString(\'Default Export of each Document\'), \'list_view\' ),\n (translateString(\'Default Export of Each Document\'), \'list_view\' ),\n
(translateString(\'Default Export of each Document (one sheet per view)\'), \'list_view_separate_sheet\'),\n (translateString(\'Default Export of Each Document (One sheet per view)\'), \'list_view_separate_sheet\'),\n
]\n ]\n
</string> </value> </string> </value>
</item> </item>
...@@ -141,6 +141,12 @@ return [\n ...@@ -141,6 +141,12 @@ return [\n
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Base_getExportModeItemList</string> </value> <value> <string>Base_getExportModeItemList</string> </value>
</item> </item>
<item>
<key> <string>uid</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>warnings</string> </key> <key> <string>warnings</string> </key>
<value> <value>
......
2008-09-04 yusei
* Update English messages.
2008-08-28 yusei 2008-08-28 yusei
* Update Base_translateString or translateString instead of N_ for translation message. * Update Base_translateString or translateString instead of N_ for translation message.
......
150 151
\ No newline at end of file \ No newline at end of file
5.1 5.2
\ No newline at end of file \ No newline at end of file
...@@ -302,6 +302,12 @@ ...@@ -302,6 +302,12 @@
</dictionary> </dictionary>
</value> </value>
</item> </item>
<item>
<key> <string>uid</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
...@@ -516,7 +522,7 @@ ...@@ -516,7 +522,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>listbox</string> </value> <value> <string>Pay Sheet Line Report Section</string> </value>
</item> </item>
<item> <item>
<key> <string>url_columns</string> </key> <key> <string>url_columns</string> </key>
......
...@@ -72,7 +72,7 @@ model = paysheet.getSpecialiseValue()\n ...@@ -72,7 +72,7 @@ model = paysheet.getSpecialiseValue()\n
\n \n
if model is None:\n if model is None:\n
return context.Base_redirect(form_id,\n return context.Base_redirect(form_id,\n
keep_items=dict(portal_status_message=Base_translateString(\'No Pay Sheet Model.\')))\n keep_items=dict(portal_status_message=Base_translateString(\'No pay sheet model.\')))\n
\n \n
def getPropertyFromModel(model, property_name):\n def getPropertyFromModel(model, property_name):\n
"""Get a property from the paysheet model, or from a specialised model.\n """Get a property from the paysheet model, or from a specialised model.\n
......
2008-09-04 yusei
* Update English messages.
2008-08-28 yusei 2008-08-28 yusei
* Use Base_translateString or translateString instead of N_ for translation message. * Use Base_translateString or translateString instead of N_ for translation message.
......
314 316
\ No newline at end of file \ No newline at end of file
...@@ -130,10 +130,10 @@ if failure:\n ...@@ -130,10 +130,10 @@ if failure:\n
editable_mode=0))\n editable_mode=0))\n
# successful ingestion, show appropriate message\n # successful ingestion, show appropriate message\n
if merged_content is not None and merged_content is not new_content:\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 target = merged_content\n
else:\n else:\n
msg = context.Base_translateString(\'Document successfully created\')\n msg = context.Base_translateString(\'Document successfully created.\')\n
target = new_content\n target = new_content\n
\n \n
return target.Base_redirect(\'view\',\n return target.Base_redirect(\'view\',\n
...@@ -233,6 +233,12 @@ return target.Base_redirect(\'view\',\n ...@@ -233,6 +233,12 @@ return target.Base_redirect(\'view\',\n
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>ERP5Site_contributeContent</string> </value> <value> <string>ERP5Site_contributeContent</string> </value>
</item> </item>
<item>
<key> <string>uid</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>warnings</string> </key> <key> <string>warnings</string> </key>
<value> <value>
......
...@@ -101,7 +101,7 @@ elif doAction0 == \'add\':\n ...@@ -101,7 +101,7 @@ elif doAction0 == \'add\':\n
new_content = context.newContent(portal_type=type_name,\n new_content = context.newContent(portal_type=type_name,\n
container=context,\n container=context,\n
id=str(new_id))\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 preserved_parameters[\'editable_mode\'] = 1\n
redirect_url = \'%s/view\' % (new_content.absolute_url(), )\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 # The created object is not a part of the selection, so prevent from displaying the selection navigation controls\n
...@@ -118,10 +118,10 @@ elif doAction0 == \'template\':\n ...@@ -118,10 +118,10 @@ elif doAction0 == \'template\':\n
new_content_id = new_content_list[0][\'new_id\']\n new_content_id = new_content_list[0][\'new_id\']\n
new_content = context[new_content_id]\n new_content = context[new_content_id]\n
new_content.makeTemplateInstance()\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 redirect_url = \'%s/view\' % ( new_content.absolute_url(), )\n
else:\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 redirect_url = \'%s/view\' % (context.absolute_url(), )\n
else:\n else:\n
redirect_url = request[\'ACTUAL_URL\']\n redirect_url = request[\'ACTUAL_URL\']\n
......
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
class="inspect_object" title="Inspect object" href="Base_viewInspectionReport"\n class="inspect_object" title="Inspect object" href="Base_viewInspectionReport"\n
i18n:attributes="title" i18n:domain="ui">\n i18n:attributes="title" i18n:domain="ui">\n
<span class="image"></span>\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>\n
<a tal:condition="here/hasActivity | nothing" class="activity_pending"\n <a tal:condition="here/hasActivity | nothing" class="activity_pending"\n
title="Activity Pending"\n title="Activity Pending"\n
......
...@@ -70,8 +70,8 @@ ...@@ -70,8 +70,8 @@
<h1 i18n:translate="" i18n:domain="ui">Log in</h1>\n <h1 i18n:translate="" i18n:domain="ui">Log in</h1>\n
</tal:block>\n </tal:block>\n
<tal:block tal:condition="python: request.get(\'came_from\', None) is not None">\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 <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 <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 <span i18n:name="go-back"><a href="javascript:history.back();" i18n:translate="">go back</a></span>.\n
</p>\n </p>\n
</tal:block>\n </tal:block>\n
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
<script type="text/javascript">setFocus()</script>\n <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">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">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 </div>\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
...@@ -140,6 +140,12 @@ ...@@ -140,6 +140,12 @@
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>uid</string> </key>
<value>
<none/>
</value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
user_actions actions/user;"\n user_actions actions/user;"\n
tal:attributes="onChange string:submitAction(this.form,\'Base_doFavorite\')">\n tal:attributes="onChange string:submitAction(this.form,\'Base_doFavorite\')">\n
<option selected="selected" value=""\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 <tal:block tal:repeat="action ordered_global_actions">\n
<option tal:condition="action/disabled"\n <option tal:condition="action/disabled"\n
disabled="disabled">-- <tal:block tal:content="action/title" i18n:translate="" i18n:domain="ui" /> --</option>\n disabled="disabled">-- <tal:block tal:content="action/title" i18n:translate="" i18n:domain="ui" /> --</option>\n
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<select name="select_module"\n <select name="select_module"\n
tal:define="module_list here/ERP5Site_getModuleItemList;"\n tal:define="module_list here/ERP5Site_getModuleItemList;"\n
tal:attributes="onChange string:submitAction(this.form,\'Base_doModule\')">\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 <option tal:repeat="module module_list"\n
tal:attributes="value python: module[1]"\n tal:attributes="value python: module[1]"\n
tal:content="python: module[0]"\n tal:content="python: module[0]"\n
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<select name="select_language"\n <select name="select_language"\n
tal:attributes="onChange string:submitAction(this.form,\'Base_doLanguage\')">\n tal:attributes="onChange string:submitAction(this.form,\'Base_doLanguage\')">\n
<option value=""\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 <option tal:repeat="language python: here.Localizer.get_languages_map()"\n
tal:omit-tag="nothing"\n tal:omit-tag="nothing"\n
tal:attributes="value language/id;\n tal:attributes="value language/id;\n
......
...@@ -187,10 +187,10 @@ ...@@ -187,10 +187,10 @@
<tal:block metal:use-macro="here/main_template/macros/master">\n <tal:block metal:use-macro="here/main_template/macros/master">\n
<tal:block metal:fill-slot="main">\n <tal:block metal:fill-slot="main">\n
<div class="content login">\n <div class="content login">\n
<h1 i18n:translate="">Reset Password</h1>\n <h1 i18n:translate="" i18n:domain="ui">Reset Password</h1>\n
\n \n
<p i18n:translate="">\n <p i18n:translate="" i18n:domain="ui">\n
Fill your login and new password\n Fill your login and new password.\n
</p>\n </p>\n
\t\n \t\n
<fieldset id="fieldset_left" class="left">\n <fieldset id="fieldset_left" class="left">\n
......
...@@ -135,7 +135,7 @@ IDEAS:\n ...@@ -135,7 +135,7 @@ IDEAS:\n
</div>\n </div>\n
<div id="logged_in_as">\n <div id="logged_in_as">\n
<tal:block tal:condition="not: portal/portal_membership/isAnonymousUser">\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 tal:replace="python:portal.portal_membership.getAuthenticatedMember().getUserName()" />\n
</tal:block>\n </tal:block>\n
</div>\n </div>\n
...@@ -143,7 +143,7 @@ IDEAS:\n ...@@ -143,7 +143,7 @@ IDEAS:\n
<div tal:content="request/portal_status_message | nothing" id="transition_message" />\n <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 <div id="information_area" tal:condition="python: request.has_key(\'field_errors\')" \n
i18n:translate="" i18n:domain="ui">\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>\n </div>\n
<div id="master">\n <div id="master">\n
......
2008-09-04 yusei
* Update English messages.
2008-09-03 yusei 2008-09-03 yusei
* Fixed i18n markup in login_form. * Fixed i18n markup in login_form.
* Remove text which is not suitable for translation. * Remove text which is not suitable for translation.
......
596 597
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment