[MERGE] forward port of branch 9.0 up to dcab356

2 files changed, 16 insertions, 15 deletions

diff --git a/addons/project_timesheet/i18n/ca.po b/addons/project_timesheet/i18n/ca.po
index 3f7828ef18c..77cdf87d8d2 100644
--- a/addons/project_timesheet/i18n/ca.po
+++ b/addons/project_timesheet/i18n/ca.po
@@ -3,13 +3,14 @@
 # * project_timesheet
 # 
 # Translators:
+# Marc Tormo i Bochaca <mtbochaca@gmail.com>, 2016
 msgid ""
 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-12-21 22:25+0000\n"
-"Last-Translator: Martin Trigaux\n"
+"PO-Revision-Date: 2016-05-02 14:37+0000\n"
+"Last-Translator: Marc Tormo i Bochaca <mtbochaca@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/odoo/odoo-9/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,12 +24,12 @@ msgstr ""
 msgid ""
 "<p class=\"oe_view_nocontent_create\">Record your timesheets for the project"
 " '%s'.</p>"
-msgstr ""
+msgstr "<p class=\"oe_view_nocontent_create\">Graveu el vostre full de treball per al projecte '%s'.</p>"
 
 #. module: project_timesheet
 #: model:ir.model.fields,field_description:project_timesheet.field_project_config_settings_group_tasks_work_on_tasks
 msgid "Activity Log"
-msgstr ""
+msgstr "Registre d'activitat "
 
 #. module: project_timesheet
 #: model:ir.model.fields,help:project_timesheet.field_project_config_settings_group_tasks_work_on_tasks
@@ -43,7 +44,7 @@ msgstr "Compte analític"
 #. module: project_timesheet
 #: model:ir.ui.view,arch_db:project_timesheet.view_account_analytic_line_form_inherit_account_id
 msgid "Analytic Account/Project"
-msgstr ""
+msgstr "Compte analític/Projecte"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_account_analytic_line
@@ -86,7 +87,7 @@ msgstr "Retard hores"
 #. module: project_timesheet
 #: selection:project.config.settings,group_tasks_work_on_tasks:0
 msgid "Do not log work activities on task"
-msgstr ""
+msgstr "No registrar activitats de treball a la tasca"
 
 #. module: project_timesheet
 #: model:ir.ui.view,arch_db:project_timesheet.view_task_form2_inherited
@@ -108,7 +109,7 @@ msgstr "Hores dedicades"
 msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
-msgstr ""
+msgstr "Si la tasca te un progrés del 99.99% heu de tancar la tasca si està finalitzada o re-avaluar el temps "
 
 #. module: project_timesheet
 #: selection:project.config.settings,group_tasks_work_on_tasks:0
@@ -203,9 +204,9 @@ msgstr "Progrés del temps de treball (%)"
 msgid ""
 "You cannot delete a partner which is assigned to project, but you can "
 "uncheck the active box."
-msgstr ""
+msgstr "No podeu esborrar un soci que està assignat a un projecte, però podeu desmarcar la casella d'actiu."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_config_settings
 msgid "project.config.settings"
-msgstr ""
+msgstr "project.config.settings"
diff --git a/addons/project_timesheet/i18n/nb.po b/addons/project_timesheet/i18n/nb.po
index a6dca237437..861488b11c3 100644
--- a/addons/project_timesheet/i18n/nb.po
+++ b/addons/project_timesheet/i18n/nb.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 07:35+0000\n"
+"PO-Revision-Date: 2016-05-04 15:36+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/odoo/odoo-9/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
 #. module: project_timesheet
 #: model:ir.model.fields,help:project_timesheet.field_project_config_settings_group_tasks_work_on_tasks
 msgid "Allows you to compute work on tasks."
-msgstr ""
+msgstr "Lar deg beregne arbeidstid på oppgaver."
 
 #. module: project_timesheet
 #: model:ir.model.fields,field_description:project_timesheet.field_project_task_analytic_account_id
@@ -59,7 +59,7 @@ msgstr ""
 #. module: project_timesheet
 #: model:ir.model.fields,field_description:project_timesheet.field_report_project_task_user_hours_delay
 msgid "Avg. Plan.-Eff."
-msgstr ""
+msgstr "Gj.snitt effektivitet"
 
 #. module: project_timesheet
 #: model:ir.model.fields,help:project_timesheet.field_project_task_delay_hours
@@ -96,7 +96,7 @@ msgstr "Varighet."
 #. module: project_timesheet
 #: model:ir.model.fields,field_description:project_timesheet.field_report_project_task_user_hours_effective
 msgid "Effective Hours"
-msgstr ""
+msgstr "Effektive timer"
 
 #. module: project_timesheet
 #: model:ir.model.fields,field_description:project_timesheet.field_project_task_effective_hours
@@ -108,12 +108,12 @@ msgstr "Timer brukt"
 msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
-msgstr ""
+msgstr "Hvis oppgaven har en fremgang på 99,99% bør du lukke oppgaven hvis den er ferdig eller revurdere tiden"
 
 #. module: project_timesheet
 #: selection:project.config.settings,group_tasks_work_on_tasks:0
 msgid "Log work activities on tasks"
-msgstr ""
+msgstr "Logg arbeid på oppgaver"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_res_partner