[MERGE] forward port branch 11.0 up to e918271f760

4 files changed, 18 insertions, 18 deletions

diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
index 3b162466f5c..1933940a398 100644
--- a/addons/project/i18n/ja.po
+++ b/addons/project/i18n/ja.po
@@ -951,7 +951,7 @@ msgstr "有効"
 #: model:ir.actions.act_window,name:project.mail_activity_type_action_config_project_types
 #: model:ir.ui.menu,name:project.project_menu_config_activity_type
 msgid "Activity Types"
-msgstr ""
+msgstr "活動タイプ"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.task_type_edit
@@ -1944,7 +1944,7 @@ msgstr "フォーキャスト"
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_search_form
 msgid "Future Activities"
-msgstr ""
+msgstr "将来の活動"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_tasks_config
@@ -2417,7 +2417,7 @@ msgstr "最終更新日"
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_search_form
 msgid "Late Activities"
-msgstr ""
+msgstr "遅れた活動"
 
 #. module: project
 #: model:web.planner,tooltip_planner:project.planner_project
@@ -2509,7 +2509,7 @@ msgstr "マーケティング部門"
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_project_favorite_user_ids
 msgid "Members"
-msgstr "会員"
+msgstr "メンバー"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.project_task_actions_act_window_merge_tasks
@@ -2534,7 +2534,7 @@ msgstr "従業員間のより効率的なコミュニケーション"
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_search_form
 msgid "My Activities"
-msgstr ""
+msgstr "自分の活動"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_project_project_filter
@@ -2549,7 +2549,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.project_task_action_activity
 msgid "My Next Activities"
-msgstr ""
+msgstr "自分の次の活動"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_search_form
@@ -3172,7 +3172,7 @@ msgstr ""
 #: code:addons/project/controllers/portal.py:93
 #, python-format
 msgid "Search in Messages"
-msgstr ""
+msgstr "メッセージ内を検索"
 
 #. module: project
 #: code:addons/project/controllers/portal.py:95
diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index da814a6b94b..e26350348df 100644
--- a/addons/project/i18n/nl.po
+++ b/addons/project/i18n/nl.po
@@ -561,6 +561,8 @@ msgid ""
 "<strong>Add a Deadline</strong><br/>\n"
 "                                    The deadline will help you determine if a task is progressing as expected  and to anticipate its next update."
 msgstr ""
+"<strong>Deadline toevoegen</strong><br/>\n"
+"De deadline helpt u bepalen of een taak vooruitgaat zoals verwacht en helpt u anticiperen op de volgende update."
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index 26471088e94..8b961059159 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
@@ -26,14 +26,14 @@
 # liulixia <liu.lixia@elico-corp.com>, 2017
 # fausthuang <faust_huang@hotmail.com>, 2017
 # Si Ling Lau <happy8645@hotmail.com>, 2017
-# Jeff Yu <jeff.yu@elico-corp.com>, 2017
+# Jeff Yu - Elico Corp <jeff.yu@elico-corp.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:25+0000\n"
 "PO-Revision-Date: 2017-10-02 11:25+0000\n"
-"Last-Translator: Jeff Yu <jeff.yu@elico-corp.com>, 2017\n"
+"Last-Translator: Jeff Yu - Elico Corp <jeff.yu@elico-corp.com>, 2017\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -959,7 +959,7 @@ msgstr "有效"
 #: model:ir.actions.act_window,name:project.mail_activity_type_action_config_project_types
 #: model:ir.ui.menu,name:project.project_menu_config_activity_type
 msgid "Activity Types"
-msgstr ""
+msgstr "活动类型"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.task_type_edit
@@ -2636,7 +2636,7 @@ msgstr "没有确认的"
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_notes
 msgid "Notes"
-msgstr "便笺"
+msgstr "备注"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index ff4f92c9305..b4b32662cb4 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -307,23 +307,21 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="o_kanban_card_manage_pane">
+                                    <div class="o_kanban_card_manage_pane" groups="project.group_project_manager">
                                         <div class="o_kanban_card_manage_section o_kanban_manage_reports">
-                                            <div groups="project.group_project_manager">
+                                            <div>
                                                 <a type="edit">Settings</a>
                                             </div>
                                             <div>
                                                 <a name="%(project.action_project_task_user_tree_filtered)d" type="action">Tasks</a>
                                             </div>
                                         </div>
-                                        <div t-if="widget.editable" class="o_project_kanban_colorpicker">
+                                        <div class="o_project_kanban_colorpicker">
                                             <ul class="oe_kanban_colorpicker" data-field="color"/>
                                         </div>
                                     </div>
-                                    <div class="o_project_kanban_manage">
-                                        <a class="o_kanban_manage_toggle_button o_left" href="#"><i class="fa fa-ellipsis-v" /></a>
-                                        <span class="o_right"><field name="is_favorite" widget="boolean_favorite" nolabel="1" /></span>
-                                    </div>
+                                    <a class="o_kanban_manage_toggle_button o_left" href="#" groups="project.group_project_manager"><i class="fa fa-ellipsis-v" /></a>
+                                    <span class="o_right"><field name="is_favorite" widget="boolean_favorite" nolabel="1" /></span>
                                 </div>
 
                                 <div class="o_project_kanban_boxes">