Merge lp:~unifield-team/unifield-server/us-958 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 4149
Proposed branch: lp:~unifield-team/unifield-server/us-958
Merge into: lp:unifield-server
Diff against target: 28 lines (+6/-1)
2 files modified
bin/addons/base/i18n/fr.po (+1/-1)
bin/addons/msf_profile/i18n/fr_MF.po (+5/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-958
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+314818@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/addons/base/i18n/fr.po'
--- bin/addons/base/i18n/fr.po 2014-06-18 08:12:33 +0000
+++ bin/addons/base/i18n/fr.po 2017-01-16 10:11:25 +0000
@@ -6517,7 +6517,7 @@
6517#: model:ir.ui.menu,name:base.menu_sale_config_sales6517#: model:ir.ui.menu,name:base.menu_sale_config_sales
6518#: model:ir.ui.menu,name:base.menu_sales6518#: model:ir.ui.menu,name:base.menu_sales
6519msgid "Sales"6519msgid "Sales"
6520msgstr "Ventes"6520msgstr "Commandes"
65216521
6522#. module: base6522#. module: base
6523#: field:ir.actions.server,child_ids:06523#: field:ir.actions.server,child_ids:0
65246524
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po 2017-01-02 08:52:42 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po 2017-01-16 10:11:25 +0000
@@ -58904,6 +58904,11 @@
58904msgid "Introduction"58904msgid "Introduction"
58905msgstr "Introduction"58905msgstr "Introduction"
5890658906
58907#. module: base
58908#: model:ir.ui.menu,name:base.menu_base_partner
58909msgid "Sales"
58910msgstr "Commandes"
58911
58907#. modules: base, procurement_request58912#. modules: base, procurement_request
58908#: model:ir.ui.menu,name:base.menu_base_partner58913#: model:ir.ui.menu,name:base.menu_base_partner
58909#: field:sale.order,order_ids:058914#: field:sale.order,order_ids:0

Subscribers

People subscribed via source and target branches

to all changes: