diff --git a/addons/analytic_contract_hr_expense/i18n/ja.po b/addons/analytic_contract_hr_expense/i18n/ja.po
new file mode 100644
index 00000000000..3be80b97079
--- /dev/null
+++ b/addons/analytic_contract_hr_expense/i18n/ja.po
@@ -0,0 +1,72 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2014-02-21 02:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:39+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "or view"
+msgstr "または参照"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "Nothing to invoice, create"
+msgstr ""
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "expenses"
+msgstr "経費"
+
+#. module: analytic_contract_hr_expense
+#: model:ir.model,name:analytic_contract_hr_expense.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "分析勘定"
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:144
+#, python-format
+msgid "Expenses to Invoice of %s"
+msgstr ""
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:136
+#, python-format
+msgid "Expenses of %s"
+msgstr "%sの経費"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,expense_invoiced:0
+#: field:account.analytic.account,expense_to_invoice:0
+#: field:account.analytic.account,remaining_expense:0
+msgid "unknown"
+msgstr "不明"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,est_expenses:0
+msgid "Estimation of Expenses to Invoice"
+msgstr "請求対象経費見込"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,charge_expenses:0
+msgid "Charge Expenses"
+msgstr "経費請求"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "⇒ Invoice"
+msgstr "⇒ 請求"
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 6bb8e2700d4..1abcdac9712 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -146,6 +146,7 @@
         <!-- CRM-related subtypes for messaging / Chatter -->
         <record id="mt_lead_create" model="mail.message.subtype">
             <field name="name">Lead Created</field>
+            <field name="hidden" eval="True"/>
             <field name="res_model">crm.lead</field>
             <field name="default" eval="False"/>
             <field name="description">Lead created</field>
@@ -171,6 +172,7 @@
         <!-- Salesteam-related subtypes for messaging / Chatter -->
         <record id="mt_salesteam_lead" model="mail.message.subtype">
             <field name="name">Lead Created</field>
+            <field name="sequence">10</field>
             <field name="res_model">crm.case.section</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_lead_create')"/>
@@ -178,18 +180,21 @@
         </record>
         <record id="mt_salesteam_lead_stage" model="mail.message.subtype">
             <field name="name">Opportunity Stage Changed</field>
+            <field name="sequence">11</field>
             <field name="res_model">crm.case.section</field>
             <field name="parent_id" eval="ref('mt_lead_stage')"/>
             <field name="relation_field">section_id</field>
         </record>
         <record id="mt_salesteam_lead_won" model="mail.message.subtype">
             <field name="name">Opportunity Won</field>
+            <field name="sequence">12</field>
             <field name="res_model">crm.case.section</field>
             <field name="parent_id" eval="ref('mt_lead_won')"/>
             <field name="relation_field">section_id</field>
         </record>
         <record id="mt_salesteam_lead_lost" model="mail.message.subtype">
             <field name="name">Opportunity Lost</field>
+            <field name="sequence">13</field>
             <field name="res_model">crm.case.section</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_lead_lost')"/>
diff --git a/addons/gamification/i18n.moved/gamification.pot b/addons/gamification/i18n.moved/gamification.pot
deleted file mode 100644
index 0ef4cdbea64..00000000000
--- a/addons/gamification/i18n.moved/gamification.pot
+++ /dev/null
@@ -1,1733 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* gamification
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 8.0alpha1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-13 15:08+0000\n"
-"PO-Revision-Date: 2014-02-13 15:08+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Search Goals"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.goal.definition,name:gamification.definition_base_company_data
-msgid "Set your Company Data"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,report_message_frequency:0
-msgid "Never"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,computation_mode:0
-msgid "Defined how will be computed the goals. The result of the operation will be stored in the field 'Current'."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: view:gamification.goal:0
-#: field:gamification.goal.wizard,goal_id:0
-msgid "Goal"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,period:0
-msgid "Non recurring"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,next_report_date:0
-msgid "Next Report Date"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,monetary:0
-msgid "Monetary Value"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "My Goals"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal.definition,condition:0
-msgid "The lower the better"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge.user.wizard:0
-#: view:gamification.goal.wizard:0
-msgid "Grant Badge To"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,stat_count_distinct:0
-msgid "The number of time this badge has been received by unique users."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,unique_owner_ids:0
-msgid "The list of unique users having received this badge."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: view:gamification.goal:0
-#: view:gamification.goal.definition:0
-msgid "Group By..."
-msgstr ""
-
-#. module: gamification
-#: model:gamification.challenge,name:gamification.challenge_base_configure
-msgid "Setup your Company"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "/∞"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/wizard/grant_badge.py:44
-#, python-format
-msgid "You can not grant a badge to yourself"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal,completeness:0
-msgid "Completeness"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,field_date_id:0
-msgid "Date Field"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,stat_my_this_month:0
-msgid "The number of time the current user has received this badge this month."
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge.line,condition:0
-msgid ">="
-msgstr ""
-
-#. module: gamification
-#: model:ir.actions.act_window,name:gamification.challenge_wizard
-msgid "Challenge Description"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model,name:gamification.model_gamification_badge_user_wizard
-msgid "gamification.badge.user.wizard"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Reward"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,message_ids:0
-#: help:gamification.challenge,message_ids:0
-#: help:gamification.goal,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,category:0
-msgid "Define the visibility of the challenge through menus"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Refresh Challenge"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model,name:gamification.model_gamification_challenge_line
-msgid "Gamification generic goal for challenge"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.definition:0
-msgid "e.g. result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', 'mail.group'), ('partner_id', '=', object.user_id.partner_id.id)], count=True, context=context)"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge.line,definition_monetary:0
-msgid "Monetary"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal,state:0
-msgid "In progress (to update)"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model,name:gamification.model_gamification_goal_definition
-msgid "Gamification goal definition"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,remaining_sending:0
-msgid "If a maxium is set"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,invited_user_ids:0
-msgid "Suggest to users"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: model:ir.actions.act_window,name:gamification.goal_list_action
-#: model:ir.ui.menu,name:gamification.gamification_goal_menu
-msgid "Goals"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Badge Description"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "than the target."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-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 ""
-
-#. module: gamification
-#: help:gamification.challenge,manager_id:0
-msgid "The user responsible for the challenge."
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/goal.py:385
-#, python-format
-msgid "Update %s"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,description:0
-msgid "Goal Description"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "this month"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,owner_ids:0
-msgid "Owners"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge.user,sender_id:0
-msgid "Sender"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,stat_my_this_month:0
-msgid "My Monthly Total"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,remind_update_delay:0
-msgid "Never reminded if no value or zero is specified."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: field:gamification.challenge.line,challenge_id:0
-#: field:gamification.goal,challenge_id:0
-msgid "Challenge"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,condition:0
-msgid "Goal Performance"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,message_ids:0
-#: field:gamification.challenge,message_ids:0
-#: field:gamification.goal,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "badges this month"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:517
-#: code:addons/gamification/models/goal.py:351
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,line_ids:0
-msgid "Lines"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge.user:0
-msgid "Granted by"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,stat_count_distinct:0
-msgid "Number of users"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,message_unread:0
-#: help:gamification.challenge,message_unread:0
-#: help:gamification.goal,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: gamification
-#: model:ir.actions.act_window,name:gamification.action_new_simplified_res_users
-msgid "Create User"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,period:0
-#: selection:gamification.challenge,report_message_frequency:0
-msgid "Yearly"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.badge,rule_auth:0
-msgid "People having some badges"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "granted,"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge.line,definition_full_suffix:0
-#: field:gamification.goal,definition_suffix:0
-#: field:gamification.goal.definition,suffix:0
-msgid "Suffix"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Reference"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,autojoin_group_id:0
-msgid "Auto-subscription Group"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "refresh"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Even if the challenge is failed, best challengers will be rewarded"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,reward_id:0
-msgid "For Every Succeding User"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge.line,target_goal:0
-msgid "Target Value to Reach"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,start_date:0
-msgid "The day a new challenge will be automatically started. If no periodicity is set, will use this date as the goal start date."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Notification Messages"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,manager_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: gamification
-#. openerp-web
-#: code:addons/gamification/static/src/xml/gamification.xml:108
-#, python-format
-msgid "more details..."
-msgstr ""
-
-#. module: gamification
-#: model:ir.actions.act_window,name:gamification.badge_list_action
-#: model:ir.ui.menu,name:gamification.gamification_badge_menu
-msgid "Badges"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,rule_auth_badge_ids:0
-msgid "Only the people having these badges can give this badge"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal.definition,computation_mode:0
-msgid "Recorded manually"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Statistics"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "From"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Granting"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Grant"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.definition:0
-msgid "e.g. days"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge.line,definition_id:0
-#: view:gamification.goal:0
-#: field:gamification.goal,definition_id:0
-#: field:gamification.goal.definition,name:0
-msgid "Goal Definition"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge.line,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal,state:0
-msgid "Failed"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: field:gamification.challenge,state:0
-#: view:gamification.goal:0
-#: field:gamification.goal,state:0
-msgid "State"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,message_follower_ids:0
-#: field:gamification.challenge,message_follower_ids:0
-#: field:gamification.goal,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,reward_first_id:0
-msgid "For 1st user"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Can not grant"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,message_unread:0
-#: field:gamification.challenge,message_unread:0
-#: field:gamification.goal,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,display_mode:0
-msgid "Displayed as"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-#: field:gamification.badge,name:0
-#: field:gamification.badge.user,badge_id:0
-#: field:gamification.badge.user.wizard,badge_id:0
-msgid "Badge"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,suffix:0
-msgid "The unit of the target and current values"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: model:ir.actions.act_window,name:gamification.goals_from_challenge_act
-msgid "Related Goals"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Subscriptions"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge.user.wizard:0
-#: model:ir.actions.act_window,name:gamification.action_grant_wizard
-msgid "Grant Badge"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:683
-#, python-format
-msgid "<br/>Reward (badge %s) for every succeeding user was sent to %s."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,message_summary:0
-#: help:gamification.challenge,message_summary:0
-#: help:gamification.goal,message_summary:0
-msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views."
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,report_message_group_id:0
-msgid "Send a copy to"
-msgstr ""
-
-#. module: gamification
-#: model:ir.actions.act_window,help:gamification.challenge_list_action
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-"                    Click to create a challenge. \n"
-"                </p>\n"
-"                <p>\n"
-"                    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.\n"
-"                </p>\n"
-"            "
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:695
-#, python-format
-msgid "Nobody reached the required conditions to receive special badges."
-msgstr ""
-
-#. module: gamification
-#. openerp-web
-#: code:addons/gamification/static/src/xml/gamification.xml:35
-#: code:addons/gamification/static/src/xml/gamification.xml:57
-#, python-format
-msgid "Target: <="
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Reminders for Manual Goals"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/goal.py:265
-#, python-format
-msgid "Invalid return content from the evaluation of %s"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.definition:0
-#: field:gamification.goal.definition,computation_mode:0
-msgid "Computation Mode"
-msgstr ""
-
-#. module: gamification
-#: model:email.template,body_html:gamification.simple_report_template
-msgid "<header><strong>${object.name}</strong>\n"
-"</header><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\"><tr><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 if line>= 100:\n"
-"                style=\"font-weight:bold;\"\n"
-"            % endif\n"
-"            &gt;\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\"><tr><th colspan=\"4\">${line['name']}</th>\n"
-"            </tr><tr><th>#</th>\n"
-"                <th>Person</th>\n"
-"                <th>Completeness</th>\n"
-"                <th>Current</th>\n"
-"            </tr>\n"
-"            % for goal in line['goals']:\n"
-"                <tr if goal.completeness>= 100:\n"
-"                        style=\"font-weight:bold;\"\n"
-"                    % endif\n"
-"                    &gt;\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><br><br>\n"
-"\n"
-"    % endfor\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,condition:0
-msgid "A goal is considered as completed when the current value is compared to the value to reach"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,remind_update_delay:0
-msgid "Non-updated manual goals will be reminded after"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,full_suffix:0
-msgid "The currency and suffix field"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal.definition,display_mode:0
-msgid "Exclusive (done or not-done)"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/badge.py:223
-#: code:addons/gamification/models/badge.py:225
-#: code:addons/gamification/models/badge.py:227
-#: code:addons/gamification/models/badge.py:229
-#: code:addons/gamification/wizard/grant_badge.py:44
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal,last_update:0
-msgid "Last Update"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,report_message_frequency:0
-msgid "Report Frequency"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,field_id:0
-msgid "The field containing the value to evaluate"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,end_date:0
-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 ""
-
-#. module: gamification
-#: field:gamification.badge.user,create_date:0
-msgid "Created"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.badge,name:gamification.badge_idea
-msgid "Brilliant"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,visibility_mode:0
-msgid "Individual Goals"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Invited"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,report_message_frequency:0
-msgid "On change"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,period:0
-#: selection:gamification.challenge,report_message_frequency:0
-msgid "Daily"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: view:gamification.goal.definition:0
-msgid "Goal definitions"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Participating"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,rule_auth:0
-msgid "Who can grant this badge"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,last_report_date:0
-msgid "Last Report Date"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal.definition,computation_mode:0
-msgid "Automatic: execute a specific Python code"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model,name:gamification.model_gamification_goal_wizard
-msgid "gamification.goal.wizard"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model,name:gamification.model_gamification_badge_user
-msgid "Gamification user badge"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Describe the challenge: what is does, who it targets, why it matters..."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Goal List"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge.user,comment:0
-#: field:gamification.badge.user.wizard,comment:0
-msgid "Comment"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal,state:0
-msgid "In progress"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Search Challenges"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.badge,rule_auth:0
-msgid "No one, assigned through challenges"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,stat_my:0
-msgid "My Total"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "reply later"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,image:0
-msgid "Image"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Running Challenges"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,category:0
-msgid "Appears in"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Passed"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.definition:0
-msgid "Clickable Goals"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal,state:0
-msgid "Canceled"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge.user,badge_name:0
-msgid "Badge Name"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge.line,definition_suffix:0
-msgid "Unit"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/badge.py:229
-#, python-format
-msgid "You have already sent this badge too many time this month."
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,stat_my_monthly_sending:0
-msgid "My Monthly Sending Total"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Check Badge"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,period:0
-#: selection:gamification.challenge,report_message_frequency:0
-msgid "Weekly"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Assign Challenge To"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge.user.wizard:0
-#: view:gamification.challenge:0
-#: view:gamification.goal.wizard:0
-msgid "or"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge.line,sequence:0
-msgid "Sequence number for ordering"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Category"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal,current:0
-msgid "Current Value"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,field_date_id:0
-msgid "The date to use for the time period evaluated"
-msgstr ""
-
-#. module: gamification
-#: model:ir.actions.act_window,help:gamification.goals_from_challenge_act
-msgid "<p>\n"
-"                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.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: gamification
-#: model:ir.actions.act_window,help:gamification.badge_list_action
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-"                    Click to create a badge. \n"
-"                </p>\n"
-"                <p>\n"
-"                    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.\n"
-"                </p>\n"
-"            "
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,rule_auth_badge_ids:0
-msgid "Required Badges"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Line List"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,rule_max:0
-msgid "Monthly Limited Sending"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:517
-#, python-format
-msgid "Retrieving progress for personal challenge without user information"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.goal.definition,name:gamification.definition_base_timezone
-msgid "Set your Timezone"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,goal_definition_ids:0
-msgid "The users that have succeeded theses goals will receive automatically the badge."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,image:0
-msgid "This field holds the image used for the badge, limited to 256x256"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.wizard:0
-msgid "Update"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal,line_id:0
-msgid "Goal Line"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,rule_max_number:0
-msgid "Limitation Number"
-msgstr ""
-
-#. module: gamification
-#: model:ir.module.category,name:gamification.module_goal_category
-msgid "Gamification"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,state:0
-#: view:gamification.goal:0
-#: selection:gamification.goal,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Reject"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,model_id:0
-msgid "The model object for the field to evaluate"
-msgstr ""
-
-#. module: gamification
-#: model:ir.actions.act_window,help:gamification.goal_definition_list_action
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-"                    Click to create a goal definition. \n"
-"                </p>\n"
-"                <p>\n"
-"                    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.\n"
-"                </p>\n"
-"            "
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge.user,sender_id:0
-msgid "The user who has send the badge"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,stat_count:0
-msgid "The number of time this badge has been received."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.definition:0
-#: field:gamification.goal.definition,model_id:0
-msgid "Model"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model,name:gamification.model_gamification_challenge
-msgid "Gamification challenge"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,rule_max:0
-msgid "Check to set a monthly limit per person of sending this badge"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model,name:gamification.model_gamification_badge
-msgid "Gamification badge"
-msgstr ""
-
-#. module: gamification
-#: model:ir.actions.act_window,help:gamification.action_new_simplified_res_users
-msgid "Create and manage users that will connect to the system. Users can be 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 ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Security rules to define who is allowed to manually grant badges. Not enforced for administrator."
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal.definition,display_mode:0
-msgid "Progressive (using numerical values)"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model,name:gamification.model_gamification_goal
-msgid "Gamification goal instance"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:685
-#, python-format
-msgid "<br/>Nobody has succeeded to reach every goal, no badge is rewared for this challenge."
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,message_is_follower:0
-#: field:gamification.challenge,message_is_follower:0
-#: field:gamification.goal,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,full_suffix:0
-msgid "Full Suffix"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Advanced Options"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,start_date:0
-#: field:gamification.goal,start_date:0
-msgid "Start Date"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,reward_second_id:0
-msgid "For 2nd user"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Data"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge.line,condition:0
-msgid "Condition"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge.user,user_id:0
-#: field:gamification.badge.user.wizard,user_id:0
-#: view:gamification.goal:0
-#: field:gamification.goal,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,domain:0
-msgid "Filter Domain"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Schedule"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal.definition,computation_mode:0
-msgid "Automatic: number of records"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,rule_max_number:0
-msgid "The maximum number of time this badge can be sent per month per person."
-msgstr ""
-
-#. module: gamification
-#: model:ir.model,name:gamification.model_res_groups
-msgid "Access Groups"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.definition:0
-msgid "Formating Options"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,compute_code:0
-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 ""
-
-#. module: gamification
-#: field:gamification.challenge,user_ids:0
-#: model:ir.model,name:gamification.model_res_users
-msgid "Users"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.badge,rule_auth:0
-msgid "A selected list of users"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: view:gamification.challenge.line:0
-msgid "Challenge Lines"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,rule_auth_user_ids:0
-msgid "Only these people can give this badge"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,active:0
-msgid "Active"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,action_id:0
-msgid "The action that will be called to update the goal value."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "You can still grant"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal,computation_mode:0
-msgid "Computation mode"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,action_id:0
-msgid "Action"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.goal.definition,name:gamification.definition_base_invite
-msgid "Invite new Users"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal,definition_description:0
-msgid "Definition Description"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.badge,name:gamification.badge_problem_solver
-msgid "Problem Solver"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Target: less than"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,stat_this_month:0
-msgid "The number of time this badge has been received this month."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal,last_update:0
-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 ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Depending on the Display mode, reports will be individual or shared."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Start goal"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,period:0
-msgid "Periodicity"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge.user,create_uid:0
-msgid "Creator"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:692
-#, python-format
-msgid "<br/>Special rewards were sent to the top competing users. The ranking for this challenge is :"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,compute_code:0
-msgid "Python Code"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Rewards for challenges"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Send Report"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Period"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,name:0
-msgid "Challenge Name"
-msgstr ""
-
-#. module: gamification
-#: model:ir.ui.menu,name:gamification.gamification_menu
-msgid "Gamification Tools"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,goal_definition_ids:0
-msgid "Rewarded by"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,remaining_sending:0
-msgid "Remaining Sending Allowed"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,state:0
-msgid "Done"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,visibility_mode:0
-#: field:gamification.goal,definition_display:0
-msgid "Display Mode"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge.user.wizard:0
-#: view:gamification.goal.wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "There is no reward upon completion of this challenge."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,monetary:0
-msgid "The target and current value are defined in the company currency."
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal.definition,condition:0
-msgid "The higher the better"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.goal.definition,name:gamification.definition_base_company_logo
-msgid "Set your Company Logo"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Goal Reached"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,stat_my:0
-msgid "The number of time the current user has received this badge."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,report_message_group_id:0
-msgid "Group that will receive a copy of the report in addition to the user"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal,target_goal:0
-msgid "To Reach"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,res_id_field:0
-msgid "The field name on the user profile (res.users) containing the value for res_id for action."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal,remind_update_delay:0
-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 ""
-
-#. module: gamification
-#: view:gamification.badge.user.wizard:0
-msgid "Who would you like to reward?"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge.line,condition:0
-msgid "<="
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Configure Challenge"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,period:0
-#: selection:gamification.challenge,report_message_frequency:0
-msgid "Monthly"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,user_ids:0
-msgid "List of users participating to the challenge"
-msgstr ""
-
-#. module: gamification
-#: model:email.template,body_html:gamification.email_template_goal_reminder
-msgid "<header><strong>Reminder ${object.name}</strong>\n"
-"    </header><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"
-"\n"
-"    <p>If you have not changed your score yet, you can use the button \"The current value is up to date\" to indicate so.</p>"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-#: field:gamification.goal.wizard,current:0
-msgid "Current"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "To"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/badge.py:225
-#, python-format
-msgid "You are not in the user allowed list."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "í"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,challenge_ids:0
-msgid "Reward of Challenges"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal,definition_condition:0
-msgid "Definition Condition"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,autojoin_group_id:0
-msgid "Group of users whose members will be automatically added to user_ids once the challenge is started"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.definition:0
-#: model:ir.actions.act_window,name:gamification.goal_definition_list_action
-#: model:ir.ui.menu,name:gamification.gamification_definition_menu
-msgid "Goal Definitions"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.badge,name:gamification.badge_hidden
-msgid "Hidden"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: view:gamification.goal:0
-msgid "days"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,report_template_id:0
-msgid "Report Template"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,rule_auth:0
-msgid "Allowance to Grant"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal.definition,computation_mode:0
-msgid "Automatic: sum on a field"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.challenge,name:gamification.challenge_base_discover
-msgid "Complete your Profile"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,description:0
-#: field:gamification.challenge,description:0
-msgid "Description"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/badge.py:223
-#, python-format
-msgid "This badge can not be sent by users."
-msgstr ""
-
-#. module: gamification
-#: model:email.template,body_html:gamification.email_template_badge_received
-msgid "<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"
-"            % endif\n"
-"        </p>\n"
-"\n"
-"        % if object.comment\n"
-"            <p><em>${object.comment}</em></p>\n"
-"        % endif\n"
-"        "
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,stat_this_month:0
-msgid "Monthly total"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,reward_third_id:0
-msgid "For 3rd user"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge.user.wizard:0
-msgid "Describe what they did and why it matters (will be public)"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/badge.py:227
-#, python-format
-msgid "You do not have the required badges."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "e.g. Monthly Sales Objectives"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,line_ids:0
-msgid "List of goals that will be set"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Badge List"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,visibility_mode:0
-msgid "Leader Board (Group Ranking)"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Reached when current value is"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/goal.py:351
-#, python-format
-msgid "Can not modify the configuration of a started goal"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,unique_owner_ids:0
-msgid "Unique Owners"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:665
-#, python-format
-msgid "The challenge %s is finished."
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,end_date:0
-#: view:gamification.goal:0
-#: field:gamification.goal,end_date:0
-msgid "End Date"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,owner_ids:0
-msgid "The list of instances of this badge granted to users"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Goal Failed"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,res_id_field:0
-msgid "ID Field of user"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge.line,name:0
-msgid "Name"
-msgstr ""
-
-#. module: gamification
-#. openerp-web
-#: code:addons/gamification/static/src/xml/gamification.xml:105
-#, python-format
-msgid "Invited Challenges"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Reset Completion"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,domain:0
-msgid "Domain for filtering records. The rule can contain reference to 'user' that is a browse record of the current user, e.g. [('user_id', '=', user.id)]."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,stat_my_monthly_sending:0
-msgid "The number of time the current user has sent this badge this month."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal,challenge_id:0
-msgid "Challenge that generated the goal, assign challenge to users to generate goals with a value in this field."
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,rule_auth_user_ids:0
-msgid "Authorized Users"
-msgstr ""
-
-#. module: gamification
-#: model:ir.actions.act_window,help:gamification.goal_list_action
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-"                    Click to create a goal. \n"
-"                </p>\n"
-"                <p>\n"
-"                    A goal is defined by a user and a goal definition.\n"
-"                    Goals can be created automatically by using challenges.\n"
-"                </p>\n"
-"            "
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,reward_failure:0
-msgid "Reward Bests if not Succeeded?"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,field_id:0
-msgid "Field to Sum"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,message_summary:0
-#: field:gamification.challenge,message_summary:0
-#: field:gamification.goal,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.badge,name:gamification.badge_good_job
-msgid "Good Job"
-msgstr ""
-
-#. module: gamification
-#. openerp-web
-#: code:addons/gamification/static/src/xml/gamification.xml:32
-#: code:addons/gamification/static/src/xml/gamification.xml:54
-#, python-format
-msgid "Target:"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.wizard:0
-msgid "Set the current value you have reached for this goal"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.badge,rule_auth:0
-msgid "Everyone"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.definition:0
-msgid "How to compute the goal?"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.definition:0
-msgid "Search Goal Definitions"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.goal.definition,name:gamification.definition_nbr_following
-msgid "Mail Group Following"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Accept"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Grant this Badge"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: model:ir.actions.act_window,name:gamification.challenge_list_action
-#: model:ir.ui.menu,name:gamification.gamification_challenge_menu
-msgid "Challenges"
-msgstr ""
-
-#. module: gamification
-#: model:res.groups,name:gamification.group_goal_manager
-msgid "Manager"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "HR Challenges"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal,remind_update_delay:0
-msgid "Remind delay"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "No monthly sending limit"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal,state:0
-msgid "Reached"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge.user:0
-msgid "the"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,stat_count:0
-msgid "Total"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,period:0
-msgid "Period of automatic goal assigment. If none is selected, should be launched manually."
-msgstr ""
-
diff --git a/addons/hr_recruitment/i18n/zh_CN.po b/addons/hr_recruitment/i18n/zh_CN.po
index 9d8dd82a732..d403b334e55 100644
--- a/addons/hr_recruitment/i18n/zh_CN.po
+++ b/addons/hr_recruitment/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-02-11 15:26+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2014-02-20 15:53+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:29+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-02-21 05:48+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -33,24 +33,24 @@ msgstr "必备条件"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Application Summary"
-msgstr ""
+msgstr "申请摘要"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Start Interview"
-msgstr ""
+msgstr "开始面试"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Mobile:"
-msgstr ""
+msgstr "手机："
 
 #. module: hr_recruitment
 #: help:hr.recruitment.stage,fold:0
 msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
-msgstr ""
+msgstr "此阶段是不可见的。例如：状态栏或看板视图中，在该阶段中 不存在可显示的记录。"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
@@ -99,7 +99,7 @@ msgstr "暂停的职位"
 #: view:hr.applicant:0
 #: field:hr.applicant,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未读消息"
 
 #. module: hr_recruitment
 #: field:hr.applicant,company_id:0
@@ -157,7 +157,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
 #: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
 msgid "Applications"
-msgstr ""
+msgstr "求职申请"
 
 #. module: hr_recruitment
 #: field:hr.applicant,day_open:0
@@ -167,12 +167,12 @@ msgstr "开启天数"
 #. module: hr_recruitment
 #: field:hr.applicant,emp_id:0
 msgid "employee"
-msgstr ""
+msgstr "雇员"
 
 #. module: hr_recruitment
 #: field:hr.config.settings,fetchmail_applicants:0
 msgid "Create applicants from an incoming email account"
-msgstr ""
+msgstr "从电子邮件帐号接收的邮件创建求职申请"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -184,7 +184,7 @@ msgstr "天数"
 #: view:hr.recruitment.partner.create:0
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
 msgid "Create Contact"
-msgstr ""
+msgstr "新建联系人"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -808,7 +808,7 @@ msgstr "生效"
 #: view:hr.recruitment.report:0
 #: field:hr.recruitment.report,nbr:0
 msgid "# of Applications"
-msgstr ""
+msgstr "个申请"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.hr_recruitment_stage_act
@@ -1251,7 +1251,7 @@ msgstr "开始"
 #. module: hr_recruitment
 #: view:board.board:0
 msgid "Applications to be Processed"
-msgstr ""
+msgstr "待处理的申请"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
diff --git a/addons/hr_timesheet_sheet/i18n/zh_CN.po b/addons/hr_timesheet_sheet/i18n/zh_CN.po
index a5871aa0fab..532fb4af074 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-11-01 08:13+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
+"PO-Revision-Date: 2014-02-20 15:57+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:13+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-02-21 05:48+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -33,7 +33,7 @@ msgstr "服务"
 #: field:hr.timesheet.report,quantity:0
 #: field:timesheet.report,quantity:0
 msgid "Time"
-msgstr ""
+msgstr "时间"
 
 #. module: hr_timesheet_sheet
 #: help:hr.config.settings,timesheet_max_difference:0
@@ -92,7 +92,7 @@ msgstr "# 成本"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未读消息"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -133,7 +133,7 @@ msgstr "日期到"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "to"
-msgstr ""
+msgstr "到"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -145,7 +145,7 @@ msgstr "根据计工单"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:398
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
-msgstr ""
+msgstr "你不能修改已确认的时间表条目"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -188,13 +188,13 @@ msgstr "拒绝"
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
 msgid "Timesheet Activities"
-msgstr ""
+msgstr "时间表活动"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Please create an employee and associate it with this user."
-msgstr ""
+msgstr "请创建员工信息并关联到此用户"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:402
@@ -202,7 +202,7 @@ msgstr ""
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
-msgstr ""
+msgstr "无法录入当前时间表以外的出勤日期"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:205
@@ -226,7 +226,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: hr_timesheet_sheet
 #: help:hr_timesheet_sheet.sheet,state:0
@@ -252,7 +252,7 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误！"
 
 #. module: hr_timesheet_sheet
 #: field:hr.config.settings,timesheet_max_difference:0
@@ -307,7 +307,7 @@ msgstr "员工计工单"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:215
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "无效的动作！"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index e1ca797670b..4a2dc6d06f0 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -54,6 +54,7 @@
         <!-- Discussion subtype for messaging / Chatter -->
         <record id="mt_comment" model="mail.message.subtype">
             <field name="name">Discussions</field>
+            <field name="sequence" eval="0"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/mail/mail_message_subtype.py b/addons/mail/mail_message_subtype.py
index bef6e427c3b..bae4d941a52 100644
--- a/addons/mail/mail_message_subtype.py
+++ b/addons/mail/mail_message_subtype.py
@@ -29,6 +29,8 @@ class mail_message_subtype(osv.osv):
         on the Wall. """
     _name = 'mail.message.subtype'
     _description = 'Message subtypes'
+    _order = 'sequence, id'
+
     _columns = {
         'name': fields.char('Message Type', required=True, translate=True,
             help='Message subtype gives a more precise type on the message, '\
@@ -50,7 +52,11 @@ class mail_message_subtype(osv.osv):
             help="Model the subtype applies to. If False, this subtype applies to all models."),
         'default': fields.boolean('Default',
             help="Activated by default when subscribing."),
+        'sequence': fields.integer('Sequence', help="Used to order subtypes."),
+        'hidden': fields.boolean('Hidden', help="Hide the subtype in the follower options")
     }
+
     _defaults = {
         'default': True,
+        'sequence': 1,
     }
diff --git a/addons/mail/mail_message_subtype.xml b/addons/mail/mail_message_subtype.xml
index a79f5815bd1..efcb81b5794 100644
--- a/addons/mail/mail_message_subtype.xml
+++ b/addons/mail/mail_message_subtype.xml
@@ -9,6 +9,7 @@
             <field name="arch" type="xml">
                 <tree string="Subtype">
                     <field name="name"/>
+                    <field name="sequence"/>
                     <field name="res_model"/>
                     <field name="default"/>
                 </tree>
@@ -22,12 +23,18 @@
                 <form string="Email message" version="7.0">
                     <sheet>
                         <group>
-                            <field name="name"/>
-                            <field name="res_model"/>
-                            <field name="default"/>
-                            <field name="description"/>
-                            <field name="parent_id"/>
-                            <field name="relation_field"/>
+                            <group string='Description'>
+                                <field name="name"/>
+                                <field name="sequence"/>
+                                <field name="res_model"/>
+                                <field name="description"/>
+                                <field name="default"/>
+                                <field name="hidden"/>
+                            </group>
+                            <group string='Auto subscription'>
+                                <field name="parent_id"/>
+                                <field name="relation_field"/>
+                            </group>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 633132583ed..876d10d0f2c 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import base64
+from collections import OrderedDict
 import datetime
 import dateutil
 import email
@@ -185,8 +186,17 @@ class mail_thread(osv.AbstractModel):
 
         # find current model subtypes, add them to a dictionary
         subtype_obj = self.pool.get('mail.message.subtype')
-        subtype_ids = subtype_obj.search(cr, uid, ['|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context)
-        subtype_dict = dict((subtype.name, dict(default=subtype.default, followed=False, id=subtype.id)) for subtype in subtype_obj.browse(cr, uid, subtype_ids, context=context))
+        subtype_ids = subtype_obj.search(
+            cr, uid, [
+                '&', ('hidden', '=', False), '|', ('res_model', '=', self._name), ('res_model', '=', False)
+            ], context=context)
+        subtype_dict = OrderedDict(
+            (subtype.name, {
+                'default': subtype.default,
+                'followed': False,
+                'parent_model': subtype.parent_id and subtype.parent_id.res_model or self._name,
+                'id': subtype.id}
+            ) for subtype in subtype_obj.browse(cr, uid, subtype_ids, context=context))
         for id in ids:
             res[id]['message_subtype_data'] = subtype_dict.copy()
 
@@ -1580,10 +1590,7 @@ class mail_thread(osv.AbstractModel):
         if set(partner_ids) == set([user_pid]):
             try:
                 self.check_access_rights(cr, uid, 'read')
-                if context.get('operation', '') == 'create':
-                    self.check_access_rule(cr, uid, ids, 'create')
-                else:
-                    self.check_access_rule(cr, uid, ids, 'read')
+                self.check_access_rule(cr, uid, ids, 'read')
             except (osv.except_osv, orm.except_orm):
                 return False
         else:
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 7acd12a257b..efecffd2526 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -760,4 +760,8 @@
 .openerp .oe_sidebar_suggestion .oe_suggest_items:hover a.oe_suggestion_remove_item {
     visibility: visible;
 }
+.subtype-border {
+    border-bottom: 1px solid #dddddd;
+    margin-bottom: 10px;
+}
 
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 0e674efcf52..5823def2dc0 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -270,7 +270,15 @@ openerp_mail_followers = function(session, mail) {
             var records = data[id].message_subtype_data;
             this.records_length = $.map(records, function(value, index) { return index; }).length;
             if (this.records_length > 1) { self.display_followers(); }
+            var old_model = '';
             _(records).each(function (record, record_name) {
+                if (old_model != record.parent_model){
+                    if (old_model != ''){
+                        var index = $($list).find('.oe_subtype').length;
+                        $($($list).find('.oe_subtype')[index-1]).addClass('subtype-border');
+                    }
+                    old_model = record.parent_model;
+                }
                 record.name = record_name;
                 record.followed = record.followed || undefined;
                 $(session.web.qweb.render('mail.followers.subtype', {'record': record, 'dialog': dialog})).appendTo($list);
diff --git a/addons/portal_project/i18n/fi.po b/addons/portal_project/i18n/fi.po
new file mode 100644
index 00000000000..3d84cb911de
--- /dev/null
+++ b/addons/portal_project/i18n/fi.po
@@ -0,0 +1,37 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2014-02-22 20:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-02-23 07:07+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
+
+#. module: portal_project
+#: model:ir.actions.act_window,help:portal_project.open_view_project
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                  Click to start a new project.\n"
+"                </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                  Klikkaa aloittaaksesi uuden projektin.\n"
+"                </p>\n"
+"            "
+
+#. module: portal_project
+#: model:ir.actions.act_window,name:portal_project.open_view_project
+#: model:ir.ui.menu,name:portal_project.portal_services_projects
+msgid "Projects"
+msgstr "Projektit"
diff --git a/addons/portal_project_issue/i18n/fi.po b/addons/portal_project_issue/i18n/fi.po
new file mode 100644
index 00000000000..d18d7c113b2
--- /dev/null
+++ b/addons/portal_project_issue/i18n/fi.po
@@ -0,0 +1,47 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2014-02-22 20:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-02-23 07:07+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
+
+#. module: portal_project_issue
+#: view:project.issue:0
+msgid "Creation:"
+msgstr "Luonti:"
+
+#. module: portal_project_issue
+#: model:ir.actions.act_window,help:portal_project_issue.project_issue_categ_act0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create an issue.\n"
+"              </p><p>\n"
+"                You can track your issues from this menu and the action we\n"
+"                will take.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klikkaa luodaksesi palautteen.\n"
+"              </p><p>\n"
+"                Voit seurata palautteitasi ja niiden\n"
+"                etenemistä tästä valikosta.\n"
+"              </p>\n"
+"            "
+
+#. module: portal_project_issue
+#: model:ir.actions.act_window,name:portal_project_issue.project_issue_categ_act0
+msgid "Issues"
+msgstr "Ilmoitukset"
diff --git a/addons/product_expiry/i18n/am.po b/addons/product_expiry/i18n/am.po
new file mode 100644
index 00000000000..d165d4ba279
--- /dev/null
+++ b/addons/product_expiry/i18n/am.po
@@ -0,0 +1,149 @@
+# Amharic translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2014-02-21 11:53+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Amharic <am@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:39+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_from_product_template
+msgid "Ham"
+msgstr ""
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_lait_product_template
+msgid "Cow milk"
+msgstr ""
+
+#. module: product_expiry
+#: field:product.product,life_time:0
+msgid "Product Life Time"
+msgstr "የእቃው የመቆያ ግዜ"
+
+#. module: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid ""
+"This is the date on which the goods with this Serial Number should be "
+"removed from the stock."
+msgstr ""
+
+#. module: product_expiry
+#: help:product.product,removal_time:0
+msgid ""
+"When a new a Serial Number is issued, this is the number of days before the "
+"goods should be removed from the stock."
+msgstr ""
+
+#. module: product_expiry
+#: field:product.product,use_time:0
+msgid "Product Use Time"
+msgstr "የእቃው መጠቀምያ ግዜ"
+
+#. module: product_expiry
+#: model:ir.model,name:product_expiry.model_product_product
+msgid "Product"
+msgstr "እቃ"
+
+#. module: product_expiry
+#: help:product.product,use_time:0
+msgid ""
+"When a new a Serial Number is issued, this is the number of days before the "
+"goods starts deteriorating, without being dangerous yet."
+msgstr ""
+
+#. module: product_expiry
+#: field:product.product,removal_time:0
+msgid "Product Removal Time"
+msgstr "የእቃው የሚወገድበት ግዜ"
+
+#. module: product_expiry
+#: help:stock.production.lot,alert_date:0
+msgid ""
+"This is the date on which an alert should be notified about the goods with "
+"this Serial Number."
+msgstr ""
+
+#. module: product_expiry
+#: model:ir.model,name:product_expiry.model_stock_production_lot
+msgid "Serial Number"
+msgstr "መለያ ቁጥር"
+
+#. module: product_expiry
+#: help:product.product,alert_time:0
+msgid ""
+"When a new a Serial Number is issued, this is the number of days before an "
+"alert should be notified."
+msgstr ""
+
+#. module: product_expiry
+#: field:stock.production.lot,removal_date:0
+msgid "Removal Date"
+msgstr "የሚወገድበት ቀን"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_pain_product_template
+msgid "Bread"
+msgstr ""
+
+#. module: product_expiry
+#: view:product.product:0
+msgid "Dates"
+msgstr ""
+
+#. module: product_expiry
+#: field:stock.production.lot,life_date:0
+msgid "End of Life Date"
+msgstr "የመጨረሻው ቀን"
+
+#. module: product_expiry
+#: field:stock.production.lot,use_date:0
+msgid "Best before Date"
+msgstr "ያለፍ ጥሩ ቀናቶች"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_jambon_product_template
+msgid "French cheese Camenbert"
+msgstr ""
+
+#. module: product_expiry
+#: help:product.product,life_time:0
+msgid ""
+"When a new a Serial Number is issued, this is the number of days before the "
+"goods may become dangerous and must not be consumed."
+msgstr ""
+
+#. module: product_expiry
+#: field:stock.production.lot,alert_date:0
+msgid "Alert Date"
+msgstr "ማሳወቅያ ቀን"
+
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid ""
+"This is the date on which the goods with this Serial Number start "
+"deteriorating, without being dangerous yet."
+msgstr ""
+
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"This is the date on which the goods with this Serial Number may become "
+"dangerous and must not be consumed."
+msgstr ""
+
+#. module: product_expiry
+#: field:product.product,alert_time:0
+msgid "Product Alert Time"
+msgstr "እቃውን የማሳወቅያ ግዜ"
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 7ddc983bf1c..95a76d8988e 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -78,6 +78,7 @@
             <field name="name">Task Created</field>
             <field name="res_model">project.task</field>
             <field name="default" eval="False"/>
+            <field name="hidden" eval="True"/>
             <field name="description">Task created</field>
         </record>
         <record id="mt_task_assigned" model="mail.message.subtype">
@@ -101,6 +102,7 @@
         <!-- Project-related subtypes for messaging / Chatter -->
         <record id="mt_project_task_new" model="mail.message.subtype">
             <field name="name">Task Created</field>
+            <field name="sequence">10</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_task_new')"/>
@@ -108,6 +110,7 @@
         </record>
         <record id="mt_project_task_assigned" model="mail.message.subtype">
             <field name="name">Task Assigned</field>
+            <field name="sequence">11</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_task_assigned')"/>
@@ -115,12 +118,14 @@
         </record>
         <record id="mt_project_task_blocked" model="mail.message.subtype">
             <field name="name">Task Blocked</field>
+            <field name="sequence">12</field>
             <field name="res_model">project.project</field>
             <field name="parent_id" eval="ref('mt_task_blocked')"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_task_stage" model="mail.message.subtype">
             <field name="name">Task Stage Changed</field>
+            <field name="sequence">13</field>
             <field name="res_model">project.project</field>
             <field name="parent_id" eval="ref('mt_task_stage')"/>
             <field name="relation_field">project_id</field>
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index 25a336d4094..d60106dffd2 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -33,6 +33,7 @@ Access all issues from the top Project menu, and access the issues of a specific
             <field name="name">Issue Created</field>
             <field name="res_model">project.issue</field>
             <field name="default" eval="False"/>
+            <field name="hidden" eval="True"/>
             <field name="description">Issue created</field>
         </record>
         <record id="mt_issue_assigned" model="mail.message.subtype">
@@ -56,6 +57,7 @@ Access all issues from the top Project menu, and access the issues of a specific
         <!-- Project-related subtypes for messaging / Chatter -->
         <record id="mt_project_issue_new" model="mail.message.subtype">
             <field name="name">Issue Created</field>
+            <field name="sequence">20</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_issue_new')"/>
@@ -63,6 +65,7 @@ Access all issues from the top Project menu, and access the issues of a specific
         </record>
         <record id="mt_project_issue_assigned" model="mail.message.subtype">
             <field name="name">Issue Assigned</field>
+            <field name="sequence">21</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_issue_assigned')"/>
@@ -70,12 +73,14 @@ Access all issues from the top Project menu, and access the issues of a specific
         </record>
         <record id="mt_project_issue_blocked" model="mail.message.subtype">
             <field name="name">Issue Blocked</field>
+            <field name="sequence">22</field>
             <field name="res_model">project.project</field>
             <field name="parent_id" eval="ref('mt_issue_blocked')"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_issue_stage" model="mail.message.subtype">
             <field name="name">Issue Stage Changed</field>
+            <field name="sequence">23</field>
             <field name="res_model">project.project</field>
             <field name="description">Stage changed</field>
             <field name="parent_id" eval="ref('mt_issue_stage')"/>
diff --git a/addons/sale_crm/sale_crm_data.xml b/addons/sale_crm/sale_crm_data.xml
index 519af2a976b..1996f367202 100644
--- a/addons/sale_crm/sale_crm_data.xml
+++ b/addons/sale_crm/sale_crm_data.xml
@@ -5,12 +5,14 @@
         <!-- Salesteam-related subtypes for messaging / Chatter -->
         <record id="mt_salesteam_order_sent" model="mail.message.subtype">
             <field name="name">Quotation Send</field>
+            <field name="sequence">20</field>
             <field name="res_model">crm.case.section</field>
             <field name="parent_id" eval="ref('sale.mt_order_sent')"/>
             <field name="relation_field">section_id</field>
         </record>
         <record id="mt_salesteam_order_confirmed" model="mail.message.subtype">
             <field name="name">Sales Order Confirmed</field>
+            <field name="sequence">21</field>
             <field name="res_model">crm.case.section</field>
             <field name="parent_id" eval="ref('sale.mt_order_confirmed')"/>
             <field name="relation_field">section_id</field>
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 50d5d8e616c..968d4683449 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -688,22 +688,22 @@
                     <div class="col-md-3 text-center">
                         <span class="fa fa-suitcase fa-5x"></span>
                         <h3 class="mt8 mb0">First Feature</h3>
-                        <p class="text-muted">Tell what's the value for the customer for this feature.</p>
+                        <div class="text-muted">Tell what's the value for the customer for this feature.</div>
                     </div>
                     <div class="col-md-3 text-center">
                         <span class="fa fa-lock fa-5x"></span>
                         <h3 class="mt8 mb0">Second Feature</h3>
-                        <p class="text-muted">Write what the customer would like to know, not what you want to show.</p>
+                        <div class="text-muted">Write what the customer would like to know, not what you want to show.</div>
                     </div>
                     <div class="col-md-3 text-center">
                         <span class="fa fa-heart fa-5x"></span>
                         <h3 class="mt8 mb0">Third Feature</h3>
-                        <p class="text-muted">A small explanation of this great feature, in clear words.</p>
+                        <div class="text-muted">A small explanation of this great feature, in clear words.</div>
                     </div>
                     <div class="col-md-3 text-center">
                         <span class="fa fa-credit-card fa-5x"></span>
                         <h3 class="mt8 mb0">Fourth Feature</h3>
-                        <p class="text-muted">A small explanation of this great feature on two lines.</p>
+                        <div class="text-muted">A small explanation of this great feature on two lines.</div>
                     </div>
                 </div>
             </div>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 88cb65b9daa..42c0ad46dbb 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -250,7 +250,7 @@
             </div>
         </div>
     </xpath>
-    <xpath expr='//script[@src="/website/static/lib/bootstrap/js/bootstrap.js"]' position="before">
+    <xpath expr='//script[@src="/web/static/lib/bootstrap/js/bootstrap.js"]' position="before">
         <link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
         <link rel='stylesheet' href='/website/static/src/css/editor.css'/>
         <link rel='stylesheet' href='/website/static/lib/bootstrap-tour/bootstrap-tour.css'/>