diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-02-17 18:07:21 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-02-17 18:07:21 +0100 |
| commit | 60c9cac46b0f32069a6763c3bf0b9e3a64d90e7d (patch) | |
| tree | 4a234008ac69f9b573efc310f93e7a2ac850bce0 /addons/website/data | |
| parent | 4ecba34944e04e8be88e2588407dd84fc24bbe0a (diff) | |
| parent | 87a01c75ef1dde98bc31f714d8ac4b2ea598e316 (diff) | |
[MERGE] forward port of branch saas-9 up to 87a01c7
Diffstat (limited to 'addons/website/data')
| -rw-r--r-- | addons/website/data/data.xml | 2 | ||||
| -rw-r--r-- | addons/website/data/demo.xml | 2 | ||||
| -rw-r--r-- | addons/website/data/web_planner_data.xml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/addons/website/data/data.xml b/addons/website/data/data.xml index 3340335e390..f7d29ac4046 100644 --- a/addons/website/data/data.xml +++ b/addons/website/data/data.xml @@ -2,7 +2,7 @@ <openerp> <data noupdate="1"> <record id="default_website" model="website"> - <field name="name">localhost</field> + <field name="name">Website localhost</field> <field name="domain">localhost</field> <field name="company_id" ref="base.main_company"/> <field name="user_id" ref="base.public_user"/> diff --git a/addons/website/data/demo.xml b/addons/website/data/demo.xml index 10b80df08fa..adf1735dcd9 100644 --- a/addons/website/data/demo.xml +++ b/addons/website/data/demo.xml @@ -135,7 +135,7 @@ response = request.render("website.template_partner_comment", values) </record> <record id="website2" model="website"> - <field name="name">0.0.0.0</field> + <field name="name">Website 0.0.0.0</field> <field name="domain">0.0.0.0</field> <field name="social_twitter">https://twitter.com/Odoo</field> <field name="social_facebook">https://www.facebook.com/Odoo</field> diff --git a/addons/website/data/web_planner_data.xml b/addons/website/data/web_planner_data.xml index e43a22ede43..8ce93eca745 100644 --- a/addons/website/data/web_planner_data.xml +++ b/addons/website/data/web_planner_data.xml @@ -445,7 +445,7 @@ <input id="input_element_footer_0" type="text" placeholder="ex: About us"/> </div> <div class="col-md-6"> - <textarea id="input_element_footer_7" type="text" placeholder="ex: Contact us, Our Customers, Privacy Policy, Events, Bolg, Jobs"/> + <textarea id="input_element_footer_7" type="text" placeholder="ex: Contact us, Our Customers, Privacy Policy, Events, Blog, Jobs"/> </div> </li> <li class="row"> |