[I18N] fetch new master terms from Transifex

5 files changed, 744 insertions, 2838 deletions

diff --git a/addons/gamification/i18n/es.po b/addons/gamification/i18n/es.po
index 3a9d53f217d..d3bbbee888f 100644
--- a/addons/gamification/i18n/es.po
+++ b/addons/gamification/i18n/es.po
@@ -1,15 +1,7 @@
-# #-#-#-#-#  es.po (Odoo 9.0)  #-#-#-#-#
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * gamification
-#
-# Translators:
-# Jesus Alan Ramos Rodriguez <alan.ramos@jarsa.com.mx>, 2015
-# #-#-#-#-#  es.po (Odoo Server 10.0alpha1e)  #-#-#-#-#
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * gamification
-#
+# 
 # Translators:
 # Martin Trigaux <mat@odoo.com>, 2016
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
@@ -25,34 +17,27 @@
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
 # Martin Mendoza del Solar <martin@mendozadelsolar.com>, 2016
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0alpha1e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
 "PO-Revision-Date: 2016-08-18 08:38+0000\n"
-"Last-Translator: Martin Mendoza del Solar <martin@mendozadelsolar.com>, "
-"2016\n"
+"Last-Translator: Martin Mendoza del Solar <martin@mendozadelsolar.com>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"#-#-#-#-#  es.po (Odoo 9.0)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"#-#-#-#-#  es.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: gamification
 #: model:mail.template,body_html:gamification.email_template_badge_received
 msgid ""
 "\n"
-"        <p>Congratulation, you have received the badge <strong>${object."
-"badge_id.name}</strong> !\n"
+"        <p>Congratulation, you have received the badge <strong>${object.badge_id.name}</strong> !\n"
 "            % if object.sender_id\n"
-"                This badge was granted by <strong>${object.sender_id.name}</"
-"strong>.\n"
+"                This badge was granted by <strong>${object.sender_id.name}</strong>.\n"
 "            % endif\n"
 "        </p>\n"
 "\n"
@@ -62,11 +47,9 @@ msgid ""
 "        "
 msgstr ""
 "\n"
-"        <p>Enhorabuena, ha recibido la insignia <strong>${object.badge_id."
-"name}</strong> !\n"
+"        <p>Enhorabuena, ha recibido la insignia <strong>${object.badge_id.name}</strong> !\n"
 "            % if object.sender_id\n"
-"                Está insignia fue concedida por <strong>${object.sender_id."
-"name}</strong>.\n"
+"                Está insignia fue concedida por <strong>${object.sender_id.name}</strong>.\n"
 "            % endif\n"
 "        </p>\n"
 "\n"
@@ -83,16 +66,11 @@ msgid ""
 "        <strong>Reminder ${object.name}</strong>\n"
 "    </p>\n"
 "    \n"
-"    <p>You have not updated your progress for the goal ${object."
-"definition_id.name} (currently reached at ${object.completeness}%) for at "
-"least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
+"    <p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
 "            "
 msgstr ""
 "\n"
-"<header> <strong>Recordatorio ${object.name}</strong> </header> <p>No ha "
-"actualizado su progreso para el objetivo ${object.definition_id.name} "
-"(currently reached at ${object.completeness}%) durante al menos ${object."
-"remind_update_delay} días. No olvide hacerlo.</p>"
+"<header> <strong>Recordatorio ${object.name}</strong> </header> <p>No ha actualizado su progreso para el objetivo ${object.definition_id.name} (currently reached at ${object.completeness}%) durante al menos ${object.remind_update_delay} días. No olvide hacerlo.</p>"
 
 #. module: gamification
 #: model:mail.template,body_html:gamification.simple_report_template
@@ -101,8 +79,7 @@ msgid ""
 "<p>\n"
 "    <strong>${object.name}</strong>\n"
 "</p>\n"
-"<p class=\"oe_grey\">The following message contains the current progress for "
-"the challenge ${object.name}</p>\n"
+"<p class=\"oe_grey\">The following message contains the current progress for the challenge ${object.name}</p>\n"
 "\n"
 "% if object.visibility_mode == 'personal':\n"
 "    <table width=\"100%\" border=\"1\">\n"
@@ -170,53 +147,39 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"<p> <strong>${object.name}</strong> </p> <p class=\"oe_grey\">El siguiente "
-"mensaje contiene el progreso actual para el desafío ${object.name}</p> % if "
-"object.visibility_mode == 'personal': <table width=\"100%\" border=\"1\"> "
-"<tr> <th>Objetivo</th> <th>Valor objetivo</th> <th>Actual</th> "
-"<th>Completitud</th> </tr> % for line in ctx[\"challenge_lines\"]: <tr % if "
-"line['completeness'] >= 100: style=\"font-weight:bold;\" % endif > <td>"
-"${line['name']}</td> <td>${line['target']} % if line['suffix']: "
-"${line['suffix']} % endif </td> <td>${line['current']} % if line['suffix']: "
-"${line['suffix']} % endif </td> <td>${line['completeness']} %</td> </tr> % "
-"endfor </table> % else: % for line in ctx[\"challenge_lines\"]: <table width="
-"\"100%\" border=\"1\"> <tr> <th colspan=\"4\">${line['name']}</th> </tr> "
-"<tr> <th>#</th> <th>Persona</th> <th>Completitud</th> <th>Actual</th> </tr> "
-"% for goal in line['goals']: <tr % if goal.completeness >= 100: style=\"font-"
-"weight:bold;\" % endif > <td>${goal['rank']}</td> <td>${goal['name']}</td> "
-"<td>${goal['completeness']}%</td> <td>${goal['current']}/${line['target']} % "
-"if line['suffix']: ${line['suffix']} % endif </td> </tr> % endfor </table> "
-"<br/><br/> % endfor % endif\n"
-"<header> <strong>${object.name}</strong> </header> <p class=\"oe_grey\">The "
-"following message contains the current progress for the challenge ${object."
-"name}</p> % if object.visibility_mode == 'personal': <table width=\"100%\" "
-"border=\"1\"> <tr> <th>Goal</th> <th>Target</th> <th>Current</th> "
-"<th>Completeness</th> </tr> % for line in ctx[\"challenge_lines\"]: <tr % if "
-"line['completeness'] >= 100: style=\"font-weight:bold;\" % endif > <td>"
-"${line['name']}</td> <td>${line['target']} % if line['suffix']: "
-"${line['suffix']} % endif </td> <td>${line['current']} % if line['suffix']: "
-"${line['suffix']} % endif </td> <td>${line['completeness']} %</td> </tr> % "
-"endfor </table> % else: % for line in ctx[\"challenge_lines\"]: <table width="
-"\"100%\" border=\"1\"> <tr> <th colspan=\"4\">${line['name']}</th> </tr> "
-"<tr> <th>#</th> <th>Person</th> <th>Completeness</th> <th>Current</th> </tr> "
-"% for goal in line['goals']: <tr % if goal.completeness >= 100: style=\"font-"
-"weight:bold;\" % endif > <td>${goal['rank']}</td> <td>${goal['name']}</td> "
-"<td>${goal['completeness']}%</td> <td>${goal['current']}/${line['target']} % "
-"if line['suffix']: ${line['suffix']} % endif </td> </tr> % endfor </table> "
-"<br/><br/> % endfor % endif"
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:746
+"<p> <strong>${object.name}</strong> </p> <p class=\"oe_grey\">El siguiente mensaje contiene el progreso actual para el desafío ${object.name}</p> % if object.visibility_mode == 'personal': <table width=\"100%\" border=\"1\"> <tr> <th>Objetivo</th> <th>Valor objetivo</th> <th>Actual</th> <th>Completitud</th> </tr> % for line in ctx[\"challenge_lines\"]: <tr % if line['completeness'] >= 100: style=\"font-weight:bold;\" % endif > <td>${line['name']}</td> <td>${line['target']} % if line['suffix']: ${line['suffix']} % endif </td> <td>${line['current']} % if line['suffix']: ${line['suffix']} % endif </td> <td>${line['completeness']} %</td> </tr> % endfor </table> % else: % for line in ctx[\"challenge_lines\"]: <table width=\"100%\" border=\"1\"> <tr> <th colspan=\"4\">${line['name']}</th> </tr> <tr> <th>#</th> <th>Persona</th> <th>Completitud</th> <th>Actual</th> </tr> % for goal in line['goals']: <tr % if goal.completeness >= 100: style=\"font-weight:bold;\" % endif > <td>${goal['rank']}</td> <td>${goal['name']}</td> <td>${goal['completeness']}%</td> <td>${goal['current']}/${line['target']} % if line['suffix']: ${line['suffix']} % endif </td> </tr> % endfor </table> <br/><br/> % endfor % endif\n"
+"<header> <strong>${object.name}</strong> </header> <p class=\"oe_grey\">The following message contains the current progress for the challenge ${object.name}</p> % if object.visibility_mode == 'personal': <table width=\"100%\" border=\"1\"> <tr> <th>Goal</th> <th>Target</th> <th>Current</th> <th>Completeness</th> </tr> % for line in ctx[\"challenge_lines\"]: <tr % if line['completeness'] >= 100: style=\"font-weight:bold;\" % endif > <td>${line['name']}</td> <td>${line['target']} % if line['suffix']: ${line['suffix']} % endif </td> <td>${line['current']} % if line['suffix']: ${line['suffix']} % endif </td> <td>${line['completeness']} %</td> </tr> % endfor </table> % else: % for line in ctx[\"challenge_lines\"]: <table width=\"100%\" border=\"1\"> <tr> <th colspan=\"4\">${line['name']}</th> </tr> <tr> <th>#</th> <th>Person</th> <th>Completeness</th> <th>Current</th> </tr> % for goal in line['goals']: <tr % if goal.completeness >= 100: style=\"font-weight:bold;\" % endif > <td>${goal['rank']}</td> <td>${goal['name']}</td> <td>${goal['completeness']}%</td> <td>${goal['current']}/${line['target']} % if line['suffix']: ${line['suffix']} % endif </td> </tr> % endfor </table> <br/><br/> % endfor % endif"
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:591
+#, python-format
+msgid "%s has joined the challenge"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:600
+#, python-format
+msgid "%s has refused the challenge"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:657
+#, python-format
+msgid "<br/> %(rank)d. %(user_name)s - %(reward_name)s"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:654
 #, python-format
 msgid ""
-"<br/>Nobody has succeeded to reach every goal, no badge is rewarded for this "
-"challenge."
+"<br/>Nobody has succeeded to reach every goal, no badge is rewarded for this"
+" challenge."
 msgstr ""
 "<br/>Nadie ha conseguido alcanzar todas las metas, por lo que no se dará a "
 "nadie la insignia por este desafío."
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:744
+#: code:addons/gamification/models/challenge.py:652
 #, python-format
 msgid "<br/>Reward (badge %s) for every succeeding user was sent to %s."
 msgstr ""
@@ -224,70 +187,54 @@ msgstr ""
 "enviada a %s."
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:753
+#: code:addons/gamification/models/challenge.py:662
 #, python-format
 msgid ""
 "<br/>Special rewards were sent to the top competing users. The ranking for "
 "this challenge is :"
 msgstr ""
-"<br/>Las recompensas especiales se enviaron a los usuarios más competitivos. "
-"La clasificación para este desafío es:"
+"<br/>Las recompensas especiales se enviaron a los usuarios más competitivos."
+" La clasificación para este desafío es:"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
 msgid ""
 "<span class=\"o_stat_text\">Related</span>\n"
-"                                    <span class=\"o_stat_text\">Goals</span>"
+"                                <span class=\"o_stat_text\">Goals</span>"
 msgstr ""
-"<span class=\"o_stat_text\">Metas</span>\n"
-"<span class=\"o_stat_text\">Relacionadas</span>"
 
 #. module: gamification
 #: model:ir.actions.act_window,help:gamification.badge_list_action
 msgid ""
 "A badge is a symbolic token granted to a user as a sign of reward.\n"
-"                    It can be deserved automatically when some conditions "
-"are met or manually by users.\n"
-"                    Some badges are harder than others to get with specific "
-"conditions."
+"                It can be deserved automatically when some conditions are met or manually by users.\n"
+"                Some badges are harder than others to get with specific conditions."
 msgstr ""
-"Una insignia es una muestra simbólica concedida a un usuario como una señal "
-"de recompensa.\n"
-"Se puede ganar automáticamente cuando se cumplen algunas condiciones o "
-"manualmente por los usuarios.\n"
-"Algunas insignias son más difíciles de obtener que otras para llegar a "
-"condiciones específicas."
 
 #. module: gamification
 #: model:ir.actions.act_window,help:gamification.goal_definition_list_action
 msgid ""
-"A goal definition is a technical model of goal defining a condition to "
-"reach.\n"
-"                    The dates, values to reach or users are defined in goal "
-"instance."
+"A goal definition is a technical model of goal defining a condition to reach.\n"
+"                The dates, values to reach or users are defined in goal instance."
 msgstr ""
-"La definición de una meta es un modelo técnico de de una meta definiendo una "
-"condición a cumplir.\n"
-"Las fechas, valores a cumplir o usuarios son definidos en la instancia de la "
-"meta."
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_condition
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition
+#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition_3030
 msgid ""
 "A goal is considered as completed when the current value is compared to the "
 "value to reach"
 msgstr ""
-"Un objetivo se considera completado cuando el valor actual se compara con el "
-"valor a alcanzar"
+"Un objetivo se considera completado cuando el valor actual se compara con el"
+" valor a alcanzar"
 
 #. module: gamification
 #: model:ir.actions.act_window,help:gamification.goal_list_action
 msgid ""
 "A goal is defined by a user and a goal definition.\n"
-"                    Goals can be created automatically by using challenges."
+"                Goals can be created automatically by using challenges."
 msgstr ""
-"Una meta es definida por un usuario y una definición de meta.\n"
-"Las metas pueden ser creadas automáticamente usando retos."
 
 #. module: gamification
 #: selection:gamification.badge,rule_auth:0
@@ -295,11 +242,6 @@ msgid "A selected list of users"
 msgstr "Una lista de usuarios seleccionados"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Accept"
-msgstr "Aceptar"
-
-#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_action_id
 msgid "Action"
 msgstr "Acción"
@@ -338,15 +280,9 @@ msgstr "Asignar desafío a"
 #: model:ir.actions.act_window,help:gamification.challenge_list_action
 msgid ""
 "Assign a list of goals to chosen users to evaluate them.\n"
-"                    The challenge can use a period (weekly, monthly...) for "
-"automatic creation of goals.\n"
-"                    The goals are created for the specified users or member "
-"of the group."
+"                The challenge can use a period (weekly, monthly...) for automatic creation of goals.\n"
+"                The goals are created for the specified users or member of the group."
 msgstr ""
-"Asigna una lista de metas a los usuarios elegidos para evaluarlos.\n"
-"Los retos pueden usar un periodo (semanalmente, mensualmente...) para la "
-"creación automática de metas.\n"
-"Las metas son creadas para usuarios específicos o miembros de un grupo."
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_rule_auth_user_ids
@@ -433,7 +369,7 @@ msgid "Can not grant"
 msgstr "No se puede conceder"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:461
+#: code:addons/gamification/models/goal.py:410
 #, python-format
 msgid "Can not modify the configuration of a started goal"
 msgstr "No se puede modificar la configuración de un objetivo iniciado"
@@ -457,23 +393,16 @@ msgstr "Categoría"
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_challenge_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_challenge_id
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
 msgid "Challenge"
 msgstr "Desafío"
 
 #. module: gamification
-#: model:ir.actions.act_window,name:gamification.challenge_wizard
-msgid "Challenge Description"
-msgstr "Descripción del desafío"
-
-#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_line_id
 msgid "Challenge Line"
 msgstr "Línea de desafío"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_line_list_view
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
 msgid "Challenge Lines"
 msgstr "Líneas de desafío"
 
@@ -557,22 +486,13 @@ msgid "Completeness"
 msgstr "Porc. de finalización"
 
 #. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_computation_mode
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_computation_mode
 #: model:ir.ui.view,arch_db:gamification.goal_definition_search_view
 msgid "Computation Mode"
 msgstr "Modo de cálculo"
 
 #. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_computation_mode
-msgid "Computation mode"
-msgstr "Modo de cálculo"
-
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_condition
-msgid "Condition"
-msgstr "Condición"
-
-#. module: gamification
 #: model:ir.actions.act_window,name:gamification.action_new_simplified_res_users
 msgid "Create User"
 msgstr "Crear usuario"
@@ -614,13 +534,8 @@ msgstr "Creado por"
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_create_date
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_create_date
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_create_date
-#, fuzzy
 msgid "Created on"
-msgstr ""
-"#-#-#-#-#  es.po (Odoo 9.0)  #-#-#-#-#\n"
-"Creado en\n"
-"#-#-#-#-#  es.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Creado el"
+msgstr "Creado el"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_create_uid
@@ -659,6 +574,7 @@ msgid "Define the visibility of the challenge through menus"
 msgstr "Defina la visibilidad del desafío a través de los menús"
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_goal_computation_mode
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_computation_mode
 msgid ""
 "Defined how will be computed the goals. The result of the operation will be "
@@ -668,12 +584,7 @@ msgstr ""
 "guardará en el campo 'Actual'."
 
 #. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3136
-msgid "Definition Condition"
-msgstr "Definición de la condición"
-
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3145
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3039
 msgid "Definition Description"
 msgstr "Descripción de la definición"
 
@@ -686,8 +597,10 @@ msgstr ""
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
-msgid "Describe the challenge: what is does, who it targets, why it matters..."
-msgstr "Describa el desafío: qué hace, a quién va dirigido, por qué importa..."
+msgid ""
+"Describe the challenge: what is does, who it targets, why it matters..."
+msgstr ""
+"Describa el desafío: qué hace, a quién va dirigido, por qué importa..."
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.view_badge_wizard_grant
@@ -702,7 +615,6 @@ msgstr "Descripción"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_visibility_mode
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display
 msgid "Display Mode"
 msgstr "Modo de visualización"
 
@@ -715,15 +627,11 @@ msgstr "Modo de visualización"
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display_name
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_display_name
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_display_name
-#, fuzzy
 msgid "Display Name"
-msgstr ""
-"#-#-#-#-#  es.po (Odoo 9.0)  #-#-#-#-#\n"
-"Nombre mostrado\n"
-"#-#-#-#-#  es.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Nombre a mostrar"
+msgstr "Nombre a mostrar"
 
 #. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display_mode
 msgid "Displayed as"
 msgstr "Mostrado como"
@@ -748,16 +656,12 @@ msgstr ""
 #. module: gamification
 #: selection:gamification.challenge,state:0
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
-#, fuzzy
 msgid "Done"
-msgstr ""
-"#-#-#-#-#  es.po (Odoo 9.0)  #-#-#-#-#\n"
-"Realizado\n"
-"#-#-#-#-#  es.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Hecho"
+msgstr "Hecho"
 
 #. module: gamification
-#: selection:gamification.challenge,state:0 selection:gamification.goal,state:0
+#: selection:gamification.challenge,state:0
+#: selection:gamification.goal,state:0
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
 msgid "Draft"
 msgstr "Borrador"
@@ -766,13 +670,8 @@ msgstr "Borrador"
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_end_date
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_end_date
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
-#, fuzzy
 msgid "End Date"
-msgstr ""
-"#-#-#-#-#  es.po (Odoo 9.0)  #-#-#-#-#\n"
-"Fecha final\n"
-"#-#-#-#-#  es.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Fecha finalización"
+msgstr "Fecha finalización"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_batch_mode
@@ -783,14 +682,8 @@ msgstr ""
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_batch_user_expression
-msgid "Evaluted expression for batch mode"
-msgstr "Expresión evaluada para el modo de proceso por lotes"
-
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Even if the challenge is failed, best challengers will be rewarded"
+msgid "Evaluated expression for batch mode"
 msgstr ""
-"Incluso si el desafío se falla, los mejores contendientes serán premiados"
 
 #. module: gamification
 #: selection:gamification.badge,rule_auth:0
@@ -896,7 +789,7 @@ msgstr "Objetivo"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_id
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3147
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3041
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_name
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
 msgid "Goal Definition"
@@ -925,7 +818,9 @@ msgid "Goal List"
 msgstr "Lista de objetivos"
 
 #. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_condition
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3030
 msgid "Goal Performance"
 msgstr "Redimiento de objetivos"
 
@@ -946,7 +841,6 @@ msgstr "Definiciones de objetivos"
 #: model:ir.ui.menu,name:gamification.gamification_goal_menu
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
 #: model:ir.ui.view,arch_db:gamification.view_challenge_kanban
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
 msgid "Goals"
 msgstr "Objetivos"
 
@@ -1015,6 +909,11 @@ msgid "How to compute the goal?"
 msgstr "¿Cömo calcular el objetivo?"
 
 #. module: gamification
+#: selection:gamification.challenge,category:0
+msgid "Human Resources / Engagement"
+msgstr ""
+
+#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_wizard_id
@@ -1023,13 +922,8 @@ msgstr "¿Cömo calcular el objetivo?"
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_id
-#, fuzzy
 msgid "ID"
-msgstr ""
-"#-#-#-#-#  es.po (Odoo 9.0)  #-#-#-#-#\n"
-"ID (identificación)\n"
-"#-#-#-#-#  es.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"ID"
+msgstr "ID"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_res_id_field
@@ -1038,8 +932,8 @@ msgstr "Campo ID del usuario"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_remaining_sending
-msgid "If a maxium is set"
-msgstr "Si se establece un máximo"
+msgid "If a maximum is set"
+msgstr ""
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_user_challenge_id
@@ -1097,24 +991,12 @@ msgid "Individual Goals"
 msgstr "Objetivos individuales"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:338
-#, python-format
-msgid "Invalid return content from the evaluation of code for definition %s"
-msgstr ""
-"Contenido devuelto de la evaluación del código para la definición %s no "
-"valido."
-
-#. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_admin3
 #: model:gamification.goal.definition,name:gamification.definition_base_invite
 msgid "Invite new Users"
 msgstr "Invitar nuevos usuarios"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Invited"
-msgstr "Invitado"
-
-#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge___last_update
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user___last_update
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_wizard___last_update
@@ -1145,13 +1027,8 @@ msgstr "Última actualización"
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_write_uid
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_write_uid
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_write_uid
-#, fuzzy
 msgid "Last Updated by"
-msgstr ""
-"#-#-#-#-#  es.po (Odoo 9.0)  #-#-#-#-#\n"
-"Última actualización de\n"
-"#-#-#-#-#  es.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Última actualización por"
+msgstr "Última actualización por"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_wizard_write_date
@@ -1162,13 +1039,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_write_date
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_write_date
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_write_date
-#, fuzzy
 msgid "Last Updated on"
-msgstr ""
-"#-#-#-#-#  es.po (Odoo 9.0)  #-#-#-#-#\n"
-"Última actualización en\n"
-"#-#-#-#-#  es.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Última actualización el"
+msgstr "Última actualización el"
 
 #. module: gamification
 #: selection:gamification.challenge,visibility_mode:0
@@ -1293,7 +1165,7 @@ msgid "No one, assigned through challenges"
 msgstr "Nadie asignado a lo largo de los desafíos"
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:756
+#: code:addons/gamification/models/challenge.py:669
 #, python-format
 msgid "Nobody reached the required conditions to receive special badges."
 msgstr ""
@@ -1346,11 +1218,6 @@ msgid "Owners"
 msgstr "Propietarios"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Participating"
-msgstr "Participando"
-
-#. module: gamification
 #: selection:gamification.badge,rule_auth:0
 msgid "People having some badges"
 msgstr "Gente que tiene algunas insignias"
@@ -1425,16 +1292,16 @@ msgid "Refresh Challenge"
 msgstr "Actualizar desafío"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Reject"
-msgstr "Rechazado"
-
-#. module: gamification
 #: model:ir.actions.act_window,name:gamification.goals_from_challenge_act
 msgid "Related Goals"
 msgstr "Objetivo relacionado"
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_badge_user_wizard_user_id
+msgid "Related user name for the resource to manage its access."
+msgstr "Usuario relacionado con el recurso para gestionar su acceso."
+
+#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_remaining_sending
 msgid "Remaining Sending Allowed"
 msgstr "Aportación permitida restante"
@@ -1475,7 +1342,7 @@ msgid "Responsible"
 msgstr "Responsable"
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:551
+#: code:addons/gamification/models/challenge.py:489
 #, python-format
 msgid "Retrieving progress for personal challenge without user information"
 msgstr ""
@@ -1483,7 +1350,6 @@ msgstr ""
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
 msgid "Reward"
 msgstr "Recompensa"
 
@@ -1582,21 +1448,29 @@ msgid "Set the current value you have reached for this goal"
 msgstr "Establecer el valor actual que ha alcanzado para este objetivo"
 
 #. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_admin1
 #: model:gamification.goal.definition,name:gamification.definition_base_company_data
 msgid "Set your Company Data"
 msgstr "Establezca sus datos de compañía"
 
 #. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_admin2
 #: model:gamification.goal.definition,name:gamification.definition_base_company_logo
 msgid "Set your Company Logo"
 msgstr "Establezca el logotipo de su compañía"
 
 #. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_discover1
 #: model:gamification.goal.definition,name:gamification.definition_base_timezone
 msgid "Set your Timezone"
 msgstr "Establezca su zona horaria"
 
 #. module: gamification
+#: selection:gamification.challenge,category:0
+msgid "Settings / Gamification Tools"
+msgstr ""
+
+#. module: gamification
 #: model:gamification.challenge,name:gamification.challenge_base_configure
 msgid "Setup your Company"
 msgstr "Configure su compañía"
@@ -1609,13 +1483,8 @@ msgstr "Comenzar desafío"
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_start_date
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_start_date
-#, fuzzy
 msgid "Start Date"
-msgstr ""
-"#-#-#-#-#  es.po (Odoo 9.0)  #-#-#-#-#\n"
-"Fecha inicial\n"
-"#-#-#-#-#  es.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Fecha de inicio"
+msgstr "Fecha de inicio"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_form_view
@@ -1627,13 +1496,8 @@ msgstr "Iniciar objetivo"
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_state
 #: model:ir.ui.view,arch_db:gamification.challenge_search_view
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
-#, fuzzy
 msgid "State"
-msgstr ""
-"#-#-#-#-#  es.po (Odoo 9.0)  #-#-#-#-#\n"
-"Provincia\n"
-"#-#-#-#-#  es.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Estado"
+msgstr "Estado"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.badge_form_view
@@ -1642,18 +1506,13 @@ msgstr "Estadísticas"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
-#, fuzzy
 msgid "Subscriptions"
-msgstr ""
-"#-#-#-#-#  es.po (Odoo 9.0)  #-#-#-#-#\n"
-"Documentos periódicos\n"
-"#-#-#-#-#  es.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Suscripciones"
+msgstr "Suscripciones"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_full_suffix
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3141
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3035
 msgid "Suffix"
 msgstr "Sufijo"
 
@@ -1678,13 +1537,15 @@ msgid "The action that will be called to update the goal value."
 msgstr "La acción que será llamada para actualizar el valor objetivo."
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:740
+#: code:addons/gamification/models/challenge.py:648
 #, python-format
 msgid "The challenge %s is finished."
 msgstr "El desafío %s está finalizado."
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_full_suffix
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_full_suffix
+#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix_3035
 msgid "The currency and suffix field"
 msgstr "El campo de moneda y sufijo"
 
@@ -1712,7 +1573,7 @@ msgstr ""
 "establece periodicidad, se usará esta fecha como fecha de inicio."
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:129
+#: code:addons/gamification/models/goal.py:90
 #, python-format
 msgid ""
 "The domain for the definition %s seems incorrect, please check it.\n"
@@ -1734,8 +1595,8 @@ msgid ""
 "The field name on the user profile (res.users) containing the value for "
 "res_id for action."
 msgstr ""
-"El nombre del campo en el perfil de usuario (res.users) conteniendo el valor "
-"para la acción para res_id."
+"El nombre del campo en el perfil de usuario (res.users) conteniendo el valor"
+" para la acción para res_id."
 
 #. module: gamification
 #: selection:gamification.goal.definition,condition:0
@@ -1759,36 +1620,33 @@ msgstr "Mejor cuanto más bajo"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_rule_max_number
-msgid "The maximum number of time this badge can be sent per month per person."
+msgid ""
+"The maximum number of time this badge can be sent per month per person."
 msgstr ""
 "El máximo número de veces que esta insignia puede ser concedida por mes por "
 "persona."
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:146
+#: code:addons/gamification/models/goal.py:107
 #, python-format
 msgid ""
-"The model configuration for the definition %s seems incorrect, please check "
-"it.\n"
+"The model configuration for the definition %s seems incorrect, please check it.\n"
 "\n"
 "%s not found"
 msgstr ""
-"La configuración del modelo para la definición %s parece incorrecta, por "
-"favor compruebe que.\n"
+"La configuración del modelo para la definición %s parece incorrecta, por favor compruebe que.\n"
 "\n"
 "%s no se encuentra"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:143
+#: code:addons/gamification/models/goal.py:104
 #, python-format
 msgid ""
-"The model configuration for the definition %s seems incorrect, please check "
-"it.\n"
+"The model configuration for the definition %s seems incorrect, please check it.\n"
 "\n"
 "%s not stored"
 msgstr ""
-"La configuración del modelo para la definición %s parece incorrecta, "
-"compruebe que.\n"
+"La configuración del modelo para la definición %s parece incorrecta, compruebe que.\n"
 "\n"
 "%s no esta guardada"
 
@@ -1808,7 +1666,8 @@ msgstr ""
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_stat_my_this_month
-msgid "The number of time the current user has received this badge this month."
+msgid ""
+"The number of time the current user has received this badge this month."
 msgstr ""
 "El número de veces que el usuario actual ha recibido la insignia este mes."
 
@@ -1841,11 +1700,13 @@ msgid "The number of time this badge has been received."
 msgstr "El número de veces que esta insignia ha sido recibida."
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_monetary
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_monetary
 msgid "The target and current value are defined in the company currency."
 msgstr "El valor actual y el objetivo se definen en la moneda de la compañía."
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_suffix
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix
 msgid "The unit of the target and current values"
 msgstr "La unidad de los valores actuales y objetivos"
@@ -1866,15 +1727,15 @@ msgid ""
 "The users that have succeeded theses goals will receive automatically the "
 "badge."
 msgstr ""
-"Los usuarios que han conseguido estos objetivos obtendrán automáticamente la "
-"insignia."
+"Los usuarios que han conseguido estos objetivos obtendrán automáticamente la"
+" insignia."
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_batch_user_expression
 msgid ""
 "The value to compare with the distinctive field. The expression can contain "
-"reference to 'user' which is a browse record of the current user, e.g. user."
-"id, user.partner_id.id..."
+"reference to 'user' which is a browse record of the current user, e.g. "
+"user.id, user.partner_id.id..."
 msgstr ""
 "El valor a comprar con el campo distintivo. La expresión puede contener "
 "referencias a 'user', que es el registro del usuario actual. Por ejemplo: "
@@ -1884,16 +1745,8 @@ msgstr ""
 #: model:ir.actions.act_window,help:gamification.goals_from_challenge_act
 msgid ""
 "There is no goals associated to this challenge matching your search.\n"
-"                Make sure that your challenge is active and assigned to at "
-"least one user."
+"            Make sure that your challenge is active and assigned to at least one user."
 msgstr ""
-"No hay una metas asociadas a este reto que coincidan con tu búsqueda.\n"
-"Asegúrese de que su desafío es activo y asignado a al menos un usuario"
-
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "There is no reward upon completion of this challenge."
-msgstr "No hay recompensa por completar este desafío."
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_closed
@@ -1901,7 +1754,7 @@ msgid "These goals will not be recomputed."
 msgstr "Estos objetivos no serán recalculados."
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:223
+#: code:addons/gamification/models/badge.py:213
 #, python-format
 msgid "This badge can not be sent by users."
 msgstr "Esta insignia no puede ser enviada por los usuarios."
@@ -1914,13 +1767,8 @@ msgstr ""
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_kanban_view
-#, fuzzy
 msgid "To"
-msgstr ""
-"#-#-#-#-#  es.po (Odoo 9.0)  #-#-#-#-#\n"
-"A\n"
-"#-#-#-#-#  es.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Para"
+msgstr "Para"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_target_goal
@@ -1953,7 +1801,7 @@ msgid "Update"
 msgstr "Actualizar"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:495
+#: code:addons/gamification/models/goal.py:445
 #, python-format
 msgid "Update %s"
 msgstr "Actualizar %s"
@@ -1972,12 +1820,16 @@ msgid "User domain"
 msgstr "Dominio de usuario"
 
 #. module: gamification
-#: model:ir.model,name:gamification.model_res_users
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_user_ids
 msgid "Users"
 msgstr "Usuarios"
 
 #. module: gamification
+#: selection:gamification.challenge,category:0
+msgid "Website / Forum"
+msgstr ""
+
+#. module: gamification
 #: selection:gamification.challenge,period:0
 #: selection:gamification.challenge,report_message_frequency:0
 msgid "Weekly"
@@ -1999,8 +1851,8 @@ msgid ""
 "With this option enabled, a user can receive a badge only once. The top 3 "
 "badges are still rewarded only at the end of the challenge."
 msgstr ""
-"Con esta opción habilitada, cada usuario puede recibir una insignia sólo una "
-"vez. Las tres mejores insignias se siguen recompensando de todas formas al "
+"Con esta opción habilitada, cada usuario puede recibir una insignia sólo una"
+" vez. Las tres mejores insignias se siguen recompensando de todas formas al "
 "final del desafío."
 
 #. module: gamification
@@ -2015,19 +1867,19 @@ msgid "Yearly"
 msgstr "Anualmente"
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:225
+#: code:addons/gamification/models/badge.py:215
 #, python-format
 msgid "You are not in the user allowed list."
 msgstr "No está en la lista de autorizados."
 
 #. module: gamification
-#: code:addons/gamification/wizard/grant_badge.py:26
+#: code:addons/gamification/wizard/grant_badge.py:24
 #, python-format
 msgid "You can not grant a badge to yourself"
 msgstr "No puede auto-concederse una insignia"
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:235
+#: code:addons/gamification/models/challenge.py:195
 #, python-format
 msgid "You can not reset a challenge with unfinished goals."
 msgstr "No puedes reiniciar un reto con metas sin terminar."
@@ -2043,13 +1895,13 @@ msgid "You did great at your job."
 msgstr "Hiciste un excelente trabajo."
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:227
+#: code:addons/gamification/models/badge.py:217
 #, python-format
 msgid "You do not have the required badges."
 msgstr "No tiene las insignias requeridas."
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:229
+#: code:addons/gamification/models/badge.py:219
 #, python-format
 msgid "You have already sent this badge too many time this month."
 msgstr "Ha enviado demasiadas veces esta insignia demasiadas veces este mes."
@@ -2083,13 +1935,9 @@ msgstr "Por ejemplo, días"
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_definition_form_view
 msgid ""
-"e.g. result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', "
-"'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)], "
-"count=True, context=context)"
+"e.g. result = env['mail.followers'].search_count([('res_model', '=', "
+"'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)])"
 msgstr ""
-"Por ejemplo: result = pool.get('mail.followers').search(cr, uid, "
-"[('res_model', '=', 'mail.channel'), ('partner_id', '=', object.user_id."
-"partner_id.id)], count=True, context=context)"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_definition_form_view
@@ -2117,11 +1965,6 @@ msgid "refresh"
 msgstr "actualizar"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "reply later"
-msgstr "responder más tarde."
-
-#. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_form_view
 msgid "than the target."
 msgstr "que el objetivo."
@@ -2135,227 +1978,3 @@ msgstr "el"
 #: model:ir.ui.view,arch_db:gamification.badge_kanban_view
 msgid "this month"
 msgstr "este mes"
-
-#~ msgid ""
-#~ "\n"
-#~ "    <header>\n"
-#~ "        <strong>Reminder ${object.name}</strong>\n"
-#~ "    </header>\n"
-#~ "    \n"
-#~ "    <p>You have not updated your progress for the goal ${object."
-#~ "definition_id.name} (currently reached at ${object.completeness}%) for at "
-#~ "least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
-#~ "            "
-#~ msgstr ""
-#~ "\n"
-#~ "    <header>\n"
-#~ "        <strong>Recordatorio ${object.name}</strong>\n"
-#~ "    </header>\n"
-#~ "    \n"
-#~ "    <p>No ha actualizado su progreso para el objetivo ${object."
-#~ "definition_id.name} (currently reached at ${object.completeness}%) "
-#~ "durante al menos ${object.remind_update_delay} días. No olvide hacerlo.</"
-#~ "p>\n"
-#~ "            "
-
-#~ msgid ""
-#~ "\n"
-#~ "<header>\n"
-#~ "    <strong>${object.name}</strong>\n"
-#~ "</header>\n"
-#~ "<p class=\"oe_grey\">The following message contains the current progress "
-#~ "for the challenge ${object.name}</p>\n"
-#~ "\n"
-#~ "% if object.visibility_mode == 'personal':\n"
-#~ "    <table width=\"100%\" border=\"1\">\n"
-#~ "    <tr>\n"
-#~ "        <th>Goal</th>\n"
-#~ "        <th>Target</th>\n"
-#~ "        <th>Current</th>\n"
-#~ "        <th>Completeness</th>\n"
-#~ "    </tr>\n"
-#~ "    % for line in ctx[\"challenge_lines\"]:\n"
-#~ "        <tr\n"
-#~ "            % if line['completeness'] >= 100:\n"
-#~ "                style=\"font-weight:bold;\"\n"
-#~ "            % endif\n"
-#~ "            >\n"
-#~ "            <td>${line['name']}</td>\n"
-#~ "            <td>${line['target']}\n"
-#~ "            % if line['suffix']:\n"
-#~ "                ${line['suffix']}\n"
-#~ "            % endif\n"
-#~ "            </td>\n"
-#~ "            <td>${line['current']}\n"
-#~ "            % if line['suffix']:\n"
-#~ "                ${line['suffix']}\n"
-#~ "            % endif\n"
-#~ "            </td>\n"
-#~ "            <td>${line['completeness']} %</td>\n"
-#~ "        </tr>\n"
-#~ "    % endfor\n"
-#~ "    </table>\n"
-#~ "% else:\n"
-#~ "    % for line in ctx[\"challenge_lines\"]:\n"
-#~ "        <table width=\"100%\" border=\"1\">\n"
-#~ "            <tr>\n"
-#~ "                <th colspan=\"4\">${line['name']}</th>\n"
-#~ "            </tr>\n"
-#~ "            <tr>\n"
-#~ "                <th>#</th>\n"
-#~ "                <th>Person</th>\n"
-#~ "                <th>Completeness</th>\n"
-#~ "                <th>Current</th>\n"
-#~ "            </tr>\n"
-#~ "            % for goal in line['goals']:\n"
-#~ "                <tr\n"
-#~ "                    % if goal.completeness >= 100:\n"
-#~ "                        style=\"font-weight:bold;\"\n"
-#~ "                    % endif\n"
-#~ "                    >\n"
-#~ "                    <td>${goal['rank']}</td>\n"
-#~ "                    <td>${goal['name']}</td>\n"
-#~ "                    <td>${goal['completeness']}%</td>\n"
-#~ "                    <td>${goal['current']}/${line['target']}\n"
-#~ "                    % if line['suffix']:\n"
-#~ "                        ${line['suffix']}\n"
-#~ "                    % endif\n"
-#~ "                    </td>\n"
-#~ "                </tr>\n"
-#~ "            % endfor\n"
-#~ "        </table>\n"
-#~ "\n"
-#~ "        <br/><br/>\n"
-#~ "\n"
-#~ "    % endfor\n"
-#~ "% endif\n"
-#~ "            "
-#~ msgstr ""
-#~ "\n"
-#~ "<header>\n"
-#~ "    <strong>${object.name}</strong>\n"
-#~ "</header>\n"
-#~ "<p class=\"oe_grey\">El siguiente mensaje contiene el progreso actual "
-#~ "para el desafío ${object.name}</p>\n"
-#~ "\n"
-#~ "% if object.visibility_mode == 'personal':\n"
-#~ "    <table width=\"100%\" border=\"1\">\n"
-#~ "    <tr>\n"
-#~ "        <th>Objetivo</th>\n"
-#~ "        <th>Valor objetivo</th>\n"
-#~ "        <th>Actual</th>\n"
-#~ "        <th>Completitud</th>\n"
-#~ "    </tr>\n"
-#~ "    % for line in ctx[\"challenge_lines\"]:\n"
-#~ "        <tr\n"
-#~ "            % if line['completeness'] >= 100:\n"
-#~ "                style=\"font-weight:bold;\"\n"
-#~ "            % endif\n"
-#~ "            >\n"
-#~ "            <td>${line['name']}</td>\n"
-#~ "            <td>${line['target']}\n"
-#~ "            % if line['suffix']:\n"
-#~ "                ${line['suffix']}\n"
-#~ "            % endif\n"
-#~ "            </td>\n"
-#~ "            <td>${line['current']}\n"
-#~ "            % if line['suffix']:\n"
-#~ "                ${line['suffix']}\n"
-#~ "            % endif\n"
-#~ "            </td>\n"
-#~ "            <td>${line['completeness']} %</td>\n"
-#~ "        </tr>\n"
-#~ "    % endfor\n"
-#~ "    </table>\n"
-#~ "% else:\n"
-#~ "    % for line in ctx[\"challenge_lines\"]:\n"
-#~ "        <table width=\"100%\" border=\"1\">\n"
-#~ "            <tr>\n"
-#~ "                <th colspan=\"4\">${line['name']}</th>\n"
-#~ "            </tr>\n"
-#~ "            <tr>\n"
-#~ "                <th>#</th>\n"
-#~ "                <th>Persona</th>\n"
-#~ "                <th>Completitud</th>\n"
-#~ "                <th>Actual</th>\n"
-#~ "            </tr>\n"
-#~ "            % for goal in line['goals']:\n"
-#~ "                <tr\n"
-#~ "                    % if goal.completeness >= 100:\n"
-#~ "                        style=\"font-weight:bold;\"\n"
-#~ "                    % endif\n"
-#~ "                    >\n"
-#~ "                    <td>${goal['rank']}</td>\n"
-#~ "                    <td>${goal['name']}</td>\n"
-#~ "                    <td>${goal['completeness']}%</td>\n"
-#~ "                    <td>${goal['current']}/${line['target']}\n"
-#~ "                    % if line['suffix']:\n"
-#~ "                        ${line['suffix']}\n"
-#~ "                    % endif\n"
-#~ "                    </td>\n"
-#~ "                </tr>\n"
-#~ "            % endfor\n"
-#~ "        </table>\n"
-#~ "\n"
-#~ "        <br/><br/>\n"
-#~ "\n"
-#~ "    % endfor\n"
-#~ "% endif\n"
-#~ "            "
-
-#~ msgid "Action Needed"
-#~ msgstr "Necesaria acción"
-
-#~ msgid "Date of the last message posted on the record."
-#~ msgstr "Fecha del último mensaje publicado en el registro."
-
-#~ msgid "Followers"
-#~ msgstr "Seguidores"
-
-#~ msgid "Followers (Channels)"
-#~ msgstr "Seguidores (Canales)"
-
-#~ msgid "Followers (Partners)"
-#~ msgstr "Seguidores (Empresas)"
-
-#~ msgid "For Every Succeding User"
-#~ msgstr "Para todos los usuarios exitosos"
-
-#~ msgid "If checked new messages require your attention."
-#~ msgstr "Si está marcado, hay nuevos mensajes que requieren su atención"
-
-#~ msgid "If checked, new messages require your attention."
-#~ msgstr "Si está marcado, hay nuevos mensajes que requieren su atención."
-
-#~ msgid "Inherited models"
-#~ msgstr "Modelos heredados"
-
-#~ msgid "Is Follower"
-#~ msgstr "Es un seguidor"
-
-#~ msgid "Last Message Date"
-#~ msgstr "Fecha del último mensaje"
-
-#~ msgid "Messages"
-#~ msgstr "Mensajes"
-
-#~ msgid "Messages and communication history"
-#~ msgstr "Mensajes e historial de comunicación"
-
-#~ msgid "Number of Actions"
-#~ msgstr "Número de acciones"
-
-#~ msgid "Number of messages which requires an action"
-#~ msgstr "Número de mensajes que requieren una acción"
-
-#~ msgid "Number of unread messages"
-#~ msgstr "Número de mensajes no leidos"
-
-#~ msgid "Unread Messages"
-#~ msgstr "Mensajes sin leer"
-
-#~ msgid "Unread Messages Counter"
-#~ msgstr "Contador de mensajes no leidos"
-
-#~ msgid "Related user name for the resource to manage its access."
-#~ msgstr "Usuario relacionado con el recurso para gestionar su acceso."
diff --git a/addons/gamification/i18n/fr.po b/addons/gamification/i18n/fr.po
index b23b3ca794b..e1b5c8e4263 100644
--- a/addons/gamification/i18n/fr.po
+++ b/addons/gamification/i18n/fr.po
@@ -1,17 +1,7 @@
-# #-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * gamification
-#
-# Translators:
-# Lucas Deliege <lud@odoo.com>, 2015
-# Maxime Chambreuil <maxime.chambreuil@gmail.com>, 2015
-# Olivier Lenoir <olivier.lenoir@free.fr>, 2015
-# #-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * gamification
-#
+# 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
@@ -30,34 +20,27 @@
 # Jérôme Tanché <jerome.tanche@ouest-dsi.fr>, 2016
 # Saad Thaifa <saad.thaifa@gmail.com>, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0alpha1e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
 "PO-Revision-Date: 2016-08-18 08:38+0000\n"
 "Last-Translator: Melanie Bernard <mbe@odoo.com>, 2016\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: gamification
 #: model:mail.template,body_html:gamification.email_template_badge_received
-#, fuzzy
 msgid ""
 "\n"
-"        <p>Congratulation, you have received the badge <strong>${object."
-"badge_id.name}</strong> !\n"
+"        <p>Congratulation, you have received the badge <strong>${object.badge_id.name}</strong> !\n"
 "            % if object.sender_id\n"
-"                This badge was granted by <strong>${object.sender_id.name}</"
-"strong>.\n"
+"                This badge was granted by <strong>${object.sender_id.name}</strong>.\n"
 "            % endif\n"
 "        </p>\n"
 "\n"
@@ -66,21 +49,8 @@ msgid ""
 "        % endif\n"
 "        "
 msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"\n"
-"<p>Félicitations, vous avez reçu le badge <strong>${object.badge_id.name}</"
-"strong> !\n"
-"% if object.sender_id\n"
-"Ce badge est délivré par<strong>${object.sender_id.name}</strong>.\n"
-"% endif\n"
-"</p>\n"
-"% if object.comment\n"
-"<p><em>${object.comment}</em></p>\n"
-"% endif\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
 "\n"
-"<p>Félicitations, vous avez reçu le badge <strong>${object.badge_id.name}</"
-"strong> !\n"
+"<p>Félicitations, vous avez reçu le badge <strong>${object.badge_id.name}</strong> !\n"
 "% if object.sender_id\n"
 "Ce badge est délivré par <strong>${object.sender_id.name}</strong>.\n"
 "% endif\n"
@@ -97,9 +67,7 @@ msgid ""
 "        <strong>Reminder ${object.name}</strong>\n"
 "    </p>\n"
 "    \n"
-"    <p>You have not updated your progress for the goal ${object."
-"definition_id.name} (currently reached at ${object.completeness}%) for at "
-"least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
+"    <p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
 "            "
 msgstr ""
 
@@ -110,8 +78,7 @@ msgid ""
 "<p>\n"
 "    <strong>${object.name}</strong>\n"
 "</p>\n"
-"<p class=\"oe_grey\">The following message contains the current progress for "
-"the challenge ${object.name}</p>\n"
+"<p class=\"oe_grey\">The following message contains the current progress for the challenge ${object.name}</p>\n"
 "\n"
 "% if object.visibility_mode == 'personal':\n"
 "    <table width=\"100%\" border=\"1\">\n"
@@ -180,38 +147,48 @@ msgid ""
 msgstr ""
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:746
+#: code:addons/gamification/models/challenge.py:591
+#, python-format
+msgid "%s has joined the challenge"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:600
+#, python-format
+msgid "%s has refused the challenge"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:657
+#, python-format
+msgid "<br/> %(rank)d. %(user_name)s - %(reward_name)s"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:654
 #, python-format
 msgid ""
-"<br/>Nobody has succeeded to reach every goal, no badge is rewarded for this "
-"challenge."
+"<br/>Nobody has succeeded to reach every goal, no badge is rewarded for this"
+" challenge."
 msgstr ""
 "<br/>Personne n'a pu atteindre chacun des objectifs, aucun badge ne "
 "récompensera ce défi."
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:744
-#, fuzzy, python-format
+#: code:addons/gamification/models/challenge.py:652
+#, python-format
 msgid "<br/>Reward (badge %s) for every succeeding user was sent to %s."
 msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"<br/>Récompense (badge %s) pour chaque utilisateur atteignant les objectifs "
-"a été envoyée à %s.\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
 "<br/>La récompense (badge %s) pour chaque utilisateur atteignant les "
 "objectifs a été envoyée à %s."
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:753
-#, fuzzy, python-format
+#: code:addons/gamification/models/challenge.py:662
+#, python-format
 msgid ""
 "<br/>Special rewards were sent to the top competing users. The ranking for "
 "this challenge is :"
 msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"<br/>Des récompenses spéciales ont été envoyées pour les meilleurs "
-"utilisateurs. Le classement pour ce concours est:\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
 "<br/>Des récompenses spéciales ont été envoyées pour les meilleurs "
 "utilisateurs. Le classement pour ce défi est :"
 
@@ -219,42 +196,28 @@ msgstr ""
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
 msgid ""
 "<span class=\"o_stat_text\">Related</span>\n"
-"                                    <span class=\"o_stat_text\">Goals</span>"
+"                                <span class=\"o_stat_text\">Goals</span>"
 msgstr ""
-"<span class=\"o_stat_text\">Objectifs</span>\n"
-"<span class=\"o_stat_text\">Relatifs</span>"
 
 #. module: gamification
 #: model:ir.actions.act_window,help:gamification.badge_list_action
 msgid ""
 "A badge is a symbolic token granted to a user as a sign of reward.\n"
-"                    It can be deserved automatically when some conditions "
-"are met or manually by users.\n"
-"                    Some badges are harder than others to get with specific "
-"conditions."
+"                It can be deserved automatically when some conditions are met or manually by users.\n"
+"                Some badges are harder than others to get with specific conditions."
 msgstr ""
-"Un badge est un jeton symbolique délivré à un utilisateur en guise de "
-"récompense.\n"
-"Il peut être attribué soit automatiquement lorsque certaines conditions sont "
-"remplies soit manuellement par les utilisateurs.\n"
-"Des conditions spécifiques peuvent rendent certains badges plus difficiles à "
-"obtenir que d'autres."
 
 #. module: gamification
 #: model:ir.actions.act_window,help:gamification.goal_definition_list_action
 msgid ""
-"A goal definition is a technical model of goal defining a condition to "
-"reach.\n"
-"                    The dates, values to reach or users are defined in goal "
-"instance."
+"A goal definition is a technical model of goal defining a condition to reach.\n"
+"                The dates, values to reach or users are defined in goal instance."
 msgstr ""
-"La définition d'un objectif est un modèle technique décrivant une condition "
-"à remplir.\n"
-"Les dates, les valeurs à atteindre ou les utilisateurs sont définis dans une "
-"instance de l'objectif."
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_condition
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition
+#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition_3030
 msgid ""
 "A goal is considered as completed when the current value is compared to the "
 "value to reach"
@@ -266,25 +229,13 @@ msgstr ""
 #: model:ir.actions.act_window,help:gamification.goal_list_action
 msgid ""
 "A goal is defined by a user and a goal definition.\n"
-"                    Goals can be created automatically by using challenges."
+"                Goals can be created automatically by using challenges."
 msgstr ""
-"Un objectif est défini par un utilisateur et une définition d'objectif.\n"
-"Les objectifs peuvent être créés automatiquement en utilisant des défis."
 
 #. module: gamification
 #: selection:gamification.badge,rule_auth:0
-#, fuzzy
 msgid "A selected list of users"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Une liste sélectionnée d'utilisateurs\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Une sélection d'utilisateurs"
-
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Accept"
-msgstr "Accepter"
+msgstr "Une sélection d'utilisateurs"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_action_id
@@ -318,28 +269,16 @@ msgstr "Apparaît sur"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
-#, fuzzy
 msgid "Assign Challenge To"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Attribuer un Défi\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Attribuer un Défi à"
+msgstr "Attribuer un Défi à"
 
 #. module: gamification
 #: model:ir.actions.act_window,help:gamification.challenge_list_action
 msgid ""
 "Assign a list of goals to chosen users to evaluate them.\n"
-"                    The challenge can use a period (weekly, monthly...) for "
-"automatic creation of goals.\n"
-"                    The goals are created for the specified users or member "
-"of the group."
+"                The challenge can use a period (weekly, monthly...) for automatic creation of goals.\n"
+"                The goals are created for the specified users or member of the group."
 msgstr ""
-"Attribuer une liste d'objectifs aux utilisateurs choisis pour les évaluer.\n"
-"Le défi peut utiliser une période (hebdomadaire, mensuelle ...) pour la "
-"création automatique d'objectifs.\n"
-"Les objectifs sont créés pour les utilisateurs ou pour les membres du groupe "
-"spécifiés."
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_rule_auth_user_ids
@@ -348,13 +287,8 @@ msgstr "Utilisateurs habilités"
 
 #. module: gamification
 #: selection:gamification.goal.definition,computation_mode:0
-#, fuzzy
 msgid "Automatic: execute a specific Python code"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Automatique : exécuter du code Python spécifique\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Automatique : exécute du code Python spécifique"
+msgstr "Automatique : exécute du code Python spécifique"
 
 #. module: gamification
 #: selection:gamification.goal.definition,computation_mode:0
@@ -387,24 +321,14 @@ msgstr "Badge délivré"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.badge_list_view
-#, fuzzy
 msgid "Badge List"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Liste de Badge\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Liste de Badges"
+msgstr "Liste de Badges"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_badge_name
 #: model:ir.ui.view,arch_db:gamification.badge_form_view
-#, fuzzy
 msgid "Badge Name"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Nom de Badge\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Nom du Badge"
+msgstr "Nom du Badge"
 
 #. module: gamification
 #: model:ir.actions.act_window,name:gamification.badge_list_action
@@ -414,23 +338,16 @@ msgstr "Badges"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
-#, fuzzy
 msgid ""
 "Badges are granted when a challenge is finished. This is either at the end "
 "of a running period (eg: end of the month for a monthly challenge), at the "
 "end date of a challenge (if no periodicity is set) or when the challenge is "
 "manually closed."
 msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Les badges sont délivrés en fin de défi. Cette fin est déterminée soit par "
-"une période (ex: fin de mois pour un défi mensuel) soit par la date de fin "
-"(si une périodicité n'est pas définie) soit par la fermeture manuelle du "
-"défi.\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
 "Les badges sont délivrés en fin de défi. Un défi se termine soit à la fin "
 "d'une période (ex: fin de mois pour un défi mensuel), soit par une date de "
-"fin (si une périodicité n'est pas définie) soit par la fermeture manuelle du "
-"défi."
+"fin (si une périodicité n'est pas définie) soit par la fermeture manuelle du"
+" défi."
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_batch_mode
@@ -439,13 +356,8 @@ msgstr "Mode Groupé"
 
 #. module: gamification
 #: model:gamification.badge,name:gamification.badge_idea
-#, fuzzy
 msgid "Brilliant"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Brilliant\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Brillant"
+msgstr "Brillant"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.badge_kanban_view
@@ -453,7 +365,7 @@ msgid "Can not grant"
 msgstr "Impossible de délivrer"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:461
+#: code:addons/gamification/models/goal.py:410
 #, python-format
 msgid "Can not modify the configuration of a started goal"
 msgstr "Impossible de modifier la configuration d'un objectif en cours"
@@ -477,23 +389,16 @@ msgstr "Catégorie"
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_challenge_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_challenge_id
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
 msgid "Challenge"
 msgstr "Défi"
 
 #. module: gamification
-#: model:ir.actions.act_window,name:gamification.challenge_wizard
-msgid "Challenge Description"
-msgstr "Description du Défi"
-
-#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_line_id
 msgid "Challenge Line"
 msgstr "Ligne de Défi"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_line_list_view
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
 msgid "Challenge Lines"
 msgstr "Lignes de Défi"
 
@@ -576,22 +481,13 @@ msgid "Completeness"
 msgstr "Complétude"
 
 #. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_computation_mode
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_computation_mode
 #: model:ir.ui.view,arch_db:gamification.goal_definition_search_view
 msgid "Computation Mode"
 msgstr "Mode Calcul"
 
 #. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_computation_mode
-msgid "Computation mode"
-msgstr "Mode calcul"
-
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_condition
-msgid "Condition"
-msgstr "Condition"
-
-#. module: gamification
 #: model:ir.actions.act_window,name:gamification.action_new_simplified_res_users
 msgid "Create User"
 msgstr "Créer un utilisateur"
@@ -674,6 +570,7 @@ msgid "Define the visibility of the challenge through menus"
 msgstr "Définir la visibilité du défi via les menus"
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_goal_computation_mode
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_computation_mode
 msgid ""
 "Defined how will be computed the goals. The result of the operation will be "
@@ -683,12 +580,7 @@ msgstr ""
 "dans le champ 'Courant'."
 
 #. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3136
-msgid "Definition Condition"
-msgstr "Définition de Condition"
-
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3145
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3039
 msgid "Definition Description"
 msgstr "Description"
 
@@ -696,16 +588,14 @@ msgstr "Description"
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
 msgid "Depending on the Display mode, reports will be individual or shared."
 msgstr ""
-"Selon le mode d'affichage, les comptes-rendus seront individuels ou partagés."
+"Selon le mode d'affichage, les comptes-rendus seront individuels ou "
+"partagés."
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
-#, fuzzy
-msgid "Describe the challenge: what is does, who it targets, why it matters..."
+msgid ""
+"Describe the challenge: what is does, who it targets, why it matters..."
 msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Décrire le défi : Ce qu'il fait, qui il concerne, quel est son intérêt...\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
 "Décrire le défi : ce qu'il fait, qui il concerne, quel est son intérêt..."
 
 #. module: gamification
@@ -723,14 +613,8 @@ msgstr "Description"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_visibility_mode
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display
-#, fuzzy
 msgid "Display Mode"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Mode Affichage\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Mode d'affichage"
+msgstr "Mode d'affichage"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_display_name
@@ -741,15 +625,11 @@ msgstr ""
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display_name
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_display_name
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_display_name
-#, fuzzy
 msgid "Display Name"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Nom affiché\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Afficher le nom"
+msgstr "Afficher le nom"
 
 #. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display_mode
 msgid "Displayed as"
 msgstr "Affiché comme"
@@ -774,16 +654,12 @@ msgstr ""
 #. module: gamification
 #: selection:gamification.challenge,state:0
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
-#, fuzzy
 msgid "Done"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Terminé\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Fait"
+msgstr "Fait"
 
 #. module: gamification
-#: selection:gamification.challenge,state:0 selection:gamification.goal,state:0
+#: selection:gamification.challenge,state:0
+#: selection:gamification.goal,state:0
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
 msgid "Draft"
 msgstr "Brouillon"
@@ -802,13 +678,8 @@ msgstr "Évaluer l'expression en mode lot au lieu plutôt que par utilisateur"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_batch_user_expression
-msgid "Evaluted expression for batch mode"
-msgstr "Expression évaluée pour le mode lot"
-
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Even if the challenge is failed, best challengers will be rewarded"
-msgstr "Même si le défi a échoué, les meilleurs concurrents seront récompensés"
+msgid "Evaluated expression for batch mode"
+msgstr ""
 
 #. module: gamification
 #: selection:gamification.badge,rule_auth:0
@@ -872,73 +743,38 @@ msgstr "Suffixe Complet"
 
 #. module: gamification
 #: model:ir.ui.menu,name:gamification.gamification_menu
-#, fuzzy
 msgid "Gamification Tools"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Outils de l'Émulation\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Outils de ludification"
+msgstr "Outils de ludification"
 
 #. module: gamification
 #: model:ir.model,name:gamification.model_gamification_badge
-#, fuzzy
 msgid "Gamification badge"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Badge d'émulation\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Badge de ludification"
+msgstr "Badge de ludification"
 
 #. module: gamification
 #: model:ir.model,name:gamification.model_gamification_challenge
-#, fuzzy
 msgid "Gamification challenge"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Défi d'émulation\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Défi de ludification"
+msgstr "Défi de ludification"
 
 #. module: gamification
 #: model:ir.model,name:gamification.model_gamification_challenge_line
-#, fuzzy
 msgid "Gamification generic goal for challenge"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Objectif générique d'émulation pour les défis\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Objectif générique de ludification pour les défis"
+msgstr "Objectif générique de ludification pour les défis"
 
 #. module: gamification
 #: model:ir.model,name:gamification.model_gamification_goal_definition
-#, fuzzy
 msgid "Gamification goal definition"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Définition d'objectif d'émulation\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Définition d'objectif de ludification"
+msgstr "Définition d'objectif de ludification"
 
 #. module: gamification
 #: model:ir.model,name:gamification.model_gamification_goal
-#, fuzzy
 msgid "Gamification goal instance"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Occurrence d'objectif d'émulation\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Occurrence d'objectif de ludification"
+msgstr "Occurrence d'objectif de ludification"
 
 #. module: gamification
 #: model:ir.model,name:gamification.model_gamification_badge_user
-#, fuzzy
 msgid "Gamification user badge"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Badge d'émulation pour utilisateur\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Badge de ludification pour utilisateur"
+msgstr "Badge de ludification pour utilisateur"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_goal_id
@@ -949,7 +785,7 @@ msgstr "Objectif"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_id
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3147
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3041
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_name
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
 msgid "Goal Definition"
@@ -978,7 +814,9 @@ msgid "Goal List"
 msgstr "Liste d'Objectif"
 
 #. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_condition
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3030
 msgid "Goal Performance"
 msgstr "Résultats sur Objectif"
 
@@ -999,7 +837,6 @@ msgstr "Définitions d'objectif"
 #: model:ir.ui.menu,name:gamification.gamification_goal_menu
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
 #: model:ir.ui.view,arch_db:gamification.view_challenge_kanban
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
 msgid "Goals"
 msgstr "Objectifs"
 
@@ -1068,6 +905,11 @@ msgid "How to compute the goal?"
 msgstr "Comment calculer l'objectif ?"
 
 #. module: gamification
+#: selection:gamification.challenge,category:0
+msgid "Human Resources / Engagement"
+msgstr ""
+
+#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_wizard_id
@@ -1086,8 +928,8 @@ msgstr "Champ ID de l'utilisateur"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_remaining_sending
-msgid "If a maxium is set"
-msgstr "Si un maximum est défini"
+msgid "If a maximum is set"
+msgstr ""
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_user_challenge_id
@@ -1119,8 +961,8 @@ msgid ""
 "In batch mode, this indicates which field distinct one user form the other, "
 "e.g. user_id, partner_id..."
 msgstr ""
-"En mode lot, ceci indique quel champ distingue un utilisateur des autres, "
-"ex :  user_id, partner_id ..."
+"En mode lot, ceci indique quel champ distingue un utilisateur des autres, ex"
+" :  user_id, partner_id ..."
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_last_update
@@ -1129,8 +971,8 @@ msgid ""
 "for a while (defined in challenge). Ignored in case of non-manual goal or "
 "goal not linked to a challenge."
 msgstr ""
-"En cas d'objectif manuel, des rappels sont envoyés si l'objectif n'a pas été "
-"mis à jour pendant un certain temps (défini dans défi). Ignoré en cas "
+"En cas d'objectif manuel, des rappels sont envoyés si l'objectif n'a pas été"
+" mis à jour pendant un certain temps (défini dans défi). Ignoré en cas "
 "d'objectif non-manuel ou non lié à un défi."
 
 #. module: gamification
@@ -1144,22 +986,12 @@ msgid "Individual Goals"
 msgstr "Objectifs individuels"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:338
-#, python-format
-msgid "Invalid return content from the evaluation of code for definition %s"
-msgstr "Retour d'évaluation invalide pour le code de la définition %s"
-
-#. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_admin3
 #: model:gamification.goal.definition,name:gamification.definition_base_invite
 msgid "Invite new Users"
 msgstr "Inviter de nouveaux Utilisateurs"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Invited"
-msgstr "Invité"
-
-#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge___last_update
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user___last_update
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_wizard___last_update
@@ -1168,13 +1000,8 @@ msgstr "Invité"
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal___last_update
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition___last_update
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard___last_update
-#, fuzzy
 msgid "Last Modified on"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Dernière modification le\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Dernière Modification le"
+msgstr "Dernière Modification le"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_last_report_date
@@ -1195,13 +1022,8 @@ msgstr "Dernière mise à jour"
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_write_uid
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_write_uid
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_write_uid
-#, fuzzy
 msgid "Last Updated by"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Mis à jour par\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Dernière mise à jour par"
+msgstr "Dernière mise à jour par"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_wizard_write_date
@@ -1212,13 +1034,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_write_date
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_write_date
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_write_date
-#, fuzzy
 msgid "Last Updated on"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Mis à jour le\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Dernière mise à jour le"
+msgstr "Dernière mise à jour le"
 
 #. module: gamification
 #: selection:gamification.challenge,visibility_mode:0
@@ -1343,7 +1160,7 @@ msgid "No one, assigned through challenges"
 msgstr "Personne n'est concerné par les défis"
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:756
+#: code:addons/gamification/models/challenge.py:669
 #, python-format
 msgid "Nobody reached the required conditions to receive special badges."
 msgstr ""
@@ -1396,11 +1213,6 @@ msgid "Owners"
 msgstr "Détenteurs"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Participating"
-msgstr "Participer"
-
-#. module: gamification
 #: selection:gamification.badge,rule_auth:0
 msgid "People having some badges"
 msgstr "Personnes possédant des badges"
@@ -1416,8 +1228,8 @@ msgid ""
 "Period of automatic goal assigment. If none is selected, should be launched "
 "manually."
 msgstr ""
-"Période d'assignation automatique d'objectif. Si aucun n'est sélectionné, il "
-"faudra procéder à un lancement manuel."
+"Période d'assignation automatique d'objectif. Si aucun n'est sélectionné, il"
+" faudra procéder à un lancement manuel."
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_period
@@ -1471,18 +1283,8 @@ msgstr "Référence"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
-#, fuzzy
 msgid "Refresh Challenge"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Rafraîchir de Défi\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Rafraîchir le défi"
-
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Reject"
-msgstr "Refuser"
+msgstr "Rafraîchir le défi"
 
 #. module: gamification
 #: model:ir.actions.act_window,name:gamification.goals_from_challenge_act
@@ -1490,14 +1292,14 @@ msgid "Related Goals"
 msgstr "Objectifs relatifs"
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_badge_user_wizard_user_id
+msgid "Related user name for the resource to manage its access."
+msgstr "Utilisateur associé à la ressource pour gérer les droits d'accès."
+
+#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_remaining_sending
-#, fuzzy
 msgid "Remaining Sending Allowed"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Envoi de restant autorisé\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Envoi du restant autorisé"
+msgstr "Envoi du restant autorisé"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_remind_update_delay
@@ -1535,7 +1337,7 @@ msgid "Responsible"
 msgstr "Responsable"
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:551
+#: code:addons/gamification/models/challenge.py:489
 #, python-format
 msgid "Retrieving progress for personal challenge without user information"
 msgstr ""
@@ -1543,7 +1345,6 @@ msgstr ""
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
 msgid "Reward"
 msgstr "Récompense"
 
@@ -1644,21 +1445,29 @@ msgstr ""
 "objectif "
 
 #. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_admin1
 #: model:gamification.goal.definition,name:gamification.definition_base_company_data
 msgid "Set your Company Data"
 msgstr "Définissez les données de votre société"
 
 #. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_admin2
 #: model:gamification.goal.definition,name:gamification.definition_base_company_logo
 msgid "Set your Company Logo"
 msgstr "Définissez le logo de votre société"
 
 #. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_discover1
 #: model:gamification.goal.definition,name:gamification.definition_base_timezone
 msgid "Set your Timezone"
 msgstr "Définissez votre fuseau horaire"
 
 #. module: gamification
+#: selection:gamification.challenge,category:0
+msgid "Settings / Gamification Tools"
+msgstr ""
+
+#. module: gamification
 #: model:gamification.challenge,name:gamification.challenge_base_configure
 msgid "Setup your Company"
 msgstr "Configurer votre Société"
@@ -1700,7 +1509,7 @@ msgstr "Abonnements"
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_full_suffix
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3141
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3035
 msgid "Suffix"
 msgstr "Suffixe"
 
@@ -1726,13 +1535,15 @@ msgstr ""
 "L'action qui sera appelée pour à mettre à jour la valeur de l'objectif."
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:740
+#: code:addons/gamification/models/challenge.py:648
 #, python-format
 msgid "The challenge %s is finished."
 msgstr "Le défi %s est terminé."
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_full_suffix
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_full_suffix
+#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix_3035
 msgid "The currency and suffix field"
 msgstr "Le champ de la devise et du suffixe"
 
@@ -1760,7 +1571,7 @@ msgstr ""
 "de périodicité, le date de début de l'objectif sera utilisée."
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:129
+#: code:addons/gamification/models/goal.py:90
 #, python-format
 msgid ""
 "The domain for the definition %s seems incorrect, please check it.\n"
@@ -1807,35 +1618,32 @@ msgstr "Le plus faible est le meilleur"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_rule_max_number
-msgid "The maximum number of time this badge can be sent per month per person."
+msgid ""
+"The maximum number of time this badge can be sent per month per person."
 msgstr ""
 "Le nombre de fois maximum d'envois de ce badge par mois et par personne."
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:146
+#: code:addons/gamification/models/goal.py:107
 #, python-format
 msgid ""
-"The model configuration for the definition %s seems incorrect, please check "
-"it.\n"
+"The model configuration for the definition %s seems incorrect, please check it.\n"
 "\n"
 "%s not found"
 msgstr ""
-"La configuration modèle pour la définition %s semble incorrecte, vérifiez-"
-"la.\n"
+"La configuration modèle pour la définition %s semble incorrecte, vérifiez-la.\n"
 "\n"
 "%s introuvable"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:143
+#: code:addons/gamification/models/goal.py:104
 #, python-format
 msgid ""
-"The model configuration for the definition %s seems incorrect, please check "
-"it.\n"
+"The model configuration for the definition %s seems incorrect, please check it.\n"
 "\n"
 "%s not stored"
 msgstr ""
-"La configuration modèle pour la définition %s semble incorrecte, vérifiez-"
-"la.\n"
+"La configuration modèle pour la définition %s semble incorrecte, vérifiez-la.\n"
 "\n"
 "%s non enregistrée"
 
@@ -1856,7 +1664,8 @@ msgstr ""
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_stat_my_this_month
-msgid "The number of time the current user has received this badge this month."
+msgid ""
+"The number of time the current user has received this badge this month."
 msgstr ""
 "Le nombre de fois que l'utilisateur courant a reçu ce badge ce mois-ci."
 
@@ -1887,12 +1696,14 @@ msgid "The number of time this badge has been received."
 msgstr "Le nombre de fois que ce badge a été reçu."
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_monetary
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_monetary
 msgid "The target and current value are defined in the company currency."
 msgstr ""
 "La cible et la valeur courant sont définies dans la devise de la société."
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_suffix
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix
 msgid "The unit of the target and current values"
 msgstr "L'unité de la cible et des valeurs courantes"
@@ -1920,8 +1731,8 @@ msgstr ""
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_batch_user_expression
 msgid ""
 "The value to compare with the distinctive field. The expression can contain "
-"reference to 'user' which is a browse record of the current user, e.g. user."
-"id, user.partner_id.id..."
+"reference to 'user' which is a browse record of the current user, e.g. "
+"user.id, user.partner_id.id..."
 msgstr ""
 "La valeur à comparer avec le champ distinctif. L'expression peut faire "
 "référence à ' l'utilisateur ' qui est un enregistrement de l'utilisateur "
@@ -1931,16 +1742,8 @@ msgstr ""
 #: model:ir.actions.act_window,help:gamification.goals_from_challenge_act
 msgid ""
 "There is no goals associated to this challenge matching your search.\n"
-"                Make sure that your challenge is active and assigned to at "
-"least one user."
+"            Make sure that your challenge is active and assigned to at least one user."
 msgstr ""
-"Il n'y a pas d'objectifs associés au défi correspondant à votre recherche.\n"
-"Vérifiez que votre défi est actif et assigné à au moins un utilisateur."
-
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "There is no reward upon completion of this challenge."
-msgstr "Il n'y a pas de récompense à la fin de ce défi."
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_closed
@@ -1948,7 +1751,7 @@ msgid "These goals will not be recomputed."
 msgstr "Ces objectifs ne seront pas recalculés."
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:223
+#: code:addons/gamification/models/badge.py:213
 #, python-format
 msgid "This badge can not be sent by users."
 msgstr "Ce badge ne peut pas être envoyé par les utilisateurs."
@@ -1960,13 +1763,8 @@ msgstr "Ce champ contient l'image du badge, limitée à 256x256"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_kanban_view
-#, fuzzy
 msgid "To"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Vers\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"A"
+msgstr "A"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_target_goal
@@ -1995,16 +1793,11 @@ msgstr "Unité"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.view_goal_wizard_update_current
-#, fuzzy
 msgid "Update"
-msgstr ""
-"#-#-#-#-#  fr.po (Odoo 9.0)  #-#-#-#-#\n"
-"Mettre à jour\n"
-"#-#-#-#-#  fr.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Mise à jour"
+msgstr "Mise à jour"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:495
+#: code:addons/gamification/models/goal.py:445
 #, python-format
 msgid "Update %s"
 msgstr "Mettre à jour %s"
@@ -2023,12 +1816,16 @@ msgid "User domain"
 msgstr "Domaine de l'utilisateur"
 
 #. module: gamification
-#: model:ir.model,name:gamification.model_res_users
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_user_ids
 msgid "Users"
 msgstr "Utilisateurs"
 
 #. module: gamification
+#: selection:gamification.challenge,category:0
+msgid "Website / Forum"
+msgstr ""
+
+#. module: gamification
 #: selection:gamification.challenge,period:0
 #: selection:gamification.challenge,report_message_frequency:0
 msgid "Weekly"
@@ -2067,19 +1864,19 @@ msgid "Yearly"
 msgstr "Annuel"
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:225
+#: code:addons/gamification/models/badge.py:215
 #, python-format
 msgid "You are not in the user allowed list."
 msgstr "Vous ne faites pas partie des utilisateurs habilités."
 
 #. module: gamification
-#: code:addons/gamification/wizard/grant_badge.py:26
+#: code:addons/gamification/wizard/grant_badge.py:24
 #, python-format
 msgid "You can not grant a badge to yourself"
 msgstr "Vous ne pouvez pas vous délivrer vous-même un badge"
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:235
+#: code:addons/gamification/models/challenge.py:195
 #, python-format
 msgid "You can not reset a challenge with unfinished goals."
 msgstr "On ne peut pas réinitialiser un défi ayant des objectifs inachevés."
@@ -2095,13 +1892,13 @@ msgid "You did great at your job."
 msgstr "Vous avez fait du bon travail."
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:227
+#: code:addons/gamification/models/badge.py:217
 #, python-format
 msgid "You do not have the required badges."
 msgstr "Vous ne possédez pas les badges requis."
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:229
+#: code:addons/gamification/models/badge.py:219
 #, python-format
 msgid "You have already sent this badge too many time this month."
 msgstr "Vous avez envoyé ce badge trop souvent ce mois-ci."
@@ -2135,13 +1932,9 @@ msgstr "ex : jours"
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_definition_form_view
 msgid ""
-"e.g. result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', "
-"'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)], "
-"count=True, context=context)"
+"e.g. result = env['mail.followers'].search_count([('res_model', '=', "
+"'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)])"
 msgstr ""
-"Ex : result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', "
-"'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)], "
-"count=True, context=context)"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_definition_form_view
@@ -2169,11 +1962,6 @@ msgid "refresh"
 msgstr "rafraîchir"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "reply later"
-msgstr "répondre plus tard"
-
-#. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_form_view
 msgid "than the target."
 msgstr "que la cible"
@@ -2187,222 +1975,3 @@ msgstr "le"
 #: model:ir.ui.view,arch_db:gamification.badge_kanban_view
 msgid "this month"
 msgstr "ce mois-ci"
-
-#~ msgid ""
-#~ "\n"
-#~ "    <header>\n"
-#~ "        <strong>Reminder ${object.name}</strong>\n"
-#~ "    </header>\n"
-#~ "    \n"
-#~ "    <p>You have not updated your progress for the goal ${object."
-#~ "definition_id.name} (currently reached at ${object.completeness}%) for at "
-#~ "least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
-#~ "            "
-#~ msgstr ""
-#~ "\n"
-#~ "<header>\n"
-#~ "<strong>Rappel ${object.name}</strong>\n"
-#~ "</header>\n"
-#~ "\n"
-#~ "<p>Vous navez pas mis à jour votre progression vers l'objectif ${object."
-#~ "definition_id.name} (actuellement à ${object.completeness}%) depuis au "
-#~ "moins ${object.remind_update_delay} jours. N'oubliez pas de le faire.</p>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<header>\n"
-#~ "    <strong>${object.name}</strong>\n"
-#~ "</header>\n"
-#~ "<p class=\"oe_grey\">The following message contains the current progress "
-#~ "for the challenge ${object.name}</p>\n"
-#~ "\n"
-#~ "% if object.visibility_mode == 'personal':\n"
-#~ "    <table width=\"100%\" border=\"1\">\n"
-#~ "    <tr>\n"
-#~ "        <th>Goal</th>\n"
-#~ "        <th>Target</th>\n"
-#~ "        <th>Current</th>\n"
-#~ "        <th>Completeness</th>\n"
-#~ "    </tr>\n"
-#~ "    % for line in ctx[\"challenge_lines\"]:\n"
-#~ "        <tr\n"
-#~ "            % if line['completeness'] >= 100:\n"
-#~ "                style=\"font-weight:bold;\"\n"
-#~ "            % endif\n"
-#~ "            >\n"
-#~ "            <td>${line['name']}</td>\n"
-#~ "            <td>${line['target']}\n"
-#~ "            % if line['suffix']:\n"
-#~ "                ${line['suffix']}\n"
-#~ "            % endif\n"
-#~ "            </td>\n"
-#~ "            <td>${line['current']}\n"
-#~ "            % if line['suffix']:\n"
-#~ "                ${line['suffix']}\n"
-#~ "            % endif\n"
-#~ "            </td>\n"
-#~ "            <td>${line['completeness']} %</td>\n"
-#~ "        </tr>\n"
-#~ "    % endfor\n"
-#~ "    </table>\n"
-#~ "% else:\n"
-#~ "    % for line in ctx[\"challenge_lines\"]:\n"
-#~ "        <table width=\"100%\" border=\"1\">\n"
-#~ "            <tr>\n"
-#~ "                <th colspan=\"4\">${line['name']}</th>\n"
-#~ "            </tr>\n"
-#~ "            <tr>\n"
-#~ "                <th>#</th>\n"
-#~ "                <th>Person</th>\n"
-#~ "                <th>Completeness</th>\n"
-#~ "                <th>Current</th>\n"
-#~ "            </tr>\n"
-#~ "            % for goal in line['goals']:\n"
-#~ "                <tr\n"
-#~ "                    % if goal.completeness >= 100:\n"
-#~ "                        style=\"font-weight:bold;\"\n"
-#~ "                    % endif\n"
-#~ "                    >\n"
-#~ "                    <td>${goal['rank']}</td>\n"
-#~ "                    <td>${goal['name']}</td>\n"
-#~ "                    <td>${goal['completeness']}%</td>\n"
-#~ "                    <td>${goal['current']}/${line['target']}\n"
-#~ "                    % if line['suffix']:\n"
-#~ "                        ${line['suffix']}\n"
-#~ "                    % endif\n"
-#~ "                    </td>\n"
-#~ "                </tr>\n"
-#~ "            % endfor\n"
-#~ "        </table>\n"
-#~ "\n"
-#~ "        <br/><br/>\n"
-#~ "\n"
-#~ "    % endfor\n"
-#~ "% endif\n"
-#~ "            "
-#~ msgstr ""
-#~ "\n"
-#~ "<header>\n"
-#~ "<strong>${object.name}</strong>\n"
-#~ "</header>\n"
-#~ "<p class=\"oe_grey\">Ce message indique l'état d'avancement pour le défi "
-#~ "${object.name}</p>\n"
-#~ "\n"
-#~ "% if object.visibility_mode == 'personal':\n"
-#~ "<table width=\"100%\" border=\"1\">\n"
-#~ "<tr>\n"
-#~ "<th>Objectif</th>\n"
-#~ "<th>Cible</th>\n"
-#~ "<th>Courant</th>\n"
-#~ "<th>Complétude</th>\n"
-#~ "</tr>\n"
-#~ "% for line in ctx[\"challenge_lines\"]:\n"
-#~ "<tr\n"
-#~ "% if line['completeness'] >= 100:\n"
-#~ "style=\"font-weight:bold;\"\n"
-#~ "% endif\n"
-#~ ">\n"
-#~ "<td>${line['name']}</td>\n"
-#~ "<td>${line['target']}\n"
-#~ "% if line['suffix']:\n"
-#~ "${line['suffix']}\n"
-#~ "% endif\n"
-#~ "</td>\n"
-#~ "<td>${line['current']}\n"
-#~ "% if line['suffix']:\n"
-#~ "${line['suffix']}\n"
-#~ "% endif\n"
-#~ "</td>\n"
-#~ "<td>${line['completeness']} %</td>\n"
-#~ "</tr>\n"
-#~ "% endfor\n"
-#~ "</table>\n"
-#~ "% else:\n"
-#~ "% for line in ctx[\"challenge_lines\"]:\n"
-#~ "<table width=\"100%\" border=\"1\">\n"
-#~ "<tr>\n"
-#~ "<th colspan=\"4\">${line['name']}</th>\n"
-#~ "</tr>\n"
-#~ "<tr>\n"
-#~ "<th>#</th>\n"
-#~ "<th>Personne</th>\n"
-#~ "<th>Complétude</th>\n"
-#~ "<th>Courant</th>\n"
-#~ "</tr>\n"
-#~ "% for goal in line['goals']:\n"
-#~ "<tr\n"
-#~ "% if goal.completeness >= 100:\n"
-#~ "style=\"font-weight:bold;\"\n"
-#~ "% endif\n"
-#~ ">\n"
-#~ "<td>${goal['rank']}</td>\n"
-#~ "<td>${goal['name']}</td>\n"
-#~ "<td>${goal['completeness']}%</td>\n"
-#~ "<td>${goal['current']}/${line['target']}\n"
-#~ "% if line['suffix']:\n"
-#~ "${line['suffix']}\n"
-#~ "% endif\n"
-#~ "</td>\n"
-#~ "</tr>\n"
-#~ "% endfor\n"
-#~ "</table>\n"
-#~ "<br/><br/>\n"
-#~ "% endfor\n"
-#~ "% endif"
-
-#~ msgid "Action Needed"
-#~ msgstr "A besoin d'une action"
-
-#~ msgid "Date of the last message posted on the record."
-#~ msgstr "Date du dernier message posté sur cet enregistrement"
-
-#~ msgid "Followers"
-#~ msgstr "Abonnés"
-
-#~ msgid "Followers (Channels)"
-#~ msgstr "Abonnés (Canaux)"
-
-#~ msgid "Followers (Partners)"
-#~ msgstr "Abonnés (Partenaires)"
-
-#~ msgid "For Every Succeding User"
-#~ msgstr "Pour tous les utilisateurs suivants"
-
-#~ msgid "If checked new messages require your attention."
-#~ msgstr "Si coché, de nouveaux messages demandent votre attention."
-
-#~ msgid "If checked, new messages require your attention."
-#~ msgstr "Si coché, les nouveaux messages exigeront votre attention."
-
-#~ msgid "Inherited models"
-#~ msgstr "Modèles hérités"
-
-#~ msgid "Is Follower"
-#~ msgstr "Est un abonné"
-
-#~ msgid "Last Message Date"
-#~ msgstr "Date du dernier message"
-
-#~ msgid "Messages"
-#~ msgstr "Messages"
-
-#~ msgid "Messages and communication history"
-#~ msgstr "Historique des messages et communications"
-
-#~ msgid "Number of Actions"
-#~ msgstr "Nombre d'actions"
-
-#~ msgid "Number of messages which requires an action"
-#~ msgstr "Nombre de messages exigeant une action"
-
-#~ msgid "Number of unread messages"
-#~ msgstr "Nombre de messages non lus"
-
-#~ msgid "Unread Messages"
-#~ msgstr "Messages non lus"
-
-#~ msgid "Unread Messages Counter"
-#~ msgstr "Compteur de messages non lus"
-
-#~ msgid "Related user name for the resource to manage its access."
-#~ msgstr "Utilisateur associé à la ressource pour gérer les droits d'accès."
diff --git a/addons/gamification/i18n/hu.po b/addons/gamification/i18n/hu.po
index 4fb665ad755..3c1b6f63bff 100644
--- a/addons/gamification/i18n/hu.po
+++ b/addons/gamification/i18n/hu.po
@@ -1,48 +1,33 @@
-# #-#-#-#-#  hu.po (Odoo 9.0)  #-#-#-#-#
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * gamification
-#
-# Translators:
-# krnkris, 2015-2016
-# krnkris, 2016
-# #-#-#-#-#  hu.po (Odoo Server 10.0alpha1e)  #-#-#-#-#
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * gamification
-#
+# 
 # Translators:
 # krnkris <krnkris@freemail.hu>, 2016
 # Martin Trigaux <mat@odoo.com>, 2016
 # Oregional <geza.nagy@oregional.hu>, 2016
 # Kovács Tibor <kovika@gmail.com>, 2016
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0alpha1e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
 "PO-Revision-Date: 2016-08-18 08:38+0000\n"
 "Last-Translator: Kovács Tibor <kovika@gmail.com>, 2016\n"
 "Language-Team: Hungarian (https://www.transifex.com/odoo/teams/41243/hu/)\n"
-"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"#-#-#-#-#  hu.po (Odoo 9.0)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"#-#-#-#-#  hu.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
+"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: gamification
 #: model:mail.template,body_html:gamification.email_template_badge_received
 msgid ""
 "\n"
-"        <p>Congratulation, you have received the badge <strong>${object."
-"badge_id.name}</strong> !\n"
+"        <p>Congratulation, you have received the badge <strong>${object.badge_id.name}</strong> !\n"
 "            % if object.sender_id\n"
-"                This badge was granted by <strong>${object.sender_id.name}</"
-"strong>.\n"
+"                This badge was granted by <strong>${object.sender_id.name}</strong>.\n"
 "            % endif\n"
 "        </p>\n"
 "\n"
@@ -52,11 +37,9 @@ msgid ""
 "        "
 msgstr ""
 "\n"
-"        <p>Gratulálunk, egy jelvényt kapott <strong>${object.badge_id.name}</"
-"strong> !\n"
+"        <p>Gratulálunk, egy jelvényt kapott <strong>${object.badge_id.name}</strong> !\n"
 "            % if object.sender_id\n"
-"                Ezt a jelvényt adományozta <strong>${object.sender_id.name}</"
-"strong>.\n"
+"                Ezt a jelvényt adományozta <strong>${object.sender_id.name}</strong>.\n"
 "            % endif\n"
 "        </p>\n"
 "\n"
@@ -73,9 +56,7 @@ msgid ""
 "        <strong>Reminder ${object.name}</strong>\n"
 "    </p>\n"
 "    \n"
-"    <p>You have not updated your progress for the goal ${object."
-"definition_id.name} (currently reached at ${object.completeness}%) for at "
-"least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
+"    <p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
 "            "
 msgstr ""
 
@@ -86,8 +67,7 @@ msgid ""
 "<p>\n"
 "    <strong>${object.name}</strong>\n"
 "</p>\n"
-"<p class=\"oe_grey\">The following message contains the current progress for "
-"the challenge ${object.name}</p>\n"
+"<p class=\"oe_grey\">The following message contains the current progress for the challenge ${object.name}</p>\n"
 "\n"
 "% if object.visibility_mode == 'personal':\n"
 "    <table width=\"100%\" border=\"1\">\n"
@@ -156,24 +136,42 @@ msgid ""
 msgstr ""
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:746
+#: code:addons/gamification/models/challenge.py:591
+#, python-format
+msgid "%s has joined the challenge"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:600
+#, python-format
+msgid "%s has refused the challenge"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:657
+#, python-format
+msgid "<br/> %(rank)d. %(user_name)s - %(reward_name)s"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:654
 #, python-format
 msgid ""
-"<br/>Nobody has succeeded to reach every goal, no badge is rewarded for this "
-"challenge."
+"<br/>Nobody has succeeded to reach every goal, no badge is rewarded for this"
+" challenge."
 msgstr ""
-"<br/>Senkinek nem sikerült az összes cél, nem történt jelvény kiosztás ehhez "
-"a kihíváshoz."
+"<br/>Senkinek nem sikerült az összes cél, nem történt jelvény kiosztás ehhez"
+" a kihíváshoz."
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:744
+#: code:addons/gamification/models/challenge.py:652
 #, python-format
 msgid "<br/>Reward (badge %s) for every succeeding user was sent to %s."
 msgstr ""
 "<br/>Jutalom (jelvény %s) az összes sikeres felhasználóhoz kiküldve %s."
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:753
+#: code:addons/gamification/models/challenge.py:662
 #, python-format
 msgid ""
 "<br/>Special rewards were sent to the top competing users. The ranking for "
@@ -186,42 +184,28 @@ msgstr ""
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
 msgid ""
 "<span class=\"o_stat_text\">Related</span>\n"
-"                                    <span class=\"o_stat_text\">Goals</span>"
+"                                <span class=\"o_stat_text\">Goals</span>"
 msgstr ""
-"<span class=\"o_stat_text\">Kapcsolódó</span>\n"
-"                                    <span class=\"o_stat_text\">Célok</span>"
 
 #. module: gamification
 #: model:ir.actions.act_window,help:gamification.badge_list_action
 msgid ""
 "A badge is a symbolic token granted to a user as a sign of reward.\n"
-"                    It can be deserved automatically when some conditions "
-"are met or manually by users.\n"
-"                    Some badges are harder than others to get with specific "
-"conditions."
+"                It can be deserved automatically when some conditions are met or manually by users.\n"
+"                Some badges are harder than others to get with specific conditions."
 msgstr ""
-"A jelvény egy szimbolikus emléktárgy a felhasználónak létrehozva,  "
-"jutalmazás kifejezésére.\n"
-"                    Automatikusan is hozzá lehet jutni, ha egy pár "
-"kritériumnak megfelel, vagy kézzel is adható.\n"
-"                    Egyes jelvények megszerzése nehezebb a különleges  "
-"feltételek miatt."
 
 #. module: gamification
 #: model:ir.actions.act_window,help:gamification.goal_definition_list_action
 msgid ""
-"A goal definition is a technical model of goal defining a condition to "
-"reach.\n"
-"                    The dates, values to reach or users are defined in goal "
-"instance."
+"A goal definition is a technical model of goal defining a condition to reach.\n"
+"                The dates, values to reach or users are defined in goal instance."
 msgstr ""
-"Egy cél meghatározás az egy technikai modell meghatározása az elérni kívánt "
-"célnak.\n"
-"                    Felhasználók vagy a cél eléréséhez az adatok, értékek "
-"meghatározása egy cél érdekében."
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_condition
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition
+#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition_3030
 msgid ""
 "A goal is considered as completed when the current value is compared to the "
 "value to reach"
@@ -232,11 +216,8 @@ msgstr ""
 #: model:ir.actions.act_window,help:gamification.goal_list_action
 msgid ""
 "A goal is defined by a user and a goal definition.\n"
-"                    Goals can be created automatically by using challenges."
+"                Goals can be created automatically by using challenges."
 msgstr ""
-"A célt egy felhasználó és a cél leírása határozz meg.\n"
-"                    Célokat automatikusan is létrehozhatja a kihívások "
-"használatával."
 
 #. module: gamification
 #: selection:gamification.badge,rule_auth:0
@@ -244,11 +225,6 @@ msgid "A selected list of users"
 msgstr "Egy kiválasztott csoportlista"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Accept"
-msgstr "Elfogad"
-
-#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_action_id
 msgid "Action"
 msgstr "Művelet"
@@ -287,16 +263,9 @@ msgstr "Kihívás hozzárendelése ehhez"
 #: model:ir.actions.act_window,help:gamification.challenge_list_action
 msgid ""
 "Assign a list of goals to chosen users to evaluate them.\n"
-"                    The challenge can use a period (weekly, monthly...) for "
-"automatic creation of goals.\n"
-"                    The goals are created for the specified users or member "
-"of the group."
+"                The challenge can use a period (weekly, monthly...) for automatic creation of goals.\n"
+"                The goals are created for the specified users or member of the group."
 msgstr ""
-"Hozzárendelhet egy, a felhasználók által kiválasztható cél listát, melyből "
-"kiértékelheti Őket. \n"
-"A felmérés használhat egy időszakot (heti, havi...) a célok automatikus "
-"létrehozásához.\n"
-"A célt az ide vonatkozó felhasználóhoz vagy egy csoport tagjához hozza létre."
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_rule_auth_user_ids
@@ -351,13 +320,8 @@ msgstr "Jelvény neve"
 #. module: gamification
 #: model:ir.actions.act_window,name:gamification.badge_list_action
 #: model:ir.ui.menu,name:gamification.gamification_badge_menu
-#, fuzzy
 msgid "Badges"
-msgstr ""
-"#-#-#-#-#  hu.po (Odoo 9.0)  #-#-#-#-#\n"
-"Kitűzők\n"
-"#-#-#-#-#  hu.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Jelvények"
+msgstr "Jelvények"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
@@ -388,7 +352,7 @@ msgid "Can not grant"
 msgstr "Nem tudja létrehozni"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:461
+#: code:addons/gamification/models/goal.py:410
 #, python-format
 msgid "Can not modify the configuration of a started goal"
 msgstr "Egy elkezdett célnak a beállítását nem tudja módosítani"
@@ -396,13 +360,8 @@ msgstr "Egy elkezdett célnak a beállítását nem tudja módosítani"
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.view_badge_wizard_grant
 #: model:ir.ui.view,arch_db:gamification.view_goal_wizard_update_current
-#, fuzzy
 msgid "Cancel"
-msgstr ""
-"#-#-#-#-#  hu.po (Odoo 9.0)  #-#-#-#-#\n"
-"Megszakítás\n"
-"#-#-#-#-#  hu.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Mégse"
+msgstr "Mégse"
 
 #. module: gamification
 #: selection:gamification.goal,state:0
@@ -417,23 +376,16 @@ msgstr "Kategória"
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_challenge_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_challenge_id
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
 msgid "Challenge"
 msgstr "Kihívás"
 
 #. module: gamification
-#: model:ir.actions.act_window,name:gamification.challenge_wizard
-msgid "Challenge Description"
-msgstr "Kihívás leírása"
-
-#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_line_id
 msgid "Challenge Line"
 msgstr "Kihívás tételsor"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_line_list_view
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
 msgid "Challenge Lines"
 msgstr "Kihívás tételsorok"
 
@@ -453,8 +405,8 @@ msgid ""
 "Challenge that generated the goal, assign challenge to users to generate "
 "goals with a value in this field."
 msgstr ""
-"A cél által generált kihívás, rendelje hozzá a felhasználókhoz a kihívásokat "
-"a célok generálásához, ennek a mezőnek az értékével."
+"A cél által generált kihívás, rendelje hozzá a felhasználókhoz a kihívásokat"
+" a célok generálásához, ennek a mezőnek az értékével."
 
 #. module: gamification
 #: model:ir.actions.act_window,name:gamification.challenge_list_action
@@ -516,22 +468,13 @@ msgid "Completeness"
 msgstr "Elvégzettség"
 
 #. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_computation_mode
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_computation_mode
 #: model:ir.ui.view,arch_db:gamification.goal_definition_search_view
 msgid "Computation Mode"
 msgstr "Számítási mód"
 
 #. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_computation_mode
-msgid "Computation mode"
-msgstr "Kiszámítási mód"
-
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_condition
-msgid "Condition"
-msgstr "Feltétel"
-
-#. module: gamification
 #: model:ir.actions.act_window,name:gamification.action_new_simplified_res_users
 msgid "Create User"
 msgstr "Felhasználó létrehozás"
@@ -545,8 +488,8 @@ msgid ""
 "specific access to the applications they need to use in the system."
 msgstr ""
 "Hozza létre és kezelje a felhasználókat, akik csatlakozni fognak a "
-"rendszerhez. A felhasználók deaktiválhatóak, ha eltelik egy időszak amelynek "
-"során nem csatlakoznak a rendszerhez. Csoportokhoz rendelheti őket, amely "
+"rendszerhez. A felhasználók deaktiválhatóak, ha eltelik egy időszak amelynek"
+" során nem csatlakoznak a rendszerhez. Csoportokhoz rendelheti őket, amely "
 "külön hozzáféréseket biztosít az alkalmazásokhoz, amelyekre szükségük van a "
 "rendszer használatához."
 
@@ -614,6 +557,7 @@ msgid "Define the visibility of the challenge through menus"
 msgstr "Határozza meg a kihívás felfedezhetőségét a menün keresztül"
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_goal_computation_mode
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_computation_mode
 msgid ""
 "Defined how will be computed the goals. The result of the operation will be "
@@ -623,12 +567,7 @@ msgstr ""
 "'Jelenlegi' mezőben."
 
 #. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3136
-msgid "Definition Condition"
-msgstr "Meghatározás feltétel"
-
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3145
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3039
 msgid "Definition Description"
 msgstr "Meghatározás leírása"
 
@@ -640,7 +579,8 @@ msgstr ""
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
-msgid "Describe the challenge: what is does, who it targets, why it matters..."
+msgid ""
+"Describe the challenge: what is does, who it targets, why it matters..."
 msgstr "Kihívás körülírása: mit csinál, mik a célok, miért számít..."
 
 #. module: gamification
@@ -656,7 +596,6 @@ msgstr "Leírás"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_visibility_mode
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display
 msgid "Display Mode"
 msgstr "Megjelenítés módja"
 
@@ -669,15 +608,11 @@ msgstr "Megjelenítés módja"
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display_name
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_display_name
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_display_name
-#, fuzzy
 msgid "Display Name"
-msgstr ""
-"#-#-#-#-#  hu.po (Odoo 9.0)  #-#-#-#-#\n"
-"Név megjelenítése\n"
-"#-#-#-#-#  hu.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Megjelenített név"
+msgstr "Megjelenített név"
 
 #. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display_mode
 msgid "Displayed as"
 msgstr "Megjelenítés mint"
@@ -702,16 +637,12 @@ msgstr ""
 #. module: gamification
 #: selection:gamification.challenge,state:0
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
-#, fuzzy
 msgid "Done"
-msgstr ""
-"#-#-#-#-#  hu.po (Odoo 9.0)  #-#-#-#-#\n"
-"Kész\n"
-"#-#-#-#-#  hu.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Elvégezve"
+msgstr "Elvégezve"
 
 #. module: gamification
-#: selection:gamification.challenge,state:0 selection:gamification.goal,state:0
+#: selection:gamification.challenge,state:0
+#: selection:gamification.goal,state:0
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
 msgid "Draft"
 msgstr "Tervezet"
@@ -720,13 +651,8 @@ msgstr "Tervezet"
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_end_date
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_end_date
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
-#, fuzzy
 msgid "End Date"
-msgstr ""
-"#-#-#-#-#  hu.po (Odoo 9.0)  #-#-#-#-#\n"
-"Dátum-ig:\n"
-"#-#-#-#-#  hu.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Befejezés dátuma"
+msgstr "Befejezés dátuma"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_batch_mode
@@ -737,14 +663,8 @@ msgstr ""
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_batch_user_expression
-msgid "Evaluted expression for batch mode"
-msgstr "Értékelje a hozzászlást a tömeges módhoz"
-
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Even if the challenge is failed, best challengers will be rewarded"
+msgid "Evaluated expression for batch mode"
 msgstr ""
-"Még akkor is, ha a kihívás sikertelen, a legjobb kihívók jutalmazva lesznek"
 
 #. module: gamification
 #: selection:gamification.badge,rule_auth:0
@@ -798,13 +718,8 @@ msgstr "Formázási lehetőségek"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_kanban_view
-#, fuzzy
 msgid "From"
-msgstr ""
-"#-#-#-#-#  hu.po (Odoo 9.0)  #-#-#-#-#\n"
-"Feladó\n"
-"#-#-#-#-#  hu.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Kezdő dátum"
+msgstr "Kezdő dátum"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_full_suffix
@@ -818,13 +733,8 @@ msgstr "Gammifikációs/Játékos eszközök"
 
 #. module: gamification
 #: model:ir.model,name:gamification.model_gamification_badge
-#, fuzzy
 msgid "Gamification badge"
-msgstr ""
-"#-#-#-#-#  hu.po (Odoo 9.0)  #-#-#-#-#\n"
-"Gamifikációs/játékos kitüntetés\n"
-"#-#-#-#-#  hu.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Gamifikációs/játékos jelvény"
+msgstr "Gamifikációs/játékos jelvény"
 
 #. module: gamification
 #: model:ir.model,name:gamification.model_gamification_challenge
@@ -848,13 +758,8 @@ msgstr "Gamifikációs/játékos cél példány"
 
 #. module: gamification
 #: model:ir.model,name:gamification.model_gamification_badge_user
-#, fuzzy
 msgid "Gamification user badge"
-msgstr ""
-"#-#-#-#-#  hu.po (Odoo 9.0)  #-#-#-#-#\n"
-"Gamifikációs/játékos felhasználói kitüntetés\n"
-"#-#-#-#-#  hu.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Gamifikációs/játékos felhasználói jelvény"
+msgstr "Gamifikációs/játékos felhasználói jelvény"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_goal_id
@@ -865,7 +770,7 @@ msgstr "Cél"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_id
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3147
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3041
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_name
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
 msgid "Goal Definition"
@@ -894,7 +799,9 @@ msgid "Goal List"
 msgstr "Cél lista"
 
 #. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_condition
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3030
 msgid "Goal Performance"
 msgstr "Cél teljesítmény"
 
@@ -915,7 +822,6 @@ msgstr "Cél meghatározásai"
 #: model:ir.ui.menu,name:gamification.gamification_goal_menu
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
 #: model:ir.ui.view,arch_db:gamification.view_challenge_kanban
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
 msgid "Goals"
 msgstr "Célok"
 
@@ -960,13 +866,8 @@ msgstr "Adományozza"
 #: model:ir.ui.view,arch_db:gamification.challenge_search_view
 #: model:ir.ui.view,arch_db:gamification.goal_definition_search_view
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
-#, fuzzy
 msgid "Group By"
-msgstr ""
-"#-#-#-#-#  hu.po (Odoo 9.0)  #-#-#-#-#\n"
-"Csoportosítás...\n"
-"#-#-#-#-#  hu.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Csoportosítás"
+msgstr "Csoportosítás"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_challenge_report_message_group_id
@@ -989,6 +890,11 @@ msgid "How to compute the goal?"
 msgstr "Hogyan számítsa ki a célt?"
 
 #. module: gamification
+#: selection:gamification.challenge,category:0
+msgid "Human Resources / Engagement"
+msgstr ""
+
+#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_wizard_id
@@ -997,13 +903,8 @@ msgstr "Hogyan számítsa ki a célt?"
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_id
-#, fuzzy
 msgid "ID"
-msgstr ""
-"#-#-#-#-#  hu.po (Odoo 9.0)  #-#-#-#-#\n"
-"ID\n"
-"#-#-#-#-#  hu.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Azonosító ID"
+msgstr "Azonosító ID"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_res_id_field
@@ -1012,8 +913,8 @@ msgstr "Felhasználói ID azonosító mező"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_remaining_sending
-msgid "If a maxium is set"
-msgstr "Ha a maximumot beállította"
+msgid "If a maximum is set"
+msgstr ""
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_user_challenge_id
@@ -1036,8 +937,8 @@ msgid ""
 "In batch mode, the domain is evaluated globally. If enabled, do not use "
 "keyword 'user' in above filter domain."
 msgstr ""
-"Kötegelt módban, a domént globálissan értékeli. Ha bekapocslt, ne használjon "
-"'felhasználó' kulcsszót a felső domén szűrőben."
+"Kötegelt módban, a domént globálissan értékeli. Ha bekapocslt, ne használjon"
+" 'felhasználó' kulcsszót a felső domén szűrőben."
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_batch_distinctive_field
@@ -1070,23 +971,12 @@ msgid "Individual Goals"
 msgstr "Egyéni célok"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:338
-#, python-format
-msgid "Invalid return content from the evaluation of code for definition %s"
-msgstr ""
-"Érvénytelen visszatérő tartalom a %s meghatározás kódjának értékelésénél"
-
-#. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_admin3
 #: model:gamification.goal.definition,name:gamification.definition_base_invite
 msgid "Invite new Users"
 msgstr "Új felhasználók meghívása"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Invited"
-msgstr "Meghívott"
-
-#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge___last_update
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user___last_update
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_wizard___last_update
@@ -1095,13 +985,8 @@ msgstr "Meghívott"
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal___last_update
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition___last_update
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard___last_update
-#, fuzzy
 msgid "Last Modified on"
-msgstr ""
-"#-#-#-#-#  hu.po (Odoo 9.0)  #-#-#-#-#\n"
-"Utolsó frissítés dátuma\n"
-"#-#-#-#-#  hu.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Utoljára frissítve ekkor"
+msgstr "Utoljára frissítve ekkor"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_last_report_date
@@ -1122,13 +1007,8 @@ msgstr "Utolsó frissítés"
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_write_uid
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_write_uid
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_write_uid
-#, fuzzy
 msgid "Last Updated by"
-msgstr ""
-"#-#-#-#-#  hu.po (Odoo 9.0)  #-#-#-#-#\n"
-"Utoljára frissítve, által\n"
-"#-#-#-#-#  hu.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Utoljára frissítette"
+msgstr "Utoljára frissítette"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_wizard_write_date
@@ -1180,13 +1060,8 @@ msgstr "Levelezés csoport követők"
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_model_id
 #: model:ir.ui.view,arch_db:gamification.goal_definition_search_view
-#, fuzzy
 msgid "Model"
-msgstr ""
-"#-#-#-#-#  hu.po (Odoo 9.0)  #-#-#-#-#\n"
-"Model\n"
-"#-#-#-#-#  hu.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Modell"
+msgstr "Modell"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_monetary
@@ -1270,10 +1145,11 @@ msgid "No one, assigned through challenges"
 msgstr "Felmérésen keresztül senki nincs hozzárendelve"
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:756
+#: code:addons/gamification/models/challenge.py:669
 #, python-format
 msgid "Nobody reached the required conditions to receive special badges."
-msgstr "Senki nem érte el a kívánt feltételeket a speciális kitűző eléréséhez."
+msgstr ""
+"Senki nem érte el a kívánt feltételeket a speciális kitűző eléréséhez."
 
 #. module: gamification
 #: selection:gamification.challenge,period:0
@@ -1322,11 +1198,6 @@ msgid "Owners"
 msgstr "Tulajdonosok"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Participating"
-msgstr "Részvétel"
-
-#. module: gamification
 #: selection:gamification.badge,rule_auth:0
 msgid "People having some badges"
 msgstr "Személyek egy pár kitűzővel"
@@ -1401,16 +1272,18 @@ msgid "Refresh Challenge"
 msgstr "Felmérés frissítés"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Reject"
-msgstr "Elutasít"
-
-#. module: gamification
 #: model:ir.actions.act_window,name:gamification.goals_from_challenge_act
 msgid "Related Goals"
 msgstr "Kapcsolódó célok"
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_badge_user_wizard_user_id
+msgid "Related user name for the resource to manage its access."
+msgstr ""
+"Az erőforráshoz kapcsolódó felhasználó neve, aki kezeli a hozzáférést az "
+"erőforráshoz."
+
+#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_remaining_sending
 msgid "Remaining Sending Allowed"
 msgstr "Hátralévő megengedett küldés"
@@ -1451,7 +1324,7 @@ msgid "Responsible"
 msgstr "Felelős"
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:551
+#: code:addons/gamification/models/challenge.py:489
 #, python-format
 msgid "Retrieving progress for personal challenge without user information"
 msgstr ""
@@ -1460,7 +1333,6 @@ msgstr ""
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
 msgid "Reward"
 msgstr "Jutalmazás"
 
@@ -1559,21 +1431,29 @@ msgid "Set the current value you have reached for this goal"
 msgstr "Jelenlegi értéket a cél eléréséhez megszerzett értékre állítja"
 
 #. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_admin1
 #: model:gamification.goal.definition,name:gamification.definition_base_company_data
 msgid "Set your Company Data"
 msgstr "Vállalata adatait állítja be"
 
 #. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_admin2
 #: model:gamification.goal.definition,name:gamification.definition_base_company_logo
 msgid "Set your Company Logo"
 msgstr "Céges logót állítja be."
 
 #. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_discover1
 #: model:gamification.goal.definition,name:gamification.definition_base_timezone
 msgid "Set your Timezone"
 msgstr "Időzánáját állítja be"
 
 #. module: gamification
+#: selection:gamification.challenge,category:0
+msgid "Settings / Gamification Tools"
+msgstr ""
+
+#. module: gamification
 #: model:gamification.challenge,name:gamification.challenge_base_configure
 msgid "Setup your Company"
 msgstr "Vállalkozását állítja be"
@@ -1615,7 +1495,7 @@ msgstr "Feliratkozások"
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_full_suffix
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3141
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3035
 msgid "Suffix"
 msgstr "Utótag"
 
@@ -1640,13 +1520,15 @@ msgid "The action that will be called to update the goal value."
 msgstr "A cél értékének frissítéséhez meghívott művelet."
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:740
+#: code:addons/gamification/models/challenge.py:648
 #, python-format
 msgid "The challenge %s is finished."
 msgstr "A %s felmérés befejeződött."
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_full_suffix
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_full_suffix
+#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix_3035
 msgid "The currency and suffix field"
 msgstr "A pénznem és utótag mező"
 
@@ -1674,7 +1556,7 @@ msgstr ""
 "beállítva, ezt fogja használni a cél indítási dátumra."
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:129
+#: code:addons/gamification/models/goal.py:90
 #, python-format
 msgid ""
 "The domain for the definition %s seems incorrect, please check it.\n"
@@ -1722,15 +1604,16 @@ msgstr "Minél alacsonyabb annál jobb"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_rule_max_number
-msgid "The maximum number of time this badge can be sent per month per person."
-msgstr "Maximum, ahányszor ezt a kitűzőt havonta, személyenként ki lehet adni."
+msgid ""
+"The maximum number of time this badge can be sent per month per person."
+msgstr ""
+"Maximum, ahányszor ezt a kitűzőt havonta, személyenként ki lehet adni."
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:146
+#: code:addons/gamification/models/goal.py:107
 #, python-format
 msgid ""
-"The model configuration for the definition %s seems incorrect, please check "
-"it.\n"
+"The model configuration for the definition %s seems incorrect, please check it.\n"
 "\n"
 "%s not found"
 msgstr ""
@@ -1739,11 +1622,10 @@ msgstr ""
 "%s nem található"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:143
+#: code:addons/gamification/models/goal.py:104
 #, python-format
 msgid ""
-"The model configuration for the definition %s seems incorrect, please check "
-"it.\n"
+"The model configuration for the definition %s seems incorrect, please check it.\n"
 "\n"
 "%s not stored"
 msgstr ""
@@ -1767,7 +1649,8 @@ msgstr ""
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_stat_my_this_month
-msgid "The number of time the current user has received this badge this month."
+msgid ""
+"The number of time the current user has received this badge this month."
 msgstr ""
 "Ahányszor a jelenlegi felhasználó megkapta ezt a kitűzőt ebben a hónapban."
 
@@ -1779,7 +1662,8 @@ msgstr "Ahányszor a jelenlegi felhasználó megkapta ezt a kitűzőt."
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_stat_my_monthly_sending
 msgid "The number of time the current user has sent this badge this month."
-msgstr "Ahányszor a jelenlegi felhasználó adta ezt a kitűzőt ebben a hónapban."
+msgstr ""
+"Ahányszor a jelenlegi felhasználó adta ezt a kitűzőt ebben a hónapban."
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_stat_count_distinct
@@ -1797,12 +1681,14 @@ msgid "The number of time this badge has been received."
 msgstr "Ahányszor ezt a kitűzőt megkapták."
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_monetary
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_monetary
 msgid "The target and current value are defined in the company currency."
 msgstr ""
 "A cél és a jelenlegi értéke a vállalkozás pénznemeinél van meghatározva."
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_suffix
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix
 msgid "The unit of the target and current values"
 msgstr "A cél és a jelenlegi értékek egysége"
@@ -1830,8 +1716,8 @@ msgstr ""
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_batch_user_expression
 msgid ""
 "The value to compare with the distinctive field. The expression can contain "
-"reference to 'user' which is a browse record of the current user, e.g. user."
-"id, user.partner_id.id..."
+"reference to 'user' which is a browse record of the current user, e.g. "
+"user.id, user.partner_id.id..."
 msgstr ""
 "Összehasonlító érték a meghatározott mezőhöz. A kifejezés tartalmazhat "
 "'user'-re hivatkozást, mely a jelenlegi felhasználó  böngészési bejegyzése, "
@@ -1841,17 +1727,8 @@ msgstr ""
 #: model:ir.actions.act_window,help:gamification.goals_from_challenge_act
 msgid ""
 "There is no goals associated to this challenge matching your search.\n"
-"                Make sure that your challenge is active and assigned to at "
-"least one user."
+"            Make sure that your challenge is active and assigned to at least one user."
 msgstr ""
-"Nincsenek a keresésének megfelelő, ehhez a felméréshez kapcsolódó célok.\n"
-"                Győződjön meg róla, hogy a felmérései aktívak és legalább "
-"egy felhasználóhoz hozzárendeltek."
-
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "There is no reward upon completion of this challenge."
-msgstr "Nincs jutalom ennek a felmérésnek a végén."
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_closed
@@ -1859,7 +1736,7 @@ msgid "These goals will not be recomputed."
 msgstr "A célok nem lesznek újraszámolva."
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:223
+#: code:addons/gamification/models/badge.py:213
 #, python-format
 msgid "This badge can not be sent by users."
 msgstr "Ezt a kitűzőt nem küldhetik ki felhasználók."
@@ -1901,16 +1778,11 @@ msgstr "Egység"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.view_goal_wizard_update_current
-#, fuzzy
 msgid "Update"
-msgstr ""
-"#-#-#-#-#  hu.po (Odoo 9.0)  #-#-#-#-#\n"
-"Frissít\n"
-"#-#-#-#-#  hu.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Frissítés"
+msgstr "Frissítés"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:495
+#: code:addons/gamification/models/goal.py:445
 #, python-format
 msgid "Update %s"
 msgstr "%s firssít"
@@ -1929,12 +1801,16 @@ msgid "User domain"
 msgstr "Felhasználói domén"
 
 #. module: gamification
-#: model:ir.model,name:gamification.model_res_users
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_user_ids
 msgid "Users"
 msgstr "Felhasználók"
 
 #. module: gamification
+#: selection:gamification.challenge,category:0
+msgid "Website / Forum"
+msgstr ""
+
+#. module: gamification
 #: selection:gamification.challenge,period:0
 #: selection:gamification.challenge,report_message_frequency:0
 msgid "Weekly"
@@ -1971,19 +1847,19 @@ msgid "Yearly"
 msgstr "Évente"
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:225
+#: code:addons/gamification/models/badge.py:215
 #, python-format
 msgid "You are not in the user allowed list."
 msgstr "Nincs rajta a felhasználó engedélyezett listán."
 
 #. module: gamification
-#: code:addons/gamification/wizard/grant_badge.py:26
+#: code:addons/gamification/wizard/grant_badge.py:24
 #, python-format
 msgid "You can not grant a badge to yourself"
 msgstr "Nem adományozhat saját magának kitűzőt"
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:235
+#: code:addons/gamification/models/challenge.py:195
 #, python-format
 msgid "You can not reset a challenge with unfinished goals."
 msgstr "Nem állíthatja vissza a felmérést befejezetlen célokkal."
@@ -1999,13 +1875,13 @@ msgid "You did great at your job."
 msgstr "Nagyon jól teljesítette a munkáját."
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:227
+#: code:addons/gamification/models/badge.py:217
 #, python-format
 msgid "You do not have the required badges."
 msgstr "Nincs meg a szükséges kitűzője."
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:229
+#: code:addons/gamification/models/badge.py:219
 #, python-format
 msgid "You have already sent this badge too many time this month."
 msgstr "Ezt a kitűzőt már túl sokszor elküldte ebben a hónapban."
@@ -2039,13 +1915,9 @@ msgstr "pl. napok"
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_definition_form_view
 msgid ""
-"e.g. result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', "
-"'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)], "
-"count=True, context=context)"
+"e.g. result = env['mail.followers'].search_count([('res_model', '=', "
+"'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)])"
 msgstr ""
-"pl. result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', "
-"'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)], "
-"count=True, context=context)"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_definition_form_view
@@ -2073,11 +1945,6 @@ msgid "refresh"
 msgstr "frissítés"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "reply later"
-msgstr "válasz később"
-
-#. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_form_view
 msgid "than the target."
 msgstr "utána a cél."
@@ -2091,228 +1958,3 @@ msgstr "a"
 #: model:ir.ui.view,arch_db:gamification.badge_kanban_view
 msgid "this month"
 msgstr "ebben a hónapban"
-
-#~ msgid ""
-#~ "\n"
-#~ "    <header>\n"
-#~ "        <strong>Reminder ${object.name}</strong>\n"
-#~ "    </header>\n"
-#~ "    \n"
-#~ "    <p>You have not updated your progress for the goal ${object."
-#~ "definition_id.name} (currently reached at ${object.completeness}%) for at "
-#~ "least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
-#~ "            "
-#~ msgstr ""
-#~ "\n"
-#~ "    <header>\n"
-#~ "        <strong>Emlékeztető${object.name}</strong>\n"
-#~ "    </header>\n"
-#~ "    \n"
-#~ "    <p>Nem frissítette a folyamatait a céljához ${object.definition_id."
-#~ "name} (most elérte a ${object.completeness}%) legalább ${object."
-#~ "remind_update_delay} nappal. Ne felejtse el megcsinálni.</p>\n"
-#~ "            "
-
-#~ msgid ""
-#~ "\n"
-#~ "<header>\n"
-#~ "    <strong>${object.name}</strong>\n"
-#~ "</header>\n"
-#~ "<p class=\"oe_grey\">The following message contains the current progress "
-#~ "for the challenge ${object.name}</p>\n"
-#~ "\n"
-#~ "% if object.visibility_mode == 'personal':\n"
-#~ "    <table width=\"100%\" border=\"1\">\n"
-#~ "    <tr>\n"
-#~ "        <th>Goal</th>\n"
-#~ "        <th>Target</th>\n"
-#~ "        <th>Current</th>\n"
-#~ "        <th>Completeness</th>\n"
-#~ "    </tr>\n"
-#~ "    % for line in ctx[\"challenge_lines\"]:\n"
-#~ "        <tr\n"
-#~ "            % if line['completeness'] >= 100:\n"
-#~ "                style=\"font-weight:bold;\"\n"
-#~ "            % endif\n"
-#~ "            >\n"
-#~ "            <td>${line['name']}</td>\n"
-#~ "            <td>${line['target']}\n"
-#~ "            % if line['suffix']:\n"
-#~ "                ${line['suffix']}\n"
-#~ "            % endif\n"
-#~ "            </td>\n"
-#~ "            <td>${line['current']}\n"
-#~ "            % if line['suffix']:\n"
-#~ "                ${line['suffix']}\n"
-#~ "            % endif\n"
-#~ "            </td>\n"
-#~ "            <td>${line['completeness']} %</td>\n"
-#~ "        </tr>\n"
-#~ "    % endfor\n"
-#~ "    </table>\n"
-#~ "% else:\n"
-#~ "    % for line in ctx[\"challenge_lines\"]:\n"
-#~ "        <table width=\"100%\" border=\"1\">\n"
-#~ "            <tr>\n"
-#~ "                <th colspan=\"4\">${line['name']}</th>\n"
-#~ "            </tr>\n"
-#~ "            <tr>\n"
-#~ "                <th>#</th>\n"
-#~ "                <th>Person</th>\n"
-#~ "                <th>Completeness</th>\n"
-#~ "                <th>Current</th>\n"
-#~ "            </tr>\n"
-#~ "            % for goal in line['goals']:\n"
-#~ "                <tr\n"
-#~ "                    % if goal.completeness >= 100:\n"
-#~ "                        style=\"font-weight:bold;\"\n"
-#~ "                    % endif\n"
-#~ "                    >\n"
-#~ "                    <td>${goal['rank']}</td>\n"
-#~ "                    <td>${goal['name']}</td>\n"
-#~ "                    <td>${goal['completeness']}%</td>\n"
-#~ "                    <td>${goal['current']}/${line['target']}\n"
-#~ "                    % if line['suffix']:\n"
-#~ "                        ${line['suffix']}\n"
-#~ "                    % endif\n"
-#~ "                    </td>\n"
-#~ "                </tr>\n"
-#~ "            % endfor\n"
-#~ "        </table>\n"
-#~ "\n"
-#~ "        <br/><br/>\n"
-#~ "\n"
-#~ "    % endfor\n"
-#~ "% endif\n"
-#~ "            "
-#~ msgstr ""
-#~ "\n"
-#~ "<header>\n"
-#~ "    <strong>${object.name}</strong>\n"
-#~ "</header>\n"
-#~ "<p class=\"oe_grey\">A következő üzenet tartalmazza a jelenlegi kihívás "
-#~ "folyamatait ${object.name}</p>\n"
-#~ "\n"
-#~ "% if object.visibility_mode == 'personal':\n"
-#~ "    <table width=\"100%\" border=\"1\">\n"
-#~ "    <tr>\n"
-#~ "        <th>Cél</th>\n"
-#~ "        <th>Célkitűzés</th>\n"
-#~ "        <th>Jelenlegi</th>\n"
-#~ "        <th>Teljesítés</th>\n"
-#~ "    </tr>\n"
-#~ "    % for line in ctx[\"challenge_lines\"]:\n"
-#~ "        <tr\n"
-#~ "            % if line['completeness'] >= 100:\n"
-#~ "                style=\"font-weight:bold;\"\n"
-#~ "            % endif\n"
-#~ "            >\n"
-#~ "            <td>${line['name']}</td>\n"
-#~ "            <td>${line['target']}\n"
-#~ "            % if line['suffix']:\n"
-#~ "                ${line['suffix']}\n"
-#~ "            % endif\n"
-#~ "            </td>\n"
-#~ "            <td>${line['current']}\n"
-#~ "            % if line['suffix']:\n"
-#~ "                ${line['suffix']}\n"
-#~ "            % endif\n"
-#~ "            </td>\n"
-#~ "            <td>${line['completeness']} %</td>\n"
-#~ "        </tr>\n"
-#~ "    % endfor\n"
-#~ "    </table>\n"
-#~ "% else:\n"
-#~ "    % for line in ctx[\"challenge_lines\"]:\n"
-#~ "        <table width=\"100%\" border=\"1\">\n"
-#~ "            <tr>\n"
-#~ "                <th colspan=\"4\">${line['name']}</th>\n"
-#~ "            </tr>\n"
-#~ "            <tr>\n"
-#~ "                <th>#</th>\n"
-#~ "                <th>Személy</th>\n"
-#~ "                <th>Teljesítés</th>\n"
-#~ "                <th>Jelenlegi</th>\n"
-#~ "            </tr>\n"
-#~ "            % a cél tételsorban['goals']:\n"
-#~ "                <tr\n"
-#~ "                    % if goal.completeness >= 100:\n"
-#~ "                        style=\"font-weight:bold;\"\n"
-#~ "                    % endif\n"
-#~ "                    >\n"
-#~ "                    <td>${goal['rank']}</td>\n"
-#~ "                    <td>${goal['name']}</td>\n"
-#~ "                    <td>${goal['completeness']}%</td>\n"
-#~ "                    <td>${goal['current']}/${line['target']}\n"
-#~ "                    % if line['suffix']:\n"
-#~ "                        ${line['suffix']}\n"
-#~ "                    % endif\n"
-#~ "                    </td>\n"
-#~ "                </tr>\n"
-#~ "            % endfor\n"
-#~ "        </table>\n"
-#~ "\n"
-#~ "        <br/><br/>\n"
-#~ "\n"
-#~ "    % endfor\n"
-#~ "% endif\n"
-#~ "            "
-
-#~ msgid "Action Needed"
-#~ msgstr "Művelet szükséges"
-
-#~ msgid "Date of the last message posted on the record."
-#~ msgstr "A feljegyzésen történt utolsó levelezés dátuma."
-
-#~ msgid "Followers"
-#~ msgstr "Követők"
-
-#~ msgid "Followers (Channels)"
-#~ msgstr "Követők (Csatornák)"
-
-#~ msgid "Followers (Partners)"
-#~ msgstr "Követők (Partnerek)"
-
-#~ msgid "For Every Succeding User"
-#~ msgstr "Összes eredményes felhasználónak"
-
-#~ msgid "If checked new messages require your attention."
-#~ msgstr "Ha be van jelölve, akkor figyelje az új üzeneteket."
-
-#~ msgid "If checked, new messages require your attention."
-#~ msgstr "Ha be van jelölve, akkor figyelje az új üzeneteket."
-
-#~ msgid "Inherited models"
-#~ msgstr "Származtatott modellek"
-
-#~ msgid "Is Follower"
-#~ msgstr "Ő egy követő"
-
-#~ msgid "Last Message Date"
-#~ msgstr "Utolsó üzenet dátuma"
-
-#~ msgid "Messages"
-#~ msgstr "Üzenetek"
-
-#~ msgid "Messages and communication history"
-#~ msgstr "Üzenetek és kommunikáció történet"
-
-#~ msgid "Number of Actions"
-#~ msgstr "Műveletek száma"
-
-#~ msgid "Number of messages which requires an action"
-#~ msgstr "Üzenetek száma, melyek közbenjárást igényelnek"
-
-#~ msgid "Number of unread messages"
-#~ msgstr "Olvasatlan üzenetek száma"
-
-#~ msgid "Unread Messages"
-#~ msgstr "Olvasatlan üzenetek"
-
-#~ msgid "Unread Messages Counter"
-#~ msgstr "Olvasatlan üzenetek számlálója"
-
-#~ msgid "Related user name for the resource to manage its access."
-#~ msgstr ""
-#~ "Az erőforráshoz kapcsolódó felhasználó neve, aki kezeli a hozzáférést az "
-#~ "erőforráshoz."
diff --git a/addons/gamification/i18n/nl.po b/addons/gamification/i18n/nl.po
index 2ab215b087f..d00ed697dba 100644
--- a/addons/gamification/i18n/nl.po
+++ b/addons/gamification/i18n/nl.po
@@ -1,50 +1,34 @@
-# #-#-#-#-#  nl.po (Odoo 9.0)  #-#-#-#-#
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * gamification
-#
-# Translators:
-# Eric Geens <ericgeens@yahoo.com>, 2015
-# Erwin van der Ploeg <erwin@odooexperts.nl>, 2015-2016
-# Yenthe Van Ginneken <yenthespam@gmail.com>, 2015
-# #-#-#-#-#  nl.po (Odoo Server 10.0alpha1e)  #-#-#-#-#
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * gamification
-#
+# 
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
 # Stephan Van Dyck <stephan.vandyck@vanroey.be>, 2016
 # Martin Trigaux <mat@odoo.com>, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0alpha1e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
 "PO-Revision-Date: 2016-08-18 08:38+0000\n"
 "Last-Translator: Eric Geens <ericgeens@yahoo.com>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
-"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"#-#-#-#-#  nl.po (Odoo 9.0)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"#-#-#-#-#  nl.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
+"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: gamification
 #: model:mail.template,body_html:gamification.email_template_badge_received
 msgid ""
 "\n"
-"        <p>Congratulation, you have received the badge <strong>${object."
-"badge_id.name}</strong> !\n"
+"        <p>Congratulation, you have received the badge <strong>${object.badge_id.name}</strong> !\n"
 "            % if object.sender_id\n"
-"                This badge was granted by <strong>${object.sender_id.name}</"
-"strong>.\n"
+"                This badge was granted by <strong>${object.sender_id.name}</strong>.\n"
 "            % endif\n"
 "        </p>\n"
 "\n"
@@ -54,11 +38,9 @@ msgid ""
 "        "
 msgstr ""
 "\n"
-"        <p>Gefeliciteerd, u heeft de badge <strong>${object.badge_id.name}</"
-"strong>  ontvangen!\n"
+"        <p>Gefeliciteerd, u heeft de badge <strong>${object.badge_id.name}</strong>  ontvangen!\n"
 "            % if object.sender_id\n"
-"                deze badge is toegewezen door <strong>${object.sender_id."
-"name}</strong>.\n"
+"                deze badge is toegewezen door <strong>${object.sender_id.name}</strong>.\n"
 "            % endif\n"
 "        </p>\n"
 "\n"
@@ -75,9 +57,7 @@ msgid ""
 "        <strong>Reminder ${object.name}</strong>\n"
 "    </p>\n"
 "    \n"
-"    <p>You have not updated your progress for the goal ${object."
-"definition_id.name} (currently reached at ${object.completeness}%) for at "
-"least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
+"    <p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
 "            "
 msgstr ""
 
@@ -88,8 +68,7 @@ msgid ""
 "<p>\n"
 "    <strong>${object.name}</strong>\n"
 "</p>\n"
-"<p class=\"oe_grey\">The following message contains the current progress for "
-"the challenge ${object.name}</p>\n"
+"<p class=\"oe_grey\">The following message contains the current progress for the challenge ${object.name}</p>\n"
 "\n"
 "% if object.visibility_mode == 'personal':\n"
 "    <table width=\"100%\" border=\"1\">\n"
@@ -158,17 +137,35 @@ msgid ""
 msgstr ""
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:746
+#: code:addons/gamification/models/challenge.py:591
+#, python-format
+msgid "%s has joined the challenge"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:600
+#, python-format
+msgid "%s has refused the challenge"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:657
+#, python-format
+msgid "<br/> %(rank)d. %(user_name)s - %(reward_name)s"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:654
 #, python-format
 msgid ""
-"<br/>Nobody has succeeded to reach every goal, no badge is rewarded for this "
-"challenge."
+"<br/>Nobody has succeeded to reach every goal, no badge is rewarded for this"
+" challenge."
 msgstr ""
 "<br/>Niemand heeft alle doelen bereikt, er is geen badge uitgereikt voor "
 "deze uitdaging."
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:744
+#: code:addons/gamification/models/challenge.py:652
 #, python-format
 msgid "<br/>Reward (badge %s) for every succeeding user was sent to %s."
 msgstr ""
@@ -176,55 +173,41 @@ msgstr ""
 "%s."
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:753
+#: code:addons/gamification/models/challenge.py:662
 #, python-format
 msgid ""
 "<br/>Special rewards were sent to the top competing users. The ranking for "
 "this challenge is :"
 msgstr ""
-"<br/>Speciale beloningen zijn verstuurd naar de top van deelnemende spelers. "
-"De rangschikking voor deze uitdaging is:"
+"<br/>Speciale beloningen zijn verstuurd naar de top van deelnemende spelers."
+" De rangschikking voor deze uitdaging is:"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
 msgid ""
 "<span class=\"o_stat_text\">Related</span>\n"
-"                                    <span class=\"o_stat_text\">Goals</span>"
+"                                <span class=\"o_stat_text\">Goals</span>"
 msgstr ""
-"<span class=\"o_stat_text\">Gerelateerde</span>\n"
-"                                    <span class=\"o_stat_text\">doelen</span>"
 
 #. module: gamification
 #: model:ir.actions.act_window,help:gamification.badge_list_action
 msgid ""
 "A badge is a symbolic token granted to a user as a sign of reward.\n"
-"                    It can be deserved automatically when some conditions "
-"are met or manually by users.\n"
-"                    Some badges are harder than others to get with specific "
-"conditions."
+"                It can be deserved automatically when some conditions are met or manually by users.\n"
+"                Some badges are harder than others to get with specific conditions."
 msgstr ""
-"Een badge is een symbolisch teken toegekend aan een gebruiker als teken van "
-"beloning.\n"
-"Het kan automatisch worden verdiend wanneer aan een aantal voorwaarden wordt "
-"voldaan of handmatig door gebruikers worden toegekend.\n"
-"Sommige badges zijn moeilijker te verkrijgen dan anderen met specifieke "
-"voorwaarden."
 
 #. module: gamification
 #: model:ir.actions.act_window,help:gamification.goal_definition_list_action
 msgid ""
-"A goal definition is a technical model of goal defining a condition to "
-"reach.\n"
-"                    The dates, values to reach or users are defined in goal "
-"instance."
+"A goal definition is a technical model of goal defining a condition to reach.\n"
+"                The dates, values to reach or users are defined in goal instance."
 msgstr ""
-"Een doeldefinitie is een technisch model of doeldefinitie die een conditie "
-"definieert om te voldoen.\n"
-"De datums, waardes om te behalen of de gebruikers zijn gedefinieerd in de "
-"doelstelling instantie."
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_condition
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition
+#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition_3030
 msgid ""
 "A goal is considered as completed when the current value is compared to the "
 "value to reach"
@@ -236,10 +219,8 @@ msgstr ""
 #: model:ir.actions.act_window,help:gamification.goal_list_action
 msgid ""
 "A goal is defined by a user and a goal definition.\n"
-"                    Goals can be created automatically by using challenges."
+"                Goals can be created automatically by using challenges."
 msgstr ""
-"Een doel is gedefinieerd door een gebruiker en een doeldefinitie.\n"
-"Doelen kunnen automatisch aangemaakt worden door uitdagingen te gebruiken."
 
 #. module: gamification
 #: selection:gamification.badge,rule_auth:0
@@ -247,11 +228,6 @@ msgid "A selected list of users"
 msgstr "Een geselecteerde lijst van gebruikers"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Accept"
-msgstr "Accepteren"
-
-#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_action_id
 msgid "Action"
 msgstr "Actie"
@@ -290,16 +266,9 @@ msgstr "Wijs uitdaging toe aan"
 #: model:ir.actions.act_window,help:gamification.challenge_list_action
 msgid ""
 "Assign a list of goals to chosen users to evaluate them.\n"
-"                    The challenge can use a period (weekly, monthly...) for "
-"automatic creation of goals.\n"
-"                    The goals are created for the specified users or member "
-"of the group."
+"                The challenge can use a period (weekly, monthly...) for automatic creation of goals.\n"
+"                The goals are created for the specified users or member of the group."
 msgstr ""
-"Wijs een lijst van doelen toe aan een groep gebruikers om ze te evalueren.\n"
-"De uitdaging kan over een periode lopen (week, maand...) om doelen "
-"automatisch aan te maken.\n"
-"De doelen worden aangemaakt voor de specifieke gebruikers of leden van een "
-"groep."
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_rule_auth_user_ids
@@ -386,7 +355,7 @@ msgid "Can not grant"
 msgstr "Kan niet toekennen"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:461
+#: code:addons/gamification/models/goal.py:410
 #, python-format
 msgid "Can not modify the configuration of a started goal"
 msgstr "Kan de configuratie niet wijzigen van een gestart doel"
@@ -394,13 +363,8 @@ msgstr "Kan de configuratie niet wijzigen van een gestart doel"
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.view_badge_wizard_grant
 #: model:ir.ui.view,arch_db:gamification.view_goal_wizard_update_current
-#, fuzzy
 msgid "Cancel"
-msgstr ""
-"#-#-#-#-#  nl.po (Odoo 9.0)  #-#-#-#-#\n"
-"Annuleren\n"
-"#-#-#-#-#  nl.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Annuleer"
+msgstr "Annuleer"
 
 #. module: gamification
 #: selection:gamification.goal,state:0
@@ -415,23 +379,16 @@ msgstr "Categorie"
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_challenge_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_challenge_id
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
 msgid "Challenge"
 msgstr "Uitdaging"
 
 #. module: gamification
-#: model:ir.actions.act_window,name:gamification.challenge_wizard
-msgid "Challenge Description"
-msgstr "Omschrijving uitdaging"
-
-#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_line_id
 msgid "Challenge Line"
 msgstr "Uitdagingsregels"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_line_list_view
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
 msgid "Challenge Lines"
 msgstr "Uitdagingsregels"
 
@@ -514,22 +471,13 @@ msgid "Completeness"
 msgstr "Volledigheid"
 
 #. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_computation_mode
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_computation_mode
 #: model:ir.ui.view,arch_db:gamification.goal_definition_search_view
 msgid "Computation Mode"
 msgstr "Berekenmodus"
 
 #. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_computation_mode
-msgid "Computation mode"
-msgstr "Berekenmodus"
-
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_condition
-msgid "Condition"
-msgstr "Voorwaarde"
-
-#. module: gamification
 #: model:ir.actions.act_window,name:gamification.action_new_simplified_res_users
 msgid "Create User"
 msgstr "Gebruiker aanmaken"
@@ -545,7 +493,8 @@ msgstr ""
 "Maken en beheren van gebruikers die gaan werken met het systeem. Gebruikers "
 "kunnen worden geblokkeerd als er een periode is dat ze niet kunnen/moeten "
 "werken met het systeem. U kunt groepen aan hen toewijzen om hen specifieke "
-"toegang te verlenen tot applicaties die ze gaan gebruiken binnen het systeem."
+"toegang te verlenen tot applicaties die ze gaan gebruiken binnen het "
+"systeem."
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_create_date
@@ -611,6 +560,7 @@ msgid "Define the visibility of the challenge through menus"
 msgstr "Definieer de zichtbaarheid van uitdagingen door menu's"
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_goal_computation_mode
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_computation_mode
 msgid ""
 "Defined how will be computed the goals. The result of the operation will be "
@@ -620,12 +570,7 @@ msgstr ""
 "bewerking wordt opgeslagen in et veld 'Huidig'."
 
 #. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3136
-msgid "Definition Condition"
-msgstr "Definitie conditie"
-
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3145
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3039
 msgid "Definition Description"
 msgstr "Definitie-beschrijving"
 
@@ -637,7 +582,8 @@ msgstr ""
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
-msgid "Describe the challenge: what is does, who it targets, why it matters..."
+msgid ""
+"Describe the challenge: what is does, who it targets, why it matters..."
 msgstr ""
 "Omschrijf de uitdaging: wat ze doet, wie het beïnvloed en waarom het "
 "belangrijk is.."
@@ -656,7 +602,6 @@ msgstr "Omschrijving"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_visibility_mode
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display
 msgid "Display Mode"
 msgstr "Weergavemodus"
 
@@ -673,6 +618,7 @@ msgid "Display Name"
 msgstr "Schermnaam"
 
 #. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display_mode
 msgid "Displayed as"
 msgstr "Weergegeven als"
@@ -697,16 +643,12 @@ msgstr ""
 #. module: gamification
 #: selection:gamification.challenge,state:0
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
-#, fuzzy
 msgid "Done"
-msgstr ""
-"#-#-#-#-#  nl.po (Odoo 9.0)  #-#-#-#-#\n"
-"Voltooid\n"
-"#-#-#-#-#  nl.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Verwerkt"
+msgstr "Verwerkt"
 
 #. module: gamification
-#: selection:gamification.challenge,state:0 selection:gamification.goal,state:0
+#: selection:gamification.challenge,state:0
+#: selection:gamification.goal,state:0
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
 msgid "Draft"
 msgstr "Concept"
@@ -725,13 +667,8 @@ msgstr "Evalueer de expressie in batch in plaats van per gebruiker"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_batch_user_expression
-msgid "Evaluted expression for batch mode"
-msgstr "Geëvalueerde expressie voor batch modus"
-
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Even if the challenge is failed, best challengers will be rewarded"
-msgstr "Zelfs als de uitdaging is mislukt worden de beste uitgedaagde beloond."
+msgid "Evaluated expression for batch mode"
+msgstr ""
 
 #. module: gamification
 #: selection:gamification.badge,rule_auth:0
@@ -837,7 +774,7 @@ msgstr "Doel"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_id
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3147
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3041
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_name
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
 msgid "Goal Definition"
@@ -866,7 +803,9 @@ msgid "Goal List"
 msgstr "Doellijst"
 
 #. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_condition
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3030
 msgid "Goal Performance"
 msgstr "Prestaties doel"
 
@@ -887,7 +826,6 @@ msgstr "Doel definities"
 #: model:ir.ui.menu,name:gamification.gamification_goal_menu
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
 #: model:ir.ui.view,arch_db:gamification.view_challenge_kanban
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
 msgid "Goals"
 msgstr "Doelen"
 
@@ -932,13 +870,8 @@ msgstr "Toekennen"
 #: model:ir.ui.view,arch_db:gamification.challenge_search_view
 #: model:ir.ui.view,arch_db:gamification.goal_definition_search_view
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
-#, fuzzy
 msgid "Group By"
-msgstr ""
-"#-#-#-#-#  nl.po (Odoo 9.0)  #-#-#-#-#\n"
-"Groeperen op\n"
-"#-#-#-#-#  nl.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Groepeer op"
+msgstr "Groepeer op"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_challenge_report_message_group_id
@@ -961,6 +894,11 @@ msgid "How to compute the goal?"
 msgstr "Hoe het doel te bereiken?"
 
 #. module: gamification
+#: selection:gamification.challenge,category:0
+msgid "Human Resources / Engagement"
+msgstr ""
+
+#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_wizard_id
@@ -974,18 +912,13 @@ msgstr "ID"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_res_id_field
-#, fuzzy
 msgid "ID Field of user"
-msgstr ""
-"#-#-#-#-#  nl.po (Odoo 9.0)  #-#-#-#-#\n"
-"ID gebruiker\n"
-"#-#-#-#-#  nl.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"ID veld van gebruiker"
+msgstr "ID veld van gebruiker"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_remaining_sending
-msgid "If a maxium is set"
-msgstr "Als een maximum is ingesteld"
+msgid "If a maximum is set"
+msgstr ""
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_user_challenge_id
@@ -999,13 +932,8 @@ msgstr "Afbeelding"
 
 #. module: gamification
 #: selection:gamification.challenge,state:0
-#, fuzzy
 msgid "In Progress"
-msgstr ""
-"#-#-#-#-#  nl.po (Odoo 9.0)  #-#-#-#-#\n"
-"In behandeling\n"
-"#-#-#-#-#  nl.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"In Behandeling"
+msgstr "In Behandeling"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_definition_form_view
@@ -1033,8 +961,8 @@ msgid ""
 "goal not linked to a challenge."
 msgstr ""
 "In het geval van een handmatig ingesteld doel, worden herinneringen "
-"verstuurt als de doelstelling een tijdje niet is bijgewerkt (gedefinieerd in "
-"de uitdaging). Genegeerd in geval van een niet-handmatige doel of een doel "
+"verstuurt als de doelstelling een tijdje niet is bijgewerkt (gedefinieerd in"
+" de uitdaging). Genegeerd in geval van een niet-handmatige doel of een doel "
 "niet gekoppeld aan een uitdaging"
 
 #. module: gamification
@@ -1048,22 +976,12 @@ msgid "Individual Goals"
 msgstr "Individuele doelen"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:338
-#, python-format
-msgid "Invalid return content from the evaluation of code for definition %s"
-msgstr "Ongeldige retour inhoud uit de evaluatie van de code voor definitie %s"
-
-#. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_admin3
 #: model:gamification.goal.definition,name:gamification.definition_base_invite
 msgid "Invite new Users"
 msgstr "Nodig nieuwe gebruikers uit"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Invited"
-msgstr "Uitgenodigd"
-
-#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge___last_update
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user___last_update
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_wizard___last_update
@@ -1126,13 +1044,8 @@ msgstr "Regel lijst"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_ids
-#, fuzzy
 msgid "Lines"
-msgstr ""
-"#-#-#-#-#  nl.po (Odoo 9.0)  #-#-#-#-#\n"
-"Regels\n"
-"#-#-#-#-#  nl.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Lijnen"
+msgstr "Lijnen"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_challenge_line_ids
@@ -1237,7 +1150,7 @@ msgid "No one, assigned through challenges"
 msgstr "Niemand aangeduid via uitdagingen"
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:756
+#: code:addons/gamification/models/challenge.py:669
 #, python-format
 msgid "Nobody reached the required conditions to receive special badges."
 msgstr ""
@@ -1289,11 +1202,6 @@ msgid "Owners"
 msgstr "Eigenaars"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Participating"
-msgstr "Deelnemende"
-
-#. module: gamification
 #: selection:gamification.badge,rule_auth:0
 msgid "People having some badges"
 msgstr "Mensen die badges hebben"
@@ -1329,13 +1237,8 @@ msgstr "Progressief (maakt gebruik van numeriek waardes)"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_compute_code
-#, fuzzy
 msgid "Python Code"
-msgstr ""
-"#-#-#-#-#  nl.po (Odoo 9.0)  #-#-#-#-#\n"
-"Python code\n"
-"#-#-#-#-#  nl.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Python Code"
+msgstr "Python Code"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_compute_code
@@ -1373,16 +1276,17 @@ msgid "Refresh Challenge"
 msgstr "Vernieuw uitdaging"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Reject"
-msgstr "Afwijzen"
-
-#. module: gamification
 #: model:ir.actions.act_window,name:gamification.goals_from_challenge_act
 msgid "Related Goals"
 msgstr "Gerelateerde doelen"
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_badge_user_wizard_user_id
+msgid "Related user name for the resource to manage its access."
+msgstr ""
+"Gekoppelde gebruikersnaam voor de resource om zijn toegang te beheren."
+
+#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_remaining_sending
 msgid "Remaining Sending Allowed"
 msgstr "Toegestaan restant te versturen"
@@ -1423,14 +1327,14 @@ msgid "Responsible"
 msgstr "Verantwoordelijke"
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:551
+#: code:addons/gamification/models/challenge.py:489
 #, python-format
 msgid "Retrieving progress for personal challenge without user information"
-msgstr "Ontvang proces voor persoonlijke uitdaging zonder gebruiker informatie"
+msgstr ""
+"Ontvang proces voor persoonlijke uitdaging zonder gebruiker informatie"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
 msgid "Reward"
 msgstr "Beloning"
 
@@ -1461,13 +1365,8 @@ msgstr "Beloning voor uitdagingen"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
-#, fuzzy
 msgid "Running"
-msgstr ""
-"#-#-#-#-#  nl.po (Odoo 9.0)  #-#-#-#-#\n"
-"In behandeling\n"
-"#-#-#-#-#  nl.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Actief"
+msgstr "Actief"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_search_view
@@ -1534,21 +1433,29 @@ msgid "Set the current value you have reached for this goal"
 msgstr "Stel de huidige waarde in welke u heeft bereikt van deze doelstelling"
 
 #. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_admin1
 #: model:gamification.goal.definition,name:gamification.definition_base_company_data
 msgid "Set your Company Data"
 msgstr "Stel uw bedrijfsgegevens in"
 
 #. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_admin2
 #: model:gamification.goal.definition,name:gamification.definition_base_company_logo
 msgid "Set your Company Logo"
 msgstr "Stel uw bedrijfslogo in"
 
 #. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_discover1
 #: model:gamification.goal.definition,name:gamification.definition_base_timezone
 msgid "Set your Timezone"
 msgstr "Stel uw tijdzonde in"
 
 #. module: gamification
+#: selection:gamification.challenge,category:0
+msgid "Settings / Gamification Tools"
+msgstr ""
+
+#. module: gamification
 #: model:gamification.challenge,name:gamification.challenge_base_configure
 msgid "Setup your Company"
 msgstr "Stel uw bedrijfsgegevens in"
@@ -1590,7 +1497,7 @@ msgstr "Abonnementen"
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_full_suffix
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3141
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3035
 msgid "Suffix"
 msgstr "Achtervoegsel"
 
@@ -1616,13 +1523,15 @@ msgstr ""
 "De actie welke wordt aangeroepen om de doelstelling waarde bij te werken."
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:740
+#: code:addons/gamification/models/challenge.py:648
 #, python-format
 msgid "The challenge %s is finished."
 msgstr "Het doel %s is voltooid."
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_full_suffix
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_full_suffix
+#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix_3035
 msgid "The currency and suffix field"
 msgstr "Het valuta en achtervoegsel veld"
 
@@ -1650,7 +1559,7 @@ msgstr ""
 "periode is ingesteld wordt de startdatum van het doel gebruikt."
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:129
+#: code:addons/gamification/models/goal.py:90
 #, python-format
 msgid ""
 "The domain for the definition %s seems incorrect, please check it.\n"
@@ -1697,27 +1606,26 @@ msgstr "Hoe lager hoe beter"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_rule_max_number
-msgid "The maximum number of time this badge can be sent per month per person."
+msgid ""
+"The maximum number of time this badge can be sent per month per person."
 msgstr ""
 "Het maximum aantal keer dat de badge per maand per persoon kan verstuurd "
 "worden."
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:146
+#: code:addons/gamification/models/goal.py:107
 #, python-format
 msgid ""
-"The model configuration for the definition %s seems incorrect, please check "
-"it.\n"
+"The model configuration for the definition %s seems incorrect, please check it.\n"
 "\n"
 "%s not found"
 msgstr ""
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:143
+#: code:addons/gamification/models/goal.py:104
 #, python-format
 msgid ""
-"The model configuration for the definition %s seems incorrect, please check "
-"it.\n"
+"The model configuration for the definition %s seems incorrect, please check it.\n"
 "\n"
 "%s not stored"
 msgstr ""
@@ -1739,7 +1647,8 @@ msgstr ""
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_stat_my_this_month
-msgid "The number of time the current user has received this badge this month."
+msgid ""
+"The number of time the current user has received this badge this month."
 msgstr ""
 "De tijd die de huidige gebruiker heeft om de badge deze maand te krijgen."
 
@@ -1752,7 +1661,8 @@ msgstr "Het aantal keren dat de huidige gebruiker de badge heeft ontvangen."
 #: model:ir.model.fields,help:gamification.field_gamification_badge_stat_my_monthly_sending
 msgid "The number of time the current user has sent this badge this month."
 msgstr ""
-"Het aantal keren dat de huidige gebruiker de badge heeft gestuurd deze maand."
+"Het aantal keren dat de huidige gebruiker de badge heeft gestuurd deze "
+"maand."
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_stat_count_distinct
@@ -1770,12 +1680,14 @@ msgid "The number of time this badge has been received."
 msgstr "Het aantal keren dat deze badge is ontvangen."
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_monetary
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_monetary
 msgid "The target and current value are defined in the company currency."
 msgstr ""
 "De doelwaarde en huidige waarde zijn gedefinieerd in de bedrijfsvaluta."
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_suffix
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix
 msgid "The unit of the target and current values"
 msgstr "De eenheid van het doel en de huidige waarde"
@@ -1801,8 +1713,8 @@ msgstr "De gebruikers die de doelen halen krijgen automatisch de badge."
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_batch_user_expression
 msgid ""
 "The value to compare with the distinctive field. The expression can contain "
-"reference to 'user' which is a browse record of the current user, e.g. user."
-"id, user.partner_id.id..."
+"reference to 'user' which is a browse record of the current user, e.g. "
+"user.id, user.partner_id.id..."
 msgstr ""
 "De waarde om te vergelijken met het onderscheidende veld. De expressie kan "
 "een referentie naar hebben naar 'user', wat een zoekactie naar de huidige "
@@ -1812,20 +1724,8 @@ msgstr ""
 #: model:ir.actions.act_window,help:gamification.goals_from_challenge_act
 msgid ""
 "There is no goals associated to this challenge matching your search.\n"
-"                Make sure that your challenge is active and assigned to at "
-"least one user."
+"            Make sure that your challenge is active and assigned to at least one user."
 msgstr ""
-"Er is geen bijbehorende doelstelling bij deze uitdaging welke overeenkomt "
-"met uw zoekactie.\n"
-"Zorg ervoor dat uw uitdaging actief is en is toegewezen aan tenminste één "
-"gebruiker.\n"
-"              \n"
-"            "
-
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "There is no reward upon completion of this challenge."
-msgstr "Er is geen beloning voor het voltooien van deze uitdaging."
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_closed
@@ -1833,7 +1733,7 @@ msgid "These goals will not be recomputed."
 msgstr "Deze doelen worden niet herberekend."
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:223
+#: code:addons/gamification/models/badge.py:213
 #, python-format
 msgid "This badge can not be sent by users."
 msgstr "Deze badge kan niet door gebruikers verstuurd worden."
@@ -1880,7 +1780,7 @@ msgid "Update"
 msgstr "Bijwerken"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:495
+#: code:addons/gamification/models/goal.py:445
 #, python-format
 msgid "Update %s"
 msgstr "Bijwerken %s"
@@ -1899,12 +1799,16 @@ msgid "User domain"
 msgstr "Gebruiker domein"
 
 #. module: gamification
-#: model:ir.model,name:gamification.model_res_users
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_user_ids
 msgid "Users"
 msgstr "Gebruikers"
 
 #. module: gamification
+#: selection:gamification.challenge,category:0
+msgid "Website / Forum"
+msgstr ""
+
+#. module: gamification
 #: selection:gamification.challenge,period:0
 #: selection:gamification.challenge,report_message_frequency:0
 msgid "Weekly"
@@ -1942,19 +1846,19 @@ msgid "Yearly"
 msgstr "Jaarlijks"
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:225
+#: code:addons/gamification/models/badge.py:215
 #, python-format
 msgid "You are not in the user allowed list."
 msgstr "U bevind zich niet in de toegestane gebruikerslijst."
 
 #. module: gamification
-#: code:addons/gamification/wizard/grant_badge.py:26
+#: code:addons/gamification/wizard/grant_badge.py:24
 #, python-format
 msgid "You can not grant a badge to yourself"
 msgstr "U kan geen badge aan uzelf toewijzen"
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:235
+#: code:addons/gamification/models/challenge.py:195
 #, python-format
 msgid "You can not reset a challenge with unfinished goals."
 msgstr "U kan geen uitdaging terugzetten met onvoltooide doelen."
@@ -1970,13 +1874,13 @@ msgid "You did great at your job."
 msgstr "U heeft uw job geweldig gedaan."
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:227
+#: code:addons/gamification/models/badge.py:217
 #, python-format
 msgid "You do not have the required badges."
 msgstr "U hebt niet de benodigde badges"
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:229
+#: code:addons/gamification/models/badge.py:219
 #, python-format
 msgid "You have already sent this badge too many time this month."
 msgstr "U hebt deze badge al te vaak verstuurd deze maand."
@@ -2010,13 +1914,9 @@ msgstr "Bijv. dagen"
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_definition_form_view
 msgid ""
-"e.g. result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', "
-"'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)], "
-"count=True, context=context)"
+"e.g. result = env['mail.followers'].search_count([('res_model', '=', "
+"'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)])"
 msgstr ""
-"Bijv. result = pool.get('mail.followers').search(cr, uid, [('res_model', "
-"'=', 'mail.group'), ('partner_id', '=', object.user_id.partner_id.id)], "
-"count=True, context=context)"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_definition_form_view
@@ -2044,11 +1944,6 @@ msgid "refresh"
 msgstr "vernieuwen"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "reply later"
-msgstr "Reageer later"
-
-#. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_form_view
 msgid "than the target."
 msgstr "dan het doel."
@@ -2062,228 +1957,3 @@ msgstr "de"
 #: model:ir.ui.view,arch_db:gamification.badge_kanban_view
 msgid "this month"
 msgstr "deze maand"
-
-#~ msgid ""
-#~ "\n"
-#~ "    <header>\n"
-#~ "        <strong>Reminder ${object.name}</strong>\n"
-#~ "    </header>\n"
-#~ "    \n"
-#~ "    <p>You have not updated your progress for the goal ${object."
-#~ "definition_id.name} (currently reached at ${object.completeness}%) for at "
-#~ "least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
-#~ "            "
-#~ msgstr ""
-#~ "\n"
-#~ "    <header>\n"
-#~ "        <strong>Herinnering${object.name}</strong>\n"
-#~ "    </header>\n"
-#~ "    \n"
-#~ "    <p>U heeft niet de voortgang van uw doelstellingen ${object."
-#~ "definition_id.name} bijgewerkt (huidig behaald ${object.completeness}%) "
-#~ "voor tenminste ${object.remind_update_delay} dagen. Vergeet dit niet te "
-#~ "doen.</p>\n"
-#~ "            "
-
-#~ msgid ""
-#~ "\n"
-#~ "<header>\n"
-#~ "    <strong>${object.name}</strong>\n"
-#~ "</header>\n"
-#~ "<p class=\"oe_grey\">The following message contains the current progress "
-#~ "for the challenge ${object.name}</p>\n"
-#~ "\n"
-#~ "% if object.visibility_mode == 'personal':\n"
-#~ "    <table width=\"100%\" border=\"1\">\n"
-#~ "    <tr>\n"
-#~ "        <th>Goal</th>\n"
-#~ "        <th>Target</th>\n"
-#~ "        <th>Current</th>\n"
-#~ "        <th>Completeness</th>\n"
-#~ "    </tr>\n"
-#~ "    % for line in ctx[\"challenge_lines\"]:\n"
-#~ "        <tr\n"
-#~ "            % if line['completeness'] >= 100:\n"
-#~ "                style=\"font-weight:bold;\"\n"
-#~ "            % endif\n"
-#~ "            >\n"
-#~ "            <td>${line['name']}</td>\n"
-#~ "            <td>${line['target']}\n"
-#~ "            % if line['suffix']:\n"
-#~ "                ${line['suffix']}\n"
-#~ "            % endif\n"
-#~ "            </td>\n"
-#~ "            <td>${line['current']}\n"
-#~ "            % if line['suffix']:\n"
-#~ "                ${line['suffix']}\n"
-#~ "            % endif\n"
-#~ "            </td>\n"
-#~ "            <td>${line['completeness']} %</td>\n"
-#~ "        </tr>\n"
-#~ "    % endfor\n"
-#~ "    </table>\n"
-#~ "% else:\n"
-#~ "    % for line in ctx[\"challenge_lines\"]:\n"
-#~ "        <table width=\"100%\" border=\"1\">\n"
-#~ "            <tr>\n"
-#~ "                <th colspan=\"4\">${line['name']}</th>\n"
-#~ "            </tr>\n"
-#~ "            <tr>\n"
-#~ "                <th>#</th>\n"
-#~ "                <th>Person</th>\n"
-#~ "                <th>Completeness</th>\n"
-#~ "                <th>Current</th>\n"
-#~ "            </tr>\n"
-#~ "            % for goal in line['goals']:\n"
-#~ "                <tr\n"
-#~ "                    % if goal.completeness >= 100:\n"
-#~ "                        style=\"font-weight:bold;\"\n"
-#~ "                    % endif\n"
-#~ "                    >\n"
-#~ "                    <td>${goal['rank']}</td>\n"
-#~ "                    <td>${goal['name']}</td>\n"
-#~ "                    <td>${goal['completeness']}%</td>\n"
-#~ "                    <td>${goal['current']}/${line['target']}\n"
-#~ "                    % if line['suffix']:\n"
-#~ "                        ${line['suffix']}\n"
-#~ "                    % endif\n"
-#~ "                    </td>\n"
-#~ "                </tr>\n"
-#~ "            % endfor\n"
-#~ "        </table>\n"
-#~ "\n"
-#~ "        <br/><br/>\n"
-#~ "\n"
-#~ "    % endfor\n"
-#~ "% endif\n"
-#~ "            "
-#~ msgstr ""
-#~ "\n"
-#~ "<header>\n"
-#~ "    <strong>${object.name}</strong>\n"
-#~ "</header>\n"
-#~ "<p class=\"oe_grey\">The following message contains the current progress "
-#~ "for the challenge ${object.name}</p>\n"
-#~ "\n"
-#~ "% if object.visibility_mode == 'personal':\n"
-#~ "    <table width=\"100%\" border=\"1\">\n"
-#~ "    <tr>\n"
-#~ "        <th>Doelstelling</th>\n"
-#~ "        <th>Doel</th>\n"
-#~ "        <th>Huidig</th>\n"
-#~ "        <th>Volledigheid</th>\n"
-#~ "    </tr>\n"
-#~ "    % for line in ctx[\"challenge_lines\"]:\n"
-#~ "        <tr\n"
-#~ "            % if line['completeness'] >= 100:\n"
-#~ "                style=\"font-weight:bold;\"\n"
-#~ "            % endif\n"
-#~ "            >\n"
-#~ "            <td>${line['name']}</td>\n"
-#~ "            <td>${line['target']}\n"
-#~ "            % if line['suffix']:\n"
-#~ "                ${line['suffix']}\n"
-#~ "            % endif\n"
-#~ "            </td>\n"
-#~ "            <td>${line['current']}\n"
-#~ "            % if line['suffix']:\n"
-#~ "                ${line['suffix']}\n"
-#~ "            % endif\n"
-#~ "            </td>\n"
-#~ "            <td>${line['completeness']} %</td>\n"
-#~ "        </tr>\n"
-#~ "    % endfor\n"
-#~ "    </table>\n"
-#~ "% else:\n"
-#~ "    % for line in ctx[\"challenge_lines\"]:\n"
-#~ "        <table width=\"100%\" border=\"1\">\n"
-#~ "            <tr>\n"
-#~ "                <th colspan=\"4\">${line['name']}</th>\n"
-#~ "            </tr>\n"
-#~ "            <tr>\n"
-#~ "                <th>#</th>\n"
-#~ "                <th>Persoon</th>\n"
-#~ "                <th>Volledigheid</th>\n"
-#~ "                <th>Huidig</th>\n"
-#~ "            </tr>\n"
-#~ "            % for goal in line['goals']:\n"
-#~ "                <tr\n"
-#~ "                    % if goal.completeness >= 100:\n"
-#~ "                        style=\"font-weight:bold;\"\n"
-#~ "                    % endif\n"
-#~ "                    >\n"
-#~ "                    <td>${goal['rank']}</td>\n"
-#~ "                    <td>${goal['name']}</td>\n"
-#~ "                    <td>${goal['completeness']}%</td>\n"
-#~ "                    <td>${goal['current']}/${line['target']}\n"
-#~ "                    % if line['suffix']:\n"
-#~ "                        ${line['suffix']}\n"
-#~ "                    % endif\n"
-#~ "                    </td>\n"
-#~ "                </tr>\n"
-#~ "            % endfor\n"
-#~ "        </table>\n"
-#~ "\n"
-#~ "        <br/><br/>\n"
-#~ "\n"
-#~ "    % endfor\n"
-#~ "% endif\n"
-#~ "            "
-
-#~ msgid "Action Needed"
-#~ msgstr "Vereist actie"
-
-#~ msgid "Date of the last message posted on the record."
-#~ msgstr "Datum van het laatste bericht verstuurt op deze regel."
-
-#~ msgid "Followers"
-#~ msgstr "Volgers"
-
-#~ msgid "Followers (Channels)"
-#~ msgstr "Volgers (Kanalen)"
-
-#~ msgid "Followers (Partners)"
-#~ msgstr "Volgers (Partners)"
-
-#~ msgid "For Every Succeding User"
-#~ msgstr "Voor elke geslaagde gebruiker"
-
-#~ msgid "If checked new messages require your attention."
-#~ msgstr "Indien aangevinkt zullen nieuwe berichten uw aandacht vragen."
-
-#~ msgid "If checked, new messages require your attention."
-#~ msgstr "Indien aangevinkt vragen nieuwe berichten uw aandacht."
-
-#~ msgid "Inherited models"
-#~ msgstr "Overerfde modellen"
-
-#~ msgid "Is Follower"
-#~ msgstr "Is een volger"
-
-#~ msgid "Last Message Date"
-#~ msgstr "Laatste bericht datum"
-
-#~ msgid "Messages"
-#~ msgstr "Berichten"
-
-#~ msgid "Messages and communication history"
-#~ msgstr "Berichten en communicatie historie"
-
-#~ msgid "Number of Actions"
-#~ msgstr "Aantal acties"
-
-#~ msgid "Number of messages which requires an action"
-#~ msgstr "Aantal berichten die actie vereisen"
-
-#~ msgid "Number of unread messages"
-#~ msgstr "Aantal ongelezen berichten"
-
-#~ msgid "Unread Messages"
-#~ msgstr "Ongelezen berichten"
-
-#~ msgid "Unread Messages Counter"
-#~ msgstr "Teller ongelezen berichten"
-
-#~ msgid "Related user name for the resource to manage its access."
-#~ msgstr ""
-#~ "Gekoppelde gebruikersnaam voor de resource om zijn toegang te beheren."
diff --git a/addons/gamification/i18n/zh_CN.po b/addons/gamification/i18n/zh_CN.po
index 49a58c03c46..ab225bbfe6e 100644
--- a/addons/gamification/i18n/zh_CN.po
+++ b/addons/gamification/i18n/zh_CN.po
@@ -1,47 +1,30 @@
-# #-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * gamification
-#
+# 
 # Translators:
 # Jeffery Chenn <jeffery9@gmail.com>, 2016
-# liAnGjiA <liangjia@qq.com>, 2016
-# liAnGjiA <liangjia@qq.com>, 2016
-# #-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * gamification
-#
-# Translators:
-# Jeffery Chenn <jeffery9@gmail.com>, 2016
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0alpha1e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
 "PO-Revision-Date: 2016-08-18 08:38+0000\n"
 "Last-Translator: Jeffery Chenn <jeffery9@gmail.com>, 2016\n"
-"Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/"
-"zh_CN/)\n"
-"Language: zh_CN\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"
 "Content-Transfer-Encoding: \n"
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: gamification
 #: model:mail.template,body_html:gamification.email_template_badge_received
 msgid ""
 "\n"
-"        <p>Congratulation, you have received the badge <strong>${object."
-"badge_id.name}</strong> !\n"
+"        <p>Congratulation, you have received the badge <strong>${object.badge_id.name}</strong> !\n"
 "            % if object.sender_id\n"
-"                This badge was granted by <strong>${object.sender_id.name}</"
-"strong>.\n"
+"                This badge was granted by <strong>${object.sender_id.name}</strong>.\n"
 "            % endif\n"
 "        </p>\n"
 "\n"
@@ -70,9 +53,7 @@ msgid ""
 "        <strong>Reminder ${object.name}</strong>\n"
 "    </p>\n"
 "    \n"
-"    <p>You have not updated your progress for the goal ${object."
-"definition_id.name} (currently reached at ${object.completeness}%) for at "
-"least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
+"    <p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
 "            "
 msgstr ""
 
@@ -83,8 +64,7 @@ msgid ""
 "<p>\n"
 "    <strong>${object.name}</strong>\n"
 "</p>\n"
-"<p class=\"oe_grey\">The following message contains the current progress for "
-"the challenge ${object.name}</p>\n"
+"<p class=\"oe_grey\">The following message contains the current progress for the challenge ${object.name}</p>\n"
 "\n"
 "% if object.visibility_mode == 'personal':\n"
 "    <table width=\"100%\" border=\"1\">\n"
@@ -153,21 +133,39 @@ msgid ""
 msgstr ""
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:746
+#: code:addons/gamification/models/challenge.py:591
+#, python-format
+msgid "%s has joined the challenge"
+msgstr "%s 加入挑战"
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:600
+#, python-format
+msgid "%s has refused the challenge"
+msgstr "%s 拒绝挑战"
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:657
+#, python-format
+msgid "<br/> %(rank)d. %(user_name)s - %(reward_name)s"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:654
 #, python-format
 msgid ""
-"<br/>Nobody has succeeded to reach every goal, no badge is rewarded for this "
-"challenge."
+"<br/>Nobody has succeeded to reach every goal, no badge is rewarded for this"
+" challenge."
 msgstr "<br/>没有人成功的完成每一个目标，那么这个挑战不会发放任何徽章"
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:744
+#: code:addons/gamification/models/challenge.py:652
 #, python-format
 msgid "<br/>Reward (badge %s) for every succeeding user was sent to %s."
 msgstr "每一个成功用户的<br/> 奖励（徽章 %s）被送到 %s。"
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:753
+#: code:addons/gamification/models/challenge.py:662
 #, python-format
 msgid ""
 "<br/>Special rewards were sent to the top competing users. The ranking for "
@@ -178,36 +176,28 @@ msgstr "<br/>特殊的奖励被派往上相互竞争的用户。这个挑战是�
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
 msgid ""
 "<span class=\"o_stat_text\">Related</span>\n"
-"                                    <span class=\"o_stat_text\">Goals</span>"
+"                                <span class=\"o_stat_text\">Goals</span>"
 msgstr ""
-"<span class=\"o_stat_text\">相关的</span>\n"
-"                                    <span class=\"o_stat_text\">目标</span>"
 
 #. module: gamification
 #: model:ir.actions.act_window,help:gamification.badge_list_action
 msgid ""
 "A badge is a symbolic token granted to a user as a sign of reward.\n"
-"                    It can be deserved automatically when some conditions "
-"are met or manually by users.\n"
-"                    Some badges are harder than others to get with specific "
-"conditions."
+"                It can be deserved automatically when some conditions are met or manually by users.\n"
+"                Some badges are harder than others to get with specific conditions."
 msgstr ""
-"徽章是给用户象征性的奖励。有些条件满足的时候它可以自动的得到或者用户手动的设"
-"置。根据具体条件的设置，有些徽章会比其他徽章更难得到"
 
 #. module: gamification
 #: model:ir.actions.act_window,help:gamification.goal_definition_list_action
 msgid ""
-"A goal definition is a technical model of goal defining a condition to "
-"reach.\n"
-"                    The dates, values to reach or users are defined in goal "
-"instance."
+"A goal definition is a technical model of goal defining a condition to reach.\n"
+"                The dates, values to reach or users are defined in goal instance."
 msgstr ""
-"目标定义是要达成一定条件的目标的技术模型要达成的日期，数值或者在目标实例中的"
-"用户定义"
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_condition
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition
+#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition_3030
 msgid ""
 "A goal is considered as completed when the current value is compared to the "
 "value to reach"
@@ -217,8 +207,8 @@ msgstr "当一个目标的当前值达到目标值时被视为已完成"
 #: model:ir.actions.act_window,help:gamification.goal_list_action
 msgid ""
 "A goal is defined by a user and a goal definition.\n"
-"                    Goals can be created automatically by using challenges."
-msgstr "用户定义目标并且目标能被挑战自动的创建"
+"                Goals can be created automatically by using challenges."
+msgstr ""
 
 #. module: gamification
 #: selection:gamification.badge,rule_auth:0
@@ -226,19 +216,9 @@ msgid "A selected list of users"
 msgstr "已选的用户列表"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Accept"
-msgstr "接受"
-
-#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_action_id
-#, fuzzy
 msgid "Action"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"行动\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"动作"
+msgstr "动作"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_active
@@ -252,13 +232,8 @@ msgstr "高级选项"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_rule_auth
-#, fuzzy
 msgid "Allowance to Grant"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"津贴补助\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"允许授予"
+msgstr "允许授予"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_challenge_user_domain
@@ -273,19 +248,15 @@ msgstr "出现在"
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
 msgid "Assign Challenge To"
-msgstr "指定的挑战"
+msgstr "指派挑战给"
 
 #. module: gamification
 #: model:ir.actions.act_window,help:gamification.challenge_list_action
 msgid ""
 "Assign a list of goals to chosen users to evaluate them.\n"
-"                    The challenge can use a period (weekly, monthly...) for "
-"automatic creation of goals.\n"
-"                    The goals are created for the specified users or member "
-"of the group."
+"                The challenge can use a period (weekly, monthly...) for automatic creation of goals.\n"
+"                The goals are created for the specified users or member of the group."
 msgstr ""
-"给选定的用户分配一个目标列表，自动创建目标的挑战可以是一段时期（每周，每"
-"月……）目标是为指定的用户或者组成员创建的"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_rule_auth_user_ids
@@ -295,7 +266,7 @@ msgstr "授权用户"
 #. module: gamification
 #: selection:gamification.goal.definition,computation_mode:0
 msgid "Automatic: execute a specific Python code"
-msgstr "自动：执行一个特定的Python代码"
+msgstr "自动：执行特定Python代码"
 
 #. module: gamification
 #: selection:gamification.goal.definition,computation_mode:0
@@ -305,7 +276,7 @@ msgstr "自动：记录数"
 #. module: gamification
 #: selection:gamification.goal.definition,computation_mode:0
 msgid "Automatic: sum on a field"
-msgstr "自动:金额字段"
+msgstr "自动：字段加总"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_name
@@ -324,7 +295,7 @@ msgstr "徽章描述"
 #: model:mail.message.subtype,description:gamification.mt_badge_granted
 #: model:mail.message.subtype,name:gamification.mt_badge_granted
 msgid "Badge Granted"
-msgstr "授予徽章"
+msgstr "徽章授予"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.badge_list_view
@@ -351,8 +322,7 @@ msgid ""
 "end date of a challenge (if no periodicity is set) or when the challenge is "
 "manually closed."
 msgstr ""
-"当完成一个任务时授予一枚徽章，这是在一个运行周期结束时（如：最后的每月挑战"
-"月），在一个挑战的结束日期（如果没有周期性设置）或挑战时的手动关闭"
+"当完成一个任务时授予一枚徽章，这是在一个运行周期结束时（如：最后的每月挑战月），在一个挑战的结束日期（如果没有周期性设置）或挑战时的手动关闭"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_batch_mode
@@ -370,7 +340,7 @@ msgid "Can not grant"
 msgstr "不能授予"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:461
+#: code:addons/gamification/models/goal.py:410
 #, python-format
 msgid "Can not modify the configuration of a started goal"
 msgstr "不能修改一个已开始的目标配置"
@@ -383,13 +353,8 @@ msgstr "取消"
 
 #. module: gamification
 #: selection:gamification.goal,state:0
-#, fuzzy
 msgid "Canceled"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"已作废\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"已取消"
+msgstr "已取消"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
@@ -399,94 +364,47 @@ msgstr "类别"
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_challenge_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_challenge_id
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-#, fuzzy
 msgid "Challenge"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"任务\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"挑战"
-
-#. module: gamification
-#: model:ir.actions.act_window,name:gamification.challenge_wizard
-msgid "Challenge Description"
-msgstr "任务描述"
+msgstr "挑战"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_line_id
-#, fuzzy
 msgid "Challenge Line"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"任务行\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"挑战行"
+msgstr "挑战行"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_line_list_view
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-#, fuzzy
 msgid "Challenge Lines"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"任务行\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"挑战行"
+msgstr "挑战行"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_name
-#, fuzzy
 msgid "Challenge Name"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"任务名称\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"挑战名称"
+msgstr "挑战名称"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_challenge_id
-#, fuzzy
 msgid "Challenge originating"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"任务开始\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"挑战源于"
+msgstr "挑战源于"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_challenge_id
-#, fuzzy
 msgid ""
 "Challenge that generated the goal, assign challenge to users to generate "
 "goals with a value in this field."
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"已产生目标的任务，分配具体的目标任务给用户\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"已产生目标的挑战，分配具体的目标任务给用户"
+msgstr "已产生目标的挑战，分配具体的目标任务给用户"
 
 #. module: gamification
 #: model:ir.actions.act_window,name:gamification.challenge_list_action
 #: model:ir.ui.menu,name:gamification.gamification_challenge_menu
 #: model:ir.ui.view,arch_db:gamification.view_challenge_kanban
-#, fuzzy
 msgid "Challenges"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"任务\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"挑战"
+msgstr "挑战"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_rule_max
-#, fuzzy
 msgid "Check to set a monthly limit per person of sending this badge"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"检查设定每人每月限额发送此徽章\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"检查按人设定发放此徽章的月度限额"
+msgstr "检查按人设定发放此徽章的月度限额"
 
 #. module: gamification
 #: model:ir.actions.act_window,help:gamification.badge_list_action
@@ -510,23 +428,13 @@ msgstr "点击创建一个目标"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_definition_form_view
-#, fuzzy
 msgid "Clickable Goals"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"点击目标\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"可点击目标"
+msgstr "可点击目标"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_closed
-#, fuzzy
 msgid "Closed goal"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"关闭目标\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"关闭的目标"
+msgstr "关闭的目标"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_comment
@@ -545,25 +453,11 @@ msgid "Completeness"
 msgstr "完整性"
 
 #. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_computation_mode
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_computation_mode
 #: model:ir.ui.view,arch_db:gamification.goal_definition_search_view
-#, fuzzy
 msgid "Computation Mode"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"计算方式\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"计算模式"
-
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_computation_mode
-msgid "Computation mode"
-msgstr "计算方式"
-
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_condition
-msgid "Condition"
-msgstr "条件"
+msgstr "计算模式"
 
 #. module: gamification
 #: model:ir.actions.act_window,name:gamification.action_new_simplified_res_users
@@ -577,9 +471,7 @@ msgid ""
 "deactivated should there be a period of time during which they will/should "
 "not connect to the system. You can assign them groups in order to give them "
 "specific access to the applications they need to use in the system."
-msgstr ""
-"为系统创建和管理用户。在一段时间内用该系统的用户可以暂不激活。你还可以给用户"
-"分配某一个组，以便他们能用到系统的指定功能"
+msgstr "为系统创建和管理用户。在一段时间内用该系统的用户可以暂不激活。你还可以给用户分配某一个组，以便他们能用到系统的指定功能"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_create_date
@@ -605,13 +497,8 @@ msgstr "创建者"
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_create_date
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_create_date
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_create_date
-#, fuzzy
 msgid "Created on"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"创建时间\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"创建于"
+msgstr "创建于"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_create_uid
@@ -650,6 +537,7 @@ msgid "Define the visibility of the challenge through menus"
 msgstr "通过菜单定义的可见性的挑战"
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_goal_computation_mode
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_computation_mode
 msgid ""
 "Defined how will be computed the goals. The result of the operation will be "
@@ -657,12 +545,7 @@ msgid ""
 msgstr "定义将计算的目标，操作的结果将存储在“当前”"
 
 #. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3136
-msgid "Definition Condition"
-msgstr "定义条件"
-
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3145
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3039
 msgid "Definition Description"
 msgstr "定义说明"
 
@@ -673,13 +556,9 @@ msgstr "根据不同的显示模式，报告将是个人或共享"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
-#, fuzzy
-msgid "Describe the challenge: what is does, who it targets, why it matters..."
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"描述了挑战：什么是什么，谁是目标，它为什么重要\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"描述挑战：目标是什么，谁的目标，为什么重要..."
+msgid ""
+"Describe the challenge: what is does, who it targets, why it matters..."
+msgstr "描述挑战：目标是什么，谁的目标，为什么重要..."
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.view_badge_wizard_grant
@@ -694,7 +573,6 @@ msgstr "说明"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_visibility_mode
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display
 msgid "Display Mode"
 msgstr "显示模式"
 
@@ -711,6 +589,7 @@ msgid "Display Name"
 msgstr "显示名称"
 
 #. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display_mode
 msgid "Displayed as"
 msgstr "显示为"
@@ -722,17 +601,12 @@ msgstr "批处理用户的特有字段"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_domain
-#, fuzzy
 msgid ""
 "Domain for filtering records. General rule, not user depending, e.g. "
 "[('state', '=', 'done')]. The expression can contain reference to 'user' "
 "which is a browse record of the current user if not in batch mode."
 msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"域过滤记录。一般规则，不依赖用户，例如.[('state', '=', 'done')]。如果不是批处"
-"理模式，表达式可以包含当前用户的浏览记录的'user'参考。\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"用于过滤记录的领域。一般规则，不是用户依赖的，例如.[('state', '=', 'done')]. "
+"用于筛选记录的领域。一般规则，不是用户依赖的，例如.[('state', '=', 'done')]. "
 "如果不是在批处理模式下，该规则可以包含当前用户的浏览记录作为参考给“user”。"
 
 #. module: gamification
@@ -742,7 +616,8 @@ msgid "Done"
 msgstr "完成"
 
 #. module: gamification
-#: selection:gamification.challenge,state:0 selection:gamification.goal,state:0
+#: selection:gamification.challenge,state:0
+#: selection:gamification.goal,state:0
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
 msgid "Draft"
 msgstr "草稿"
@@ -751,13 +626,8 @@ msgstr "草稿"
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_end_date
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_end_date
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
-#, fuzzy
 msgid "End Date"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"终止日期\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"结束日期"
+msgstr "结束日期"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_batch_mode
@@ -766,23 +636,13 @@ msgstr "批量评估每个用户的表现"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_batch_user_expression
-msgid "Evaluted expression for batch mode"
-msgstr "评估表现批处理模式"
-
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Even if the challenge is failed, best challengers will be rewarded"
-msgstr "即使挑战失败，最好的挑战者也将被奖励"
+msgid "Evaluated expression for batch mode"
+msgstr ""
 
 #. module: gamification
 #: selection:gamification.badge,rule_auth:0
-#, fuzzy
 msgid "Everyone"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"全体\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"所有人"
+msgstr "所有人"
 
 #. module: gamification
 #: selection:gamification.goal.definition,display_mode:0
@@ -801,23 +661,13 @@ msgstr "字段总计"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_domain
-#, fuzzy
 msgid "Filter Domain"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"筛选域\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"筛选领域"
+msgstr "筛选域"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_reward_first_id
-#, fuzzy
 msgid "For 1st user"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"首位用户\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"第一位用户"
+msgstr "第一位用户"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_reward_second_id
@@ -866,33 +716,18 @@ msgstr "游戏化任务"
 
 #. module: gamification
 #: model:ir.model,name:gamification.model_gamification_challenge_line
-#, fuzzy
 msgid "Gamification generic goal for challenge"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"任务游戏化的一般目标\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"挑战的游戏化一般目标"
+msgstr "挑战的游戏化一般目标"
 
 #. module: gamification
 #: model:ir.model,name:gamification.model_gamification_goal_definition
-#, fuzzy
 msgid "Gamification goal definition"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"游戏化的目标定义\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"游戏化目标定义"
+msgstr "游戏化目标定义"
 
 #. module: gamification
 #: model:ir.model,name:gamification.model_gamification_goal
-#, fuzzy
 msgid "Gamification goal instance"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"游戏化的目标实例\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"游戏化目标实例"
+msgstr "游戏化目标实例"
 
 #. module: gamification
 #: model:ir.model,name:gamification.model_gamification_badge_user
@@ -908,7 +743,7 @@ msgstr "目标"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_id
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3147
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3041
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_name
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
 msgid "Goal Definition"
@@ -923,13 +758,8 @@ msgstr "目标定义"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description
-#, fuzzy
 msgid "Goal Description"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"目标描述\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"目标说明"
+msgstr "目标说明"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_form_view
@@ -942,14 +772,11 @@ msgid "Goal List"
 msgstr "目标清单"
 
 #. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_condition
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition
-#, fuzzy
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3030
 msgid "Goal Performance"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"目标性能\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"目标绩效"
+msgstr "目标绩效"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_form_view
@@ -968,7 +795,6 @@ msgstr "目标定义"
 #: model:ir.ui.menu,name:gamification.gamification_goal_menu
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
 #: model:ir.ui.view,arch_db:gamification.view_challenge_kanban
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
 msgid "Goals"
 msgstr "目标"
 
@@ -1023,13 +849,8 @@ msgstr "公司将接收报告的副本，除了用户"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_search_view
-#, fuzzy
 msgid "HR Challenges"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"人力资源任务\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"人力资源挑战"
+msgstr "人力资源挑战"
 
 #. module: gamification
 #: model:gamification.badge,name:gamification.badge_hidden
@@ -1042,6 +863,11 @@ msgid "How to compute the goal?"
 msgstr "如何计算目标？"
 
 #. module: gamification
+#: selection:gamification.challenge,category:0
+msgid "Human Resources / Engagement"
+msgstr ""
+
+#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_wizard_id
@@ -1050,13 +876,8 @@ msgstr "如何计算目标？"
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_id
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_id
-#, fuzzy
 msgid "ID"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"ID\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"标识"
+msgstr "ID"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_res_id_field
@@ -1065,8 +886,8 @@ msgstr "用户ID字段"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_remaining_sending
-msgid "If a maxium is set"
-msgstr "如果一个最大设置"
+msgid "If a maximum is set"
+msgstr ""
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_user_challenge_id
@@ -1088,17 +909,14 @@ msgstr "进行中"
 msgid ""
 "In batch mode, the domain is evaluated globally. If enabled, do not use "
 "keyword 'user' in above filter domain."
-msgstr ""
-"在批处理模式下，评估范围是全部，如果启用，不要在过滤字段使用关键词'user'"
+msgstr "在批处理模式下，评估范围是全部，如果启用，不要在筛选字段使用关键词'user'"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_batch_distinctive_field
 msgid ""
 "In batch mode, this indicates which field distinct one user form the other, "
 "e.g. user_id, partner_id..."
-msgstr ""
-"用批处理模式，这表明一个用户形式跟其它用户 有区别，例如.user_id, "
-"partner_id..."
+msgstr "用批处理模式，这表明一个用户形式跟其它用户 有区别，例如.user_id, partner_id..."
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_last_update
@@ -1106,9 +924,7 @@ msgid ""
 "In case of manual goal, reminders are sent if the goal as not been updated "
 "for a while (defined in challenge). Ignored in case of non-manual goal or "
 "goal not linked to a challenge."
-msgstr ""
-"如遇手动目标，提醒如果目标没有被更新，一会儿发（定义在挑战），忽略的情况下的"
-"非手动的目标或目标不与挑战"
+msgstr "如遇手动目标，提醒如果目标没有被更新，一会儿发（定义在挑战），忽略的情况下的非手动的目标或目标不与挑战"
 
 #. module: gamification
 #: selection:gamification.goal,state:0
@@ -1121,22 +937,12 @@ msgid "Individual Goals"
 msgstr "个人目标"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:338
-#, python-format
-msgid "Invalid return content from the evaluation of code for definition %s"
-msgstr "定义从诊断代码中返回的无效内容 %s"
-
-#. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_admin3
 #: model:gamification.goal.definition,name:gamification.definition_base_invite
 msgid "Invite new Users"
 msgstr "邀请新用户"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Invited"
-msgstr "邀请"
-
-#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge___last_update
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user___last_update
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_wizard___last_update
@@ -1145,13 +951,8 @@ msgstr "邀请"
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal___last_update
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition___last_update
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard___last_update
-#, fuzzy
 msgid "Last Modified on"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"最后修改时间\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"最后修改日"
+msgstr "最后修改日"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_last_report_date
@@ -1160,13 +961,8 @@ msgstr "最新报告日期"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_last_update
-#, fuzzy
 msgid "Last Update"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"最新更新\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"最近更新"
+msgstr "最近更新"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_wizard_write_uid
@@ -1177,13 +973,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_write_uid
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_write_uid
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_write_uid
-#, fuzzy
 msgid "Last Updated by"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"最后更新者\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"最后更新人"
+msgstr "最后更新人"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_wizard_write_date
@@ -1194,13 +985,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_write_date
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_write_date
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_write_date
-#, fuzzy
 msgid "Last Updated on"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"最后更新时间\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"最近更新时间"
