=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/resources/i18n_global_fr_FR.properties'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/resources/i18n_global_fr_FR.properties	2011-12-22 20:31:08 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/resources/i18n_global_fr_FR.properties	2011-12-25 20:39:01 +0000
@@ -515,16 +515,16 @@
 format.Daily.endDate=
 format.time.label=hh:mm
 format.time=HH:mm
-format.Monthly.startDate=MMMM aaaa
+format.Monthly.startDate=MMMM yyyy
 month.short.may=Mai
 month.short.november=Nov
-format.datetime.label=aaaa-mm-jj hh:mm
+format.datetime.label=yyyy-mm-dd hh:mm
 format.SixMonthly.startDate=MMM '\u00e0'
-format.date=aaaa-MM-jj
+format.date=yyyy-MM-dd
 format.Monthly.endDate=
 weekday.wednesday=Mercredi
 format.Yearly.endDate=
-format.datetime=aaaa-MM-jj HH:mm
+format.datetime=yyyy-MM-dd HH:mm
 weekday.saturday=Samedi
 month.may=Mai
 month.short.july=Jul
@@ -533,18 +533,18 @@
 month.short.august=Aou
 weekday.short.wednesday=Mer
 weekday.short.monday=Lun
-format.OnChange.endDate=aaaa-MM-jj
+format.OnChange.endDate=yyyy-MM-dd
 month.short.october=Oct
-format.TwoYearly.endDate=aaaa
-format.Yearly.startDate=aaaa
+format.TwoYearly.endDate=yyyy
+format.Yearly.startDate=yyyy
 month.july=Juillet
 month.february=F\u00e9vrier
 weekday.sunday=Dimanche
 month.short.september=Sept
 format.Quarterly.startDate=MMM '\u00e0'
 Yearly=Annuel
-format.Quarterly.endDate=MMMM aaaa
-month.april=Avril\t
+format.Quarterly.endDate=MMM yyyy
+month.april=Avril
 Monthly=Mensuel
 format.Survey.endDate=
 month.short.december=Dec
@@ -555,26 +555,26 @@
 weekday.tuesday=Mardi
 month.short.february=F\u00e9v
 month.short.march=Mars
-format.OnChange.startDate=yyyy-MM-jj '-'
-format.SixMonthly.endDate=MMM aaaa
+format.OnChange.startDate=yyyy-MM-dd '-'
+format.SixMonthly.endDate=MMM yyyy
 Survey=Etude
 weekday.short.sunday=Dim
 month.august=Ao\u00fbt
 month.short.june=juin
 Quarterly=Trimestriel
-format.Daily.startDate=aaaa-MM-jj
+format.Daily.startDate=yyyy-MM-dd
 TwoYearly=Biennal
 weekday.short.thursday=Jeu
-format.Weekly.endDate=aaaa
+format.Weekly.endDate=yyyy
 SixMonthly=Semestriel
 weekday.short.friday=Ven
 month.january=Janvier
 Weekly=Hebdomadaire
-format.Survey.startDate=aaaa-MM-jj
+format.Survey.startDate=yyyy-MM-dd
 month.november=Novembre
-format.date.label=aaaa-mm-jj
+format.date.label=yyyy-mm-dd
 month.september=Septembre
-format.TwoYearly.startDate=aaaa 'et '
+format.TwoYearly.startDate=yyyy 'et '
 weekday.short.saturday=Sam
 month.june=Juin
 month.october=Octobre