From a2f6e77b085312fb87d97f9f2ab87a31be50d016 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 17 Nov 2015 16:54:18 +0100 Subject: [PATCH] [FIX] English Typos, unclear, rephrase, harmonise terms. Thanks Transifex reporters! --- addons/crm/web_planner_data.xml | 2 +- addons/event/models/event.py | 2 +- addons/fleet/fleet.py | 2 +- addons/mass_mailing/views/snippets_themes.xml | 2 +- addons/pos_restaurant/restaurant_view.xml | 2 +- addons/purchase/purchase.py | 2 +- addons/rating_project/models/project.py | 2 +- addons/stock/data/web_planner_data.xml | 2 +- addons/stock/stock_view.xml | 22 +++++++------- addons/subscription/subscription_view.xml | 2 +- addons/website/data/web_planner_data.xml | 2 +- addons/website/models/ir_actions.py | 2 +- addons/website/views/snippets.xml | 30 +++++++++---------- addons/website_event/data/event_demo.xml | 6 ++-- addons/website_form/models/models.py | 2 +- .../website_forum/data/forum_default_faq.html | 6 ++-- .../static/src/js/website_tour_forum.js | 4 +-- .../website_forum_doc/views/website_doc.xml | 2 +- .../views/website_links_template.xml | 2 +- .../data/website_quotation_demo.xml | 6 ++-- addons/website_sale_stock/__openerp__.py | 2 +- openerp/addons/base/module/module.py | 2 +- 22 files changed, 52 insertions(+), 54 deletions(-) diff --git a/addons/crm/web_planner_data.xml b/addons/crm/web_planner_data.xml index 99d9ead21e2..af295e2742d 100644 --- a/addons/crm/web_planner_data.xml +++ b/addons/crm/web_planner_data.xml @@ -789,7 +789,7 @@ methodical organization, trainings and good sales tools.

- If you followed the preceeding steps, you already setup + If you followed the preceding steps, you already setup the foundations to a strong process leading to continuous improvements of your sales teams.

diff --git a/addons/event/models/event.py b/addons/event/models/event.py index 801b67660b1..2bcf28eca45 100644 --- a/addons/event/models/event.py +++ b/addons/event/models/event.py @@ -177,7 +177,7 @@ class event_event(models.Model): # badge fields badge_front = fields.Html(string='Badge Front') badge_back = fields.Html(string='Badge Back') - badge_innerleft = fields.Html(string='Badge Innner Left') + badge_innerleft = fields.Html(string='Badge Inner Left') badge_innerright = fields.Html(string='Badge Inner Right') event_logo = fields.Html(string='Event Logo') diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 5108841e3e2..4565e1eefd1 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -770,7 +770,7 @@ class fleet_vehicle_log_contract(osv.Model): 'state': fields.selection([('open', 'In Progress'), ('toclose','To Close'), ('closed', 'Terminated')], 'Status', readonly=True, help='Choose wheter the contract is still valid or not', copy=False), - 'notes': fields.text('Terms and Conditions', help='Write here all supplementary informations relative to this contract', copy=False), + 'notes': fields.text('Terms and Conditions', help='Write here all supplementary information relative to this contract', copy=False), 'cost_generated': fields.float('Recurring Cost Amount', help="Costs paid at regular intervals, depending on the cost frequency. If the cost frequency is set to unique, the cost will be logged at the start date"), 'cost_frequency': fields.selection([('no','No'), ('daily', 'Daily'), ('weekly','Weekly'), ('monthly','Monthly'), ('yearly','Yearly')], 'Recurring Cost Frequency', help='Frequency of the recuring cost', required=True), 'generated_cost_ids': fields.one2many('fleet.vehicle.cost', 'contract_id', 'Generated Costs'), diff --git a/addons/mass_mailing/views/snippets_themes.xml b/addons/mass_mailing/views/snippets_themes.xml index e57cec87e5e..2bce3bb239b 100644 --- a/addons/mass_mailing/views/snippets_themes.xml +++ b/addons/mass_mailing/views/snippets_themes.xml @@ -344,7 +344,7 @@

Dear ${object.name}

-

Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assist with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.

+

Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assists with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.

Great stories are for everyone even when only written for just one person. If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest.

Kind Regards,

Michael Fletcher

diff --git a/addons/pos_restaurant/restaurant_view.xml b/addons/pos_restaurant/restaurant_view.xml index 27f323651b7..2c05b63f248 100644 --- a/addons/pos_restaurant/restaurant_view.xml +++ b/addons/pos_restaurant/restaurant_view.xml @@ -131,7 +131,7 @@

Each Order Printer has an IP Address that defines the PosBox/Hardware Proxy where the printer can be found, and a list of product categories. - An Order Printer will only print updates for prodcuts belonging to one of + An Order Printer will only print updates for products belonging to one of its categories.

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 8f6c188abfa..9fa7abf4ee0 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -283,7 +283,7 @@ class PurchaseOrder(models.Model): raise UserError(_('Unable to cancel purchase order %s as some receptions have already been done.') % (order.name)) for inv in order.invoice_ids: if inv and inv.state not in ('cancel', 'draft'): - raise UserError(_("Unable to cancel this purchase order.i You must first cancel related vendor bills.")) + raise UserError(_("Unable to cancel this purchase order. You must first cancel related vendor bills.")) for pick in order.picking_ids.filtered(lambda r: r.state != 'cancel'): pick.action_cancel() diff --git a/addons/rating_project/models/project.py b/addons/rating_project/models/project.py index 68ebd3420dc..d187a71edf5 100644 --- a/addons/rating_project/models/project.py +++ b/addons/rating_project/models/project.py @@ -53,7 +53,7 @@ class Project(models.Model): percentage_satisfaction_project = fields.Integer( compute="_compute_percentage_satisfaction_project", string="% Happy", store=True, default=-1) is_visible_happy_customer = fields.Boolean(string="Customer Satisfaction", default=False, - help="Display informations about rating of the project on kanban and form view. This buttons will only be displayed if at least a rating exists.") + help="Display information about rating of the project on kanban and form view. This buttons will only be displayed if at least a rating exists.") @api.multi diff --git a/addons/stock/data/web_planner_data.xml b/addons/stock/data/web_planner_data.xml index 9577807fd6c..a19494cd317 100644 --- a/addons/stock/data/web_planner_data.xml +++ b/addons/stock/data/web_planner_data.xml @@ -434,7 +434,7 @@
  • When you process an incoming shipment, internal transfer or delivery, assign a lot number or different lot numbers or serial numbers to a product by clicking on the icon

    • To check the trajectory of a lot, find it back in Inventory Control > Serial Numbers / lots. - Choose a Lo t in the list and click on Traceabilityi>. You may also + Choose a lot in the list and click on Traceabilityi>. You may also filter the Quantitative Valuation of a product with a certain lot.

    diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index deb0b4a80da..2980b3bf98a 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -988,7 +988,7 @@

    Click here to create a new transfer.

    - You can either do it immediatly or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker. + You can either do it immediately or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker.

    @@ -1013,7 +1013,7 @@

    Click here to create a new transfer.

    - You can either do it immediatly or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker. + You can either do it immediately or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker.

    @@ -1037,7 +1037,7 @@

    Click here to create a new transfer.

    - You can either do it immediatly or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker. + You can either do it immediately or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker.

    @@ -1061,7 +1061,7 @@

    Click here to create a new transfer.

    - You can either do it immediatly or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker. + You can either do it immediately or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker.

    @@ -1086,7 +1086,7 @@

    Click here to create a new transfer.

    - You can either do it immediatly or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker. + You can either do it immediately or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker.

    @@ -1110,7 +1110,7 @@

    Click here to create a new transfer.

    - You can either do it immediatly or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker. + You can either do it immediately or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker.

    @@ -1135,7 +1135,7 @@

    Click here to create a new transfer.

    - You can either do it immediatly or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker. + You can either do it immediately or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker.

    @@ -1160,7 +1160,7 @@

    Click here to create a new transfer.

    - You can either do it immediatly or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker. + You can either do it immediately or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker.

    @@ -1209,7 +1209,7 @@

    Click here to create a new transfer.

    - You can either do it immediatly or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker. + You can either do it immediately or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker.

    @@ -1694,9 +1694,7 @@

    Click to define a new transfer.

    - You can either do it immediatly or mark it as Todo for future processing. -

    - Use your scanner to validate the transferred quantity quicker. + You can either do it immediately or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker.

    diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml index 6c9b1a8403f..e6152225e99 100644 --- a/addons/subscription/subscription_view.xml +++ b/addons/subscription/subscription_view.xml @@ -22,7 +22,7 @@ - + diff --git a/addons/website/data/web_planner_data.xml b/addons/website/data/web_planner_data.xml index 5740508a70d..e82a6261c76 100644 --- a/addons/website/data/web_planner_data.xml +++ b/addons/website/data/web_planner_data.xml @@ -338,7 +338,7 @@ Just try not to go over 6 items, otherwise your main menu will be difficult to use.

    - As you add more pages to your website, you main menu will begin to feel overcrowded. + As you add more pages to your website, your main menu will begin to feel overcrowded. You can regroup similar pages into a sub-menu, so they will appear under a unique drop-down menu.

    diff --git a/addons/website/models/ir_actions.py b/addons/website/models/ir_actions.py index 8fd4be81af7..febe85488ab 100644 --- a/addons/website/models/ir_actions.py +++ b/addons/website/models/ir_actions.py @@ -39,7 +39,7 @@ class actions_server(osv.Model): help='A code server action can be executed from the website, using a dedicated ' 'controller. The address is /website/action/. ' 'Set this field as True to allow users to run this action. If it ' - 'set to is False the action cannot be run through the website.'), + 'is set to False the action cannot be run through the website.'), } def on_change_website_path(self, cr, uid, ids, website_path, xml_id, context=None): diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml index e4952608a12..23f92225da5 100644 --- a/addons/website/views/snippets.xml +++ b/addons/website/views/snippets.xml @@ -153,7 +153,7 @@

    Great stories have personality. Consider telling a great story that provides personality. Writing a story - with personality for potential clients will asist with + with personality for potential clients will asists with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience. @@ -283,8 +283,8 @@