diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-15 13:10:45 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-15 13:10:45 +0200 |
| commit | 9fe4cf5f728ffc3ad2bb387841aa1b57c1ba16dd (patch) | |
| tree | 8dc9257aba7132a65fa9ac02fd847db290d95d30 /addons/website_google_map | |
| parent | b2220945896bb9f343840d19b8d2821467e22d48 (diff) | |
| parent | dda0d3d62d23cae3013db32bcb6322a2574f0162 (diff) | |
[MERGE] forward port of branch saas-11 up to dda0d3d
# Conflicts:
# addons/product_uos/i18n/lo.po
# addons/sales_team/models/__init__.py
# addons/website_payment/views/website_payment_templates.xml
# addons/website_portal_sale/views/templates.xml
# openerp/addons/base/ir/ir_qweb.py
Diffstat (limited to 'addons/website_google_map')
| -rw-r--r-- | addons/website_google_map/i18n/pl.po | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/website_google_map/i18n/pl.po b/addons/website_google_map/i18n/pl.po index 397ac3f121a..dfb23e12daa 100644 --- a/addons/website_google_map/i18n/pl.po +++ b/addons/website_google_map/i18n/pl.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:41+0000\n" -"PO-Revision-Date: 2015-09-08 10:29+0000\n" +"PO-Revision-Date: 2016-06-09 05:01+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Polish (http://www.transifex.com/odoo/odoo-9/language/pl/)\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" #. module: website_google_map #: model:ir.ui.view,arch_db:website_google_map.google_map msgid "<!DOCTYPE html>" -msgstr "" +msgstr "<!DOCTYPE html>" #. module: website_google_map #: model:ir.ui.view,arch_db:website_google_map.google_map |