Merge lp:~dorian-kemps/unifield-server/US-5020-2 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 5286
Proposed branch: lp:~dorian-kemps/unifield-server/US-5020-2
Merge into: lp:unifield-server
Diff against target: 47 lines (+6/-3)
1 file modified
bin/addons/msf_profile/i18n/fr_MF.po (+6/-3)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-5020-2
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+363209@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 2019-02-12 08:53:37 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2019-02-14 14:38:54 +0000
4@@ -35091,7 +35091,7 @@
5 msgid "Shipment Date:"
6 msgstr "Shipment Date:"
7
8-#. modules: sales_followup, sync_client, sale, mission_stock, msf_doc_import, purchase_followup, account_override
9+#. modules: sales_followup, sync_client, sale, mission_stock, msf_doc_import, purchase_followup, account_override, stock
10 #: field:msr_in_progress,start_date:0
11 #: field:abstract.wizard.import,start_date:0
12 #: field:wizard.import.batch,start_date:0
13@@ -35103,6 +35103,7 @@
14 #: field:sale.loan.stock.moves,start_date:0
15 #: field:ir.track.changes.wizard,start_date:0
16 #: field:integrity.finance.wizard,date_from:0
17+#: report:addons/stock/report/stock_expired_damaged_report_xls.mako:178
18 msgid "Start date"
19 msgstr "Date de début"
20
21@@ -44544,7 +44545,7 @@
22 msgid "Reordering Mode"
23 msgstr "Mode de Réapprovisionnement"
24
25-#. modules: msf_doc_import, sale, sales_followups, account_override
26+#. modules: msf_doc_import, sale, sales_followups, account_override, stock
27 #: field:abstract.wizard.import,end_date:0
28 #: field:wizard.import.batch,end_date:0
29 #: field:sale.donation.stock.moves,end_date:0
30@@ -44552,6 +44553,7 @@
31 #: field:ir.followup.location.wizard,end_date:0
32 #: field:sale.followup.multi.wizard,end_date:0
33 #: field:integrity.finance.wizard,date_to:0
34+#: report:addons/stock/report/stock_expired_damaged_report_xls.mako:186
35 msgid "End date"
36 msgstr "Date de fin"
37
38@@ -105196,7 +105198,8 @@
39 " "
40 msgstr "\n"
41 " Votre fichier est prêt. Vous pouvez le télécharger depuis la barre à droite (Pièces Jointes).\n"
42-" "
43+"
44+
45 #. module: msf_outgoing
46 #: view:shipment:0
47 #: selection:shipment,state:0

Subscribers

People subscribed via source and target branches