+msgstr "最近更新时间"
 
 #. module: gamification
 #: selection:gamification.challenge,visibility_mode:0
@@ -1219,13 +1005,8 @@ msgstr "列表行"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_ids
-#, fuzzy
 msgid "Lines"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"行\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"明细行"
+msgstr "明细行"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_challenge_line_ids
@@ -1234,13 +1015,8 @@ msgstr "将要设置的目标列表"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_challenge_user_ids
-#, fuzzy
 msgid "List of users participating to the challenge"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"参与任务的用户列表\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"参与挑战的用户列表"
+msgstr "参与挑战的用户列表"
 
 #. module: gamification
 #: model:gamification.goal.definition,name:gamification.definition_nbr_following
@@ -1260,13 +1036,8 @@ msgstr "货币"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_monetary
-#, fuzzy
 msgid "Monetary Value"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"货币值\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"金钱值"
+msgstr "金钱值"
 
 #. module: gamification
 #: selection:gamification.challenge,period:0
@@ -1276,13 +1047,8 @@ msgstr "每月"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_rule_max
-#, fuzzy
 msgid "Monthly Limited Sending"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"每月有限的发送\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"月度限额发放"
+msgstr "月度限额发放"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_stat_this_month
@@ -1296,13 +1062,8 @@ msgstr "我的目标"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_stat_my_monthly_sending
-#, fuzzy
 msgid "My Monthly Sending Total"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"我每月发送的总数\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"月度发放总数"
+msgstr "月度发放总数"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_stat_my_this_month
@@ -1311,13 +1072,8 @@ msgstr "我的月份总计"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_stat_my
-#, fuzzy
 msgid "My Total"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"我的总数\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"我的总计"
+msgstr "我的总计"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_name
@@ -1326,13 +1082,8 @@ msgstr "名称"
 
 #. module: gamification
 #: selection:gamification.challenge,report_message_frequency:0
-#, fuzzy
 msgid "Never"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"不接收\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"从不"
+msgstr "从不"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_challenge_remind_update_delay
@@ -1346,13 +1097,8 @@ msgstr "下次报告日期"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.badge_form_view
-#, fuzzy
 msgid "No monthly sending limit"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"没有每月发送限制\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"没有月度发放限额"
+msgstr "没有月度发放限额"
 
 #. module: gamification
 #: model:gamification.badge,description:gamification.badge_problem_solver
@@ -1361,16 +1107,11 @@ msgstr "没有人能像你一样解决挑战"
 
 #. module: gamification
 #: selection:gamification.badge,rule_auth:0
-#, fuzzy
 msgid "No one, assigned through challenges"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"没有人完成已分配的任务\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"没有人完成已分配的挑战"
+msgstr "没有人完成已分配的挑战"
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:756
+#: code:addons/gamification/models/challenge.py:669
 #, python-format
 msgid "Nobody reached the required conditions to receive special badges."
 msgstr "没有人达到获得特殊徽章的要求"
@@ -1421,11 +1162,6 @@ msgid "Owners"
 msgstr "拥有者"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Participating"
-msgstr "参与"
-
-#. module: gamification
 #: selection:gamification.badge,rule_auth:0
 msgid "People having some badges"
 msgstr "有一些徽章的人"
@@ -1449,42 +1185,25 @@ msgstr "周期"
 
 #. module: gamification
 #: model:gamification.badge,name:gamification.badge_problem_solver
-#, fuzzy
 msgid "Problem Solver"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"解决问题的方法\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"问题解决者"
+msgstr "问题解决者"
 
 #. module: gamification
 #: selection:gamification.goal.definition,display_mode:0
-#, fuzzy
 msgid "Progressive (using numerical values)"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"逐行扫描（使用数值）\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"逐行（使用数值化值）"
+msgstr "逐行（使用数值化值）"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_compute_code
-#, fuzzy
 msgid "Python Code"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"Python代码\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"Python 代码"
+msgstr "Python 代码"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_compute_code
 msgid ""
 "Python code to be executed for each user. 'result' should contains the new "
 "current value. Evaluated user can be access through object.user_id."
-msgstr ""
-"Python代码必须为每个用户执行， 'result'，应包含新的当前值，评估的用户可以通过"
-"object.user_id访问。"
+msgstr "Python代码必须为每个用户执行， 'result'，应包含新的当前值，评估的用户可以通过object.user_id访问。"
 
 #. module: gamification
 #: selection:gamification.goal,state:0
@@ -1503,28 +1222,13 @@ msgstr "手动记录"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_form_view
-#, fuzzy
 msgid "Reference"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"引用\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"参考"
+msgstr "参考"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
-#, fuzzy
 msgid "Refresh Challenge"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"更新任务\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"刷新挑战"
-
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Reject"
-msgstr "拒绝"
+msgstr "刷新挑战"
 
 #. module: gamification
 #: model:ir.actions.act_window,name:gamification.goals_from_challenge_act
@@ -1532,6 +1236,11 @@ msgid "Related Goals"
 msgstr "相关目标"
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_badge_user_wizard_user_id
+msgid "Related user name for the resource to manage its access."
+msgstr "用于管理资源访问权限的用户名"
+
+#. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_remaining_sending
 msgid "Remaining Sending Allowed"
 msgstr "其他的允许发送"
@@ -1572,18 +1281,13 @@ msgid "Responsible"
 msgstr "负责人"
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:551
-#, fuzzy, python-format
+#: code:addons/gamification/models/challenge.py:489
+#, python-format
 msgid "Retrieving progress for personal challenge without user information"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"正在检索个人任务的进度，无需用户信息\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"正在检索个人挑战的进度，无需用户信息"
+msgstr "正在检索个人挑战的进度，无需用户信息"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
 msgid "Reward"
 msgstr "奖励"
 
@@ -1599,13 +1303,8 @@ msgstr "每完成一个目标就马上奖励"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_challenge_ids
-#, fuzzy
 msgid "Reward of Challenges"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"任务奖励\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"挑战的奖励"
+msgstr "挑战的奖励"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_goal_definition_ids
@@ -1614,13 +1313,8 @@ msgstr "奖励按照"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.badge_form_view
-#, fuzzy
 msgid "Rewards for challenges"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"任务奖励\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"挑战的奖励"
+msgstr "挑战的奖励"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_search_view
@@ -1629,13 +1323,8 @@ msgstr "运行中"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_search_view
-#, fuzzy
 msgid "Running Challenges"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"运行中的任务\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"运行中的挑战"
+msgstr "运行中的挑战"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_form_view
@@ -1644,13 +1333,8 @@ msgstr "安排"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_search_view
-#, fuzzy
 msgid "Search Challenges"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"搜索任务\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"搜索挑战"
+msgstr "搜索挑战"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_definition_search_view
@@ -1700,21 +1384,29 @@ msgid "Set the current value you have reached for this goal"
 msgstr "设置你已经达到这个目标的当前值"
 
 #. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_admin1
 #: model:gamification.goal.definition,name:gamification.definition_base_company_data
 msgid "Set your Company Data"
 msgstr "设置你的公司数据"
 
 #. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_admin2
 #: model:gamification.goal.definition,name:gamification.definition_base_company_logo
 msgid "Set your Company Logo"
 msgstr "设置您的公司LOGO徽标"
 
 #. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_discover1
 #: model:gamification.goal.definition,name:gamification.definition_base_timezone
 msgid "Set your Timezone"
 msgstr "设置您的时区"
 
 #. module: gamification
+#: selection:gamification.challenge,category:0
+msgid "Settings / Gamification Tools"
+msgstr ""
+
+#. module: gamification
 #: model:gamification.challenge,name:gamification.challenge_base_configure
 msgid "Setup your Company"
 msgstr "公司资料设置"
@@ -1756,7 +1448,7 @@ msgstr "订阅"
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_full_suffix
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3141
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3035
 msgid "Suffix"
 msgstr "后缀"
 
@@ -1767,13 +1459,8 @@ msgstr "建议用户"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_target_goal
-#, fuzzy
 msgid "Target Value to Reach"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"达到目标值\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"要达到的目标值"
+msgstr "要达到的目标值"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_kanban_view
@@ -1786,13 +1473,15 @@ msgid "The action that will be called to update the goal value."
 msgstr "将被调用来更新目标值的动作"
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:740
+#: code:addons/gamification/models/challenge.py:648
 #, python-format
 msgid "The challenge %s is finished."
 msgstr "我们面临的挑战 %s 已完成"
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_full_suffix
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_full_suffix
+#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix_3035
 msgid "The currency and suffix field"
 msgstr "币种和后缀字段"
 
@@ -1803,17 +1492,10 @@ msgstr "用于评估的时间段的日期"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_challenge_end_date
-#, fuzzy
 msgid ""
 "The day a new challenge will be automatically closed. If no periodicity is "
 "set, will use this date as the goal end date."
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"一天一个新的任务将自动关闭。如果没有周期性设置，将使用此日期为目标的结束日"
-"期。\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"一天一个新的挑战将自动关闭。如果没有周期性设置，将使用此日期为目标的关闭日"
-"期。"
+msgstr "一天一个新的挑战将自动关闭。如果没有周期性设置，将使用此日期为目标的关闭日期。"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_challenge_start_date
@@ -1823,18 +1505,13 @@ msgid ""
 msgstr "新挑战自动开始日期。如果没有周期性设置，将此日期作为为目标开始日期。"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:129
-#, fuzzy, python-format
+#: code:addons/gamification/models/goal.py:90
+#, python-format
 msgid ""
 "The domain for the definition %s seems incorrect, please check it.\n"
 "\n"
 "%s"
 msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"定义 %s 的域貌似不正确，请检查它。\n"
-"\n"
-"%s\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
 "定义 %s 的领域貌似不正确，请检查它。\n"
 "\n"
 "%s"
@@ -1873,15 +1550,15 @@ msgstr "越低越好"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_rule_max_number
-msgid "The maximum number of time this badge can be sent per month per person."
+msgid ""
+"The maximum number of time this badge can be sent per month per person."
 msgstr "这个徽章可以给每人每月最大时间数"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:146
+#: code:addons/gamification/models/goal.py:107
 #, python-format
 msgid ""
-"The model configuration for the definition %s seems incorrect, please check "
-"it.\n"
+"The model configuration for the definition %s seems incorrect, please check it.\n"
 "\n"
 "%s not found"
 msgstr ""
@@ -1890,11 +1567,10 @@ msgstr ""
 "%s 未找到"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:143
+#: code:addons/gamification/models/goal.py:104
 #, python-format
 msgid ""
-"The model configuration for the definition %s seems incorrect, please check "
-"it.\n"
+"The model configuration for the definition %s seems incorrect, please check it.\n"
 "\n"
 "%s not stored"
 msgstr ""
@@ -1912,12 +1588,12 @@ msgstr "为评估本领域的模型对象"
 msgid ""
 "The number of days after which the user assigned to a manual goal will be "
 "reminded. Never reminded if no value is specified."
-msgstr ""
-"数天之后，分配到一个手动目标的用户将被提醒。如果没有指定值永远不会提醒。"
+msgstr "数天之后，分配到一个手动目标的用户将被提醒。如果没有指定值永远不会提醒。"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge_stat_my_this_month
-msgid "The number of time the current user has received this badge this month."
+msgid ""
+"The number of time the current user has received this badge this month."
 msgstr "本月当前用户已收到时间这个徽章的数量"
 
 #. module: gamification
@@ -1946,16 +1622,13 @@ msgid "The number of time this badge has been received."
 msgstr "这个徽章已收到的时间数"
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_monetary
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_monetary
-#, fuzzy
 msgid "The target and current value are defined in the company currency."
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"公司的目标和当前货币定义的值\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"目标和当前值以公司货币定义。"
+msgstr "目标和当前值以公司货币定义。"
 
 #. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_suffix
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix
 msgid "The unit of the target and current values"
 msgstr "单元目标和当前值"
@@ -1981,26 +1654,17 @@ msgstr "这些目标已经成功的用户会自动的收到徽章"
 #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_batch_user_expression
 msgid ""
 "The value to compare with the distinctive field. The expression can contain "
-"reference to 'user' which is a browse record of the current user, e.g. user."
-"id, user.partner_id.id..."
-msgstr ""
-"独特字段与数值进行比较。该规则可以包含当前用户的浏览记录作为参考给“user”，如."
+"reference to 'user' which is a browse record of the current user, e.g. "
 "user.id, user.partner_id.id..."
+msgstr ""
+"独特字段与数值进行比较。该规则可以包含当前用户的浏览记录作为参考给“user”，如.user.id, user.partner_id.id..."
 
 #. module: gamification
 #: model:ir.actions.act_window,help:gamification.goals_from_challenge_act
 msgid ""
 "There is no goals associated to this challenge matching your search.\n"
-"                Make sure that your challenge is active and assigned to at "
-"least one user."
+"            Make sure that your challenge is active and assigned to at least one user."
 msgstr ""
-"没有和这个挑战相关的目标匹配你的搜索\n"
-"确保你的挑战是激活的并且分配给至少一个用户"
-
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "There is no reward upon completion of this challenge."
-msgstr "有这种挑战完成后没有奖励"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_closed
@@ -2008,7 +1672,7 @@ msgid "These goals will not be recomputed."
 msgstr "这些目标将不会被重新计算"
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:223
+#: code:addons/gamification/models/badge.py:213
 #, python-format
 msgid "This badge can not be sent by users."
 msgstr "这个徽章不能发送的用户"
@@ -2020,13 +1684,8 @@ msgstr "这一领域的图像用于徽章,仅限于256 x256"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_kanban_view
-#, fuzzy
 msgid "To"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"到\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"至"
+msgstr "至"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_target_goal
@@ -2050,13 +1709,8 @@ msgstr "唯一的所有者"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_suffix
-#, fuzzy
 msgid "Unit"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"单件\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"单位"
+msgstr "单位"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.view_goal_wizard_update_current
@@ -2064,7 +1718,7 @@ msgid "Update"
 msgstr "更新"
 
 #. module: gamification
-#: code:addons/gamification/models/goal.py:495
+#: code:addons/gamification/models/goal.py:445
 #, python-format
 msgid "Update %s"
 msgstr "更新  %s"
@@ -2079,21 +1733,20 @@ msgstr "用户"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_user_domain
-#, fuzzy
 msgid "User domain"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"用户域\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"用户领域"
+msgstr "用户领域"
 
 #. module: gamification
-#: model:ir.model,name:gamification.model_res_users
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_user_ids
 msgid "Users"
 msgstr "用户"
 
 #. module: gamification
+#: selection:gamification.challenge,category:0
+msgid "Website / Forum"
+msgstr ""
+
+#. module: gamification
 #: selection:gamification.challenge,period:0
 #: selection:gamification.challenge,report_message_frequency:0
 msgid "Weekly"
@@ -2114,8 +1767,7 @@ msgstr "你希望谁来奖励？"
 msgid ""
 "With this option enabled, a user can receive a badge only once. The top 3 "
 "badges are still rewarded only at the end of the challenge."
-msgstr ""
-"启用此选项，一个用户可以一次获得一枚徽章。前3枚徽章只有在任务结束时才能奖励"
+msgstr "启用此选项，一个用户可以一次获得一枚徽章。前3枚徽章只有在任务结束时才能奖励"
 
 #. module: gamification
 #: model:gamification.badge,description:gamification.badge_idea
@@ -2129,19 +1781,19 @@ msgid "Yearly"
 msgstr "每年"
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:225
+#: code:addons/gamification/models/badge.py:215
 #, python-format
 msgid "You are not in the user allowed list."
 msgstr "你是不是在用户允许列表中"
 
 #. module: gamification
-#: code:addons/gamification/wizard/grant_badge.py:26
+#: code:addons/gamification/wizard/grant_badge.py:24
 #, python-format
 msgid "You can not grant a badge to yourself"
 msgstr "你不能自己授予自己一个徽章"
 
 #. module: gamification
-#: code:addons/gamification/models/challenge.py:235
+#: code:addons/gamification/models/challenge.py:195
 #, python-format
 msgid "You can not reset a challenge with unfinished goals."
 msgstr "你不能重新设置一个带有未完成目标的挑战"
@@ -2157,13 +1809,13 @@ msgid "You did great at your job."
 msgstr "你的工作做的很好"
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:227
+#: code:addons/gamification/models/badge.py:217
 #, python-format
 msgid "You do not have the required badges."
 msgstr "您没有必要的徽章"
 
 #. module: gamification
-#: code:addons/gamification/models/badge.py:229
+#: code:addons/gamification/models/badge.py:219
 #, python-format
 msgid "You have already sent this badge too many time this month."
 msgstr "您已经在本月太多的时间发送这个徽章"
@@ -2186,44 +1838,25 @@ msgstr "天"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.challenge_form_view
-#, fuzzy
 msgid "e.g. Monthly Sales Objectives"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"例如月度销售目标\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"例如，月度销售目标"
+msgstr "例如，月度销售目标"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_definition_form_view
-#, fuzzy
 msgid "e.g. days"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"如.天\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"例如，天数"
+msgstr "例如，天数"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_definition_form_view
 msgid ""
-"e.g. result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', "
-"'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)], "
-"count=True, context=context)"
+"e.g. result = env['mail.followers'].search_count([('res_model', '=', "
+"'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)])"
 msgstr ""
-"e.g. result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', "
-"'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)], "
-"count=True, context=context)"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_definition_form_view
-#, fuzzy
 msgid "e.g. user.partner_id.id"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Odoo 9.0)  #-#-#-#-#\n"
-"例如 user.partner_id.id\n"
-"#-#-#-#-#  zh_CN.po (Odoo Server 10.0alpha1e)  #-#-#-#-#\n"
-"例如，user.partner_id.id"
+msgstr "例如，user.partner_id.id"
 
 #. module: gamification
 #: model:ir.model,name:gamification.model_gamification_badge_user_wizard
@@ -2246,11 +1879,6 @@ msgid "refresh"
 msgstr "刷新"
 
 #. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "reply later"
-msgstr "以后答复"
-
-#. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_form_view
 msgid "than the target."
 msgstr "比目标"
@@ -2264,225 +1892,3 @@ msgstr "于"
 #: model:ir.ui.view,arch_db:gamification.badge_kanban_view
 msgid "this month"
 msgstr "本月"
-
-#~ msgid ""
-#~ "\n"
-#~ "    <header>\n"
-#~ "        <strong>Reminder ${object.name}</strong>\n"
-#~ "    </header>\n"
-#~ "    \n"
-#~ "    <p>You have not updated your progress for the goal ${object."
-#~ "definition_id.name} (currently reached at ${object.completeness}%) for at "
-#~ "least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
-#~ "            "
-#~ msgstr ""
-#~ "\n"
-#~ "<header>\n"
-#~ "        <strong>提醒 ${object.name}</strong>\n"
-#~ "    </header>\n"
-#~ "    \n"
-#~ "    <p> 最近 ${object.remind_update_delay} 天内，你没有更新你的目标进度 "
-#~ "${object.definition_id.name} (当前完成 ${object.completeness}%)。 不要忘记"
-#~ "去做。</p>\n"
-#~ "            "
-
-#~ msgid ""
-#~ "\n"
-#~ "<header>\n"
-#~ "    <strong>${object.name}</strong>\n"
-#~ "</header>\n"
-#~ "<p class=\"oe_grey\">The following message contains the current progress "
-#~ "for the challenge ${object.name}</p>\n"
-#~ "\n"
-#~ "% if object.visibility_mode == 'personal':\n"
-#~ "    <table width=\"100%\" border=\"1\">\n"
-#~ "    <tr>\n"
-#~ "        <th>Goal</th>\n"
-#~ "        <th>Target</th>\n"
-#~ "        <th>Current</th>\n"
-#~ "        <th>Completeness</th>\n"
-#~ "    </tr>\n"
-#~ "    % for line in ctx[\"challenge_lines\"]:\n"
-#~ "        <tr\n"
-#~ "            % if line['completeness'] >= 100:\n"
-#~ "                style=\"font-weight:bold;\"\n"
-#~ "            % endif\n"
-#~ "            >\n"
-#~ "            <td>${line['name']}</td>\n"
-#~ "            <td>${line['target']}\n"
-#~ "            % if line['suffix']:\n"
-#~ "                ${line['suffix']}\n"
-#~ "            % endif\n"
-#~ "            </td>\n"
-#~ "            <td>${line['current']}\n"
-#~ "            % if line['suffix']:\n"
-#~ "                ${line['suffix']}\n"
-#~ "            % endif\n"
-#~ "            </td>\n"
-#~ "            <td>${line['completeness']} %</td>\n"
-#~ "        </tr>\n"
-#~ "    % endfor\n"
-#~ "    </table>\n"
-#~ "% else:\n"
-#~ "    % for line in ctx[\"challenge_lines\"]:\n"
-#~ "        <table width=\"100%\" border=\"1\">\n"
-#~ "            <tr>\n"
-#~ "                <th colspan=\"4\">${line['name']}</th>\n"
-#~ "            </tr>\n"
-#~ "            <tr>\n"
-#~ "                <th>#</th>\n"
-#~ "                <th>Person</th>\n"
-#~ "                <th>Completeness</th>\n"
-#~ "                <th>Current</th>\n"
-#~ "            </tr>\n"
-#~ "            % for goal in line['goals']:\n"
-#~ "                <tr\n"
-#~ "                    % if goal.completeness >= 100:\n"
-#~ "                        style=\"font-weight:bold;\"\n"
-#~ "                    % endif\n"
-#~ "                    >\n"
-#~ "                    <td>${goal['rank']}</td>\n"
-#~ "                    <td>${goal['name']}</td>\n"
-#~ "                    <td>${goal['completeness']}%</td>\n"
-#~ "                    <td>${goal['current']}/${line['target']}\n"
-#~ "                    % if line['suffix']:\n"
-#~ "                        ${line['suffix']}\n"
-#~ "                    % endif\n"
-#~ "                    </td>\n"
-#~ "                </tr>\n"
-#~ "            % endfor\n"
-#~ "        </table>\n"
-#~ "\n"
-#~ "        <br/><br/>\n"
-#~ "\n"
-#~ "    % endfor\n"
-#~ "% endif\n"
-#~ "            "
-#~ msgstr ""
-#~ "\n"
-#~ "<header>\n"
-#~ "    <strong>${object.name}</strong>\n"
-#~ "</header>\n"
-#~ "<p class=\"oe_grey\">下面的信息包含了任务的当前进度 ${object.name}</p>\n"
-#~ "\n"
-#~ "% if object.visibility_mode == 'personal':\n"
-#~ "    <table width=\"100%\" border=\"1\">\n"
-#~ "    <tr>\n"
-#~ "        <th>总目标</th>\n"
-#~ "        <th>目标</th>\n"
-#~ "        <th>当前</th>\n"
-#~ "        <th>完整性</th>\n"
-#~ "    </tr>\n"
-#~ "    % for line in ctx[\"challenge_lines\"]:\n"
-#~ "        <tr\n"
-#~ "            % if line['completeness'] >= 100:\n"
-#~ "                style=\"font-weight:bold;\"\n"
-#~ "            % endif\n"
-#~ "            >\n"
-#~ "            <td>${line['name']}</td>\n"
-#~ "            <td>${line['target']}\n"
-#~ "            % if line['suffix']:\n"
-#~ "                ${line['suffix']}\n"
-#~ "            % endif\n"
-#~ "            </td>\n"
-#~ "            <td>${line['current']}\n"
-#~ "            % if line['suffix']:\n"
-#~ "                ${line['suffix']}\n"
-#~ "            % endif\n"
-#~ "            </td>\n"
-#~ "            <td>${line['completeness']} %</td>\n"
-#~ "        </tr>\n"
-#~ "    % endfor\n"
-#~ "    </table>\n"
-#~ "% else:\n"
-#~ "    % for line in ctx[\"challenge_lines\"]:\n"
-#~ "        <table width=\"100%\" border=\"1\">\n"
-#~ "            <tr>\n"
-#~ "                <th colspan=\"4\">${line['name']}</th>\n"
-#~ "            </tr>\n"
-#~ "            <tr>\n"
-#~ "                <th>#</th>\n"
-#~ "                <th>个人</th>\n"
-#~ "                <th>完整性</th>\n"
-#~ "                <th>当前</th>\n"
-#~ "            </tr>\n"
-#~ "            % for goal in line['goals']:\n"
-#~ "                <tr\n"
-#~ "                    % if goal.completeness >= 100:\n"
-#~ "                        style=\"font-weight:bold;\"\n"
-#~ "                    % endif\n"
-#~ "                    >\n"
-#~ "                    <td>${goal['rank']}</td>\n"
-#~ "                    <td>${goal['name']}</td>\n"
-#~ "                    <td>${goal['completeness']}%</td>\n"
-#~ "                    <td>${goal['current']}/${line['target']}\n"
-#~ "                    % if line['suffix']:\n"
-#~ "                        ${line['suffix']}\n"
-#~ "                    % endif\n"
-#~ "                    </td>\n"
-#~ "                </tr>\n"
-#~ "            % endfor\n"
-#~ "        </table>\n"
-#~ "\n"
-#~ "        <br/><br/>\n"
-#~ "\n"
-#~ "    % endfor\n"
-#~ "% endif\n"
-#~ "            "
-
-#~ msgid "Action Needed"
-#~ msgstr "所需行动"
-
-#~ msgid "Date of the last message posted on the record."
-#~ msgstr "发布到记录上的最后消息的日期"
-
-#~ msgid "Followers"
-#~ msgstr "关注者"
-
-#~ msgid "Followers (Channels)"
-#~ msgstr "关注者(频道)"
-
-#~ msgid "Followers (Partners)"
-#~ msgstr "关注者（业务伙伴）"
-
-#~ msgid "For Every Succeding User"
-#~ msgstr "每一位成功的用户"
-
-#~ msgid "If checked new messages require your attention."
-#~ msgstr "查看是否有需要留意的新信息。"
-
-#~ msgid "If checked, new messages require your attention."
-#~ msgstr "确认后, 会出现新消息."
-
-#~ msgid "Inherited models"
-#~ msgstr "继承的模块"
-
-#~ msgid "Is Follower"
-#~ msgstr "是关注者"
-
-#~ msgid "Last Message Date"
-#~ msgstr "最后消息日期"
-
-#~ msgid "Messages"
-#~ msgstr "消息"
-
-#~ msgid "Messages and communication history"
-#~ msgstr "消息和通信历史"
-
-#~ msgid "Number of Actions"
-#~ msgstr "动作的序列号"
-
-#~ msgid "Number of messages which requires an action"
-#~ msgstr "需要动作的消息编号"
-
-#~ msgid "Number of unread messages"
-#~ msgstr "未读的消息数量"
-
-#~ msgid "Unread Messages"
-#~ msgstr "未读消息"
-
-#~ msgid "Unread Messages Counter"
-#~ msgstr "未读消息计数器"
-
-#~ msgid "Related user name for the resource to manage its access."
-#~ msgstr "用于管理资源访问权限的用户名"