diff --git a/bt5/erp5_crm/ActionTemplateItem/portal_types/Campaign/clone_ticket_and_event_list.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Campaign/clone_ticket_and_event_list.xml index 942af47bf1616c89e0ffae25d01fc86e335ce7da..cc351ee2b82af800ef2048df52ceb64faed65c3f 100644 --- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Campaign/clone_ticket_and_event_list.xml +++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Campaign/clone_ticket_and_event_list.xml @@ -55,7 +55,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Clone Ticket And Events</string> </value> + <value> <string>Clone Ticket and Events</string> </value> </item> <item> <key> <string>visible</string> </key> diff --git a/bt5/erp5_crm/ActionTemplateItem/portal_types/Meeting/clone_ticket_and_event_list.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Meeting/clone_ticket_and_event_list.xml index 942af47bf1616c89e0ffae25d01fc86e335ce7da..cc351ee2b82af800ef2048df52ceb64faed65c3f 100644 --- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Meeting/clone_ticket_and_event_list.xml +++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Meeting/clone_ticket_and_event_list.xml @@ -55,7 +55,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Clone Ticket And Events</string> </value> + <value> <string>Clone Ticket and Events</string> </value> </item> <item> <key> <string>visible</string> </key> diff --git a/bt5/erp5_crm/ActionTemplateItem/portal_types/Person%20Module/create_event_list.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Person%20Module/create_event_list.xml index da9d2ef75828c8075528bacc4d97d33b8cdf6957..d550da75118b97ab5c9b552053b8761fc7ddfff4 100644 --- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Person%20Module/create_event_list.xml +++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Person%20Module/create_event_list.xml @@ -57,7 +57,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Create new events</string> </value> + <value> <string>Create New Events</string> </value> </item> <item> <key> <string>visible</string> </key> diff --git a/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/clone_ticket_and_event_list.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/clone_ticket_and_event_list.xml index 942af47bf1616c89e0ffae25d01fc86e335ce7da..cc351ee2b82af800ef2048df52ceb64faed65c3f 100644 --- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/clone_ticket_and_event_list.xml +++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/clone_ticket_and_event_list.xml @@ -55,7 +55,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Clone Ticket And Events</string> </value> + <value> <string>Clone Ticket and Events</string> </value> </item> <item> <key> <string>visible</string> </key> diff --git a/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/clone_ticket_and_event_list.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/clone_ticket_and_event_list.xml index 942af47bf1616c89e0ffae25d01fc86e335ce7da..cc351ee2b82af800ef2048df52ceb64faed65c3f 100644 --- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/clone_ticket_and_event_list.xml +++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/clone_ticket_and_event_list.xml @@ -55,7 +55,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Clone Ticket And Events</string> </value> + <value> <string>Clone Ticket and Events</string> </value> </item> <item> <key> <string>visible</string> </key> diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEvent.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEvent.xml index 89895b8168e4946537d05569815ae6209360ea8f..f98d5d10f568debfbec3bc65a610b058cabf7927 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEvent.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_addEvent.xml @@ -113,7 +113,7 @@ event_kw[\'causality\'] = causality\n module = context.getDefaultModule(portal_type=portal_type)\n event = module.newContent(**event_kw)\n \n -message = context.Base_translateString(\'New Event Created\')\n +message = context.Base_translateString(\'New event created.\')\n \n event.Base_redirect(keep_items={\'portal_status_message\': message})\n </string> </value> diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createDocumentFromAttachment.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createDocumentFromAttachment.xml index 366c63c2b9d1092886ebe70fce8f4e7063d2674a..036f45c73aa4fe475ea2edbd3a097b0e357981c9 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createDocumentFromAttachment.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createDocumentFromAttachment.xml @@ -89,11 +89,11 @@ if dms_module is not None:\n if len(uids) == 1:\n return context.REQUEST.RESPONSE.redirect(\n \'%s/view?portal_status_message=%s+%s.\' % (doc.absolute_url(), doc.getTranslatedPortalType(),\n - Base_translateString(\'+Created+Successfully\')))\n + Base_translateString(\'+created+successfully.\')))\n \n return context.REQUEST.RESPONSE.redirect(\n \'%s?portal_status_message=%s+%s.\' % (dms_module.absolute_url(),len(uids),\n - Base_translateString(\'+Documents+created+Successfully\')))\n + Base_translateString(\'+documents+created+successfully\')))\n </string> </value> </item> <item> diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAssignDialog.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAssignDialog.xml index c36b28b83e0a53ce6fbb579fe2cd565f466da85d..39dec7f5602573bad77c1aeb3518b150e0834339 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAssignDialog.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAssignDialog.xml @@ -56,6 +56,12 @@ <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> @@ -123,7 +129,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Assign to ticket</string> </value> + <value> <string>Assign to Ticket</string> </value> </item> <item> <key> <string>unicode_mode</string> </key> diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewDocumentFastInputList/listbox.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewDocumentFastInputList/listbox.xml index 13cc29ee61c540cbfc37fc98717108dad237e2b7..280a4ee63a472b45229f6749fb23ea26cbea4785 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewDocumentFastInputList/listbox.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewDocumentFastInputList/listbox.xml @@ -593,7 +593,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>listbox</string> </value> + <value> <string>Attachments</string> </value> </item> <item> <key> <string>url_columns</string> </key> diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_newEvent.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_newEvent.xml index 02a028e1c913f8fa75e833075f7eb1783791e224..7b0b6c1c3472e36040f79c649842347c3ef570fb 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_newEvent.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_newEvent.xml @@ -107,7 +107,7 @@ else:\n if direction == \'incoming\' and len(person_list) > 1:\n # This case is not possible\n portal_status_message = translateString(\n - "The Single Event option can only be used with outgoing messages")\n + "The single event option can only be used with outgoing messages.")\n return context.Base_redirect(form_id, keep_items = dict(portal_status_message=portal_status_message, selection_name=selection_name), **kw)\n # Proceed to event creation\n event = module.newContent(portal_type=portal_type, \n @@ -120,7 +120,7 @@ else:\n event.plan()\n count = 1\n \n -portal_status_message = translateString("Created and associated ${count} new Events to the selected Ticket.", \n +portal_status_message = translateString("Created and associated ${count} new events to the selected ticket.", \n mapping=dict(count=count))\n context.Base_redirect(form_id, keep_items = dict(portal_status_message=portal_status_message,\n selection_name=selection_name), **kw)\n diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_newBug.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_newBug.xml index d237abdc07686452ece04f8890be5e7b866507f8..9756f430b4b3a27533c3abe5dc5d2cdc48ac7be5 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_newBug.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_newBug.xml @@ -76,7 +76,7 @@ module = context.getDefaultModule(portal_type)\n if portal_type not in module.getVisibleAllowedContentTypeList():\n return context.Base_redirect(form_id,\n keep_items=dict(\n - portal_status_message=Base_translateString("You do not have permission to add new bug")))\n + portal_status_message=Base_translateString("You do not have permission to add new bug.")))\n \n # Create a new event\n bug = module.newContent(portal_type=portal_type,\n diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_newEvent.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_newEvent.xml index 138aa1401fe770112a083955a71ccbff7a8292b3..df041a1a24789fc73da13190b90dbd2e3937967c 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_newEvent.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_newEvent.xml @@ -75,7 +75,7 @@ module = context.getDefaultModule(portal_type)\n if portal_type not in module.getVisibleAllowedContentTypeList():\n return context.Base_redirect(form_id,\n keep_items=dict(\n - portal_status_message=translateString("You do not have permission to add new event")))\n + portal_status_message=translateString("You do not have permission to add new event.")))\n \n # Create a new event\n event = module.newContent(portal_type=portal_type, description=description, title=title, follow_up=context.getRelativeUrl())\n diff --git a/bt5/erp5_crm/bt/change_log b/bt5/erp5_crm/bt/change_log index 5309202b638885cf944cfdd4f2dddd69d968c3f7..1793d45dbf902adfec59d35601263deedb7f3d4f 100644 --- a/bt5/erp5_crm/bt/change_log +++ b/bt5/erp5_crm/bt/change_log @@ -1,3 +1,6 @@ +2008-09-04 yusei +* Update English messages. + 2008-08-29 yusei * Correct message text. diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision index da4c6e99aa6cd502ccd600b9379c040b072aa52b..8c91667498f9f487f9985d24898b21307f66b30a 100644 --- a/bt5/erp5_crm/bt/revision +++ b/bt5/erp5_crm/bt/revision @@ -1 +1 @@ -297 \ No newline at end of file +298 \ No newline at end of file