QLocale: Add fr_MA locale

French_Morocco locale was introduced in CLDRv22.1 and already exists in Qt5

Change-Id: I4f0452f421cf074eb2c4fae22351d430d5f02e42
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 50 insertions, 36 deletions

diff --git a/util/local_database/cldr2.0_fixes.diff b/util/local_database/cldr2.0_fixes.diff
index b0152fa029..fc2e06fcc4 100644
--- a/util/local_database/cldr2.0_fixes.diff
+++ b/util/local_database/cldr2.0_fixes.diff
@@ -1,5 +1,5 @@
-diff -ruN ../common/main/ca.xml main/ca.xml
---- ../common/main/ca.xml	2011-05-10 20:52:31.000000000 +0200
+diff -ruN ../cldr2.0/common/main/ca.xml main/ca.xml
+--- ../cldr2.0/common/main/ca.xml	2011-05-10 20:52:31.000000000 +0200
 +++ main/ca.xml	2013-01-16 11:36:55.343546843 +0100
 @@ -1343,22 +1343,22 @@
  				<timeFormats>
@@ -28,8 +28,8 @@ diff -ruN ../common/main/ca.xml main/ca.xml
  						</timeFormat>
  					</timeFormatLength>
  				</timeFormats>
-diff -ruN ../common/main/cs.xml main/cs.xml
---- ../common/main/cs.xml	2011-05-10 22:34:45.000000000 +0200
+diff -ruN ../cldr2.0/common/main/cs.xml main/cs.xml
+--- ../cldr2.0/common/main/cs.xml	2011-05-10 22:34:45.000000000 +0200
 +++ main/cs.xml	2013-02-11 11:18:15.870446110 +0100
 @@ -1071,18 +1071,18 @@
  				<months>
@@ -62,8 +62,8 @@ diff -ruN ../common/main/cs.xml main/cs.xml
  						</monthWidth>
  						<monthWidth type="narrow">
  							<month type="1" draft="contributed">1</month>
-diff -ruN ../common/main/en_CA.xml main/en_CA.xml
---- ../common/main/en_CA.xml	2011-05-02 20:50:23.000000000 +0200
+diff -ruN ../cldr2.0/common/main/en_CA.xml main/en_CA.xml
+--- ../cldr2.0/common/main/en_CA.xml	2011-05-02 20:50:23.000000000 +0200
 +++ main/en_CA.xml	2013-01-16 11:36:55.551546840 +0100
 @@ -10,28 +10,6 @@
  	<dates>
@@ -94,8 +94,22 @@ diff -ruN ../common/main/en_CA.xml main/en_CA.xml
  				<dateTimeFormats>
  					<availableFormats>
  						<dateFormatItem id="Md">M-d</dateFormatItem>
-diff -ruN ../common/main/ga.xml main/ga.xml
---- ../common/main/ga.xml	2011-05-05 21:19:19.000000000 +0200
+diff -ruN ../cldr2.0/common/main/fr_MA.xml main/fr_MA.xml
+--- ../cldr2.0/common/main/fr_MA.xml	1970-01-01 01:00:00.000000000 +0100
++++ main/fr_MA.xml	2013-05-02 15:03:39.595646413 +0200
+@@ -0,0 +1,10 @@
++<?xml version="1.0" encoding="UTF-8" ?>
++<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
++<ldml>
++	<identity>
++		<version number="$Revision: 7465 $"/>
++		<generation date="$Date: 2012-08-01 21:53:17 -0700 (Wed, 01 Aug 2012) $"/>
++		<language type="fr"/>
++		<territory type="MA"/>
++	</identity>
++</ldml>
+diff -ruN ../cldr2.0/common/main/ga.xml main/ga.xml
+--- ../cldr2.0/common/main/ga.xml	2011-05-05 21:19:19.000000000 +0200
 +++ main/ga.xml	2013-03-11 12:24:44.137303130 +0100
 @@ -63,14 +63,53 @@
  			<calendar type="gregorian">
@@ -180,8 +194,8 @@ diff -ruN ../common/main/ga.xml main/ga.xml
  				<timeFormats>
  					<timeFormatLength type="full">
  						<timeFormat>
-diff -ruN ../common/main/gu.xml main/gu.xml
---- ../common/main/gu.xml	2011-05-10 20:52:32.000000000 +0200
+diff -ruN ../cldr2.0/common/main/gu.xml main/gu.xml
+--- ../cldr2.0/common/main/gu.xml	2011-05-10 20:52:32.000000000 +0200
 +++ main/gu.xml	2013-01-16 11:36:55.971546844 +0100
 @@ -3652,7 +3652,7 @@
  		</timeZoneNames>
