make/data/cldr/common/main/nn.xml

rev 56742 : [mq]: 8231273

@@ -5,11 +5,11 @@
 Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
         <identity>
-                <version number="$Revision: 14982 $"/>
+                <version number="$Revision$"/>
                 <language type="nn"/>
         </identity>
         <localeDisplayNames>
                 <localeDisplayPattern>
                         <localePattern>{0} ({1})</localePattern>

@@ -6804,15 +6804,10 @@
                         <unit type="power-horsepower">
                                 <displayName>hestekrefter</displayName>
                                 <unitPattern count="one">{0} hestekraft</unitPattern>
                                 <unitPattern count="other">{0} hestekrefter</unitPattern>
                         </unit>
-                        <unit type="pressure-hectopascal">
-                                <displayName>hektopascal</displayName>
-                                <unitPattern count="one">{0} hektopascal</unitPattern>
-                                <unitPattern count="other">{0} hektopascal</unitPattern>
-                        </unit>
                         <unit type="pressure-millimeter-of-mercury">
                                 <displayName>millimeter kvikksølv</displayName>
                                 <unitPattern count="one">{0} millimeter kvikksølv</unitPattern>
                                 <unitPattern count="other">{0} millimeter kvikksølv</unitPattern>
                         </unit>

@@ -6829,10 +6824,15 @@
                         <unit type="pressure-millibar">
                                 <displayName>millibar</displayName>
                                 <unitPattern count="one">{0} millibar</unitPattern>
                                 <unitPattern count="other">{0} millibar</unitPattern>
                         </unit>
+                        <unit type="pressure-hectopascal">
+                                <displayName>hektopascal</displayName>
+                                <unitPattern count="one">{0} hektopascal</unitPattern>
+                                <unitPattern count="other">{0} hektopascal</unitPattern>
+                        </unit>
                         <unit type="speed-kilometer-per-hour">
                                 <displayName>kilometer per time</displayName>
                                 <unitPattern count="one">{0} kilometer per time</unitPattern>
                                 <unitPattern count="other">{0} kilomeer per time</unitPattern>
                         </unit>

@@ -7496,15 +7496,10 @@
                         <unit type="power-horsepower">
                                 <displayName>hk</displayName>
                                 <unitPattern count="one">{0} hk</unitPattern>
                                 <unitPattern count="other">{0} hk</unitPattern>
                         </unit>
-                        <unit type="pressure-hectopascal">
-                                <displayName>hPa</displayName>
-                                <unitPattern count="one">{0} hPa</unitPattern>
-                                <unitPattern count="other">{0} hPa</unitPattern>
-                        </unit>
                         <unit type="pressure-millimeter-of-mercury">
                                 <displayName>mmHg</displayName>
                                 <unitPattern count="one">{0} mmHg</unitPattern>
                                 <unitPattern count="other">{0} mmHg</unitPattern>
                         </unit>

@@ -7521,10 +7516,15 @@
                         <unit type="pressure-millibar">
                                 <displayName>mbar</displayName>
                                 <unitPattern count="one">{0} mbar</unitPattern>
                                 <unitPattern count="other">{0} mbar</unitPattern>
                         </unit>
+                        <unit type="pressure-hectopascal">
+                                <displayName>hPa</displayName>
+                                <unitPattern count="one">{0} hPa</unitPattern>
+                                <unitPattern count="other">{0} hPa</unitPattern>
+                        </unit>
                         <unit type="speed-kilometer-per-hour">
                                 <displayName>km/time</displayName>
                                 <unitPattern count="one">{0} km/t</unitPattern>
                                 <unitPattern count="other">{0} km/t</unitPattern>
                         </unit>

@@ -7901,22 +7901,22 @@
                         </unit>
                         <unit type="power-horsepower">
                                 <unitPattern count="one" draft="unconfirmed">{0}hk</unitPattern>
                                 <unitPattern count="other" draft="unconfirmed">{0}hk</unitPattern>
                         </unit>
-                        <unit type="pressure-hectopascal">
-                                <unitPattern count="one" draft="unconfirmed">{0}hPa</unitPattern>
-                                <unitPattern count="other" draft="unconfirmed">{0}hPa</unitPattern>
-                        </unit>
                         <unit type="pressure-inch-hg">
                                 <unitPattern count="one">{0} inHg</unitPattern>
                                 <unitPattern count="other">{0} inHg</unitPattern>
                         </unit>
                         <unit type="pressure-millibar">
                                 <unitPattern count="one" draft="unconfirmed">{0}mbar</unitPattern>
                                 <unitPattern count="other" draft="unconfirmed">{0}mbar</unitPattern>
                         </unit>
+                        <unit type="pressure-hectopascal">
+                                <unitPattern count="one" draft="unconfirmed">{0}hPa</unitPattern>
+                                <unitPattern count="other" draft="unconfirmed">{0}hPa</unitPattern>
+                        </unit>
                         <unit type="speed-kilometer-per-hour">
                                 <displayName>km/t</displayName>
                                 <unitPattern count="one">{0}km/t</unitPattern>
                                 <unitPattern count="other">{0}km/t</unitPattern>
                         </unit>