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
1=== modified file 'bin/addons/base/i18n/fr.po'
2--- bin/addons/base/i18n/fr.po 2014-06-18 08:12:33 +0000
3+++ bin/addons/base/i18n/fr.po 2017-01-16 10:11:25 +0000
4@@ -6517,7 +6517,7 @@
5 #: model:ir.ui.menu,name:base.menu_sale_config_sales
6 #: model:ir.ui.menu,name:base.menu_sales
7 msgid "Sales"
8-msgstr "Ventes"
9+msgstr "Commandes"
10
11 #. module: base
12 #: field:ir.actions.server,child_ids:0
13
14=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
15--- bin/addons/msf_profile/i18n/fr_MF.po 2017-01-02 08:52:42 +0000
16+++ bin/addons/msf_profile/i18n/fr_MF.po 2017-01-16 10:11:25 +0000
17@@ -58904,6 +58904,11 @@
18 msgid "Introduction"
19 msgstr "Introduction"
20
21+#. module: base
22+#: model:ir.ui.menu,name:base.menu_base_partner
23+msgid "Sales"
24+msgstr "Commandes"
25+
26 #. modules: base, procurement_request
27 #: model:ir.ui.menu,name:base.menu_base_partner
28 #: field:sale.order,order_ids:0

Subscribers

People subscribed via source and target branches

to all changes: