diff --git a/addons/payment_ogone/data/ogone.py b/addons/payment_ogone/data/ogone.py
index 3a2500ee24b..8b3369d9721 100644
--- a/addons/payment_ogone/data/ogone.py
+++ b/addons/payment_ogone/data/ogone.py
@@ -12,7 +12,7 @@ OGONE_ERROR_MAP = {
'0020001009': "Authorization failed, please retry",
'0020001010': "Authorization failed, please retry",
'0030001999': "Our payment system is currently under maintenance, please try later",
- '0050001005': "Expiry date error",
+ '0050001005': "Expiration Date error",
'0050001007': "Requested Operation code not allowed",
'0050001008': "Invalid delay value",
'0050001010': "Input date in invalid format",
@@ -216,7 +216,7 @@ OGONE_ERROR_MAP = {
'50001002': "Card number format check failed for given card number.",
'50001003': "Merchant data error",
'50001004': "Merchant identification missing",
- '50001005': "Expiry date error",
+ '50001005': "Expiration Date error",
'50001006': "Amount is not a number",
'50001007': "A technical problem occurred, please contact helpdesk",
'50001008': "A technical problem occurred, please contact helpdesk",
diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py
index 763e671dadd..a6a2b04645e 100644
--- a/addons/product_expiry/__openerp__.py
+++ b/addons/product_expiry/__openerp__.py
@@ -1,6 +1,6 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
{
- 'name' : 'Products Expiry Date',
+ 'name' : 'Products Expiration Date',
'version' : '1.0',
'category' : 'Specific Industry Applications',
'depends' : ['stock'],
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index a1947c72a99..15c5309a2ac 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -1517,7 +1517,7 @@ msgstr ""
#. module: stock
#: selection:stock.config.settings,module_product_expiry:0
-msgid "Define expiry date on serial numbers"
+msgid "Define Expiration Date on serial numbers"
msgstr ""
#. module: stock
@@ -1753,7 +1753,7 @@ msgstr ""
#. module: stock
#: selection:stock.config.settings,module_product_expiry:0
-msgid "Do not use expiry date"
+msgid "Do not use Expiration Date"
msgstr ""
#. module: stock
@@ -1854,7 +1854,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_product_expiry
-msgid "Expiry Dates"
+msgid "Expiration Dates"
msgstr ""
#. module: stock
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index 52a86211681..cc1700b7262 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -87,9 +87,9 @@ class stock_config_settings(osv.osv_memory):
help='Adds a Claim link to the delivery order.\n'
'-This installs the module claim_from_delivery.'),
'module_product_expiry': fields.selection([
- (0, 'Do not use expiry date'),
- (1, 'Define expiry date on serial numbers')
- ], "Expiry Dates",
+ (0, 'Do not use Expiration Date'),
+ (1, 'Define Expiration Date on serial numbers')
+ ], "Expiration Dates",
help="""Track different dates on products and serial numbers.
The following dates can be tracked:
- end of life
diff --git a/addons/website_quote/i18n/website_quote.pot b/addons/website_quote/i18n/website_quote.pot
index 2b8e1294eb5..14dd40feee4 100644
--- a/addons/website_quote/i18n/website_quote.pot
+++ b/addons/website_quote/i18n/website_quote.pot
@@ -238,7 +238,7 @@ msgstr ""
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.report_saleorder_validity_date
-msgid "Expiry Date:"
+msgid "Expiration Date:"
msgstr ""
#. module: website_quote
diff --git a/addons/website_quote/views/report_saleorder.xml b/addons/website_quote/views/report_saleorder.xml
index 9139ed6899d..b813999656f 100644
--- a/addons/website_quote/views/report_saleorder.xml
+++ b/addons/website_quote/views/report_saleorder.xml
@@ -4,7 +4,7 @@
-
Expiry Date:
+
Expiration Date: