diff --git a/.tx/config b/.tx/config
index ca8e8fa1e99db660b376f618334c31790a70e6e5..bc15e57845d853b328e3ebf20fc8230be206af3b 100644
--- a/.tx/config
+++ b/.tx/config
@@ -182,6 +182,11 @@ file_filter = addons/calendar/i18n/<lang>.po
 source_file = addons/calendar/i18n/calendar.pot
 source_lang = en
 
+[odoo-11.calendar_sms]
+file_filter = addons/calendar_sms/i18n/<lang>.po
+source_file = addons/calendar_sms/i18n/calendar_sms.pot
+source_lang = en
+
 [odoo-11.contacts]
 file_filter = addons/contacts/i18n/<lang>.po
 source_file = addons/contacts/i18n/contacts.pot
diff --git a/odoo/addons/base/i18n/base.pot b/odoo/addons/base/i18n/base.pot
index 317089f94787c445789e053db4ab907056426790..ac813c1367491ffae473508b424f7d2e22e05ac0 100644
--- a/odoo/addons/base/i18n/base.pot
+++ b/odoo/addons/base/i18n/base.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~18\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-02 11:56+0000\n"
-"PO-Revision-Date: 2017-10-02 11:56+0000\n"
+"POT-Creation-Date: 2017-10-10 13:14+0000\n"
+"PO-Revision-Date: 2017-10-10 13:14+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -623,13 +623,6 @@ msgid "\n"
 "    "
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_sms_fortytwo
-msgid "\n"
-"    Send SMS text messages with FortyTwo SMS Services.\n"
-""
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,summary:base.module_sale_ebay
 msgid "\n"
@@ -3364,14 +3357,6 @@ msgid "\n"
 ""
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,description:base.module_test_main_flows
-msgid "\n"
-"This mobule will test the main workflow of Odoo.\n"
-"It will install some main apps and will try to execute the most important actions.\n"
-""
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,description:base.module_rating_project
 msgid "\n"
@@ -3661,7 +3646,7 @@ msgid "\n"
 "This module gives a framework for SMS text messaging\n"
 "----------------------------------------------------\n"
 "\n"
-"You need to install a provider alongside of this module in order to be able send SMS text messages.\n"
+"The service is provided by the In App Purchase Odoo platform.\n"
 ""
 msgstr ""
 
@@ -3770,6 +3755,13 @@ msgid "\n"
 "    "
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_iap
+msgid "\n"
+"This module provides standard tools (account model, context manager and helpers) to support In-App purchases inside Odoo.\n"
+""
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_at
 #: model:ir.module.module,description:base.module_l10n_at_reports
@@ -3818,6 +3810,14 @@ msgid "\n"
 "    "
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,description:base.module_test_main_flows
+msgid "\n"
+"This module will test the main workflow of Odoo.\n"
+"It will install some main apps and will try to execute the most important actions.\n"
+""
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban_gauge
 msgid "\n"
@@ -4342,10 +4342,15 @@ msgstr ""
 #: model:ir.ui.view,arch_db:base.view_server_action_form
 msgid "<code style=\"white-space: pre-wrap\">\n"
 "partner_name = record.name + '_code'\n"
-"env[\"res.partner\"].create({\"name\": partner_name})\n"
+"env['res.partner'].create({'name': partner_name})\n"
 "</code>"
 msgstr ""
 
+#. module: base
+#: model:ir.ui.view,arch_db:base.view_server_action_form
+msgid "<code>Warning</code>: Warning Exception to use with <code>raise</code>"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_model_fields_form
 #: model:ir.ui.view,arch_db:base.view_model_form
@@ -4358,6 +4363,31 @@ msgstr ""
 msgid "<code>dateutil</code> (Python module)"
 msgstr ""
 
+#. module: base
+#: model:ir.ui.view,arch_db:base.view_server_action_form
+msgid "<code>env</code>: Odoo Environment on which the action is triggered"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.view,arch_db:base.view_server_action_form
+msgid "<code>log(message, level='info')</code>:logging function to record debug information in <code>ir.logging</code> table"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.view,arch_db:base.view_server_action_form
+msgid "<code>model</code>: Odoo Model of the record on which the action is triggered; is a void recordset"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.view,arch_db:base.view_server_action_form
+msgid "<code>record</code>: record on which the action is triggered; may be be void"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.view,arch_db:base.view_server_action_form
+msgid "<code>records</code>: recordset of all records on which the action is triggered in multi mode; may be void"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_model_fields_form
 #: model:ir.ui.view,arch_db:base.view_model_form
@@ -4370,6 +4400,11 @@ msgstr ""
 msgid "<code>time</code> (Python module)"
 msgstr ""
 
+#. module: base
+#: model:ir.ui.view,arch_db:base.view_server_action_form
+msgid "<code>time</code>, <code>datetime</code>, <code>dateutil</code>, <code>timezone</code>: useful Python libraries"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_currency_kanban
 msgid "<strong><span>Current Rate: </span></strong>"
@@ -5804,6 +5839,11 @@ msgstr ""
 msgid "Basic 2D Grid view for odoo"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,summary:base.module_iap
+msgid "Basic models and helpers to support In-App purchases."
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_batch_deposit
 msgid "Batch Deposit"
@@ -6408,7 +6448,7 @@ msgid "China"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions_report.py:683
+#: code:addons/base/ir/ir_actions_report.py:685
 #, python-format
 msgid "Choose Your Document Layout"
 msgstr ""
@@ -7536,11 +7576,6 @@ msgstr ""
 msgid "DHL Shipping"
 msgstr ""
 
-#. module: base
-#: model:ir.ui.view,arch_db:base.res_config_settings_view_form
-msgid "DISCARD"
-msgstr ""
-
 #. module: base
 #: selection:report.paperformat,format:0
 msgid "DLE 26 110 x 220 mm"
@@ -7883,6 +7918,11 @@ msgid "Disabling this option will also uninstall the following modules \n"
 "%s"
 msgstr ""
 
+#. module: base
+#: model:ir.ui.view,arch_db:base.res_config_settings_view_form
+msgid "Discard"
+msgstr ""
+
 #. module: base
 #: model:ir.module.category,name:base.module_category_discuss
 #: model:ir.module.module,shortdesc:base.module_mail
@@ -8457,13 +8497,13 @@ msgid "Events Sales"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_gamification_sale_crm
-msgid "Example of goal definitions and challenges that can be used related to the usage of the CRM Sale module."
+#: model:ir.ui.view,arch_db:base.view_server_action_form
+msgid "Example of Python code"
 msgstr ""
 
 #. module: base
-#: model:ir.ui.view,arch_db:base.view_server_action_form
-msgid "Example of python code"
+#: model:ir.module.module,description:base.module_gamification_sale_crm
+msgid "Example of goal definitions and challenges that can be used related to the usage of the CRM Sale module."
 msgstr ""
 
 #. module: base
@@ -9024,11 +9064,6 @@ msgstr ""
 msgid "Formatted Email"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,summary:base.module_sms_fortytwo
-msgid "FortyTwo SMS Gateway"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_website_forum
 msgid "Forum"
@@ -9610,7 +9645,7 @@ msgstr ""
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_server_action_form
-msgid "Help with Python expressions."
+msgid "Help with Python expressions"
 msgstr ""
 
 #. module: base
@@ -10201,6 +10236,11 @@ msgstr ""
 msgid "In Apps"
 msgstr ""
 
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_iap
+msgid "In-App Purchases"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_currency_search
 #: model:ir.ui.view,arch_db:base.view_view_search
@@ -10274,8 +10314,12 @@ msgid "Indonesia"
 msgstr ""
 
 #. module: base
+#: model:ir.actions.act_window,name:base.res_partner_industry_action
+#: model:ir.model,name:base.model_res_partner_industry
 #: model:ir.model.fields,field_description:base.field_res_partner_industry_id
 #: model:ir.model.fields,field_description:base.field_res_users_industry_id
+#: model:ir.ui.view,arch_db:base.res_partner_industry_view_form
+#: model:ir.ui.view,arch_db:base.res_partner_industry_view_tree
 msgid "Industry"
 msgstr ""
 
@@ -15549,11 +15593,6 @@ msgstr ""
 msgid "SEPA Direct Debit"
 msgstr ""
 
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_sms_fortytwo
-msgid "SMS FortyTwo Provider"
-msgstr ""
-
 #. module: base
 #: model:ir.module.module,summary:base.module_sms
 msgid "SMS Text Messaging"
@@ -15561,7 +15600,7 @@ msgstr ""
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sms
-msgid "SMS base"
+msgid "SMS gateway"
 msgstr ""
 
 #. module: base
@@ -15843,16 +15882,6 @@ msgstr ""
 msgid "Second: %(sec)s"
 msgstr ""
 
-#. module: base
-#: model:ir.actions.act_window,name:base.res_partner_industry_action
-#: model:ir.model,name:base.model_res_partner_industry
-#: model:ir.model.fields,field_description:base.field_res_partner_industry_id
-#: model:ir.model.fields,field_description:base.field_res_users_industry_id
-#: model:ir.ui.view,arch_db:base.res_partner_industry_view_form
-#: model:ir.ui.view,arch_db:base.res_partner_industry_view_tree
-msgid "Sector of Activity"
-msgstr ""
-
 #. module: base
 #: model:ir.ui.menu,name:base.menu_security
 #: model:ir.ui.view,arch_db:base.act_report_xml_view
@@ -17449,6 +17478,11 @@ msgstr ""
 msgid "To enable it, make sure this directory exists and is writable on the server:"
 msgstr ""
 
+#. module: base
+#: model:ir.ui.view,arch_db:base.view_server_action_form
+msgid "To return an action, assign: <code>action = {...}</code>"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.view,arch_db:base.ir_actions_todo_tree
 msgid "Todo"
@@ -17777,7 +17811,7 @@ msgid "Unable to delete this document because it is used as a default property"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions_report.py:622
+#: code:addons/base/ir/ir_actions_report.py:624
 #, python-format
 msgid "Unable to find Wkhtmltopdf on this system. The PDF can not be created."
 msgstr ""
@@ -18765,13 +18799,13 @@ msgid "Wizards to be Launched"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions_report.py:393
+#: code:addons/base/ir/ir_actions_report.py:394
 #, python-format
 msgid "Wkhtmltopdf failed (error code: %s). Memory limit too low or maximum file number of subprocess reached. Message : %s"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions_report.py:396
+#: code:addons/base/ir/ir_actions_report.py:397
 #, python-format
 msgid "Wkhtmltopdf failed (error code: %s). Message: %s"
 msgstr ""
@@ -19161,11 +19195,6 @@ msgstr ""
 msgid "email@yourcompany.com"
 msgstr ""
 
-#. module: base
-#: model:ir.ui.view,arch_db:base.view_server_action_form
-msgid "env: Odoo Environement on which the action is triggered"
-msgstr ""
-
 #. module: base
 #: code:addons/base/ir/ir_fields.py:328
 #, python-format
@@ -19472,11 +19501,6 @@ msgstr ""
 msgid "ir.ui.view.custom"
 msgstr ""
 
-#. module: base
-#: model:ir.ui.view,arch_db:base.view_server_action_form
-msgid "log(message, level='info'): a logging function to create ir_logging records"
-msgstr ""
-
 #. module: base
 #: selection:ir.model.fields,ttype:0
 msgid "many2many"
@@ -19487,11 +19511,6 @@ msgstr ""
 msgid "many2one"
 msgstr ""
 
-#. module: base
-#: model:ir.ui.view,arch_db:base.view_server_action_form
-msgid "model: Odoo Model of the record on which the action is triggered; is a void recordset"
-msgstr ""
-
 #. module: base
 #: selection:ir.model.fields,ttype:0
 msgid "monetary"
@@ -19535,16 +19554,6 @@ msgstr ""
 msgid "pos_sale"
 msgstr ""
 
-#. module: base
-#: model:ir.ui.view,arch_db:base.view_server_action_form
-msgid "record: browse record on which the action is triggered"
-msgstr ""
-
-#. module: base
-#: model:ir.ui.view,arch_db:base.view_server_action_form
-msgid "records: record set of records on which the action is triggered in multi mode"
-msgstr ""
-
 #. module: base
 #: selection:ir.model.fields,ttype:0
 msgid "reference"
@@ -19660,11 +19669,6 @@ msgstr ""
 msgid "text"
 msgstr ""
 
-#. module: base
-#: model:ir.ui.view,arch_db:base.view_server_action_form
-msgid "time, datetime, timezone: Python module"
-msgstr ""
-
 #. module: base
 #: model:ir.ui.view,arch_db:base.res_config_installer
 msgid "title"