[FIX] update saas-10 translations by merging 9.0 and master

using the --uses-first parameter on msgmerge this time

addons/web_tip/i18n/ja.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-07-22 08:38+0000\n"
+"POT-Creation-Date: 2016-08-29 12:00+0000\n"
+"PO-Revision-Date: 2016-08-28 09:34+0000\n"
 "Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
 "Language-Team: Japanese (http://www.transifex.com/odoo/odoo-9/language/ja/)\n"
 "Language: ja\n"
@@ -202,7 +202,7 @@ msgstr ""
 #: model:ir.model,name:web_tip.model_web_tip
 #: model:ir.ui.menu,name:web_tip.menu_tip_action
 msgid "Tips"
-msgstr ""
+msgstr "ヒント"
 
 #. module: web_tip
 #: model:ir.model.fields,field_description:web_tip.field_web_tip_trigger_selector