2008-09-04 yusei

* Update English messages.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23430 20353a03-c40f-0410-a6d1-a30d3c3de9de

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>

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>

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>

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>

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>

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>

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>

bt5/erp5_forge/bt/change_log

+2008-09-04 yusei
+* Update English messages.
+
 2008-09-03 yusei
 * Don't extract title from field if tales expression was used.
 

bt5/erp5_forge/bt/revision

-361
+362
\ No newline at end of file

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>

bt5/erp5_ods_style/bt/change_log

+2008-09-04 yusei
+* Update English messages.
+
 2008-08-28 yusei
 * Update Base_translateString or translateString instead of N_ for translation message.
 

bt5/erp5_ods_style/bt/revision

-150
+151
\ No newline at end of file

bt5/erp5_ods_style/bt/version

-5.1
+5.2
\ No newline at end of file

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>

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

bt5/erp5_payroll/bt/change_log

+2008-09-04 yusei
+* Update English messages.
+
 2008-08-28 yusei
 * Use Base_translateString or translateString instead of N_ for translation message.
 

bt5/erp5_payroll/bt/revision

-314
+316
\ No newline at end of file

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>

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

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

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>

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

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

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

product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log

+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.

product/ERP5/bootstrap/erp5_xhtml_style/bt/revision

-596
+597
\ No newline at end of file