[MERGE] forward port branch 12.0 up to b3052b690fa

2 files changed, 52 insertions, 21 deletions

diff --git a/addons/hr_org_chart/i18n/ko.po b/addons/hr_org_chart/i18n/ko.po
index b90a3e99e20..7214d0e6316 100644
--- a/addons/hr_org_chart/i18n/ko.po
+++ b/addons/hr_org_chart/i18n/ko.po
@@ -3,14 +3,16 @@
 # * hr_org_chart
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Link Up링크업 <linkup.way@gmail.com>, 2018
+# Linkup <link-up@naver.com>, 2018
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~18\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-20 09:53+0000\n"
-"PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-08-24 09:19+0000\n"
+"Last-Translator: Linkup <link-up@naver.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/odoo/teams/41243/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +22,7 @@ msgstr ""
 
 #. module: hr_org_chart
 #. openerp-web
-#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:136
+#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:137
 #, python-format
 msgid "Direct Subordinates of %s"
 msgstr ""
@@ -35,7 +37,7 @@ msgstr ""
 #. module: hr_org_chart
 #: model:ir.model,name:hr_org_chart.model_hr_employee
 msgid "Employee"
-msgstr ""
+msgstr "임직원"
 
 #. module: hr_org_chart
 #. openerp-web
@@ -46,13 +48,13 @@ msgstr ""
 
 #. module: hr_org_chart
 #. openerp-web
-#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:146
+#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:147
 #, python-format
 msgid "Indirect Subordinates of %s"
 msgstr ""
 
 #. module: hr_org_chart
-#: model:ir.model.fields,field_description:hr_org_chart.field_hr_employee_child_all_count
+#: model:ir.model.fields,field_description:hr_org_chart.field_hr_employee__child_all_count
 msgid "Indirect Surbordinates Count"
 msgstr ""
 
@@ -65,6 +67,13 @@ msgstr ""
 
 #. module: hr_org_chart
 #. openerp-web
+#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:66
+#, python-format
+msgid "More managers"
+msgstr ""
+
+#. module: hr_org_chart
+#. openerp-web
 #: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:87
 #, python-format
 msgid "No hierarchy position."
@@ -77,7 +86,14 @@ msgstr ""
 
 #. module: hr_org_chart
 #. openerp-web
-#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:139
+#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:155
+#, python-format
+msgid "Redirect"
+msgstr ""
+
+#. module: hr_org_chart
+#. openerp-web
+#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:140
 #, python-format
 msgid "Subordinates of %s"
 msgstr ""
@@ -94,4 +110,4 @@ msgstr ""
 #: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:144
 #, python-format
 msgid "Total"
-msgstr "총계"
+msgstr "합계"
diff --git a/addons/hr_org_chart/i18n/th.po b/addons/hr_org_chart/i18n/th.po
index 771223b2f29..26bc2b614a4 100644
--- a/addons/hr_org_chart/i18n/th.po
+++ b/addons/hr_org_chart/i18n/th.po
@@ -3,14 +3,15 @@
 # * hr_org_chart
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2018
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~18\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-20 09:53+0000\n"
-"PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-08-24 09:19+0000\n"
+"Last-Translator: Martin Trigaux, 2018\n"
 "Language-Team: Thai (https://www.transifex.com/odoo/teams/41243/th/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +21,7 @@ msgstr ""
 
 #. module: hr_org_chart
 #. openerp-web
-#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:136
+#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:137
 #, python-format
 msgid "Direct Subordinates of %s"
 msgstr ""
@@ -35,7 +36,7 @@ msgstr ""
 #. module: hr_org_chart
 #: model:ir.model,name:hr_org_chart.model_hr_employee
 msgid "Employee"
-msgstr ""
+msgstr "บุคลากร"
 
 #. module: hr_org_chart
 #. openerp-web
@@ -46,13 +47,13 @@ msgstr ""
 
 #. module: hr_org_chart
 #. openerp-web
-#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:146
+#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:147
 #, python-format
 msgid "Indirect Subordinates of %s"
 msgstr ""
 
 #. module: hr_org_chart
-#: model:ir.model.fields,field_description:hr_org_chart.field_hr_employee_child_all_count
+#: model:ir.model.fields,field_description:hr_org_chart.field_hr_employee__child_all_count
 msgid "Indirect Surbordinates Count"
 msgstr ""
 
@@ -65,6 +66,13 @@ msgstr ""
 
 #. module: hr_org_chart
 #. openerp-web
+#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:66
+#, python-format
+msgid "More managers"
+msgstr ""
+
+#. module: hr_org_chart
+#. openerp-web
 #: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:87
 #, python-format
 msgid "No hierarchy position."
@@ -77,7 +85,14 @@ msgstr ""
 
 #. module: hr_org_chart
 #. openerp-web
-#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:139
+#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:155
+#, python-format
+msgid "Redirect"
+msgstr ""
+
+#. module: hr_org_chart
+#. openerp-web
+#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:140
 #, python-format
 msgid "Subordinates of %s"
 msgstr ""