@@ -192,8 +206,8 @@ diff -ruN ../common/main/gu.xml main/gu.xml
  		<symbols numberSystem="latn">
  			<exponential>પૂર્વ</exponential>
  			<nan>સંખ્યા નથીં</nan>
-diff -ruN ../common/main/hi.xml main/hi.xml
---- ../common/main/hi.xml	2011-05-10 20:52:32.000000000 +0200
+diff -ruN ../cldr2.0/common/main/hi.xml main/hi.xml
+--- ../cldr2.0/common/main/hi.xml	2011-05-10 20:52:32.000000000 +0200
 +++ main/hi.xml	2013-01-16 11:36:56.063546844 +0100
 @@ -3181,7 +3181,7 @@
  		</timeZoneNames>
@@ -204,8 +218,8 @@ diff -ruN ../common/main/hi.xml main/hi.xml
  		<symbols numberSystem="latn">
  			<decimal>.</decimal>
  			<group>,</group>
-diff -ruN ../common/main/id.xml main/id.xml
---- ../common/main/id.xml	2011-05-09 19:42:31.000000000 +0200
+diff -ruN ../cldr2.0/common/main/id.xml main/id.xml
+--- ../cldr2.0/common/main/id.xml	2011-05-09 19:42:31.000000000 +0200
 +++ main/id.xml	2013-01-16 14:50:10.735567197 +0100
 @@ -1250,8 +1250,8 @@
  				<dayPeriods>
@@ -254,8 +268,8 @@ diff -ruN ../common/main/id.xml main/id.xml
  			<gmtFormat>GMT{0}</gmtFormat>
  			<regionFormat>Waktu {0}</regionFormat>
  			<fallbackRegionFormat>Waktu {1} ({0})</fallbackRegionFormat>
-diff -ruN ../common/main/ja.xml main/ja.xml
---- ../common/main/ja.xml	2011-05-09 19:42:31.000000000 +0200
+diff -ruN ../cldr2.0/common/main/ja.xml main/ja.xml
+--- ../cldr2.0/common/main/ja.xml	2011-05-09 19:42:31.000000000 +0200
 +++ main/ja.xml	2013-02-11 11:16:18.954445250 +0100
 @@ -1413,7 +1413,7 @@
  					</dateFormatLength>
@@ -266,8 +280,8 @@ diff -ruN ../common/main/ja.xml main/ja.xml
  						</dateFormat>
  					</dateFormatLength>
  				</dateFormats>
-diff -ruN ../common/main/kn.xml main/kn.xml
---- ../common/main/kn.xml	2011-05-10 20:52:32.000000000 +0200
+diff -ruN ../cldr2.0/common/main/kn.xml main/kn.xml
+--- ../cldr2.0/common/main/kn.xml	2011-05-10 20:52:32.000000000 +0200
 +++ main/kn.xml	2013-01-16 11:36:56.375546845 +0100
 @@ -3592,7 +3592,7 @@
  		</timeZoneNames>
@@ -278,8 +292,8 @@ diff -ruN ../common/main/kn.xml main/kn.xml
  		<symbols numberSystem="latn">
  			<exponential>ಪೂರ್ವ</exponential>
  			<nan>ಸಂಖ್ಯೆಯಲ್ಲ</nan>
-diff -ruN ../common/main/kok.xml main/kok.xml
---- ../common/main/kok.xml	2011-05-02 08:05:35.000000000 +0200
+diff -ruN ../cldr2.0/common/main/kok.xml main/kok.xml
+--- ../cldr2.0/common/main/kok.xml	2011-05-02 08:05:35.000000000 +0200
 +++ main/kok.xml	2013-01-16 11:36:56.395546845 +0100
 @@ -271,7 +271,7 @@
  		</timeZoneNames>
@@ -290,8 +304,8 @@ diff -ruN ../common/main/kok.xml main/kok.xml
  		<decimalFormats>
  			<decimalFormatLength>
  				<decimalFormat>
-diff -ruN ../common/main/ml.xml main/ml.xml
---- ../common/main/ml.xml	2011-05-10 20:52:32.000000000 +0200
+diff -ruN ../cldr2.0/common/main/ml.xml main/ml.xml
+--- ../cldr2.0/common/main/ml.xml	2011-05-10 20:52:32.000000000 +0200
 +++ main/ml.xml	2013-01-16 11:36:56.623546845 +0100
 @@ -3827,7 +3827,7 @@
  		</timeZoneNames>
@@ -302,8 +316,8 @@ diff -ruN ../common/main/ml.xml main/ml.xml
  		<symbols numberSystem="latn">
  			<decimal>.</decimal>
  			<group>,</group>
-diff -ruN ../common/main/mr.xml main/mr.xml
---- ../common/main/mr.xml	2011-05-10 20:52:32.000000000 +0200
+diff -ruN ../cldr2.0/common/main/mr.xml main/mr.xml
+--- ../cldr2.0/common/main/mr.xml	2011-05-10 20:52:32.000000000 +0200
 +++ main/mr.xml	2013-01-16 11:36:56.651546845 +0100
 @@ -3693,7 +3693,7 @@
  		</timeZoneNames>
@@ -314,8 +328,8 @@ diff -ruN ../common/main/mr.xml main/mr.xml
  		<symbols numberSystem="latn">
  			<exponential>पू</exponential>
  			<nan>नान</nan>
-diff -ruN ../common/main/ne.xml main/ne.xml
---- ../common/main/ne.xml	2011-05-02 08:05:36.000000000 +0200
+diff -ruN ../cldr2.0/common/main/ne.xml main/ne.xml
+--- ../cldr2.0/common/main/ne.xml	2011-05-02 08:05:36.000000000 +0200
 +++ main/ne.xml	2013-01-16 11:36:56.787546844 +0100
 @@ -1240,7 +1240,7 @@
  		</timeZoneNames>
@@ -326,8 +340,8 @@ diff -ruN ../common/main/ne.xml main/ne.xml
  		<symbols numberSystem="latn">
  			<decimal draft="contributed">.</decimal>
  			<group draft="contributed">,</group>
-diff -ruN ../common/main/pa.xml main/pa.xml
---- ../common/main/pa.xml	2011-05-02 20:50:20.000000000 +0200
+diff -ruN ../cldr2.0/common/main/pa.xml main/pa.xml
+--- ../cldr2.0/common/main/pa.xml	2011-05-02 20:50:20.000000000 +0200
 +++ main/pa.xml	2013-01-16 11:36:56.855546846 +0100
 @@ -299,7 +299,7 @@
  		</calendars>
@@ -338,8 +352,8 @@ diff -ruN ../common/main/pa.xml main/pa.xml
  		<decimalFormats>
  			<decimalFormatLength>
  				<decimalFormat>
-diff -ruN ../common/main/sk.xml main/sk.xml
---- ../common/main/sk.xml	2011-05-09 19:42:31.000000000 +0200
+diff -ruN ../cldr2.0/common/main/sk.xml main/sk.xml
+--- ../cldr2.0/common/main/sk.xml	2011-05-09 19:42:31.000000000 +0200
 +++ main/sk.xml	2013-01-16 11:36:57.119546846 +0100
 @@ -1703,7 +1703,7 @@
  		</timeZoneNames>
@@ -350,8 +364,8 @@ diff -ruN ../common/main/sk.xml main/sk.xml
  		<symbols numberSystem="latn">
  			<decimal>,</decimal>
  			<group> </group>
-diff -ruN ../common/main/ta.xml main/ta.xml
---- ../common/main/ta.xml	2011-05-09 19:42:31.000000000 +0200
+diff -ruN ../cldr2.0/common/main/ta.xml main/ta.xml
+--- ../cldr2.0/common/main/ta.xml	2011-05-09 19:42:31.000000000 +0200
 +++ main/ta.xml	2013-02-13 17:26:52.939693894 +0100
 @@ -1244,12 +1244,12 @@
  							<dayPeriod type="pm">பிற்பகல்</dayPeriod>
@@ -379,8 +393,8 @@ diff -ruN ../common/main/ta.xml main/ta.xml
  		<symbols numberSystem="latn">
  			<decimal>.</decimal>
  			<group>,</group>
-diff -ruN ../common/main/te.xml main/te.xml
---- ../common/main/te.xml	2011-05-10 20:52:33.000000000 +0200
+diff -ruN ../cldr2.0/common/main/te.xml main/te.xml
+--- ../cldr2.0/common/main/te.xml	2011-05-10 20:52:33.000000000 +0200
 +++ main/te.xml	2013-01-16 11:36:57.343546845 +0100
 @@ -3616,7 +3616,7 @@
  		</timeZoneNames>
@@ -391,8 +405,8 @@ diff -ruN ../common/main/te.xml main/te.xml
  		<symbols numberSystem="latn">
  			<exponential>తూ</exponential>
  		</symbols>
-diff -ruN ../common/main/tr.xml main/tr.xml
---- ../common/main/tr.xml	2011-05-02 08:05:38.000000000 +0200
+diff -ruN ../cldr2.0/common/main/tr.xml main/tr.xml
+--- ../cldr2.0/common/main/tr.xml	2011-05-02 08:05:38.000000000 +0200
 +++ main/tr.xml	2013-01-16 11:36:57.463546845 +0100
 @@ -1392,8 +1392,8 @@
  				<dayPeriods>