[MERGE] forward port of branch 8.0 up to 3e965ec

3 files changed, 10 insertions, 10 deletions

diff --git a/addons/website/i18n/ja.po b/addons/website/i18n/ja.po
index 5ed53bde525..086494495b0 100644
--- a/addons/website/i18n/ja.po
+++ b/addons/website/i18n/ja.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 8.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-07-22 08:25+0000\n"
-"PO-Revision-Date: 2016-06-20 07:03+0000\n"
+"PO-Revision-Date: 2016-06-22 14:42+0000\n"
 "Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
 "Language-Team: Japanese (http://www.transifex.com/odoo/odoo-8/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -382,7 +382,7 @@ msgstr ""
 #: code:addons/website/static/src/xml/website.editor.xml:92
 #, python-format
 msgid "Basic"
-msgstr ""
+msgstr "初期"
 
 #. module: website
 #: view:website:website.snippets
diff --git a/addons/website/i18n/pl.po b/addons/website/i18n/pl.po
index bbf6d82e6df..74da0f447f0 100644
--- a/addons/website/i18n/pl.po
+++ b/addons/website/i18n/pl.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 8.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-07-22 08:25+0000\n"
-"PO-Revision-Date: 2016-06-08 09:13+0000\n"
+"PO-Revision-Date: 2016-06-24 07:44+0000\n"
 "Last-Translator: zbik2607 <darek@krokus.com.pl>\n"
 "Language-Team: Polish (http://www.transifex.com/odoo/odoo-8/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -719,7 +719,7 @@ msgstr "Prawa autorskie &copy;"
 #. module: website
 #: view:website:website.themes
 msgid "Cosmo"
-msgstr ""
+msgstr "Cosmo"
 
 #. module: website
 #: view:website:website.page_404
diff --git a/addons/website/i18n/zh_CN.po b/addons/website/i18n/zh_CN.po
index 94e25f18676..36e625ccb15 100644
--- a/addons/website/i18n/zh_CN.po
+++ b/addons/website/i18n/zh_CN.po
@@ -23,8 +23,8 @@ msgstr ""
 "Project-Id-Version: Odoo 8.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-07-22 08:25+0000\n"
-"PO-Revision-Date: 2016-06-22 02:43+0000\n"
-"Last-Translator: liAnGjiA <liangjia@qq.com>\n"
+"PO-Revision-Date: 2016-06-26 00:47+0000\n"
+"Last-Translator: Jeffery Chenn <jeffery9@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-8/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -679,19 +679,19 @@ msgstr ".考虑讲述\n                            一个带有个性的故事�
 #. module: website
 #: view:website:website.403 view:website:website.404
 msgid "Contact Us"
-msgstr "联络我们"
+msgstr "联系我们"
 
 #. module: website
 #: view:website:website.snippets
 msgid "Contact Us Now"
-msgstr "现在联络我们"
+msgstr "现在联系我们"
 
 #. module: website
 #: view:website:website.contactus view:website:website.layout
 #: view:website:website.snippets
 #: model:website.menu,name:website.menu_contactus
 msgid "Contact us"
-msgstr "联络我们"
+msgstr "联系我们"
 
 #. module: website
 #: view:website:website.contactus
@@ -2321,7 +2321,7 @@ msgstr "作为可选继承显示"
 #. module: website
 #: view:website:website.layout
 msgid "Sign in"
-msgstr "登陆"
+msgstr "登录"
 
 #. module: website
 #: view:website:website.themes