diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_conflicted_files.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_conflicted_files.xml index ec45c45b22d0d09bf8c3e4672956926a42d4af63..25c6d789d525fd1e7e196cffeea481c5a7759c7d 100644 --- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_conflicted_files.xml +++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_conflicted_files.xml @@ -55,7 +55,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Resolve SVN conflicted files</string> </value> + <value> <string>Resolve SVN Conflicted Files</string> </value> </item> <item> <key> <string>visible</string> </key> diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_unversioned_files.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_unversioned_files.xml index de76c1e3a994d327688d1e2f97be59c922bd88d9..d31538183f7b67cfc72c898c04257cedcabfeb68 100644 --- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_unversioned_files.xml +++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_unversioned_files.xml @@ -55,7 +55,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Clean SVN unversioned files</string> </value> + <value> <string>Clean SVN Unversioned Files</string> </value> </item> <item> <key> <string>visible</string> </key> diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/view_svn_repos_infos.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/view_svn_repos_infos.xml index aa7d1bb28bac56d6bb7a6f28b3a91c8df3be65b0..ce36ca511b4e877f618982b015b5d468a3724965 100644 --- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/view_svn_repos_infos.xml +++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/view_svn_repos_infos.xml @@ -55,7 +55,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>View SVN Repository Infos</string> </value> + <value> <string>View SVN Repository Information</string> </value> </item> <item> <key> <string>visible</string> </key> diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/portal_actions/generate_pot_file.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/portal_actions/generate_pot_file.xml index d262adecd3b365ad3c48f49d76792e5aaf03bcbf..6143faf36cc68c17b328bfcc404f5c52dc9f55ca 100644 --- a/bt5/erp5_forge/ActionTemplateItem/portal_types/portal_actions/generate_pot_file.xml +++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/portal_actions/generate_pot_file.xml @@ -55,7 +55,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Generate pot file</string> </value> + <value> <string>Generate POT File</string> </value> </item> <item> <key> <string>visible</string> </key> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_newFile.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_newFile.xml index ed81874daf3b6ab829205b337f10fa3264295206..47dfd42b5560aec373804789c01af44570fd3ff7 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_newFile.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_newFile.xml @@ -115,7 +115,7 @@ portal.portal_notifications.sendMessage(sender=sender,\n message=body)\n \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 return document.Base_redirect(\'view\', keep_items = dict(portal_status_message=portal_status_message), **kw)\n </string> </value> @@ -207,6 +207,12 @@ return document.Base_redirect(\'view\', keep_items = dict(portal_status_message= <key> <string>id</string> </key> <value> <string>Bug_newFile</string> </value> </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>warnings</string> </key> <value> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml index 3ab51881f267484f9950b6d62192f5c982ab8f94..69e8655ff21e24569a1cef6ca6900715c05f4d2d 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml @@ -98,12 +98,12 @@ else:\n commit_recurs = removed\n \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 return context.asContext(added=added, modified=modified, removed=removed).BusinessTemplate_viewSvnChangelog()\n \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 return context.asContext(added=added, modified=modified, removed=removed).BusinessTemplate_viewSvnChangelog()\n \n @@ -123,7 +123,7 @@ except SubversionLoginError, error1 :\n \n return request.RESPONSE.redirect(\'%s/view?%s\' % (\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> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog.xml index 6615f40fdca2fd46f9c20f97c23350f796aed988..95230e8bd27b9a7ff26c9ed79a513019ad355faf 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog.xml @@ -46,6 +46,16 @@ <key> <string>action</string> </key> <value> <string>BusinessTemplate_doSvnMultiDiff</string> </value> </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>edit_order</string> </key> + <value> + <list/> + </value> + </item> <item> <key> <string>encoding</string> </key> <value> <string>UTF-8</string> </value> @@ -122,7 +132,13 @@ </item> <item> <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> <key> <string>unicode_mode</string> </key> diff --git a/bt5/erp5_forge/bt/change_log b/bt5/erp5_forge/bt/change_log index f8b6136126b0b63f2c12d9878c81802cf4828855..f99d5dd057330072c6b512e04f1269cd895d2258 100644 --- a/bt5/erp5_forge/bt/change_log +++ b/bt5/erp5_forge/bt/change_log @@ -1,3 +1,6 @@ +2008-09-04 yusei +* Update English messages. + 2008-09-03 yusei * Don't extract title from field if tales expression was used. diff --git a/bt5/erp5_forge/bt/revision b/bt5/erp5_forge/bt/revision index e24b797f8d0569c7a2132bc8a53fc02b28f47284..6c0c8340ea7a0cd49ae705eace128ab18a729ec4 100644 --- a/bt5/erp5_forge/bt/revision +++ b/bt5/erp5_forge/bt/revision @@ -1 +1 @@ -361 \ No newline at end of file +362 \ No newline at end of file diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_getExportModeItemList.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_getExportModeItemList.xml index 3218fed6500acc42e26f79a63d2408a236f15606..65e8a9766810982a137229a0e1cd8d3568d71b30 100644 --- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_getExportModeItemList.xml +++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_getExportModeItemList.xml @@ -70,8 +70,8 @@ return [\n (\'\', \'\'),\n (translateString(\'List of Documents\'), \'list\'),\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\'), \'list_view\' ),\n + (translateString(\'Default Export of Each Document (One sheet per view)\'), \'list_view_separate_sheet\'),\n ]\n </string> </value> </item> @@ -141,6 +141,12 @@ return [\n <key> <string>id</string> </key> <value> <string>Base_getExportModeItemList</string> </value> </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>warnings</string> </key> <value> diff --git a/bt5/erp5_ods_style/bt/change_log b/bt5/erp5_ods_style/bt/change_log index f02fc4673917b75626549a59e66bb318929faf54..951ec331cf9819e96ce0c2e34f12c209993d29f0 100644 --- a/bt5/erp5_ods_style/bt/change_log +++ b/bt5/erp5_ods_style/bt/change_log @@ -1,3 +1,6 @@ +2008-09-04 yusei +* Update English messages. + 2008-08-28 yusei * Update Base_translateString or translateString instead of N_ for translation message. diff --git a/bt5/erp5_ods_style/bt/revision b/bt5/erp5_ods_style/bt/revision index 4701cc793111aafe3a1e6f48d82e5b8c8a38943e..c663e4d093b2a397637e836bfae88ca26365cc33 100644 --- a/bt5/erp5_ods_style/bt/revision +++ b/bt5/erp5_ods_style/bt/revision @@ -1 +1 @@ -150 \ No newline at end of file +151 \ No newline at end of file diff --git a/bt5/erp5_ods_style/bt/version b/bt5/erp5_ods_style/bt/version index 83364075e010b711a21b67fa5536b762cfdcb3e4..341d0b550fd3661c072120ecb43cebf476feecdc 100644 --- a/bt5/erp5_ods_style/bt/version +++ b/bt5/erp5_ods_style/bt/version @@ -1 +1 @@ -5.1 \ No newline at end of file +5.2 \ No newline at end of file diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml index 1950342e083e78498d3a208c05db28cf73aacdc5..bd40a87dca690ab95da154c02dd937d971bd88ff 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml @@ -302,6 +302,12 @@ </dictionary> </value> </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>values</string> </key> <value> @@ -516,7 +522,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>listbox</string> </value> + <value> <string>Pay Sheet Line Report Section</string> </value> </item> <item> <key> <string>url_columns</string> </key> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml index 6e862ed781577d4bb852e1f0849a3de71970e491..98bd485c7aba9819ae67573d5e4496026fb59aa4 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml @@ -72,7 +72,7 @@ model = paysheet.getSpecialiseValue()\n \n if model is None:\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 def getPropertyFromModel(model, property_name):\n """Get a property from the paysheet model, or from a specialised model.\n diff --git a/bt5/erp5_payroll/bt/change_log b/bt5/erp5_payroll/bt/change_log index 884e0964dd9b7da44aa790d2379169810de295d8..2cabef756b5abfb45540c2dd9e5b5ee3ed923a87 100644 --- a/bt5/erp5_payroll/bt/change_log +++ b/bt5/erp5_payroll/bt/change_log @@ -1,3 +1,6 @@ +2008-09-04 yusei +* Update English messages. + 2008-08-28 yusei * Use Base_translateString or translateString instead of N_ for translation message. diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index c0d6976f6b2c443c848629a9f6e5fcb8337bd30d..272a4581e99a8e4b8a0bfd3429e493850a30788b 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -314 \ No newline at end of file +316 \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_contributeContent.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_contributeContent.xml index a84986f2530eed0427dfb5128a2b53b09057626d..fc76acdd3a8d1c76817e23603b5c7a8720fbd6f5 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_contributeContent.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_contributeContent.xml @@ -130,10 +130,10 @@ if failure:\n 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 @@ -233,6 +233,12 @@ return target.Base_redirect(\'view\',\n <key> <string>id</string> </key> <value> <string>ERP5Site_contributeContent</string> </value> </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>warnings</string> </key> <value> diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doAction.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doAction.xml index d9e51e3464cec305c01fb15c777d5fd5bcb3f203..c76d39dcc8a0bb31090886406a74a33f9d97208e 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doAction.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doAction.xml @@ -101,7 +101,7 @@ elif doAction0 == \'add\':\n 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 @@ elif doAction0 == \'template\':\n 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 diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml index 90d2809b77d1a9e8033129936bfc6c3a8a608411..411452dd298a838cbc773d047c5c5bec7f323912 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml @@ -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 diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/login_form.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/login_form.xml index e1daaa37799b4ecf2988f3309db5822cf0bce889..de36ebc32cfda9feb16c206a0e6f8e7972a38005 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/login_form.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/login_form.xml @@ -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> diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml index 92db57c78e870ea3634ef20ad25c413b7f3b0fac..1f5d2c326643f5a8292da1c8a05acd9bc62f00b1 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml @@ -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 diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/reset_password_form.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/reset_password_form.xml index 43778a44f7380232a161d79caa21c83ed1e4f1a6..47411d0340a946e0148964ebcff5876bbbc5e89c 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/reset_password_form.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/reset_password_form.xml @@ -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 diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml index f667e6d75b4a50e40120894e72483a049dde4af5..d9104fd545066c925a6437ef96098579341e28f8 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml @@ -135,7 +135,7 @@ IDEAS:\n </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 @@ IDEAS:\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 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 diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log index b372f029f6be4cc2ff603a652543f5e9349693b3..e2226a19e47e235ea3721f501714d59bd2296a9e 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log @@ -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. diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index d63356f400186f3b5403b1cc947a715ef2ee118a..5203768bd595700874fadf7a73ab838622f01867 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -596 \ No newline at end of file +597 \ No newline at end of file