From 8f1a5533951ccd7847252fa2f3315a836ecffbd6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 1 Dec 2013 16:22:06 +0100
Subject: [PATCH] =?UTF-8?q?Fix:=20[=20bug=20#1162=20]=20Traduction=20des?=
 =?UTF-8?q?=20mi-journ=C3=A9es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ChangeLog                    | 1 +
 htdocs/langs/en_US/main.lang | 2 ++
 htdocs/langs/fr_FR/main.lang | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1ea35d60a0a..375bd99b338 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ Fix: [ bug #1145 ] Agenda button list type do not display
 Fix: [ bug #1148 ] Product consomation : supplier order bad status
 Fix: [ bug #1159 ] Commercial search "other" give p.note do not exists
 Fix: [ bug #1163 ] SQL Error when searching for supplier orders
+Fix: [ bug #1162 ] Traduction des mi-journées
 
 ***** ChangeLog for 3.4.1 compared to 3.4.0 *****
 Fix: Display buying price on line edit when no supplier price is defined
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 6876d0c6b2b..2bc80f696bd 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -256,6 +256,8 @@ Seconds=Seconds
 Today=Today
 Yesterday=Yesterday
 Tomorrow=Tomorrow
+Morning=Morning
+Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
 HourShort=H
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index f642fe4c9b5..9ad1a71b1a8 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -252,6 +252,8 @@ Seconds=Secondes
 Today=Aujourd'hui
 Yesterday=Hier
 Tomorrow=Demain
+Morning=Matin
+Afternoon=Après-midi
 Quadri=Trimestre
 MonthOfDay=Mois du jour
 HourShort=H