Unifield Server

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

  1. us-1676
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4148
Proposed branch: lp:~unifield-team/unifield-server/us-1676
Merge into: lp:unifield-server
Diff against target: 21 lines (+2/-2)
1 file modified
bin/addons/msf_profile/i18n/fr_MF.po (+2/-2)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1676
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+314811@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/msf_profile/i18n/fr_MF.po'
2--- bin/addons/msf_profile/i18n/fr_MF.po 2017-01-02 08:52:42 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2017-01-16 10:08:52 +0000
4@@ -59471,7 +59471,7 @@
5 #: code:addons/product/product.py:142
6 #, python-format
7 msgid "Conversion from Product UoM m to Default UoM PCE is not possible as they both belong to different Category!."
8-msgstr "La conversion de l'UdM Produit vers l'UdM Pièce par défaut est impossible car elles ne sont pas de la même catégorie !"
9+msgstr "La conversion de l'UdM Produit vers l'UdM PCE par défaut est impossible car elles ne sont pas de la même catégorie !"
10
11 #. module: base
12 #: selection:ir.model.fields,ttype:0
13@@ -73604,7 +73604,7 @@
14 #. module: product
15 #: model:product.uom,name:product.product_uom_unit
16 msgid "PCE"
17-msgstr "Pièce"
18+msgstr "PCE"
19
20 #. module: stock_schedule
21 #: code:addons/stock_schedule/schedule.py:411

Subscribers

People subscribed via source and target branches

to all changes: