summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Trigaux <mat@odoo.com>2018-01-03 11:09:09 +0100
committerMartin Trigaux <mat@odoo.com>2018-01-03 11:09:09 +0100
commitcab7e0d204761a6249d67b4bb6e4b7ab6acb6e2b (patch)
tree7e84e50845749e3205051d57f9f1435a29edcf2d
parent076821fed125a86fff6f4b71b61f6271c4a9dc12 (diff)
[FIX] *: add missing space in multilines messages
Courtesy of @Yenthe666
-rw-r--r--addons/account/i18n/account.pot2
-rw-r--r--addons/account/models/account_move.py2
-rw-r--r--addons/event/i18n/event.pot2
-rw-r--r--addons/event/models/event.py2
-rw-r--r--addons/fleet/i18n/fleet.pot2
-rw-r--r--addons/fleet/models/fleet_vehicle_cost.py2
-rw-r--r--addons/mrp/i18n/mrp.pot4
-rw-r--r--addons/mrp/models/mrp_routing.py6
-rw-r--r--addons/payment/i18n/payment.pot2
-rw-r--r--addons/payment/models/payment_acquirer.py2
-rw-r--r--addons/resource/i18n/resource.pot2
-rw-r--r--addons/resource/models/resource.py2
-rw-r--r--addons/stock/i18n/stock.pot6
-rw-r--r--addons/stock/models/stock_inventory.py4
-rw-r--r--addons/stock/models/stock_location.py2
-rw-r--r--addons/stock/models/stock_move.py4
-rw-r--r--odoo/addons/base/i18n/base.pot12
-rw-r--r--odoo/addons/base/ir/ir_actions.py4
-rw-r--r--odoo/addons/base/ir/ir_mail_server.py6
-rw-r--r--odoo/addons/base/ir/ir_model.py2
-rw-r--r--odoo/addons/base/ir/ir_sequence.py2
-rw-r--r--odoo/tools/config.py6
22 files changed, 39 insertions, 39 deletions
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 580082bcd01..f147d8361b0 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -8959,7 +8959,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_account_move_tax_cash_basis_rec_id
-msgid "Technical field used to keep track of the tax cash basis reconciliation.This is needed when cancelling the source: it will post the inverse journal entry to cancel that part too."
+msgid "Technical field used to keep track of the tax cash basis reconciliation. This is needed when cancelling the source: it will post the inverse journal entry to cancel that part too."
msgstr ""
#. module: account
diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 6e83a298097..5a80b5d98ff 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -110,7 +110,7 @@ class AccountMove(models.Model):
tax_cash_basis_rec_id = fields.Many2one(
'account.partial.reconcile',
string='Tax Cash Basis Entry of',
- help="Technical field used to keep track of the tax cash basis reconciliation."
+ help="Technical field used to keep track of the tax cash basis reconciliation. "
"This is needed when cancelling the source: it will post the inverse journal entry to cancel that part too.")
@api.model
diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot
index 80242495105..e93a61e640a 100644
--- a/addons/event/i18n/event.pot
+++ b/addons/event/i18n/event.pot
@@ -1033,7 +1033,7 @@ msgstr ""
#. module: event
#: model:ir.model.fields,help:event.field_event_type_auto_confirm
-msgid "Events and registrations will automatically be confirmedupon creation, easing the flow for simple events."
+msgid "Events and registrations will automatically be confirmed upon creation, easing the flow for simple events."
msgstr ""
#. module: event
diff --git a/addons/event/models/event.py b/addons/event/models/event.py
index e37da65a62b..716e0f4b1c6 100644
--- a/addons/event/models/event.py
+++ b/addons/event/models/event.py
@@ -44,7 +44,7 @@ class EventType(models.Model):
help="It will select this default maximum value when you choose this event")
auto_confirm = fields.Boolean(
'Automatically Confirm Registrations', default=True,
- help="Events and registrations will automatically be confirmed"
+ help="Events and registrations will automatically be confirmed "
"upon creation, easing the flow for simple events.")
# location
is_online = fields.Boolean(
diff --git a/addons/fleet/i18n/fleet.pot b/addons/fleet/i18n/fleet.pot
index ccfc718ce0b..6a92eac8aa8 100644
--- a/addons/fleet/i18n/fleet.pot
+++ b/addons/fleet/i18n/fleet.pot
@@ -483,7 +483,7 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_cost_generated
-msgid "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"
+msgid "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"
msgstr ""
#. module: fleet
diff --git a/addons/fleet/models/fleet_vehicle_cost.py b/addons/fleet/models/fleet_vehicle_cost.py
index 2a11ab84c4b..a52a94954dd 100644
--- a/addons/fleet/models/fleet_vehicle_cost.py
+++ b/addons/fleet/models/fleet_vehicle_cost.py
@@ -117,7 +117,7 @@ class FleetVehicleLogContract(models.Model):
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."
+ 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'),
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index 19b28b0f069..e2748b68680 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -1294,7 +1294,7 @@ msgstr ""
#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_routing_location_id
-msgid "Keep empty if you produce at the location where you find the raw materials.Set a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."
+msgid "Keep empty if you produce at the location where you find the raw materials. Set a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."
msgstr ""
#. module: mrp
@@ -2873,7 +2873,7 @@ msgstr ""
#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_routing_workcenter_routing_id
-msgid "The routing contains all the Work Centers used and for how long. This will create work orders afterwardswhich alters the execution of the manufacturing order. "
+msgid "The routing contains all the Work Centers used and for how long. This will create work orders afterwards which alters the execution of the manufacturing order."
msgstr ""
#. module: mrp
diff --git a/addons/mrp/models/mrp_routing.py b/addons/mrp/models/mrp_routing.py
index fd1c36fee32..7c2c48c0fcd 100644
--- a/addons/mrp/models/mrp_routing.py
+++ b/addons/mrp/models/mrp_routing.py
@@ -22,7 +22,7 @@ class MrpRouting(models.Model):
copy=True, oldname='workcenter_lines')
location_id = fields.Many2one(
'stock.location', 'Production Location',
- help="Keep empty if you produce at the location where you find the raw materials."
+ help="Keep empty if you produce at the location where you find the raw materials. "
"Set a location if you produce at a fixed location. This can be a partner location "
"if you subcontract the manufacturing operations.")
company_id = fields.Many2one(
@@ -49,8 +49,8 @@ class MrpRoutingWorkcenter(models.Model):
routing_id = fields.Many2one(
'mrp.routing', 'Parent Routing',
index=True, ondelete='cascade', required=True,
- help="The routing contains all the Work Centers used and for how long. This will create work orders afterwards"
- "which alters the execution of the manufacturing order. ")
+ help="The routing contains all the Work Centers used and for how long. This will create work orders afterwards "
+ "which alters the execution of the manufacturing order.")
note = fields.Text('Description')
company_id = fields.Many2one(
'res.company', 'Company',
diff --git a/addons/payment/i18n/payment.pot b/addons/payment/i18n/payment.pot
index 05b3b94fde0..ecf6ef9ed88 100644
--- a/addons/payment/i18n/payment.pot
+++ b/addons/payment/i18n/payment.pot
@@ -1168,7 +1168,7 @@ msgstr ""
#. module: payment
#: model:ir.model.fields,help:payment.field_payment_acquirer_save_token
-msgid "This option allows customers to save their credit card as a payment token and to reuse it for a later purchase.If you manage subscriptions (recurring invoicing), you need it to automatically charge the customer when you issue an invoice."
+msgid "This option allows customers to save their credit card as a payment token and to reuse it for a later purchase. If you manage subscriptions (recurring invoicing), you need it to automatically charge the customer when you issue an invoice."
msgstr ""
#. module: payment
diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py
index 15ea2e07542..82033d4375b 100644
--- a/addons/payment/models/payment_acquirer.py
+++ b/addons/payment/models/payment_acquirer.py
@@ -120,7 +120,7 @@ class PaymentAcquirer(models.Model):
('ask', 'Let the customer decide'),
('always', 'Always')],
string='Save Cards', default='none',
- help="This option allows customers to save their credit card as a payment token and to reuse it for a later purchase."
+ help="This option allows customers to save their credit card as a payment token and to reuse it for a later purchase. "
"If you manage subscriptions (recurring invoicing), you need it to automatically charge the customer when you "
"issue an invoice.")
token_implemented = fields.Boolean('Saving Card Data supported', compute='_compute_feature_support', search='_search_is_tokenized')
diff --git a/addons/resource/i18n/resource.pot b/addons/resource/i18n/resource.pot
index 9332892ba51..0696d01be23 100644
--- a/addons/resource/i18n/resource.pot
+++ b/addons/resource/i18n/resource.pot
@@ -435,7 +435,7 @@ msgstr ""
#. module: resource
#: model:ir.model.fields,help:resource.field_resource_calendar_leaves_tz
-msgid "Timezone used when encoding the leave. It is used to correctlylocalize leave hours when computing time intervals."
+msgid "Timezone used when encoding the leave. It is used to correctly localize leave hours when computing time intervals."
msgstr ""
#. module: resource
diff --git a/addons/resource/models/resource.py b/addons/resource/models/resource.py
index 6d215d7160a..ddb3238320a 100644
--- a/addons/resource/models/resource.py
+++ b/addons/resource/models/resource.py
@@ -722,7 +722,7 @@ class ResourceCalendarLeaves(models.Model):
date_to = fields.Datetime('End Date', required=True)
tz = fields.Selection(
_tz_get, string='Timezone', default=lambda self: self._context.get('tz', self.env.user.tz or 'UTC'),
- help="Timezone used when encoding the leave. It is used to correctly"
+ help="Timezone used when encoding the leave. It is used to correctly "
"localize leave hours when computing time intervals.")
resource_id = fields.Many2one(
"resource.resource", 'Resource',
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 32e2061ba3e..8f4757bffc9 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -885,7 +885,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_move_procure_method
-msgid "By default, the system will take from the stock in the source location and passively wait for availability.The other possibility allows you to directly create a procurement on the source location (and thus ignore its current stock) to gather products. If we want to chain moves and have this one to wait for the previous,this second option should be chosen."
+msgid "By default, the system will take from the stock in the source location and passively wait for availability. The other possibility allows you to directly create a procurement on the source location (and thus ignore its current stock) to gather products. If we want to chain moves and have this one to wait for the previous, this second option should be chosen."
msgstr ""
#. module: stock
@@ -5683,7 +5683,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_location_path_auto
-msgid "The 'Manual Operation' value will create a stock move after the current one.With 'Automatic No Step Added', the location is replaced in the original move."
+msgid "The 'Manual Operation' value will create a stock move after the current one. With 'Automatic No Step Added', the location is replaced in the original move."
msgstr ""
#. module: stock
@@ -6677,7 +6677,7 @@ msgstr ""
#. module: stock
#: code:addons/stock/models/stock_inventory.py:386
#, python-format
-msgid "You cannot have two inventory adjustements in state 'in Progress' with the same product(%s), same location(%s), same package, same owner and same lot. Please first validatethe first inventory adjustement with this product before creating another one."
+msgid "You cannot have two inventory adjustements in state 'in Progress' with the same product (%s), same location (%s), same package, same owner and same lot. Please first validate the first inventory adjustement with this product before creating another one."
msgstr ""
#. module: stock
diff --git a/addons/stock/models/stock_inventory.py b/addons/stock/models/stock_inventory.py
index 6b067851bdf..62f78d58f8c 100644
--- a/addons/stock/models/stock_inventory.py
+++ b/addons/stock/models/stock_inventory.py
@@ -383,8 +383,8 @@ class InventoryLine(models.Model):
('prod_lot_id', '=', values.get('prod_lot_id'))])
res = super(InventoryLine, self).create(values)
if existings:
- raise UserError(_("You cannot have two inventory adjustements in state 'in Progress' with the same product"
- "(%s), same location(%s), same package, same owner and same lot. Please first validate"
+ raise UserError(_("You cannot have two inventory adjustements in state 'in Progress' with the same product "
+ "(%s), same location (%s), same package, same owner and same lot. Please first validate "
"the first inventory adjustement with this product before creating another one.") % (res.product_id.display_name, res.location_id.name))
return res
diff --git a/addons/stock/models/stock_location.py b/addons/stock/models/stock_location.py
index 9a458f01b30..05e4bb2b60d 100644
--- a/addons/stock/models/stock_location.py
+++ b/addons/stock/models/stock_location.py
@@ -208,7 +208,7 @@ class PushedFlow(models.Model):
('manual', 'Manual Operation'),
('transparent', 'Automatic No Step Added')], string='Automatic Move',
default='manual', index=True, required=True,
- help="The 'Manual Operation' value will create a stock move after the current one."
+ help="The 'Manual Operation' value will create a stock move after the current one. "
"With 'Automatic No Step Added', the location is replaced in the original move.")
propagate = fields.Boolean('Propagate cancel and split', default=True, help='If checked, when the previous move is cancelled or split, the move generated by this move will too')
active = fields.Boolean('Active', default=True)
diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py
index 7d80f03b366..f220fa92e2f 100644
--- a/addons/stock/models/stock_move.py
+++ b/addons/stock/models/stock_move.py
@@ -115,9 +115,9 @@ class StockMove(models.Model):
('make_to_stock', 'Default: Take From Stock'),
('make_to_order', 'Advanced: Apply Procurement Rules')], string='Supply Method',
default='make_to_stock', required=True,
- help="By default, the system will take from the stock in the source location and passively wait for availability."
+ help="By default, the system will take from the stock in the source location and passively wait for availability. "
"The other possibility allows you to directly create a procurement on the source location (and thus ignore "
- "its current stock) to gather products. If we want to chain moves and have this one to wait for the previous,"
+ "its current stock) to gather products. If we want to chain moves and have this one to wait for the previous, "
"this second option should be chosen.")
scrapped = fields.Boolean('Scrapped', related='location_dest_id.scrap_location', readonly=True, store=True)
scrap_ids = fields.One2many('stock.scrap', 'move_id')
diff --git a/odoo/addons/base/i18n/base.pot b/odoo/addons/base/i18n/base.pot
index ab99d591de7..b48f01be5c8 100644
--- a/odoo/addons/base/i18n/base.pot
+++ b/odoo/addons/base/i18n/base.pot
@@ -5437,7 +5437,7 @@ msgstr ""
#. module: base
#: model:ir.model.fields,help:base.field_ir_act_client_params
-msgid "Arguments sent to the client along withthe view tag"
+msgid "Arguments sent to the client along with the view tag"
msgstr ""
#. module: base
@@ -10050,7 +10050,7 @@ msgstr ""
#. module: base
#: model:ir.model.fields,help:base.field_ir_mail_server_smtp_debug
-msgid "If enabled, the full output of SMTP sessions will be written to the server log at DEBUG level(this is very verbose and may include confidential info!)"
+msgid "If enabled, the full output of SMTP sessions will be written to the server log at DEBUG level (this is very verbose and may include confidential info!)"
msgstr ""
#. module: base
@@ -14969,7 +14969,7 @@ msgstr ""
#. module: base
#: model:ir.model.fields,help:base.field_ir_act_server_link_field_id
#: model:ir.model.fields,help:base.field_ir_cron_link_field_id
-msgid "Provide the field used to link the newly created recordon the record on used by the server action."
+msgid "Provide the field used to link the newly created record on the record on used by the server action."
msgstr ""
#. module: base
@@ -16965,7 +16965,7 @@ msgstr ""
#. module: base
#: code:addons/base/ir/ir_model.py:366
#, python-format
-msgid "The Selection Options expression is not a valid Pythonic expression.Please provide an expression in the [('key','Label'), ...] format."
+msgid "The Selection Options expression is not a valid Pythonic expression. Please provide an expression in the [('key','Label'), ...] format."
msgstr ""
#. module: base
@@ -17708,7 +17708,7 @@ msgstr ""
#. module: base
#: model:ir.model.fields,help:base.field_ir_sequence_implementation
-msgid "Two sequence object implementations are offered: Standard and 'No gap'. The later is slower than the former but forbids anygap in the sequence (while they are possible in the former)."
+msgid "Two sequence object implementations are offered: Standard and 'No gap'. The later is slower than the former but forbids any gap in the sequence (while they are possible in the former)."
msgstr ""
#. module: base
@@ -18995,7 +18995,7 @@ msgstr ""
#. module: base
#: code:addons/base/ir/ir_mail_server.py:224
#, python-format
-msgid "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS instead.If SSL is needed, an upgrade to Python 2.6 on the server-side should do the trick."
+msgid "Your Odoo Server does not support SMTP-over-SSL. You could use STARTTLS instead. If SSL is needed, an upgrade to Python 2.6 on the server-side should do the trick."
msgstr ""
#. module: base
diff --git a/odoo/addons/base/ir/ir_actions.py b/odoo/addons/base/ir/ir_actions.py
index 982a0364089..776a098e453 100644
--- a/odoo/addons/base/ir/ir_actions.py
+++ b/odoo/addons/base/ir/ir_actions.py
@@ -372,7 +372,7 @@ class IrActionsServer(models.Model):
oldname='srcmodel_id', help="Model for record creation / update. Set this field only to specify a different model than the base model.")
crud_model_name = fields.Char(related='crud_model_id.name', readonly=True)
link_field_id = fields.Many2one('ir.model.fields', string='Link using field',
- help="Provide the field used to link the newly created record"
+ help="Provide the field used to link the newly created record "
"on the record on used by the server action.")
fields_lines = fields.One2many('ir.server.object.lines', 'server_id', string='Value Mapping', copy=True)
@@ -695,7 +695,7 @@ class IrActionsActClient(models.Model):
res_model = fields.Char(string='Destination Model', help="Optional model, mostly used for needactions.")
context = fields.Char(string='Context Value', default="{}", required=True, help="Context dictionary as Python expression, empty by default (Default: {})")
params = fields.Binary(compute='_compute_params', inverse='_inverse_params', string='Supplementary arguments',
- help="Arguments sent to the client along with"
+ help="Arguments sent to the client along with "
"the view tag")
params_store = fields.Binary(string='Params storage', readonly=True)
diff --git a/odoo/addons/base/ir/ir_mail_server.py b/odoo/addons/base/ir/ir_mail_server.py
index 0a08993d639..affbaacc5c8 100644
--- a/odoo/addons/base/ir/ir_mail_server.py
+++ b/odoo/addons/base/ir/ir_mail_server.py
@@ -144,7 +144,7 @@ class IrMailServer(models.Model):
"- TLS (STARTTLS): TLS encryption is requested at start of SMTP session (Recommended)\n"
"- SSL/TLS: SMTP sessions are encrypted with SSL/TLS through a dedicated port (default: 465)")
smtp_debug = fields.Boolean(string='Debugging', help="If enabled, the full output of SMTP sessions will "
- "be written to the server log at DEBUG level"
+ "be written to the server log at DEBUG level "
"(this is very verbose and may include confidential info!)")
sequence = fields.Integer(string='Priority', default=10, help="When no specific mail server is requested for a mail, the highest priority one "
"is used. Default priority is 10 (smaller number = higher priority)")
@@ -221,8 +221,8 @@ class IrMailServer(models.Model):
if smtp_encryption == 'ssl':
if 'SMTP_SSL' not in smtplib.__all__:
raise UserError(
- _("Your OpenERP Server does not support SMTP-over-SSL. "
- "You could use STARTTLS instead."
+ _("Your Odoo Server does not support SMTP-over-SSL. "
+ "You could use STARTTLS instead. "
"If SSL is needed, an upgrade to Python 2.6 on the server-side "
"should do the trick."))
connection = smtplib.SMTP_SSL(smtp_server, smtp_port)
diff --git a/odoo/addons/base/ir/ir_model.py b/odoo/addons/base/ir/ir_model.py
index 891d95e5230..868865a26a7 100644
--- a/odoo/addons/base/ir/ir_model.py
+++ b/odoo/addons/base/ir/ir_model.py
@@ -363,7 +363,7 @@ class IrModelFields(models.Model):
raise ValueError(selection)
except Exception:
_logger.info('Invalid selection list definition for fields.selection', exc_info=True)
- raise UserError(_("The Selection Options expression is not a valid Pythonic expression."
+ raise UserError(_("The Selection Options expression is not a valid Pythonic expression. "
"Please provide an expression in the [('key','Label'), ...] format."))
@api.constrains('name', 'state')
diff --git a/odoo/addons/base/ir/ir_sequence.py b/odoo/addons/base/ir/ir_sequence.py
index 7fff19057e9..71fc44c2c76 100644
--- a/odoo/addons/base/ir/ir_sequence.py
+++ b/odoo/addons/base/ir/ir_sequence.py
@@ -119,7 +119,7 @@ class IrSequence(models.Model):
implementation = fields.Selection([('standard', 'Standard'), ('no_gap', 'No gap')],
string='Implementation', required=True, default='standard',
help="Two sequence object implementations are offered: Standard "
- "and 'No gap'. The later is slower than the former but forbids any"
+ "and 'No gap'. The later is slower than the former but forbids any "
"gap in the sequence (while they are possible in the former).")
active = fields.Boolean(default=True)
prefix = fields.Char(help="Prefix value of the record for the sequence")
diff --git a/odoo/tools/config.py b/odoo/tools/config.py
index 1901620cf4e..64666235499 100644
--- a/odoo/tools/config.py
+++ b/odoo/tools/config.py
@@ -224,9 +224,9 @@ class configmanager(object):
help="specify a custom database template to create a new database")
parser.add_option_group(group)
- group = optparse.OptionGroup(parser, "Internationalisation options",
- "Use these options to translate Odoo to another language."
- "See i18n section of the user manual. Option '-d' is mandatory."
+ group = optparse.OptionGroup(parser, "Internationalisation options. ",
+ "Use these options to translate Odoo to another language. "
+ "See i18n section of the user manual. Option '-d' is mandatory. "
"Option '-l' is mandatory in case of importation"
)
group.add_option('--load-language', dest="load_language",