]> granicus.if.org Git - icu/commitdiff
ICU-20987 integrate CLDR release-37-alpha3 to master, adjust MeasureUnitTest.java...
authorPeter Edberg <pedberg@unicode.org>
Fri, 13 Mar 2020 03:19:25 +0000 (20:19 -0700)
committerpedberg-icu <42151464+pedberg-icu@users.noreply.github.com>
Fri, 13 Mar 2020 19:01:39 +0000 (12:01 -0700)
140 files changed:
icu4c/source/data/curr/ms_ID.txt [new file with mode: 0644]
icu4c/source/data/locales/ms_ID.txt [new file with mode: 0644]
icu4c/source/data/misc/langInfo.txt
icu4c/source/data/misc/likelySubtags.txt
icu4c/source/data/misc/metadata.txt
icu4c/source/data/misc/supplementalData.txt
icu4c/source/data/unit/af.txt
icu4c/source/data/unit/am.txt
icu4c/source/data/unit/ar.txt
icu4c/source/data/unit/ar_SA.txt
icu4c/source/data/unit/as.txt
icu4c/source/data/unit/ast.txt
icu4c/source/data/unit/az.txt
icu4c/source/data/unit/be.txt
icu4c/source/data/unit/bg.txt
icu4c/source/data/unit/bn.txt
icu4c/source/data/unit/br.txt
icu4c/source/data/unit/bs.txt
icu4c/source/data/unit/ca.txt
icu4c/source/data/unit/ccp.txt
icu4c/source/data/unit/ceb.txt
icu4c/source/data/unit/chr.txt
icu4c/source/data/unit/cs.txt
icu4c/source/data/unit/cy.txt
icu4c/source/data/unit/da.txt
icu4c/source/data/unit/de.txt
icu4c/source/data/unit/dsb.txt
icu4c/source/data/unit/el.txt
icu4c/source/data/unit/en.txt
icu4c/source/data/unit/en_001.txt
icu4c/source/data/unit/en_AU.txt
icu4c/source/data/unit/en_CA.txt
icu4c/source/data/unit/es.txt
icu4c/source/data/unit/es_419.txt
icu4c/source/data/unit/es_MX.txt
icu4c/source/data/unit/es_US.txt
icu4c/source/data/unit/et.txt
icu4c/source/data/unit/eu.txt
icu4c/source/data/unit/fa.txt
icu4c/source/data/unit/fi.txt
icu4c/source/data/unit/fil.txt
icu4c/source/data/unit/fo.txt
icu4c/source/data/unit/fr.txt
icu4c/source/data/unit/fr_CA.txt
icu4c/source/data/unit/fy.txt
icu4c/source/data/unit/ga.txt
icu4c/source/data/unit/gd.txt
icu4c/source/data/unit/gl.txt
icu4c/source/data/unit/gsw.txt
icu4c/source/data/unit/gu.txt
icu4c/source/data/unit/he.txt
icu4c/source/data/unit/hi.txt
icu4c/source/data/unit/hr.txt
icu4c/source/data/unit/hsb.txt
icu4c/source/data/unit/hu.txt
icu4c/source/data/unit/hy.txt
icu4c/source/data/unit/ia.txt
icu4c/source/data/unit/id.txt
icu4c/source/data/unit/is.txt
icu4c/source/data/unit/it.txt
icu4c/source/data/unit/ja.txt
icu4c/source/data/unit/jv.txt
icu4c/source/data/unit/ka.txt
icu4c/source/data/unit/kea.txt
icu4c/source/data/unit/kk.txt
icu4c/source/data/unit/kl.txt
icu4c/source/data/unit/km.txt
icu4c/source/data/unit/kn.txt
icu4c/source/data/unit/ko.txt
icu4c/source/data/unit/kok.txt
icu4c/source/data/unit/ksh.txt
icu4c/source/data/unit/ku.txt
icu4c/source/data/unit/ky.txt
icu4c/source/data/unit/lb.txt
icu4c/source/data/unit/lo.txt
icu4c/source/data/unit/lt.txt
icu4c/source/data/unit/lv.txt
icu4c/source/data/unit/mk.txt
icu4c/source/data/unit/ml.txt
icu4c/source/data/unit/mn.txt
icu4c/source/data/unit/mr.txt
icu4c/source/data/unit/ms.txt
icu4c/source/data/unit/my.txt
icu4c/source/data/unit/mzn.txt
icu4c/source/data/unit/nb.txt
icu4c/source/data/unit/ne.txt
icu4c/source/data/unit/nl.txt
icu4c/source/data/unit/nn.txt
icu4c/source/data/unit/or.txt
icu4c/source/data/unit/pa.txt
icu4c/source/data/unit/pcm.txt
icu4c/source/data/unit/pl.txt
icu4c/source/data/unit/ps.txt
icu4c/source/data/unit/ps_PK.txt
icu4c/source/data/unit/pt.txt
icu4c/source/data/unit/pt_PT.txt
icu4c/source/data/unit/ro.txt
icu4c/source/data/unit/root.txt
icu4c/source/data/unit/ru.txt
icu4c/source/data/unit/sd.txt
icu4c/source/data/unit/se.txt
icu4c/source/data/unit/si.txt
icu4c/source/data/unit/sk.txt
icu4c/source/data/unit/sl.txt
icu4c/source/data/unit/so.txt
icu4c/source/data/unit/sq.txt
icu4c/source/data/unit/sr.txt
icu4c/source/data/unit/sr_Latn.txt
icu4c/source/data/unit/sv.txt
icu4c/source/data/unit/sw.txt
icu4c/source/data/unit/sw_KE.txt
icu4c/source/data/unit/ta.txt
icu4c/source/data/unit/te.txt
icu4c/source/data/unit/th.txt
icu4c/source/data/unit/tk.txt
icu4c/source/data/unit/to.txt
icu4c/source/data/unit/tr.txt
icu4c/source/data/unit/ug.txt
icu4c/source/data/unit/uk.txt
icu4c/source/data/unit/ur.txt
icu4c/source/data/unit/uz.txt
icu4c/source/data/unit/uz_Cyrl.txt
icu4c/source/data/unit/vi.txt
icu4c/source/data/unit/yue.txt
icu4c/source/data/unit/yue_Hans.txt
icu4c/source/data/unit/zh.txt
icu4c/source/data/unit/zh_Hant.txt
icu4c/source/data/unit/zh_Hant_HK.txt
icu4c/source/data/unit/zu.txt
icu4c/source/data/zone/ms_ID.txt [new file with mode: 0644]
icu4c/source/i18n/measunit.cpp
icu4c/source/i18n/unicode/measunit.h
icu4c/source/test/testdata/structLocale.txt
icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java
icu4j/main/shared/data/icudata.jar
icu4j/main/shared/data/icutzdata.jar
icu4j/main/shared/data/testdata.jar
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java
tools/cldr/cldr-to-icu/build-icu-data.xml
tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/ant/LocaleIdResolver.java

diff --git a/icu4c/source/data/curr/ms_ID.txt b/icu4c/source/data/curr/ms_ID.txt
new file mode 100644 (file)
index 0000000..a91f1ef
--- /dev/null
@@ -0,0 +1,11 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ms_ID{
+    Currencies{
+        IDR{
+            "Rp",
+            "Rupiah Indonesia",
+        }
+    }
+    Version{"37"}
+}
diff --git a/icu4c/source/data/locales/ms_ID.txt b/icu4c/source/data/locales/ms_ID.txt
new file mode 100644 (file)
index 0000000..6a60a2b
--- /dev/null
@@ -0,0 +1,113 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ms_ID{
+    NumberElements{
+        latn{
+            patterns{
+                accountingFormat{"¤#,##0.00"}
+            }
+            symbols{
+                decimal{","}
+                group{"."}
+                timeSeparator{"."}
+            }
+        }
+    }
+    Version{"37"}
+    calendar{
+        generic{
+            DateTimePatterns{
+                "HH.mm.ss zzzz",
+                "HH.mm.ss z",
+                "HH.mm.ss",
+                "HH.mm",
+                "EEEE, dd MMMM y G",
+                "d MMMM y G",
+                "d MMM y G",
+                "dd/MM/yy GGGGG",
+                "{1} {0}",
+                "{1} {0}",
+                "{1} {0}",
+                "{1} {0}",
+                "{1} {0}",
+            }
+        }
+        gregorian{
+            DateTimePatterns{
+                "HH.mm.ss zzzz",
+                "HH.mm.ss z",
+                "HH.mm.ss",
+                "HH.mm",
+                "EEEE, dd MMMM y",
+                "d MMMM y",
+                "d MMM y",
+                "dd/MM/yy",
+                "{1}, {0}",
+                "{1} {0}",
+                "{1} {0}",
+                "{1}, {0}",
+                "{1}, {0}",
+            }
+            availableFormats{
+                Bhm{"h.mm B"}
+                Bhms{"h.mm.ss B"}
+                EBhm{"E h.mm B"}
+                EBhms{"E h.mm.ss B"}
+                EHm{"E HH.mm"}
+                EHms{"E HH.mm.ss"}
+                Ehm{"E h.mm a"}
+                Ehms{"E h.mm.ss a"}
+                Hm{"HH.mm"}
+                Hms{"HH.mm.ss"}
+                Hmsv{"HH.mm.ss v"}
+                Hmv{"HH.mm v"}
+                hm{"h.mm a"}
+                hms{"h.mm.ss a"}
+                hmsv{"h.mm.ss. a v"}
+                hmv{"h.mm a v"}
+            }
+            intervalFormats{
+                Bhm{
+                    B{"h.mm B – h.mm B"}
+                    h{"h.mm – h.mm B"}
+                    m{"h.mm – h.mm B"}
+                }
+                Hm{
+                    H{"HH.mm–HH.mm"}
+                    m{"HH.mm–HH.mm"}
+                }
+                Hmv{
+                    H{"HH.mm–HH.mm v"}
+                    m{"HH.mm–HH.mm v"}
+                }
+                hm{
+                    a{"h.mm a – h.mm a"}
+                    h{"h.mm–h.mm a"}
+                    m{"h.mm–h.mm a"}
+                }
+                hmv{
+                    a{"h.mm a – h.mm a v"}
+                    h{"h.mm–h.mm a v"}
+                    m{"h.mm–h.mm a v"}
+                }
+            }
+        }
+        islamic{
+            DateTimePatterns{
+                "HH.mm.ss zzzz",
+                "HH.mm.ss z",
+                "HH.mm.ss",
+                "HH.mm",
+                "EEEE, dd MMMM y G",
+                "d MMMM y G",
+                "d MMM y G",
+                "dd/MM/yy GGGGG",
+                "{1} {0}",
+                "{1} {0}",
+                "{1} {0}",
+                "{1} {0}",
+                "{1} {0}",
+            }
+        }
+    }
+}
index 36a99ae92a3050f96602f08ee3c93c047117d09d..6cdc8ffa1a565307df3624759bfe790f0be98194 100644 (file)
@@ -216,50 +216,50 @@ langInfo:table(nofallback){
         }  // regionAliases
         trie:bin{  // BytesTrie: 9865 bytes
 001a6dcc1474c4ef77c26977a2b978a4
-5479a4c47a0f6d7f7a5b7a30e1ad9ae8
-2ef5af3d10e1a53a022a3c42cc254811
+5479a4c47a0f6d7f7a5b7a30e1ad9be8
+2ef5af3e10e1a53a022a3c42cc254811
 616e01e2a3fef4a3f90b4d24540e54ca
 cc552a5610cea3fc10d3a3fb4dcad550
 2a5310d2a3f702c1a3f6c6a3f4c8a3f5
 47d4e2473248d81e3a4910c4a3f101c2
-a3fac6a3ef6d326e36733a7910e2ad9a
-10e9af3b10e5af3c10ed22022aa90f43
+a3fac6a3ef6d326e36733a7910e2ad9b
+10e9af3c10e5af3d10ed22022aa90f43
 b6064910c4a9116817683269366b3a6c
-10edaf3a10f8adb710e1af3910f4ad95
-61326436653a6710e8adc610e7af3610
-eaaf3710e1af3800126d46741b743475
-387742e1adeaefaf0110edaf0601f5af
-07f6af0810e1af096d3c6e406f50725a
-7301e7ad86ebaf0510efadfd02e3adfe
-e9adfff5af0001e2af02f3af0310f3af
-0467266736683a693e6a4e6c10f3adfc
-10e9adf510e7adf602e2adf7f5adf8f6
-adf901e1adfae9adfb61386254636465
-01eca521f2adf404e5adebeaadececad
-edeeadeef2adef02f0adf0f1adf1f2ad
-f210e9adf30c6e3d7221722e7332774e
-e8af0d10e2af1304e1adbee9af14eca5
-30edaf15f2af1610e5af176e346f3e70
-01e5a78ff2adbb01e1adb5f2af1001e7
-af11eeaf12651d653a6c3e6d02e6af0f
-eeadabf2adae10f3af0c02e1af0ee3ad
-a7e4ada8613462386301efad75f2ad74
-10f6af0a10e9af0b0d6d497330733075
-34e9a735efaf2a10f3af2f04e1af30e5
-32eaaf33f4af34f7af35012a2e481261
-6ef3af32012aaf314310ceaf326d3a6f
-3e7202e2af2ce5af2decaf2e10ecaf29
-10eeaf2b6520653e67426b4c6c02e5af
-26e7af27ecaf2810f2af2201f2af23f7
-af2410efaf25612e62606410e4a73507
-f40cf4af1bf6af1cf9af1dfaaf1eeda7
-b9efaf18f0af19f3af1a02e1af1fe2af
-20f9af2174a25275a4d0760a6f1fe509
-e5addde9ad62efade56f3472387501ee
-ade8f4ade910f4ade610efade7613c65
-4c69566c606d01e6ade3f7ade402e7ad
-dbe9adcbeeaddc01e3addef0addf01e3
-ade0f6ade110f3ade200267576e91ff2
+10edaf3b10f8adb810e1af3a10f4ad96
+61326436653a6710e8adc710e7af3710
+eaaf3810e1af3900126d46741b743475
+387742e1adebefaf0210edaf0701f5af
+08f6af0910e1af0a6d3c6e406f50725a
+7301e7ad87ebaf0610efadfe02e3adff
+e9af00f5af0101e2af03f3af0410f3af
+0567266736683a693e6a4e6c10f3adfd
+10e9adf610e7adf702e2adf8f5adf9f6
+adfa01e1adfbe9adfc61386254636465
+01eca521f2adf504e5adeceaadedecad
+eeeeadeff2adf002f0adf1f1adf2f2ad
+f310e9adf40c6e3d7221722e7332774e
+e8af0e10e2af1404e1adbfe9af15eca5
+30edaf16f2af1710e5af186e346f3e70
+01e5a78ff2adbc01e1adb6f2af1101e7
+af12eeaf13651d653a6c3e6d02e6af10
+eeadacf2adaf10f3af0d02e1af0fe3ad
+a8e4ada9613462386301efad76f2ad75
+10f6af0b10e9af0c0d6d497330733075
+34e9a735efaf2b10f3af3004e1af31e5
+32eaaf34f4af35f7af36012a2e481261
+6ef3af33012aaf324310ceaf336d3a6f
+3e7202e2af2de5af2eecaf2f10ecaf2a
+10eeaf2c6520653e67426b4c6c02e5af
+27e7af28ecaf2910f2af2301f2af24f7
+af2510efaf26612e62606410e4a73507
+f40cf4af1cf6af1df9af1efaaf1feda7
+b9efaf19f0af1af3af1b02e1af20e2af
+21f9af2274a25275a4d0760a6f1fe509
+e5addee9ad62efade66f3472387501ee
+ade9f4adea10f4ade710efade8613c65
+4c69566c606d01e6ade4f7ade502e7ad
+dce9adcceeaddd01e3addff0ade001e3
+ade1f6ade210f3ade300267576e91ff2
 0ef2abc8f3abccf4abd2f767f9abe2e9
 abadebabb4ecabb8eeabbeefabc07a24
 7a36e1ab8ce5ab9ee72ee8aba910edab
@@ -285,14 +285,14 @@ ab8decab8eeeab8ff1ab9006e70ce7ab
 94efab95f7ab96faab97e3ab91e4ab92
 e6ab9301e9ab98f9ab990f735fe72ce7
 42ebabecf2ad4afa012a8641127261e2
-add9012a2e43127972ecabe9022aabe8
+adda012a2e43127972ecabe9022aabe8
 4b2a4d10ceabea10daabe97360746476
-687a10ee012a2e41127261e2add9022a
-abf7412a4310ceadda10c6add910e1ad
-d510f2add601e8add7ecadd86d326d3e
-6e426f707202e9add2f4add3f7add410
-e2abee01f226f8add0012a2e44126576
-e1adcf012aadce4e10d0adcf10ebadd1
+687a10ee012a2e41127261e2adda022a
+abf7412a4310ceaddb10c6adda10e1ad
+d610f2add701e8add8ecadd96d326d3e
+6e426f707202e9add3f4add4f7add510
+e2abee01f226f8add1012a2e44126576
+e1add0012aadcf4e10d0add010ebadd2
 62326436673a6c10e9abed10f5abe610
 edabe710e1abeb70c39570a4f971a6d7
 72a6e47300287884ec39f229f509f5ab
@@ -606,55 +606,55 @@ e4a36eeaa36ff0a370f2a371e1a36be2
 a36ce3a36d09ed0feda376eea377efa3
 78f1a379f5a37ae3a363e6a372e8a373
 e9a374eca37500184dc26554c0ca5736
-5736584e59645a12616ee2adcd01612c
-631168efa9a81172e1adcc01702a7311
+5736584e59645a12616ee2adce01612c
+631168efa9a81172e1adcd01702a7311
 75f8691165efa9e401652c691169e9a7
 19117ae9a781543455a28756126169e9
-adcb056746674a68506901622a7210e8
-adca10f4012aa3b14210d445116ce7ad
-c7106101e158e9042aaba943324b364c
-3a5410c8aba910cea7d510c8adc810c1
-adc9012aa54e4d10d6a54e6130657c66
-116ee7adc6056d116d2e6e327610f4a3
+adcc056746674a68506901622a7210e8
+adcb10f4012aa3b14210d445116ce7ad
+c8106101e158e9042aaba943324b364c
+3a5410c8aba910cea7d510c8adc910c1
+adca012aa54e4d10d6a54e6130657c66
+116ee7adc7056d116d2e6e327610f4a3
 a710ecab8c10e7abe167346b386c01e5
-ab9af5a75e10e2adc410f2adc5116cf5
+ab9af5a75e10e2adc510f2adc6116cf5
 ab9e126761f2abeb50c0c350a27252a2
 a85306694369426f6a759079016c2a72
-10e3a50d10efadc301643e6e01e4ab3b
-e8012aab4c4c10cbab4c10e4adc00267
-2e72387910efa50f01e4ab69efadc110
-e1ab71116ee4adc2613e675e6801612a
-7210e4adbf10f7a562026d2e72327510
-f2ab2910f2ab5f10e2adbe116ef7a34b
-046138654a68506c76721174e9adbb01
-6c2a7510e3a51d10eda11172edadb902
-612e6c326e10f8a9e810e7adba01e9a9
+10e3a50d10efadc401643e6e01e4ab3b
+e8012aab4c4c10cbab4c10e4adc10267
+2e72387910efa50f01e4ab69efadc210
+e1ab71116ee4adc3613e675e6801612a
+7210e4adc010f7a562026d2e72327510
+f2ab2910f2ab5f10e2adbf116ef7a34b
+046138654a68506c76721174e9adbc01
+6c2a7510e3a51d10eda11172edadba02
+612e6c326e10f8a9e810e7adbb01e9a9
 d8f0a9d91172e4a5f6026a306f367511
-6ef2a9ac116ee7adbc1168e7adbd4d7c
+6ef2a9ac116ee7adbd1168e7adbe4d7c
 4ea2a44f0367426c48724e7301672a6d
-10e1adb810e5a9d11161edab441163eb
+10e1adb910e5a9d11161edab441163eb
 ab27016b2a7910e1a9cd10e8a9d30772
 2e725a7460756679116df2032aa3ce49
-2e4d325410c8adb310cea76210cda3ce
-116fefa95b1165e9adb1116cf4adb261
+2e4d325410c8adb410cea76210cda3ce
+116fefa95b1165e9adb2116cf4adb361
 4265746c9a6f01642a6e10e7a54110e9
-adb00368326b366e3a7210e3adac10ea
-ada910e1adaa01e4a972e9adab026434
-6e387201e3adaeefadaf10e6a93c10e4
-adad1179eda942046138624c65506b56
-731168f5adb7016e2a7210e2adb510e4
-adb41161f49f1177e1adb6116fefa560
+adb10368326b366e3a7210e3adad10ea
+adaa10e1adab01e4a972e9adac026434
+6e387201e3adafefadb010e6a93c10e4
+adae1179eda942046138624c65506b56
+731168f5adb8016e2a7210e2adb610e4
+adb51161f49f1177e1adb7116fefa560
 47c4154ac3294aa6ba4ba6d34c036146
-65a69669a6987901632a6410e9ada810
-e9ada7026ea6736fa6747410ee001a4b
+65a69669a6987901632a6410e9ada910
+e9ada8026ea6736fa6747410ee001a4b
 c139545b571457ac6958ac6d59305a01
 c1abf3d7ab6210d4ad66544055825603
 c1ad61c5ad63cead62d5a3930bce14d6
-09d6abddd7abcadaab82ceada5cfabc0
+09d6abddd7abcadaab82ceada6cfabc0
 d2abc8cbc5cdcbabb5ccad5dcdabb404
-c1ada6c7ad5fd3a561d9ad60daabf74e
+c1ada7c7ad5fd3a561d9ad60daabf74e
 824e8a50a24a52a26d530cce17d40cd4
-ad57d5a79cd6ad58d9ada4cead55cfab
+ad57d5a79cd6ad58d9ada5cead55cfab
 68d2ad56ca09caad53cbab52cdad54c3
 ad52c5ab81c9ab5606c70cc7abefc9ad
 45cca54dcfa981c1ad42c3ad43c5ad44
@@ -663,74 +663,74 @@ edcdad4bd2ad4cc1ad47c5ad48c6ad49
 c7abc4c8a57d03c5ad51cfa94dd5a79c
 d7ab1e4b9e4ca2434d0010cd1dd40fd4
 a95cd5a92cd8abf1d9a90fdaad41cda7
-3fcfada2d1ad3fd2ada3c60cc6ad3ec7
-a930cbada1cca3a8c1ada0c3ad3cc4ad
-3dc5ab3001c5ad31cdad9f04c9ad37d3
+3fcfada3d1ad3fd2ada4c60cc6ad3ec7
+a930cbada2cca3a8c1ada1c3ad3cc4ad
+3dc5ab3001c5ad31cdada004c9ad37d3
 ad38d4a7fcd5ad39d6a90243bd465f46
 4c475c48a2484904c3ad2ec4a711d2ad
-9ed3a70fd4a72702c9a57bcfa582d2a5
+9fd3a70fd4a72702c9a57bcfa582d2a5
 880cce17d30cd3ad29d4ad2ad5abf6d7
 ad2bcead26d0ad27d1ad28c608c6ad25
-c867cca775c1ad24c2abf9c5ad9d04cd
+c867cca775c1ad24c2abf9c5ad9e04cd
 ad2ccead2dd2a701d4a704d5a7054352
-44a2424505d309d3a567d4ad97daad23
+44a2424505d309d3a567d4ad98daad23
 c1ad1fc3ad20c5a55a0fcf1ad60cd6ad
-1ad7abfbd9ad9bdaa51acfad17d0ad18
+1ad7abfbd9ad9cdaa51acfad17d0ad18
 d2ad19d5abf4c9c68bc9ad14ccad15cd
-ad16cead9a05cb09cba522cfad1ddaad
-9cc5a52ec7ad50caad1c345e34ae8641
+ad16cead9b05cb09cba522cfad1ddaad
+9dc5a52ec7ad50caad1c345e34ae8641
 78420bce14d209d2a9fad5a73fd6ad10
 cead0dcfad0ed1ad0fc909c9ab13caad
 0bccad0cc1a3bfc5ad08c6ad090cd217
 d50cd5abf0d7ad06d8ad07daa35ed2ad
-03d3ad04d4ad05cd09cdad99cfad01d1
-ad02c4abfec6ad98cc6d2aa561312c32
-1133b0ad971137b2a79c10e1a9aa10ef
+03d3ad04d4ad05cd09cdad9acfad01d1
+ad02c4abfec6ad99cc6d2aa561312c32
+1133b0ad981137b2a79c10e1a9aa10ef
 012aa7f44c10c1a7f41170e3a7da026d
 2e6e327310f5a7e810e2a7e401e1a7ca
 e2a5cd01613a701161ee012aa72d4a10
-d0a72d016d2a7610e1ad9310efad9205
-6e1e6e306f36741168e9ad961164e1a7
+d0a72d016d2a7610e1ad9410efad9305
+6e1e6e306f36741168e9ad971164e1a7
 851172e5012aa78a4b01d0ad33d2a78a
-61306844691174f3ad95016c2a6e10e1
-ad9410e9a55b02612e6d326f10eaab3a
+61306844691174f3ad96016c2a6e10e1
+ad9510e9a55b02612e6d326f10eaab3a
 10f2a9f610f2012aa77a4b10c8a77a47
 3448a25c49127461eca56c0465466c5a
 6f60727a75016a2a7210f5a9d510f2a5
 d1116ff2012aa5b14710c5a5b11161e7
-a51f016e2a7410e8a5cb01e7ad86eda5
+a51f016e2a7410e8a5cb01e7ad87eda5
 680161506510eb032aa55c432e473254
-10d2a38c10d9ad1b10d2a55c10eead87
-056c186c306d3675116ee7ad911175f7
+10d2a38c10d9ad1b10d2a55c10eead88
+056c186c306d3675116ee7ad921175f7
 a5f5106e01e7a5faf0a96a6130659c69
-1172e1ad90016e2a7410f2a93b05ef24
-efad8af34cf4032aa3f9482e4d325410
+1172e1ad91016e2a7410f2a93b05ef24
+efad8bf34cf4032aa3f9482e4d325410
 d7a3f910cba3f010cfa3f2012aa3ec43
-10cea3ece2a3fee7ad88e9ad891162f2
-054917493a533e5502c1ad8ecbad8cd3
-ad8f10cca5ea10c5ad8d2aa5ea432a47
-10c2ad8c10c1ad8b43c106437044a2bf
+10cea3ece2a3fee7ad89e9ad8a1162f2
+054917493a533e5502c1ad8fcbad8dd3
+ad9010cca5ea10c5ad8e2aa5ea432a47
+10c2ad8d10c1ad8c43c106437044a2bf
 450267406c46741168e9012a754501d2
 ad22d4751179f0a55801622a7910edad
-8510e1ad840461a26868a2776fa28670
+8610e1ad850461a26868a2776fa28670
 a288791172ec0a4d335414542e553858
-10cbad7d01caaba4d2ad7c10c1abec4d
-2e523e5310cbad7b02c4ad79cba906ce
-a54002cfad7ad3ab2ed5ab1b2aab1b41
+10cbad7e01caaba4d2ad7d10c1abec4d
+2e523e5310cbad7c02c4ad7acba906ce
+a54002cfad7bd3ab2ed5ab1b2aab1b41
 38423c474c4b01c7a7c1daad3510ccad
-7602c1ad77c7a389d9a37c01c52dd2ad
-78026b2e6e327210e9ad7410eda3e610
-f3a51302612e65327210f3ad7510eda5
+7702c1ad78c7a389d9a37c01c52dd2ad
+79026b2e6e327210e9ad7510eda3e610
+f3a51302612e65327210f3ad7610eda5
 0610f2a5031170f4a5111172f4a5cc03
-653469866f8c751170ecad831176e106
+653469866f8c751170ecad841176e106
 491749324d364e3a5010cba3c610cea5
-ec10d5ad8010d0a98b2aa5ec422a4610
-caad7f10d4ad7e1161ebad811167f2ad
-822aa25441aa3142056f1f6f3e724475
-01672a6810e4ad7310e9ad721170efa3
-fd106101e8a9ebe9ad716130655c6811
-6bf3ad70036c326d36733a7410ebad6f
-10e9ad6e10f5a36a10f3a3c1116ee701
+ec10d5ad8110d0a98b2aa5ec422a4610
+caad8010d4ad7f1161ebad821167f2ad
+832aa25441aa3142056f1f6f3e724475
+01672a6810e4ad7410e9ad731170efa3
+fd106101e8a9ebe9ad726130655c6811
+6bf3ad71036c326d36733a7410ebad70
+10e9ad6f10f5a36a10f3a3c1116ee701
 2aa3ad4210c4a3ad00214ac1c052c0cc
 5638563c5758586259665a01d2abf2d7
 ab6204c1ad61c4ad62c5ad63cead62d5
@@ -799,13 +799,13 @@ ab1bb4abf9b5a52e046436673c684272
 4110cda34210e200134c625131513c53
 405450556a5901c5abfdd4ab8310c1ad
 4f02c1abf8c4abfcd9ad5904c791c8a9
-2bcaad6ccead5ed2ad6d10cbad684c3c
+2bcaad6dcead5ed2ad6e10cbad684c3c
 4d464e624f665001cbad4ad3ad4d01c2
 ad36d9ad3a04c1ad3bcdab08cea772d2
-ad40d5ad6a10c7ad6b10cdad46452e45
+ad40d5ad6b10c7ad6c10cdad46452e45
 42474a494e4a644b02c8a505cdad32d7
-ad3401c79bc8ad2110c2ad6803c4a911
-cead69d1ad2fd2a57110cfad302a9b41
+ad3401c79bc8ad2110c2ad6803c4ad69
+cead6ad1ad2fd2a57110cfad302a9b41
 32423c43464410daad1e01c5abffc6ad
 0001c8ad0ad5ab0801c3a910ceabe800
 217588e62bf221f29bf3a349f6a353f9
@@ -833,7 +833,7 @@ e24df94f05ed06ed59ef5bf15de353e4
 02e927eb29f52b04e92ff131f233f435
 f93702e439e53be83d
         }  // trie
-        lsrs{  // 1598
+        lsrs{  // 1599
             "","","",
             "skip","script","",
             "aa","Latn","ET",
@@ -1619,7 +1619,7 @@ f93702e439e53be83d
             "maw","Latn","ZZ",
             "ms","Latn","MY",
             "ms","Arab","CC",
-            "ms","Arab","ID",
+            "ms","Latn","ID",
             "maz","Latn","MX",
             "mbh","Latn","ZZ",
             "mbo","Latn","ZZ",
@@ -2219,6 +2219,7 @@ f93702e439e53be83d
             "fr","Latn","YT",
             "lez","Aghb","RU",
             "ks","Arab","GB",
+            "ms","Arab","ID",
             "ur","Arab","IN",
             "ur","Arab","MU",
             "ha","Arab","NG",
@@ -2711,12 +2712,12 @@ e735623065366812f26de73512fa61f2
         }  // regionToPartitions
         partitions{".","0","1","2","3","4","5","6","0123456","03","16","02","05","04","012346"}
         paradigms{
+            "en","Latn","US",
             "en","Latn","GB",
-            "es","Latn","419",
-            "pt","Latn","PT",
             "es","Latn","ES",
-            "en","Latn","US",
+            "es","Latn","419",
             "pt","Latn","BR",
+            "pt","Latn","PT",
         }
         distances:intvector{80,50,4,3}
     }  // match
index fe047a54867d5d7ad853333258e7dcae161df266..d8130927ec06af381e7b4699e0a3c1acf880e352 100644 (file)
@@ -840,7 +840,7 @@ likelySubtags:table(nofallback){
     mro{"mro_Mroo_BD"}
     ms{"ms_Latn_MY"}
     ms_CC{"ms_Arab_CC"}
-    ms_ID{"ms_Arab_ID"}
+    ms_ID{"ms_Latn_ID"}
     mt{"mt_Latn_MT"}
     mtc{"mtc_Latn_ZZ"}
     mtf{"mtf_Latn_ZZ"}
index 6ab22dc802ced86ee55356a7167d1c0f35cd872d..4f1c3d79b7529bf7851edae85a949f9e0e9858fc 100644 (file)
@@ -1951,10 +1951,6 @@ metadata:table(nofallback){
                 reason{"deprecated"}
                 replacement{"cz72"}
             }
-            escn{
-                reason{"overlong"}
-                replacement{"IC"}
-            }
             fi01{
                 reason{"overlong"}
                 replacement{"AX"}
index 4786ec50626f87d11797eeee0ba01f7ed3191e83..ecb04aadb5269a6140ffbce7fa9b4ce4e9bcc9b5 100644 (file)
@@ -7944,7 +7944,6 @@ supplementalData:table(nofallback){
                 "czus",
                 "czvy",
                 "czzl",
-                "escn",
                 "fi01",
                 "fra~b",
                 "frbl",
@@ -7982,17 +7981,25 @@ supplementalData:table(nofallback){
                 "gbdgn",
                 "gbdow",
                 "gbdry",
+                "gbeaw",
+                "gbeng",
                 "gbfer",
+                "gbgbn",
                 "gblmv",
                 "gblrn",
                 "gblsb",
                 "gbmft",
                 "gbmyl",
                 "gbndn",
+                "gbnir",
                 "gbnta",
                 "gbnym",
                 "gbomh",
+                "gbsct",
                 "gbstb",
+                "gbukm",
+                "gbwls",
+                "ghba",
                 "glqa",
                 "gr01",
                 "gr03~7",
@@ -8007,6 +8014,7 @@ supplementalData:table(nofallback){
                 "gr91~4",
                 "gra1",
                 "is0",
+                "itao",
                 "itci",
                 "itgo",
                 "itog",
@@ -8023,18 +8031,15 @@ supplementalData:table(nofallback){
                 "mammd",
                 "mammn",
                 "masyb",
-                "mk01",
-                "mk09",
-                "mk15",
-                "mk17",
-                "mk28~9",
-                "mk31",
-                "mk38~9",
-                "mk57",
-                "mk68",
-                "mk77",
-                "mk79",
-                "mk84",
+                "mk01~9",
+                "mk10~9",
+                "mk20~9",
+                "mk30~9",
+                "mk40~9",
+                "mk50~9",
+                "mk60~9",
+                "mk70~9",
+                "mk80~5",
                 "mrnkc",
                 "mvce",
                 "mvnc",
@@ -8053,6 +8058,7 @@ supplementalData:table(nofallback){
                 "nzs",
                 "omba",
                 "omsh",
+                "pkta",
                 "plds",
                 "plkp",
                 "pllb",
@@ -8082,6 +8088,8 @@ supplementalData:table(nofallback){
                 "uspr",
                 "usum",
                 "usvi",
+                "zagt",
+                "zanl",
             }
             regular{
                 "ad02~8",
@@ -8794,8 +8802,7 @@ supplementalData:table(nofallback){
                 "esc",
                 "esca~c",
                 "esce",
-                "escl~m",
-                "esco",
+                "escl~o",
                 "escr~u",
                 "esex",
                 "esga",
@@ -8946,13 +8953,12 @@ supplementalData:table(nofallback){
                 "gbdud",
                 "gbdur",
                 "gbeal",
-                "gbeaw",
                 "gbeay",
                 "gbedh",
                 "gbedu",
                 "gbeln",
                 "gbels",
-                "gbenf~g",
+                "gbenf",
                 "gberw",
                 "gbery",
                 "gbess",
@@ -8962,7 +8968,6 @@ supplementalData:table(nofallback){
                 "gbfln",
                 "gbfmo",
                 "gbgat",
-                "gbgbn",
                 "gbglg",
                 "gbgls",
                 "gbgre",
@@ -9017,7 +9022,6 @@ supplementalData:table(nofallback){
                 "gbnet",
                 "gbnfk",
                 "gbngm",
-                "gbnir",
                 "gbnlk",
                 "gbnln",
                 "gbnmd",
@@ -9051,7 +9055,6 @@ supplementalData:table(nofallback){
                 "gbsaw",
                 "gbsay",
                 "gbscb",
-                "gbsct",
                 "gbsfk",
                 "gbsft",
                 "gbsgc",
@@ -9080,7 +9083,6 @@ supplementalData:table(nofallback){
                 "gbtof",
                 "gbtrf",
                 "gbtwh",
-                "gbukm",
                 "gbvgl",
                 "gbwar",
                 "gbwbk",
@@ -9091,7 +9093,6 @@ supplementalData:table(nofallback){
                 "gbwkf",
                 "gbwll",
                 "gbwln",
-                "gbwls",
                 "gbwlv",
                 "gbwnd",
                 "gbwnm",
@@ -9118,14 +9119,20 @@ supplementalData:table(nofallback){
                 "gesz",
                 "getb",
                 "ghaa",
+                "ghaf",
                 "ghah",
-                "ghba",
+                "ghbe",
+                "ghbo",
                 "ghcp",
                 "ghep",
+                "ghne",
                 "ghnp",
+                "ghot",
+                "ghsv",
                 "ghtv",
                 "ghue",
                 "ghuw",
+                "ghwn",
                 "ghwp",
                 "glav",
                 "glku",
@@ -9371,6 +9378,7 @@ supplementalData:table(nofallback){
                 "injk",
                 "inka",
                 "inkl",
+                "inla",
                 "inld",
                 "inmh",
                 "inml",
@@ -9432,7 +9440,8 @@ supplementalData:table(nofallback){
                 "it88",
                 "itag",
                 "ital",
-                "itan~r",
+                "itan",
+                "itap~r",
                 "itat",
                 "itav",
                 "itba",
@@ -9842,7 +9851,7 @@ supplementalData:table(nofallback){
                 "mdun",
                 "me01~9",
                 "me10~9",
-                "me20~3",
+                "me20~4",
                 "mga",
                 "mgd",
                 "mgf",
@@ -9873,22 +9882,20 @@ supplementalData:table(nofallback){
                 "mhuti",
                 "mhwth",
                 "mhwtj",
-                "mk02~8",
-                "mk10~4",
-                "mk16",
-                "mk18~9",
-                "mk20~7",
-                "mk30",
-                "mk32~7",
-                "mk40~9",
-                "mk50~6",
-                "mk58~9",
-                "mk60~7",
-                "mk69",
-                "mk70~6",
-                "mk78",
-                "mk80~3",
-                "mk85",
+                "mk101~9",
+                "mk201~9",
+                "mk210~1",
+                "mk301",
+                "mk303~4",
+                "mk307~8",
+                "mk310~3",
+                "mk401~9",
+                "mk410",
+                "mk501~9",
+                "mk601~9",
+                "mk701~6",
+                "mk801~9",
+                "mk810~7",
                 "ml1",
                 "ml10",
                 "ml2~9",
@@ -10288,7 +10295,6 @@ supplementalData:table(nofallback){
                 "pkkp",
                 "pkpb",
                 "pksd",
-                "pkta",
                 "pl02",
                 "pl04",
                 "pl06",
@@ -10967,11 +10973,11 @@ supplementalData:table(nofallback){
                 "yeta",
                 "zaec",
                 "zafs",
-                "zagt",
+                "zagp",
+                "zakzn",
                 "zalp",
                 "zamp",
                 "zanc",
-                "zanl",
                 "zanw",
                 "zawc",
                 "zm01~9",
@@ -21786,13 +21792,223 @@ supplementalData:table(nofallback){
             "ga9",
         }
         GB{
-            "gbeaw",
-            "gbeng",
-            "gbgbn",
-            "gbnir",
-            "gbsct",
-            "gbukm",
-            "gbwls",
+            "gbabc",
+            "gbabd",
+            "gbabe",
+            "gbagb",
+            "gbagy",
+            "gband",
+            "gbann",
+            "gbans",
+            "gbbas",
+            "gbbbd",
+            "gbbdf",
+            "gbbdg",
+            "gbben",
+            "gbbex",
+            "gbbfs",
+            "gbbge",
+            "gbbgw",
+            "gbbir",
+            "gbbkm",
+            "gbbmh",
+            "gbbne",
+            "gbbnh",
+            "gbbns",
+            "gbbol",
+            "gbbpl",
+            "gbbrc",
+            "gbbrd",
+            "gbbry",
+            "gbbst",
+            "gbbur",
+            "gbcam",
+            "gbcay",
+            "gbcbf",
+            "gbccg",
+            "gbcgn",
+            "gbche",
+            "gbchw",
+            "gbcld",
+            "gbclk",
+            "gbcma",
+            "gbcmd",
+            "gbcmn",
+            "gbcon",
+            "gbcov",
+            "gbcrf",
+            "gbcry",
+            "gbcwy",
+            "gbdal",
+            "gbdby",
+            "gbden",
+            "gbder",
+            "gbdev",
+            "gbdgy",
+            "gbdnc",
+            "gbdnd",
+            "gbdor",
+            "gbdrs",
+            "gbdud",
+            "gbdur",
+            "gbeal",
+            "gbeay",
+            "gbedh",
+            "gbedu",
+            "gbeln",
+            "gbels",
+            "gbenf",
+            "gberw",
+            "gbery",
+            "gbess",
+            "gbesx",
+            "gbfal",
+            "gbfif",
+            "gbfln",
+            "gbfmo",
+            "gbgat",
+            "gbglg",
+            "gbgls",
+            "gbgre",
+            "gbgwn",
+            "gbhal",
+            "gbham",
+            "gbhav",
+            "gbhck",
+            "gbhef",
+            "gbhil",
+            "gbhld",
+            "gbhmf",
+            "gbhns",
+            "gbhpl",
+            "gbhrt",
+            "gbhrw",
+            "gbhry",
+            "gbios",
+            "gbiow",
+            "gbisl",
+            "gbivc",
+            "gbkec",
+            "gbken",
+            "gbkhl",
+            "gbkir",
+            "gbktt",
+            "gbkwl",
+            "gblan",
+            "gblbc",
+            "gblbh",
+            "gblce",
+            "gblds",
+            "gblec",
+            "gblew",
+            "gblin",
+            "gbliv",
+            "gblnd",
+            "gblut",
+            "gbman",
+            "gbmdb",
+            "gbmdw",
+            "gbmea",
+            "gbmik",
+            "gbmln",
+            "gbmon",
+            "gbmrt",
+            "gbmry",
+            "gbmty",
+            "gbmul",
+            "gbnay",
+            "gbnbl",
+            "gbnel",
+            "gbnet",
+            "gbnfk",
+            "gbngm",
+            "gbnlk",
+            "gbnln",
+            "gbnmd",
+            "gbnsm",
+            "gbnth",
+            "gbntl",
+            "gbntt",
+            "gbnty",
+            "gbnwm",
+            "gbnwp",
+            "gbnyk",
+            "gbold",
+            "gbork",
+            "gboxf",
+            "gbpem",
+            "gbpkn",
+            "gbply",
+            "gbpol",
+            "gbpor",
+            "gbpow",
+            "gbpte",
+            "gbrcc",
+            "gbrch",
+            "gbrct",
+            "gbrdb",
+            "gbrdg",
+            "gbrfw",
+            "gbric",
+            "gbrot",
+            "gbrut",
+            "gbsaw",
+            "gbsay",
+            "gbscb",
+            "gbsfk",
+            "gbsft",
+            "gbsgc",
+            "gbshf",
+            "gbshn",
+            "gbshr",
+            "gbskp",
+            "gbslf",
+            "gbslg",
+            "gbslk",
+            "gbsnd",
+            "gbsol",
+            "gbsom",
+            "gbsos",
+            "gbsry",
+            "gbste",
+            "gbstg",
+            "gbsth",
+            "gbstn",
+            "gbsts",
+            "gbstt",
+            "gbsty",
+            "gbswa",
+            "gbswd",
+            "gbswk",
+            "gbtam",
+            "gbtfw",
+            "gbthr",
+            "gbtob",
+            "gbtof",
+            "gbtrf",
+            "gbtwh",
+            "gbvgl",
+            "gbwar",
+            "gbwbk",
+            "gbwdu",
+            "gbwft",
+            "gbwgn",
+            "gbwil",
+            "gbwkf",
+            "gbwll",
+            "gbwln",
+            "gbwlv",
+            "gbwnd",
+            "gbwnm",
+            "gbwok",
+            "gbwor",
+            "gbwrl",
+            "gbwrt",
+            "gbwrx",
+            "gbwsm",
+            "gbwsx",
+            "gbyor",
+            "gbzet",
         }
         GD{
             "gd01",
@@ -21819,14 +22035,20 @@ supplementalData:table(nofallback){
         }
         GH{
             "ghaa",
+            "ghaf",
             "ghah",
-            "ghba",
+            "ghbe",
+            "ghbo",
             "ghcp",
             "ghep",
+            "ghne",
             "ghnp",
+            "ghot",
+            "ghsv",
             "ghtv",
             "ghue",
             "ghuw",
+            "ghwn",
             "ghwp",
         }
         GL{
@@ -22058,6 +22280,7 @@ supplementalData:table(nofallback){
             "injk",
             "inka",
             "inkl",
+            "inla",
             "inld",
             "inmh",
             "inml",
@@ -22825,6 +23048,7 @@ supplementalData:table(nofallback){
             "me21",
             "me22",
             "me23",
+            "me24",
         }
         MG{
             "mga",
@@ -22839,77 +23063,86 @@ supplementalData:table(nofallback){
             "mht",
         }
         MK{
-            "mk02",
-            "mk03",
-            "mk04",
-            "mk05",
-            "mk06",
-            "mk07",
-            "mk08",
-            "mk10",
-            "mk11",
-            "mk12",
-            "mk13",
-            "mk14",
-            "mk16",
-            "mk18",
-            "mk19",
-            "mk20",
-            "mk21",
-            "mk22",
-            "mk23",
-            "mk24",
-            "mk25",
-            "mk26",
-            "mk27",
-            "mk30",
-            "mk32",
-            "mk33",
-            "mk34",
-            "mk35",
-            "mk36",
-            "mk37",
-            "mk40",
-            "mk41",
-            "mk42",
-            "mk43",
-            "mk44",
-            "mk45",
-            "mk46",
-            "mk47",
-            "mk48",
-            "mk49",
-            "mk50",
-            "mk51",
-            "mk52",
-            "mk53",
-            "mk54",
-            "mk55",
-            "mk56",
-            "mk58",
-            "mk59",
-            "mk60",
-            "mk61",
-            "mk62",
-            "mk63",
-            "mk64",
-            "mk65",
-            "mk66",
-            "mk67",
-            "mk69",
-            "mk70",
-            "mk71",
-            "mk72",
-            "mk73",
-            "mk74",
-            "mk75",
-            "mk76",
-            "mk78",
-            "mk80",
-            "mk81",
-            "mk82",
-            "mk83",
-            "mk85",
+            "mk101",
+            "mk102",
+            "mk103",
+            "mk104",
+            "mk105",
+            "mk106",
+            "mk107",
+            "mk108",
+            "mk109",
+            "mk201",
+            "mk202",
+            "mk203",
+            "mk204",
+            "mk205",
+            "mk206",
+            "mk207",
+            "mk208",
+            "mk209",
+            "mk210",
+            "mk211",
+            "mk301",
+            "mk303",
+            "mk304",
+            "mk307",
+            "mk308",
+            "mk310",
+            "mk311",
+            "mk312",
+            "mk313",
+            "mk401",
+            "mk402",
+            "mk403",
+            "mk404",
+            "mk405",
+            "mk406",
+            "mk407",
+            "mk408",
+            "mk409",
+            "mk410",
+            "mk501",
+            "mk502",
+            "mk503",
+            "mk504",
+            "mk505",
+            "mk506",
+            "mk507",
+            "mk508",
+            "mk509",
+            "mk601",
+            "mk602",
+            "mk603",
+            "mk604",
+            "mk605",
+            "mk606",
+            "mk607",
+            "mk608",
+            "mk609",
+            "mk701",
+            "mk702",
+            "mk703",
+            "mk704",
+            "mk705",
+            "mk706",
+            "mk801",
+            "mk802",
+            "mk803",
+            "mk804",
+            "mk805",
+            "mk806",
+            "mk807",
+            "mk808",
+            "mk809",
+            "mk810",
+            "mk811",
+            "mk812",
+            "mk813",
+            "mk814",
+            "mk815",
+            "mk816",
+            "mk817",
         }
         ML{
             "ml1",
@@ -23446,7 +23679,6 @@ supplementalData:table(nofallback){
             "pkkp",
             "pkpb",
             "pksd",
-            "pkta",
         }
         PL{
             "pl02",
@@ -24802,11 +25034,11 @@ supplementalData:table(nofallback){
         ZA{
             "zaec",
             "zafs",
-            "zagt",
+            "zagp",
+            "zakzn",
             "zalp",
             "zamp",
             "zanc",
-            "zanl",
             "zanw",
             "zawc",
         }
@@ -25404,231 +25636,6 @@ supplementalData:table(nofallback){
             "fr72",
             "fr85",
         }
-        gbeng{
-            "gbbas",
-            "gbbbd",
-            "gbbdf",
-            "gbbdg",
-            "gbben",
-            "gbbex",
-            "gbbir",
-            "gbbkm",
-            "gbbmh",
-            "gbbne",
-            "gbbnh",
-            "gbbns",
-            "gbbol",
-            "gbbpl",
-            "gbbrc",
-            "gbbrd",
-            "gbbry",
-            "gbbst",
-            "gbbur",
-            "gbcam",
-            "gbcbf",
-            "gbche",
-            "gbchw",
-            "gbcld",
-            "gbcma",
-            "gbcmd",
-            "gbcon",
-            "gbcov",
-            "gbcry",
-            "gbdal",
-            "gbdby",
-            "gbder",
-            "gbdev",
-            "gbdnc",
-            "gbdor",
-            "gbdud",
-            "gbdur",
-            "gbeal",
-            "gbenf",
-            "gbery",
-            "gbess",
-            "gbesx",
-            "gbgat",
-            "gbgls",
-            "gbgre",
-            "gbhal",
-            "gbham",
-            "gbhav",
-            "gbhck",
-            "gbhef",
-            "gbhil",
-            "gbhmf",
-            "gbhns",
-            "gbhpl",
-            "gbhrt",
-            "gbhrw",
-            "gbhry",
-            "gbios",
-            "gbiow",
-            "gbisl",
-            "gbkec",
-            "gbken",
-            "gbkhl",
-            "gbkir",
-            "gbktt",
-            "gbkwl",
-            "gblan",
-            "gblbh",
-            "gblce",
-            "gblds",
-            "gblec",
-            "gblew",
-            "gblin",
-            "gbliv",
-            "gblnd",
-            "gblut",
-            "gbman",
-            "gbmdb",
-            "gbmdw",
-            "gbmik",
-            "gbmrt",
-            "gbnbl",
-            "gbnel",
-            "gbnet",
-            "gbnfk",
-            "gbngm",
-            "gbnln",
-            "gbnsm",
-            "gbnth",
-            "gbntt",
-            "gbnty",
-            "gbnwm",
-            "gbnyk",
-            "gbold",
-            "gboxf",
-            "gbply",
-            "gbpol",
-            "gbpor",
-            "gbpte",
-            "gbrcc",
-            "gbrch",
-            "gbrdb",
-            "gbrdg",
-            "gbric",
-            "gbrot",
-            "gbrut",
-            "gbsaw",
-            "gbsfk",
-            "gbsft",
-            "gbsgc",
-            "gbshf",
-            "gbshn",
-            "gbshr",
-            "gbskp",
-            "gbslf",
-            "gbslg",
-            "gbsnd",
-            "gbsol",
-            "gbsom",
-            "gbsos",
-            "gbsry",
-            "gbste",
-            "gbsth",
-            "gbstn",
-            "gbsts",
-            "gbstt",
-            "gbsty",
-            "gbswd",
-            "gbswk",
-            "gbtam",
-            "gbtfw",
-            "gbthr",
-            "gbtob",
-            "gbtrf",
-            "gbtwh",
-            "gbwar",
-            "gbwbk",
-            "gbwft",
-            "gbwgn",
-            "gbwil",
-            "gbwkf",
-            "gbwll",
-            "gbwlv",
-            "gbwnd",
-            "gbwnm",
-            "gbwok",
-            "gbwor",
-            "gbwrl",
-            "gbwrt",
-            "gbwsm",
-            "gbwsx",
-            "gbyor",
-        }
-        gbnir{
-            "gbabc",
-            "gband",
-            "gbann",
-            "gbbfs",
-            "gbccg",
-            "gbdrs",
-            "gbfmo",
-            "gblbc",
-            "gbmea",
-            "gbmul",
-            "gbnmd",
-        }
-        gbsct{
-            "gbabd",
-            "gbabe",
-            "gbagb",
-            "gbans",
-            "gbclk",
-            "gbdgy",
-            "gbdnd",
-            "gbeay",
-            "gbedh",
-            "gbedu",
-            "gbeln",
-            "gbels",
-            "gberw",
-            "gbfal",
-            "gbfif",
-            "gbglg",
-            "gbhld",
-            "gbivc",
-            "gbmln",
-            "gbmry",
-            "gbnay",
-            "gbnlk",
-            "gbork",
-            "gbpkn",
-            "gbrfw",
-            "gbsay",
-            "gbscb",
-            "gbslk",
-            "gbstg",
-            "gbwdu",
-            "gbwln",
-            "gbzet",
-        }
-        gbwls{
-            "gbagy",
-            "gbbge",
-            "gbbgw",
-            "gbcay",
-            "gbcgn",
-            "gbcmn",
-            "gbcrf",
-            "gbcwy",
-            "gbden",
-            "gbfln",
-            "gbgwn",
-            "gbmon",
-            "gbmty",
-            "gbntl",
-            "gbnwp",
-            "gbpem",
-            "gbpow",
-            "gbrct",
-            "gbswa",
-            "gbtof",
-            "gbvgl",
-            "gbwrx",
-        }
         gnb{
             "gnbf",
             "gnbk",
@@ -25793,7 +25800,6 @@ supplementalData:table(nofallback){
             "itvb",
             "itvc",
         }
-        it23{"itao"}
         it25{
             "itbg",
             "itbs",
@@ -25941,47 +25947,47 @@ supplementalData:table(nofallback){
             "kn12",
         }
         lk1{
-            "lk52",
-            "lk71",
-            "lk81",
+            "lk11",
+            "lk12",
+            "lk13",
         }
         lk2{
-            "lk11",
-            "lk31",
-            "lk51",
+            "lk21",
+            "lk22",
+            "lk23",
         }
         lk3{
-            "lk12",
+            "lk31",
+            "lk32",
             "lk33",
-            "lk41",
         }
         lk4{
-            "lk13",
-            "lk21",
+            "lk41",
             "lk42",
-            "lk61",
-            "lk92",
+            "lk43",
+            "lk44",
+            "lk45",
         }
         lk5{
-            "lk22",
-            "lk32",
-            "lk43",
+            "lk51",
+            "lk52",
+            "lk53",
         }
         lk6{
-            "lk45",
-            "lk82",
+            "lk61",
+            "lk62",
         }
         lk7{
-            "lk23",
+            "lk71",
             "lk72",
         }
         lk8{
-            "lk62",
-            "lk91",
+            "lk81",
+            "lk82",
         }
         lk9{
-            "lk44",
-            "lk53",
+            "lk91",
+            "lk92",
         }
         ma01{
             "mache",
@@ -29596,8 +29602,11 @@ supplementalData:table(nofallback){
                 literacyShareF:int{49100000}
                 populationShareF:int{48300000}
             }
+            ms{
+                populationShareF:int{48340000}
+            }
             ms_Arab{
-                populationShareF:int{48460000}
+                populationShareF:int{48120000}
             }
             mwv{
                 populationShareF:int{46240000}
index ac522a98736ce58fdc6c80d9a8e5a625fe157991..dfeb458bab8b361cbfd7f73f62de87f4a25556a7 100644 (file)
@@ -14,7 +14,7 @@ af{
                 one{"{0} swaartekrag"}
                 other{"{0} swaartekrag"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meter per vierkante sekonde"}
                 one{"{0} meter per vierkante sekonde"}
                 other{"{0} meter per vierkante sekonde"}
@@ -123,11 +123,6 @@ af{
                 one{"{0} millimol per liter"}
                 other{"{0} millimol per liter"}
             }
-            part-per-million{
-                dnam{"dele per miljoen"}
-                one{"{0} deel per miljoen"}
-                other{"{0} dele per miljoen"}
-            }
             percent{
                 dnam{"persent"}
                 one{"{0} persent"}
@@ -138,6 +133,11 @@ af{
                 one{"{0} per duisend"}
                 other{"{0} per duisend"}
             }
+            permillion{
+                dnam{"dele per miljoen"}
+                one{"{0} deel per miljoen"}
+                other{"{0} dele per miljoen"}
+            }
             permyriad{
                 dnam{"per tienduisend"}
                 one{"{0} per tienduisend"}
@@ -145,7 +145,7 @@ af{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"liter per 100 kilometer"}
                 one{"{0} liter per 100 kilometer"}
                 other{"{0} liter per 100 kilometer"}
@@ -650,7 +650,7 @@ af{
                 one{"{0} hektopascal"}
                 other{"{0} hektopascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"duim kwik"}
                 one{"{0} duim kwik"}
                 other{"{0} duim kwik"}
@@ -670,12 +670,12 @@ af{
                 one{"{0} millibar"}
                 other{"{0} millibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"millimeter kwik"}
                 one{"{0} millimeter kwik"}
                 other{"{0} millimeter kwik"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"pond per vierkante duim"}
                 one{"{0} pond per vierkante duim"}
                 other{"{0} pond per vierkante duim"}
@@ -731,7 +731,7 @@ af{
                 one{"{0} newtonmeter"}
                 other{"{0} newtonmeter"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"pondvoet"}
                 one{"{0} pondvoet"}
                 other{"{0} pondvoet"}
@@ -933,7 +933,7 @@ af{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ℓ/100 km"}
                 one{"{0} ℓ/100 km"}
                 other{"{0} ℓ/100 km"}
@@ -1073,7 +1073,7 @@ af{
                 one{"{0}hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} dm.Hg"}
                 other{"{0} dm.Hg"}
             }
@@ -1131,7 +1131,7 @@ af{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1246,11 +1246,6 @@ af{
                 one{"{0} mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"dele/miljoen"}
-                one{"{0} d.p.m."}
-                other{"{0} d.p.m."}
-            }
             percent{
                 dnam{"percent"}
                 one{"{0}%"}
@@ -1261,6 +1256,11 @@ af{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"dele/miljoen"}
+                one{"{0} d.p.m."}
+                other{"{0} d.p.m."}
+            }
             permyriad{
                 dnam{"per tienduisend"}
                 one{"{0}‱"}
@@ -1268,7 +1268,7 @@ af{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ℓ/100 km"}
                 one{"{0} ℓ/100 km"}
                 other{"{0} ℓ/100 km"}
@@ -1794,7 +1794,7 @@ af{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"duim Hg"}
                 one{"{0} duim Hg"}
                 other{"{0} duim Hg"}
@@ -1814,7 +1814,7 @@ af{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
@@ -1824,7 +1824,7 @@ af{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"lb./vk. duim"}
                 one{"{0} pd.vk.dm."}
                 other{"{0} pd.vk.dm."}
@@ -1880,7 +1880,7 @@ af{
                 one{"{0} Nm"}
                 other{"{0} Nm"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lb.vt."}
                 one{"{0} lb.vt."}
                 other{"{0} lb.vt."}
index a40449b15724178bc192fd2e7e1ff0e15cdaf6c1..9f091f70b145226e32ebc794eda69040694f89e8 100644 (file)
@@ -14,7 +14,7 @@ am{
                 one{"{0} ጂ-ኃይል"}
                 other{"{0} ጂ-ኃይል"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"ሜ/ሰ²"}
                 one{"{0} ሜ/ሰ²"}
                 other{"{0} ሜ/ሰ²"}
@@ -123,11 +123,6 @@ am{
                 one{"{0} mmol/L"}
                 other{"{0} mmol/L"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"ፐርሰንት"}
                 one{"{0} ፐርሰንት"}
@@ -138,9 +133,14 @@ am{
                 one{"{0} በማይል"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ሊትሮች በ100 ኪሎሜትሮች"}
                 one{"{0} ሊትር በ100 ኪሎሜትሮች"}
                 other{"{0} ሊትሮች በ100 ኪሎሜትሮች"}
@@ -622,7 +622,7 @@ am{
                 one{"{0} ሄክቶፓስካል"}
                 other{"{0} ሄክቶፓስካል"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ኢንች ሜርኩሪ"}
                 one{"{0} ኢንች ሜርኩሪ"}
                 other{"{0} ኢንች ሜርኩሪ"}
@@ -642,7 +642,7 @@ am{
                 one{"{0} ሚሊባር"}
                 other{"{0} ሚሊባር"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
@@ -652,7 +652,7 @@ am{
                 one{"{0} ፓስካል"}
                 other{"{0} ፓስካል"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -900,7 +900,7 @@ am{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ሊትር በ100 ኪሎሜትሮች"}
                 one{"{0}ሊበ100ኪሜ"}
                 other{"{0}ሊበ100ኪሜ"}
@@ -1045,7 +1045,7 @@ am{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -1103,7 +1103,7 @@ am{
                 one{"{0} ጂ"}
                 other{"{0} ጂ"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"ሜ/ሰ²"}
                 one{"{0} ሜ/ሰ²"}
                 other{"{0} ሜ/ሰ²"}
@@ -1212,11 +1212,6 @@ am{
                 one{"{0} mmol/L"}
                 other{"{0} mmol/L"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"ፐርሰንት"}
                 one{"{0}%"}
@@ -1227,9 +1222,14 @@ am{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ሊትር በ100 ኪሎሜትሮች"}
                 one{"{0} ሊ/100ኪሜ"}
                 other{"{0} ሊ/100ኪሜ"}
@@ -1711,7 +1711,7 @@ am{
                 one{"{0} ሄክቶፓስካል"}
                 other{"{0} ሄክቶፓስካል"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ኢንች ሜርኩሪ"}
                 one{"{0} ኢሜ"}
                 other{"{0} ኢንሜር"}
@@ -1731,7 +1731,7 @@ am{
                 one{"{0} ሚባ"}
                 other{"{0} ሚባ"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
@@ -1741,7 +1741,7 @@ am{
                 one{"{0} ፓስካል"}
                 other{"{0} ፓስካል"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index 2128a602e27f0601f039a1934dde5ae0794302ac..c33132b9dc5d1dc98faf3640dc3efdecb7ed41ea 100644 (file)
@@ -18,7 +18,7 @@ ar{
                 two{"{0} قوة تسارع"}
                 zero{"{0} قوة تسارع"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"متر في الثانية المربعة"}
                 few{"{0} متر في الثانية المربعة"}
                 many{"{0} متر في الثانية المربعة"}
@@ -212,15 +212,6 @@ ar{
                 two{"{0} مول"}
                 zero{"{0} مول"}
             }
-            part-per-million{
-                dnam{"جزء في المليون"}
-                few{"{0} أجزاء في المليون"}
-                many{"{0} جزءًا في المليون"}
-                one{"{0} جزء في المليون"}
-                other{"{0} جزء في المليون"}
-                two{"جزآن في المليون"}
-                zero{"{0} جزء في المليون"}
-            }
             percent{
                 dnam{"بالمائة"}
                 few{"{0}٪"}
@@ -239,9 +230,18 @@ ar{
                 two{"{0} في الألف"}
                 zero{"{0} في الألف"}
             }
+            permillion{
+                dnam{"جزء في المليون"}
+                few{"{0} أجزاء في المليون"}
+                many{"{0} جزءًا في المليون"}
+                one{"{0} جزء في المليون"}
+                other{"{0} جزء في المليون"}
+                two{"جزآن في المليون"}
+                zero{"{0} جزء في المليون"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"لتر لكل ١٠٠ كيلومتر"}
                 few{"{0} لترات لكل ١٠٠ كيلومتر"}
                 many{"{0} لترًا لكل ١٠٠ كيلومتر"}
@@ -1152,7 +1152,7 @@ ar{
                 two{"{0} هكتوباسكال"}
                 zero{"{0} هكتوباسكال"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"بوصة زئبقية"}
                 few{"{0} بوصة زئبقية"}
                 many{"{0} بوصة زئبقية"}
@@ -1188,7 +1188,7 @@ ar{
                 two{"{0} ملي بار"}
                 zero{"{0} ملي بار"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"مليمتر زئبقي"}
                 few{"{0} مليمتر زئبقي"}
                 many{"{0} مليمتر زئبقي"}
@@ -1206,7 +1206,7 @@ ar{
                 two{"{0} باسكال"}
                 zero{"{0} باسكال"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"رطل لكل بوصة مربعة"}
                 few{"{0} رطل لكل بوصة مربعة"}
                 many{"{0} رطل لكل بوصة مربعة"}
@@ -1302,7 +1302,7 @@ ar{
                 two{"{0} نيوتن متر"}
                 zero{"{0} نيوتن متر"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"باوند قدم"}
                 few{"{0} باوند قدم"}
                 many{"{0} باوند قدم"}
@@ -1656,7 +1656,7 @@ ar{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ل/١٠٠كم"}
                 few{"{0} ل/١٠٠كم"}
                 many{"{0} ل/١٠٠كم"}
@@ -1906,7 +1906,7 @@ ar{
                 two{"{0} هكب"}
                 zero{"{0} هكب"}
             }
-            inch-hg{
+            inch-ofhg{
                 few{"{0} ب ز"}
                 many{"{0} ب ز"}
                 one{"{0} ب ز"}
@@ -2008,7 +2008,7 @@ ar{
                 two{"{0} قوة تسارع"}
                 zero{"{0} قوة تسارع"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"م/ث²"}
                 few{"{0} م/ث²"}
                 many{"{0} م/ث²"}
@@ -2203,15 +2203,6 @@ ar{
                 two{"{0} مول"}
                 zero{"{0} مول"}
             }
-            part-per-million{
-                dnam{"جزء/مليون"}
-                few{"{0} جزء/مليون"}
-                many{"{0} جزء/مليون"}
-                one{"{0} جزء/مليون"}
-                other{"{0} جزء/مليون"}
-                two{"{0} جزء/مليون"}
-                zero{"{0} جزء/مليون"}
-            }
             percent{
                 dnam{"بالمائة"}
                 few{"{0}٪"}
@@ -2230,9 +2221,18 @@ ar{
                 two{"{0}؉"}
                 zero{"{0}؉"}
             }
+            permillion{
+                dnam{"جزء/مليون"}
+                few{"{0} جزء/مليون"}
+                many{"{0} جزء/مليون"}
+                one{"{0} جزء/مليون"}
+                other{"{0} جزء/مليون"}
+                two{"{0} جزء/مليون"}
+                zero{"{0} جزء/مليون"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"لتر/‏١٠٠ كم"}
                 few{"{0} لتر/١٠٠ كم"}
                 many{"{0} لتر/١٠٠ كم"}
@@ -3143,7 +3143,7 @@ ar{
                 two{"{0} هكتوباسكال"}
                 zero{"{0} هكتوباسكال"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ب. زئبقية"}
                 few{"{0} ب. زئبقية"}
                 many{"{0} ب. زئبقية"}
@@ -3179,7 +3179,7 @@ ar{
                 two{"{0} م. بار"}
                 zero{"{0} م. بار"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"ملم زئبقي"}
                 few{"{0} ملم زئبقي"}
                 many{"{0} ملم زئبقي"}
@@ -3197,7 +3197,7 @@ ar{
                 two{"{0} باسكال"}
                 zero{"{0} باسكال"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"رطل/بوصة مربعة"}
                 few{"{0} رطل/بوصة²"}
                 many{"{0} رطل/بوصة²"}
@@ -3293,7 +3293,7 @@ ar{
                 two{"{0} نيوتن متر"}
                 zero{"{0} نيوتن متر"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"باوند قدم"}
                 few{"{0} باوند قدم"}
                 many{"{0} باوند قدم"}
index d6143f4191cd1c67e9828774247193e5efb604e7..d07e1a8acab1cad85c1919423f4878bc80966d44 100644 (file)
@@ -4,7 +4,7 @@ ar_SA{
     Version{"37"}
     units{
         acceleration{
-            meter-per-second-squared{
+            meter-per-square-second{
                 few{"{0} أمتار في الثانية المربعة"}
                 many{"{0} مترًا في الثانية المربعة"}
                 one{"{0} متر في الثانية المربعة"}
@@ -98,7 +98,7 @@ ar_SA{
             }
         }
         concentr{
-            part-per-million{
+            permillion{
                 few{"{0} أجزاء في المليون"}
                 many{"{0} جزءًا في المليون"}
                 one{"{0} جزء في المليون"}
@@ -278,7 +278,7 @@ ar_SA{
             }
         }
         pressure{
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 few{"{0} أرطال لكل بوصة مربعة"}
                 many{"{0} رطلًا لكل بوصة مربعة"}
                 one{"{0} رطل لكل بوصة مربعة"}
@@ -502,7 +502,7 @@ ar_SA{
                 two{"قيراطان"}
                 zero{"{0} قيراط"}
             }
-            part-per-million{
+            permillion{
                 few{"{0} أجزاء/مليون"}
                 many{"{0} جزءًا/مليون"}
                 one{"{0} جزء/مليون"}
@@ -512,7 +512,7 @@ ar_SA{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 few{"{0} لترات/١٠٠ كم"}
                 many{"{0} لترًا/١٠٠ كم"}
                 one{"{0} لتر/١٠٠ كم"}
@@ -707,7 +707,7 @@ ar_SA{
                 two{"{0} ميغاباسكال"}
                 zero{"{0} ميغاباسكال"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 few{"{0} أرطال/بوصة²"}
                 many{"{0} رطلًا/بوصة²"}
                 one{"{0} رطل/بوصة²"}
index d466e2a4faf7c5812248135a7b35f27e1ac4a06c..62e4842baaa552c0a49e901aafc068ea39851d9d 100644 (file)
@@ -14,7 +14,7 @@ as{
                 one{"{0} জি-বল"}
                 other{"{0} জি-বল"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"মিটাৰ প্ৰতি বৰ্গ ছেকেণ্ড"}
                 one{"{0} মিটাৰ প্ৰতি বৰ্গ ছেকেণ্ড"}
                 other{"{0} মিটাৰ প্ৰতি বৰ্গ ছেকেণ্ড"}
@@ -128,11 +128,6 @@ as{
                 one{"{0} ম’ল"}
                 other{"{0} ম’ল"}
             }
-            part-per-million{
-                dnam{"প্ৰতি মিলিয়নত ভাগ"}
-                one{"প্ৰতি মিলিয়নত {0} ভাগ"}
-                other{"প্ৰতি মিলিয়নত {0} ভাগ"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0} শতাংশ"}
@@ -143,6 +138,11 @@ as{
                 one{"{0} প্ৰতিমাইল"}
                 other{"{0} প্ৰতিমাইল"}
             }
+            permillion{
+                dnam{"প্ৰতি মিলিয়নত ভাগ"}
+                one{"প্ৰতি মিলিয়নত {0} ভাগ"}
+                other{"প্ৰতি মিলিয়নত {0} ভাগ"}
+            }
             permyriad{
                 dnam{"পাৰমিৰেইড"}
                 one{"{0} পাৰমিৰেইড"}
@@ -150,7 +150,7 @@ as{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"প্ৰতি ১০০ কিলোমিটাৰত লিটাৰ"}
                 one{"প্ৰতি ১০০ কিলোমিটাৰত {0} লিটাৰ"}
                 other{"প্ৰতি ১০০ কিলোমিটাৰত {0} লিটাৰ"}
@@ -635,7 +635,7 @@ as{
                 one{"{0} হেক্টোপাছকল"}
                 other{"{0} হেক্টোপাছকল"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ইঞ্চি মাৰ্কিউৰী"}
                 one{"{0} ইঞ্চি মাৰ্কিউৰী"}
                 other{"{0} ইঞ্চি মাৰ্কিউৰী"}
@@ -655,12 +655,12 @@ as{
                 one{"{0} মিলিবাৰ"}
                 other{"{0} মিলিবাৰ"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"মিলিমিটাৰ মাৰ্কিউৰী"}
                 one{"{0} মিলিমিটাৰ মাৰ্কিউৰী"}
                 other{"{0} মিলিমিটাৰ মাৰ্কিউৰী"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"প্ৰতি বৰ্গ ইঞ্চি পাউণ্ড"}
                 one{"{0} প্ৰতি বৰ্গ ইঞ্চি পাউণ্ড"}
                 other{"{0} প্ৰতি বৰ্গ ইঞ্চি পাউণ্ড"}
@@ -716,7 +716,7 @@ as{
                 one{"{0} নিউটন-মিটাৰ"}
                 other{"{0} নিউটন-মিটাৰ"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"পাউণ্ড-ফুট"}
                 one{"{0} পাউণ্ড-ফুট"}
                 other{"{0} পাউণ্ড-ফুট"}
@@ -872,7 +872,7 @@ as{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ল/১০০ ক.ম."}
                 one{"{0} ল/১০০ ক.ম."}
                 other{"{0} ল/১০০ ক.ম."}
@@ -990,7 +990,7 @@ as{
                 one{"{0} জি"}
                 other{"{0} জি"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"মিটাৰ/বৰ্গ ছেকেণ্ড"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1104,11 +1104,6 @@ as{
                 one{"{0} ম’ল"}
                 other{"{0} ম’ল"}
             }
-            part-per-million{
-                dnam{"ভাগ/মিলিয়ন"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"শতাংশ"}
                 one{"{0}%"}
@@ -1119,6 +1114,11 @@ as{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ভাগ/মিলিয়ন"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"পাৰমিৰেইড"}
                 one{"{0}‱"}
@@ -1126,7 +1126,7 @@ as{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"লিঃ/১০০ কিঃ মিঃ"}
                 one{"{0} ল/১০০ ক.ম."}
                 other{"{0} ল/১০০ ক.ম."}
@@ -1611,7 +1611,7 @@ as{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1631,12 +1631,12 @@ as{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1692,7 +1692,7 @@ as{
                 one{"{0} নি. মি."}
                 other{"{0} নি. মি."}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
index cbf377e9d8567a4900075e42ba35ce4fdb31ab0a..c8d880d560a14a24ba69448b471b18c8b954b529 100644 (file)
@@ -14,7 +14,7 @@ ast{
                 one{"{0} fuercia g"}
                 other{"{0} fuercies gues"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metros per segundu al cuadráu"}
                 one{"{0} metru per segundu al cuadráu"}
                 other{"{0} metros por segundu al cuadráu"}
@@ -118,14 +118,14 @@ ast{
                 one{"{0} milimol per llitru"}
                 other{"{0} milimoles per llitru"}
             }
-            part-per-million{
+            permillion{
                 dnam{"partes per millón"}
                 one{"{0} parte per millón"}
                 other{"{0} partes per millón"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"llitros per 100 quilómetros"}
                 one{"{0} llitru per 100 quilómetros"}
                 other{"{0} llitros per 100 quilómetros"}
@@ -557,7 +557,7 @@ ast{
                 one{"{0} hectopascal"}
                 other{"{0} hectopascales"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"pulgaes de mercuriu"}
                 one{"{0} pulgada de mercuriu"}
                 other{"{0} pulgaes de mercuriu"}
@@ -567,12 +567,12 @@ ast{
                 one{"{0} milibar"}
                 other{"{0} milibares"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milímetros de mercuriu"}
                 one{"{0} milímetru de mercuriu"}
                 other{"{0} milímetros de mercuriu"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"llibres per pulgada cuadrada"}
                 one{"{0} llibra per pulgada cuadrada"}
                 other{"{0} llibres per pulgada cuadrada"}
@@ -762,7 +762,7 @@ ast{
                 one{"{0}G"}
                 other{"{0}Gs"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0}m/s²"}
                 other{"{0}m/s²"}
@@ -866,14 +866,14 @@ ast{
                 one{"{0}mmol/L"}
                 other{"{0}mmol/L"}
             }
-            part-per-million{
+            permillion{
                 dnam{"ppm"}
                 one{"{0}ppm"}
                 other{"{0}ppm"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0}L/100km"}
                 other{"{0}L/100km"}
@@ -1300,7 +1300,7 @@ ast{
                 one{"{0}hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"″ Hg"}
                 one{"{0}″ Hg"}
                 other{"{0}″ Hg"}
@@ -1310,12 +1310,12 @@ ast{
                 one{"{0}mb"}
                 other{"{0}mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0}mm Hg"}
                 other{"{0}mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0}psi"}
                 other{"{0}psi"}
@@ -1505,7 +1505,7 @@ ast{
                 one{"{0} G"}
                 other{"{0} Gs"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1609,14 +1609,14 @@ ast{
                 one{"{0} mmol/L"}
                 other{"{0} mmol/L"}
             }
-            part-per-million{
+            permillion{
                 dnam{"ppm"}
                 one{"{0} ppm"}
                 other{"{0} ppm"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100 km"}
                 one{"{0} L/100 km"}
                 other{"{0} L/100 km"}
@@ -2048,7 +2048,7 @@ ast{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"in Hg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -2058,12 +2058,12 @@ ast{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index 4c6f8cb681081d5cc884bb3291e1d258ce911302..ed3b5d25421967ddcc68bae1eccb79b1d7578934 100644 (file)
@@ -14,7 +14,7 @@ az{
                 one{"{0} g qüvvəsi"}
                 other{"{0} g qüvvəsi"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metr saniyə kvadratı"}
                 one{"{0} metr saniyə kvadratı"}
                 other{"{0} metr saniyə kvadratı"}
@@ -123,11 +123,6 @@ az{
                 one{"{0} millimol/litr"}
                 other{"{0} millimol/litr"}
             }
-            part-per-million{
-                dnam{"milyonda hissəcik"}
-                one{"milyonda {0} hissəcik"}
-                other{"milyonda {0} hissəcik"}
-            }
             percent{
                 dnam{"faiz"}
                 one{"{0} faiz"}
@@ -138,6 +133,11 @@ az{
                 one{"{0} promil"}
                 other{"{0} promil"}
             }
+            permillion{
+                dnam{"milyonda hissəcik"}
+                one{"milyonda {0} hissəcik"}
+                other{"milyonda {0} hissəcik"}
+            }
             permyriad{
                 dnam{"permiriada"}
                 one{"{0} permiriada"}
@@ -145,7 +145,7 @@ az{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"100 kilometrə litr"}
                 one{"100 kilometrə {0} litr"}
                 other{"100 kilometrə {0} litr"}
@@ -670,7 +670,7 @@ az{
                 one{"{0} hektopaskal"}
                 other{"{0} hektopaskal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"civə düymü"}
                 one{"{0} civə düymü"}
                 other{"{0} civə düymü"}
@@ -690,7 +690,7 @@ az{
                 one{"{0} millibar"}
                 other{"{0} millibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"millimetr civə sütunu"}
                 one{"{0} millimetr civə sütunu"}
                 other{"{0} millimetr civə sütunu"}
@@ -700,7 +700,7 @@ az{
                 one{"{0} paskal"}
                 other{"{0} paskal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"funt/kvadrat düym"}
                 one{"{0} funt/kvadrat düym"}
                 other{"{0} funt/kvadrat düym"}
@@ -756,7 +756,7 @@ az{
                 one{"{0} nyuton-metr"}
                 other{"{0} nyuton-metr"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"funt-fut"}
                 one{"{0} funt-fut"}
                 other{"{0} funt-fut"}
@@ -956,7 +956,7 @@ az{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 one{"{0} l/100km"}
                 other{"{0} l/100km"}
@@ -1099,7 +1099,7 @@ az{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -1157,7 +1157,7 @@ az{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1267,11 +1267,6 @@ az{
                 one{"{0} mmol/l"}
                 other{"{0} mmol/l"}
             }
-            part-per-million{
-                dnam{"hissəcik/milyon"}
-                one{"{0} hs/mln"}
-                other{"{0} hs/mln"}
-            }
             percent{
                 dnam{"faiz"}
                 one{"{0}%"}
@@ -1282,12 +1277,17 @@ az{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"hissəcik/milyon"}
+                one{"{0} hs/mln"}
+                other{"{0} hs/mln"}
+            }
             permyriad{
                 dnam{"permiriada"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 one{"{0} l/100km"}
                 other{"{0} l/100km"}
@@ -1798,7 +1798,7 @@ az{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"civə düymü"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1808,7 +1808,7 @@ az{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
@@ -1818,7 +1818,7 @@ az{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index c40ab6fb98a20a2f554a8b6030e272d000ce6022..d9d5673af0863f14899e7af3150f49aa0f73866c 100644 (file)
@@ -16,7 +16,7 @@ be{
                 one{"{0} g"}
                 other{"{0} g"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"м/с²"}
                 few{"{0} м/с²"}
                 many{"{0} м/с²"}
@@ -170,13 +170,6 @@ be{
                 one{"{0} моль"}
                 other{"{0} моля"}
             }
-            part-per-million{
-                dnam{"частак на мільён"}
-                few{"{0} часткі на мільён"}
-                many{"{0} частак на мільён"}
-                one{"{0} частка на мільён"}
-                other{"{0} часткі на мільён"}
-            }
             percent{
                 dnam{"працэнтаў"}
                 few{"{0} працэнты"}
@@ -191,6 +184,13 @@ be{
                 one{"{0} праміле"}
                 other{"{0} праміле"}
             }
+            permillion{
+                dnam{"частак на мільён"}
+                few{"{0} часткі на мільён"}
+                many{"{0} частак на мільён"}
+                one{"{0} частка на мільён"}
+                other{"{0} часткі на мільён"}
+            }
             permyriad{
                 dnam{"базісныя пункты"}
                 few{"{0} базісныя пункты"}
@@ -200,7 +200,7 @@ be{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"літры на 100 кіламетраў"}
                 few{"{0} літры на 100 кіламетраў"}
                 many{"{0} літраў на 100 кіламетраў"}
@@ -919,7 +919,7 @@ be{
                 one{"{0} гектапаскаль"}
                 other{"{0} гектапаскаля"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"цалі ртутнага слупа"}
                 few{"{0} цалі ртутнага слупа"}
                 many{"{0} цаляў ртутнага слупа"}
@@ -947,7 +947,7 @@ be{
                 one{"{0} мілібар"}
                 other{"{0} мілібара"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"міліметры ртутнага слупа"}
                 few{"{0} міліметры ртутнага слупа"}
                 many{"{0} міліметраў ртутнага слупа"}
@@ -961,7 +961,7 @@ be{
                 one{"{0} паскаль"}
                 other{"{0} паскаля"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"фунты на квадратную цалю"}
                 few{"{0} фунты на квадратную цалю"}
                 many{"{0} фунтаў на квадратную цалю"}
@@ -1037,7 +1037,7 @@ be{
                 one{"{0} ньютан-метр"}
                 other{"{0} ньютан-метра"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"фунт-футы"}
                 few{"{0} фунт-футы"}
                 many{"{0} фунт-футаў"}
@@ -1249,7 +1249,7 @@ be{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"л/100 км"}
                 few{"{0} л/100 км"}
                 many{"{0} л/100 км"}
@@ -1401,7 +1401,7 @@ be{
                 one{"{0} g"}
                 other{"{0} g"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"м/с²"}
                 few{"{0} м/с²"}
                 many{"{0} м/с²"}
@@ -1556,13 +1556,6 @@ be{
                 one{"{0} моль"}
                 other{"{0} моля"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                few{"{0} ppm"}
-                many{"{0} ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 few{"{0} %"}
@@ -1577,6 +1570,13 @@ be{
                 one{"{0} ‰"}
                 other{"{0} ‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                few{"{0} ppm"}
+                many{"{0} ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"‱"}
                 few{"{0} ‱"}
@@ -1586,7 +1586,7 @@ be{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"л/100 км"}
                 few{"{0} л/100 км"}
                 many{"{0} л/100 км"}
@@ -2305,7 +2305,7 @@ be{
                 one{"{0} гПа"}
                 other{"{0} гПа"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"цалі рт. сл."}
                 few{"{0} цалі рт. сл."}
                 many{"{0} цаляў рт. сл."}
@@ -2333,7 +2333,7 @@ be{
                 one{"{0} мбар"}
                 other{"{0} мбар"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"мм рт. сл."}
                 few{"{0} мм рт. сл."}
                 many{"{0} мм рт. сл."}
@@ -2347,7 +2347,7 @@ be{
                 one{"{0} Па"}
                 other{"{0} Па"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"фунты на кв. цалю"}
                 few{"{0} фунты на кв. цалю"}
                 many{"{0} фунтаў на кв. цалю"}
@@ -2423,7 +2423,7 @@ be{
                 one{"{0} Н⋅м"}
                 other{"{0} Н⋅м"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"фунт-футы"}
                 few{"{0} фунт-футы"}
                 many{"{0} фунт-футаў"}
index ed044349079c7fd746877c330f88c6e6a7b04be8..cbaebfc516497c610526a02874da306c03b72850 100644 (file)
@@ -14,7 +14,7 @@ bg{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"метри за секунда на квадрат"}
                 one{"{0} метър за секунда на квадрат"}
                 other{"{0} метра за секунда на квадрат"}
@@ -128,11 +128,6 @@ bg{
                 one{"{0} мол"}
                 other{"{0} мола"}
             }
-            part-per-million{
-                dnam{"части на милион"}
-                one{"{0} част на милион"}
-                other{"{0} части на милион"}
-            }
             percent{
                 dnam{"процент"}
                 one{"{0} процент"}
@@ -143,6 +138,11 @@ bg{
                 one{"{0} промил"}
                 other{"{0} промила"}
             }
+            permillion{
+                dnam{"части на милион"}
+                one{"{0} част на милион"}
+                other{"{0} части на милион"}
+            }
             permyriad{
                 dnam{"базисен пункт"}
                 one{"{0} базисен пункт"}
@@ -150,7 +150,7 @@ bg{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"литри на 100 километра"}
                 one{"{0} литър на 100 километра"}
                 other{"{0} литра на 100 километра"}
@@ -675,7 +675,7 @@ bg{
                 one{"{0} хектопаскал"}
                 other{"{0} хектопаскала"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"инчове живачен стълб"}
                 one{"{0} инч живачен стълб"}
                 other{"{0} инча живачен стълб"}
@@ -695,7 +695,7 @@ bg{
                 one{"{0} милибар"}
                 other{"{0} милибара"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"милиметри живачен стълб"}
                 one{"{0} мм живачен стълб"}
                 other{"{0} мм живачен стълб"}
@@ -705,7 +705,7 @@ bg{
                 one{"{0} паскал"}
                 other{"{0} паскала"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"фунтове на квадратен инч"}
                 one{"{0} фунт на квадратен инч"}
                 other{"{0} фунта на квадратен инч"}
@@ -761,7 +761,7 @@ bg{
                 one{"{0} нютон-метър"}
                 other{"{0} нютон-метра"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"фунт-футове"}
                 one{"{0} фунт-фут"}
                 other{"{0} фунт-фута"}
@@ -963,7 +963,7 @@ bg{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1103,7 +1103,7 @@ bg{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -1161,7 +1161,7 @@ bg{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1270,11 +1270,6 @@ bg{
                 one{"{0} мол"}
                 other{"{0} мол"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"процент"}
                 one{"{0}%"}
@@ -1284,6 +1279,11 @@ bg{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"базисен пункт"}
                 one{"{0}‱"}
@@ -1291,7 +1291,7 @@ bg{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1759,7 +1759,7 @@ bg{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1779,12 +1779,12 @@ bg{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1840,7 +1840,7 @@ bg{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
index c81ea2d2c975582f6c3e3f306e674bba71ecf855..03a30015d0b943bc1ced41dd59c5040f928350ec 100644 (file)
@@ -14,7 +14,7 @@ bn{
                 one{"{0} জি-বল"}
                 other{"{0} জি-বল"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"মিটার প্রতি বর্গ সেকেন্ডে"}
                 one{"{0} মিটার প্রতি বর্গ সেকেন্ডে"}
                 other{"{0} মিটার প্রতি বর্গ সেকেন্ডে"}
@@ -123,11 +123,6 @@ bn{
                 one{"{0} মিলিমোল, প্রতি লিটারে"}
                 other{"{0} মিলিমোল, প্রতি লিটারে"}
             }
-            part-per-million{
-                dnam{"ভাগ, প্রতি মিলিয়নে"}
-                one{"{0} ভাগ, প্রতি মিলিয়নে"}
-                other{"{0} ভাগ, প্রতি মিলিয়নে"}
-            }
             percent{
                 dnam{"শতাংশ"}
                 one{"{0}শতাংশ"}
@@ -138,9 +133,14 @@ bn{
                 one{"{0} প্রতিমাইল"}
                 other{"{0}প্রতিমাইল"}
             }
+            permillion{
+                dnam{"ভাগ, প্রতি মিলিয়নে"}
+                one{"{0} ভাগ, প্রতি মিলিয়নে"}
+                other{"{0} ভাগ, প্রতি মিলিয়নে"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"লিটার, প্রতি ১০০ কিলোমিটারে"}
                 one{"{0} লিটার, প্রতি ১০০ কিলোমিটারে"}
                 other{"{0} লিটার, প্রতি ১০০ কিলোমিটারে"}
@@ -660,7 +660,7 @@ bn{
                 one{"{0} হেক্টোপাসকল"}
                 other{"{0} হেক্টোপাসকল"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ইঞ্চি পারদ"}
                 one{"{0} ইঞ্চি পারদ"}
                 other{"{0} ইঞ্চি পারদ"}
@@ -680,7 +680,7 @@ bn{
                 one{"{0} মিলিবার"}
                 other{"{0} মিলিবার"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"মিলিমিটার পারদ"}
                 one{"{0} মিলিমিটার পারদ"}
                 other{"{0} মিলিমিটার পারদ"}
@@ -690,7 +690,7 @@ bn{
                 one{"{0} প্যাসকেল"}
                 other{"{0} প্যাসকেল"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"বর্গইঞ্চি প্রতি পাউন্ড"}
                 one{"{0} বর্গইঞ্চি প্রতি পাউন্ড"}
                 other{"{0} বর্গইঞ্চি প্রতি পাউন্ড"}
@@ -891,7 +891,7 @@ bn{
                 one{"{0} জি-বল"}
                 other{"{0} জি-বল"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -948,7 +948,7 @@ bn{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -1212,7 +1212,7 @@ bn{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1222,12 +1222,12 @@ bn{
                 one{"{0} mb"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1300,7 +1300,7 @@ bn{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1409,11 +1409,6 @@ bn{
                 one{"{0} mmol/L"}
                 other{"{0} mmol/L"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"শতাংশ"}
                 one{"{0}%"}
@@ -1424,9 +1419,14 @@ bn{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -1909,7 +1909,7 @@ bn{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1919,12 +1919,12 @@ bn{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index f3cc062e1a2facfb61783cd931932cb6c23fa866..4df7507bc38554bc6042fbe2bc5bff7ea5d34270 100644 (file)
@@ -9,7 +9,7 @@ br{
     }
     units{
         acceleration{
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metroù dre eilenn garrez"}
                 few{"{0} metr dre eilenn garrez"}
                 many{"{0} a vetroù dre eilenn garrez"}
@@ -194,7 +194,7 @@ br{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litroù dre 100 kilometr"}
                 few{"{0} litr dre 100 kilometr"}
                 many{"{0} a litroù dre 100 kilometr"}
@@ -1032,7 +1032,7 @@ br{
                 other{"{0} paskal"}
                 two{"{0} baskal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"lurioù dre veutad karrez"}
                 few{"{0} lur dre veutad karrez"}
                 many{"{0} a lurioù dre veutad karrez"}
@@ -1353,7 +1353,7 @@ br{
                 other{"{0}G"}
                 two{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0}m/s²"}
                 many{"{0}m/s²"}
@@ -1548,7 +1548,7 @@ br{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 few{"{0}l/100km"}
                 many{"{0}l/100km"}
@@ -2344,7 +2344,7 @@ br{
                 other{"{0}hPa"}
                 two{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"″Hg"}
                 few{"{0}″Hg"}
                 many{"{0}″Hg"}
@@ -2374,7 +2374,7 @@ br{
                 other{"{0}mbar"}
                 two{"{0}mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 few{"{0}mmHg"}
                 many{"{0}mmHg"}
@@ -2389,7 +2389,7 @@ br{
                 other{"{0}Pa"}
                 two{"{0}Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"lb/in²"}
                 few{"{0}lb/in²"}
                 many{"{0}lb/in²"}
@@ -2474,7 +2474,7 @@ br{
                 other{"{0}N⋅m"}
                 two{"{0}N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 few{"{0}lbf⋅ft"}
                 many{"{0}lbf⋅ft"}
                 one{"{0}lbf⋅ft"}
@@ -2707,7 +2707,7 @@ br{
             g-force{
                 dnam{"G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0} m/s²"}
                 many{"{0} m/s²"}
@@ -2888,7 +2888,7 @@ br{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 few{"{0} l/100km"}
                 many{"{0} l/100km"}
@@ -3598,7 +3598,7 @@ br{
                 other{"{0} hPa"}
                 two{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 few{"{0} inHg"}
                 many{"{0} inHg"}
@@ -3614,7 +3614,7 @@ br{
                 other{"{0} mbar"}
                 two{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 few{"{0} mmHg"}
                 many{"{0} mmHg"}
@@ -3622,7 +3622,7 @@ br{
                 other{"{0} mmHg"}
                 two{"{0} mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"lb/in²"}
                 few{"{0} lb/in²"}
                 many{"{0} lb/in²"}
index f1f1f7042da47f352b4fa1dc63d380459fa6f9e0..53c13cea2dcce7391cdf214e866e08ecee07d1f6 100644 (file)
@@ -15,7 +15,7 @@ bs{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metri u sekundi na kvadrat"}
                 few{"{0} metra u sekundi na kvadrat"}
                 one{"{0} metar u sekundi na kvadrat"}
@@ -149,12 +149,6 @@ bs{
                 one{"{0} mol"}
                 other{"{0} mola"}
             }
-            part-per-million{
-                dnam{"dijelovi na milion"}
-                few{"{0} dijela na milion"}
-                one{"{0} dio na milion"}
-                other{"{0} dijelova na milion"}
-            }
             percent{
                 dnam{"procenat"}
                 few{"{0} procenta"}
@@ -167,6 +161,12 @@ bs{
                 one{"{0} promil"}
                 other{"{0} promila"}
             }
+            permillion{
+                dnam{"dijelovi na milion"}
+                few{"{0} dijela na milion"}
+                one{"{0} dio na milion"}
+                other{"{0} dijelova na milion"}
+            }
             permyriad{
                 dnam{"permyriad"}
                 few{"{0} permyriada"}
@@ -175,7 +175,7 @@ bs{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litri na 100 kilometara"}
                 few{"{0} litra na 100 kilometara"}
                 one{"{0} litar na 100 kilometara"}
@@ -755,7 +755,7 @@ bs{
                 one{"{0} hektopaskal"}
                 other{"{0} hektopaskala"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inči živinog stuba"}
                 few{"{0} inča živinog stuba"}
                 one{"{0} inč živinog stuba"}
@@ -779,7 +779,7 @@ bs{
                 one{"{0} milibar"}
                 other{"{0} milibara"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimetri živinog stuba"}
                 few{"{0} milimetra živinog stuba"}
                 one{"{0} milimetar živinog stuba"}
@@ -791,7 +791,7 @@ bs{
                 one{"{0} paskal"}
                 other{"{0} paskala"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"funte po kvadratnom inču"}
                 few{"{0} funte po kvadratnom inču"}
                 one{"{0} funta po kvadratnom inču"}
@@ -857,7 +857,7 @@ bs{
                 one{"{0} njutn-metar"}
                 other{"{0} njutn-metara"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"funte sile po stopi"}
                 few{"{0} funte sile po stopi"}
                 one{"{0} funta sile po stopi"}
@@ -1041,7 +1041,7 @@ bs{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100 km"}
                 few{"{0} L/100 km"}
                 one{"{0} L/100 km"}
@@ -1178,7 +1178,7 @@ bs{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0} m/s²"}
                 one{"{0} m/s²"}
@@ -1313,12 +1313,6 @@ bs{
                 one{"{0} mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"dijelovi/milion"}
-                few{"{0} ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 few{"{0}%"}
@@ -1331,6 +1325,12 @@ bs{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"dijelovi/milion"}
+                few{"{0} ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"‱"}
                 few{"{0}‱"}
@@ -1339,7 +1339,7 @@ bs{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100 km"}
                 few{"{0} L/100 km"}
                 one{"{0} L/100 km"}
@@ -1962,7 +1962,7 @@ bs{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"in Hg"}
                 few{"{0} inHg"}
                 one{"{0} inHg"}
@@ -1986,7 +1986,7 @@ bs{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 few{"{0} mm Hg"}
                 one{"{0} mm Hg"}
@@ -1998,7 +1998,7 @@ bs{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 few{"{0} psi"}
                 one{"{0} psi"}
@@ -2064,7 +2064,7 @@ bs{
                 one{"{0} Nm"}
                 other{"{0} Nm"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 few{"{0} lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
index 07dd4552e27fa0b08d3c9c7f186aa6c76970b13c..97a91f2520ca4c5e4f463d0395357017f6892484 100644 (file)
@@ -14,7 +14,7 @@ ca{
                 one{"{0} força G"}
                 other{"{0} força G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metres per segon al quadrat"}
                 one{"{0} metre per segon al quadrat"}
                 other{"{0} metres per segon al quadrat"}
@@ -128,11 +128,6 @@ ca{
                 one{"{0} mol"}
                 other{"{0} mols"}
             }
-            part-per-million{
-                dnam{"parts per milió"}
-                one{"{0} part per milió"}
-                other{"{0} parts per milió"}
-            }
             percent{
                 dnam{"per cent"}
                 one{"{0} per cent"}
@@ -143,6 +138,11 @@ ca{
                 one{"{0} per mil"}
                 other{"{0} per mil"}
             }
+            permillion{
+                dnam{"parts per milió"}
+                one{"{0} part per milió"}
+                other{"{0} parts per milió"}
+            }
             permyriad{
                 dnam{"per deu mil"}
                 one{"{0} per deu mil"}
@@ -150,7 +150,7 @@ ca{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litres per 100 quilòmetres"}
                 one{"{0} litre per 100 quilòmetres"}
                 other{"{0} litres per 100 quilòmetres"}
@@ -675,7 +675,7 @@ ca{
                 one{"{0} hectopascal"}
                 other{"{0} hectopascals"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"polzades de mercuri"}
                 one{"{0} polzada de mercuri"}
                 other{"{0} polzades de mercuri"}
@@ -695,7 +695,7 @@ ca{
                 one{"{0} mil·libar"}
                 other{"{0} mil·libars"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mil·límetres de mercuri"}
                 one{"mil·límetre de mercuri"}
                 other{"{0} mil·límetres de mercuri"}
@@ -705,7 +705,7 @@ ca{
                 one{"{0} pascal"}
                 other{"{0} pascals"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"lliures per polzada quadrada"}
                 one{"{0} lliura per polzada quadrada"}
                 other{"{0} lliures per polzada quadrada"}
@@ -761,7 +761,7 @@ ca{
                 one{"{0} newton-metre"}
                 other{"{0} newtons-metre"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lliures-peu"}
                 one{"{0} lliura-peu"}
                 other{"{0} lliures-peu"}
@@ -964,7 +964,7 @@ ca{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1182,7 +1182,7 @@ ca{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1292,11 +1292,6 @@ ca{
                 one{"{0} mM/l"}
                 other{"{0} mM/l"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"per cent"}
                 one{"{0} %"}
@@ -1307,12 +1302,17 @@ ca{
                 one{"{0} ‰"}
                 other{"{0} ‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"per deu mil"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1812,7 +1812,7 @@ ca{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1825,7 +1825,7 @@ ca{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
@@ -1835,7 +1835,7 @@ ca{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1891,7 +1891,7 @@ ca{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
index 56ac3668fc0d03ce2575cbbb1951cd795f859be8..ae5929104761ebbff2ef2f7370755cf71309374a 100644 (file)
@@ -14,7 +14,7 @@ ccp{
                 one{"{0} 𑄎𑄨-𑄝𑄧𑄣𑄴"}
                 other{"{0} 𑄎𑄨-𑄝𑄧𑄣𑄴"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"𑄟𑄨𑄑𑄢𑄴 𑄛𑄳𑄢𑄧𑄖𑄨 𑄝𑄧𑄢𑄴𑄉𑄧 𑄥𑄬𑄇𑄬𑄚𑄳𑄓𑄴"}
                 one{"{0} 𑄟𑄨𑄑𑄢𑄴 𑄛𑄳𑄢𑄧𑄖𑄨 𑄝𑄧𑄢𑄴𑄉𑄧 𑄥𑄬𑄇𑄬𑄚𑄴𑄓𑄬"}
                 other{"{0} 𑄟𑄨𑄑𑄢𑄴 𑄛𑄳𑄢𑄧𑄖𑄨 𑄝𑄧𑄢𑄴𑄉𑄧 𑄥𑄬𑄇𑄬𑄚𑄴𑄓𑄬"}
@@ -118,14 +118,14 @@ ccp{
                 one{"{0} 𑄟𑄨𑄣𑄨𑄟𑄮𑄣𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄣𑄨𑄑𑄢𑄬"}
                 other{"{0} 𑄟𑄨𑄣𑄨𑄟𑄮𑄣𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄣𑄨𑄑𑄢𑄬"}
             }
-            part-per-million{
+            permillion{
                 dnam{"𑄞𑄇𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄘𑄧𑄌𑄴 𑄣𑄬𑄉"}
                 one{"{0} 𑄞𑄧𑄇𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄘𑄧𑄌𑄴 𑄣𑄉𑄬"}
                 other{"{0} 𑄞𑄧𑄇𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄘𑄧𑄌𑄴 𑄣𑄉𑄬"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"𑄣𑄨𑄑𑄢𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄷𑄶𑄶 𑄇𑄨𑄣𑄮𑄟𑄨𑄑𑄢𑄬"}
                 one{"{0} 𑄣𑄨𑄑𑄢𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄷𑄶𑄶 𑄇𑄨𑄣𑄮𑄟𑄨𑄑𑄢𑄬"}
                 other{"{0} 𑄣𑄨𑄑𑄢𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄷𑄶𑄶 𑄇𑄨𑄣𑄮𑄟𑄨𑄑𑄢𑄬"}
@@ -537,7 +537,7 @@ ccp{
                 one{"{0} 𑄦𑄬𑄇𑄴𑄑𑄮𑄛𑄥𑄴𑄇𑄧𑄣𑄴"}
                 other{"{0} 𑄦𑄬𑄇𑄴𑄑𑄮𑄛𑄥𑄴𑄇𑄧𑄣𑄴"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"𑄃𑄨𑄚𑄴𑄌𑄨 𑄛𑄢𑄧𑄖𑄴"}
                 one{"{0} 𑄃𑄨𑄚𑄴𑄌𑄨 𑄛𑄢𑄧𑄖𑄴"}
                 other{"{0} 𑄃𑄨𑄚𑄴𑄌𑄨 𑄛𑄢𑄧𑄖𑄴"}
@@ -547,12 +547,12 @@ ccp{
                 one{"{0} 𑄟𑄨𑄣𑄨𑄝𑄢𑄴"}
                 other{"{0}𑄟𑄨𑄣𑄨𑄝𑄢𑄴"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"𑄟𑄨𑄣𑄨𑄟𑄨𑄑𑄢𑄴 𑄛𑄢𑄧𑄖𑄴"}
                 one{"{0} 𑄟𑄨𑄣𑄨𑄟𑄨𑄑𑄢𑄴 𑄛𑄢𑄧𑄖𑄴"}
                 other{"{0} 𑄟𑄨𑄣𑄨𑄟𑄨𑄑𑄢𑄴 𑄛𑄢𑄧𑄖𑄴"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"𑄝𑄧𑄢𑄴𑄉𑄧𑄃𑄨𑄚𑄴𑄌𑄨 𑄛𑄳𑄢𑄧𑄖𑄨 𑄛𑄅𑄪𑄚𑄳𑄓𑄴"}
                 one{"{0} 𑄝𑄧𑄢𑄴𑄉𑄧𑄃𑄨𑄚𑄴𑄌𑄨 𑄛𑄳𑄢𑄧𑄖𑄨 𑄛𑄅𑄪𑄚𑄳𑄓𑄴"}
                 other{"{0} 𑄝𑄧𑄢𑄴𑄉𑄧𑄃𑄨𑄚𑄴𑄌𑄨 𑄛𑄳𑄢𑄧𑄖𑄨 𑄛𑄅𑄪𑄚𑄳𑄓𑄴"}
@@ -781,7 +781,7 @@ ccp{
             per{"{0}/{1}"}
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -920,7 +920,7 @@ ccp{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -978,7 +978,7 @@ ccp{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1082,14 +1082,14 @@ ccp{
                 one{"{0} mmol/L"}
                 other{"{0} mmol/L"}
             }
-            part-per-million{
+            permillion{
                 dnam{"ppm"}
                 one{"{0} ppm"}
                 other{"{0} ppm"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -1501,7 +1501,7 @@ ccp{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1511,12 +1511,12 @@ ccp{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index 475e04e6d283eb1760da0fce9b330753fcc91ab8..97f03f286c1ed5e86f51f554277f63dc76474d8c 100644 (file)
@@ -13,7 +13,7 @@ ceb{
                 one{"{0} g-force"}
                 other{"{0} g-force"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"mga metro kada second squared"}
                 one{"{0} ka metro kada second squared"}
                 other{"{0} ka mga metro kada second squared"}
@@ -127,11 +127,6 @@ ceb{
                 one{"{0} ka mole"}
                 other{"{0} ka mga mole"}
             }
-            part-per-million{
-                dnam{"mga part per million"}
-                one{"{0} ka part per million"}
-                other{"{0} ka mga part per million"}
-            }
             percent{
                 dnam{"porsyento"}
                 one{"{0} ka porsyento"}
@@ -142,6 +137,11 @@ ceb{
                 one{"{0} ka permille"}
                 other{"{0} ka permille"}
             }
+            permillion{
+                dnam{"mga part per million"}
+                one{"{0} ka part per million"}
+                other{"{0} ka mga part per million"}
+            }
             permyriad{
                 dnam{"permyriad"}
                 one{"{0} ka permyriad"}
@@ -149,7 +149,7 @@ ceb{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"mga litro kada 100 kilometro"}
                 one{"{0} ka litro kada 100 kilometro"}
                 other{"{0} ka litro kada 100 kilometro"}
@@ -676,7 +676,7 @@ ceb{
                 one{"{0} ka hectopascal"}
                 other{"{0} ka mga hectopascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"mga pulgada sa mercury"}
                 one{"{0} ka pulgada sa mercury"}
                 other{"{0} ka mga pulgada sa mercury"}
@@ -696,7 +696,7 @@ ceb{
                 one{"{0} ka millibar"}
                 other{"{0} ka mga millibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mga millimetro sa mercury"}
                 one{"{0} ka millimetro sa mercury"}
                 other{"{0} ka mga millimetro sa mercury"}
@@ -706,7 +706,7 @@ ceb{
                 one{"{0} ka pascal"}
                 other{"{0} ka mga pascal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"mga pound kada kuwadradong pulgada"}
                 one{"{0} ka pound kada kuwadradong pulgada"}
                 other{"{0} ka mga pound kada kuwadradong pulgada"}
@@ -757,10 +757,10 @@ ceb{
                 one{"{0} ka newton-meter"}
                 other{"{0} ka mga newton-meter"}
             }
-            pound-foot{
-                dnam{"mga pound-foot"}
-                one{"{0} ka pound-foot"}
-                other{"{0} ka mga pound-foot"}
+            pound-force-foot{
+                dnam{"mga pound-force-foot"}
+                one{"{0} ka pound-force-foot"}
+                other{"{0} ka mga pound-force-foot"}
             }
         }
         volume{
@@ -908,7 +908,7 @@ ceb{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0}L/100km"}
                 other{"{0}L/100km"}
@@ -1013,7 +1013,7 @@ ceb{
     }
     unitsShort{
         acceleration{
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"mga metro/sec²"}
             }
         }
@@ -1085,21 +1085,21 @@ ceb{
                 one{"{0} mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"mga part/million"}
-            }
             percent{
                 dnam{"porsyento"}
             }
             permille{
                 dnam{"permille"}
             }
+            permillion{
+                dnam{"mga part/million"}
+            }
             permyriad{
                 dnam{"permyriad"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100 km"}
                 one{"{0} L/100 km"}
                 other{"{0} L/100 km"}
@@ -1359,7 +1359,7 @@ ceb{
                 one{"{0} ka mbar"}
                 other{"{0} ka mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
index 071da3b80b96700bc3ca7e5b1336d67345e36132..2e2af5af3cdd002e4b81aa35938a57eac7bd8525 100644 (file)
@@ -14,7 +14,7 @@ chr{
                 one{"{0} ᎠᏓᎾᏌᏁᏍᎩ-ᎦᏌᏙᏯᏍᏗ"}
                 other{"{0} ᎠᏓᎾᏌᏁᏍᎩ-ᎦᏌᏙᏯᏍᏗ"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"ᏗᏟᎶᏗ ᎠᏎᏢ ᎢᏳᏓᎵ ᏅᎩ ᏧᏅᏏᎩ"}
                 one{"{0} ᎠᏟᎶᏗ ᎠᏎᏢ ᎢᏳᏓᎵ ᏅᎩ ᏧᏅᏏᎩ"}
                 other{"{0} ᏗᏟᎶᏗ ᎠᏎᏢ ᎢᏳᏓᎵ ᏅᎩ ᏧᏅᏏᎩ"}
@@ -128,11 +128,6 @@ chr{
                 one{"{0} ᎼᎴ"}
                 other{"{0} ᎼᎴᏍ"}
             }
-            part-per-million{
-                dnam{"ᏚᏙᏢᏒ ᎢᏳᏆᏗᏅᏛ ᎢᏳᏓᎵ"}
-                one{"{0} ᎤᏙᏢᏒ ᎢᏳᏆᏗᏅᏛ ᎢᏳᏓᎵ"}
-                other{"{0} ᏚᏙᏢᏒ ᎢᏳᏆᏗᏅᏛ ᎢᏳᏓᎵ"}
-            }
             percent{
                 dnam{"ᏓᎬᏩᎶᏛ"}
                 one{"{0} ᏓᎬᏩᎶᏛ"}
@@ -143,6 +138,11 @@ chr{
                 one{"{0} ᏈᎻᎴ"}
                 other{"{0} ᏈᎻᎴ"}
             }
+            permillion{
+                dnam{"ᏚᏙᏢᏒ ᎢᏳᏆᏗᏅᏛ ᎢᏳᏓᎵ"}
+                one{"{0} ᎤᏙᏢᏒ ᎢᏳᏆᏗᏅᏛ ᎢᏳᏓᎵ"}
+                other{"{0} ᏚᏙᏢᏒ ᎢᏳᏆᏗᏅᏛ ᎢᏳᏓᎵ"}
+            }
             permyriad{
                 dnam{"ᏋᎻᎵᎠᏗ"}
                 one{"{0} ᏋᎻᎵᎠᏗ"}
@@ -150,7 +150,7 @@ chr{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ᏗᎵᏔᎢ 100 ᎠᎦᏴᎵ ᏗᏟᎶᏍᏗ ᎢᏳᏓᎵ"}
                 one{"{0} ᎵᏔᎢ 100 ᎠᎦᏴᎵ ᏗᏟᎶᏍᏗ ᎢᏳᏓᎵ"}
                 other{"{0} ᏗᎵᏔᎢ 100 ᎠᎦᏴᎵ ᏗᏟᎶᏍᏗ ᎢᏳᏓᎵ"}
@@ -675,7 +675,7 @@ chr{
                 one{"{0} ᎮᏔ ᏆᏌᎵ"}
                 other{"{0} ᎮᏔ ᏗᏆᏌᎵ"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ᎢᏏᏔᏗᏍᏗ ᎾᎿ ᎹᎫᎢ"}
                 one{"{0} ᎢᏗᎳᏏᏗ ᎾᎿ ᎹᎫᎢ"}
                 other{"{0} ᎢᏏᏔᏗᏍᏗ ᎾᎿ ᎹᎫᎢ"}
@@ -695,7 +695,7 @@ chr{
                 one{"{0} ᎢᎦᎦᏴᎵ ᎦᎾᎸᎢ"}
                 other{"{0} ᎢᏯᎦᏴᎵ ᏕᎦᎾᎸᎢ"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᏗᏟᎶᏗ ᎾᎿ ᎹᎫᎢ"}
                 one{"{0} ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᎠᏟᎶᏗ ᎾᎿ ᎹᎫᎢ"}
                 other{"{0} ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᏗᏟᎶᏗ ᎾᎿ ᎹᎫᎢ"}
@@ -705,7 +705,7 @@ chr{
                 one{"{0} ᏆᏌᎵ"}
                 other{"{0} ᏗᏆᏌᎵ"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ᎢᏧᏓᎨᏓ ᏅᎩ ᏧᏅᏏᎩ ᎢᏏᏔᏗᏍᏗ ᎢᏳᏓᎵ"}
                 one{"{0} ᏑᏓᎨᏓ ᏅᎩ ᏧᏅᏏᎩ ᎢᏏᏔᏗᏍᏗ ᎢᏳᏓᎵ"}
                 other{"{0} ᎢᏧᏓᎨᏓ ᏅᎩ ᏧᏅᏏᎩ ᎢᏏᏔᏗᏍᏗ ᎢᏳᏓᎵ"}
@@ -761,7 +761,7 @@ chr{
                 one{"{0} ᏄᏛᏅ-ᎠᏟᎶᏍᏗ"}
                 other{"{0} ᏄᏛᏅ-ᎠᏟᎶᏍᏗ"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"ᏑᏓᎨᏓ-ᏧᎳᏏᏕᏂ"}
                 one{"{0} ᏑᏓᎨᏓ-ᎤᎳᏏᏕᏂ"}
                 other{"{0} ᏑᏓᎨᏓ-ᏧᎳᏏᏕᏂ"}
@@ -917,7 +917,7 @@ chr{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0}L/100km"}
                 other{"{0}L/100km"}
@@ -1039,7 +1039,7 @@ chr{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"ᏗᏟᎶᏍᏗ/sec²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1153,11 +1153,6 @@ chr{
                 one{"{0} mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"ᏚᏙᏢᏒ/ᎢᏳᏆᏗᏅᏛ"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"ᏓᎬᏩᎶᏛ"}
                 one{"{0}%"}
@@ -1168,6 +1163,11 @@ chr{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ᏚᏙᏢᏒ/ᎢᏳᏆᏗᏅᏛ"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"ᏋᎻᎵᎠᏗ"}
                 one{"{0}‱"}
@@ -1175,7 +1175,7 @@ chr{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -1668,7 +1668,7 @@ chr{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1688,12 +1688,12 @@ chr{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1749,7 +1749,7 @@ chr{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
index 66fa1c314f0d228a0fe1dd10da09bf5ae69b9acf..34de1af1ce87b4adca52c7374dd43cc32a652726 100644 (file)
@@ -16,7 +16,7 @@ cs{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metr za sekundu na druhou"}
                 few{"{0} metry za sekundu na druhou"}
                 many{"{0} metru za sekundu na druhou"}
@@ -171,13 +171,6 @@ cs{
                 one{"{0} mol"}
                 other{"{0} molů"}
             }
-            part-per-million{
-                dnam{"díly z milionu"}
-                few{"{0} díly z milionu"}
-                many{"{0} dílu z milionu"}
-                one{"{0} díl z milionu"}
-                other{"{0} dílů z milionu"}
-            }
             percent{
                 dnam{"procenta"}
                 few{"{0} procenta"}
@@ -192,6 +185,13 @@ cs{
                 one{"{0} promile"}
                 other{"{0} promile"}
             }
+            permillion{
+                dnam{"díly z milionu"}
+                few{"{0} díly z milionu"}
+                many{"{0} dílu z milionu"}
+                one{"{0} díl z milionu"}
+                other{"{0} dílů z milionu"}
+            }
             permyriad{
                 dnam{"desetiny promile"}
                 few{"{0} desetiny promile"}
@@ -201,7 +201,7 @@ cs{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litry na sto kilometrů"}
                 few{"{0} litry na sto kilometrů"}
                 many{"{0} litru na sto kilometrů"}
@@ -941,7 +941,7 @@ cs{
                 one{"{0} hektopascal"}
                 other{"{0} hektopascalů"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"palce rtuti"}
                 few{"{0} palce rtuti"}
                 many{"{0} palce rtuti"}
@@ -969,7 +969,7 @@ cs{
                 one{"{0} milibar"}
                 other{"{0} milibarů"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimetry rtuti"}
                 few{"{0} milimetry rtuti"}
                 many{"{0} milimetru rtuti"}
@@ -983,7 +983,7 @@ cs{
                 one{"{0} pascal"}
                 other{"{0} pascalů"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"libry na čtvereční palec"}
                 few{"{0} libry na čtvereční palec"}
                 many{"{0} libry na čtvereční palec"}
@@ -1059,7 +1059,7 @@ cs{
                 one{"{0} newtonmetr"}
                 other{"{0} newtonmetrů"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"librostopy"}
                 few{"{0} librostopy"}
                 many{"{0} librostopy"}
@@ -1273,7 +1273,7 @@ cs{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0} m/s²"}
                 many{"{0} m/s²"}
@@ -1414,13 +1414,6 @@ cs{
                 one{"{0} mmol/l"}
                 other{"{0} mmol/l"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                few{"{0} ppm"}
-                many{"{0} ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 few{"{0} %"}
@@ -1428,9 +1421,16 @@ cs{
                 one{"{0} %"}
                 other{"{0} %"}
             }
+            permillion{
+                dnam{"ppm"}
+                few{"{0} ppm"}
+                many{"{0} ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 few{"{0} l/100 km"}
                 many{"{0} l/100 km"}
@@ -2011,7 +2011,7 @@ cs{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 few{"{0} inHg"}
                 many{"{0} inHg"}
@@ -2025,14 +2025,14 @@ cs{
                 one{"{0} mb"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 few{"{0} mm Hg"}
                 many{"{0} mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 few{"{0} psi"}
                 many{"{0} psi"}
@@ -2287,7 +2287,7 @@ cs{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0} m/s²"}
                 many{"{0} m/s²"}
@@ -2442,13 +2442,6 @@ cs{
                 one{"{0} mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                few{"{0} ppm"}
-                many{"{0} ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 few{"{0} %"}
@@ -2463,6 +2456,13 @@ cs{
                 one{"{0} ‰"}
                 other{"{0} ‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                few{"{0} ppm"}
+                many{"{0} ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"‱"}
                 few{"{0} ‱"}
@@ -2472,7 +2472,7 @@ cs{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 few{"{0} l/100 km"}
                 many{"{0} l/100 km"}
@@ -3208,7 +3208,7 @@ cs{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 few{"{0} inHg"}
                 many{"{0} inHg"}
@@ -3236,7 +3236,7 @@ cs{
                 one{"{0} mb"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 few{"{0} mm Hg"}
                 many{"{0} mm Hg"}
@@ -3250,7 +3250,7 @@ cs{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 few{"{0} psi"}
                 many{"{0} psi"}
@@ -3326,7 +3326,7 @@ cs{
                 one{"{0} Nm"}
                 other{"{0} Nm"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 few{"{0} lbf⋅ft"}
                 many{"{0} lbf⋅ft"}
index 795cb2bf35913149d7245775caf0bca2ed043474..d7474246aa4f137f20a6d7eeafcfbdb043df338c 100644 (file)
@@ -18,7 +18,7 @@ cy{
                 two{"{0} G"}
                 zero{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metrau yr eiliad sgwâr"}
                 few{"{0} m/eil²"}
                 many{"{0} m/eil²"}
@@ -212,15 +212,6 @@ cy{
                 two{"{0} môl"}
                 zero{"{0} môl"}
             }
-            part-per-million{
-                dnam{"rhannau pob miliwn"}
-                few{"{0} rhan pob miliwn"}
-                many{"{0} rhan pob miliwn"}
-                one{"{0} rhan pob miliwn"}
-                other{"{0} rhan pob miliwn"}
-                two{"{0} rhan pob miliwn"}
-                zero{"{0} rhan pob miliwn"}
-            }
             percent{
                 dnam{"y cant"}
                 few{"{0}%"}
@@ -239,6 +230,15 @@ cy{
                 two{"{0}‰"}
                 zero{"{0}‰"}
             }
+            permillion{
+                dnam{"rhannau pob miliwn"}
+                few{"{0} rhan pob miliwn"}
+                many{"{0} rhan pob miliwn"}
+                one{"{0} rhan pob miliwn"}
+                other{"{0} rhan pob miliwn"}
+                two{"{0} rhan pob miliwn"}
+                zero{"{0} rhan pob miliwn"}
+            }
             permyriad{
                 dnam{"permyriad"}
                 few{"{0}‱"}
@@ -250,7 +250,7 @@ cy{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litrau y 100 cilometr"}
                 few{"{0} L/100km"}
                 many{"{0} L/100km"}
@@ -1161,7 +1161,7 @@ cy{
                 two{"{0} hPa"}
                 zero{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"modfeddi o fercwri"}
                 few{"{0} ″ Hg"}
                 many{"{0} ″ Hg"}
@@ -1197,7 +1197,7 @@ cy{
                 two{"{0} filibar"}
                 zero{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimetrau o fercwri"}
                 few{"{0} mm Hg"}
                 many{"{0} mm Hg"}
@@ -1209,7 +1209,7 @@ cy{
             pascal{
                 dnam{"pascals"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"pwysau y fodfedd sgwar"}
                 few{"{0} psi"}
                 many{"{0} psi"}
@@ -1305,7 +1305,7 @@ cy{
                 two{"{0} N⋅m"}
                 zero{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"pwys-troedfeddi"}
                 few{"{0} lbf⋅ft"}
                 many{"{0} lbf⋅ft"}
@@ -1694,7 +1694,7 @@ cy{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 few{"{0}L/100km"}
                 many{"{0}L/100km"}
@@ -2316,7 +2316,7 @@ cy{
                 two{"{0}hPa"}
                 zero{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"″ Hg"}
                 few{"{0}\u0022 Hg"}
                 many{"{0}\u0022 Hg"}
@@ -2334,7 +2334,7 @@ cy{
                 two{"{0}mb"}
                 zero{"{0}mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 few{"{0}mmHg"}
                 many{"{0}mmHg"}
@@ -2343,7 +2343,7 @@ cy{
                 two{"{0}mmHg"}
                 zero{"{0}mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 few{"{0}psi"}
                 many{"{0}psi"}
@@ -2548,7 +2548,7 @@ cy{
             g-force{
                 dnam{"grym disgyrchedd"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metrau/eil²"}
                 few{"{0} m/eil²"}
                 many{"{0} m/eil²"}
@@ -2740,15 +2740,6 @@ cy{
                 two{"{0} môl"}
                 zero{"{0} môl"}
             }
-            part-per-million{
-                dnam{"rhan/miliwn"}
-                few{"{0} ppm"}
-                many{"{0} ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-                two{"{0} ppm"}
-                zero{"{0} ppm"}
-            }
             percent{
                 dnam{"y cant"}
                 few{"{0}%"}
@@ -2767,12 +2758,21 @@ cy{
                 two{"{0}‰"}
                 zero{"{0}‰"}
             }
+            permillion{
+                dnam{"rhan/miliwn"}
+                few{"{0} ppm"}
+                many{"{0} ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+                two{"{0} ppm"}
+                zero{"{0} ppm"}
+            }
             permyriad{
                 dnam{"permyriad"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 few{"{0} L/100km"}
                 many{"{0} L/100km"}
@@ -3517,7 +3517,7 @@ cy{
                 two{"{0} hPa"}
                 zero{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"\u0022 Hg"}
                 few{"{0} ″ Hg"}
                 many{"{0} ″ Hg"}
@@ -3535,7 +3535,7 @@ cy{
                 two{"{0} mbar"}
                 zero{"{0} mbar"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 few{"{0} psi"}
                 many{"{0} psi"}
                 one{"{0} psi"}
index 78ec39e8cdb1396d8366c022d8f83840fcbe78c6..9004cdf032c6c6cc2ed19ff2a24ca2dbb789885c 100644 (file)
@@ -14,7 +14,7 @@ da{
                 one{"{0} G-kraft"}
                 other{"{0} G-kraft"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meter pr. sekund²"}
                 one{"{0} meter pr. sekund²"}
                 other{"{0} meter pr. sekund²"}
@@ -119,11 +119,6 @@ da{
                 one{"{0} millimol pr. liter"}
                 other{"{0} millimol pr. liter"}
             }
-            part-per-million{
-                dnam{"parts per million"}
-                one{"{0} parts per million"}
-                other{"{0} parts per million"}
-            }
             percent{
                 dnam{"procent"}
                 one{"{0} procent"}
@@ -134,9 +129,14 @@ da{
                 one{"{0} promille"}
                 other{"{0} promille"}
             }
+            permillion{
+                dnam{"parts per million"}
+                one{"{0} parts per million"}
+                other{"{0} parts per million"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"liter pr. 100 kilometer"}
                 one{"{0} liter pr. 100 kilometer"}
                 other{"{0} liter pr. 100 kilometer"}
@@ -623,7 +623,7 @@ da{
                 one{"{0} hektopascal"}
                 other{"{0} hektopascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"tommer kviksølv"}
                 one{"{0} tomme kviksølv"}
                 other{"{0} tommer kviksølv"}
@@ -643,7 +643,7 @@ da{
                 one{"{0} millibar"}
                 other{"{0} millibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"millimeter kviksølv"}
                 one{"{0} millimeter kviksølv"}
                 other{"{0} millimeter kviksølv"}
@@ -653,7 +653,7 @@ da{
                 one{"{0} pascal"}
                 other{"{0} pascal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"pounds pr. kvadrattomme"}
                 one{"{0} pound pr. kvadrattomme"}
                 other{"{0} pounds pr. kvadrattommer"}
@@ -902,7 +902,7 @@ da{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1090,7 +1090,7 @@ da{
                 one{"{0}hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"# Hg"}
                 one{"{0}\u0022 Hg"}
                 other{"{0}\u0022 Hg"}
@@ -1100,12 +1100,12 @@ da{
                 one{"{0}mbar"}
                 other{"{0}mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1177,7 +1177,7 @@ da{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1282,11 +1282,6 @@ da{
                 one{"{0} mmol/l"}
                 other{"{0} mmol/l"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"pct."}
                 one{"{0} pct."}
@@ -1297,13 +1292,18 @@ da{
                 one{"{0} ‰"}
                 other{"{0} ‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 one{"{0} ‱"}
                 other{"{0} ‱"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1752,7 +1752,7 @@ da{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"# Hg"}
                 one{"{0} # Hg"}
                 other{"{0} # Hg"}
@@ -1762,12 +1762,12 @@ da{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index 94a42e9ac6815c0646b490b1ddba215df16285d0..89f48d9584c4060008c15eb162119240e78255b3 100644 (file)
@@ -14,7 +14,7 @@ de{
                 one{"{0}-fache Erdbeschleunigung"}
                 other{"{0}-fache Erdbeschleunigung"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"Meter pro Quadratsekunde"}
             }
         }
@@ -121,11 +121,6 @@ de{
                 one{"{0} Millimol pro Liter"}
                 other{"{0} Millimol pro Liter"}
             }
-            part-per-million{
-                dnam{"Parts per million"}
-                one{"{0} Parts per million"}
-                other{"{0} Parts per million"}
-            }
             percent{
                 dnam{"Prozent"}
                 one{"{0} Prozent"}
@@ -136,9 +131,14 @@ de{
                 one{"{0} Promille"}
                 other{"{0} Promille"}
             }
+            permillion{
+                dnam{"Parts per million"}
+                one{"{0} Parts per million"}
+                other{"{0} Parts per million"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"Liter auf 100 Kilometer"}
                 one{"{0} Liter auf 100 Kilometer"}
                 other{"{0} Liter auf 100 Kilometer"}
@@ -664,7 +664,7 @@ de{
                 one{"{0} Hektopascal"}
                 other{"{0} Hektopascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"Zoll Quecksilbersäule"}
                 one{"{0} Zoll Quecksilbersäule"}
                 other{"{0} Zoll Quecksilbersäule"}
@@ -684,7 +684,7 @@ de{
                 one{"{0} Millibar"}
                 other{"{0} Millibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"Millimeter Quecksilbersäule"}
                 one{"{0} Millimeter Quecksilbersäule"}
                 other{"{0} Millimeter Quecksilbersäule"}
@@ -694,7 +694,7 @@ de{
                 one{"{0} Pascal"}
                 other{"{0} Pascal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"Pfund pro Quadratzoll"}
                 one{"{0} Pfund pro Quadratzoll"}
                 other{"{0} Pfund pro Quadratzoll"}
@@ -894,7 +894,7 @@ de{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -971,7 +971,7 @@ de{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100 km"}
                 one{"{0} L/100 km"}
                 other{"{0} L/100 km"}
@@ -1321,7 +1321,7 @@ de{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1331,12 +1331,12 @@ de{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1561,11 +1561,6 @@ de{
                 one{"{0} mmol/L"}
                 other{"{0} mmol/L"}
             }
-            part-per-million{
-                dnam{"parts/million"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0} %"}
@@ -1575,9 +1570,14 @@ de{
                 one{"{0} ‰"}
                 other{"{0} ‰"}
             }
+            permillion{
+                dnam{"parts/million"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100 km"}
                 one{"{0} L/100 km"}
                 other{"{0} L/100 km"}
@@ -1889,7 +1889,7 @@ de{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1899,12 +1899,12 @@ de{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index 3a7c0029607352d2a27d1b65531d356bf8319008..2edee148198463c0fc4c75946e32e266fbb7e131 100644 (file)
@@ -16,7 +16,7 @@ dsb{
                 other{"{0} jadnotkow zemskego póspěšenja"}
                 two{"{0} jadnotce zemskego póspěšenja"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metry na kwadratnu sekundu"}
                 few{"{0} metry na kwadratnu sekundu"}
                 one{"{0} meter na kwadratnu sekundu"}
@@ -641,7 +641,7 @@ dsb{
                 other{"{0} hektopascalow"}
                 two{"{0} hektopascala"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"cole žywoslobrowego słupika"}
                 few{"{0} cole słupika žywego slobra"}
                 one{"{0} col słupika žywego slobra"}
@@ -655,14 +655,14 @@ dsb{
                 other{"{0} milibarow"}
                 two{"{0} milibara"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimetry słupika žywego slobra"}
                 few{"{0} milimetry słupika žywego slobra"}
                 one{"{0} milimeter słupika žywego slobra"}
                 other{"{0} milimetrow słupika žywego slobra"}
                 two{"{0} milimetra słupika žywego slobra"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"punty na kwadratny col"}
                 few{"{0} punty na kwadratny col"}
                 one{"{0} punt na kwadratny col"}
@@ -1112,7 +1112,7 @@ dsb{
                 other{"{0} hPa"}
                 two{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 few{"{0} inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1192,7 +1192,7 @@ dsb{
                 other{"{0} G"}
                 two{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0} m/s²"}
                 one{"{0} m/s²"}
@@ -1817,7 +1817,7 @@ dsb{
                 other{"{0} hPa"}
                 two{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 few{"{0} inHg"}
                 one{"{0} inHg"}
@@ -1831,14 +1831,14 @@ dsb{
                 other{"{0} mbar"}
                 two{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 few{"{0} mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
                 two{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 few{"{0} psi"}
                 one{"{0} psi"}
index af7968a8d5e575a641406cd6f54b726440a8e16e..227bbd4cd3b0dce397242ddab1238542d6a8a15a 100644 (file)
@@ -14,7 +14,7 @@ el{
                 one{"{0} δύναμη επιτάχυνσης"}
                 other{"{0} δύναμη επιτάχυνσης"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"μέτρα ανά τετραγωνικό δευτερόλεπτο"}
                 one{"{0} μέτρο ανά τετραγωνικό δευτερόλεπτο"}
                 other{"{0} μέτρα ανά τετραγωνικό δευτερόλεπτο"}
@@ -128,11 +128,6 @@ el{
                 one{"{0} μολ"}
                 other{"{0} μολ"}
             }
-            part-per-million{
-                dnam{"μέρη ανά εκατομμύριο"}
-                one{"{0} μέρος ανά εκατομμύριο"}
-                other{"{0} μέρη ανά εκατομμύριο"}
-            }
             percent{
                 dnam{"τοις εκατό"}
                 one{"{0} τοις εκατό"}
@@ -143,6 +138,11 @@ el{
                 one{"{0} τοις χιλίοις"}
                 other{"{0} τοις χιλίοις"}
             }
+            permillion{
+                dnam{"μέρη ανά εκατομμύριο"}
+                one{"{0} μέρος ανά εκατομμύριο"}
+                other{"{0} μέρη ανά εκατομμύριο"}
+            }
             permyriad{
                 dnam{"ποσοστόσημο τοις δεκάκις χιλίοις"}
                 one{"{0} ποσοστόσημο τοις δεκάκις χιλίοις"}
@@ -150,7 +150,7 @@ el{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"λίτρα ανά 100 χιλιόμετρα"}
                 one{"{0} λίτρο ανά 100 χιλιόμετρα"}
                 other{"{0} λίτρα ανά 100 χιλιόμετρα"}
@@ -674,7 +674,7 @@ el{
                 one{"{0} εκτοπασκάλ"}
                 other{"{0} εκτοπασκάλ"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ίντσες στήλης υδραργύρου"}
                 one{"{0} ίντσα στήλης υδραργύρου"}
                 other{"{0} ίντσες στήλης υδραργύρου"}
@@ -694,7 +694,7 @@ el{
                 one{"{0} μιλιμπάρ"}
                 other{"{0} μιλιμπάρ"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"χιλιοστόμετρα στήλης υδραργύρου"}
                 one{"{0} χιλιοστόμετρο στήλης υδραργύρου"}
                 other{"{0} χιλιοστόμετρα στήλης υδραργύρου"}
@@ -704,7 +704,7 @@ el{
                 one{"{0} πασκάλ"}
                 other{"{0} πασκάλ"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"λίβρες ανά τετραγωνική ίντσα"}
                 one{"{0} λίβρα ανά τετραγωνική ίντσα"}
                 other{"{0} λίβρες ανά τετραγωνική ίντσα"}
@@ -760,7 +760,7 @@ el{
                 one{"{0} νιουτόμετρο"}
                 other{"{0} νιουτόμετρα"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"λίβρες-πόδια"}
                 one{"{0} λίβρα-πόδι"}
                 other{"{0} λίβρες-πόδια"}
@@ -962,7 +962,7 @@ el{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"λ/100 χλμ"}
                 one{"{0} λ/100 χλμ"}
                 other{"{0} λ/100 χλμ"}
@@ -1102,7 +1102,7 @@ el{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -1162,7 +1162,7 @@ el{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"μέτρα/τετρ. δευτ."}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1276,11 +1276,6 @@ el{
                 one{"{0} μολ"}
                 other{"{0} μολ"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"τοις εκατό"}
                 one{"{0}%"}
@@ -1291,6 +1286,11 @@ el{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"ποσοστόσημο τοις δεκάκις χιλίοις"}
                 one{"{0}‱"}
@@ -1298,7 +1298,7 @@ el{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"λ./100 χλμ."}
                 one{"{0} λ./100 χλμ."}
                 other{"{0} λ./100 χλμ."}
@@ -1786,7 +1786,7 @@ el{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1806,7 +1806,7 @@ el{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
@@ -1815,7 +1815,7 @@ el{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1871,7 +1871,7 @@ el{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"λβρ⋅πδ"}
                 one{"{0} λβρ⋅πδ"}
                 other{"{0} λβρ⋅πδ"}
index bc151222d77d43f9cce288636ec7ac9069932146..3c42afb09fea52562056abe3f8a69b24694ba4a8 100644 (file)
@@ -9,7 +9,7 @@ en{
                 one{"{0} g-force"}
                 other{"{0} g-force"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meters per second squared"}
                 one{"{0} meter per second squared"}
                 other{"{0} meters per second squared"}
@@ -123,11 +123,6 @@ en{
                 one{"{0} mole"}
                 other{"{0} moles"}
             }
-            part-per-million{
-                dnam{"parts per million"}
-                one{"{0} part per million"}
-                other{"{0} parts per million"}
-            }
             percent{
                 dnam{"percent"}
                 one{"{0} percent"}
@@ -138,6 +133,11 @@ en{
                 one{"{0} permille"}
                 other{"{0} permille"}
             }
+            permillion{
+                dnam{"parts per million"}
+                one{"{0} part per million"}
+                other{"{0} parts per million"}
+            }
             permyriad{
                 dnam{"permyriad"}
                 one{"{0} permyriad"}
@@ -145,7 +145,7 @@ en{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"liters per 100 kilometers"}
                 one{"{0} liter per 100 kilometers"}
                 other{"{0} liters per 100 kilometers"}
@@ -687,7 +687,7 @@ en{
                 one{"{0} hectopascal"}
                 other{"{0} hectopascals"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inches of mercury"}
                 one{"{0} inch of mercury"}
                 other{"{0} inches of mercury"}
@@ -707,7 +707,7 @@ en{
                 one{"{0} millibar"}
                 other{"{0} millibars"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"millimeters of mercury"}
                 one{"{0} millimeter of mercury"}
                 other{"{0} millimeters of mercury"}
@@ -717,7 +717,7 @@ en{
                 one{"{0} pascal"}
                 other{"{0} pascals"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"pounds per square inch"}
                 one{"{0} pound per square inch"}
                 other{"{0} pounds per square inch"}
@@ -768,9 +768,9 @@ en{
                 one{"{0} newton-meter"}
                 other{"{0} newton-meters"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"pound-feet"}
-                one{"{0} pound-foot"}
+                one{"{0} pound-force-foot"}
                 other{"{0} pound-feet"}
             }
         }
@@ -924,7 +924,7 @@ en{
                 one{"{0}G"}
                 other{"{0}Gs"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0}m/s²"}
                 other{"{0}m/s²"}
@@ -1033,11 +1033,6 @@ en{
                 one{"{0}mol"}
                 other{"{0}mol"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0}ppm"}
-                other{"{0}ppm"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0}%"}
@@ -1048,6 +1043,11 @@ en{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0}ppm"}
+                other{"{0}ppm"}
+            }
             permyriad{
                 dnam{"‱"}
                 one{"{0}‱"}
@@ -1055,7 +1055,7 @@ en{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0}L/100km"}
                 other{"{0}L/100km"}
@@ -1580,7 +1580,7 @@ en{
                 one{"{0}hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"″ Hg"}
                 one{"{0}″ Hg"}
                 other{"{0}″ Hg"}
@@ -1600,7 +1600,7 @@ en{
                 one{"{0}mb"}
                 other{"{0}mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0}mmHg"}
                 other{"{0}mmHg"}
@@ -1610,7 +1610,7 @@ en{
                 one{"{0}Pa"}
                 other{"{0}Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0}psi"}
                 other{"{0}psi"}
@@ -1661,7 +1661,7 @@ en{
                 one{"{0}N⋅m"}
                 other{"{0}N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0}lbf⋅ft"}
                 other{"{0}lbf⋅ft"}
@@ -1817,7 +1817,7 @@ en{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meters/sec²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1931,11 +1931,6 @@ en{
                 one{"{0} mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"parts/million"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"percent"}
                 one{"{0}%"}
@@ -1946,6 +1941,11 @@ en{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"parts/million"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"permyriad"}
                 one{"{0}‱"}
@@ -1953,7 +1953,7 @@ en{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100 km"}
                 one{"{0} L/100 km"}
                 other{"{0} L/100 km"}
@@ -2495,7 +2495,7 @@ en{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -2515,7 +2515,7 @@ en{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
@@ -2525,7 +2525,7 @@ en{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -2576,7 +2576,7 @@ en{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
index e10edffafaa2a65af1edaa5f950535babd2ff32e..5fc1b2cc5d95c96f1b807181dadf3d53f829ef86 100644 (file)
@@ -4,7 +4,7 @@ en_001{
     Version{"37"}
     units{
         acceleration{
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metres per second squared"}
                 one{"{0} metre per second squared"}
                 other{"{0} metres per second squared"}
@@ -58,7 +58,7 @@ en_001{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litres per 100 kilometres"}
                 one{"{0} litre per 100 kilometres"}
                 other{"{0} litres per 100 kilometres"}
@@ -149,7 +149,7 @@ en_001{
             }
         }
         pressure{
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"millimetres of mercury"}
                 one{"{0} millimetre of mercury"}
                 other{"{0} millimetres of mercury"}
@@ -268,7 +268,7 @@ en_001{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 one{"{0}l/100km"}
                 other{"{0}l/100km"}
@@ -363,7 +363,7 @@ en_001{
     }
     unitsShort{
         acceleration{
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metres/sec²"}
             }
         }
@@ -396,7 +396,7 @@ en_001{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -445,7 +445,7 @@ en_001{
             }
         }
         pressure{
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHG"}
             }
         }
index 9265c41d9a2b0d1561fcb03cc390fd23e21d02cd..288edc664d584fe79a335d55396fd69cfcd3689f 100644 (file)
@@ -69,7 +69,7 @@ en_AU{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0}L/100km"}
                 other{"{0}L/100km"}
@@ -181,7 +181,7 @@ en_AU{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100 km"}
                 one{"{0} L/100 km"}
                 other{"{0} L/100 km"}
@@ -264,7 +264,7 @@ en_AU{
             }
         }
         pressure{
-            inch-hg{
+            inch-ofhg{
                 dnam{"in Hg"}
             }
             millibar{
@@ -272,7 +272,7 @@ en_AU{
                 one{"{0} mb"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
index 8b46844f51e0ffc411bdc5be57fff395e404334d..9a4b09f3024b414e769358ad2f5d56d19920fcaa 100644 (file)
@@ -46,7 +46,7 @@ en_CA{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0}L/100km"}
                 other{"{0}L/100km"}
@@ -158,7 +158,7 @@ en_CA{
     }
     unitsShort{
         acceleration{
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metres/sec.²"}
             }
         }
@@ -227,7 +227,7 @@ en_CA{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100 km"}
                 one{"{0} L/100 km"}
                 other{"{0} L/100 km"}
@@ -406,7 +406,7 @@ en_CA{
             }
         }
         pressure{
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
             }
         }
index e250c8a04febe8030df5a1801393514627900f64..eb95dd38e97ab840f67e58c1c923a17a8042a94b 100644 (file)
@@ -14,7 +14,7 @@ es{
                 one{"{0} unidad de fuerza gravitacional"}
                 other{"{0} unidades de fuerza gravitacional"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metros por segundo al cuadrado"}
                 one{"{0} metro por segundo al cuadrado"}
                 other{"{0} metros por segundo al cuadrado"}
@@ -129,11 +129,6 @@ es{
                 one{"{0} moles"}
                 other{"{0} moles"}
             }
-            part-per-million{
-                dnam{"partes por millón"}
-                one{"{0} parte por millón"}
-                other{"{0} partes por millón"}
-            }
             percent{
                 dnam{"por ciento"}
                 one{"{0} por ciento"}
@@ -144,6 +139,11 @@ es{
                 one{"{0} por mil"}
                 other{"{0} por mil"}
             }
+            permillion{
+                dnam{"partes por millón"}
+                one{"{0} parte por millón"}
+                other{"{0} partes por millón"}
+            }
             permyriad{
                 dnam{"por diez mil"}
                 one{"{0} por diez mil"}
@@ -151,7 +151,7 @@ es{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litros por 100 kilómetros"}
                 one{"{0} litro por 100 kilómetros"}
                 other{"{0} litros por 100 kilómetros"}
@@ -678,7 +678,7 @@ es{
                 one{"{0} hectopascal"}
                 other{"{0} hectopascales"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"pulgadas de mercurio"}
                 one{"{0} pulgada de mercurio"}
                 other{"{0} pulgadas de mercurio"}
@@ -698,7 +698,7 @@ es{
                 one{"{0} milibar"}
                 other{"{0} milibares"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milímetros de mercurio"}
                 one{"{0} milímetro de mercurio"}
                 other{"{0} milímetros de mercurio"}
@@ -708,7 +708,7 @@ es{
                 one{"{0} pascal"}
                 other{"{0} pascales"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"libras por pulgada cuadrada"}
                 one{"{0} libra por pulgada cuadrada"}
                 other{"{0} libras por pulgada cuadrada"}
@@ -764,7 +764,7 @@ es{
                 one{"{0} newton metro"}
                 other{"{0} newton metros"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"libra pies"}
                 one{"{0} libra pie"}
                 other{"{0} libras pies"}
@@ -967,7 +967,7 @@ es{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 one{"{0}l/100km"}
                 other{"{0}l/100km"}
@@ -1168,7 +1168,7 @@ es{
                 one{"{0}hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0}inHg"}
                 other{"{0}inHg"}
@@ -1178,12 +1178,12 @@ es{
                 one{"{0}mbar"}
                 other{"{0}mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0}mmHg"}
                 other{"{0}mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0}psi"}
                 other{"{0}psi"}
@@ -1251,7 +1251,7 @@ es{
                 one{"{0} Fg"}
                 other{"{0} Fg"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1365,11 +1365,6 @@ es{
                 one{"{0} moles"}
                 other{"{0} moles"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"por ciento"}
                 one{"{0} %"}
@@ -1380,6 +1375,11 @@ es{
                 one{"{0} ‰"}
                 other{"{0} ‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"por diez mil"}
                 one{"{0} ‱"}
@@ -1387,7 +1387,7 @@ es{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1898,7 +1898,7 @@ es{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1908,7 +1908,7 @@ es{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
@@ -1918,7 +1918,7 @@ es{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1974,7 +1974,7 @@ es{
                 one{"{0} Nm"}
                 other{"{0} Nm"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf ft"}
                 one{"{0} lbf ft"}
                 other{"{0} lbf ft"}
index d41a2147c2f15c7da6330e43e75879e8e35c1c87..c9bf29801f8cf6b5a3ac54433ad33a11b69c05eb 100644 (file)
@@ -86,7 +86,7 @@ es_419{
             g-force{
                 dnam{"G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0}m/s²"}
                 other{"{0}m/s²"}
index 423060a401507551c3ef6878be4c14a7fce2ed65..09dfead02026a7dc2e70280ad158f6d2a239f85a 100644 (file)
@@ -12,7 +12,7 @@ es_MX{
             millimole-per-liter{
                 dnam{"mmol/L"}
             }
-            part-per-million{
+            permillion{
                 dnam{"ppm"}
             }
         }
index 7e442d38331893aa4b1c1cb06a5ec37047e6297a..d3875326c752316d77124d33c291f7571bcdf253 100644 (file)
@@ -24,7 +24,7 @@ es_US{
             millimole-per-liter{
                 dnam{"mmol/L"}
             }
-            part-per-million{
+            permillion{
                 dnam{"ppm"}
             }
         }
index b0d7b5c9fe4bbe775bd25135150984a384349ea8..16bd5da350ab58daba1e006af9593ca05324346f 100644 (file)
@@ -14,7 +14,7 @@ et{
                 one{"{0} Maa raskuskiirendus"}
                 other{"{0} Maa raskuskiirendust"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meetrid sekundi ruudu kohta"}
                 one{"{0} meeter sekundi ruudu kohta"}
                 other{"{0} meetrit sekundi ruudu kohta"}
@@ -129,11 +129,6 @@ et{
                 one{"{0} mool"}
                 other{"{0} mooli"}
             }
-            part-per-million{
-                dnam{"osa miljoni kohta"}
-                one{"{0} osa miljoni kohta"}
-                other{"{0} osa miljoni kohta"}
-            }
             percent{
                 dnam{"protsent"}
                 one{"{0} protsent"}
@@ -144,6 +139,11 @@ et{
                 one{"{0} promill"}
                 other{"{0} promilli"}
             }
+            permillion{
+                dnam{"osa miljoni kohta"}
+                one{"{0} osa miljoni kohta"}
+                other{"{0} osa miljoni kohta"}
+            }
             permyriad{
                 dnam{"promüriaad"}
                 one{"{0} promüriaad"}
@@ -151,7 +151,7 @@ et{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"liitrid 100 kilomeetri kohta"}
                 one{"liiter 100 kilomeetri kohta"}
                 other{"{0} liitrit 100 kilomeetri kohta"}
@@ -691,7 +691,7 @@ et{
                 one{"{0} hektopaskal"}
                 other{"{0} hektopaskalit"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"tollid elavhõbedasammast"}
                 one{"{0} toll elavhõbedasammast"}
                 other{"{0} tolli elavhõbedasammast"}
@@ -711,7 +711,7 @@ et{
                 one{"{0} millibaar"}
                 other{"{0} millibaari"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"millimeetrid elavhõbedasammast"}
                 one{"{0} millimeeter elavhõbedasammast"}
                 other{"{0} millimeetrit elavhõbedasammast"}
@@ -721,7 +721,7 @@ et{
                 one{"{0} paskal"}
                 other{"{0} paskalit"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"naelad ruuttolli kohta"}
                 one{"{0} nael ruuttolli kohta"}
                 other{"{0} naela ruuttolli kohta"}
@@ -777,7 +777,7 @@ et{
                 one{"{0} njuutonmeeter"}
                 other{"{0} njuutonmeetrit"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"naeljalad"}
                 one{"{0} naeljalg"}
                 other{"{0} naeljalga"}
@@ -978,7 +978,7 @@ et{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100km"}
                 other{"{0} l/100km"}
@@ -1157,7 +1157,7 @@ et{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"″ Hg"}
                 one{"{0} toll Hg"}
                 other{"{0} tolli Hg"}
@@ -1167,7 +1167,7 @@ et{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
@@ -1219,7 +1219,7 @@ et{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1334,11 +1334,6 @@ et{
                 one{"{0} mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"osa/miljon"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0}%"}
@@ -1349,6 +1344,11 @@ et{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"osa/miljon"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"promüriaad"}
                 one{"{0}‱"}
@@ -1356,7 +1356,7 @@ et{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1891,7 +1891,7 @@ et{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"in Hg"}
                 one{"{0} in Hg"}
                 other{"{0} in Hg"}
@@ -1911,12 +1911,12 @@ et{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1972,7 +1972,7 @@ et{
                 one{"{0} Nm"}
                 other{"{0} Nm"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
index c4c3ab5f7ff5259ece9888fd01e710cbedf76475..83f5c3024bb1fd7ba471c93256f35df286a73167 100644 (file)
@@ -14,7 +14,7 @@ eu{
                 one{"{0} grabitate-indar"}
                 other{"{0} grabitate-indar"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metroak segundo karratu bakoitzeko"}
                 one{"{0} metro segundo karratu bakoitzeko"}
                 other{"{0} metro segundo karratu bakoitzeko"}
@@ -119,11 +119,6 @@ eu{
                 one{"{0} milimole litro bakoitzeko"}
                 other{"{0} milimole litro bakoitzeko"}
             }
-            part-per-million{
-                dnam{"zati milioi bakoitzeko"}
-                one{"{0} zati milioi bakoitzeko"}
-                other{"{0} zati milioi bakoitzeko"}
-            }
             percent{
                 dnam{"ehuneko"}
                 one{"ehuneko {0}"}
@@ -134,13 +129,18 @@ eu{
                 one{"milako {0}"}
                 other{"milako {0}"}
             }
+            permillion{
+                dnam{"zati milioi bakoitzeko"}
+                one{"{0} zati milioi bakoitzeko"}
+                other{"{0} zati milioi bakoitzeko"}
+            }
             permyriad{
                 one{"‱ {0}"}
                 other{"‱ {0}"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litro 100 kilometro bakoitzeko"}
                 one{"{0} litro 100 kilometro bakoitzeko"}
                 other{"{0} litro 100 kilometro bakoitzeko"}
@@ -652,7 +652,7 @@ eu{
                 one{"{0} hektopascal"}
                 other{"{0} hektopascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"merkurio-hazbeteak"}
                 one{"{0} merkurio-hazbete"}
                 other{"{0} merkurio-hazbete"}
@@ -672,7 +672,7 @@ eu{
                 one{"{0} milibar"}
                 other{"{0} milibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"merkurio-milimetroak"}
                 one{"{0} merkurio-milimetro"}
                 other{"{0} merkurio-milimetro"}
@@ -682,7 +682,7 @@ eu{
                 one{"{0} pascal"}
                 other{"{0} pascal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"libra hazbete karratuko"}
                 one{"{0} libra hazbete karratuko"}
                 other{"{0} libra hazbete karratuko"}
@@ -738,7 +738,7 @@ eu{
                 one{"{0} newton-metro"}
                 other{"{0} newton-metro"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"oin-libra"}
                 one{"{0} oin-libra"}
                 other{"{0} oin-libra"}
@@ -939,7 +939,7 @@ eu{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1079,7 +1079,7 @@ eu{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -1137,7 +1137,7 @@ eu{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1242,11 +1242,6 @@ eu{
                 one{"{0} mmol/l"}
                 other{"{0} mmol/l"}
             }
-            part-per-million{
-                dnam{"zati/milioi"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 one{"% {0}"}
@@ -1257,13 +1252,18 @@ eu{
                 one{"‰ {0}"}
                 other{"‰ {0}"}
             }
+            permillion{
+                dnam{"zati/milioi"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 one{"‱ {0}"}
                 other{"‱ {0}"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1770,7 +1770,7 @@ eu{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1790,7 +1790,7 @@ eu{
                 one{"{0} mb"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
@@ -1800,7 +1800,7 @@ eu{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1856,7 +1856,7 @@ eu{
                 one{"{0} Nm"}
                 other{"{0} Nm"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"oin-libra"}
                 one{"{0} oin-libra"}
                 other{"{0} oin-libra"}
index 16ef77cf1e1836354b14d859cbff698cd8307c45..7a58e5022d568601d2a22d6a65db3ecd49836985 100644 (file)
@@ -14,7 +14,7 @@ fa{
                 one{"{0} نیروی جاذبه"}
                 other{"{0} جاذبه"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"متر بر مجذور ثانیه"}
                 one{"{0} متر بر مجذور ثانیه"}
                 other{"{0} متر بر مجذور ثانیه"}
@@ -126,11 +126,6 @@ fa{
                 one{"{0} مول"}
                 other{"{0} مول"}
             }
-            part-per-million{
-                dnam{"بخش در میلیون"}
-                one{"{0} بخش در میلیون"}
-                other{"{0} بخش در میلیون"}
-            }
             percent{
                 dnam{"درصد"}
                 one{"{0} درصد"}
@@ -141,6 +136,11 @@ fa{
                 one{"{0} هزارم"}
                 other{"{0} هزارم"}
             }
+            permillion{
+                dnam{"بخش در میلیون"}
+                one{"{0} بخش در میلیون"}
+                other{"{0} بخش در میلیون"}
+            }
             permyriad{
                 dnam{"ده‌هزارم"}
                 one{"{0} ده‌هزارم"}
@@ -148,7 +148,7 @@ fa{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"لیتر در ۱۰۰ کیلومتر"}
                 one{"{0} لیتر در ۱۰۰ کیلومتر"}
                 other{"{0} لیتر در ۱۰۰ کیلومتر"}
@@ -670,7 +670,7 @@ fa{
                 one{"{0} هکتوپاسکال"}
                 other{"{0} هکتوپاسکال"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"اینچ جیوه"}
                 one{"{0} اینچ جیوه"}
                 other{"{0} اینچ جیوه"}
@@ -690,7 +690,7 @@ fa{
                 one{"{0} میلی‌بار"}
                 other{"{0} میلی‌بار"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"میلی‌متر جیوه"}
                 one{"{0} میلی‌متر جیوه"}
                 other{"{0} میلی‌متر جیوه"}
@@ -700,7 +700,7 @@ fa{
                 one{"{0} پاسکال"}
                 other{"{0} پاسکال"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"پوند در اینچ مربع"}
                 one{"{0} پوند در اینچ مربع"}
                 other{"{0} پوند در اینچ مربع"}
@@ -755,7 +755,7 @@ fa{
                 one{"{0} نیوتن‌متر"}
                 other{"{0} نیوتن‌متر"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"پوند-فوت"}
                 one{"{0} پوند-فوت"}
                 other{"{0} پوند-فوت"}
@@ -906,7 +906,7 @@ fa{
                 one{"{0}G"}
                 other{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"متر/مجذور ثانیه"}
             }
         }
@@ -970,7 +970,7 @@ fa{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"لیتر/۱۰۰ کیلومتر"}
                 one{"{0} ل./۱۰۰ ک.م."}
                 other{"{0} ل./۱۰۰ ک.م."}
@@ -1213,7 +1213,7 @@ fa{
                 one{"{0}hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"اینچ جیوه"}
                 one{"{0}inHg"}
                 other{"{0}inHg"}
@@ -1223,12 +1223,12 @@ fa{
                 one{"{0}mbar"}
                 other{"{0}mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"میلی‌متر جیوه"}
                 one{"{0} م‌م جیوه"}
                 other{"{0} م‌م جیوه"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"پوند در اینچ مربع"}
                 one{"{0}‎ psi"}
                 other{"{0}‎ psi"}
@@ -1300,7 +1300,7 @@ fa{
                 one{"{0} جاذبه"}
                 other{"{0} جاذبه"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"متر/مجذور ثانیه"}
                 one{"{0}<LRM> m/s²"}
                 other{"{0}<LRM> m/s²"}
@@ -1415,11 +1415,6 @@ fa{
                 one{"{0} مول"}
                 other{"{0} مول"}
             }
-            part-per-million{
-                dnam{"بخش/میلیون"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"درصد"}
                 one{"{0}٪"}
@@ -1430,6 +1425,11 @@ fa{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"بخش/میلیون"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"ده‌هزارم"}
                 one{"{0}‱"}
@@ -1437,7 +1437,7 @@ fa{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"لیتر/۱۰۰ کیلومتر"}
                 one{"{0} ل./۱۰۰ ک.م."}
                 other{"{0} ل./۱۰۰ ک.م."}
@@ -1932,7 +1932,7 @@ fa{
                 one{"{0}‎ hPa"}
                 other{"{0}‎ hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"اینچ جیوه"}
                 one{"{0} اینچ جیوه"}
                 other{"{0} اینچ جیوه"}
@@ -1952,12 +1952,12 @@ fa{
                 one{"{0} میلی‌بار"}
                 other{"{0} میلی‌بار"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"میلی‌متر جیوه"}
                 one{"{0} م‌م جیوه"}
                 other{"{0} م‌م جیوه"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"پوند در اینچ مربع"}
                 one{"{0}‎ psi"}
                 other{"{0}‎ psi"}
@@ -2012,7 +2012,7 @@ fa{
                 one{"{0} نیوتن‌متر"}
                 other{"{0} نیوتن‌متر"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"پوند-فوت"}
                 one{"{0} پوند-فوت"}
                 other{"{0} پوند-فوت"}
index 025a82d3e8155acdfc5579ed5ed9cbb50f27402c..838e7d3796088c70b041aac79f846ed752d02e07 100644 (file)
@@ -14,7 +14,7 @@ fi{
                 one{"{0} G-voima"}
                 other{"{0} G-voimaa"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metrit per sekunti toiseen"}
                 one{"{0} metri per sekunti toiseen"}
                 other{"{0} metriä per sekunti toiseen"}
@@ -128,11 +128,6 @@ fi{
                 one{"{0} mooli"}
                 other{"{0} moolia"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"prosentit"}
                 one{"{0} prosentti"}
@@ -143,6 +138,11 @@ fi{
                 one{"{0} promille"}
                 other{"{0} promillea"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"peruspiste"}
                 one{"{0} peruspiste"}
@@ -150,7 +150,7 @@ fi{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litrat / 100 kilometriä"}
                 one{"{0} litra / 100 km"}
                 other{"{0} litraa / 100 km"}
@@ -645,7 +645,7 @@ fi{
                 one{"{0} hehtopascal"}
                 other{"{0} hehtopascalia"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"elohopeatuumat"}
                 one{"{0} tuuma elohopeaa"}
                 other{"{0} tuumaa elohopeaa"}
@@ -665,7 +665,7 @@ fi{
                 one{"{0} millibaari"}
                 other{"{0} millibaaria"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"elohopeamillimetrit"}
                 one{"{0} millimetri elohopeaa"}
                 other{"{0} millimetriä elohopeaa"}
@@ -675,7 +675,7 @@ fi{
                 one{"{0} pascal"}
                 other{"{0} pascalia"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"paunat / neliötuuma"}
                 one{"{0} pauna / neliötuuma"}
                 other{"{0} paunaa / neliötuuma"}
@@ -731,7 +731,7 @@ fi{
                 one{"{0} newtonmetri"}
                 other{"{0} newtonmetriä"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"pauna-jalat"}
                 one{"{0} pauna-jalka"}
                 other{"{0} pauna-jalkaa"}
@@ -887,7 +887,7 @@ fi{
                 one{"{0}G"}
                 other{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0}m/s²"}
                 other{"{0}m/s²"}
@@ -1000,11 +1000,6 @@ fi{
                 one{"{0}mol"}
                 other{"{0}mol"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0}ppm"}
-                other{"{0}ppm"}
-            }
             percent{
                 one{"{0} %"}
                 other{"{0} %"}
@@ -1013,6 +1008,11 @@ fi{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0}ppm"}
+                other{"{0}ppm"}
+            }
             permyriad{
                 dnam{"‱"}
                 one{"{0}‱"}
@@ -1020,7 +1020,7 @@ fi{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 one{"{0}l/100km"}
                 other{"{0}l/100km"}
@@ -1542,7 +1542,7 @@ fi{
                 one{"{0}hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0}″ Hg"}
                 other{"{0}″ Hg"}
@@ -1560,7 +1560,7 @@ fi{
                 one{"{0}mbar"}
                 other{"{0}mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0}mmHg"}
                 other{"{0}mmHg"}
@@ -1569,7 +1569,7 @@ fi{
                 one{"{0}Pa"}
                 other{"{0}Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0}psi"}
                 other{"{0}psi"}
@@ -1773,7 +1773,7 @@ fi{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1887,11 +1887,6 @@ fi{
                 one{"{0} mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 one{"{0} %"}
                 other{"{0} %"}
@@ -1900,6 +1895,11 @@ fi{
                 one{"{0} ‰"}
                 other{"{0} ‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"peruspiste"}
                 one{"{0} ‱"}
@@ -1907,7 +1907,7 @@ fi{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -2384,7 +2384,7 @@ fi{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -2394,12 +2394,12 @@ fi{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -2455,7 +2455,7 @@ fi{
                 one{"{0} Nm"}
                 other{"{0} Nm"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
index a4795ddc9f0ce56c4f35bfeb0fa95121f22cf472..e8e1dfd530eb056bf3f05bd0e3cd9f2f82c18b54 100644 (file)
@@ -14,7 +14,7 @@ fil{
                 one{"{0} g-force"}
                 other{"{0} g-force"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metro kada segundo kwadrado"}
                 one{"{0} metro kada segundo kwadrado"}
                 other{"{0} na metro kada segundo kwadrado"}
@@ -123,11 +123,6 @@ fil{
                 one{"{0} mole"}
                 other{"{0} mole"}
             }
-            part-per-million{
-                dnam{"parts per million"}
-                one{"{0} part per million"}
-                other{"{0} parts per million"}
-            }
             percent{
                 dnam{"porsyento"}
                 one{"{0} porsyento"}
@@ -138,6 +133,11 @@ fil{
                 one{"{0} permille"}
                 other{"{0} na permille"}
             }
+            permillion{
+                dnam{"parts per million"}
+                one{"{0} part per million"}
+                other{"{0} parts per million"}
+            }
             permyriad{
                 dnam{"permyriad"}
                 one{"{0} permyriad"}
@@ -145,7 +145,7 @@ fil{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litro kada 100 kilometro"}
                 one{"{0} litro kada 100 kilometro"}
                 other{"{0} na litro kada 100 kilometer"}
@@ -675,7 +675,7 @@ fil{
                 one{"{0} hectopascal"}
                 other{"{0} na hectopascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"pulgada ng asoge"}
                 one{"{0} pulgada ng asoge"}
                 other{"{0} na pulgada ng asoge"}
@@ -695,7 +695,7 @@ fil{
                 one{"{0} millibar"}
                 other{"{0} na millibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimetro ng asoge"}
                 one{"{0} millimetro ng mercury"}
                 other{"{0} na milimetro ng asoge"}
@@ -704,7 +704,7 @@ fil{
                 one{"{0} pascal"}
                 other{"{0} pascals"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"libra kada pulgadang parisukat"}
                 one{"{0} libra kada pulgadang parisukat"}
                 other{"{0} na libra kada pulgadang parisukat"}
@@ -760,9 +760,9 @@ fil{
                 one{"{0} newton-meter"}
                 other{"{0} newton-meter"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"pound-feet"}
-                one{"{0} pound-foot"}
+                one{"{0} pound-force-foot"}
                 other{"{0} pound-feet"}
             }
         }
@@ -911,7 +911,7 @@ fil{
                 one{"{0}G"}
                 other{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 one{"{0}m/s²"}
                 other{"{0}m/s²"}
             }
@@ -963,7 +963,7 @@ fil{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0}L/100km"}
                 other{"{0}L/100km"}
@@ -1213,7 +1213,7 @@ fil{
                 one{"{0}hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"″ Hg"}
                 one{"{0}\u0022 Hg"}
                 other{"{0}\u0022 Hg"}
@@ -1223,12 +1223,12 @@ fil{
                 one{"{0}mb"}
                 other{"{0}mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0}mmHg"}
                 other{"{0}mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0}psi"}
                 other{"{0}psi"}
@@ -1299,7 +1299,7 @@ fil{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metro/segundo²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1407,11 +1407,6 @@ fil{
             mole{
                 dnam{"mole"}
             }
-            part-per-million{
-                dnam{"parts/million"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0}%"}
@@ -1422,6 +1417,11 @@ fil{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"parts/million"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"permyriad"}
                 one{"{0}‱"}
@@ -1429,7 +1429,7 @@ fil{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} na L/100km"}
                 other{"{0} na L/100km"}
@@ -1932,7 +1932,7 @@ fil{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"in Hg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1952,12 +1952,12 @@ fil{
                 one{"{0} mb"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimetro ng asoge"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -2013,7 +2013,7 @@ fil{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
index beaa9cf8910813f0355a579c0f61934daaeb08a3..574e98f1b01db507e2f769a3e5f6cdad08711ad8 100644 (file)
@@ -14,7 +14,7 @@ fo{
                 one{"{0} G-kraft"}
                 other{"{0} G-kreftir"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metrar um sekundi²"}
                 one{"{0} metur um sekundi²"}
                 other{"{0} metrar um sekundi²"}
@@ -118,11 +118,6 @@ fo{
                 one{"{0} millimol fyri hvønn litur"}
                 other{"{0} millimol fyri hvønn litur"}
             }
-            part-per-million{
-                dnam{"partar fyri hvørja millión"}
-                one{"{0} partur fyri hvørja millión"}
-                other{"{0} partar fyri hvørja millión"}
-            }
             percent{
                 dnam{"prosent"}
                 one{"{0} prosent"}
@@ -133,6 +128,11 @@ fo{
                 one{"{0} promilla"}
                 other{"{0} promillur"}
             }
+            permillion{
+                dnam{"partar fyri hvørja millión"}
+                one{"{0} partur fyri hvørja millión"}
+                other{"{0} partar fyri hvørja millión"}
+            }
             permyriad{
                 dnam{"promyriad"}
                 one{"{0} promyriad"}
@@ -140,7 +140,7 @@ fo{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litrar fyri hvørjar 100 kilometrar"}
                 one{"{0} litur fyri hvørjar 100 kilometrar"}
                 other{"{0} litrar fyri hvørjar 100 kilometrar"}
@@ -660,7 +660,7 @@ fo{
                 one{"{0} hektopascal"}
                 other{"{0} hektopascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"tummar av kviksilvur"}
                 one{"{0} tummi av kviksilvur"}
                 other{"{0} tummar av kviksilvur"}
@@ -680,7 +680,7 @@ fo{
                 one{"{0} millibar"}
                 other{"{0} millibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"millimetrar av kviksilvur"}
                 one{"{0} millimetur av kviksilvur"}
                 other{"{0} millimetrar av kviksilvur"}
@@ -690,7 +690,7 @@ fo{
                 one{"{0} Pascal"}
                 other{"{0} Pascal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -746,7 +746,7 @@ fo{
                 one{"{0} newtonmetur"}
                 other{"{0} newtonmetrar"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"pund føtur"}
                 one{"{0} pund fótur"}
                 other{"{0} pund føtur"}
@@ -935,7 +935,7 @@ fo{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 one{"{0}l/100km"}
                 other{"{0}l/100km"}
@@ -1089,7 +1089,7 @@ fo{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1193,11 +1193,6 @@ fo{
                 one{"{0} mmol/l"}
                 other{"{0} mmol/l"}
             }
-            part-per-million{
-                dnam{"partar/millión"}
-                one{"{0} partur/mill."}
-                other{"{0} partar/mill."}
-            }
             percent{
                 dnam{"prosent"}
                 one{"{0} %"}
@@ -1208,6 +1203,11 @@ fo{
                 one{"{0} ‰"}
                 other{"{0} ‰"}
             }
+            permillion{
+                dnam{"partar/millión"}
+                one{"{0} partur/mill."}
+                other{"{0} partar/mill."}
+            }
             permyriad{
                 dnam{"promyriad"}
                 one{"{0} ‱"}
@@ -1215,7 +1215,7 @@ fo{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1682,7 +1682,7 @@ fo{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1692,7 +1692,7 @@ fo{
                 one{"{0} mb"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
@@ -1700,7 +1700,7 @@ fo{
             pascal{
                 dnam{"pascal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index dc573cc5ef5d721bee26215f64b85a1851a96f51..407f11c156861ba3bf968e0ca7036c852b846a88 100644 (file)
@@ -14,7 +14,7 @@ fr{
                 one{"{0} fois l’accélération de pesanteur terrestre"}
                 other{"{0} fois l’accélération de pesanteur terrestre"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"mètres par seconde carrée"}
                 one{"{0} mètre par seconde carrée"}
                 other{"{0} mètres par seconde carrée"}
@@ -128,11 +128,6 @@ fr{
                 one{"{0} mole"}
                 other{"{0} moles"}
             }
-            part-per-million{
-                dnam{"parts par million"}
-                one{"{0} part par million"}
-                other{"{0} parts par million"}
-            }
             percent{
                 dnam{"pour cent"}
                 one{"{0} pour cent"}
@@ -143,6 +138,11 @@ fr{
                 one{"{0} pour mille"}
                 other{"{0} pour mille"}
             }
+            permillion{
+                dnam{"parts par million"}
+                one{"{0} part par million"}
+                other{"{0} parts par million"}
+            }
             permyriad{
                 dnam{"pour dix mille"}
                 one{"{0} pour dix mille"}
@@ -150,7 +150,7 @@ fr{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litres aux 100 km"}
                 one{"{0} litre aux 100 km"}
                 other{"{0} litres aux 100 km"}
@@ -692,7 +692,7 @@ fr{
                 one{"{0} hectopascal"}
                 other{"{0} hectopascals"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"pouces de mercure"}
                 one{"{0} pouce de mercure"}
                 other{"{0} pouces de mercure"}
@@ -712,7 +712,7 @@ fr{
                 one{"{0} millibar"}
                 other{"{0} millibars"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"millimètres de mercure"}
                 one{"{0} millimètre de mercure"}
                 other{"{0} millimètres de mercure"}
@@ -722,7 +722,7 @@ fr{
                 one{"{0} pascal"}
                 other{"{0} pascals"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"livres par pouce carré"}
                 one{"{0} livre par pouce carré"}
                 other{"{0} livres par pouce carré"}
@@ -778,7 +778,7 @@ fr{
                 one{"{0} newton-mètre"}
                 other{"{0} newtons-mètres"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"livres-pieds"}
                 one{"{0} livre-pied"}
                 other{"{0} livres-pieds"}
@@ -929,7 +929,7 @@ fr{
                 one{"{0}G"}
                 other{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
             }
         }
@@ -992,7 +992,7 @@ fr{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 one{"{0}l/100km"}
                 other{"{0}l/100km"}
@@ -1231,7 +1231,7 @@ fr{
                 one{"{0}hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"″Hg"}
                 one{"{0}″ Hg"}
                 other{"{0}″ Hg"}
@@ -1241,12 +1241,12 @@ fr{
                 one{"{0}mbar"}
                 other{"{0}mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"lb/po²"}
                 one{"{0} lb/po²"}
                 other{"{0} lb/po²"}
@@ -1377,7 +1377,7 @@ fr{
                 one{"{0} force g"}
                 other{"{0} force g"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1491,11 +1491,6 @@ fr{
                 one{"{0} mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0} %"}
@@ -1506,13 +1501,18 @@ fr{
                 one{"{0} ‰"}
                 other{"{0} ‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 one{"{0} ‱"}
                 other{"{0} ‱"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -2049,7 +2049,7 @@ fr{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -2067,7 +2067,7 @@ fr{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
@@ -2076,7 +2076,7 @@ fr{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"lb/po²"}
                 one{"{0} lb/po²"}
                 other{"{0} lb/po²"}
@@ -2131,7 +2131,7 @@ fr{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
index 159dd4d6a9794b884b677751bf8f869a78a908bb..037f68a59ec59752a56b8c344e864ff4e6246d5f 100644 (file)
@@ -7,7 +7,7 @@ fr_CA{
             g-force{
                 dnam{"force G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 one{"{0} mètre par seconde carrée"}
                 other{"{0} mètres par seconde carrée"}
             }
@@ -72,18 +72,18 @@ fr_CA{
             }
         }
         concentr{
-            part-per-million{
-                dnam{"parties par million"}
-                one{"{0} partie par million"}
-                other{"{0} parties par million"}
-            }
             permille{
                 one{"{0} pour mille"}
                 other{"{0} pour mille"}
             }
+            permillion{
+                dnam{"parties par million"}
+                one{"{0} partie par million"}
+                other{"{0} parties par million"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litres aux 100 kilomètres"}
                 one{"{0} litre aux 100 kilomètres"}
                 other{"{0} litres aux 100 kilomètres"}
@@ -408,7 +408,7 @@ fr_CA{
                 one{"{0} hectopascal"}
                 other{"{0} hectopascals"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} pouce de mercure"}
                 other{"{0} pouces de mercure"}
             }
@@ -512,7 +512,7 @@ fr_CA{
     }
     unitsNarrow{
         acceleration{
-            meter-per-second-squared{
+            meter-per-square-second{
                 one{"{0}m/s²"}
                 other{"{0}m/s²"}
             }
@@ -524,7 +524,7 @@ fr_CA{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100 km"}
                 one{"{0} L/100 km"}
                 other{"{0} L/100 km"}
@@ -632,14 +632,14 @@ fr_CA{
             }
         }
         pressure{
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 one{"{0}mmHg"}
                 other{"{0}mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0}psi"}
                 other{"{0}psi"}
@@ -676,7 +676,7 @@ fr_CA{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
             }
@@ -740,7 +740,7 @@ fr_CA{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100 km"}
                 one{"{0} L/100 km"}
                 other{"{0} L/100 km"}
@@ -1063,7 +1063,7 @@ fr_CA{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"po Hg"}
                 one{"{0} po Hg"}
                 other{"{0} po Hg"}
@@ -1072,12 +1072,12 @@ fr_CA{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1112,7 +1112,7 @@ fr_CA{
             }
         }
         torque{
-            pound-foot{
+            pound-force-foot{
                 dnam{"lb-pi"}
                 one{"{0} lb-pi"}
                 other{"{0} lb-pi"}
index 25d47b01e82147047918ed826b02822fecf1a153..b558cfdbf5cfb8bd635197829e163085352dd5cf 100644 (file)
@@ -206,7 +206,7 @@ fy{
                 one{"{0} hektopaskal"}
                 other{"{0} hektopaskal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -427,7 +427,7 @@ fy{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -674,7 +674,7 @@ fy{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
index cf8c9ad995b22cadb9be7d021855740c8dc82009..7e3cf3f19d35dd3899a7ccc467cc8df7b749cc70 100644 (file)
@@ -17,7 +17,7 @@ ga{
                 other{"{0} g-fhórsa"}
                 two{"{0} g-fhórsa"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"méadair sa soicind cearnaithe"}
                 few{"{0} mhéadar sa soicind cearnaithe"}
                 many{"{0} méadar sa soicind cearnaithe"}
@@ -191,14 +191,6 @@ ga{
                 other{"{0} mól"}
                 two{"{0} mhól"}
             }
-            part-per-million{
-                dnam{"codanna sa mhilliún"}
-                few{"{0} sa mhilliún"}
-                many{"{0} sa mhilliún"}
-                one{"{0} sa mhilliún"}
-                other{"{0} sa mhilliún"}
-                two{"{0} sa mhilliún"}
-            }
             percent{
                 dnam{"faoin gcéad"}
                 few{"{0}%"}
@@ -215,6 +207,14 @@ ga{
                 other{"{0} faoin míle"}
                 two{"{0}‰"}
             }
+            permillion{
+                dnam{"codanna sa mhilliún"}
+                few{"{0} sa mhilliún"}
+                many{"{0} sa mhilliún"}
+                one{"{0} sa mhilliún"}
+                other{"{0} sa mhilliún"}
+                two{"{0} sa mhilliún"}
+            }
             permyriad{
                 dnam{"permeiriad"}
                 few{"{0}‱"}
@@ -225,7 +225,7 @@ ga{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"lítir sa 100 ciliméadar"}
                 few{"{0} lítear sa 100 ciliméadar"}
                 many{"{0} lítear sa 100 ciliméadar"}
@@ -1059,7 +1059,7 @@ ga{
                 other{"{0} heicteapascal"}
                 two{"{0} heicteapascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"orlaí mearcair"}
                 few{"{0} orlach mearcair"}
                 many{"{0} n-orlach mearcair"}
@@ -1091,7 +1091,7 @@ ga{
                 other{"{0} milleabar"}
                 two{"{0} mhilleabar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milliméadair mhearcair"}
                 few{"{0} mhilliméadar mearcair"}
                 many{"{0} milliméadar mearcair"}
@@ -1099,7 +1099,7 @@ ga{
                 other{"{0} milliméadar mearcair"}
                 two{"{0} mhilliméadar mearcair"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"puint san orlach cearnach"}
                 few{"{0} phunt san orlach cearnach"}
                 many{"{0} bpunt san orlach cearnach"}
@@ -1185,7 +1185,7 @@ ga{
                 other{"{0} méadar niútain"}
                 two{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"punt-troigh"}
                 few{"{0} lbf⋅ft"}
                 many{"{0} lbf⋅ft"}
@@ -1428,7 +1428,7 @@ ga{
                 other{"{0}G"}
                 two{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0}m/s²"}
                 many{"{0}m/s²"}
@@ -1586,14 +1586,6 @@ ga{
                 other{"{0} mmol/L"}
                 two{"{0} mmol/L"}
             }
-            part-per-million{
-                dnam{"codanna/milliún"}
-                few{"{0}/milliún"}
-                many{"{0}/milliún"}
-                one{"{0}/milliún"}
-                other{"{0}/milliún"}
-                two{"{0}/milliún"}
-            }
             percent{
                 dnam{"%"}
                 few{"{0}%"}
@@ -1602,9 +1594,17 @@ ga{
                 other{"{0}%"}
                 two{"{0}%"}
             }
+            permillion{
+                dnam{"codanna/milliún"}
+                few{"{0}/milliún"}
+                many{"{0}/milliún"}
+                one{"{0}/milliún"}
+                other{"{0}/milliún"}
+                two{"{0}/milliún"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 few{"{0}l/100km"}
                 many{"{0}l/100km"}
@@ -2271,7 +2271,7 @@ ga{
                 other{"{0}hPa"}
                 two{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"orlaí Hg"}
                 few{"{0}\u0022 Hg"}
                 many{"{0}\u0022 Hg"}
@@ -2287,7 +2287,7 @@ ga{
                 other{"{0}mb"}
                 two{"{0}mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 few{"{0}mmHg"}
                 many{"{0}mmHg"}
@@ -2295,7 +2295,7 @@ ga{
                 other{"{0}mmHg"}
                 two{"{0}mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psoc"}
                 few{"{0}psoc"}
                 many{"{0}psoc"}
@@ -2590,7 +2590,7 @@ ga{
                 other{"{0} G"}
                 two{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0} m/s²"}
                 many{"{0} m/s²"}
@@ -2764,14 +2764,6 @@ ga{
                 other{"{0} mól"}
                 two{"{0} mhól"}
             }
-            part-per-million{
-                dnam{"codanna/milliún"}
-                few{"{0}/milliún"}
-                many{"{0}/milliún"}
-                one{"{0}/milliún"}
-                other{"{0}/milliún"}
-                two{"{0}/milliún"}
-            }
             percent{
                 dnam{"faoin gcéad"}
                 few{"{0}%"}
@@ -2788,6 +2780,14 @@ ga{
                 other{"{0}‰"}
                 two{"{0}‰"}
             }
+            permillion{
+                dnam{"codanna/milliún"}
+                few{"{0}/milliún"}
+                many{"{0}/milliún"}
+                one{"{0}/milliún"}
+                other{"{0}/milliún"}
+                two{"{0}/milliún"}
+            }
             permyriad{
                 dnam{"permeiriad"}
                 few{"{0}‱"}
@@ -2798,7 +2798,7 @@ ga{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 few{"{0} l/100km"}
                 many{"{0} l/100km"}
@@ -3579,7 +3579,7 @@ ga{
                 other{"{0} hPa"}
                 two{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"orlaí Hg"}
                 few{"{0} or. Hg"}
                 many{"{0} n-or. Hg"}
@@ -3611,7 +3611,7 @@ ga{
                 other{"{0} mbar"}
                 two{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 few{"{0} mm Hg"}
                 many{"{0} mm Hg"}
@@ -3619,7 +3619,7 @@ ga{
                 other{"{0} mm Hg"}
                 two{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psoc"}
                 few{"{0} psoc"}
                 many{"{0} psoc"}
@@ -3705,7 +3705,7 @@ ga{
                 other{"{0} N⋅m"}
                 two{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 few{"{0} lbf⋅ft"}
                 many{"{0} lbf⋅ft"}
index 19e10dfa85a57a4ccd7416eadf040a869f9c867c..3acde98886b86136c5934be779732994a91d0fdc 100644 (file)
@@ -16,7 +16,7 @@ gd{
                 other{"{0} forsa-g"}
                 two{"{0} fhorsa-g"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meatair san diog cheàrnagach"}
                 few{"{0} meatairean san diog cheàrnagach"}
                 one{"{0} mheatair san diog cheàrnagach"}
@@ -170,13 +170,6 @@ gd{
                 other{"{0} mòl"}
                 two{"{0} mhòl"}
             }
-            part-per-million{
-                dnam{"pàirt sa mhillean"}
-                few{"{0} pàirtean sa mhillean"}
-                one{"{0} phàirt sa mhillean"}
-                other{"{0} pàirt sa mhillean"}
-                two{"{0} phàirt sa mhillean"}
-            }
             percent{
                 dnam{"sa cheud"}
                 few{"{0} sa cheud"}
@@ -191,6 +184,13 @@ gd{
                 other{"{0} sa mhìle"}
                 two{"{0} sa mhìle"}
             }
+            permillion{
+                dnam{"pàirt sa mhillean"}
+                few{"{0} pàirtean sa mhillean"}
+                one{"{0} phàirt sa mhillean"}
+                other{"{0} pàirt sa mhillean"}
+                two{"{0} phàirt sa mhillean"}
+            }
             permyriad{
                 dnam{"sna deich mìltean"}
                 few{"{0} sna deich mìltean"}
@@ -200,7 +200,7 @@ gd{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"liotair sa 100 chilemeatair"}
                 few{"{0} liotairean sa 100 chilemeatair"}
                 one{"{0} liotair sa 100 chilemeatair"}
@@ -936,7 +936,7 @@ gd{
                 other{"{0} heacta-pascal"}
                 two{"{0} heacta-pascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"òirleach de dh’airgead-beò"}
                 few{"{0} òirlich de dh’airgead-beò"}
                 one{"{0} òirleach de dh’airgead-beò"}
@@ -964,7 +964,7 @@ gd{
                 other{"{0} milibàr"}
                 two{"{0} mhilibàr"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimeatair de dh’airgead-beò"}
                 few{"{0} milimeatairean de dh’airgead-beò"}
                 one{"{0} mhilimeatair de dh’airgead-beò"}
@@ -978,7 +978,7 @@ gd{
                 other{"{0} pascal"}
                 two{"{0} phascal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"punnd san òirleach cheàrnagach"}
                 few{"{0} puinnd san òirleach cheàrnagach"}
                 one{"{0} phunnd san òirleach cheàrnagach"}
@@ -1054,7 +1054,7 @@ gd{
                 other{"{0} newton-mheatair"}
                 two{"{0} newton-mheatair"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"troigh-phuinnd"}
                 few{"{0} troighean-puinnd"}
                 one{"{0} troigh-phuinnd"}
@@ -1268,7 +1268,7 @@ gd{
                 other{"{0}G"}
                 two{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0}m/s²"}
                 one{"{0}m/s²"}
@@ -1422,13 +1422,6 @@ gd{
                 other{"{0}mòl"}
                 two{"{0}mòl"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                few{"{0}ppm"}
-                one{"{0}ppm"}
-                other{"{0}ppm"}
-                two{"{0}ppm"}
-            }
             percent{
                 dnam{"%"}
                 few{"{0}%"}
@@ -1443,6 +1436,13 @@ gd{
                 other{"{0}‰"}
                 two{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                few{"{0}ppm"}
+                one{"{0}ppm"}
+                other{"{0}ppm"}
+                two{"{0}ppm"}
+            }
             permyriad{
                 few{"{0}‱"}
                 one{"{0}‱"}
@@ -1451,7 +1451,7 @@ gd{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 few{"{0}L/100km"}
                 one{"{0}L/100km"}
@@ -2176,7 +2176,7 @@ gd{
                 other{"{0}hPa"}
                 two{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"″ Hg"}
                 few{"{0}″ Hg"}
                 one{"{0}″ Hg"}
@@ -2202,7 +2202,7 @@ gd{
                 other{"{0}mb"}
                 two{"{0}mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 few{"{0}mm Hg"}
                 one{"{0}mm Hg"}
@@ -2215,7 +2215,7 @@ gd{
                 other{"{0}Pa"}
                 two{"{0}Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 few{"{0}psi"}
                 one{"{0}psi"}
@@ -2290,7 +2290,7 @@ gd{
                 other{"{0}N⋅m"}
                 two{"{0}N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 few{"{0}lbf⋅ft"}
                 one{"{0}lbf⋅ft"}
@@ -2503,7 +2503,7 @@ gd{
                 other{"{0} G"}
                 two{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meatair/diog²"}
                 few{"{0} m/s²"}
                 one{"{0} m/s²"}
@@ -2657,13 +2657,6 @@ gd{
                 other{"{0} mòl"}
                 two{"{0} mòl"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                few{"{0} ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-                two{"{0} ppm"}
-            }
             percent{
                 dnam{"sa cheud"}
                 few{"{0}%"}
@@ -2678,12 +2671,19 @@ gd{
                 other{"{0}‰"}
                 two{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                few{"{0} ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+                two{"{0} ppm"}
+            }
             permyriad{
                 dnam{"sna deich mìltean"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 few{"{0} L/100km"}
                 one{"{0} L/100km"}
@@ -3341,7 +3341,7 @@ gd{
                 other{"{0} hPa"}
                 two{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"in Hg"}
                 few{"{0} inHg"}
                 one{"{0} inHg"}
@@ -3361,14 +3361,14 @@ gd{
                 other{"{0} mbàr"}
                 two{"{0} mbàr"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 few{"{0} mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
                 two{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 few{"{0} psi"}
                 one{"{0} psi"}
@@ -3437,7 +3437,7 @@ gd{
             }
         }
         torque{
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 few{"{0} lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
index f636ba1a26346387f2bf1d4ba657e28fabb48dd1..e57de6a2a4509dad68423ba8d5a4f88498b61b84 100644 (file)
@@ -14,7 +14,7 @@ gl{
                 one{"{0} forza G"}
                 other{"{0} forzas G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metros por segundo cadrado"}
                 one{"{0} metro por segundo cadrado"}
                 other{"{0} metros por segundo cadrado"}
@@ -128,11 +128,6 @@ gl{
                 one{"{0} mol"}
                 other{"{0} moles"}
             }
-            part-per-million{
-                dnam{"partes por millón"}
-                one{"{0} parte por millón"}
-                other{"{0} partes por millón"}
-            }
             percent{
                 dnam{"tanto por cento"}
                 one{"{0} %"}
@@ -143,6 +138,11 @@ gl{
                 one{"{0} ‰"}
                 other{"{0} ‰"}
             }
+            permillion{
+                dnam{"partes por millón"}
+                one{"{0} parte por millón"}
+                other{"{0} partes por millón"}
+            }
             permyriad{
                 dnam{"tanto por dez mil"}
                 one{"{0} ‱"}
@@ -150,7 +150,7 @@ gl{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litros por 100 quilómetros"}
                 one{"{0} litro por 100 quilómetros"}
                 other{"{0} litros por 100 quilómetros"}
@@ -677,7 +677,7 @@ gl{
                 one{"{0} hectopascal"}
                 other{"{0} hectopascais"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"polgadas de mercurio"}
                 one{"{0} polgada de mercurio"}
                 other{"{0} polgadas de mercurio"}
@@ -697,7 +697,7 @@ gl{
                 one{"{0} milibar"}
                 other{"{0} milibares"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milímetros de mercurio"}
                 one{"{0} milímetro de mercurio"}
                 other{"{0} milímetros de mercurio"}
@@ -707,7 +707,7 @@ gl{
                 one{"{0} pascal"}
                 other{"{0} pascais"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"libras por polgada cadrada"}
                 one{"{0} libra por polgada cadrada"}
                 other{"{0} libras por polgada cadrada"}
@@ -763,7 +763,7 @@ gl{
                 one{"newton metro"}
                 other{"{0} newtons metro"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"libras pés"}
                 one{"{0} libra pé"}
                 other{"{0} libras pés"}
@@ -925,7 +925,7 @@ gl{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1047,7 +1047,7 @@ gl{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1160,11 +1160,6 @@ gl{
                 one{"{0} mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0} %"}
@@ -1175,13 +1170,18 @@ gl{
                 one{"{0} ‰"}
                 other{"{0} ‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 one{"{0} ‱"}
                 other{"{0} ‱"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litros/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1678,7 +1678,7 @@ gl{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1688,12 +1688,12 @@ gl{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1749,7 +1749,7 @@ gl{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf ft"}
                 one{"{0} lbf ft"}
                 other{"{0} lbf ft"}
index ec4c63b6076c42c6a2a440d26d4e5f7032522dc0..fe79da4cfbce9a19915d6b4b7ca137f0a18c15e7 100644 (file)
@@ -65,7 +65,7 @@ gsw{
             }
         }
         pressure{
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -109,7 +109,7 @@ gsw{
             }
         }
         pressure{
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
index 37e99c2e8221320e89d9784cac2e54c4caeca35f..d7583d014892055b2316c4a22d6283d8c322def2 100644 (file)
@@ -14,7 +14,7 @@ gu{
                 one{"{0} ગુ-બળ"}
                 other{"{0} ગુ-બળ"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"મીટર પ્રતિ સેકન્ડ²"}
                 one{"{0} મીટર પ્રતિ સેકન્ડ²"}
                 other{"{0} મીટર પ્રતિ સેકન્ડ²"}
@@ -129,11 +129,6 @@ gu{
                 one{"{0} મોલ"}
                 other{"{0} મોલ"}
             }
-            part-per-million{
-                dnam{"કણ પ્રતિ મિલિયન"}
-                one{"{0} કણ પ્રતિ મિલિયન"}
-                other{"{0} કણ પ્રતિ મિલિયન"}
-            }
             percent{
                 dnam{"ટકા"}
                 one{"{0} ટકા"}
@@ -144,6 +139,11 @@ gu{
                 one{"{0} પ્રતિમાઈલ"}
                 other{"{0} પ્રતિમાઈલ"}
             }
+            permillion{
+                dnam{"કણ પ્રતિ મિલિયન"}
+                one{"{0} કણ પ્રતિ મિલિયન"}
+                other{"{0} કણ પ્રતિ મિલિયન"}
+            }
             permyriad{
                 dnam{"પરમિરિયડ"}
                 one{"{0} પરમિરિયડ"}
@@ -151,7 +151,7 @@ gu{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"લિટર પ્રતિ 100 કિલોમીટર"}
                 one{"{0} લિટર પ્રતિ 100 કિલોમીટર"}
                 other{"{0} લિટર પ્રતિ 100 કિલોમીટર"}
@@ -676,7 +676,7 @@ gu{
                 one{"{0} હેક્ટૉપાસ્કલ"}
                 other{"{0} હેક્ટૉપાસ્કલ"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"પારાના ઇંચ"}
                 one{"{0} પારાના ઇંચ"}
                 other{"{0} પારાના ઇંચ"}
@@ -696,7 +696,7 @@ gu{
                 one{"{0} મિલિબાર"}
                 other{"{0} મિલિબાર"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"પારાનું મિલિમીટર"}
                 one{"{0} પારાનું મિલિમીટર"}
                 other{"{0} પારાનું મિલિમીટર"}
@@ -706,7 +706,7 @@ gu{
                 one{"{0} પાસ્કલ"}
                 other{"{0} પાસ્કલ"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"પાઉન્ડ પ્રતિ વર્ગ ઇંચ"}
                 one{"{0} પાઉન્ડ પ્રતિ વર્ગ ઇંચ"}
                 other{"{0} પાઉન્ડ પ્રતિ વર્ગ ઇંચ"}
@@ -762,7 +762,7 @@ gu{
                 one{"{0} ન્યૂટન-મીટર"}
                 other{"{0} ન્યૂટન-મીટર"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"પાઉન્ડ ફૂટ"}
                 one{"{0} પાઉન્ડ ફૂટ"}
                 other{"{0} પાઉન્ડ ફૂટ"}
@@ -937,7 +937,7 @@ gu{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"લિ/100 કિમી"}
                 one{"{0}લિ/100કિમી"}
                 other{"{0}લિ/100કિમી"}
@@ -1111,7 +1111,7 @@ gu{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -1159,7 +1159,7 @@ gu{
                 one{"{0} ગુ"}
                 other{"{0} ગુ"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"મીટર/સેકન્ડ²"}
                 one{"{0} મી/સે²"}
                 other{"{0} મી/સે²"}
@@ -1273,11 +1273,6 @@ gu{
                 one{"{0} મોલ"}
                 other{"{0} મોલ"}
             }
-            part-per-million{
-                dnam{"કણ/મિલિયન"}
-                one{"{0} પીપીએમ"}
-                other{"{0} પીપીએમ"}
-            }
             percent{
                 dnam{"ટકા"}
                 one{"{0}%"}
@@ -1288,6 +1283,11 @@ gu{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"કણ/મિલિયન"}
+                one{"{0} પીપીએમ"}
+                other{"{0} પીપીએમ"}
+            }
             permyriad{
                 dnam{"પરમિરિયડ"}
                 one{"{0}‱"}
@@ -1295,7 +1295,7 @@ gu{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"લિ/100 કિમી"}
                 one{"{0} લિ/100 કિમી"}
                 other{"{0} લિ/100 કિમી"}
@@ -1795,7 +1795,7 @@ gu{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1815,7 +1815,7 @@ gu{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
@@ -1825,7 +1825,7 @@ gu{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1881,7 +1881,7 @@ gu{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
index 8b310b8e1d028c9cddd33f08bd1f56b0ef2132eb..c201e4e381cd9ba4a3ac53f5f5243ac4b12a284f 100644 (file)
@@ -16,7 +16,7 @@ he{
                 other{"{0} כוחות ג׳י"}
                 two{"שני כוחות ג׳י"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"מטר לשנייה בריבוע"}
                 many{"{0} מטר לשנייה בריבוע"}
                 one{"{0} מטר לשנייה בריבוע"}
@@ -170,13 +170,6 @@ he{
                 other{"{0} מול"}
                 two{"{0} מול"}
             }
-            part-per-million{
-                dnam{"חלקים למיליון"}
-                many{"{0} חלקים למיליון"}
-                one{"{0} חלקים למיליון"}
-                other{"{0} חלקים למיליון"}
-                two{"{0} חלקים למיליון"}
-            }
             percent{
                 dnam{"אחוז"}
                 many{"{0} אחוז"}
@@ -191,6 +184,13 @@ he{
                 other{"{0} פרומיל"}
                 two{"{0} פרומיל"}
             }
+            permillion{
+                dnam{"חלקים למיליון"}
+                many{"{0} חלקים למיליון"}
+                one{"{0} חלקים למיליון"}
+                other{"{0} חלקים למיליון"}
+                two{"{0} חלקים למיליון"}
+            }
             permyriad{
                 dnam{"רבבית"}
                 many{"{0} רבביות"}
@@ -200,7 +200,7 @@ he{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ליטר/100 ק״מ"}
                 many{"{0} ליטר/100 ק״מ"}
                 one{"ליטר/100 ק״מ"}
@@ -918,7 +918,7 @@ he{
                 other{"{0} הקטופסקל"}
                 two{"{0} הקטופסקל"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"אינץ׳ כספית"}
                 many{"{0} אינץ׳ כספית"}
                 one{"אינץ׳ כספית {0}"}
@@ -946,7 +946,7 @@ he{
                 other{"{0} מיליבר"}
                 two{"{0} מיליבר"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"מילימטר כספית"}
                 many{"{0} מילימטר כספית"}
                 one{"מילימטר כספית אחד"}
@@ -960,7 +960,7 @@ he{
                 other{"{0} פסקל"}
                 two{"{0} פסקל"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"פאונד לאינץ׳ רבוע"}
                 many{"{0} פאונד לאינץ׳ רבוע"}
                 one{"פאונד אחד לאינץ׳ רבוע"}
@@ -1036,7 +1036,7 @@ he{
                 other{"{0} ניוטון-מטר"}
                 two{"{0} ניוטון-מטר"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"כוח פאונד"}
                 many{"{0} כוח פאונד"}
                 one{"{0} כוח פאונד"}
@@ -1243,7 +1243,7 @@ he{
                 other{"{0} G"}
                 two{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 many{"{0} m/s²"}
                 one{"{0} m/s²"}
@@ -1322,7 +1322,7 @@ he{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ל׳/100ק״מ"}
                 many{"{0}ל׳/100ק״מ"}
                 one{"{0}ל׳/100ק״מ"}
@@ -1689,7 +1689,7 @@ he{
                 other{"{0} hPa"}
                 two{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"in Hg"}
                 many{"{0} inHg"}
                 one{"{0} inHg"}
@@ -1703,14 +1703,14 @@ he{
                 other{"{0} מיליבר"}
                 two{"{0} מיליבר"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 many{"{0} mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
                 two{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 many{"{0} psi"}
                 one{"{0} psi"}
@@ -1809,7 +1809,7 @@ he{
                 other{"{0} G"}
                 two{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 many{"{0} m/s²"}
                 one{"{0} m/s²"}
@@ -1957,13 +1957,6 @@ he{
                 other{"{0} mmol/L"}
                 two{"{0} mmol/L"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                many{"{0} ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-                two{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 many{"{0}%"}
@@ -1978,9 +1971,16 @@ he{
                 other{"{0}‰"}
                 two{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                many{"{0} ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+                two{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ל׳/100 ק״מ"}
                 many{"{0} ל׳/100 ק״מ"}
                 one{"ל׳ {0}/100 ק״מ"}
@@ -2636,7 +2636,7 @@ he{
                 other{"{0} hPa"}
                 two{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"in Hg"}
                 many{"{0} inHg"}
                 one{"{0} inHg"}
@@ -2650,14 +2650,14 @@ he{
                 other{"{0} mbar"}
                 two{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 many{"{0} mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
                 two{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 many{"{0} psi"}
                 one{"{0} psi"}
index 083290a795bbc58877f050e1e88f525907af3c56..509c87383ca71430070dea30758bcce0ac6c6546 100644 (file)
@@ -14,7 +14,7 @@ hi{
                 one{"{0} गुरुत्व–बल"}
                 other{"{0} गुरुत्व–बल"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"मीटर/से²"}
                 one{"{0} मीटर प्रति सेकंड वर्ग"}
                 other{"{0} मीटर प्रति सेकंड वर्ग"}
@@ -128,11 +128,6 @@ hi{
                 one{"{0} मोल"}
                 other{"{0} मोल"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} हिस्सा प्रति दस लाख"}
-            }
             percent{
                 dnam{"प्रतिशत"}
                 one{"{0} प्रतिशत"}
@@ -143,6 +138,11 @@ hi{
                 one{"{0} प्रति हज़ार"}
                 other{"{0} प्रति हज़ार"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} हिस्सा प्रति दस लाख"}
+            }
             permyriad{
                 dnam{"प्रति दस हज़ार"}
                 one{"{0} प्रति दस हज़ार"}
@@ -150,7 +150,7 @@ hi{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"लीटर प्रति 100 किलोमीटर"}
                 one{"{0} लीटर प्रति 100 किलोमीटर"}
                 other{"{0} लीटर प्रति 100 किलोमीटर"}
@@ -675,7 +675,7 @@ hi{
                 one{"{0} हैक्टोपास्कल"}
                 other{"{0} हैक्टोपास्कल"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"मर्करी इंच"}
                 one{"{0} मर्करी इंच"}
                 other{"{0} मर्करी इंच"}
@@ -695,7 +695,7 @@ hi{
                 one{"{0} मिलीबार"}
                 other{"{0} मिलीबार"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"मर्क्यूरी मिलीमीटर"}
                 one{"{0} मर्क्यूरी मिलीमीटर"}
                 other{"{0} मर्क्यूरी मिलीमीटर"}
@@ -705,7 +705,7 @@ hi{
                 one{"{0} पास्कल"}
                 other{"{0} पास्कल"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"पाउंड प्रति वर्ग इंच"}
                 one{"{0} पाउंड प्रति वर्ग इंच"}
                 other{"{0} पाउंड प्रति वर्ग इंच"}
@@ -761,7 +761,7 @@ hi{
                 one{"{0} न्यूटन-मीटर"}
                 other{"{0} न्यूटन-मीटर"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"पाउंड-फ़ुट"}
                 one{"{0} पाउंड-फ़ुट"}
                 other{"{0} पाउंड-फ़ुट"}
@@ -964,7 +964,7 @@ hi{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ली॰/100 कि॰मी॰"}
                 one{"{0}ली/100कि"}
                 other{"{0}ली/100कि"}
@@ -1104,7 +1104,7 @@ hi{
                 one{"{0}hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0}\u0022 Hg"}
                 other{"{0}\u0022 Hg"}
             }
@@ -1162,7 +1162,7 @@ hi{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"मीटर/से²"}
                 one{"{0} मी॰/व॰से॰"}
                 other{"{0} मी॰/व॰से॰"}
@@ -1276,11 +1276,6 @@ hi{
                 one{"{0} मोल"}
                 other{"{0} मोल"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"प्रतिशत"}
                 one{"{0}%"}
@@ -1291,9 +1286,14 @@ hi{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ली॰/100 कि॰मी॰"}
                 one{"{0} ली॰/100 कि॰मी॰"}
                 other{"{0} ली॰/100 कि॰मी॰"}
@@ -1756,7 +1756,7 @@ hi{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1776,7 +1776,7 @@ hi{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
@@ -1786,7 +1786,7 @@ hi{
                 one{"{0} पा॰"}
                 other{"{0} पा॰"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index 05152e5956ca17ddba357bdf902be8fafcbb11d5..61aefe430392ef94696988f01fcf21d537ebd02b 100644 (file)
@@ -15,7 +15,7 @@ hr{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metri u sekundi na kvadrat"}
                 few{"{0} metra u sekundi na kvadrat"}
                 one{"{0} metar u sekundi na kvadrat"}
@@ -149,12 +149,6 @@ hr{
                 one{"{0} mola"}
                 other{"{0} mola"}
             }
-            part-per-million{
-                dnam{"dijelovi na milijun"}
-                few{"{0} dijela na milijun"}
-                one{"{0} dio na milijun"}
-                other{"{0} dijelova na milijun"}
-            }
             percent{
                 dnam{"postotak"}
                 few{"{0} posto"}
@@ -167,6 +161,12 @@ hr{
                 one{"{0} promil"}
                 other{"{0} promila"}
             }
+            permillion{
+                dnam{"dijelovi na milijun"}
+                few{"{0} dijela na milijun"}
+                one{"{0} dio na milijun"}
+                other{"{0} dijelova na milijun"}
+            }
             permyriad{
                 dnam{"permyriad"}
                 few{"{0} permyriada"}
@@ -175,7 +175,7 @@ hr{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litre na 100 kilometara"}
                 few{"{0} litre na 100 kilometara"}
                 one{"{0} litra na 100 kilometara"}
@@ -816,7 +816,7 @@ hr{
                 one{"{0} hektopaskal"}
                 other{"{0} hektopaskala"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inči žive"}
                 few{"{0} inča žive"}
                 one{"{0} inč žive"}
@@ -840,7 +840,7 @@ hr{
                 one{"{0} milibar"}
                 other{"{0} milibara"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimetri živina stupca"}
                 few{"{0} milimetra živina stupca"}
                 one{"{0} milimetar živina stupca"}
@@ -852,7 +852,7 @@ hr{
                 one{"{0} paskal"}
                 other{"{0} paskala"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"funte po kvadratnom inču"}
                 few{"{0} funte po kvadratnom inču"}
                 one{"{0} funta po kvadratnom inču"}
@@ -918,7 +918,7 @@ hr{
                 one{"{0} njutnmetar"}
                 other{"{0} njutnmetara"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"funte sile po stopi"}
                 few{"{0} funte sile po stopi"}
                 one{"{0} funta sile po stopi"}
@@ -1102,7 +1102,7 @@ hr{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 few{"{0} m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1190,7 +1190,7 @@ hr{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 few{"{0}l/100km"}
                 one{"{0}l/100km"}
@@ -1605,7 +1605,7 @@ hr{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 few{"{0} inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1615,12 +1615,12 @@ hr{
                 one{"{0} mb"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 few{"{0} mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 few{"{0} psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1785,7 +1785,7 @@ hr{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0} m/s²"}
                 one{"{0} m/s²"}
@@ -1918,12 +1918,6 @@ hr{
                 one{"{0} mola"}
                 other{"{0} mola"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                few{"{0} ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 few{"{0} %"}
@@ -1936,6 +1930,12 @@ hr{
                 one{"{0} ‰"}
                 other{"{0} ‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                few{"{0} ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 few{"{0} ‱"}
                 one{"{0} ‱"}
@@ -1943,7 +1943,7 @@ hr{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 few{"{0} l/100 km"}
                 one{"{0} l/100 km"}
@@ -2537,7 +2537,7 @@ hr{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 few{"{0} inHg"}
                 one{"{0} inHg"}
@@ -2549,7 +2549,7 @@ hr{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 few{"{0} mm Hg"}
                 one{"{0} mm Hg"}
@@ -2561,7 +2561,7 @@ hr{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 few{"{0} psi"}
                 one{"{0} psi"}
index 6025ca598608b420037e7dd8801812bcf146eaf8..d378c28654b24b85b69061f3e79384b15f21ae94 100644 (file)
@@ -16,7 +16,7 @@ hsb{
                 other{"{0} jednotkow zemskeho pospěšenja"}
                 two{"{0} jednotce zemskeho pospěšenja"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metry na kwadratnu sekundu"}
                 few{"{0} metry na kwadratnu sekundu"}
                 one{"{0} meter na kwadratnu sekundu"}
@@ -641,7 +641,7 @@ hsb{
                 other{"{0} hektopascalow"}
                 two{"{0} hektopascalej"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"cóle žiwoslěbroweho stołpika"}
                 few{"{0} cóle žiwoslěbroweho stołpika"}
                 one{"{0} cól žiwoslěbroweho stołpika"}
@@ -655,14 +655,14 @@ hsb{
                 other{"{0} milibarow"}
                 two{"{0} milibaraj"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimetry žiwoslěbroweho stołpika"}
                 few{"{0} milimetry žiwoslěbroweho stołpika"}
                 one{"{0} milimeter žiwoslěbroweho stołpika"}
                 other{"{0} milimetrow žiwoslěbroweho stołpika"}
                 two{"{0} milimetraj žiwoslěbroweho stołpika"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"punty na kwadratny cól"}
                 few{"{0} punty na kwadratny cól"}
                 one{"{0} punt na kwadratny cól"}
@@ -1112,7 +1112,7 @@ hsb{
                 other{"{0} hPa"}
                 two{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 few{"{0} inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1192,7 +1192,7 @@ hsb{
                 other{"{0} G"}
                 two{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0} m/s²"}
                 one{"{0} m/s²"}
@@ -1817,7 +1817,7 @@ hsb{
                 other{"{0} hPa"}
                 two{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 few{"{0} inHg"}
                 one{"{0} inHg"}
@@ -1831,14 +1831,14 @@ hsb{
                 other{"{0} mbar"}
                 two{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 few{"{0} mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
                 two{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 few{"{0} psi"}
                 one{"{0} psi"}
index 5ea65c03b3f76343ddfc0c2e20c7562b0e7f09da..bede3462cf944c190bc3e4e3dec5d63fdc47b761 100644 (file)
@@ -14,7 +14,7 @@ hu{
                 one{"{0} g gyorsulás"}
                 other{"{0} g gyorsulás"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"méter per másodpercnégyzet"}
                 one{"{0} méter per másodpercnégyzet"}
                 other{"{0} méter per másodpercnégyzet"}
@@ -123,11 +123,6 @@ hu{
                 one{"{0} mól"}
                 other{"{0} mól"}
             }
-            part-per-million{
-                dnam{"részecske/millió"}
-                one{"{0} részecske/millió"}
-                other{"{0} részecske/millió"}
-            }
             percent{
                 dnam{"százalék"}
                 one{"{0} százalék"}
@@ -138,6 +133,11 @@ hu{
                 one{"{0} ezrelék"}
                 other{"{0} ezrelék"}
             }
+            permillion{
+                dnam{"részecske/millió"}
+                one{"{0} részecske/millió"}
+                other{"{0} részecske/millió"}
+            }
             permyriad{
                 dnam{"tízezrelék"}
                 one{"{0} tízezrelék"}
@@ -145,7 +145,7 @@ hu{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"liter/100 km"}
                 one{"{0} liter/100 km"}
                 other{"{0} liter/100 km"}
@@ -672,7 +672,7 @@ hu{
                 one{"{0} hektopascal"}
                 other{"{0} hektopascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"higanyhüvelyk"}
                 one{"{0} higanyhüvelyk"}
                 other{"{0} higanyhüvelyk"}
@@ -692,7 +692,7 @@ hu{
                 one{"{0} millibar"}
                 other{"{0} millibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"higanymilliméter"}
                 one{"{0} higanymilliméter"}
                 other{"{0} higanymilliméter"}
@@ -702,7 +702,7 @@ hu{
                 one{"{0} pascal"}
                 other{"{0} pascal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"font per négyzethüvelyk"}
                 one{"{0} font per négyzethüvelyk"}
                 other{"{0} font per négyzethüvelyk"}
@@ -758,7 +758,7 @@ hu{
                 one{"{0} newtonméter"}
                 other{"{0} newtonméter"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"fontláb"}
                 one{"{0} fontláb"}
                 other{"{0} fontláb"}
@@ -963,7 +963,7 @@ hu{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1149,7 +1149,7 @@ hu{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"Hgin"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1158,12 +1158,12 @@ hu{
                 one{"{0} mb"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"Hgmm"}
                 one{"{0} Hgmm"}
                 other{"{0} Hgmm"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1231,7 +1231,7 @@ hu{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1335,11 +1335,6 @@ hu{
                 one{"{0} mmol/l"}
                 other{"{0} mmol/l"}
             }
-            part-per-million{
-                dnam{"részecske/millió"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"százalék"}
                 one{"{0}%"}
@@ -1350,9 +1345,14 @@ hu{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"részecske/millió"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100km"}
@@ -1811,7 +1811,7 @@ hu{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1821,7 +1821,7 @@ hu{
                 one{"{0} mb"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"Hgmm"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
@@ -1831,7 +1831,7 @@ hu{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index 820197b375905637536208d15710265b59ec8195..dbedd4a74e02a9dc83b285b2237316687dff12ef 100644 (file)
@@ -14,7 +14,7 @@ hy{
                 one{"{0} g"}
                 other{"{0} g"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"մետրեր/վայրկյան քառակուսի"}
                 one{"{0} մետր/վայրկյան քառակուսի"}
                 other{"{0} մետր/վայրկյան քառակուսի"}
@@ -128,11 +128,6 @@ hy{
                 one{"{0} մոլ"}
                 other{"{0} մոլ"}
             }
-            part-per-million{
-                dnam{"մասնիկներ միլիոնի վրա"}
-                one{"{0} մասնիկ միլիոնի վրա"}
-                other{"{0} մասնիկ միլիոնի վրա"}
-            }
             percent{
                 dnam{"տոկոս"}
                 one{"{0} տոկոս"}
@@ -143,6 +138,11 @@ hy{
                 one{"{0} պրոմիլ"}
                 other{"{0} պրոմիլ"}
             }
+            permillion{
+                dnam{"մասնիկներ միլիոնի վրա"}
+                one{"{0} մասնիկ միլիոնի վրա"}
+                other{"{0} մասնիկ միլիոնի վրա"}
+            }
             permyriad{
                 dnam{"պերմիրիադ"}
                 one{"{0} պերմիրիադ"}
@@ -150,7 +150,7 @@ hy{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"լիտրեր 100 կիլոմետրի վրա"}
                 one{"{0} լիտր 100 կիլոմետրի վրա"}
                 other{"{0} լիտր 100 կիլոմետրի վրա"}
@@ -675,7 +675,7 @@ hy{
                 one{"{0} հեկտոպասկալ"}
                 other{"{0} հեկտոպասկալ"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"սնդիկի սյան դյույմեր"}
                 one{"{0} դյույմ սնդիկի սյուն"}
                 other{"{0} դյույմ սնդիկի սյուն"}
@@ -695,7 +695,7 @@ hy{
                 one{"{0} միլիբար"}
                 other{"{0} միլիբար"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"սնդիկի սյան միլիմետրեր"}
                 one{"{0} միլիմետր սնդիկի սյուն"}
                 other{"{0} միլիմետր սնդիկի սյուն"}
@@ -705,7 +705,7 @@ hy{
                 one{"{0} պասկալ"}
                 other{"{0} պասկալ"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ֆունտեր քառակուսի դյույմի վրա"}
                 one{"{0} ֆունտ քառակուսի դյույմի վրա"}
                 other{"{0} ֆունտ քառակուսի դյույմի վրա"}
@@ -761,7 +761,7 @@ hy{
                 one{"{0} նյուտոն-մետր"}
                 other{"{0} նյուտոն-մետր"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"ֆունտ-ֆուտեր"}
                 one{"{0} ֆունտ-ֆուտ"}
                 other{"{0} ֆունտ-ֆուտ"}
@@ -963,7 +963,7 @@ hy{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"լ/100 կմ"}
                 one{"{0} լ/100 կմ"}
                 other{"{0} լ/100 կմ"}
@@ -1103,7 +1103,7 @@ hy{
                 one{"{0} հՊա"}
                 other{"{0} հՊա"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0}\u0022 ս. ս."}
                 other{"{0}\u0022 ս. ս"}
             }
@@ -1161,7 +1161,7 @@ hy{
                 one{"{0} g"}
                 other{"{0} g"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"մ/վ²"}
                 one{"{0} մ/վ²"}
                 other{"{0} մ/վ²"}
@@ -1275,11 +1275,6 @@ hy{
                 one{"{0} մոլ"}
                 other{"{0} մոլ"}
             }
-            part-per-million{
-                dnam{"մասնիկ/միլիոն"}
-                one{"{0} մասնիկ/միլիոն"}
-                other{"{0} մասնիկ/միլիոն"}
-            }
             percent{
                 dnam{"տոկոս"}
                 one{"{0}%"}
@@ -1290,6 +1285,11 @@ hy{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"մասնիկ/միլիոն"}
+                one{"{0} մասնիկ/միլիոն"}
+                other{"{0} մասնիկ/միլիոն"}
+            }
             permyriad{
                 dnam{"‱"}
                 one{"{0}‱"}
@@ -1297,7 +1297,7 @@ hy{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"լ/100 կմ"}
                 one{"{0} լ/100 կմ"}
                 other{"{0} լ/100 կմ"}
@@ -1799,7 +1799,7 @@ hy{
                 one{"{0} հՊա"}
                 other{"{0} հՊա"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"դյույմ ս.ս."}
                 one{"{0} դյմ. ս.ս."}
                 other{"{0} դյմ. ս.ս."}
@@ -1819,7 +1819,7 @@ hy{
                 one{"{0} մբար"}
                 other{"{0} մբար"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"մմ ս.ս."}
                 one{"{0} մմ ս.ս."}
                 other{"{0} մմ ս.ս."}
@@ -1829,7 +1829,7 @@ hy{
                 one{"{0} Պա"}
                 other{"{0} Պա"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ֆ․/քառ․ դյմ"}
                 one{"{0} ֆ./քառ․ դյմ"}
                 other{"{0} ֆ./քառ․ դյմ"}
@@ -1885,7 +1885,7 @@ hy{
                 one{"{0} Ն·մ"}
                 other{"{0} Ն·մ"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"ֆնտ-ֆտ"}
                 one{"{0} ֆնտ-ֆտ"}
                 other{"{0} ֆնտ-ֆտ"}
index fab65d22e81afd16efdf53cb5d913f1b802ed68c..e355a1917c8ea789316bb07273edfe2ef812a07b 100644 (file)
@@ -14,7 +14,7 @@ ia{
                 one{"{0} G"}
                 other{"{0} fortia g"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metros per secunda quadrate"}
                 one{"{0} m/s²"}
                 other{"{0} metros per secunda quadrate"}
@@ -118,11 +118,6 @@ ia{
                 one{"{0} mmol/L"}
                 other{"{0} millimoles per litro"}
             }
-            part-per-million{
-                dnam{"partes per million"}
-                one{"{0} ppm"}
-                other{"{0} partes per million"}
-            }
             percent{
                 dnam{"per cento"}
                 one{"{0}%"}
@@ -133,9 +128,14 @@ ia{
                 one{"{0}‰"}
                 other{"{0} per mille"}
             }
+            permillion{
+                dnam{"partes per million"}
+                one{"{0} ppm"}
+                other{"{0} partes per million"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litros per 100 kilometros"}
                 one{"{0} L/100km"}
                 other{"{0} litros per 100 kilometros"}
@@ -563,7 +563,7 @@ ia{
                 one{"{0} hPa"}
                 other{"{0} hectopascales"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"pollices de mercurio"}
                 one{"{0} inHg"}
                 other{"{0} pollices de mercurio"}
@@ -573,12 +573,12 @@ ia{
                 one{"{0} mbar"}
                 other{"{0} millibares"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimetros de mercurio"}
                 one{"{0} mm Hg"}
                 other{"{0} milimetros de mercurio"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"libras per pollice quadrate"}
                 one{"{0} lb/in²"}
                 other{"{0} libras per pollice quadrate"}
@@ -768,7 +768,7 @@ ia{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -886,7 +886,7 @@ ia{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -990,11 +990,6 @@ ia{
                 one{"{0} mmol/L"}
                 other{"{0} mmol/L"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0}%"}
@@ -1005,9 +1000,14 @@ ia{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -1435,7 +1435,7 @@ ia{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1445,12 +1445,12 @@ ia{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"lb/in²"}
                 one{"{0} lb/in²"}
                 other{"{0} lb/in²"}
index 5b7cbc3be1c693ed96a0fa8bfeaafec96611a545..a742b276ad64a79129a5f7de589df1b22f80d7d2 100644 (file)
@@ -13,7 +13,7 @@ id{
                 dnam{"g-force"}
                 other{"{0} g-force"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meter per detik persegi"}
                 other{"{0} meter per detik persegi"}
             }
@@ -99,10 +99,6 @@ id{
                 dnam{"millimol per liter"}
                 other{"{0} millimol per liter"}
             }
-            part-per-million{
-                dnam{"bagian per juta"}
-                other{"{0} bagian per juta"}
-            }
             percent{
                 dnam{"persen"}
                 other{"{0} persen"}
@@ -111,13 +107,17 @@ id{
                 dnam{"permil"}
                 other{"{0} permil"}
             }
+            permillion{
+                dnam{"bagian per juta"}
+                other{"{0} bagian per juta"}
+            }
             permyriad{
                 dnam{"permyriad"}
                 other{"{0} permyriad"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"liter per 100 kilometer"}
                 other{"{0} liter per 100 kilometer"}
             }
@@ -551,7 +551,7 @@ id{
                 dnam{"hektopascal"}
                 other{"{0} hektopascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inci merkuri"}
                 other{"{0} inci merkuri"}
             }
@@ -567,7 +567,7 @@ id{
                 dnam{"milibar"}
                 other{"{0} milibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimeter merkuri"}
                 other{"{0} milimeter merkuri"}
             }
@@ -575,7 +575,7 @@ id{
                 dnam{"pascal"}
                 other{"{0} pascal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"pon per inci persegi"}
                 other{"{0} pon per inci persegi"}
             }
@@ -621,7 +621,7 @@ id{
                 dnam{"newton meter"}
                 other{"{0} newton meter"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"pound kaki"}
                 other{"{0} pound kaki"}
             }
@@ -743,7 +743,7 @@ id{
             g-force{
                 other{"{0} g"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/d²"}
                 other{"{0}m/d²"}
             }
@@ -766,7 +766,7 @@ id{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 other{"{0}L/100km"}
             }
@@ -925,10 +925,10 @@ id{
             }
         }
         pressure{
-            inch-hg{
+            inch-ofhg{
                 dnam{"″ Hg"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 other{"{0} mmHg"}
             }
@@ -965,7 +965,7 @@ id{
                 dnam{"g-force"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meter/dtk²"}
                 other{"{0} m/dtk²"}
             }
@@ -1051,10 +1051,6 @@ id{
                 dnam{"millimol/liter"}
                 other{"{0} mmol/L"}
             }
-            part-per-million{
-                dnam{"bagian/juta"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"persen"}
                 other{"{0}%"}
@@ -1063,12 +1059,16 @@ id{
                 dnam{"permil"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"bagian/juta"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"permyriad"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 other{"{0} L/100km"}
             }
@@ -1474,7 +1474,7 @@ id{
                 dnam{"hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"in Hg"}
                 other{"{0} inHg"}
             }
@@ -1482,11 +1482,11 @@ id{
                 dnam{"mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 other{"{0} psi"}
             }
index ca1a813d1c626af607332c049cd9af2ef7186d43..e62f15135041c4e9f8bfa2a6163ec6ba63edbdf2 100644 (file)
@@ -14,7 +14,7 @@ is{
                 one{"{0} þyngdarhröðun"}
                 other{"{0} þyngdarhröðun"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metrar á sekúndu, á sekúndu"}
                 one{"{0} metri á sekúndu, á sekúndu"}
                 other{"{0} metrar á sekúndu, á sekúndu"}
@@ -128,11 +128,6 @@ is{
                 one{"{0} mól"}
                 other{"{0} mól"}
             }
-            part-per-million{
-                dnam{"milljónarhlutar"}
-                one{"{0} milljónarhluti"}
-                other{"{0} milljónarhlutar"}
-            }
             percent{
                 dnam{"prósent"}
                 one{"{0} prósent"}
@@ -143,6 +138,11 @@ is{
                 one{"{0} prómill"}
                 other{"{0} prómill"}
             }
+            permillion{
+                dnam{"milljónarhlutar"}
+                one{"{0} milljónarhluti"}
+                other{"{0} milljónarhlutar"}
+            }
             permyriad{
                 dnam{"permyriad"}
                 one{"{0} permyriad"}
@@ -150,7 +150,7 @@ is{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"lítrar á 100 kílómetra"}
                 one{"{0} lítri á 100 kílómetra"}
                 other{"{0} lítrar á 100 kílómetra"}
@@ -686,7 +686,7 @@ is{
                 one{"{0} hektópaskal"}
                 other{"{0} hektópasköl"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"tommur af kvikasilfri"}
                 one{"{0} tomma af kvikasilfri"}
                 other{"{0} tommur af kvikasilfri"}
@@ -706,7 +706,7 @@ is{
                 one{"{0} millibar"}
                 other{"{0} millibör"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"millimetrar af kvikasilfri"}
                 one{"{0} millimetrar af kvikasilfri"}
                 other{"{0} millimetrar af kvikasilfri"}
@@ -716,7 +716,7 @@ is{
                 one{"{0} paskal"}
                 other{"{0} pasköl"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"pund á fertommu"}
                 one{"{0} pund á fertommu"}
                 other{"{0} pund á fertommu"}
@@ -772,7 +772,7 @@ is{
                 one{"{0} njútonmetri"}
                 other{"{0} njútonmetrar"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"pundfet"}
                 one{"{0} pundfet"}
                 other{"{0} pundfet"}
@@ -923,7 +923,7 @@ is{
                 one{"{0}G"}
                 other{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -990,19 +990,19 @@ is{
                 one{"{0}mmol/L"}
                 other{"{0}mmol/L"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0}ppm"}
-                other{"{0}ppm"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0}%"}
                 other{"{0}%"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0}ppm"}
+                other{"{0}ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 one{"{0}l/100km"}
                 other{"{0}l/100km"}
@@ -1267,7 +1267,7 @@ is{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0}\u0022 Hg"}
                 other{"{0}\u0022 Hg"}
@@ -1277,12 +1277,12 @@ is{
                 one{"{0} mbar"}
                 other{"{0} mbör"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1361,7 +1361,7 @@ is{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metrar/sek²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1475,11 +1475,6 @@ is{
                 one{"{0} mól"}
                 other{"{0} mól"}
             }
-            part-per-million{
-                dnam{"milljónarhlutar"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"prósent"}
                 one{"{0}%"}
@@ -1490,12 +1485,17 @@ is{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"milljónarhlutar"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"permyriad"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -2019,7 +2019,7 @@ is{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -2029,7 +2029,7 @@ is{
                 one{"{0} mbar"}
                 other{"{0} mbör"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
@@ -2039,7 +2039,7 @@ is{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index 5b1a17201942837e347608a967a41847e4442c8f..92145ed3a703ffe8925df1ef8e4b506badd20461 100644 (file)
@@ -14,7 +14,7 @@ it{
                 one{"{0} forza g"}
                 other{"{0} forza g"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metri al secondo quadrato"}
                 one{"{0} metro al secondo quadrato"}
                 other{"{0} metri al secondo quadrato"}
@@ -128,11 +128,6 @@ it{
                 one{"{0} mole"}
                 other{"{0} moli"}
             }
-            part-per-million{
-                dnam{"parti per milione"}
-                one{"{0} parte per milione"}
-                other{"{0} parti per milione"}
-            }
             percent{
                 dnam{"percentuale"}
                 one{"{0} percento"}
@@ -143,6 +138,11 @@ it{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"parti per milione"}
+                one{"{0} parte per milione"}
+                other{"{0} parti per milione"}
+            }
             permyriad{
                 dnam{"punto base"}
                 one{"{0} punto base"}
@@ -150,7 +150,7 @@ it{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litri per 100 chilometri"}
                 one{"{0} litro per 100 chilometri"}
                 other{"{0} litri per 100 chilometri"}
@@ -647,7 +647,7 @@ it{
                 one{"{0} ettopascal"}
                 other{"{0} ettopascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"pollici di mercurio"}
                 one{"{0} pollice di mercurio"}
                 other{"{0} pollici di mercurio"}
@@ -667,12 +667,12 @@ it{
                 one{"{0} millibar"}
                 other{"{0} millibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"millimetri di mercurio"}
                 one{"{0} millimetro di mercurio"}
                 other{"{0} millimetri di mercurio"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"libbre per pollice quadrato"}
                 one{"{0} libbra per pollice quadrato"}
                 other{"{0} libbre per pollice quadrato"}
@@ -728,7 +728,7 @@ it{
                 one{"{0} newton metro"}
                 other{"{0} newton metri"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"libbre-piede"}
                 one{"{0} libbra-piede"}
                 other{"{0} libbre-piedi"}
@@ -931,7 +931,7 @@ it{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -1071,7 +1071,7 @@ it{
                 one{"{0}hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0}inHg"}
                 other{"{0}inHg"}
             }
@@ -1125,7 +1125,7 @@ it{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1234,11 +1234,6 @@ it{
                 one{"{0} mmol/l"}
                 other{"{0} mmol/l"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"percento"}
                 one{"{0}%"}
@@ -1249,9 +1244,14 @@ it{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -1699,7 +1699,7 @@ it{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1709,12 +1709,12 @@ it{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1770,7 +1770,7 @@ it{
                 one{"{0} Nm"}
                 other{"{0} Nm"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lb-ft"}
                 one{"{0} lb-ft"}
                 other{"{0} lb-ft"}
index c355ebe01470b079961d9c274a04c715064682e3..235c7fa2d685c4b00ccb1c6ece132549c5b98d45 100644 (file)
@@ -13,7 +13,7 @@ ja{
                 dnam{"重力加速度"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"メートル毎秒毎秒"}
                 other{"{0} メートル毎秒毎秒"}
             }
@@ -108,10 +108,6 @@ ja{
                 dnam{"モル"}
                 other{"{0} モル"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"パーセント"}
                 other{"{0} パーセント"}
@@ -120,13 +116,17 @@ ja{
                 dnam{"パーミル"}
                 other{"{0} パーミル"}
             }
+            permillion{
+                dnam{"ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"パーミリアド"}
                 other{"{0} パーミリアド"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"リットル毎100キロメートル"}
                 other{"{0} リットル毎100キロメートル"}
             }
@@ -568,7 +568,7 @@ ja{
                 dnam{"ヘクトパスカル"}
                 other{"{0} ヘクトパスカル"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"水銀柱インチ"}
                 other{"{0} 水銀柱インチ"}
             }
@@ -584,7 +584,7 @@ ja{
                 dnam{"ミリバール"}
                 other{"{0} ミリバール"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"水銀柱ミリメートル"}
                 other{"{0} 水銀柱ミリメートル"}
             }
@@ -592,7 +592,7 @@ ja{
                 dnam{"パスカル"}
                 other{"{0} パスカル"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"重量ポンド毎平方インチ"}
                 other{"{0} 重量ポンド毎平方インチ"}
             }
@@ -638,7 +638,7 @@ ja{
                 dnam{"ニュートンメートル"}
                 other{"{0} ニュートンメートル"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"ポンドフィート"}
                 other{"{0} ポンドフィート"}
             }
@@ -765,7 +765,7 @@ ja{
                 dnam{"重力加速度"}
                 other{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 other{"{0}m/s²"}
             }
@@ -818,7 +818,7 @@ ja{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 other{"{0}L/100km"}
             }
@@ -1125,7 +1125,7 @@ ja{
                 dnam{"hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"水銀柱インチ"}
                 other{"{0}\u0022 Hg"}
             }
@@ -1133,11 +1133,11 @@ ja{
                 dnam{"ミリバール"}
                 other{"{0}mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"水銀柱ミリメートル"}
                 other{"{0}mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"重量ポンド毎平方インチ"}
                 other{"{0}psi"}
             }
@@ -1254,7 +1254,7 @@ ja{
                 dnam{"重力加速度"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 other{"{0} m/s²"}
             }
@@ -1349,10 +1349,6 @@ ja{
                 dnam{"モル"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"パーセント"}
                 other{"{0}%"}
@@ -1361,13 +1357,17 @@ ja{
                 dnam{"パーミル"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"パーミリアド"}
                 other{"{0}‱"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 other{"{0} L/100km"}
             }
@@ -1810,7 +1810,7 @@ ja{
                 dnam{"hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"水銀柱インチ"}
                 other{"{0} inHg"}
             }
@@ -1826,7 +1826,7 @@ ja{
                 dnam{"ミリバール"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"水銀柱ミリメートル"}
                 other{"{0} mm Hg"}
             }
@@ -1834,7 +1834,7 @@ ja{
                 dnam{"パスカル"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"重量ポンド毎平方インチ"}
                 other{"{0} psi"}
             }
@@ -1880,7 +1880,7 @@ ja{
                 dnam{"ニュートンメートル"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"ポンドフィート"}
                 other{"{0} lbf⋅ft"}
             }
index 354e6d50efbcc81a5d75a9c14ae06c65ab6ea74d..8b45866652e832e47b990c644ac4dffb63c732f4 100644 (file)
@@ -13,7 +13,7 @@ jv{
                 dnam{"tenaga-g"}
                 other{"{0} tenaga-g"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meter saben detik kuadrat"}
                 other{"{0} meter saben detik kuadrat"}
             }
@@ -99,10 +99,6 @@ jv{
                 dnam{"milimol saben liter"}
                 other{"{0} milimol saben liter"}
             }
-            part-per-million{
-                dnam{"bagean saben yuta"}
-                other{"{0} bagean saben yuta"}
-            }
             percent{
                 dnam{"persen"}
                 other{"{0} persen"}
@@ -111,13 +107,17 @@ jv{
                 dnam{"permil"}
                 other{"{0} permil"}
             }
+            permillion{
+                dnam{"bagean saben yuta"}
+                other{"{0} bagean saben yuta"}
+            }
             permyriad{
                 dnam{"permiriad"}
                 other{"{0} permiriad"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"liter saben 100 kilometer"}
                 other{"{0} liter saben 100 kilometer"}
             }
@@ -535,7 +535,7 @@ jv{
                 dnam{"hektopaskal"}
                 other{"{0} hektopaskal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inci saka raksa"}
                 other{"{0} inci saka raksa"}
             }
@@ -551,7 +551,7 @@ jv{
                 dnam{"milibar"}
                 other{"{0} milibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimeter saka raksa"}
                 other{"{0} milimeter saka raksa"}
             }
@@ -559,7 +559,7 @@ jv{
                 dnam{"paskal"}
                 other{"{0} paskal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"pon saben inci kuadrat"}
                 other{"{0} pon saben inci kuadrat"}
             }
@@ -605,7 +605,7 @@ jv{
                 dnam{"newton-meter"}
                 other{"{0} newton-meter"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"pon-kaki"}
                 other{"{0} pon-kaki"}
             }
@@ -733,7 +733,7 @@ jv{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100 km"}
                 other{"{0} L/100 km"}
             }
@@ -832,7 +832,7 @@ jv{
                 dnam{"tenaga-g"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meter/detik²"}
                 other{"{0} meter/detik²"}
             }
@@ -918,10 +918,6 @@ jv{
                 dnam{"mmol/L"}
                 other{"{0} mmol/L"}
             }
-            part-per-million{
-                dnam{"bagean/yuta"}
-                other{"{0} bagean saben yuta"}
-            }
             percent{
                 dnam{"persen"}
                 other{"{0}%"}
@@ -930,12 +926,16 @@ jv{
                 dnam{"permil"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"bagean/yuta"}
+                other{"{0} bagean saben yuta"}
+            }
             permyriad{
                 dnam{"permiriad"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100 km"}
                 other{"{0} L/100 km"}
             }
@@ -1332,7 +1332,7 @@ jv{
                 dnam{"hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 other{"{0} inHg"}
             }
@@ -1340,11 +1340,11 @@ jv{
                 dnam{"mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 other{"{0} psi"}
             }
@@ -1386,7 +1386,7 @@ jv{
             }
         }
         torque{
-            pound-foot{
+            pound-force-foot{
                 dnam{"pon-kaki"}
                 other{"{0} pon-kaki"}
             }
index bebc4198f25243ad3a5c0aad4f6044a4a68a7875..b540a8515f42ee9390befaea33896ab12f0daeb7 100644 (file)
@@ -14,7 +14,7 @@ ka{
                 one{"{0} ინერციის ძალა"}
                 other{"{0} ინერციის ძალა"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"მეტრი კვადრატულ წამში"}
                 one{"{0} მ/წმ²"}
                 other{"{0} მ/წმ²"}
@@ -123,11 +123,6 @@ ka{
                 one{"{0} მილიმოლი ლიტრზე"}
                 other{"{0} მილიმოლი ლიტრზე"}
             }
-            part-per-million{
-                dnam{"ნაწილი მილიონზე"}
-                one{"{0} ნაწილი მილიონზე"}
-                other{"{0} ნაწილი მილიონზე"}
-            }
             percent{
                 dnam{"პროცენტი"}
                 one{"{0} პროცენტი"}
@@ -138,9 +133,14 @@ ka{
                 one{"{0} პრომილე"}
                 other{"{0} პრომილე"}
             }
+            permillion{
+                dnam{"ნაწილი მილიონზე"}
+                one{"{0} ნაწილი მილიონზე"}
+                other{"{0} ნაწილი მილიონზე"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ლიტრი 100 კილომეტრში"}
                 one{"{0} ლიტრი 100 კილომეტრში"}
                 other{"{0} ლიტრი 100 კილომეტრში"}
@@ -645,7 +645,7 @@ ka{
                 one{"{0} ჰექტოპასკალი"}
                 other{"{0} ჰექტოპასკალი"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ვერცხლისწყლის დუიმი"}
                 one{"{0} ვერცხლისწყლის დუიმი"}
                 other{"{0} ვერცხლისწყლის დუიმი"}
@@ -665,7 +665,7 @@ ka{
                 one{"{0} მილიბარი"}
                 other{"{0} მილიბარი"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"მილიმეტრი ვერცხლისწყლის სვეტისა"}
                 one{"{0} მილიმეტრი ვერცხლისწყლის სვეტისა"}
                 other{"{0} მილიმეტრი ვერცხლისწყლის სვეტისა"}
@@ -675,7 +675,7 @@ ka{
                 one{"{0} პასკალი"}
                 other{"{0} პასკალი"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ფუნტი კვადრატულ დუიმზე"}
                 one{"{0} ფუნტი კვადრატულ დუიმზე"}
                 other{"{0} ფუნტი კვადრატულ დუიმზე"}
@@ -921,7 +921,7 @@ ka{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ლ/100კმ"}
                 one{"{0}ლ/100კმ"}
                 other{"{0}ლ/100კმ"}
@@ -1061,7 +1061,7 @@ ka{
                 one{"{0} ჰპა"}
                 other{"{0} ჰპა"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} ვრც. დმ."}
                 other{"{0} ვრც. დმ."}
             }
@@ -1119,7 +1119,7 @@ ka{
                 one{"{0} ინ. ძ."}
                 other{"{0} ინ. ძ."}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"მ/წმ²"}
                 one{"{0} მ/წმ²"}
                 other{"{0} მ/წმ²"}
@@ -1228,11 +1228,6 @@ ka{
                 one{"{0} მმოლ/ლ"}
                 other{"{0} მმოლ/ლ"}
             }
-            part-per-million{
-                dnam{"ნაწილი/მილიონზე"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0}%"}
@@ -1243,9 +1238,14 @@ ka{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ნაწილი/მილიონზე"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ლ/100კმ"}
                 one{"{0} ლ/100კმ"}
                 other{"{0} ლ/100კმ"}
@@ -1740,7 +1740,7 @@ ka{
                 one{"{0} ჰპა"}
                 other{"{0} ჰპა"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ვრც. დმ."}
                 one{"{0} ვრც. დმ."}
                 other{"{0} ვრც. დმ."}
@@ -1760,7 +1760,7 @@ ka{
                 one{"{0} მბარი"}
                 other{"{0} მბარი"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"მმ ვწყ. სვ."}
                 one{"{0} მმ ვწყ. სვ."}
                 other{"{0} მმ ვწყ. სვ."}
@@ -1770,7 +1770,7 @@ ka{
                 one{"{0} პა"}
                 other{"{0} პა"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ფნტ. კვ. დმ."}
                 one{"{0} ფნტ. კვ. დმ."}
                 other{"{0} ფნტ. კვ. დმ."}
index b9207a4f05f3afad1168213496808a8969869d60..648fbaa0ae59e52d46b595cef8f97f43caf41012 100644 (file)
@@ -13,7 +13,7 @@ kea{
                 dnam{"forsa G"}
                 other{"{0} forsa G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metru pur sigundu kuadradu"}
                 other{"{0} metru pur sigundu kuadradu"}
             }
@@ -100,10 +100,6 @@ kea{
                 dnam{"milimol pur litru"}
                 other{"{0} milimol pur litru"}
             }
-            part-per-million{
-                dnam{"parti pur milhãu"}
-                other{"{0} parti pur milhãu"}
-            }
             percent{
                 dnam{"pursentu"}
                 other{"{0} pursentu"}
@@ -112,13 +108,17 @@ kea{
                 dnam{"pur mil"}
                 other{"{0} pur mil"}
             }
+            permillion{
+                dnam{"parti pur milhãu"}
+                other{"{0} parti pur milhãu"}
+            }
             permyriad{
                 dnam{"pontu bazi"}
                 other{"{0} pontu bazi"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litru pur 100 kilómetru"}
                 other{"{0} litru pur 100 kilómetru"}
             }
@@ -546,7 +546,7 @@ kea{
                 dnam{"ektopaskal"}
                 other{"{0} ektopaskal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"pulegada di merkúriu"}
                 other{"{0} pulegada di merkúriu"}
             }
@@ -562,7 +562,7 @@ kea{
                 dnam{"milibar"}
                 other{"{0} milibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milímetru di merkúriu"}
                 other{"{0} milímetru di merkúriu"}
             }
@@ -570,7 +570,7 @@ kea{
                 dnam{"paskal"}
                 other{"{0} paskal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"libra pur pulegada kuadradu"}
                 other{"{0} libra pur pulegada kuadradu"}
             }
@@ -612,7 +612,7 @@ kea{
                 dnam{"newton-metru"}
                 other{"{0} newton-metru"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"pe-libra"}
                 other{"{0} pe-libra"}
             }
@@ -731,7 +731,7 @@ kea{
     }
     unitsNarrow{
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 other{"{0} l/100km"}
             }
@@ -896,13 +896,13 @@ kea{
                 dnam{"milimol/litru"}
                 other{"{0} mmol/l"}
             }
-            part-per-million{
+            permillion{
                 dnam{"parti/milhãu"}
                 other{"{0} ppm"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litru/100km"}
                 other{"{0} l/100 km"}
             }
index afefe2cf5fa4b881f8f4a386cb7c2b8c8b883d39..a2a24cd537c695d3fde49107e94bb2ecb734260e 100644 (file)
@@ -14,7 +14,7 @@ kk{
                 one{"{0} гравитациялық күш"}
                 other{"{0} гравитациялық күш"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"метр/шаршы секунд"}
                 one{"{0} метр/шаршы секунд"}
                 other{"{0} метр/шаршы секунд"}
@@ -128,11 +128,6 @@ kk{
                 one{"{0} моль"}
                 other{"{0} моль"}
             }
-            part-per-million{
-                dnam{"миллиондық үлес"}
-                one{"{0} миллиондық үлес"}
-                other{"{0} миллиондық үлес"}
-            }
             percent{
                 dnam{"пайыз"}
                 one{"{0} пайыз"}
@@ -143,6 +138,11 @@ kk{
                 one{"{0} промилле"}
                 other{"{0} промилле"}
             }
+            permillion{
+                dnam{"миллиондық үлес"}
+                one{"{0} миллиондық үлес"}
+                other{"{0} миллиондық үлес"}
+            }
             permyriad{
                 dnam{"промириад"}
                 one{"{0} промириад"}
@@ -150,7 +150,7 @@ kk{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"литр/100 километр"}
                 one{"{0} литр/100 километр"}
                 other{"{0} литр/100 километр"}
@@ -677,7 +677,7 @@ kk{
                 one{"{0} гектопаскаль"}
                 other{"{0} гектопаскаль"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"дюйм сынап бағанасы"}
                 one{"{0} дюйм сынап бағанасы"}
                 other{"{0} дюйм сынап бағанасы"}
@@ -697,7 +697,7 @@ kk{
                 one{"{0} миллибар"}
                 other{"{0} миллибар"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"миллиметр сынап бағанасы"}
                 one{"{0} миллиметр сынап бағанасы"}
                 other{"{0} миллиметр сынап бағанасы"}
@@ -707,7 +707,7 @@ kk{
                 one{"{0} паскаль"}
                 other{"{0} паскаль"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"фунт/шаршы дюйм"}
                 one{"{0} фунт/шаршы дюйм"}
                 other{"{0} фунт/шаршы дюйм"}
@@ -763,7 +763,7 @@ kk{
                 one{"{0} ньютон-метр"}
                 other{"{0} ньютон-метр"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"фунт-фут"}
                 one{"{0} фунт-фут"}
                 other{"{0} фунт-фут"}
@@ -965,7 +965,7 @@ kk{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"л/100 км"}
                 one{"{0} л/100 км"}
                 other{"{0} л/100 км"}
@@ -1105,7 +1105,7 @@ kk{
                 one{"{0} гПа"}
                 other{"{0} гПа"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -1163,7 +1163,7 @@ kk{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"метр/сек²"}
                 one{"{0} м/с²"}
                 other{"{0} м/с²"}
@@ -1277,11 +1277,6 @@ kk{
                 one{"{0} моль"}
                 other{"{0} моль"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"пайыз"}
                 one{"{0}%"}
@@ -1292,6 +1287,11 @@ kk{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"‱"}
                 one{"{0}‱"}
@@ -1299,7 +1299,7 @@ kk{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"л/100 км"}
                 one{"{0} л/100 км"}
                 other{"{0} л/100 км"}
@@ -1816,7 +1816,7 @@ kk{
                 one{"{0} гПа"}
                 other{"{0} гПа"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"дюйм сынап бағанасы"}
                 one{"{0} дюйм с.б."}
                 other{"{0} дюйм с.б."}
@@ -1836,7 +1836,7 @@ kk{
                 one{"{0} мбар"}
                 other{"{0} мбар"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"мм с.б."}
                 one{"{0} мм с.б."}
                 other{"{0} мм с.б."}
@@ -1846,7 +1846,7 @@ kk{
                 one{"{0} Па"}
                 other{"{0} Па"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1902,7 +1902,7 @@ kk{
                 one{"{0} Н⋅м"}
                 other{"{0} Н⋅м"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
index 06d9fc961a050da0ded0e87b85d361f0dacad9b1..01e221fb75106e94663fe1207a199cb015f4df32 100644 (file)
@@ -57,7 +57,7 @@ kl{
             }
         }
         pressure{
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -111,7 +111,7 @@ kl{
             }
         }
         pressure{
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
index a31a526351e031a539951a4c78f6919435daa58b..0c55f684164930c95de6db088230771ee80716d4 100644 (file)
@@ -13,7 +13,7 @@ km{
                 dnam{"កម្លាំង​ទំនាញ"}
                 other{"{0} កម្លាំង​ទំនាញ"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"ម៉ែត្រ​ក្នុង​មួយ​វិនាទី​ការ៉េ"}
                 other{"{0} ម៉ែត្រ​ក្នុង​មួយ​វិនាទី​ការ៉េ"}
             }
@@ -102,10 +102,6 @@ km{
                 dnam{"មិល្លីម៉ូលក្នុងមួយលីត្រ"}
                 other{"{0} មិល្លីម៉ូលក្នុងមួយលីត្រ"}
             }
-            part-per-million{
-                dnam{"ផ្នែកក្នុងមួយលាន"}
-                other{"{0} ផ្នែកក្នុងមួយលាន"}
-            }
             percent{
                 dnam{"ភាគរយ"}
                 other{"{0} ភាគរយ"}
@@ -114,9 +110,13 @@ km{
                 dnam{"‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ផ្នែកក្នុងមួយលាន"}
+                other{"{0} ផ្នែកក្នុងមួយលាន"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"លីត្រក្នុង 100 គីឡូម៉ែត្រ"}
                 other{"{0} លីត្រក្នុង 100 គីឡូម៉ែត្រ"}
             }
@@ -471,7 +471,7 @@ km{
                 dnam{"ហិចតូប៉ាស្កាល់"}
                 other{"{0} ហិចតូប៉ាស្កាល់"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"អ៊ីញនៃបារត"}
                 other{"{0} អ៊ីញនៃបារត"}
             }
@@ -479,11 +479,11 @@ km{
                 dnam{"មិល្លីបារ"}
                 other{"{0} មិល្លីបារ"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"មិល្លីម៉ែត្រនៃ​បារត"}
                 other{"{0} មិល្លីម៉ែត្រនៃ​បារត"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ផោន​ក្នុង​មួយ​អ៊ីញ​ការ៉េ"}
                 other{"{0} ផោន​ក្នុង​មួយ​អ៊ីញ​ការ៉េ"}
             }
@@ -675,7 +675,7 @@ km{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 other{"{0}L/100km"}
             }
@@ -788,7 +788,7 @@ km{
             hectopascal{
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 other{"{0}\u0022 Hg"}
             }
             millibar{
@@ -835,7 +835,7 @@ km{
                 dnam{"កម្លាំង​ទំនាញ"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"ម៉ែត្រ​/​វិនាទី​ការ៉េ"}
                 other{"{0} m/s²"}
             }
@@ -924,10 +924,6 @@ km{
                 dnam{"mmol/L"}
                 other{"{0} mmol/L"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"ភាគរយ"}
                 other{"{0}%"}
@@ -936,9 +932,13 @@ km{
                 dnam{"‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 other{"{0} L/100km"}
             }
@@ -1296,7 +1296,7 @@ km{
                 dnam{"hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 other{"{0} inHg"}
             }
@@ -1304,11 +1304,11 @@ km{
                 dnam{"mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 other{"{0} psi"}
             }
index 2cf74d157ef6d9278ece81b6fade715b94dd8d32..9ac244c4734977b381390f858bd4750351a05235 100644 (file)
@@ -14,7 +14,7 @@ kn{
                 one{"{0} ಜಿ-ಫೋರ್ಸ್"}
                 other{"{0} ಜಿ-ಫೋರ್ಸ್"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"ಮೀಟರ್‌ಗಳು ಪ್ರತಿ ಸೆಕೆಂಡ್‌ ಸ್ಕ್ವೇರ್‌ಗಳಿಗೆ"}
                 one{"{0} ಮೀಟರ್‌ ಪ್ರತಿ ಸೆಕೆಂಡ್‌ ಸ್ಕ್ವೇರ್‌ಗಳಿಗೆ"}
                 other{"{0} ಮೀಟರ್‌ಗಳು ಪ್ರತಿ ಸೆಕೆಂಡ್‌ ಸ್ಕ್ವೇರ್‌ಗಳಿಗೆ"}
@@ -128,11 +128,6 @@ kn{
                 one{"{0} ಮೋಲ್‌ಗಳು"}
                 other{"{0} ಮೋಲ್‌ಗಳು"}
             }
-            part-per-million{
-                dnam{"ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳು"}
-                one{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗ"}
-                other{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳು"}
-            }
             percent{
                 dnam{"ಶೇಕಡಾ"}
                 one{"{0} ಶೇಕಡಾ"}
@@ -143,6 +138,11 @@ kn{
                 one{"{0} ಪ್ರತಿ ಸಾವಿರಕ್ಕೆ"}
                 other{"{0} ಪ್ರತಿ ಸಾವಿರಕ್ಕೆ"}
             }
+            permillion{
+                dnam{"ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳು"}
+                one{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗ"}
+                other{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳು"}
+            }
             permyriad{
                 dnam{"ಪರ್ಮಿರೈಡ್"}
                 one{"{0} ಪರ್ಮಿರೈಡ್"}
@@ -150,7 +150,7 @@ kn{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ಪ್ರತಿ 100 ಕಿಲೋಮೀಟರ್‌ಗಳಿಗೆ ಲೀಟರ್‌ಗಳು"}
                 one{"{0} ಪ್ರತಿ 100 ಕಿಲೋಮೀಟರ್‌ಗಳಿಗೆ ಲೀಟರ್‌ಗಳು"}
                 other{"{0} ಪ್ರತಿ 100 ಕಿಲೋಮೀಟರ್‌ಗಳಿಗೆ ಲೀಟರ್‌ಗಳು"}
@@ -682,7 +682,7 @@ kn{
                 one{"{0} ಹೆಕ್ಟೋಪ್ಯಾಸ್ಕಲ್"}
                 other{"{0} ಹೆಕ್ಟೋಪ್ಯಾಸ್ಕಲ್‌ಗಳು"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ಮರ್ಕ್ಯುರಿ ಅಂಗುಲಗಳು"}
                 one{"{0} ಮರ್ಕ್ಯುರಿ ಅಂಗುಲ"}
                 other{"{0} ಮರ್ಕ್ಯುರಿ ಅಂಗುಲಗಳು"}
@@ -702,7 +702,7 @@ kn{
                 one{"{0} ಮಿಲಿಬಾರ್"}
                 other{"{0} ಮಿಲಿಬಾರ್‌ಗಳು"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌ಗಳು"}
                 one{"{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌"}
                 other{"{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌ಗಳು"}
@@ -712,7 +712,7 @@ kn{
                 one{"{0} ಪ್ಯಾಸ್ಕಲ್"}
                 other{"{0} ಪ್ಯಾಸ್ಕಲ್ಸ್"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ಪ್ರತಿ ಚದರ ಇಂಚಿಗೆ ಪೌಂಡ್‌ಗಳು"}
                 one{"{0} ಪ್ರತಿ ಚದರ ಇಂಚಿಗೆ ಪೌಂಡ್‌"}
                 other{"{0} ಪ್ರತಿ ಚದರ ಇಂಚಿಗೆ ಪೌಂಡ್‌ಗಳು"}
@@ -768,7 +768,7 @@ kn{
                 one{"{0} ನ್ಯೂಟನ್-ಮೀಟರ್"}
                 other{"{0} ನ್ಯೂಟನ್-ಮೀಟರ್"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"ಪೌಂಡ್-ಅಡಿ"}
                 one{"{0} ಪೌಂಡ್-ಅಡಿ"}
                 other{"{0} ಪೌಂಡ್-ಅಡಿ"}
@@ -966,7 +966,7 @@ kn{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ಲೀ/100ಕಿ.ಮೀ"}
                 one{"{0} ಲೀ/100ಕಿಮೀ"}
                 other{"{0} ಲೀ/100ಕಿಮೀ"}
@@ -1142,7 +1142,7 @@ kn{
                 one{"{0}ಹೆ.ಪ್ಯಾ"}
                 other{"{0}ಹೆ.ಪ್ಯಾ"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ಮರ್ಕ್ಯು.ಅಂ."}
                 one{"{0}\u0022 Hg"}
                 other{"{0}\u0022 Hg"}
@@ -1152,12 +1152,12 @@ kn{
                 one{"{0}ಮಿ.ಬಾ."}
                 other{"{0}ಮಿ.ಬಾ."}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"ಮರ್ಕ್ಯು.ಮಿ.ಮೀ."}
                 one{"{0}mmHg"}
                 other{"{0}mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ಪ್ರ.ಚ.ಇಂ.ಪೌಂ."}
                 one{"{0}psi"}
                 other{"{0}psi"}
@@ -1225,7 +1225,7 @@ kn{
                 one{"{0} ಜಿ"}
                 other{"{0} ಜಿ"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"ಮೀಟರ್‌ಗಳು/ಸೆ²"}
                 one{"{0} ಮೀ/ಸೆ²"}
                 other{"{0} ಮೀ/ಸೆ²"}
@@ -1340,11 +1340,6 @@ kn{
                 one{"{0} ಮೋಲ್"}
                 other{"{0} ಮೋಲ್"}
             }
-            part-per-million{
-                dnam{"ಭಾಗಗಳು/ಮಿಲಿಯನ್"}
-                one{"{0} ಭಾಪ್ರಮಿ"}
-                other{"{0} ಭಾಪ್ರಮಿ"}
-            }
             percent{
                 dnam{"ಶೇಕಡಾ"}
                 one{"{0}%"}
@@ -1355,6 +1350,11 @@ kn{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ಭಾಗಗಳು/ಮಿಲಿಯನ್"}
+                one{"{0} ಭಾಪ್ರಮಿ"}
+                other{"{0} ಭಾಪ್ರಮಿ"}
+            }
             permyriad{
                 dnam{"ಪರ್ಮಿರೈಡ್"}
                 one{"{0}‱"}
@@ -1362,7 +1362,7 @@ kn{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ಲೀ/100ಕಿಮೀ"}
                 one{"{0} ಲೀ/100ಕಿಮೀ"}
                 other{"{0} ಲೀ/100ಕಿ.ಮೀ"}
@@ -1892,7 +1892,7 @@ kn{
                 one{"{0} ಹೆ.ಪ್ಯಾ"}
                 other{"{0} ಹೆ.ಪ್ಯಾ"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ಮರ್ಕ್ಯು.ಅಂ."}
                 one{"{0} ಮರ್ಕ್ಯುಅಂ"}
                 other{"{0} ಮರ್ಕ್ಯುಅಂ"}
@@ -1912,7 +1912,7 @@ kn{
                 one{"{0} ಮಿ.ಬಾರ್"}
                 other{"{0} ಮಿ.ಬಾರ್"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"ಮರ್ಕ್ಯು.ಮಿ.ಮೀ."}
                 one{"{0} ಮರ್ಕ್ಯು ಮಿಮೀ"}
                 other{"{0} ಮರ್ಕ್ಯು ಮಿಮೀ"}
@@ -1922,7 +1922,7 @@ kn{
                 one{"{0} ಪಾ"}
                 other{"{0} ಪ್ಯಾ"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ಪ್ರ.ಚ.ಇಂ.ಪೌಂ."}
                 one{"{0} ಪ್ರಚಇಂಪೌಂ"}
                 other{"{0} ಪ್ರಚಇಂಪೌಂ"}
@@ -1978,7 +1978,7 @@ kn{
                 one{"{0} ನ್ಯೂ.ಮೀ"}
                 other{"{0} ನ್ಯೂ.ಮೀ"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"ಎಲ್‌ಬಿಎಫ್-ಎಫ್‌ಟಿ"}
                 one{"{0} ಎಲ್‌ಬಿಎಫ್-ಎಫ್‌ಟಿ"}
                 other{"{0} ಎಲ್‌ಬಿಎಫ್-ಎಫ್‌ಟಿ"}
index 027a7a6ae42d28131078f3e948b472e57082febf..000d1bf7b6e3f2469b207b253f067d3ca27b9c4a 100644 (file)
@@ -13,7 +13,7 @@ ko{
                 dnam{"중력가속도"}
                 other{"{0} 중력가속도"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"제곱 초당 미터"}
                 other{"{0}제곱 초당 미터"}
             }
@@ -107,10 +107,6 @@ ko{
                 dnam{"몰"}
                 other{"{0}몰"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                other{"{0}ppm"}
-            }
             percent{
                 dnam{"%"}
                 other{"{0}%"}
@@ -119,9 +115,13 @@ ko{
                 dnam{"‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                other{"{0}ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"100킬로미터당 리터"}
                 other{"100킬로미터당 {0}리터"}
             }
@@ -522,7 +522,7 @@ ko{
                 dnam{"헥토파스칼"}
                 other{"{0}헥토파스칼"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"수은주인치"}
                 other{"{0}수은주인치"}
             }
@@ -538,11 +538,11 @@ ko{
                 dnam{"밀리바"}
                 other{"{0}밀리바"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"수은주밀리미터"}
                 other{"{0}수은주밀리미터"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"제곱인치당 파운드"}
                 other{"{0}제곱인치당 파운드"}
             }
@@ -588,7 +588,7 @@ ko{
                 dnam{"뉴턴미터"}
                 other{"{0}뉴턴미터"}
             }
-            pound-foot{
+            pound-force-foot{
                 other{"{0}lbf⋅ft"}
             }
         }
@@ -710,7 +710,7 @@ ko{
                 dnam{"g-force"}
                 other{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 other{"{0}m/s²"}
             }
@@ -756,7 +756,7 @@ ko{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 other{"{0}L/100km"}
             }
@@ -974,7 +974,7 @@ ko{
                 dnam{"hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 other{"{0}\u0022Hg"}
             }
@@ -982,11 +982,11 @@ ko{
                 dnam{"mbar"}
                 other{"{0}mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 other{"{0}mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 other{"{0}psi"}
             }
@@ -1046,7 +1046,7 @@ ko{
                 dnam{"g-force"}
                 other{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 other{"{0}m/s²"}
             }
@@ -1140,10 +1140,6 @@ ko{
             mole{
                 other{"{0}mol"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                other{"{0}ppm"}
-            }
             percent{
                 dnam{"%"}
                 other{"{0}%"}
@@ -1152,9 +1148,13 @@ ko{
                 dnam{"‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                other{"{0}ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 other{"{0}L/100km"}
             }
@@ -1594,7 +1594,7 @@ ko{
                 dnam{"hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 other{"{0}inHg"}
             }
@@ -1610,7 +1610,7 @@ ko{
                 dnam{"mbar"}
                 other{"{0}mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 other{"{0}mmHg"}
             }
@@ -1618,7 +1618,7 @@ ko{
                 dnam{"Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 other{"{0}psi"}
             }
@@ -1663,7 +1663,7 @@ ko{
             newton-meter{
                 other{"{0}N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 other{"{0}lbf⋅ft"}
             }
         }
index 4fe2efc51a60a142421a9f431bb62d8c6ca9bb20..6814a3107cb7202a4a01adf1281049893f434038 100644 (file)
@@ -9,7 +9,7 @@ kok{
     }
     units{
         acceleration{
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"मी/से²"}
                 other{"{0} मी/से²"}
             }
@@ -113,7 +113,7 @@ kok{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"लिटर/100किलोमीटर"}
                 other{"{0} लिटर/100किलोमीटर"}
             }
@@ -692,7 +692,7 @@ kok{
                 dnam{"g-force"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"मी/से²"}
                 other{"{0} मी/से²"}
             }
@@ -787,10 +787,6 @@ kok{
                 dnam{"मोल"}
                 other{"{0} मोल"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 other{"{0}%"}
@@ -799,13 +795,17 @@ kok{
                 dnam{"‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"‱"}
                 other{"{0}‱"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"लि/100किमी"}
                 other{"{0} लि/100किमी"}
             }
@@ -1236,7 +1236,7 @@ kok{
                 dnam{"hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 other{"{0} inHg"}
             }
@@ -1252,7 +1252,7 @@ kok{
                 dnam{"mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 other{"{0} mm Hg"}
             }
@@ -1260,7 +1260,7 @@ kok{
                 dnam{"Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 other{"{0} psi"}
             }
@@ -1306,7 +1306,7 @@ kok{
                 dnam{"N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
             }
index dcf48b4a1af833582efd636b648cd0bcee0a6022..7b2ef1e65da78431fc46086897c83fc703106416 100644 (file)
@@ -230,7 +230,7 @@ ksh{
                 other{"{0} Hektopascal"}
                 zero{"{0} Hektopascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"Dumm Quecksilbersäule"}
                 one{"{0} Dumm Quecksilbersäule"}
                 other{"{0} Dumm Quecksilbersäule"}
@@ -472,7 +472,7 @@ ksh{
                 other{"{0}hPa"}
                 zero{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
                 zero{"{0} inHg"}
@@ -744,7 +744,7 @@ ksh{
                 other{"{0} hPa"}
                 zero{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"Dumm Quecksilbersäule"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
index 22aa8728b3ec97d90c67b11da92cc6f48b4770df..46c727f920ee03588c3859ac853f9fc6334cc3f8 100644 (file)
@@ -100,7 +100,7 @@ ku{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 one{"{0}l/100km"}
                 other{"{0}l/100km"}
@@ -181,7 +181,7 @@ ku{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
index a3c23027827ceaa707dfef25d16c0369534ab858..6b08196ed4050b7fdf98259a35c43991007fff94 100644 (file)
@@ -14,7 +14,7 @@ ky{
                 one{"{0} оордук күчү"}
                 other{"{0} оордук күчү"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"квадраттык секундасына метр"}
                 one{"квадраттык секундасына {0} метр"}
                 other{"квадраттык секундасына {0} метр"}
@@ -128,11 +128,6 @@ ky{
                 one{"{0} моль"}
                 other{"{0} мольдор"}
             }
-            part-per-million{
-                dnam{"миллионго бөлүктөр"}
-                one{"миллионго {0} бөлүк"}
-                other{"миллионго {0} бөлүк"}
-            }
             percent{
                 dnam{"пайыз"}
                 one{"{0} пайыз"}
@@ -143,6 +138,11 @@ ky{
                 one{"{0} промилле"}
                 other{"{0} промилле"}
             }
+            permillion{
+                dnam{"миллионго бөлүктөр"}
+                one{"миллионго {0} бөлүк"}
+                other{"миллионго {0} бөлүк"}
+            }
             permyriad{
                 dnam{"‱"}
                 one{"{0}‱"}
@@ -150,7 +150,7 @@ ky{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"100 километрге литр"}
                 one{"100 километрге {0} литр"}
                 other{"100 километрге {0} литр"}
@@ -635,7 +635,7 @@ ky{
                 one{"{0} гектопаскаль"}
                 other{"{0} гектопаскаль"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"дюйм сымап мамычасы"}
                 one{"{0} дюйм сымап мамычасы"}
                 other{"{0} дюйм сымап мамычасы"}
@@ -655,12 +655,12 @@ ky{
                 one{"{0} миллибар"}
                 other{"{0} миллибар"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"миллиметр сымап мамычасы"}
                 one{"{0} миллиметр сымап мамычасы"}
                 other{"{0} миллиметр сымап мамычасы"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"чарчы дюймга фунт"}
                 one{"чарчы дюймга {0} фунт"}
                 other{"чарчы дюймга {0} фунт"}
@@ -716,7 +716,7 @@ ky{
                 one{"ньютон-метри"}
                 other{"{0} ньютон-метрлери"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
@@ -918,7 +918,7 @@ ky{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"100 км/л"}
                 one{"{0} л/100км"}
                 other{"{0} л/100км"}
@@ -1058,7 +1058,7 @@ ky{
                 one{"{0} гПа"}
                 other{"{0} гПа"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -1116,7 +1116,7 @@ ky{
                 one{"{0} о.к."}
                 other{"{0} о.к."}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"метр/сек²"}
                 one{"{0} м/сек²"}
                 other{"{0} м/сек²"}
@@ -1230,11 +1230,6 @@ ky{
                 one{"{0} моль"}
                 other{"{0} моль"}
             }
-            part-per-million{
-                dnam{"миллионго/бөлүк"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"пайыз"}
                 one{"{0}%"}
@@ -1245,6 +1240,11 @@ ky{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"миллионго/бөлүк"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"‱"}
                 one{"{0}‱"}
@@ -1252,7 +1252,7 @@ ky{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"100 км/л"}
                 one{"{0} л/100км"}
                 other{"{0} л/100км"}
@@ -1737,7 +1737,7 @@ ky{
                 one{"{0} гПа"}
                 other{"{0} гПа"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"дюйм сымап мамычасы"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1757,12 +1757,12 @@ ky{
                 one{"{0} мбар"}
                 other{"{0} мбар"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"мм.с.м."}
                 one{"{0} мм.с. м."}
                 other{"{0} мм.с. м."}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"фчд"}
                 one{"{0} фчд"}
                 other{"{0} фчд"}
@@ -1818,7 +1818,7 @@ ky{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
index 4fda6eebabd5d7935d249e57e1ea5465068e85dc..d602b3fc836e0d695ef54d727ff7baa0e48745c1 100644 (file)
@@ -14,7 +14,7 @@ lb{
                 one{"{0}-fach Äerdacceleratioun"}
                 other{"{0}-fach Äerdacceleratioun"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"Meter pro Quadratsekonn"}
                 one{"{0} Meter pro Quadratsekonn"}
                 other{"{0} Meter pro Quadratsekonn"}
@@ -479,7 +479,7 @@ lb{
                 one{"{0} Hektopascal"}
                 other{"{0} Hektopascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} Zoll Quecksëlwersail"}
                 other{"{0} Zoll Quecksëlwersail"}
@@ -489,12 +489,12 @@ lb{
                 one{"{0} Millibar"}
                 other{"{0} Millibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -653,7 +653,7 @@ lb{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
             }
@@ -896,7 +896,7 @@ lb{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -904,11 +904,11 @@ lb{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 one{"{0} psi"}
                 other{"{0} psi"}
             }
@@ -1043,7 +1043,7 @@ lb{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1513,7 +1513,7 @@ lb{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1523,12 +1523,12 @@ lb{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index f7a45e796934ad365259c0264bbeb248f0b13cef..7fdd44aa0567a397869e2a395354f36f0c30a7fc 100644 (file)
@@ -13,7 +13,7 @@ lo{
                 dnam{"ແຮງຕົກຕາມລຳພັງ"}
                 other{"{0} ແຮງຕົກຕາມລຳພັງ"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 other{"{0} m/s²"}
             }
@@ -107,10 +107,6 @@ lo{
                 dnam{"ໂມ​ລ"}
                 other{"{0} ໂມ​ລ"}
             }
-            part-per-million{
-                dnam{"ພາດຕໍ່ລ້ານ"}
-                other{"{0} ພາດຕໍ່ລ້ານ"}
-            }
             percent{
                 dnam{"ເປີເຊັນ"}
                 other{"{0} ເປີເຊັນ"}
@@ -119,13 +115,17 @@ lo{
                 dnam{"ຕໍ່ພັນ"}
                 other{"{0} ຕໍ່ພັນ"}
             }
+            permillion{
+                dnam{"ພາດຕໍ່ລ້ານ"}
+                other{"{0} ພາດຕໍ່ລ້ານ"}
+            }
             permyriad{
                 dnam{"ເປີ​ມີ​ຣຽດ"}
                 other{"{0} ເປີ​ມີ​ຣຽດ"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ລິດ ຕໍ່ 100 ກິໂລເເມັດ"}
                 other{"{0} ລິດຕໍ່ 100 ກີໂລແມັດ"}
             }
@@ -518,7 +518,7 @@ lo{
                 dnam{"hectopascals"}
                 other{"{0} hectopascals"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"in Hg"}
                 other{"{0} inches of mercury"}
             }
@@ -534,11 +534,11 @@ lo{
                 dnam{"ມິນລິບາ"}
                 other{"{0} ມິນລິບາ"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"pounds per square inch"}
                 other{"{0} pounds per square inch"}
             }
@@ -584,7 +584,7 @@ lo{
                 dnam{"ນິວ​ເຕິນ​ແມັດ"}
                 other{"{0} ນິວ​ເຕິນ​ແມັດ"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"ປອນ​-ຟຸດ"}
                 other{"{0} ປອນ​-ຟຸດ"}
             }
@@ -741,7 +741,7 @@ lo{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ລ/ 100 ກມ"}
                 other{"{0} ລ / 100 ກມ"}
             }
@@ -861,7 +861,7 @@ lo{
                 dnam{"hPA"}
                 other{"{0} hPA"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"in Hg"}
                 other{"{0} in Hg"}
             }
@@ -910,7 +910,7 @@ lo{
                 dnam{"ແຮງຕົກຕາມລຳພັງ"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 other{"{0} m/s²"}
             }
@@ -1000,10 +1000,6 @@ lo{
                 dnam{"ມິລິໂມນ/ລິດ"}
                 other{"{0} mmol/L"}
             }
-            part-per-million{
-                dnam{"ພາດ/ລ້ານ"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"ເປີເຊັນ"}
                 other{"{0}%"}
@@ -1012,9 +1008,13 @@ lo{
                 dnam{"ຕໍ່ພັນ"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ພາດ/ລ້ານ"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ລ/ 100 ກມ"}
                 other{"{0} L/100km"}
             }
@@ -1369,7 +1369,7 @@ lo{
                 dnam{"hPA"}
                 other{"{0} hPA"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"in Hg"}
                 other{"{0} in Hg"}
             }
@@ -1377,11 +1377,11 @@ lo{
                 dnam{"mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 other{"{0} psi"}
             }
index 7d4b208565693f77148218983cde7759591fa04d..2c08fc102fdccccb1db4a1b169050c78950b322a 100644 (file)
@@ -16,7 +16,7 @@ lt{
                 one{"{0} laisvojo kritimo pagreitis"}
                 other{"{0} laisvojo kritimo pagreičių"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metrai per kvadratinę sekundę"}
                 few{"{0} m/s²"}
                 many{"{0} m/s²"}
@@ -170,13 +170,6 @@ lt{
                 one{"{0} molis"}
                 other{"{0} molių"}
             }
-            part-per-million{
-                dnam{"milijoninės dalys"}
-                few{"{0} milijoninės dalys"}
-                many{"{0} milijoninės dalies"}
-                one{"{0} milijoninė dalis"}
-                other{"{0} milijoninių dalių"}
-            }
             percent{
                 dnam{"procentas"}
                 few{"{0} %"}
@@ -191,9 +184,16 @@ lt{
                 one{"{0} promilė"}
                 other{"{0} promilė"}
             }
+            permillion{
+                dnam{"milijoninės dalys"}
+                few{"{0} milijoninės dalys"}
+                many{"{0} milijoninės dalies"}
+                one{"{0} milijoninė dalis"}
+                other{"{0} milijoninių dalių"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litrai 100 kilometrų"}
                 few{"{0} litrai 100 kilometrų"}
                 many{"{0} litro 100 kilometrų"}
@@ -909,7 +909,7 @@ lt{
                 one{"{0} hektopaskalis"}
                 other{"{0} hektopaskalių"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"gyvsidabrio stulpelio coliai"}
                 few{"{0} gyvsidabrio stulpelio coliai"}
                 many{"{0} gyvsidabrio stulpelio colio"}
@@ -937,7 +937,7 @@ lt{
                 one{"{0} milibaras"}
                 other{"{0} milibarų"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"gysidabrio stulpelio milimetrai"}
                 few{"{0} gysidabrio stulpelio milimetrai"}
                 many{"{0} gysidabrio stulpelio milimetro"}
@@ -951,7 +951,7 @@ lt{
                 one{"{0} paskalis"}
                 other{"{0} paskalių"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"svarai kv. colyje"}
                 few{"{0} svarai kv. colyje"}
                 many{"{0} svaro kv. colyje"}
@@ -1027,7 +1027,7 @@ lt{
                 one{"{0} niutonmetras"}
                 other{"{0} niutonmetrų"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"svarų pėdos"}
             }
         }
@@ -1237,7 +1237,7 @@ lt{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0} m/s²"}
                 many{"{0} m/s²"}
@@ -1316,7 +1316,7 @@ lt{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 few{"{0} l/100 km"}
                 many{"{0} l/100 km"}
@@ -1595,7 +1595,7 @@ lt{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 few{"{0} inHg"}
                 many{"{0} inHg"}
@@ -1609,14 +1609,14 @@ lt{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 few{"{0} mm Hg"}
                 many{"{0} mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"lb in²"}
                 few{"{0} lb in²"}
                 many{"{0} lb in²"}
@@ -1741,7 +1741,7 @@ lt{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0} m/s²"}
                 many{"{0} m/s²"}
@@ -1888,13 +1888,6 @@ lt{
                 one{"{0} mmol/l"}
                 other{"{0} mmol/l"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                few{"{0} ppm"}
-                many{"{0} ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"procentas"}
                 few{"{0} %"}
@@ -1909,9 +1902,16 @@ lt{
                 one{"{0} ‰"}
                 other{"{0} ‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                few{"{0} ppm"}
+                many{"{0} ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 few{"{0} l/100 km"}
                 many{"{0} l/100 km"}
@@ -2574,7 +2574,7 @@ lt{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 few{"{0} inHg"}
                 many{"{0} inHg"}
@@ -2588,7 +2588,7 @@ lt{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 few{"{0} mm Hg"}
                 many{"{0} mm Hg"}
@@ -2598,7 +2598,7 @@ lt{
             pascal{
                 dnam{"paskaliai"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"lb in²"}
                 few{"{0} lb in²"}
                 many{"{0} lb in²"}
index 70ebe73828e252955f400f0097890999bae5f881..974b2cfd18c7b860c1f56f2df9b987c256500182 100644 (file)
@@ -15,7 +15,7 @@ lv{
                 other{"{0} smagumspēks"}
                 zero{"{0} smagumspēku"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metri kvadrātsekundē"}
                 one{"{0} metrs kvadrātsekundē"}
                 other{"{0} metri kvadrātsekundē"}
@@ -148,12 +148,6 @@ lv{
                 other{"{0} moli"}
                 zero{"{0} molu"}
             }
-            part-per-million{
-                dnam{"miljonās daļas"}
-                one{"{0} miljonā daļa"}
-                other{"{0} miljonās daļas"}
-                zero{"{0} miljono daļu"}
-            }
             percent{
                 dnam{"procents"}
                 one{"{0} procents"}
@@ -166,6 +160,12 @@ lv{
                 other{"{0} promiles"}
                 zero{"{0} promiļu"}
             }
+            permillion{
+                dnam{"miljonās daļas"}
+                one{"{0} miljonā daļa"}
+                other{"{0} miljonās daļas"}
+                zero{"{0} miljono daļu"}
+            }
             permyriad{
                 dnam{"promiriāde"}
                 one{"{0} promiriāde"}
@@ -174,7 +174,7 @@ lv{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litri uz 100 kilometriem"}
                 one{"{0} litrs uz 100 kilometriem"}
                 other{"{0} litri uz 100 kilometriem"}
@@ -809,7 +809,7 @@ lv{
                 other{"{0} hektopaskāli"}
                 zero{"{0} hektopaskālu"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"dzīvsudraba stabiņa collas"}
                 one{"{0} dzīvsudraba stabiņa colla"}
                 other{"{0} dzīvsudraba stabiņa collas"}
@@ -833,7 +833,7 @@ lv{
                 other{"{0} milibāri"}
                 zero{"{0} milibāru"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"dzīvsudraba stabiņa milimetri"}
                 one{"{0} dzīvsudraba stabiņa milimetrs"}
                 other{"{0} dzīvsudraba stabiņa milimetri"}
@@ -845,7 +845,7 @@ lv{
                 other{"{0} paskāli"}
                 zero{"{0} paskālu"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"mārciņas uz kvadrātcollu"}
                 one{"{0} mārciņa uz kvadrātcollu"}
                 other{"{0} mārciņas uz kvadrātcollu"}
@@ -911,7 +911,7 @@ lv{
                 other{"{0} ņūtonmetri"}
                 zero{"{0} ņūtonmetru"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"mārciņpēda"}
                 one{"{0} mārciņpēda"}
                 other{"{0} mārciņpēdas"}
@@ -1152,7 +1152,7 @@ lv{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1383,7 +1383,7 @@ lv{
                 other{"{0}hPa"}
                 zero{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0}inHg"}
                 other{"{0}inHg"}
                 zero{"{0}inHg"}
@@ -1393,7 +1393,7 @@ lv{
                 other{"{0}mbar"}
                 zero{"{0}mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
@@ -1465,7 +1465,7 @@ lv{
                 other{"{0} G"}
                 zero{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metri kvadrātsekundē"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1598,12 +1598,6 @@ lv{
                 other{"{0} mol"}
                 zero{"{0} mol"}
             }
-            part-per-million{
-                dnam{"miljonās daļas"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-                zero{"{0} ppm"}
-            }
             percent{
                 dnam{"procents"}
                 one{"{0}%"}
@@ -1616,6 +1610,12 @@ lv{
                 other{"{0}‰"}
                 zero{"{0}‰"}
             }
+            permillion{
+                dnam{"miljonās daļas"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+                zero{"{0} ppm"}
+            }
             permyriad{
                 dnam{"promiriāde"}
                 one{"{0}‱"}
@@ -1624,7 +1624,7 @@ lv{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -2213,7 +2213,7 @@ lv{
                 other{"{0} hPa"}
                 zero{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -2237,13 +2237,13 @@ lv{
                 other{"{0} mbar"}
                 zero{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
                 zero{"{0} mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -2306,7 +2306,7 @@ lv{
                 other{"{0} N⋅m"}
                 zero{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"mārciņpēda"}
                 one{"{0} mārc. pēda"}
                 other{"{0} mārc. pēdas"}
index 424e86068dbcc18229ece1089c63e19217e594a7..cbea1b74b13a696178ed375daa90f073a2d3f41c 100644 (file)
@@ -14,7 +14,7 @@ mk{
                 one{"{0} гравитациска сила"}
                 other{"{0} гравитациска сила"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"метри во секунда на квадрат"}
                 one{"{0} метар во секунда на квадрат"}
                 other{"{0} метри во секунда на квадрат"}
@@ -129,11 +129,6 @@ mk{
                 one{"{0} мол"}
                 other{"{0} молови"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"процент"}
                 one{"{0} процент"}
@@ -144,6 +139,11 @@ mk{
                 one{"{0} промили"}
                 other{"{0} промили"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"десетилјадити дел"}
                 one{"{0} десетилјадити дел"}
@@ -151,7 +151,7 @@ mk{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"литри на 100 километри"}
                 one{"{0} литар на 100 километри"}
                 other{"{0} литри на 100 километри"}
@@ -656,7 +656,7 @@ mk{
                 one{"{0} хектопаскал"}
                 other{"{0} хектопаскали"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"инчи жива"}
                 one{"{0} инч жива"}
                 other{"{0} инчи жива"}
@@ -676,12 +676,12 @@ mk{
                 one{"{0} милибар"}
                 other{"{0} милибари"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"милиметри жива"}
                 one{"{0} милиметар жива"}
                 other{"{0} милиметри жива"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"фунти на квадратен инч"}
                 one{"{0} фунта на квадратен инч"}
                 other{"{0} фунти на квадратен инч"}
@@ -737,7 +737,7 @@ mk{
                 one{"{0} њутнметар"}
                 other{"{0} њутнметри"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"стапки фунти"}
                 one{"{0} стапка фунта"}
                 other{"{0} стапки фунти"}
@@ -891,7 +891,7 @@ mk{
             g-force{
                 dnam{"G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"м/с²"}
                 one{"{0} м/с²"}
                 other{"{0} м/с²"}
@@ -965,7 +965,7 @@ mk{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -1278,7 +1278,7 @@ mk{
                 one{"{0} хПа"}
                 other{"{0} хПа"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -1287,7 +1287,7 @@ mk{
                 one{"{0} мб"}
                 other{"{0} мб"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"мм жива"}
                 one{"{0}mm Hg"}
                 other{"{0}mm Hg"}
@@ -1426,7 +1426,7 @@ mk{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"метри/сек²"}
                 one{"{0} м/с²"}
                 other{"{0} м/с²"}
@@ -1541,11 +1541,6 @@ mk{
                 one{"{0} mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"процент"}
                 one{"{0} %"}
@@ -1556,6 +1551,11 @@ mk{
                 one{"{0} ‰"}
                 other{"{0} ‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"‱"}
                 one{"{0}‱"}
@@ -1563,7 +1563,7 @@ mk{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -2105,7 +2105,7 @@ mk{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -2125,7 +2125,7 @@ mk{
                 one{"{0} мбар"}
                 other{"{0} мб."}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
@@ -2135,7 +2135,7 @@ mk{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -2191,7 +2191,7 @@ mk{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
index 5aba398cd23e4aab1253ded63ccda5396f8e450d..a19f32039409f1c7089097c050ac6a58be22ea15 100644 (file)
@@ -14,7 +14,7 @@ ml{
                 one{"{0} ജി-ഫോഴ്‌സ്"}
                 other{"{0} ജി-ഫോഴ്‌സ്"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"മീറ്റർ/സെക്കൻഡ്²"}
                 one{"{0} മീറ്റർ/സെക്കൻഡ്²"}
                 other{"{0} മീറ്റർ/സെക്കൻഡ്²"}
@@ -128,11 +128,6 @@ ml{
                 one{"{0} മോൾ"}
                 other{"{0} മോളുകൾ"}
             }
-            part-per-million{
-                dnam{"പാർട്‌സ് / മില്ല്യൺ"}
-                one{"പാർട്ട് / മില്ല്യൺ"}
-                other{"{0} പാർട്‌സ് / മില്ല്യൺ"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0}%"}
@@ -143,13 +138,18 @@ ml{
                 one{"{0} പ്രതിമില്ലി"}
                 other{"{0} പ്രതിമില്ലി"}
             }
+            permillion{
+                dnam{"പാർട്‌സ് / മില്ല്യൺ"}
+                one{"പാർട്ട് / മില്ല്യൺ"}
+                other{"{0} പാർട്‌സ് / മില്ല്യൺ"}
+            }
             permyriad{
                 one{"{0} പിരമിഡ്"}
                 other{"{0} പിരമിഡ്"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ലിറ്റർ/100 കിലോമീറ്റർ"}
                 one{"{0} ലിറ്റർ/100 കിലോമീറ്റർ"}
                 other{"{0} ലിറ്റർ/100 കിലോമീറ്റർ"}
@@ -642,7 +642,7 @@ ml{
                 one{"{0} ഹെക്‌ടോപാസ്‌ക്കൽ"}
                 other{"{0} ഹെക്‌ടോപാസ്‌ക്കൽ"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ഇഞ്ച് ഓഫ് മെർക്കുറി"}
                 one{"{0} ഇഞ്ച് ഓഫ് മെർക്കുറി"}
                 other{"{0} ഇഞ്ച് ഓഫ് മെർക്കുറി"}
@@ -662,7 +662,7 @@ ml{
                 one{"{0} മില്ലിബാർ"}
                 other{"{0} മില്ലിബാർ"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"മില്ലീമീറ്റർ മെർക്കുറി"}
                 one{"{0} മില്ലീമീറ്റർ മെർക്കുറി"}
                 other{"{0} മില്ലീമീറ്റർ മെർക്കുറി"}
@@ -672,7 +672,7 @@ ml{
                 one{"{0} പാസ്കൽ"}
                 other{"{0} പാസ്കൽസ്"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"പൗണ്ട് / ചതുരശ്ര ഇഞ്ച്"}
                 one{"{0} പൗണ്ട് / ചതുരശ്ര ഇഞ്ച്"}
                 other{"{0} പൗണ്ട് / ചതുരശ്ര ഇഞ്ച്"}
@@ -728,7 +728,7 @@ ml{
                 one{"{0} ന്യൂട്ടൺ മീറ്റർ"}
                 other{"{0} ന്യൂട്ടൺ മീറ്ററുകൾ"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"പൗണ്ട് ഫീറ്റ്"}
                 one{"{0} പൗണ്ട് ഫൂട്ട്"}
                 other{"{0} പൗണ്ട് ഫീറ്റ്"}
@@ -874,7 +874,7 @@ ml{
                 one{"{0} ജി"}
                 other{"{0} ജി"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"മീ/സെ²"}
                 one{"{0}മീ/സെ²"}
                 other{"{0}മീ/സെ²"}
@@ -927,7 +927,7 @@ ml{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ലി./100 കി.മീ."}
                 one{"{0}ലി/100കിമി"}
                 other{"{0}ലി/100കിമി"}
@@ -1186,7 +1186,7 @@ ml{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ഇഞ്ച് മെ."}
                 one{"{0}\u0022 Hg"}
                 other{"{0}\u0022 Hg"}
@@ -1196,12 +1196,12 @@ ml{
                 one{"{0} മിബാ"}
                 other{"{0} മിബാ"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"മിമീ.മെ."}
                 one{"{0}മിമീ.മെ."}
                 other{"{0}മിമീ.മെ."}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"പിഎസ്ഐ"}
             }
         }
@@ -1272,7 +1272,7 @@ ml{
                 one{"{0} ജി"}
                 other{"{0} ജി"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"മീറ്റർ/സെക്കൻഡ്²"}
                 one{"{0} മീ/സെ²"}
                 other{"{0} മീ/സെ²"}
@@ -1387,11 +1387,6 @@ ml{
                 one{"{0} മോൾ"}
                 other{"{0} മോൾ"}
             }
-            part-per-million{
-                dnam{"പാർട്‌സ്/മില്ല്യൺ"}
-                one{"{0} പാ.പെ.മി."}
-                other{"{0} പാ.പെ.മി."}
-            }
             percent{
                 dnam{"%"}
                 one{"{0}%"}
@@ -1402,12 +1397,17 @@ ml{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"പാർട്‌സ്/മില്ല്യൺ"}
+                one{"{0} പാ.പെ.മി."}
+                other{"{0} പാ.പെ.മി."}
+            }
             permyriad{
                 dnam{"പിരമിഡ്"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ലി./100 കി.മീ."}
                 one{"{0} ലി./100 കി.മീ."}
                 other{"{0} ലി./100 കി.മീ."}
@@ -1930,7 +1930,7 @@ ml{
                 one{"{0} ഹെ.പാ."}
                 other{"{0} ഹെ.പാ."}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ഇഞ്ച് മെ."}
                 one{"{0} ഇഞ്ച് മെ."}
                 other{"{0} ഇഞ്ച് മെ."}
@@ -1940,7 +1940,7 @@ ml{
                 one{"{0} മി.ബാ"}
                 other{"{0} മി.ബാ"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"മിമീ.മെ."}
                 one{"{0} മിമീ.മെ."}
                 other{"{0} മിമീ.മെ."}
@@ -1950,7 +1950,7 @@ ml{
                 one{"{0} പാ"}
                 other{"{0} പാ"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"പിഎസ്ഐ"}
                 one{"{0} പിഎസ്ഐ"}
                 other{"{0} പിഎസ്ഐ"}
index 71bc3c2dd4d295513df5d13f1e65ea91c9986017..9ae20d3c6ed040b3d78e11d94b16e694a55e0f90 100644 (file)
@@ -14,7 +14,7 @@ mn{
                 one{"{0} жи-хүч"}
                 other{"{0} жи-хүч"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"квадрат секундэд ногдох метр"}
                 one{"квадрат секундэд {0} метр"}
                 other{"квадрат секундэд {0} метр"}
@@ -128,11 +128,6 @@ mn{
                 one{"{0} моль"}
                 other{"{0} моль"}
             }
-            part-per-million{
-                dnam{"саяны хувь"}
-                one{"саяны {0} хувь"}
-                other{"саяны {0} хувь"}
-            }
             percent{
                 dnam{"хувь"}
                 one{"{0} хувь"}
@@ -143,6 +138,11 @@ mn{
                 one{"мянганы {0} хувь"}
                 other{"мянганы {0} хувь"}
             }
+            permillion{
+                dnam{"саяны хувь"}
+                one{"саяны {0} хувь"}
+                other{"саяны {0} хувь"}
+            }
             permyriad{
                 dnam{"арван мянганы хувь"}
                 one{"арван мянганы {0} хувь"}
@@ -150,7 +150,7 @@ mn{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"100 километр тутамд ногдох литр"}
                 one{"100 километр тутамд {0} литр"}
                 other{"100 километр тутамд {0} литр"}
@@ -657,7 +657,7 @@ mn{
                 one{"{0} гектоПаскал"}
                 other{"{0} гектоПаскал"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"мөнгөн усны баганын инч"}
                 one{"{0} мөнгөн усны баганын инч"}
                 other{"{0} мөнгөн усны баганын инч"}
@@ -677,7 +677,7 @@ mn{
                 one{"{0} миллибар"}
                 other{"{0} миллибар"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"мөнгөн усны баганын миллиметр"}
                 one{"{0} мөнгөн усны баганын миллиметр"}
                 other{"{0} мөнгөн усны баганын миллиметр"}
@@ -687,7 +687,7 @@ mn{
                 one{"{0} Паскаль"}
                 other{"{0} Паскаль"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"квадрат инч тутамд ногдох фунт"}
                 one{"квадрат инч тутамд {0} фунт"}
                 other{"квадрат инч тутамд {0} фунт"}
@@ -741,7 +741,7 @@ mn{
                 one{"{0} ньютон метр"}
                 other{"{0} ньютон метр"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"фунт фүүт"}
                 one{"{0} фунт фүүт"}
                 other{"{0} фунт фүүт"}
@@ -943,7 +943,7 @@ mn{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"л/100км"}
                 one{"{0} л/100км"}
                 other{"{0}л/100км"}
@@ -1083,7 +1083,7 @@ mn{
                 one{"{0} гПа"}
                 other{"{0} гПа"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} муб"}
                 other{"{0} муб"}
             }
@@ -1141,7 +1141,7 @@ mn{
                 one{"{0} Жи"}
                 other{"{0} Жи"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"метр/сек²"}
                 one{"{0} м/с²"}
                 other{"{0} м/с²"}
@@ -1255,11 +1255,6 @@ mn{
                 one{"{0} моль"}
                 other{"{0} моль"}
             }
-            part-per-million{
-                dnam{"хувь/сая"}
-                one{"{0}x10⁻⁶"}
-                other{"{0}x10⁻⁶"}
-            }
             percent{
                 dnam{"хувь"}
                 one{"{0}%"}
@@ -1270,12 +1265,17 @@ mn{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"хувь/сая"}
+                one{"{0}x10⁻⁶"}
+                other{"{0}x10⁻⁶"}
+            }
             permyriad{
                 dnam{"арван мянганы хувь"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"л/100км"}
                 one{"{0} л/100км"}
                 other{"{0} л/100км"}
@@ -1760,7 +1760,7 @@ mn{
                 one{"{0} гПа"}
                 other{"{0} гПа"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"инч.муб"}
                 one{"{0} инч.муб"}
                 other{"{0} инч.муб"}
@@ -1780,7 +1780,7 @@ mn{
                 one{"{0} мбар"}
                 other{"{0} мбар"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"мм.муб"}
                 one{"{0} мм.муб"}
                 other{"{0} мм.муб"}
@@ -1790,7 +1790,7 @@ mn{
                 one{"{0} Па"}
                 other{"{0} Па"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"фунт/инч²"}
                 one{"{0} фунт/инч²"}
                 other{"{0} фунт/инч²"}
index c6e05cee9b841d7a80718eca5b0903c24d4a074b..eaf19a1093b520c3674c0a054e4fc6027f224c93 100644 (file)
@@ -14,7 +14,7 @@ mr{
                 one{"{0} जी-फोर्स"}
                 other{"{0} जी-फोर्स"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"मीटर प्रति सेकंद चौरस"}
                 one{"{0} मीटर प्रति सेकंद चौरस"}
                 other{"{0} मीटर प्रति सेकंद चौरस"}
@@ -128,11 +128,6 @@ mr{
                 one{"{0} मोल"}
                 other{"{0} मोल"}
             }
-            part-per-million{
-                dnam{"भाग प्रति दशलक्ष"}
-                one{"{0} भाग प्रति दशलक्ष"}
-                other{"{0} भाग प्रति दशलक्ष"}
-            }
             percent{
                 dnam{"टक्के"}
                 one{"{0} टक्के"}
@@ -143,6 +138,11 @@ mr{
                 one{"{0} प्रतिमैल"}
                 other{"{0} प्रतिमैल"}
             }
+            permillion{
+                dnam{"भाग प्रति दशलक्ष"}
+                one{"{0} भाग प्रति दशलक्ष"}
+                other{"{0} भाग प्रति दशलक्ष"}
+            }
             permyriad{
                 dnam{"पर्मिरेड"}
                 one{"{0} पर्मिरेड"}
@@ -150,7 +150,7 @@ mr{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"लीटर प्रति 100 किलोमीटर"}
                 one{"{0} लीटर प्रति 100 किलोमीटर"}
                 other{"{0} लीटर प्रति 100 किलोमीटर"}
@@ -672,7 +672,7 @@ mr{
                 one{"{0} हेक्टोपास्कल"}
                 other{"{0} हेक्टोपास्कल"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"मर्क्यूरी इंच"}
                 one{"{0} मर्क्यूरी इंच"}
                 other{"{0} मर्क्यूरी इंच"}
@@ -692,12 +692,12 @@ mr{
                 one{"{0} मिलिबार"}
                 other{"{0} मिलिबार"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"मर्क्यूरी मिलिमीटर"}
                 one{"{0} मर्क्यूरी मिलिमीटर"}
                 other{"{0} मर्क्यूरी मिलिमीटर"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"प्रति चौरस इंच पाउंड"}
                 one{"{0} प्रति चौरस इंच पाउंड"}
                 other{"{0} प्रति चौरस इंच पाउंड"}
@@ -753,7 +753,7 @@ mr{
                 one{"{0} न्यूटन-मीटर"}
                 other{"{0} न्यूटन-मीटर"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"पाउंड-फूट"}
                 one{"{0} पाउंड-फुट"}
                 other{"{0} पाउंड-फूट"}
@@ -903,7 +903,7 @@ mr{
                 one{"{0}जी"}
                 other{"{0}जी"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"मीटर/सेक²"}
                 one{"{0} मी/से²"}
                 other{"{0} मी/से²"}
@@ -960,7 +960,7 @@ mr{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ली/100किमी"}
                 one{"{0} ली/100किमी"}
                 other{"{0} ली/100किमी"}
@@ -1180,7 +1180,7 @@ mr{
                 one{"{0}हेक्टोपा"}
                 other{"{0}हेक्टोपा"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"″ Hg"}
                 one{"{0}\u0022 हेग्रॅ"}
                 other{"{0}\u0022 हेग्रॅ"}
@@ -1190,12 +1190,12 @@ mr{
                 one{"{0}मिबा"}
                 other{"{0}मिबा"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0}mmHg"}
                 other{"{0}mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0}psi"}
                 other{"{0}psi"}
@@ -1263,7 +1263,7 @@ mr{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"मीटर/सेक²"}
                 one{"{0} मी/से²"}
                 other{"{0} मी/से²"}
@@ -1377,11 +1377,6 @@ mr{
                 one{"{0} मोल"}
                 other{"{0} मोल"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"टक्के"}
                 one{"{0}%"}
@@ -1392,12 +1387,17 @@ mr{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"पर्मिरेड"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ली/100किमी"}
                 one{"{0} ली/100किमी"}
                 other{"{0} ली/100किमी"}
@@ -1900,7 +1900,7 @@ mr{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"in Hg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1913,12 +1913,12 @@ mr{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index c4f069ab0ef56578ecda266758c968abca7d9d95..9c52e2fc4758eefba7e82306690b9d97def3f25e 100644 (file)
@@ -13,7 +13,7 @@ ms{
                 dnam{"daya g"}
                 other{"{0} daya g"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meter sesaat ganda dua"}
                 other{"{0} meter sesaat ganda dua"}
             }
@@ -99,10 +99,6 @@ ms{
                 dnam{"milimol setiap liter"}
                 other{"{0} milimol setiap liter"}
             }
-            part-per-million{
-                dnam{"bahagian setiap juta"}
-                other{"{0} bahagian setiap juta"}
-            }
             percent{
                 dnam{"peratus"}
                 other{"{0} peratus"}
@@ -111,13 +107,17 @@ ms{
                 dnam{"per seribu"}
                 other{"{0} per seribu"}
             }
+            permillion{
+                dnam{"bahagian setiap juta"}
+                other{"{0} bahagian setiap juta"}
+            }
             permyriad{
                 dnam{"permyriad"}
                 other{"{0} permyriad"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"liter setiap 100 kilometer"}
                 other{"{0} liter setiap 100 kilometer"}
             }
@@ -556,7 +556,7 @@ ms{
                 dnam{"hektopascal"}
                 other{"{0} hektopascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inci raksa"}
                 other{"{0} inci raksa"}
             }
@@ -572,7 +572,7 @@ ms{
                 dnam{"milibar"}
                 other{"{0} milibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimeter raksa"}
                 other{"{0} milimeter raksa"}
             }
@@ -580,7 +580,7 @@ ms{
                 dnam{"Pascal"}
                 other{"{0} Pascal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"paun seinci persegi"}
                 other{"{0} paun seinci persegi"}
             }
@@ -626,7 +626,7 @@ ms{
                 dnam{"newton meter"}
                 other{"{0} newton meter"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"kaki paun"}
                 other{"{0} kaki paun"}
             }
@@ -745,7 +745,7 @@ ms{
                 dnam{"daya g"}
                 other{"{0} g"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 other{"{0}m/s²"}
             }
         }
@@ -790,7 +790,7 @@ ms{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 other{"{0} L/100km"}
             }
@@ -1005,7 +1005,7 @@ ms{
                 dnam{"hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 other{"{0} inHg"}
             }
@@ -1013,11 +1013,11 @@ ms{
                 dnam{"mbar"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 other{"{0} psi"}
             }
@@ -1075,7 +1075,7 @@ ms{
                 dnam{"daya g"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meter/s²"}
                 other{"{0} m/s²"}
             }
@@ -1162,10 +1162,6 @@ ms{
                 dnam{"mmol/L"}
                 other{"{0} mmol/L"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"peratus"}
                 other{"{0}%"}
@@ -1174,9 +1170,13 @@ ms{
                 dnam{"per seribu"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 other{"{0} L/100km"}
             }
@@ -1588,7 +1588,7 @@ ms{
                 dnam{"hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 other{"{0} inHg"}
             }
@@ -1596,7 +1596,7 @@ ms{
                 dnam{"mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 other{"{0} mm Hg"}
             }
@@ -1604,7 +1604,7 @@ ms{
                 dnam{"Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 other{"{0} psi"}
             }
index 3d0301c1ad2c0b3ed82971fa9f26d4f0cfbcb485..694281b280386db9e7adaf5458f8e82568f729bc 100644 (file)
@@ -13,7 +13,7 @@ my{
                 dnam{"ဆွဲငင်အား"}
                 other{"{0} ဆွဲငင်အား"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"မီတာ/စက္ကန့်နှစ်ထပ်ကိန်း"}
                 other{"{0} မီတာ/စက္ကန့်နှစ်ထပ်ကိန်း"}
             }
@@ -107,10 +107,6 @@ my{
                 dnam{"mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"တစ်သန်းပုံ တစ်ပုံ"}
-                other{"တစ်သန်းပုံ {0} ပုံ"}
-            }
             percent{
                 dnam{"ရာခိုင်နှုန်း"}
                 other{"{0} ရာခိုင်နှုန်း"}
@@ -119,13 +115,17 @@ my{
                 dnam{"ထောင်လီစိတ်"}
                 other{"{0} ထောင်လီစိတ်"}
             }
+            permillion{
+                dnam{"တစ်သန်းပုံ တစ်ပုံ"}
+                other{"တစ်သန်းပုံ {0} ပုံ"}
+            }
             permyriad{
                 dnam{"ပါမီရိတ်"}
                 other{"{0} ပါမီရိတ်"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"တစ်ရာကီလိုမီတာရှိ လီတာ"}
                 other{"တစ်ရာကီလိုမီတာရှိ {0} လီတာ"}
             }
@@ -526,7 +526,7 @@ my{
                 dnam{"ဟက်တိုပါစကယ်"}
                 other{"{0} ဟက်တိုပါစကယ်"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ပြဒါးလက်မ"}
                 other{"{0} ပြဒါးလက်မ"}
             }
@@ -542,11 +542,11 @@ my{
                 dnam{"မီလီဘား"}
                 other{"{0} မီလီဘား"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"ပြဒါးမီလီမီတာ"}
                 other{"{0} ပြဒါးမီလီမီတာ"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ပေါင်/စတုရန်းလက်မ"}
                 other{"တစ်စတုရန်းလက်မလျှင် {0} ပေါင်"}
             }
@@ -592,7 +592,7 @@ my{
                 dnam{"နယူတန်−မီတာ"}
                 other{"{0} နယူတန်−မီတာ"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf.ft"}
                 other{"{0} lbf.ft"}
             }
@@ -756,7 +756,7 @@ my{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 other{"{0} L/100km"}
             }
@@ -869,7 +869,7 @@ my{
             hectopascal{
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 other{"{0} inHg"}
             }
             millibar{
@@ -916,7 +916,7 @@ my{
                 dnam{"ဆွဲငင်အား"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"မီတာ/စက္ကန့်နှစ်ထပ်ကိန်း"}
                 other{"{0} m/s²"}
             }
@@ -1010,10 +1010,6 @@ my{
                 dnam{"mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"တစ်သန်းပုံ တစ်ပုံ"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 other{"{0}%"}
@@ -1022,13 +1018,17 @@ my{
                 dnam{"‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"တစ်သန်းပုံ တစ်ပုံ"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"ပါမီရိတ်"}
                 other{"{0}‱"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"တစ်ရာကီလိုမီတာရှိ လီတာ"}
                 other{"{0} L/100 km"}
             }
@@ -1426,7 +1426,7 @@ my{
                 dnam{"hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 other{"{0} inHg"}
             }
@@ -1442,11 +1442,11 @@ my{
                 dnam{"မီလီဘား"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ပေါင်/စတုရန်းလက်မ"}
                 other{"{0} psi"}
             }
@@ -1492,7 +1492,7 @@ my{
                 dnam{"N.m"}
                 other{"{0} N.m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf.ft"}
                 other{"{0} lbf.ft"}
             }
index e8139d27e6486d70dfe0d47d4b702bed0e3e0efa..71cdb9a654f3c0ae93d445dfde60e310625e8f85 100644 (file)
@@ -13,7 +13,7 @@ mzn{
                 dnam{"g-force"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 other{"{0} m/s²"}
             }
@@ -50,7 +50,7 @@ mzn{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 other{"{0} L/100km"}
             }
@@ -443,7 +443,7 @@ mzn{
             per{"{0}/{1}"}
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 other{"{0} L/100km"}
             }
@@ -523,7 +523,7 @@ mzn{
                 dnam{"g-force"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 other{"{0} m/s²"}
             }
@@ -560,7 +560,7 @@ mzn{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 other{"{0} L/100km"}
             }
index 3f033a8e6d1818e778909581ccfc760f775a4b9d..7adb4c48d873c9dbed680e17282bebd022f6b310 100644 (file)
@@ -14,7 +14,7 @@ nb{
                 one{"{0} g-kraft"}
                 other{"{0} g-kraft"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meter per sekund²"}
                 one{"{0} meter per sekund²"}
                 other{"{0} meter per sekund²"}
@@ -118,11 +118,6 @@ nb{
                 one{"{0} millimol per liter"}
                 other{"{0} millimol per liter"}
             }
-            part-per-million{
-                dnam{"deler per million"}
-                one{"{0} del per million"}
-                other{"{0} deler per million"}
-            }
             percent{
                 dnam{"prosent"}
                 one{"{0} prosent"}
@@ -133,6 +128,11 @@ nb{
                 one{"{0} promille"}
                 other{"{0} promille"}
             }
+            permillion{
+                dnam{"deler per million"}
+                one{"{0} del per million"}
+                other{"{0} deler per million"}
+            }
             permyriad{
                 dnam{"promyriade"}
                 one{"{0} promyriade"}
@@ -140,7 +140,7 @@ nb{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"liter per 100 kilometer"}
                 one{"{0} liter per 100 kilometer"}
                 other{"{0} liter per 100 kilometer"}
@@ -656,7 +656,7 @@ nb{
                 one{"{0} hektopascal"}
                 other{"{0} hektopascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"tommer kvikksølv"}
                 one{"{0} tomme kvikksølv"}
                 other{"{0} tommer kvikksølv"}
@@ -676,7 +676,7 @@ nb{
                 one{"{0} millibar"}
                 other{"{0} millibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"millimeter kvikksølv"}
                 one{"{0} millimeter kvikksølv"}
                 other{"{0} millimeter kvikksølv"}
@@ -686,7 +686,7 @@ nb{
                 one{"{0} pascal"}
                 other{"{0} pascal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"pund per kvadrattomme"}
                 one{"{0} pund per kvadrattomme"}
                 other{"{0} pund per kvadrattomme"}
@@ -742,8 +742,8 @@ nb{
                 one{"{0} Nm"}
                 other{"{0} Nm"}
             }
-            pound-foot{
-                dnam{"pound-foot"}
+            pound-force-foot{
+                dnam{"pound-force-foot"}
             }
         }
         volume{
@@ -891,7 +891,7 @@ nb{
                 one{"{0}G"}
                 other{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 one{"{0}m/s²"}
                 other{"{0}m/s²"}
             }
@@ -947,7 +947,7 @@ nb{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 one{"{0} l/100km"}
                 other{"{0} l/100km"}
@@ -1161,7 +1161,7 @@ nb{
                 one{"{0}hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0}ʹʹ Hg"}
                 other{"{0}ʹʹ Hg"}
             }
@@ -1169,11 +1169,11 @@ nb{
                 one{"{0}mbar"}
                 other{"{0}mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 one{"{0}mmHg"}
                 other{"{0}mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 one{"{0}psi"}
                 other{"{0}psi"}
             }
@@ -1236,7 +1236,7 @@ nb{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meter/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1340,11 +1340,6 @@ nb{
                 one{"{0} mmol/l"}
                 other{"{0} mmol/l"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"prosent"}
                 one{"{0} %"}
@@ -1355,6 +1350,11 @@ nb{
                 one{"{0} ‰"}
                 other{"{0} ‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"promyriade"}
                 one{"{0} ‱"}
@@ -1362,7 +1362,7 @@ nb{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1869,7 +1869,7 @@ nb{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1879,7 +1879,7 @@ nb{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
@@ -1888,7 +1888,7 @@ nb{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index 03585ed0fd2973cf708cb8f33c29eef60331ed12..7bff11185ca1ef0d12f883809d4ce6422131d6c8 100644 (file)
@@ -14,7 +14,7 @@ ne{
                 one{"{0} गुरूत्वाकर्षण शक्ति"}
                 other{"{0} गुरूत्वाकर्षण शक्ति"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"मिटर प्रति वर्ग सेकेन्ड"}
                 one{"{0}मिटर प्रति सेकेण्ड वर्ग"}
                 other{"{0}मिटर प्रति सेकेण्ड वर्ग"}
@@ -128,11 +128,6 @@ ne{
                 one{"{0} मोल"}
                 other{"{0} मोल"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"प्रतिशत"}
                 one{"{0} प्रतिशत"}
@@ -143,6 +138,11 @@ ne{
                 one{"{0} प्रति मिल"}
                 other{"{0} प्रति मिल"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"पर्माइराइड"}
                 one{"{0} पर्माइराइड"}
@@ -150,7 +150,7 @@ ne{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"लिटर प्रति १०० किलोमिटर"}
                 one{"{0}लिटर प्रति १०० किलोमिटर"}
                 other{"{0}लिटर प्रति १०० किलोमिटर"}
@@ -675,7 +675,7 @@ ne{
                 one{"{0} हेक्टो पास्कल"}
                 other{"{0} हेक्टो पास्कल"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"इन्च पारो"}
                 one{"{0} इन्च पारो"}
                 other{"{0} इन्च पारो"}
@@ -695,7 +695,7 @@ ne{
                 one{"{0} मिलिबार"}
                 other{"{0} मिलिबार"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"मिलिमिटर पारो"}
                 one{"{0} मिलिमिटर पारो"}
                 other{"{0} मिलिमिटर पारो"}
@@ -705,7 +705,7 @@ ne{
                 one{"{0} पास्कल"}
                 other{"{0} पास्कल"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"पाउन्ड प्रति वर्ग इन्च"}
                 one{"{0} पाउन्ड प्रति वर्ग इन्च"}
                 other{"{0}पाउन्ड प्रति वर्ग इन्च"}
@@ -761,7 +761,7 @@ ne{
                 one{"{0} न्युटन मिटर"}
                 other{"{0} न्युटन मिटर"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"पाउन्ड फिट"}
                 one{"{0} पाउन्ड फुट"}
                 other{"{0} पाउन्ड फिट"}
@@ -963,7 +963,7 @@ ne{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"लि./१००कि.मि."}
                 one{"{0}L/100km"}
                 other{"{0}L/100km"}
@@ -1105,7 +1105,7 @@ ne{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} ईञ्‍च पारो"}
                 other{"{0} ईञ्‍च पारो"}
             }
@@ -1163,7 +1163,7 @@ ne{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1278,11 +1278,6 @@ ne{
                 one{"{0} मोल"}
                 other{"{0} मोल"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"प्रतिशत"}
                 one{"{0}प्रतिशत"}
@@ -1293,12 +1288,17 @@ ne{
                 one{"{0}प्रति मिल"}
                 other{"{0}प्रतिशत १"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"पर्माइराइड"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"लि./१००कि.मि."}
                 one{"{0}लि./१००कि.मि."}
                 other{"{0}लि./१००कि.मि."}
@@ -1819,7 +1819,7 @@ ne{
                 one{"{0}hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"इन्च पारो"}
                 one{"{0} इन्च पारो"}
                 other{"{0} इन्च पारो"}
@@ -1839,7 +1839,7 @@ ne{
                 one{"{0} मिलिबार"}
                 other{"{0} मिलिबार"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
@@ -1849,7 +1849,7 @@ ne{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index ad6736bb985458fc00c55445b1f1dabdffda17f6..a3f31b15a2e8189ac830a2d9941020540d06aa9a 100644 (file)
@@ -14,7 +14,7 @@ nl{
                 one{"{0} G-kracht"}
                 other{"{0} G-krachten"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meter per seconde kwadraat"}
                 one{"{0} meter per seconde kwadraat"}
                 other{"{0} meter per seconde kwadraat"}
@@ -119,11 +119,6 @@ nl{
                 one{"{0} millimol per liter"}
                 other{"{0} millimol per liter"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"procent"}
                 one{"{0} procent"}
@@ -134,6 +129,11 @@ nl{
                 one{"{0} promille"}
                 other{"{0} promille"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"basispunt"}
                 one{"{0} basispunt"}
@@ -141,7 +141,7 @@ nl{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"liter per 100 kilometer"}
                 one{"{0} liter per 100 kilometer"}
                 other{"{0} liter per 100 kilometer"}
@@ -683,7 +683,7 @@ nl{
                 one{"{0} hectopascal"}
                 other{"{0} hectopascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inch-kwikdruk"}
                 one{"{0} inch-kwikdruk"}
                 other{"{0} inch-kwikdruk"}
@@ -703,7 +703,7 @@ nl{
                 one{"{0} millibar"}
                 other{"{0} millibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"millimeter-kwikdruk"}
                 one{"{0} millimeter-kwikdruk"}
                 other{"{0} millimeter-kwikdruk"}
@@ -713,7 +713,7 @@ nl{
                 one{"{0} pascal"}
                 other{"{0} pascal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -769,9 +769,9 @@ nl{
                 one{"{0} newtonmeter"}
                 other{"{0} newtonmeter"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"pound-feet"}
-                one{"{0} pound-foot"}
+                one{"{0} pound-force-foot"}
                 other{"{0} pound-feet"}
             }
         }
@@ -925,7 +925,7 @@ nl{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1030,11 +1030,6 @@ nl{
                 one{"{0} mmol/l"}
                 other{"{0} mmol/l"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0}%"}
@@ -1045,9 +1040,14 @@ nl{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 one{"{0} l/100km"}
                 other{"{0} l/100km"}
@@ -1498,7 +1498,7 @@ nl{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1508,12 +1508,12 @@ nl{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1707,7 +1707,7 @@ nl{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1812,11 +1812,6 @@ nl{
                 one{"{0} mmol/l"}
                 other{"{0} mmol/l"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"procent"}
                 one{"{0}%"}
@@ -1827,9 +1822,14 @@ nl{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 one{"{0} l/100km"}
                 other{"{0} l/100km"}
@@ -2324,7 +2324,7 @@ nl{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -2334,7 +2334,7 @@ nl{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
@@ -2344,7 +2344,7 @@ nl{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index 48ad286bb54a9cab29c0d56eaa17a70f9893a481..2935e0c64c91befc9180e1231002534c395b5305 100644 (file)
@@ -14,7 +14,7 @@ nn{
                 one{"{0} g-kraft"}
                 other{"{0} g-krefter"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meter per sekund²"}
                 one{"{0} meter per sekund²"}
                 other{"{0} meter per sekund²"}
@@ -118,14 +118,14 @@ nn{
                 one{"{0} millimol per liter"}
                 other{"{0} millimol per liter"}
             }
-            part-per-million{
+            permillion{
                 dnam{"milliondelar"}
                 one{"{0} milliondel"}
                 other{"{0} milliondelar"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"liter per 100 kilometer"}
                 one{"{0} liter per 100 kilometer"}
                 other{"{0} liter per 100 kilometer"}
@@ -539,7 +539,7 @@ nn{
                 one{"{0} hektopascal"}
                 other{"{0} hektopascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"tommar kvikksølv"}
                 one{"{0} tomme kvikksølv"}
                 other{"{0} tommar kvikksølv"}
@@ -549,12 +549,12 @@ nn{
                 one{"{0} millibar"}
                 other{"{0} millibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"millimeter kvikksølv"}
                 one{"{0} millimeter kvikksølv"}
                 other{"{0} millimeter kvikksølv"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"pund per kvadrattomme"}
                 one{"{0} pund per kvadrattomme"}
                 other{"{0} pund per kvadrattomme"}
@@ -751,7 +751,7 @@ nn{
             per{"{0}/{1}"}
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100km"}
                 other{"{0} l/100km"}
@@ -841,7 +841,7 @@ nn{
             }
         }
         pressure{
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -883,7 +883,7 @@ nn{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -987,14 +987,14 @@ nn{
                 one{"{0} mmol/l"}
                 other{"{0} mmol/l"}
             }
-            part-per-million{
+            permillion{
                 dnam{"ppm"}
                 one{"{0} ppm"}
                 other{"{0} ppm"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1404,7 +1404,7 @@ nn{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1414,12 +1414,12 @@ nn{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index 1602dd8c0c10fe3a9b0520163072f8982c8abc92..f7415dcb679c4f1a5d1565d2ba47c5aec0a5962d 100644 (file)
@@ -14,7 +14,7 @@ or{
                 one{"{0} ଜି-ଫୋର୍ସ୍"}
                 other{"{0} ଜି-ଫୋର୍ସ୍"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"ମିଟର୍ ପ୍ରତି ସେକେଣ୍ଡ୍ ବର୍ଗ"}
                 one{"{0} ମିଟର୍ ପ୍ରତି ସେକେଣ୍ଡ୍ ବର୍ଗ"}
                 other{"{0} ମିଟର୍ ପ୍ରତି ସେକେଣ୍ଡ୍ ବର୍ଗ"}
@@ -128,11 +128,6 @@ or{
                 one{"{0} ମୋଲ"}
                 other{"{0} ମୋଲସ"}
             }
-            part-per-million{
-                dnam{"ଅଂଶ ପ୍ରତି ନିୟୁତ"}
-                one{"{0} ଅଂଶ ପ୍ରତି ନିୟୁତ"}
-                other{"{0} ଅଂଶ ପ୍ରତି ନିୟୁତ"}
-            }
             percent{
                 dnam{"ଶତକଡ଼ା"}
                 one{"{0} ଶତକଡ଼ା"}
@@ -143,6 +138,11 @@ or{
                 one{"{0} ପରମିଲ"}
                 other{"{0} ପରମିଲ"}
             }
+            permillion{
+                dnam{"ଅଂଶ ପ୍ରତି ନିୟୁତ"}
+                one{"{0} ଅଂଶ ପ୍ରତି ନିୟୁତ"}
+                other{"{0} ଅଂଶ ପ୍ରତି ନିୟୁତ"}
+            }
             permyriad{
                 dnam{"ପରମାଇରିଆଡ"}
                 one{"{0} ପରମାଇରିଆଡ"}
@@ -150,7 +150,7 @@ or{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"100 କିଲୋମିଟର୍ ପ୍ରତି ଲିଟର୍"}
                 one{"100 କିଲୋମିଟର୍ ପ୍ରତି {0} ଲିଟର୍"}
                 other{"100 କିଲୋମିଟର୍ ପ୍ରତି {0} ଲିଟର୍"}
@@ -635,7 +635,7 @@ or{
                 one{"{0} ହେକ୍ଟୋପାସ୍କେଲ୍"}
                 other{"{0} ହେକ୍ଟୋପାସ୍କେଲ୍"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ପାରାର ଇଞ୍ଜି"}
                 one{"ପାରାର {0} ଇଞ୍ଜି"}
                 other{"ପାରାର {0} ଇଞ୍ଜି"}
@@ -655,7 +655,7 @@ or{
                 one{"{0} ମିଲିବାର୍"}
                 other{"{0} ମିଲିବାର୍"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"ପାରାର ମିଲିମିଟର୍"}
                 one{"ପାରାର {0} ମିଲିମିଟର୍"}
                 other{"ପାରାର {0} ମିଲିମିଟର୍"}
@@ -665,7 +665,7 @@ or{
                 one{"{0} ପା"}
                 other{"{0} ପା"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ପାଉଣ୍ଡ୍ ପ୍ରତି ବର୍ଗ ଇଞ୍ଚ"}
                 one{"ପ୍ରତି ବର୍ଗ ଇଞ୍ଚ {0} ପାଉଣ୍ଡ୍"}
                 other{"ପ୍ରତି ବର୍ଗ ଇଞ୍ଚ {0} ପାଉଣ୍ଡ୍"}
@@ -721,7 +721,7 @@ or{
                 one{"{0} ନ୍ୟୁଟନ-ମିଟର"}
                 other{"{0} ନ୍ୟୁଟନ-ମିଟର୍ସ"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"ପାଉଣ୍ଡ-ଫିଟ"}
                 one{"{0} ପାଉଣ୍ଡ-ଫୁଟ"}
                 other{"{0} ପାଉଣ୍ଡ-ଫିଟ"}
@@ -877,7 +877,7 @@ or{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ଲି/100କିମି"}
                 one{"{0}ଲି/100 କିମି"}
                 other{"{0}ଲି/100 କିମି"}
@@ -998,7 +998,7 @@ or{
                 one{"{0} ଜି"}
                 other{"{0} ଜି"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"ମିଟର୍/ସେ²"}
                 one{"{0} ମି/ସେ²"}
                 other{"{0} ମି/ସେ²"}
@@ -1113,11 +1113,6 @@ or{
                 one{"ମୋଲ"}
                 other{"{0} ମୋଲ"}
             }
-            part-per-million{
-                dnam{"ଅଂଶ/ନିୟୁତ"}
-                one{"{0} ପିପିଏମ୍"}
-                other{"{0} ପିପିଏମ୍"}
-            }
             percent{
                 dnam{"ଶତକଡ଼ା"}
                 one{"{0}%"}
@@ -1128,12 +1123,17 @@ or{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ଅଂଶ/ନିୟୁତ"}
+                one{"{0} ପିପିଏମ୍"}
+                other{"{0} ପିପିଏମ୍"}
+            }
             permyriad{
                 dnam{"ପରମାଇରିଆଡ"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ଲି/100 କିମି"}
                 one{"{0} ଲି/100 କିମି"}
                 other{"{0} ଲି/100 କିମି"}
@@ -1604,7 +1604,7 @@ or{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1614,7 +1614,7 @@ or{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
@@ -1624,7 +1624,7 @@ or{
                 one{"{0} ପା"}
                 other{"{0} ପା"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index 32a20d0bf0d07c26d31963c032a39281dde57063..bb4dae3c503e3507272d880c92faaf07df864073 100644 (file)
@@ -14,7 +14,7 @@ pa{
                 one{"{0} ਗੁਰੂਤਾਕਰਸ਼ਣ ਬਲ"}
                 other{"{0} ਗੁਰੂਤਾਕਰਸ਼ਣ ਬਲ"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"ਮੀਟਰ ਪ੍ਰਤੀ ਵਰਗ ਸਕਿੰਟ"}
                 one{"{0} ਮੀਟਰ ਪ੍ਰਤੀ ਵਰਗ ਸਕਿੰਟ"}
                 other{"{0} ਮੀਟਰ ਪ੍ਰਤੀ ਵਰਗ ਸਕਿੰਟ"}
@@ -128,11 +128,6 @@ pa{
                 one{"{0} ਮੋਲ"}
                 other{"{0} ਮੋਲ"}
             }
-            part-per-million{
-                dnam{"ਹਿੱਸੇ ਪ੍ਰਤੀ ਮਿਲੀਅਨ"}
-                one{"{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਮਿਲੀਅਨ"}
-                other{"{0} ਹਿੱਸੇ ਪ੍ਰਤੀ ਮਿਲੀਅਨ"}
-            }
             percent{
                 dnam{"ਪ੍ਰਤੀਸ਼ਤ"}
                 one{"{0} ਪ੍ਰਤੀਸ਼ਤ"}
@@ -143,6 +138,11 @@ pa{
                 one{"{0} ਪਰਮਾਈਲ"}
                 other{"{0} ਪਰਮਾਈਲ"}
             }
+            permillion{
+                dnam{"ਹਿੱਸੇ ਪ੍ਰਤੀ ਮਿਲੀਅਨ"}
+                one{"{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਮਿਲੀਅਨ"}
+                other{"{0} ਹਿੱਸੇ ਪ੍ਰਤੀ ਮਿਲੀਅਨ"}
+            }
             permyriad{
                 dnam{"ਪ੍ਰਤੀ ਦਸ ਹਜ਼ਾਰ"}
                 one{"{0} ਪ੍ਰਤੀ ਦਸ ਹਜ਼ਾਰ"}
@@ -150,7 +150,7 @@ pa{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ਲਿਟਰ ਪ੍ਰਤੀ 100 ਕਿਲੋਮੀਟਰ"}
                 one{"{0} ਲਿਟਰ ਪ੍ਰਤੀ 100 ਕਿਲੋਮੀਟਰ"}
                 other{"{0} ਲਿਟਰ ਪ੍ਰਤੀ 100 ਕਿਲੋਮੀਟਰ"}
@@ -690,7 +690,7 @@ pa{
                 one{"{0} ਹੈਕਟੋਪਾਸਕਲ"}
                 other{"{0} ਹੈਕਟੋਪਾਸਕਲ"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ਇੰਚ ਪਾਰਾ"}
                 one{"{0} ਇੰਚ ਪਾਰਾ"}
                 other{"{0} ਇੰਚ ਪਾਰਾ"}
@@ -710,7 +710,7 @@ pa{
                 one{"{0} ਮਿਲੀਬਾਰ"}
                 other{"{0} ਮਿਲੀਬਾਰ"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"ਮਿਲੀਮੀਟਰ ਪਾਰਾ"}
                 one{"{0} ਮਿਲੀਮੀਟਰ ਪਾਰਾ"}
                 other{"{0} ਮਿਲੀਮੀਟਰ ਪਾਰਾ"}
@@ -720,7 +720,7 @@ pa{
                 one{"{0} ਪੈਸਕਲ"}
                 other{"{0} ਪੈਸਕਲ"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ਪੌਂਡ ਪ੍ਰਤੀ ਵਰਗ ਇੰਚ"}
                 one{"{0} ਪੌਂਡ ਪ੍ਰਤੀ ਵਰਗ ਇੰਚ"}
                 other{"{0} ਪੌਂਡ ਪ੍ਰਤੀ ਵਰਗ ਇੰਚ"}
@@ -776,7 +776,7 @@ pa{
                 one{"{0} ਨਿਊਟਨ-ਮੀਟਰ"}
                 other{"{0} ਨਿਊਟਨ-ਮੀਟਰ"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"ਪੌਂਡ-ਫੁੱਟ"}
                 one{"{0} ਪੌਂਡ-ਫੁੱਟ"}
                 other{"{0} ਪੌਂਡ-ਫੁੱਟ"}
@@ -931,7 +931,7 @@ pa{
                 one{"{0}G"}
                 other{"{0}Gs"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 one{"{0}ਮੀ/ਸ²"}
                 other{"{0}ਮੀ/ਸ²"}
             }
@@ -1007,7 +1007,7 @@ pa{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ਲਿ./100ਕਿ.ਮੀ."}
             }
             liter-per-kilometer{
@@ -1352,7 +1352,7 @@ pa{
                 one{"{0} ਹੈ.ਪਾ."}
                 other{"{0} ਹੈ.ਪਾ."}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ਇੰਚ ਪਾਰਾ"}
                 one{"{0}\u0022 ਪਾਰਾ"}
                 other{"{0}\u0022 ਪਾਰਾ"}
@@ -1362,12 +1362,12 @@ pa{
                 one{"{0} ਮਿ.ਬਾ."}
                 other{"{0} ਮਿ.ਬਾ."}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"ਮਿ.ਮੀ. ਪਾਰਾ"}
                 one{"{0} ਮਿ.ਮੀ. ਪਾਰਾ"}
                 other{"{0} ਮਿ.ਮੀ. ਪਾਰਾ"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ਪੌਂ.ਵ.ਇੰਚ"}
                 one{"{0} ਪੌਂ.ਵ.ਇੰਚ"}
                 other{"{0} ਪੌਂ.ਵ.ਇੰਚ"}
@@ -1503,7 +1503,7 @@ pa{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"ਮੀਟਰ/ਸਕਿੰਟ²"}
                 one{"{0} ਮੀ/ਸ²"}
                 other{"{0} ਮੀ/ਸ²"}
@@ -1618,11 +1618,6 @@ pa{
                 one{"{0} ਮੋਲ"}
                 other{"{0} ਮੋਲ"}
             }
-            part-per-million{
-                dnam{"ਹਿੱਸੇ/ਮਿਲੀਅਨ"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"ਪ੍ਰਤੀਸ਼ਤ"}
                 one{"{0}%"}
@@ -1633,12 +1628,17 @@ pa{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ਹਿੱਸੇ/ਮਿਲੀਅਨ"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"ਪ੍ਰਤੀ ਦਸ ਹਜ਼ਾਰ"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ਲਿ./100ਕਿ.ਮੀ."}
                 one{"{0}ਲਿ/100 ਕਿਮੀ"}
                 other{"{0}ਲਿ/100 ਕਿਮੀ"}
@@ -2166,7 +2166,7 @@ pa{
                 one{"{0} ਹੈ.ਪਾ."}
                 other{"{0} ਹੈ.ਪਾ."}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ਇੰਚ ਪਾਰਾ"}
                 one{"{0} ਇੰਚ ਪਾਰਾ"}
                 other{"{0} ਇੰਚ ਪਾਰਾ"}
@@ -2186,7 +2186,7 @@ pa{
                 one{"{0} ਮਿਲੀਬਾਰ"}
                 other{"{0} ਮਿਲੀਬਾਰ"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"ਮਿ.ਮੀ. ਪਾਰਾ"}
                 one{"{0} ਮਿ.ਮੀ. ਪਾਰਾ"}
                 other{"{0} ਮਿ.ਮੀ. ਪਾਰਾ"}
@@ -2196,7 +2196,7 @@ pa{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ਪੌਂ.ਵ.ਇੰਚ"}
                 one{"{0} ਪੌਂ.ਵ.ਇੰਚ"}
                 other{"{0} ਪੌਂ.ਵ.ਇੰਚ"}
index 5027499114cc724c9048fc86b4ece7deb0a0dd59..d16089799a4e7a0a51fb9ce18fd2f4bd1abfbfe3 100644 (file)
@@ -14,7 +14,7 @@ pcm{
                 one{"{0} g-Fọs"}
                 other{"{0} g-Fọs"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"Míta Fọ Ẹ́vrí Skwiá Sẹ́kọn"}
                 one{"{0} Míta Fọ Ẹ́vrí Skwiá Sẹ́kọn"}
                 other{"{0} Míta Fọ Ẹ́vrí Skwiá Sẹ́kọn"}
@@ -129,11 +129,6 @@ pcm{
                 one{"{0} Mol"}
                 other{"{0} Mol"}
             }
-            part-per-million{
-                dnam{"Pat-dẹm Fọ Ích Míliọn"}
-                one{"{0} Pat Fọ Ích Míliọn"}
-                other{"{0} Pat Fọ Ích Míliọn"}
-            }
             percent{
                 dnam{"Pasẹnt"}
                 one{"{0} Pasẹnt"}
@@ -144,6 +139,11 @@ pcm{
                 one{"{0} Fọ Ích Taúzan"}
                 other{"{0} Fọ Ích Taúzan"}
             }
+            permillion{
+                dnam{"Pat-dẹm Fọ Ích Míliọn"}
+                one{"{0} Pat Fọ Ích Míliọn"}
+                other{"{0} Pat Fọ Ích Míliọn"}
+            }
             permyriad{
                 dnam{"Fọ Ích Tẹ́n Taúzan"}
                 one{"{0} Fọ Ích Tẹ́n Taúzan"}
@@ -151,7 +151,7 @@ pcm{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"Líta-dẹm Fọ Ẹ́vrí 100 Kilómíta"}
                 one{"{0} Líta Fọ Ẹ́vrí 100 Kilómíta"}
                 other{"{0} Líta Fọ Ẹ́vrí 100 Kilómíta"}
@@ -678,7 +678,7 @@ pcm{
                 one{"{0} Hẹ́ktopáskal"}
                 other{"{0} Hẹ́ktopáskal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"Ínchís ọf Mẹ́kúri"}
                 one{"{0} Inch ọf Mẹ́kúri"}
                 other{"{0} Inch ọf Mẹ́kúri"}
@@ -698,7 +698,7 @@ pcm{
                 one{"{0} Mílibaa"}
                 other{"{0} Mílibaa"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"Milímítá-dẹm-ọf-Mẹ́kúri"}
                 one{"{0} Milímítá Mẹ́kúri"}
                 other{"{0} Milímítá Mẹ́kúri"}
@@ -708,7 +708,7 @@ pcm{
                 one{"{0} Páskal"}
                 other{"{0} Páskal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"Páund-dẹm Fọ Ẹ́vrí Skwiá Inch"}
                 one{"{0} Páund Fọ Ẹ́vrí Skwiá Inch"}
                 other{"{0} Páund Fọ Ẹ́vrí Skwiá Inch"}
@@ -764,7 +764,7 @@ pcm{
                 one{"{0} Niúton-Míta"}
                 other{"{0} Niúton-Míta"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"Páund-Fut"}
                 one{"{0} Páund-Fut"}
                 other{"{0} Páund-Fut"}
@@ -921,7 +921,7 @@ pcm{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0}L/100km"}
                 other{"{0}L/100km"}
@@ -1039,7 +1039,7 @@ pcm{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"Míta/sẹk²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1154,11 +1154,6 @@ pcm{
                 one{"{0} mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"Pat/Míliọn"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"Pasẹnt"}
                 one{"{0}%"}
@@ -1169,6 +1164,11 @@ pcm{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"Pat/Míliọn"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"Fọ Ích Tẹ́n Taúzan"}
                 one{"{0}‱"}
@@ -1176,7 +1176,7 @@ pcm{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100 km"}
                 one{"{0} L/100 km"}
                 other{"{0} L/100 km"}
@@ -1703,7 +1703,7 @@ pcm{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1723,7 +1723,7 @@ pcm{
                 one{"{0} mbaa"}
                 other{"{0} mbaa"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
@@ -1733,7 +1733,7 @@ pcm{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"pfẹsi"}
                 one{"{0} pẹsi"}
                 other{"{0} pẹsi"}
@@ -1789,7 +1789,7 @@ pcm{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
index 0782c3295d73b0fe60dee7424494f7b1c485306e..ac0f3d535c2eddc6b96b2f210f1c8d82c12e9222 100644 (file)
@@ -12,7 +12,7 @@ pl{
             g-force{
                 dnam{"stała grawitacji"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metry na sekundę do kwadratu"}
                 few{"{0} metry na sekundę do kwadratu"}
                 many{"{0} metrów na sekundę do kwadratu"}
@@ -166,13 +166,6 @@ pl{
                 one{"{0} mol"}
                 other{"{0} mola"}
             }
-            part-per-million{
-                dnam{"części na milion"}
-                few{"{0} części na milion"}
-                many{"{0} części na milion"}
-                one{"{0} część na milion"}
-                other{"{0} części na milion"}
-            }
             percent{
                 dnam{"procent"}
                 few{"{0} procent"}
@@ -187,6 +180,13 @@ pl{
                 one{"{0} promil"}
                 other{"{0} promila"}
             }
+            permillion{
+                dnam{"części na milion"}
+                few{"{0} części na milion"}
+                many{"{0} części na milion"}
+                one{"{0} część na milion"}
+                other{"{0} części na milion"}
+            }
             permyriad{
                 dnam{"punkt bazowy"}
                 few{"{0} punkty bazowe"}
@@ -196,7 +196,7 @@ pl{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litry na 100 kilometrów"}
                 few{"{0} litry na 100 kilometrów"}
                 many{"{0} litrów na 100 kilometrów"}
@@ -887,7 +887,7 @@ pl{
                 one{"{0} hektopaskal"}
                 other{"{0} hektopaskala"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"cale słupa rtęci"}
                 few{"{0} cale słupa rtęci"}
                 many{"{0} cali słupa rtęci"}
@@ -915,7 +915,7 @@ pl{
                 one{"{0} millibar"}
                 other{"{0} millibara"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimetry słupa rtęci"}
                 few{"{0} milimetry słupa rtęci"}
                 many{"{0} milimetrów słupa rtęci"}
@@ -929,7 +929,7 @@ pl{
                 one{"{0} paskal"}
                 other{"{0} paskala"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"funty na cal kwadratowy"}
                 few{"{0} funty na cal kwadratowy"}
                 many{"{0} funtów na cal kwadratowy"}
@@ -1005,7 +1005,7 @@ pl{
                 one{"{0} niutonometr"}
                 other{"{0} niutonometra"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"stopofunty"}
                 few{"{0} stopofunty"}
                 many{"{0} stopofuntów"}
@@ -1232,7 +1232,7 @@ pl{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 few{"{0} l/100 km"}
                 many{"{0} l/100 km"}
@@ -1442,7 +1442,7 @@ pl{
                 one{"{0} mol"}
                 other{"{0} mola"}
             }
-            part-per-million{
+            permillion{
                 dnam{"części/milion"}
             }
             permyriad{
@@ -1453,7 +1453,7 @@ pl{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 few{"{0} l/100 km"}
                 many{"{0} l/100 km"}
@@ -1809,7 +1809,7 @@ pl{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 few{"{0} lbf⋅ft"}
                 many{"{0} lbf⋅ft"}
index b29d70b2f4573f9b6e545f70abfcb3d343264aad..641fc3d1f41f8468f53eb9cd81b0865d2fc1e76f 100644 (file)
@@ -14,7 +14,7 @@ ps{
                 one{"{0} د جاذبې قوه"}
                 other{"{0} د جاذبې قوه"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"ميترز في مربع سيکنډ"}
                 one{"{0} ميتر في مربع سيکنډ"}
                 other{"{0} ميتر في مربع سيکنډ"}
@@ -128,11 +128,6 @@ ps{
                 one{"{0} مول"}
                 other{"{0} مولز"}
             }
-            part-per-million{
-                dnam{"پارټتس في مليون"}
-                one{"{0} پارټ في مليون"}
-                other{"{0} پارټس في مليون"}
-            }
             percent{
                 dnam{"سلنه"}
                 one{"{0} سلنه"}
@@ -143,6 +138,11 @@ ps{
                 one{"{0} في ميل"}
                 other{"{0} في ميل"}
             }
+            permillion{
+                dnam{"پارټتس في مليون"}
+                one{"{0} پارټ في مليون"}
+                other{"{0} پارټس في مليون"}
+            }
             permyriad{
                 dnam{"زرمه"}
                 one{"{0} زرمه"}
@@ -150,7 +150,7 @@ ps{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ليټرز في ۱۰۰ کيلو مترز"}
                 one{"{0} ليټر في ۱۰۰ کلو ميترز"}
                 other{"{0} ليټرز في ۱۰۰ کيلو مترز"}
@@ -614,7 +614,7 @@ ps{
                 one{"{0} هيکټو پاسکیل"}
                 other{"{0} هيکټو پاسکیلز"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"د پارې انچې"}
                 one{"{0} د پارې انچ"}
                 other{"{0} د پارې انچې"}
@@ -634,7 +634,7 @@ ps{
                 one{"{0} ملي بار"}
                 other{"{0} ملي بارز"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"د پارې ملي مترز"}
                 one{"{0} د پارې ملي متر"}
                 other{"{0} د پارې ملي مترز"}
@@ -642,7 +642,7 @@ ps{
             pascal{
                 dnam{"پاسکیلز"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"پاونډز في مربع انچ"}
                 one{"{0} پاونډ في مربع انچ"}
                 other{"{0} پاونډز في مربع انچ"}
@@ -698,7 +698,7 @@ ps{
                 one{"{0} نيوټن ميټر"}
                 other{"{0} نيوټن ميټرز"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"پاونډ فټونه"}
                 one{"{0} پاونډ فټ"}
                 other{"{0} پاونډ فټونه"}
@@ -826,7 +826,7 @@ ps{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -943,7 +943,7 @@ ps{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
             }
@@ -1056,11 +1056,6 @@ ps{
                 one{"{0} مول"}
                 other{"{0} مول"}
             }
-            part-per-million{
-                dnam{"پارټس/مليون"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"سلنه"}
                 one{"{0}%"}
@@ -1071,12 +1066,17 @@ ps{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"پارټس/مليون"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"زرمه"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -1545,7 +1545,7 @@ ps{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1555,12 +1555,12 @@ ps{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index 4c71ad93b3b638a54c370b0530e339cfb6176630..2c42cb5b135692683255c1b929b575b040373bba 100644 (file)
@@ -58,12 +58,12 @@ ps_PK{
             }
         }
         pressure{
-            inch-hg{
+            inch-ofhg{
                 dnam{"د پارے انچے"}
                 one{"{0} د پارے انچ"}
                 other{"{0} د پارے انچے"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"د پارے ملي مترز"}
                 one{"{0} د پارے ملي متر"}
                 other{"{0} د پارے ملي مترز"}
index ce7129b375450adb2ab3ff833254af1653e99df9..4744d654a6423b9ee3494001eafc14aaa2ceaeb2 100644 (file)
@@ -14,7 +14,7 @@ pt{
                 one{"{0} força g"}
                 other{"{0} força g"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metros por segundo ao quadrado"}
                 one{"{0} metro por segundo ao quadrado"}
                 other{"{0} metros por segundo ao quadrado"}
@@ -128,11 +128,6 @@ pt{
                 one{"{0} mol"}
                 other{"{0} mols"}
             }
-            part-per-million{
-                dnam{"partes por milhão"}
-                one{"{0} parte por milhão"}
-                other{"{0} partes por milhão"}
-            }
             percent{
                 dnam{"por cento"}
                 one{"{0} por cento"}
@@ -143,13 +138,18 @@ pt{
                 one{"{0} por mil"}
                 other{"{0} por mil"}
             }
+            permillion{
+                dnam{"partes por milhão"}
+                one{"{0} parte por milhão"}
+                other{"{0} partes por milhão"}
+            }
             permyriad{
                 one{"{0} ponto base"}
                 other{"{0} pontos base"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litros por 100 quilômetros"}
                 one{"{0} litro por 100 quilômetros"}
                 other{"{0} litros por 100 quilômetros"}
@@ -689,7 +689,7 @@ pt{
                 one{"{0} hectopascal"}
                 other{"{0} hectopascais"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"polegadas de mercúrio"}
                 one{"{0} polegada de mercúrio"}
                 other{"{0} polegadas de mercúrio"}
@@ -709,7 +709,7 @@ pt{
                 one{"{0} milibar"}
                 other{"{0} milibares"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milímetros de mercúrio"}
                 one{"{0} milímetro de mercúrio"}
                 other{"{0} milímetros de mercúrio"}
@@ -719,7 +719,7 @@ pt{
                 one{"{0} pascal"}
                 other{"{0} pascais"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"libras por polegada quadrada"}
                 one{"{0} libra por polegada quadrada"}
                 other{"{0} libras por polegada quadrada"}
@@ -770,7 +770,7 @@ pt{
                 one{"{0} newton-metro"}
                 other{"{0} newton-metros"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"pés-libra"}
                 one{"{0} pé-libra"}
                 other{"{0} pés-libra"}
@@ -944,7 +944,7 @@ pt{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1075,7 +1075,7 @@ pt{
             }
         }
         pressure{
-            inch-hg{
+            inch-ofhg{
                 one{"{0}\u0022 Hg"}
                 other{"{0}\u0022 Hg"}
             }
@@ -1083,7 +1083,7 @@ pt{
                 one{"{0} mb"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
@@ -1132,7 +1132,7 @@ pt{
             g-force{
                 dnam{"força g"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metros/seg²"}
             }
         }
@@ -1201,9 +1201,6 @@ pt{
                 one{"{0} mmol/l"}
                 other{"{0} mmol/l"}
             }
-            part-per-million{
-                dnam{"partes/milhão"}
-            }
             percent{
                 dnam{"por cento"}
                 one{"{0}%"}
@@ -1214,12 +1211,15 @@ pt{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"partes/milhão"}
+            }
             permyriad{
                 dnam{"ponto base"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1517,7 +1517,7 @@ pt{
                 one{"{0} bar"}
                 other{"{0} bars"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
index 6d4776ff7aa16e1d7f61b0f7c2f204799ca5f72b..cca555da9b81b1512c5258801f3ade4c84805fbc 100644 (file)
@@ -9,7 +9,7 @@ pt_PT{
                 one{"{0} força G"}
                 other{"{0} força G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metros por segundo quadrado"}
                 one{"{0} metro por segundo quadrado"}
                 other{"{0} metros por segundo quadrado"}
@@ -36,7 +36,7 @@ pt_PT{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litros por 100 quilómetros"}
                 one{"{0} litro por 100 quilómetros"}
                 other{"{0} litros por 100 quilómetros"}
@@ -141,7 +141,7 @@ pt_PT{
             }
         }
         pressure{
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -214,7 +214,7 @@ pt_PT{
             per{"{0}/{1}"}
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 one{"{0}l/100km"}
                 other{"{0}l/100km"}
             }
@@ -353,7 +353,7 @@ pt_PT{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -437,7 +437,7 @@ pt_PT{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 one{"{0} l/100km"}
                 other{"{0} l/100km"}
@@ -760,7 +760,7 @@ pt_PT{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"in Hg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -770,12 +770,12 @@ pt_PT{
                 one{"{0} mb"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index e4fec8e51a5c8a46bf45dd1b02757508cea28a3b..dbff2f5ad6252aed230a52f33f7abc9f468e5a9c 100644 (file)
@@ -15,7 +15,7 @@ ro{
                 one{"{0} forță g"}
                 other{"{0} forță g"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metri pe secundă la pătrat"}
                 few{"{0} metri pe secundă la pătrat"}
                 one{"{0} metru pe secundă la pătrat"}
@@ -150,12 +150,6 @@ ro{
                 one{"{0} mol"}
                 other{"{0} de moli"}
             }
-            part-per-million{
-                dnam{"părți pe milion"}
-                few{"{0} părți pe milion"}
-                one{"{0} parte pe milion"}
-                other{"{0} de părți pe milion"}
-            }
             percent{
                 dnam{"procent"}
                 few{"{0} procente"}
@@ -168,6 +162,12 @@ ro{
                 one{"la mie"}
                 other{"{0} la mie"}
             }
+            permillion{
+                dnam{"părți pe milion"}
+                few{"{0} părți pe milion"}
+                one{"{0} parte pe milion"}
+                other{"{0} de părți pe milion"}
+            }
             permyriad{
                 few{"{0} la zece mii"}
                 one{"{0} la zece mii"}
@@ -175,7 +175,7 @@ ro{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litri la suta de kilometri"}
                 few{"{0} litri la suta de kilometri"}
                 one{"{0} litru la suta de kilometri"}
@@ -795,7 +795,7 @@ ro{
                 one{"{0} hectopascal"}
                 other{"{0} de hectopascali"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inchi coloană de mercur"}
                 few{"{0} inchi coloană de mercur"}
                 one{"{0} inch coloană de mercur"}
@@ -819,7 +819,7 @@ ro{
                 one{"{0} milibar"}
                 other{"{0} de milibari"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimetri coloană de mercur"}
                 few{"{0} milimetri coloană de mercur"}
                 one{"{0} milimetru coloană de mercur"}
@@ -831,7 +831,7 @@ ro{
                 one{"{0} pascal"}
                 other{"{0} de pascali"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"livre pe inch pătrat"}
                 few{"{0} livre pe inch pătrat"}
                 one{"{0} livră pe inch pătrat"}
@@ -897,7 +897,7 @@ ro{
                 one{"{0} newton metru"}
                 other{"{0} de newton metri"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"livră-forță picioare"}
                 few{"{0} livră-forță picioare"}
                 one{"{0} livră-forță picior"}
@@ -1075,7 +1075,7 @@ ro{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0} m/s²"}
                 one{"{0} m/s²"}
@@ -1144,7 +1144,7 @@ ro{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 few{"{0} l/100 km"}
                 one{"{0} l/100 km"}
@@ -1444,7 +1444,7 @@ ro{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"in Hg"}
             }
             millibar{
@@ -1453,13 +1453,13 @@ ro{
                 one{"{0} mb"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 few{"{0} mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 few{"{0} psi"}
                 one{"{0} psi"}
@@ -1542,7 +1542,7 @@ ro{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0} m/s²"}
                 one{"{0} m/s²"}
@@ -1676,12 +1676,6 @@ ro{
                 one{"{0} mol"}
                 other{"{0} moli"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                few{"{0} ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 few{"{0}%"}
@@ -1694,9 +1688,15 @@ ro{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                few{"{0} ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 few{"{0} l/100 km"}
                 one{"{0} l/100 km"}
@@ -2280,7 +2280,7 @@ ro{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"in Hg"}
                 few{"{0} in Hg"}
                 one{"{0} in Hg"}
@@ -2304,13 +2304,13 @@ ro{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 few{"{0} mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 few{"{0} psi"}
                 one{"{0} psi"}
@@ -2376,7 +2376,7 @@ ro{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"livră-forță picior"}
             }
         }
index f36a8381fed63b6131d6e26be8945030a0a5ae6e..76d938f6ce0fe45154e3c7682f1b7e0f188164e4 100644 (file)
@@ -15,7 +15,7 @@ root{
                 dnam{"g-force"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 other{"{0} m/s²"}
             }
@@ -110,10 +110,6 @@ root{
                 dnam{"mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 other{"{0}%"}
@@ -122,13 +118,17 @@ root{
                 dnam{"‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"‱"}
                 other{"{0}‱"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 other{"{0} L/100km"}
             }
@@ -575,7 +575,7 @@ root{
                 dnam{"hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 other{"{0} inHg"}
             }
@@ -591,7 +591,7 @@ root{
                 dnam{"mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 other{"{0} mm Hg"}
             }
@@ -599,7 +599,7 @@ root{
                 dnam{"Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 other{"{0} psi"}
             }
@@ -645,7 +645,7 @@ root{
                 dnam{"N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
             }
index 26f97639e72e0e04f341f2ac4782cfa143e76028..a2d87641d702ae35ead873f2d6e2c42b5dc5619b 100644 (file)
@@ -16,7 +16,7 @@ ru{
                 one{"{0} g"}
                 other{"{0} g"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"метры в секунду в квадрате"}
                 few{"{0} метра в секунду в квадрате"}
                 many{"{0} метров в секунду в квадрате"}
@@ -170,13 +170,6 @@ ru{
                 one{"{0} моль"}
                 other{"{0} моля"}
             }
-            part-per-million{
-                dnam{"миллионные доли"}
-                few{"{0} миллионные доли"}
-                many{"{0} миллионных долей"}
-                one{"{0} миллионная доля"}
-                other{"{0} миллионной доли"}
-            }
             percent{
                 dnam{"проценты"}
                 few{"{0} процента"}
@@ -191,6 +184,13 @@ ru{
                 one{"{0} промилле"}
                 other{"{0} промилле"}
             }
+            permillion{
+                dnam{"миллионные доли"}
+                few{"{0} миллионные доли"}
+                many{"{0} миллионных долей"}
+                one{"{0} миллионная доля"}
+                other{"{0} миллионной доли"}
+            }
             permyriad{
                 dnam{"промириады"}
                 few{"{0} промириада"}
@@ -200,7 +200,7 @@ ru{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"литры на 100 километров"}
                 few{"{0} литра на 100 километров"}
                 many{"{0} литров на 100 километров"}
@@ -940,7 +940,7 @@ ru{
                 one{"{0} гектопаскаль"}
                 other{"{0} гектопаскаля"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"дюймы ртутного столба"}
                 few{"{0} дюйма ртутного столба"}
                 many{"{0} дюймов ртутного столба"}
@@ -968,7 +968,7 @@ ru{
                 one{"{0} миллибар"}
                 other{"{0} миллибара"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"миллиметры ртутного столба"}
                 few{"{0} миллиметра ртутного столба"}
                 many{"{0} миллиметров ртутного столба"}
@@ -982,7 +982,7 @@ ru{
                 one{"{0} паскаль"}
                 other{"{0} паскаля"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"фунты на квадратный дюйм"}
                 few{"{0} фунта на квадратный дюйм"}
                 many{"{0} фунтов на квадратный дюйм"}
@@ -1058,7 +1058,7 @@ ru{
                 one{"{0} ньютон-метр"}
                 other{"{0} ньютон-метра"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"фунт-футы"}
                 few{"{0} фунт-фута"}
                 many{"{0} фунт-футов"}
@@ -1265,7 +1265,7 @@ ru{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"м/с²"}
                 few{"{0} м/с²"}
                 many{"{0} м/с²"}
@@ -1344,7 +1344,7 @@ ru{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"л/100 км"}
                 few{"{0} л/100 км"}
                 many{"{0} л/100 км"}
@@ -1703,7 +1703,7 @@ ru{
                 one{"{0} гПа"}
                 other{"{0} гПа"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"д. рт. ст."}
                 few{"{0} inHg"}
                 many{"{0} inHg"}
@@ -1717,14 +1717,14 @@ ru{
                 one{"{0} мбар"}
                 other{"{0} мбар"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"мм рт. ст."}
                 few{"{0} мм рт. ст."}
                 many{"{0} мм рт. ст."}
                 one{"{0} мм рт. ст."}
                 other{"{0} мм рт. ст."}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ф. на дюйм²"}
                 few{"{0} ф./дюйм²"}
                 many{"{0} ф./дюйм²"}
@@ -1823,7 +1823,7 @@ ru{
                 one{"{0} g"}
                 other{"{0} g"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"м/с²"}
                 few{"{0} м/с²"}
                 many{"{0} м/с²"}
@@ -1977,13 +1977,6 @@ ru{
                 one{"{0} моль"}
                 other{"{0} моль"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                few{"{0} ppm"}
-                many{"{0} ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 few{"{0} %"}
@@ -1998,6 +1991,13 @@ ru{
                 one{"{0} ‰"}
                 other{"{0} ‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                few{"{0} ppm"}
+                many{"{0} ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 few{"{0} ‱"}
                 many{"{0} ‱"}
@@ -2006,7 +2006,7 @@ ru{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"л/100 км"}
                 few{"{0} л/100 км"}
                 many{"{0} л/100 км"}
@@ -2725,7 +2725,7 @@ ru{
                 one{"{0} гПа"}
                 other{"{0} гПа"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"д. рт. ст."}
                 few{"{0} д. рт. ст."}
                 many{"{0} д. рт. ст."}
@@ -2753,7 +2753,7 @@ ru{
                 one{"{0} мбар"}
                 other{"{0} мбар"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"мм рт. ст."}
                 few{"{0} мм рт. ст."}
                 many{"{0} мм рт. ст."}
@@ -2767,7 +2767,7 @@ ru{
                 one{"{0} Па"}
                 other{"{0} Па"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ф. на дюйм²"}
                 few{"{0} ф/дюйм²"}
                 many{"{0} ф/дюйм²"}
@@ -2843,7 +2843,7 @@ ru{
                 one{"{0} Н⋅м"}
                 other{"{0} Н⋅м"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"фнт-фт"}
                 few{"{0} фнт-фт"}
                 many{"{0} фнт-фт"}
index 200eefa6ed8da398509918eb3671c48ad0556136..8b55e19a587056bba54c805e206eb25625745607 100644 (file)
@@ -14,7 +14,7 @@ sd{
                 one{"{0} ڪشش ثقل"}
                 other{"{0} ڪشش ثقل"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"ميٽر في سيڪنڊ اسڪوائر"}
                 one{"{0} m/s²"}
                 other{"{0} ميٽر في سيڪنڊ اسڪوائر"}
@@ -129,11 +129,6 @@ sd{
                 one{"{0} مول"}
                 other{"{0} مولز"}
             }
-            part-per-million{
-                dnam{"حصا في ملين"}
-                one{"{0} حصا في ملين"}
-                other{"{0} حصا في ملين"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0}%"}
@@ -144,6 +139,11 @@ sd{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"حصا في ملين"}
+                one{"{0} حصا في ملين"}
+                other{"{0} حصا في ملين"}
+            }
             permyriad{
                 dnam{"پيرمائيرڊ"}
                 one{"{0} پيرمائيرڊ"}
@@ -151,7 +151,7 @@ sd{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ليٽرز في 100 ڪلو ميٽر"}
                 one{"{0} L/100km"}
                 other{"{0} ليٽرز في 100 ڪلو ميٽر"}
@@ -678,7 +678,7 @@ sd{
                 one{"{0} هيڪٽوپاسڪلز"}
                 other{"{0} هيڪٽوپاسڪلز"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"مرڪري جا انچز"}
                 one{"مرڪري جا {0} انچز"}
                 other{"مرڪري جا {0} انچز"}
@@ -698,7 +698,7 @@ sd{
                 one{"{0} ملي بارز"}
                 other{"{0} ملي بارز"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"مرڪري جو ملي ميٽر"}
                 one{"مرڪري جو {0} ملي ميٽر"}
                 other{"مرڪري جو {0} ملي ميٽر"}
@@ -708,7 +708,7 @@ sd{
                 one{"{0} پاسڪل"}
                 other{"{0} پاسڪلز"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"پائونڊز في اسڪوائر انچ"}
                 one{"{0} psi"}
                 other{"{0} پائونڊز في اسڪوائر انچ"}
@@ -764,7 +764,7 @@ sd{
                 one{"{0} نيوٽن-ميٽر"}
                 other{"{0} نيوٽن-ميٽرز"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"پائونڊ-فيٽ"}
                 one{"{0} پائونڊ-فوٽ"}
                 other{"{0} پائونڊ-فيٽ"}
@@ -921,7 +921,7 @@ sd{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -1051,7 +1051,7 @@ sd{
                 one{"{0} ڪشش ثقل"}
                 other{"{0} ڪشش ثقل"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"ميٽر في سيڪنڊ اسڪوائر"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1166,11 +1166,6 @@ sd{
                 one{"{0} mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"حصا في ملين"}
-                one{"{0} حصا في ملين"}
-                other{"{0} حصا في ملين"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0}%"}
@@ -1181,6 +1176,11 @@ sd{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"حصا في ملين"}
+                one{"{0} حصا في ملين"}
+                other{"{0} حصا في ملين"}
+            }
             permyriad{
                 dnam{"پيرمائيرڊ"}
                 one{"{0}‱"}
@@ -1188,7 +1188,7 @@ sd{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -1686,7 +1686,7 @@ sd{
                 one{"{0} هيڪٽوپاسڪلز"}
                 other{"{0} هيڪٽوپاسڪلز"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"مرڪري جا انچز"}
                 one{"مرڪري جا {0} انچز"}
                 other{"مرڪري جا {0} انچز"}
@@ -1706,12 +1706,12 @@ sd{
                 one{"{0} ملي بارز"}
                 other{"{0} ملي بارز"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"مرڪري جو ملي ميٽر"}
                 one{"مرڪري جو {0} ملي ميٽر"}
                 other{"مرڪري جو {0} ملي ميٽر"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"پائونڊز في اسڪوائر انچ"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1767,7 +1767,7 @@ sd{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
index 70794720928bcc1e9c10988683bfb75c1beb1656..7ee794795ffcbaac681702bdc9596a816a73a437 100644 (file)
@@ -242,7 +242,7 @@ se{
                 other{"{0} hehtopascal"}
                 two{"{0} hehtopascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"bealgi kvikksølv"}
                 one{"{0} bealgi kvikksølv"}
                 other{"{0} bealgi kvikksølv"}
@@ -509,7 +509,7 @@ se{
                 other{"{0}hPa"}
                 two{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} bealgi Hg"}
                 other{"{0} bealgi Hg"}
                 two{"{0} bealgi Hg"}
@@ -802,7 +802,7 @@ se{
                 other{"{0} hPa"}
                 two{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"bealgi kvikksølv"}
                 one{"{0} bealgi Hg"}
                 other{"{0} bealgi Hg"}
index f4fca1883699e3e0cd4ffad809f4f61f1a8bd73b..99bbd715e6a9dd3e10792e621465e0f36cca8bcc 100644 (file)
@@ -14,7 +14,7 @@ si{
                 one{"g-බලය {0}"}
                 other{"g-බලය {0}"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"තත්පර වර්ගයට මීටර"}
                 one{"තත්පර වර්ගයට මීටර {0}"}
                 other{"තත්පර වර්ගයට මීටර {0}"}
@@ -128,11 +128,6 @@ si{
                 one{"{0} මවුල"}
                 other{"{0} මවුල"}
             }
-            part-per-million{
-                dnam{"මිලියනයට කොටස්"}
-                one{"මිලියනයට කොටස් {0}"}
-                other{"මිලියනයට කොටස් {0}"}
-            }
             percent{
                 dnam{"ප්‍රතිශතය"}
                 one{"ප්‍රතිශතය {0}"}
@@ -143,6 +138,11 @@ si{
                 one{"ප්‍රතිසහශ්‍රක {0}"}
                 other{"ප්‍රතිසහශ්‍රක {0}"}
             }
+            permillion{
+                dnam{"මිලියනයට කොටස්"}
+                one{"මිලියනයට කොටස් {0}"}
+                other{"මිලියනයට කොටස් {0}"}
+            }
             permyriad{
                 dnam{"පර්මැරියඩ්"}
                 one{"{0} පර්මැරියඩ්"}
@@ -150,7 +150,7 @@ si{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"කිලෝ මීටර 100 ට ලීටර"}
                 one{"කිලෝ මීටර 100 ට ලීටර {0}"}
                 other{"කිලෝ මීටර 100 ට ලීටර {0}"}
@@ -675,7 +675,7 @@ si{
                 one{"හෙක්ටොපැස්කල් {0}"}
                 other{"හෙක්ටොපැස්කල් {0}"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"රසදිය අඟල්"}
                 one{"රසදිය අඟල් {0}"}
                 other{"රසදිය අඟල් {0}"}
@@ -695,7 +695,7 @@ si{
                 one{"මිලිබාර් {0}"}
                 other{"මිලිබාර් {0}"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"රසදිය මිලිමීටර"}
                 one{"රසදිය මිලිමීටර {0}"}
                 other{"රසදිය මිලිමීටර {0}"}
@@ -705,7 +705,7 @@ si{
                 one{"පැස්කල් {0}"}
                 other{"පැස්කල් {0}"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"වර්ග අලඟකට රාත්තල්"}
                 one{"වර්ග අලඟකට රාත්තල් {0}"}
                 other{"වර්ග අලඟකට රාත්තල් {0}"}
@@ -761,7 +761,7 @@ si{
                 one{"{0} නිව්ටන්-මීටර්"}
                 other{"{0} නිව්ටන්-මීටර්"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"රාත්තල්-පාදය"}
                 one{"{0} රාත්තල්-පාදය"}
                 other{"{0} රාත්තල්-පාදය"}
@@ -963,7 +963,7 @@ si{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ලී/කිමී100"}
                 one{"ලී/කිමී100 {0}"}
                 other{"ලී/කිමී100 {0}"}
@@ -1103,7 +1103,7 @@ si{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"රසදිය {0}\u0022"}
                 other{"රසදිය {0}\u0022"}
             }
@@ -1161,7 +1161,7 @@ si{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"මීටර/තත්පර වර්ගයට"}
                 one{"මී/තව {0}"}
                 other{"මී/තව {0}"}
@@ -1276,11 +1276,6 @@ si{
                 one{"{0} මවුල"}
                 other{"{0} මවුල"}
             }
-            part-per-million{
-                dnam{"කොටස්/මිලියනය"}
-                one{"{0} මිලිකො"}
-                other{"{0} මිලිකො"}
-            }
             percent{
                 dnam{"ප්‍රතිශතය"}
                 one{"{0}%"}
@@ -1291,6 +1286,11 @@ si{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"කොටස්/මිලියනය"}
+                one{"{0} මිලිකො"}
+                other{"{0} මිලිකො"}
+            }
             permyriad{
                 dnam{"පර්මැරියඩ්"}
                 one{"{0}‱"}
@@ -1298,7 +1298,7 @@ si{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ලී/කිමී100"}
                 one{"ලී/කිමී100 {0}"}
                 other{"ලී/100කිමී {0}"}
@@ -1825,7 +1825,7 @@ si{
                 one{"හෙ.පැ {0}"}
                 other{"හෙ.පැ {0}"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ර අඟ"}
                 one{"ර අඟ {0}"}
                 other{"ර අඟ {0}"}
@@ -1845,7 +1845,7 @@ si{
                 one{"මි.බාර් {0}"}
                 other{"මි.බාර් {0}"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"ර මිමී"}
                 one{"ර මිමී {0}"}
                 other{"ර මිමී {0}"}
@@ -1855,7 +1855,7 @@ si{
                 one{"පැස් {0}"}
                 other{"පැස් {0}"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"වඅ රා"}
                 one{"වඅ රා {0}"}
                 other{"වඅ රා {0}"}
@@ -1911,7 +1911,7 @@ si{
                 one{"{0} නි-මී"}
                 other{"{0} නි-මී"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"රාත්-පාද"}
                 one{"{0} රාත්-පාද"}
                 other{"{0} රාත්-පාද"}
index 21f825a972c463c4c415133e2037df9a488159d1..c1536201794d3822689cf3c85fa46b2286dfcbd5 100644 (file)
@@ -16,7 +16,7 @@ sk{
                 one{"{0} jednotka preťaženia"}
                 other{"{0} jednotiek preťaženia"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metre za sekundu na druhú"}
                 few{"{0} metre za sekundu na druhú"}
                 many{"{0} metra za sekundu na druhú"}
@@ -171,13 +171,6 @@ sk{
                 one{"{0} mol"}
                 other{"{0} molov"}
             }
-            part-per-million{
-                dnam{"milióntiny"}
-                few{"{0} milióntiny"}
-                many{"{0} milióntiny"}
-                one{"{0} milióntina"}
-                other{"{0} milióntin"}
-            }
             percent{
                 dnam{"percentá"}
                 few{"{0} percentá"}
@@ -192,6 +185,13 @@ sk{
                 one{"{0} promile"}
                 other{"{0} promile"}
             }
+            permillion{
+                dnam{"milióntiny"}
+                few{"{0} milióntiny"}
+                many{"{0} milióntiny"}
+                one{"{0} milióntina"}
+                other{"{0} milióntin"}
+            }
             permyriad{
                 dnam{"desatiny promile"}
                 few{"{0} desatiny promile"}
@@ -201,7 +201,7 @@ sk{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litre na 100 kilometrov"}
                 few{"{0} litre na 100 kilometrov"}
                 many{"{0} litra na 100 kilometrov"}
@@ -920,7 +920,7 @@ sk{
                 one{"{0} hektopascal"}
                 other{"{0} hektopascalov"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"palce ortuťového stĺpca"}
                 few{"{0} palce ortuťového stĺpca"}
                 many{"{0} palca ortuťového stĺpca"}
@@ -948,7 +948,7 @@ sk{
                 one{"{0} milibar"}
                 other{"{0} milibarov"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimetre ortuťového stĺpca"}
                 few{"{0} milimetre ortuťového stĺpca"}
                 many{"{0} milimetra ortuťového stĺpca"}
@@ -962,7 +962,7 @@ sk{
                 one{"pascal"}
                 other{"{0} pascalov"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"libry sily na štvorcový palec"}
                 few{"{0} libry sily na štvorcový palec"}
                 many{"{0} libry sily na štvorcový palec"}
@@ -1038,7 +1038,7 @@ sk{
                 one{"{0} newtonmeter"}
                 other{"{0} newtonmetrov"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"librostopy"}
                 few{"{0} librostopy"}
                 many{"{0} librostopy"}
@@ -1245,7 +1245,7 @@ sk{
                 one{"{0}G"}
                 other{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0} m/s²"}
                 many{"{0} m/s²"}
@@ -1355,7 +1355,7 @@ sk{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 few{"{0} l/100 km"}
                 many{"{0} l/100 km"}
@@ -1746,7 +1746,7 @@ sk{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 few{"{0}\u0022 Hg"}
                 many{"{0}\u0022 Hg"}
@@ -1760,14 +1760,14 @@ sk{
                 one{"{0} mb"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 few{"{0} mm Hg"}
                 many{"{0} mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 few{"{0} psi"}
                 many{"{0} psi"}
@@ -1974,7 +1974,7 @@ sk{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0} m/s²"}
                 many{"{0} m/s²"}
@@ -2129,13 +2129,6 @@ sk{
                 one{"{0} mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                few{"{0} ppm"}
-                many{"{0} ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 few{"{0} %"}
@@ -2150,6 +2143,13 @@ sk{
                 one{"{0} ‰"}
                 other{"{0} ‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                few{"{0} ppm"}
+                many{"{0} ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"‱"}
                 few{"{0} ‱"}
@@ -2159,7 +2159,7 @@ sk{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 few{"{0} l/100 km"}
                 many{"{0} l/100 km"}
@@ -2878,7 +2878,7 @@ sk{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 few{"{0} inHg"}
                 many{"{0} inHg"}
@@ -2906,14 +2906,14 @@ sk{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 few{"{0} mm Hg"}
                 many{"{0} mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 few{"{0} psi"}
                 many{"{0} psi"}
@@ -2989,7 +2989,7 @@ sk{
                 one{"{0} Nm"}
                 other{"{0} Nm"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 few{"{0} lbf⋅ft"}
                 many{"{0} lbf⋅ft"}
index b6811048d5d0197877c7ac638e6ecd23eb2d6bda..cbc1ff22616914b1bcee563a19155910fabf60bd 100644 (file)
@@ -16,7 +16,7 @@ sl{
                 other{"{0} G"}
                 two{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meter na kvadratno sekundo"}
                 few{"{0} metri na kvadratno sekundo"}
                 one{"{0} meter na kvadratno sekundo"}
@@ -170,13 +170,6 @@ sl{
                 other{"{0} molov"}
                 two{"{0} mola"}
             }
-            part-per-million{
-                dnam{"delci na milijon"}
-                few{"{0} delcev na milijon"}
-                one{"{0} delec na milijon"}
-                other{"{0} delcev na milijon"}
-                two{"{0} delca na milijon"}
-            }
             percent{
                 dnam{"odstotek"}
                 few{"{0} %"}
@@ -191,6 +184,13 @@ sl{
                 other{"{0} promilov"}
                 two{"{0} ‰"}
             }
+            permillion{
+                dnam{"delci na milijon"}
+                few{"{0} delcev na milijon"}
+                one{"{0} delec na milijon"}
+                other{"{0} delcev na milijon"}
+                two{"{0} delca na milijon"}
+            }
             permyriad{
                 dnam{"desettisočine"}
                 few{"{0} desettisočine"}
@@ -200,7 +200,7 @@ sl{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 few{"{0} litri na 100 kilometrov"}
                 one{"{0} liter na 100 kilometrov"}
                 other{"{0} litrov na 100 kilometrov"}
@@ -858,7 +858,7 @@ sl{
                 other{"{0} hektopaskalov"}
                 two{"{0} hektopaskala"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"palci živega srebra"}
                 few{"{0} palci živega srebra"}
                 one{"{0} palec živega srebra"}
@@ -886,7 +886,7 @@ sl{
                 other{"{0} milibarov"}
                 two{"{0} milibara"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimetri živega srebra"}
                 few{"{0} milimetri živega srebra"}
                 one{"{0} milimeter živega srebra"}
@@ -900,7 +900,7 @@ sl{
                 other{"{0} paskalov"}
                 two{"{0} paskala"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"funti na kvadratni palec"}
                 few{"{0} funti na kvadratni palec"}
                 one{"{0} funt na kvadratni palec"}
@@ -976,7 +976,7 @@ sl{
                 other{"{0} newton metrov"}
                 two{"{0} newton metra"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"funt-čevelj"}
                 few{"{0} funt-čevlji"}
                 one{"{0} funt-čevelj"}
@@ -1221,7 +1221,7 @@ sl{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 few{"{0} l/100 km"}
                 one{"{0} l/100 km"}
@@ -1427,7 +1427,7 @@ sl{
                 other{"{0} hPa"}
                 two{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 few{"{0} inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1495,7 +1495,7 @@ sl{
                 other{"{0} G"}
                 two{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0} m/s²"}
                 one{"{0} m/s²"}
@@ -1650,13 +1650,6 @@ sl{
                 other{"{0} mol"}
                 two{"{0} mol"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                few{"{0} ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-                two{"{0} ppm"}
-            }
             percent{
                 dnam{"odstotek"}
                 few{"{0} %"}
@@ -1671,6 +1664,13 @@ sl{
                 other{"{0} ‰"}
                 two{"{0} ‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                few{"{0} ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+                two{"{0} ppm"}
+            }
             permyriad{
                 dnam{"‱"}
                 few{"{0} ‱"}
@@ -1680,7 +1680,7 @@ sl{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 few{"{0} l/100 km"}
                 one{"{0} l/100 km"}
@@ -2405,7 +2405,7 @@ sl{
                 other{"{0} hPa"}
                 two{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 few{"{0} inHg"}
                 one{"{0} inHg"}
@@ -2433,7 +2433,7 @@ sl{
                 other{"{0} mbar"}
                 two{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 few{"{0} mmHG"}
                 one{"{0} mmHG"}
@@ -2447,7 +2447,7 @@ sl{
                 other{"{0} Pa"}
                 two{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 few{"{0} psi"}
                 one{"{0} psi"}
@@ -2523,7 +2523,7 @@ sl{
                 other{"{0} N⋅m"}
                 two{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 few{"{0} lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
index 99a317a81127f0f3a68fb962b3f5cf634e95d4f0..13d0239c3573d70ea3f08129334a35b43f90f59b 100644 (file)
@@ -9,7 +9,7 @@ so{
                 one{"{0} cadaadis dib ku riixaya"}
                 other{"{0} cadaadis dib ku riixaya"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"mitir ilbiriqsigii jibaaranba"}
                 one{"{0} mitir ilbiriqsigii jibaaranba"}
                 other{"{0} mitir ilbiriqsigii jibaaranba"}
@@ -120,11 +120,6 @@ so{
                 one{"{0} mool"}
                 other{"{0} mool"}
             }
-            part-per-million{
-                dnam{"baart milyankiiba"}
-                one{"{0} baart milyankiiba"}
-                other{"{0} baart milyankiiba"}
-            }
             percent{
                 dnam{"boqolkiiba"}
                 one{"boqolkiiba {0}"}
@@ -135,6 +130,11 @@ so{
                 one{"{0} baarmiil"}
                 other{"{0} baarmiil"}
             }
+            permillion{
+                dnam{"baart milyankiiba"}
+                one{"{0} baart milyankiiba"}
+                other{"{0} baart milyankiiba"}
+            }
             permyriad{
                 dnam{"bermiraad"}
                 one{"{0} bermiraad"}
@@ -142,7 +142,7 @@ so{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litar 100-kii kiilomitirba"}
                 one{"{0} litar 100-kii kiilomitirba"}
                 other{"{0} litar 100-kii kiilomitirba"}
@@ -628,7 +628,7 @@ so{
                 one{"{0} hektobaskal"}
                 other{"{0} hektobaskal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"injis maarkuri"}
                 one{"{0} inji maarkuri"}
                 other{"{0} inji maarkuri"}
@@ -648,12 +648,12 @@ so{
                 one{"{0} milibaar"}
                 other{"{0} milibaar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimitir maarkuri"}
                 one{"{0} milimitir maarkuri"}
                 other{"{0} milimitir maarkuri"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"bownd injigii jibaaranba"}
                 one{"{0} bownd injigii jibaaranba"}
                 other{"{0} bownd injigii jibaaranba"}
@@ -704,7 +704,7 @@ so{
                 one{"{0} nuyuuton-mitir"}
                 other{"{0} nuyuuton-mitir"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"bownd-fiit"}
                 one{"{0} bownd-fiit"}
                 other{"{0} bownd-fiit"}
@@ -982,7 +982,7 @@ so{
                 one{"{0} C"}
                 other{"{0} C"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"mitir/ilbrqsi²"}
                 one{"{0} m/i²"}
                 other{"{0} m/i²"}
@@ -1061,17 +1061,17 @@ so{
                 one{"{0} mool"}
                 other{"{0} mool"}
             }
-            part-per-million{
-                dnam{"baart/milyan"}
-                one{"{0} bbm"}
-                other{"{0} bbm"}
-            }
             percent{
                 dnam{"boqolkiiba"}
             }
             permille{
                 dnam{"baarmiil"}
             }
+            permillion{
+                dnam{"baart/milyan"}
+                one{"{0} bbm"}
+                other{"{0} bbm"}
+            }
             permyriad{
                 dnam{"bermiraad"}
                 one{"{0}‱"}
@@ -1417,12 +1417,12 @@ so{
                 one{"{0} Mba"}
                 other{"{0} Mba"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mmHg"}
                 one{"{0} mmHg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"bij"}
                 one{"{0} bij"}
                 other{"{0} bij"}
@@ -1464,7 +1464,7 @@ so{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"bwd⋅ft"}
                 one{"{0} bwd⋅ft"}
                 other{"{0} bwd⋅ft"}
index f83330fbdfba405e8b80fad0cb419669c5a149f5..15a9885a2f70e90ed27853ccee7cc1c2e236e58e 100644 (file)
@@ -14,7 +14,7 @@ sq{
                 one{"{0} g-forcë"}
                 other{"{0} g-forcë"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metra për sekondë në katror"}
                 one{"{0} metër për sekondë në katror"}
                 other{"{0} metra për sekondë në katror"}
@@ -128,11 +128,6 @@ sq{
                 one{"{0} mol"}
                 other{"{0} molë"}
             }
-            part-per-million{
-                dnam{"pjesë për milion"}
-                one{"{0} pjesë për milion"}
-                other{"{0} pjesë për milion"}
-            }
             percent{
                 dnam{"përqind"}
                 one{"{0} përqind"}
@@ -143,6 +138,11 @@ sq{
                 one{"{0} përmijë"}
                 other{"{0} përmijë"}
             }
+            permillion{
+                dnam{"pjesë për milion"}
+                one{"{0} pjesë për milion"}
+                other{"{0} pjesë për milion"}
+            }
             permyriad{
                 dnam{"përdhjetëmijë"}
                 one{"{0} përdhjetëmijë"}
@@ -150,7 +150,7 @@ sq{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litra për 100 kilometra"}
                 one{"{0} litër për 100 kilometra"}
                 other{"{0} litra për 100 kilometra"}
@@ -677,7 +677,7 @@ sq{
                 one{"{0} hektopaskal"}
                 other{"{0} hektopaskal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inç merkuri"}
                 one{"{0} inç merkuri"}
                 other{"{0} inç merkuri"}
@@ -697,12 +697,12 @@ sq{
                 one{"{0} milibar"}
                 other{"{0} milibare"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimetra mërkuri"}
                 one{"{0} milimetër mërkuri"}
                 other{"{0} milimetra mërkuri"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"paund për inç në katror"}
                 one{"{0} paund për inç në katror"}
                 other{"{0} paund për inç në katror"}
@@ -758,7 +758,7 @@ sq{
                 one{"{0} njuton-metër"}
                 other{"{0} njuton-metra"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"paund-këmbë"}
                 one{"{0} paund-këmbë"}
                 other{"{0} paund-këmbë"}
@@ -960,7 +960,7 @@ sq{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -1112,7 +1112,7 @@ sq{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inç Hg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1122,12 +1122,12 @@ sq{
                 one{"{0} mb"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1188,7 +1188,7 @@ sq{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1297,11 +1297,6 @@ sq{
                 one{"{0} mmol/L"}
                 other{"{0} mmol/L"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0}%"}
@@ -1312,9 +1307,14 @@ sq{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -1752,7 +1752,7 @@ sq{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1762,12 +1762,12 @@ sq{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index 8b769b0f736dbb3d240405e9f5ccf795bf9e3341..dcdc62335755c4f63aaad9d9ba9e0bf46d121003 100644 (file)
@@ -15,7 +15,7 @@ sr{
                 one{"{0} ге сила"}
                 other{"{0} ге сила"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"метри у секунди на квадрат"}
                 few{"{0} метра у секунди на квадрат"}
                 one{"{0} метар у секунди на квадрат"}
@@ -150,12 +150,6 @@ sr{
                 one{"{0} мол"}
                 other{"{0} мола"}
             }
-            part-per-million{
-                dnam{"честица на милион"}
-                few{"{0} честице на милион"}
-                one{"{0} честица на милион"}
-                other{"{0} честица на милион"}
-            }
             percent{
                 dnam{"проценат"}
                 few{"{0} процената"}
@@ -168,9 +162,15 @@ sr{
                 one{"{0} промил"}
                 other{"{0} промила"}
             }
+            permillion{
+                dnam{"честица на милион"}
+                few{"{0} честице на милион"}
+                one{"{0} честица на милион"}
+                other{"{0} честица на милион"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 few{"{0} литра на 100 километара"}
                 one{"{0} литар на 100 километара"}
@@ -740,7 +740,7 @@ sr{
                 one{"{0} хектопаскал"}
                 other{"{0} хектопаскала"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"инчи живиног стуба"}
                 few{"{0} инча живиног стуба"}
                 one{"{0} инч живиног стуба"}
@@ -764,7 +764,7 @@ sr{
                 one{"{0} милибар"}
                 other{"{0} милибара"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"милиметри живиног стуба"}
                 few{"{0} милиметра живиног стуба"}
                 one{"{0} милиметар живиног стуба"}
@@ -776,7 +776,7 @@ sr{
                 one{"{0} паскал"}
                 other{"{0} паскала"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"фунте по квадратном инчу"}
                 few{"{0} фунте по квадратном инчу"}
                 one{"{0} фунта по квадратном инчу"}
@@ -842,7 +842,7 @@ sr{
                 one{"{0} њутн-метар"}
                 other{"{0} њутн-метара"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"фунта-фити"}
                 few{"{0} фунта-фита"}
                 one{"{0} фунта-фит"}
@@ -1083,7 +1083,7 @@ sr{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 few{"{0} L/100km"}
                 one{"{0} L/100km"}
@@ -1251,7 +1251,7 @@ sr{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 few{"{0} inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1320,7 +1320,7 @@ sr{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0} m/s²"}
                 one{"{0} m/s²"}
@@ -1449,12 +1449,6 @@ sr{
                 one{"{0} mmol/L"}
                 other{"{0} mmol/L"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                few{"{0} ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"проценат"}
                 few{"{0}%"}
@@ -1467,9 +1461,15 @@ sr{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                few{"{0} ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100 km"}
                 few{"{0} L/100 km"}
                 one{"{0} L/100 km"}
@@ -2047,7 +2047,7 @@ sr{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 few{"{0} inHg"}
                 one{"{0} inHg"}
@@ -2059,7 +2059,7 @@ sr{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 few{"{0} mm Hg"}
                 one{"{0} mm Hg"}
@@ -2071,7 +2071,7 @@ sr{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 few{"{0} psi"}
                 one{"{0} psi"}
index 3a5ece8c60f277ccadeae7904b1d00950892f0d3..d2a8760713faa4560ee7a75dfbe5fcfd52a0494b 100644 (file)
@@ -16,7 +16,7 @@ sr_Latn{
                 one{"{0} ge sila"}
                 other{"{0} ge sila"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metri u sekundi na kvadrat"}
                 few{"{0} metra u sekundi na kvadrat"}
                 one{"{0} metar u sekundi na kvadrat"}
@@ -151,12 +151,6 @@ sr_Latn{
                 one{"{0} mol"}
                 other{"{0} mola"}
             }
-            part-per-million{
-                dnam{"čestica na milion"}
-                few{"{0} čestice na milion"}
-                one{"{0} čestica na milion"}
-                other{"{0} čestica na milion"}
-            }
             percent{
                 dnam{"procenat"}
                 few{"{0} procenata"}
@@ -169,9 +163,15 @@ sr_Latn{
                 one{"{0} promil"}
                 other{"{0} promila"}
             }
+            permillion{
+                dnam{"čestica na milion"}
+                few{"{0} čestice na milion"}
+                one{"{0} čestica na milion"}
+                other{"{0} čestica na milion"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 few{"{0} litra na 100 kilometara"}
                 one{"{0} litar na 100 kilometara"}
@@ -741,7 +741,7 @@ sr_Latn{
                 one{"{0} hektopaskal"}
                 other{"{0} hektopaskala"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inči živinog stuba"}
                 few{"{0} inča živinog stuba"}
                 one{"{0} inč živinog stuba"}
@@ -765,7 +765,7 @@ sr_Latn{
                 one{"{0} milibar"}
                 other{"{0} milibara"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimetri živinog stuba"}
                 few{"{0} milimetra živinog stuba"}
                 one{"{0} milimetar živinog stuba"}
@@ -777,7 +777,7 @@ sr_Latn{
                 one{"{0} paskal"}
                 other{"{0} paskala"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"funte po kvadratnom inču"}
                 few{"{0} funte po kvadratnom inču"}
                 one{"{0} funta po kvadratnom inču"}
@@ -843,7 +843,7 @@ sr_Latn{
                 one{"{0} njutn-metar"}
                 other{"{0} njutn-metara"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"funta-fiti"}
                 few{"{0} funta-fita"}
                 one{"{0} funta-fit"}
@@ -1084,7 +1084,7 @@ sr_Latn{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 few{"{0} L/100km"}
                 one{"{0} L/100km"}
@@ -1252,7 +1252,7 @@ sr_Latn{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 few{"{0} inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1321,7 +1321,7 @@ sr_Latn{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 few{"{0} m/s²"}
                 one{"{0} m/s²"}
@@ -1450,12 +1450,6 @@ sr_Latn{
                 one{"{0} mmol/L"}
                 other{"{0} mmol/L"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                few{"{0} ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"procenat"}
                 few{"{0}%"}
@@ -1468,9 +1462,15 @@ sr_Latn{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                few{"{0} ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100 km"}
                 few{"{0} L/100 km"}
                 one{"{0} L/100 km"}
@@ -2034,7 +2034,7 @@ sr_Latn{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 few{"{0} inHg"}
                 one{"{0} inHg"}
@@ -2046,7 +2046,7 @@ sr_Latn{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 few{"{0} mm Hg"}
                 one{"{0} mm Hg"}
@@ -2058,7 +2058,7 @@ sr_Latn{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 few{"{0} psi"}
                 one{"{0} psi"}
index 557951a7a54164cdd7e8c93a5264d3eea535d4c5..46fd183efc028cfbeeb331d38305042a5a7050b3 100644 (file)
@@ -14,7 +14,7 @@ sv{
                 one{"{0} gånger jordens gravitation"}
                 other{"{0} gånger jordens gravitation"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"meter per kvadratsekund"}
                 one{"{0} meter per kvadratsekund"}
                 other{"{0} meter per kvadratsekund"}
@@ -124,11 +124,6 @@ sv{
                 one{"{0} millimol per liter"}
                 other{"{0} millimol per liter"}
             }
-            part-per-million{
-                dnam{"miljondelar"}
-                one{"{0} miljondel"}
-                other{"{0} miljondelar"}
-            }
             percent{
                 dnam{"procent"}
                 one{"{0} procent"}
@@ -139,6 +134,11 @@ sv{
                 one{"{0} promille"}
                 other{"{0} promille"}
             }
+            permillion{
+                dnam{"miljondelar"}
+                one{"{0} miljondel"}
+                other{"{0} miljondelar"}
+            }
             permyriad{
                 dnam{"promyriad"}
                 one{"{0} promyriad"}
@@ -146,7 +146,7 @@ sv{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"liter per 100 kilometer"}
                 one{"{0} liter per 100 kilometer"}
                 other{"{0} liter per 100 kilometer"}
@@ -676,7 +676,7 @@ sv{
                 one{"{0} hektopascal"}
                 other{"{0} hektopascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"tum kvicksilver"}
                 one{"{0} tum kvicksilver"}
                 other{"{0} tum kvicksilver"}
@@ -696,7 +696,7 @@ sv{
                 one{"{0} millibar"}
                 other{"{0} millibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"millimeter kvicksilver"}
                 one{"{0} millimeter kvicksilver"}
                 other{"{0} millimeter kvicksilver"}
@@ -706,7 +706,7 @@ sv{
                 one{"{0} pascal"}
                 other{"{0} pascal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"pund per kvadrattum"}
                 one{"{0} pund per kvadrattum"}
                 other{"{0} pund per kvadrattum"}
@@ -762,9 +762,9 @@ sv{
                 one{"{0} newton-meter"}
                 other{"{0} newton-meter"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"pound-feet"}
-                one{"{0} pound-foot"}
+                one{"{0} pound-force-foot"}
                 other{"{0} pound-feet"}
             }
         }
@@ -913,7 +913,7 @@ sv{
                 one{"{0}G"}
                 other{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0}m/s²"}
                 other{"{0}m/s²"}
@@ -1019,11 +1019,6 @@ sv{
                 one{"{0}mol"}
                 other{"{0}mol"}
             }
-            part-per-million{
-                dnam{"miljondelar"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0} %"}
@@ -1034,13 +1029,18 @@ sv{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"miljondelar"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 one{"{0}‱"}
                 other{"{0}‱"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1491,7 +1491,7 @@ sv{
                 one{"{0}hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"tum Hg"}
                 one{"{0} tum Hg"}
                 other{"{0} tum Hg"}
@@ -1509,12 +1509,12 @@ sv{
                 one{"{0}mbar"}
                 other{"{0}mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0}mm Hg"}
                 other{"{0}mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"s:d/tum²"}
                 one{"{0}s:d/tum²"}
                 other{"{0}s:d/tum²"}
@@ -1713,7 +1713,7 @@ sv{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1817,11 +1817,6 @@ sv{
                 one{"{0} mmol/l"}
                 other{"{0} mmol/l"}
             }
-            part-per-million{
-                dnam{"miljondelar"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0} %"}
@@ -1832,13 +1827,18 @@ sv{
                 one{"{0} ‰"}
                 other{"{0} ‰"}
             }
+            permillion{
+                dnam{"miljondelar"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 one{"{0} ‱"}
                 other{"{0} ‱"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -2327,7 +2327,7 @@ sv{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"tum Hg"}
                 one{"{0} tum Hg"}
                 other{"{0} tum Hg"}
@@ -2337,12 +2337,12 @@ sv{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index 18a2c879ab6ed391d8ad4c60ec47e7a73a2bad30..c04340f9996cd54e08c3146437a14f37428c2cac 100644 (file)
@@ -14,7 +14,7 @@ sw{
                 one{"mvuto wa graviti {0}"}
                 other{"mvuto wa graviti {0}"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"mita kwa kila sekunde mraba"}
                 one{"mita {0} kwa kila sekunde mraba"}
                 other{"mita {0} kwa kila sekunde mraba"}
@@ -128,11 +128,6 @@ sw{
                 one{"moli {0}"}
                 other{"moli {0}"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"ppm {0}"}
-                other{"ppm {0}"}
-            }
             percent{
                 dnam{"asilimia"}
                 one{"asilimia {0}"}
@@ -143,6 +138,11 @@ sw{
                 one{"{0} kwa kila elfu"}
                 other{"{0} kwa kila elfu"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"ppm {0}"}
+                other{"ppm {0}"}
+            }
             permyriad{
                 dnam{"permyriadi"}
                 one{"permyriadi {0}"}
@@ -150,7 +150,7 @@ sw{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"lita kwa kilomita 100"}
                 one{"lita {0} kwa kilomita 100"}
                 other{"lita {0} kwa kilomita 100"}
@@ -647,7 +647,7 @@ sw{
                 one{"hektopaskali {0}"}
                 other{"hektopaskali {0}"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inchi za zebaki"}
                 one{"inchi {0} ya zebaki"}
                 other{"inchi {0} za zebaki"}
@@ -667,7 +667,7 @@ sw{
                 one{"kipimo cha milibari {0}"}
                 other{"kipimo cha milibari {0}"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimita za zebaki"}
                 one{"milimita {0} ya zebaki"}
                 other{"milimita {0} za zebaki"}
@@ -677,7 +677,7 @@ sw{
                 one{"paskali {0}"}
                 other{"paskali {0}"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"pauni kwa kila inchi mraba"}
                 one{"pauni {0} kwa kila inchi mraba"}
                 other{"pauni {0} kwa kila inchi mraba"}
@@ -733,7 +733,7 @@ sw{
                 one{"newtonimita {0}"}
                 other{"newtonimita {0}"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"paunifuti"}
                 one{"paunifuti {0}"}
                 other{"paunifuti {0}"}
@@ -930,7 +930,7 @@ sw{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"lita kwa kilomita 100"}
                 one{"{0}L/100km"}
                 other{"{0}L/100km"}
@@ -1077,7 +1077,7 @@ sw{
                 one{"hPa {0}"}
                 other{"hPa {0}"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -1135,7 +1135,7 @@ sw{
                 one{"G {0}"}
                 other{"G {0}"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"mita kwa kila sekunde mraba"}
                 one{"m {0}/s²"}
                 other{"m {0}/s²"}
@@ -1249,11 +1249,6 @@ sw{
                 one{"moli {0}"}
                 other{"moli {0}"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"ppm {0}"}
-                other{"ppm {0}"}
-            }
             percent{
                 dnam{"asilimia"}
                 one{"asilimia {0}"}
@@ -1264,12 +1259,17 @@ sw{
                 one{"{0} kwa elfu"}
                 other{"{0} kwa elfu"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"ppm {0}"}
+                other{"ppm {0}"}
+            }
             permyriad{
                 dnam{"permyriadi"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"lita kwa kilomita 100"}
                 one{"lita {0} kwa kilomita 100"}
                 other{"lita {0}/km100"}
@@ -1754,7 +1754,7 @@ sw{
                 one{"hPa {0}"}
                 other{"hPa {0}"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inchi za zebaki"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1772,7 +1772,7 @@ sw{
                 one{"mbar {0}"}
                 other{"mbar {0}"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimita za zebaki"}
                 one{"milimita {0} ya zebaki"}
                 other{"mm Hg {0}"}
@@ -1781,7 +1781,7 @@ sw{
                 one{"Pa {0}"}
                 other{"Pa {0}"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"pauni kwa kila inchi mraba"}
                 one{"psi {0}"}
                 other{"psi {0}"}
index dce7b07dcd25957618d1c4c5c6c9dfd83651d074..02458640ab1ed11e4fff6b8eabf64e6231b31aac 100644 (file)
@@ -126,7 +126,7 @@ sw_KE{
                 one{"baa {0}"}
                 other{"baa {0}"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"inHg {0}"}
                 other{"inHg {0}"}
             }
index d6960aca0446b7a6bd8874828d7566d42bad5a22..7c25bc3316f942bb1dbae0a6cb43298f6fe14c94 100644 (file)
@@ -14,7 +14,7 @@ ta{
                 one{"{0} ஜி-ஃபோர்ஸ்"}
                 other{"{0} ஜி-ஃபோர்ஸ்"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"மீட்டர்/சதுரவிநாடி"}
                 one{"{0} மீட்டர்/சதுரவிநாடி"}
                 other{"{0} மீட்டர்கள்/சதுரவிநாடி"}
@@ -128,11 +128,6 @@ ta{
                 one{"{0} மோல்"}
                 other{"{0} மோல்ஸ்"}
             }
-            part-per-million{
-                dnam{"பகுதிகள்/மில்லியன்"}
-                one{"{0} பகுதி/மில்லியன்"}
-                other{"{0} பகுதிகள்/மில்லியன்"}
-            }
             percent{
                 dnam{"சதவீதம்"}
                 one{"{0} சதவீதம்"}
@@ -143,6 +138,11 @@ ta{
                 one{"மில்லி ஒன்றுக்கு {0}"}
                 other{"மில்லி ஒன்றுக்கு {0}"}
             }
+            permillion{
+                dnam{"பகுதிகள்/மில்லியன்"}
+                one{"{0} பகுதி/மில்லியன்"}
+                other{"{0} பகுதிகள்/மில்லியன்"}
+            }
             permyriad{
                 dnam{"பெர்மிரியட்"}
                 one{"{0} பெர்மிரியட்"}
@@ -150,7 +150,7 @@ ta{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"லிட்டர்/100கி.மீ"}
                 one{"{0} லிட்டர்/100கி.மீ"}
                 other{"{0} லிட்டர்/100கி.மீ"}
@@ -682,7 +682,7 @@ ta{
                 one{"{0} ஹெக்டோபாஸ்கல்"}
                 other{"{0} ஹெக்டோபாஸ்கல்"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"பாதரச அங்குலங்கள்"}
                 one{"{0} பாதரச அங்குலம்"}
                 other{"{0} பாதரச அங்குலங்கள்"}
@@ -702,7 +702,7 @@ ta{
                 one{"{0} மில்லிபார்"}
                 other{"{0} மில்லிபார்கள்"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"பாதரச மில்லிமீட்டர்கள்"}
                 one{"{0} பாதரச மில்லிமீட்டர்"}
                 other{"{0} பாதரச மில்லிமீட்டர்கள்"}
@@ -712,7 +712,7 @@ ta{
                 one{"{0} பாஸ்கல்"}
                 other{"{0} பாஸ்கல்கள்"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"பவுண்டுகள்/சதுர அங்குலம்"}
                 one{"{0} பவுண்டு/சதுர அங்குலம்"}
                 other{"{0} பவுண்டுகள்/சதுர அங்குலம்"}
@@ -768,7 +768,7 @@ ta{
                 one{"{0} நியூட்டன் மீட்டர்"}
                 other{"{0} நியூட்டன் மீட்டர்கள்"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"பவுண்ட்-அடி"}
                 one{"{0} பவுண்ட்-அடி"}
                 other{"{0} பவுண்ட்-அடி"}
@@ -970,7 +970,7 @@ ta{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"லி./100கி.மீ"}
                 one{"{0}லி./100கி.மீ"}
                 other{"{0}லி./100கி.மீ"}
@@ -1145,7 +1145,7 @@ ta{
                 one{"{0} ஹெ.பா."}
                 other{"{0} ஹெ.பா."}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"பா. அங்."}
                 one{"{0} பா.அங்."}
                 other{"{0} பா.அங்."}
@@ -1155,12 +1155,12 @@ ta{
                 one{"{0} மி.பா."}
                 other{"{0} மி.பா."}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"பாத. மி.மீ."}
                 one{"{0} பாத. மி.மீ."}
                 other{"{0} பாத. மி.மீ."}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1228,7 +1228,7 @@ ta{
                 one{"{0} ஜி.ஃபோ."}
                 other{"{0} ஜி.ஃபோ."}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"மீ/வி²"}
                 one{"{0} மீ/வி²"}
                 other{"{0} மீ/வி²"}
@@ -1342,11 +1342,6 @@ ta{
                 one{"{0} மோல்"}
                 other{"{0} மோல்"}
             }
-            part-per-million{
-                dnam{"ப./மி."}
-                one{"{0} ப./மி."}
-                other{"{0} ப./மி."}
-            }
             percent{
                 dnam{"சதவீதம்"}
                 one{"{0}%"}
@@ -1357,12 +1352,17 @@ ta{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ப./மி."}
+                one{"{0} ப./மி."}
+                other{"{0} ப./மி."}
+            }
             permyriad{
                 dnam{"பெர்மிரியட்"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"லி./100கி.மீ"}
                 one{"{0} லி./100கி.மீ"}
                 other{"{0} லி./100கி.மீ"}
@@ -1882,7 +1882,7 @@ ta{
                 one{"{0} ஹெ.பாஸ்."}
                 other{"{0} ஹெ.பாஸ்."}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"பாத. அங்."}
                 one{"{0} பாத. அங்."}
                 other{"{0} பாத. அங்."}
@@ -1902,7 +1902,7 @@ ta{
                 one{"{0} மி.பா."}
                 other{"{0} மி.பா."}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"பாத. மி.மீ."}
                 one{"{0} பாத. மி.மீ."}
                 other{"{0} பாத. மி.மீ."}
@@ -1912,7 +1912,7 @@ ta{
                 one{"{0} பா."}
                 other{"{0} பா."}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1968,7 +1968,7 @@ ta{
                 one{"{0} நியூ.மீ"}
                 other{"{0} நியூ.மீ"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"ப.அடி"}
                 one{"{0} ப.அடி"}
                 other{"{0} ப.அடி"}
index b702cda40b7dd69e8330728a33dfe8f90bbad3c9..30b93bac996f590813b22a9bb88982092b01bc13 100644 (file)
@@ -14,7 +14,7 @@ te{
                 one{"{0} గు-శక్తి"}
                 other{"{0} గు-శక్తి"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"మీటర్లు/స్క్వేర్ సెకన్లు"}
                 one{"{0} మీటరు/స్క్వేర్ సెకను"}
                 other{"{0} మీటర్లు/స్క్వేర్ సెకన్లు"}
@@ -128,11 +128,6 @@ te{
                 one{"{0} మోల్"}
                 other{"{0} మోల్‌లు"}
             }
-            part-per-million{
-                dnam{"భాగాలు/మిలియన్"}
-                one{"{0} భాగం/మిలియన్"}
-                other{"{0} భాగాలు/మిలియన్"}
-            }
             percent{
                 dnam{"శాతం"}
                 one{"{0} శాతం"}
@@ -143,6 +138,11 @@ te{
                 one{"{0}/మైలుకు"}
                 other{"{0}/మైలుకు"}
             }
+            permillion{
+                dnam{"భాగాలు/మిలియన్"}
+                one{"{0} భాగం/మిలియన్"}
+                other{"{0} భాగాలు/మిలియన్"}
+            }
             permyriad{
                 dnam{"పెర్మేరియాడ్"}
                 one{"{0} పెర్మేరియాడ్"}
@@ -150,7 +150,7 @@ te{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"లీటర్లు/100 కీలోమీటర్లు"}
                 one{"{0} లీటరు/100 కీలోమీటర్లు"}
                 other{"{0} లీటర్లు/100 కీలోమీటర్లు"}
@@ -677,7 +677,7 @@ te{
                 one{"{0} హెక్టోపాస్కల్"}
                 other{"{0} హెక్టోపాస్కల్‌లు"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"అంగుళాల పాదరసం"}
                 one{"{0} అంగుళం పాదరసం"}
                 other{"{0} అంగుళాల పాదరసం"}
@@ -697,7 +697,7 @@ te{
                 one{"{0} మిల్లీబార్"}
                 other{"{0} మిల్లీబార్‌లు"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"మిల్లీమీటర్ల పాదరసం"}
                 one{"{0} మిల్లీమీటర్ పాదరసం"}
                 other{"{0} మిల్లీమీటర్ల పాదరసం"}
@@ -707,7 +707,7 @@ te{
                 one{"{0} పాస్కల్"}
                 other{"{0} పాస్కల్‌లు"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"చదరపు అంగుళానికి పౌండ్లు"}
                 one{"చదరపు అంగుళానికి {0} పౌండు"}
                 other{"చదరపు అంగుళానికి {0} పౌండ్లు"}
@@ -763,7 +763,7 @@ te{
                 one{"{0} న్యూటన్-మీటరు"}
                 other{"{0} న్యూటన్-మీటర్లు"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"పౌండ్-ఫీట్"}
                 one{"{0} పౌండ్-ఫూట్"}
                 other{"{0} పౌండ్-ఫీట్"}
@@ -962,7 +962,7 @@ te{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"లీ/100కి.మీ."}
                 one{"{0}లీ/100కి.మీ."}
                 other{"{0}లీ/100కి.మీ."}
@@ -1137,7 +1137,7 @@ te{
                 one{"{0} హె.పా"}
                 other{"{0} హె.పా"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"అం.పాద"}
                 one{"{0} అం.పాద"}
                 other{"{0} అం.పాద"}
@@ -1147,12 +1147,12 @@ te{
                 one{"{0} మి.బార్"}
                 other{"{0} మి.బార్"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"మిమీ. పాద"}
                 one{"{0} మిమీ. పాద"}
                 other{"{0} మిమీ. పాద"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"పౌ/చ.అం"}
                 one{"{0} పౌ/చ.అం"}
                 other{"{0} పౌ/చ.అం"}
@@ -1220,7 +1220,7 @@ te{
                 one{"{0} గు"}
                 other{"{0} గు"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"మీటర్లు/సెక²"}
                 one{"{0} మీ/సె²"}
                 other{"{0} మీ/సె²"}
@@ -1335,11 +1335,6 @@ te{
                 one{"{0} mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"భాగాలు/మిలియన్"}
-                one{"{0} భా./మి."}
-                other{"{0} భా./మి."}
-            }
             percent{
                 dnam{"శాతం"}
                 one{"{0}%"}
@@ -1350,12 +1345,17 @@ te{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"భాగాలు/మిలియన్"}
+                one{"{0} భా./మి."}
+                other{"{0} భా./మి."}
+            }
             permyriad{
                 dnam{"పెర్మేరియాడ్"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"లీ/100 కి.మీ."}
                 one{"{0} లీ/100 కి.మీ."}
                 other{"{0} లీ/100 కి.మీ."}
@@ -1864,7 +1864,7 @@ te{
                 one{"{0} హె.పా"}
                 other{"{0} హె.పా"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"అం.పాద"}
                 one{"{0} అం.పాద"}
                 other{"{0} అం.పాద"}
@@ -1877,7 +1877,7 @@ te{
                 one{"{0} మి.బార్"}
                 other{"{0} మి.బార్"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"మిమీ. పాద"}
                 one{"{0} మిమీ. పాద"}
                 other{"{0} మిమీ. పాద"}
@@ -1887,7 +1887,7 @@ te{
                 one{"{0} పాస్క."}
                 other{"{0} పాస్క."}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"పౌ/చ.అం"}
                 one{"{0} పౌ/చ.అం"}
                 other{"{0} పౌ/చ.అం"}
@@ -1943,7 +1943,7 @@ te{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
             }
         }
index 311551e53fd1fffc44dc180f315378330e4ae214..f2566e0addfe57fd09720fe74ea5ea81f6962f1d 100644 (file)
@@ -13,7 +13,7 @@ th{
                 dnam{"แรง G"}
                 other{"{0} แรง G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"เมตรต่อวินาทีกำลังสอง"}
                 other{"{0} เมตรต่อวินาทีกำลังสอง"}
             }
@@ -107,10 +107,6 @@ th{
                 dnam{"โมล"}
                 other{"{0} โมล"}
             }
-            part-per-million{
-                dnam{"ส่วนต่อล้าน"}
-                other{"{0} ส่วนต่อล้าน"}
-            }
             percent{
                 dnam{"เปอร์เซ็นต์"}
                 other{"{0} เปอร์เซ็นต์"}
@@ -119,13 +115,17 @@ th{
                 dnam{"เปอร์มิลล์"}
                 other{"{0} เปอร์มิลล์"}
             }
+            permillion{
+                dnam{"ส่วนต่อล้าน"}
+                other{"{0} ส่วนต่อล้าน"}
+            }
             permyriad{
                 dnam{"เปอร์มีเรียด"}
                 other{"{0} เปอร์มีเรียด"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ลิตรต่อ100 กิโลเมตร"}
                 other{"{0} ลิตรต่อ100 กิโลเมตร"}
             }
@@ -552,7 +552,7 @@ th{
                 dnam{"เฮกโตปาสกาล"}
                 other{"{0} เฮกโตปาสกาล"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"นิ้วปรอท"}
                 other{"{0} นิ้วปรอท"}
             }
@@ -568,7 +568,7 @@ th{
                 dnam{"มิลลิบาร์"}
                 other{"{0} มิลลิบาร์"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"มิลลิเมตรปรอท"}
                 other{"{0} มิลลิเมตรปรอท"}
             }
@@ -576,7 +576,7 @@ th{
                 dnam{"ปาสกาล"}
                 other{"{0} ปาสกาล"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ปอนด์ต่อตารางนิ้ว"}
                 other{"{0} ปอนด์ต่อตารางนิ้ว"}
             }
@@ -622,7 +622,7 @@ th{
                 dnam{"นิวตันเมตร"}
                 other{"{0} นิวตันเมตร"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"ปอนด์-ฟุต"}
                 other{"{0} ปอนด์-ฟุต"}
             }
@@ -780,7 +780,7 @@ th{
             per{"{0}/{1}"}
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ล. /100 กม."}
                 other{"{0} ล./100กม."}
             }
@@ -908,7 +908,7 @@ th{
                 dnam{"เฮกโตปาสกาล"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 other{"{0}\u0022 Hg"}
             }
             millibar{
@@ -955,7 +955,7 @@ th{
                 dnam{"แรง G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"เมตร/วินาที²"}
                 other{"{0} ม./วิ²"}
             }
@@ -1049,22 +1049,22 @@ th{
                 dnam{"โมล"}
                 other{"{0} โมล"}
             }
-            part-per-million{
-                dnam{"ส่วน/ล้าน"}
-                other{"{0} สตล."}
-            }
             percent{
                 dnam{"เปอร์เซ็นต์"}
             }
             permille{
                 dnam{"เปอร์มิลล์"}
             }
+            permillion{
+                dnam{"ส่วน/ล้าน"}
+                other{"{0} สตล."}
+            }
             permyriad{
                 dnam{"เปอร์มีเรียด"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"ล./100 กม."}
                 other{"{0} ล./100กม."}
             }
@@ -1456,7 +1456,7 @@ th{
                 dnam{"เฮกโตปาสกาล"}
                 other{"{0} เฮกโตปาสกาล"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"นิ้วปรอท"}
                 other{"{0} นิ้วปรอท"}
             }
@@ -1464,11 +1464,11 @@ th{
                 dnam{"มิลลิบาร์"}
                 other{"{0} มิลลิบาร์"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"มม. ปรอท"}
                 other{"{0} มม. ปรอท"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"ปอนด์/ตร.นิ้ว"}
                 other{"{0} ปอนด์/ตร.นิ้ว"}
             }
index 8bab7a4ec06717b4312aec9a0743d24ac2891208..51d2d78b0f73f747f107b6854650ccf2f0593f4d 100644 (file)
@@ -14,7 +14,7 @@ tk{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"inedördül sekuntda metr"}
                 one{"{0} metr/inedördül sekunt"}
                 other{"{0} metr/inedördül sekunt"}
@@ -128,11 +128,6 @@ tk{
                 one{"{0} mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"bölejik/million"}
-                one{"{0} bölejik/million"}
-                other{"{0} bölejik/million"}
-            }
             percent{
                 dnam{"göterim"}
                 one{"{0} göterim"}
@@ -143,6 +138,11 @@ tk{
                 one{"{0} promille"}
                 other{"{0} promille"}
             }
+            permillion{
+                dnam{"bölejik/million"}
+                one{"{0} bölejik/million"}
+                other{"{0} bölejik/million"}
+            }
             permyriad{
                 dnam{"permiriad"}
                 one{"{0} permiriad"}
@@ -150,7 +150,7 @@ tk{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litr/100 kilometr"}
                 one{"{0} litr/100 kilometr"}
                 other{"{0} litr/100 kilometr"}
@@ -677,7 +677,7 @@ tk{
                 one{"{0} gektopaskal"}
                 other{"{0} gektopaskal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"dýuým simap sütüni"}
                 one{"{0} dýuým simap sütüni"}
                 other{"{0} dýuým simap sütüni"}
@@ -697,7 +697,7 @@ tk{
                 one{"{0} millibar"}
                 other{"{0} millibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"millimetr simap sütüni"}
                 one{"{0} millimetr simap sütüni"}
                 other{"{0} millimetr simap sütüni"}
@@ -707,7 +707,7 @@ tk{
                 one{"{0} paskal"}
                 other{"{0} paskal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"funt/inedördül dýuým"}
                 one{"{0} funt/inedördül dýuým"}
                 other{"{0} funt/inedördül dýuým"}
@@ -763,7 +763,7 @@ tk{
                 one{"{0} nýuton-metr"}
                 other{"{0} nýuton-metr"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"funt-futlar"}
                 one{"{0} funt-fut"}
                 other{"{0} funt-fut"}
@@ -920,7 +920,7 @@ tk{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1038,7 +1038,7 @@ tk{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1153,11 +1153,6 @@ tk{
                 one{"{0} mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"bölejik/million"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"göterim"}
                 one{"{0}%"}
@@ -1168,6 +1163,11 @@ tk{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"bölejik/million"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"permiriad"}
                 one{"{0}‱"}
@@ -1175,7 +1175,7 @@ tk{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -1690,7 +1690,7 @@ tk{
                 one{"{0} gPa"}
                 other{"{0} gPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"dý sim.süt."}
                 one{"{0} dý sim.süt."}
                 other{"{0} dý sim.süt."}
@@ -1710,12 +1710,12 @@ tk{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm sim.süt."}
                 one{"{0} mm sim.süt."}
                 other{"{0} mm sim.süt."}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1771,7 +1771,7 @@ tk{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
index 5802936f2bd2bb4f83ade0729619cccc34652647..bfdbb3ce7e6a675b7e288c8a75788512008701b7 100644 (file)
@@ -13,7 +13,7 @@ to{
                 dnam{"k-mālohi"}
                 other{"k-mālohi ʻe {0}"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"mita he sekoni sikuea"}
                 other{"mita he sekoni sikuea ʻe {0}"}
             }
@@ -107,10 +107,6 @@ to{
                 dnam{"molo"}
                 other{"molo ʻe {0}"}
             }
-            part-per-million{
-                dnam{"konga he miliona"}
-                other{"konga ʻe {0} he miliona"}
-            }
             percent{
                 dnam{"peseti"}
                 other{"peseti ʻe {0}"}
@@ -119,13 +115,17 @@ to{
                 dnam{"pemili"}
                 other{"pemili ʻe {0}"}
             }
+            permillion{
+                dnam{"konga he miliona"}
+                other{"konga ʻe {0} he miliona"}
+            }
             permyriad{
                 dnam{"pemano"}
                 other{"pemano ʻe {0}"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"lita he kilomita ʻe 100"}
                 other{"lita ʻe {0} he kilomita ʻe 100"}
             }
@@ -568,7 +568,7 @@ to{
                 dnam{"hēkitopasikale"}
                 other{"hēkitopasikale ʻe {0}"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"ʻinisi meakuli"}
                 other{"ʻinisi meakuli ʻe {0}"}
             }
@@ -584,7 +584,7 @@ to{
                 dnam{"milipā"}
                 other{"milipā ʻe {0}"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimita meakuli"}
                 other{"milimita meakuli ʻe {0}"}
             }
@@ -592,7 +592,7 @@ to{
                 dnam{"pasikale"}
                 other{"pasikale ʻe {0}"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"pāuni he ʻinisi sikuea"}
                 other{"pāuni he ʻinisi sikuea ʻe {0}"}
             }
@@ -638,7 +638,7 @@ to{
                 dnam{"Niutonimita"}
                 other{"Niutonimita ʻe {0}"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"pāunifute"}
                 other{"pāunifute ʻe {0}"}
             }
@@ -765,7 +765,7 @@ to{
                 dnam{"k-mā"}
                 other{"{0} k-mā"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 other{"{0} m/s²"}
             }
@@ -844,7 +844,7 @@ to{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 other{"{0} l/100km"}
             }
@@ -1172,7 +1172,7 @@ to{
                 dnam{"hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"in-Hg"}
                 other{"{0} in-Hg"}
             }
@@ -1180,11 +1180,11 @@ to{
                 dnam{"mpā"}
                 other{"{0} mpā"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm-Hg"}
                 other{"{0} mm-Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"pā/in²"}
                 other{"{0} pā/in²"}
             }
@@ -1314,7 +1314,7 @@ to{
                 dnam{"k-mā"}
                 other{"k-mā ʻe {0}"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 other{"m/s² ʻe {0}"}
             }
@@ -1408,10 +1408,6 @@ to{
                 dnam{"mol"}
                 other{"mol ʻe {0}"}
             }
-            part-per-million{
-                dnam{"khm"}
-                other{"khm ʻe {0}"}
-            }
             percent{
                 dnam{"%"}
                 other{"% ʻe {0}"}
@@ -1420,12 +1416,16 @@ to{
                 dnam{"‰"}
                 other{"‰ ʻe {0}"}
             }
+            permillion{
+                dnam{"khm"}
+                other{"khm ʻe {0}"}
+            }
             permyriad{
                 other{"‱ ʻe {0}"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 other{"l ʻe {0}/100km"}
             }
@@ -1866,7 +1866,7 @@ to{
                 dnam{"hPa"}
                 other{"hPa ʻe {0}"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"in-Hg"}
                 other{"in-Hg ʻe {0}"}
             }
@@ -1880,14 +1880,14 @@ to{
                 dnam{"mpā"}
                 other{"mpā ʻe {0}"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm-Hg"}
                 other{"mm-Hg ʻe {0}"}
             }
             pascal{
                 other{"Pā ʻe {0}"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"pā/in²"}
                 other{"pā/in² ʻe {0}"}
             }
@@ -1932,7 +1932,7 @@ to{
             newton-meter{
                 other{"N⋅m ʻe {0}"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"pā⋅ft"}
                 other{"pā⋅ft ʻe {0}"}
             }
index e64e917501d194cb79c0981c530fc9c613da49d9..7918ba2e5f0772e21522310abdfd53cc0a0ae465 100644 (file)
@@ -14,7 +14,7 @@ tr{
                 one{"{0} g kuvveti"}
                 other{"{0} g kuvveti"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metre/saniye²"}
                 one{"{0} metre/saniye²"}
                 other{"{0} metre/saniye²"}
@@ -123,11 +123,6 @@ tr{
                 one{"{0} milimol/litre"}
                 other{"{0} milimol/litre"}
             }
-            part-per-million{
-                dnam{"parça/milyon"}
-                one{"{0} parça/milyon"}
-                other{"{0} parça/milyon"}
-            }
             percent{
                 dnam{"yüzde"}
                 one{"yüzde {0}"}
@@ -138,6 +133,11 @@ tr{
                 one{"binde {0}"}
                 other{"binde {0}"}
             }
+            permillion{
+                dnam{"parça/milyon"}
+                one{"{0} parça/milyon"}
+                other{"{0} parça/milyon"}
+            }
             permyriad{
                 dnam{"onbinde"}
                 one{"onbinde {0}"}
@@ -145,7 +145,7 @@ tr{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litre/100 kilometre"}
                 one{"{0} litre/100 kilometre"}
                 other{"{0} litre/100 kilometre"}
@@ -680,7 +680,7 @@ tr{
                 one{"{0} hektopaskal"}
                 other{"{0} hektopaskal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inç cıva"}
                 one{"{0} inç cıva"}
                 other{"{0} inç cıva"}
@@ -700,7 +700,7 @@ tr{
                 one{"{0} milibar"}
                 other{"{0} milibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimetre cıva"}
                 one{"{0} milimetre cıva"}
                 other{"{0} milimetre cıva"}
@@ -710,7 +710,7 @@ tr{
                 one{"{0} paskal"}
                 other{"{0} paskal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"libre/inç kare"}
                 one{"{0} libre/inç kare"}
                 other{"{0} libre/inç kare"}
@@ -766,7 +766,7 @@ tr{
                 one{"{0} newton metre"}
                 other{"{0} newton metre"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"pound fit"}
                 one{"{0} pound fit"}
                 other{"{0} pound fit"}
@@ -922,7 +922,7 @@ tr{
                 one{"{0}G"}
                 other{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/sn²"}
                 one{"{0} m/sn²"}
                 other{"{0} m/sn²"}
@@ -1020,11 +1020,6 @@ tr{
                 one{"{0} mmol/L"}
                 other{"{0} mmol/L"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 one{"%{0}"}
@@ -1035,9 +1030,14 @@ tr{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100km"}
                 one{"{0} l/100km"}
                 other{"{0} l/100km"}
@@ -1446,7 +1446,7 @@ tr{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0}\u0022 Hg"}
                 other{"{0}\u0022 Hg"}
@@ -1456,12 +1456,12 @@ tr{
                 one{"{0} mb"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"lb/in²"}
                 one{"{0} lb/in²"}
                 other{"{0} lb/in²"}
@@ -1612,7 +1612,7 @@ tr{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/sn²"}
                 one{"{0} m/sn²"}
                 other{"{0} m/sn²"}
@@ -1721,11 +1721,6 @@ tr{
                 one{"{0} mmol/l"}
                 other{"{0} mmol/l"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 one{"%{0}"}
@@ -1736,6 +1731,11 @@ tr{
                 one{"‰{0}"}
                 other{"‰{0}"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"onbinde"}
                 one{"‱{0}"}
@@ -1743,7 +1743,7 @@ tr{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"l/100 km"}
                 one{"{0} l/100 km"}
                 other{"{0} l/100 km"}
@@ -2249,7 +2249,7 @@ tr{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -2269,12 +2269,12 @@ tr{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"lb/in²"}
                 one{"{0} lb/in²"}
                 other{"{0} lb/in²"}
@@ -2330,7 +2330,7 @@ tr{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 one{"{0} lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
index 08ce427b34ced135a684edbabf211fdbfd4a1aba..450bceb63551fcb9127834d46bd7c3fcc66043c9 100644 (file)
@@ -157,7 +157,7 @@ ug{
                 one{"{0} يۈز پاسكال"}
                 other{"{0} يۈز پاسكال"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} ديۇيم سىماب تۈۋرۇكى"}
                 other{"{0} ديۇيم سىماب تۈۋرۇكى"}
             }
@@ -349,7 +349,7 @@ ug{
                 one{"{0}hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0}\u0022 Hg"}
                 other{"{0}\u0022 Hg"}
             }
@@ -552,7 +552,7 @@ ug{
                 one{"{0} ھېكتوپاسكال"}
                 other{"{0} ھېكتوپاسكال"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
index 4b67ef8884dc1fa6ce615edc9d6f6f200f06950a..4bc3cd088b16b3f7be203a6924086333b3586c2b 100644 (file)
@@ -16,7 +16,7 @@ uk{
                 one{"{0} сила тяжіння"}
                 other{"{0} сили тяжіння"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"метри на секунду в квадраті"}
                 few{"{0} метри на секунду в квадраті"}
                 many{"{0} метрів на секунду в квадраті"}
@@ -170,13 +170,6 @@ uk{
                 one{"{0} моль"}
                 other{"{0} моля"}
             }
-            part-per-million{
-                dnam{"мільйонні долі"}
-                few{"{0} мільйонні долі"}
-                many{"{0} мільйонних доль"}
-                one{"{0} мільйонна доля"}
-                other{"{0} мільйонної долі"}
-            }
             percent{
                 dnam{"відсоток"}
                 few{"{0} відсотки"}
@@ -191,6 +184,13 @@ uk{
                 one{"{0} проміле"}
                 other{"{0} проміле"}
             }
+            permillion{
+                dnam{"мільйонні долі"}
+                few{"{0} мільйонні долі"}
+                many{"{0} мільйонних доль"}
+                one{"{0} мільйонна доля"}
+                other{"{0} мільйонної долі"}
+            }
             permyriad{
                 dnam{"проміріада"}
                 few{"{0} проміріади"}
@@ -200,7 +200,7 @@ uk{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"літри на 100 кілометрів"}
                 few{"{0} літри на 100 кілометрів"}
                 many{"{0} літрів на 100 кілометрів"}
@@ -884,7 +884,7 @@ uk{
                 one{"{0} гектопаскаль"}
                 other{"{0} гектопаскаля"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"дюйми ртутного стовпа"}
                 few{"{0} дюйми ртутного стовпа"}
                 many{"{0} дюймів ртутного стовпа"}
@@ -912,7 +912,7 @@ uk{
                 one{"{0} мілібар"}
                 other{"{0} мілібара"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"міліметри ртутного стовпа"}
                 few{"{0} міліметри ртутного стовпа"}
                 many{"{0} міліметрів ртутного стовпа"}
@@ -926,7 +926,7 @@ uk{
                 one{"{0} паскаль"}
                 other{"{0} паскаля"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"фунти на квадратний дюйм"}
                 few{"{0} фунти на квадратний дюйм"}
                 many{"{0} фунтів на квадратний дюйм"}
@@ -1002,7 +1002,7 @@ uk{
                 one{"{0} ньютон-метр"}
                 other{"{0} ньютон-метра"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"фунт-фути"}
                 few{"{0} фунт-фути"}
                 many{"{0} фунт-футів"}
@@ -1216,7 +1216,7 @@ uk{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"м/с²"}
                 few{"{0}м/с²"}
                 many{"{0}м/с²"}
@@ -1311,7 +1311,7 @@ uk{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"л/100 км"}
                 few{"{0} л/100 км"}
                 many{"{0} л/100 км"}
@@ -1693,14 +1693,14 @@ uk{
                 one{"{0} мбар"}
                 other{"{0} мбара"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"ммрс"}
                 few{"{0}ммрс"}
                 many{"{0}ммрс"}
                 one{"{0}ммрс"}
                 other{"{0}ммрс"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 few{"{0}psi"}
                 many{"{0}psi"}
                 one{"{0}psi"}
@@ -1772,7 +1772,7 @@ uk{
                 one{"{0}Н·м"}
                 other{"{0}Н·м"}
             }
-            pound-foot{
+            pound-force-foot{
                 few{"{0}фн-фт"}
                 many{"{0}фн-фт"}
                 one{"{0}фн-фт"}
@@ -1831,7 +1831,7 @@ uk{
                 one{"{0} g"}
                 other{"{0} g"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"метри/с²"}
                 few{"{0} м/с²"}
                 many{"{0} м/с²"}
@@ -1986,13 +1986,6 @@ uk{
                 one{"{0} моль"}
                 other{"{0} моль"}
             }
-            part-per-million{
-                dnam{"мільйонні долі"}
-                few{"{0} ppm"}
-                many{"{0} ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"відсоток"}
                 few{"{0}%"}
@@ -2007,12 +2000,19 @@ uk{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"мільйонні долі"}
+                few{"{0} ppm"}
+                many{"{0} ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"проміріада"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"л/100 км"}
                 few{"{0} л/100 км"}
                 many{"{0} л/100 км"}
@@ -2715,7 +2715,7 @@ uk{
                 one{"{0} гПа"}
                 other{"{0} гПа"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"дюйми рт. ст."}
                 few{"{0} дюйми рт. ст."}
                 many{"{0} дюймів рт. ст."}
@@ -2743,7 +2743,7 @@ uk{
                 one{"{0} мбар"}
                 other{"{0} мбара"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"мм рт. ст."}
                 few{"{0} мм рт. ст."}
                 many{"{0} мм рт. ст."}
@@ -2757,7 +2757,7 @@ uk{
                 one{"{0} Па"}
                 other{"{0} Па"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"фунт/дюйм²"}
                 few{"{0} фунти/дюйм²"}
                 many{"{0} фунтів/дюйм²"}
@@ -2833,7 +2833,7 @@ uk{
                 one{"{0} Н·м"}
                 other{"{0} Н·м"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"фунт-фут"}
                 few{"{0} фнт-фт"}
                 many{"{0} фнт-фт"}
index f6f7235bc9aedb3d5a47cfe84fcca09cbd29e267..cc4eaef21a0b03c518b1a8fb069f13ff1f287b3f 100644 (file)
@@ -14,7 +14,7 @@ ur{
                 one{"{0} جی-فورس"}
                 other{"{0} جی-فورس"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"میٹر فی مربع سیکنڈ"}
                 one{"{0} میٹر فی مربع سیکنڈ"}
                 other{"{0} میٹر فی مربع سیکنڈ"}
@@ -128,11 +128,6 @@ ur{
                 one{"{0} مول"}
                 other{"{0} مولز"}
             }
-            part-per-million{
-                dnam{"فی ملین حصے"}
-                one{"{0} فی ملین حصے"}
-                other{"{0} فی ملین حصے"}
-            }
             percent{
                 dnam{"فیصد"}
                 one{"{0} فیصد"}
@@ -143,6 +138,11 @@ ur{
                 one{"{0} فی ہزار"}
                 other{"{0} فی ہزار"}
             }
+            permillion{
+                dnam{"فی ملین حصے"}
+                one{"{0} فی ملین حصے"}
+                other{"{0} فی ملین حصے"}
+            }
             permyriad{
                 dnam{"پرمرئیڈ"}
                 one{"{0} پرمرئیڈ"}
@@ -150,7 +150,7 @@ ur{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"لیٹر فی 100 کلو میٹر"}
                 one{"{0} لیٹر فی 100 کلو میٹر"}
                 other{"{0} لیٹر فی 100 کلو میٹر"}
@@ -682,7 +682,7 @@ ur{
                 one{"{0} ہیکٹو پاسکل"}
                 other{"{0} ہیکٹو پاسکل"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"انچ مرکری"}
                 one{"{0} انچ مرکری"}
                 other{"{0} انچ مرکری"}
@@ -702,7 +702,7 @@ ur{
                 one{"{0} ملی بار"}
                 other{"{0} ملی بار"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"ملی میٹر مرکری"}
                 one{"{0} ملی میٹر مرکری"}
                 other{"{0} ملی میٹر مرکری"}
@@ -712,7 +712,7 @@ ur{
                 one{"{0} پاسکل"}
                 other{"{0} پاسکل"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"پاؤنڈز فی مربع انچ"}
                 one{"{0} پاؤنڈ فی مربع انچ"}
                 other{"{0} پاؤنڈز فی مربع انچ"}
@@ -768,7 +768,7 @@ ur{
                 one{"{0} نیوٹن میٹر"}
                 other{"{0} نیوٹن میٹر"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"پاؤنڈ فٹ"}
                 one{"{0} پاؤنڈ فٹ"}
                 other{"{0} پاؤنڈ فٹ"}
@@ -970,7 +970,7 @@ ur{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"لیٹر/100 کلو میٹر"}
                 one{"{0}L/100km"}
                 other{"{0}L/100km"}
@@ -1138,7 +1138,7 @@ ur{
                 one{"{0}hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"″ Hg"}
                 one{"{0} انچ مرکری"}
                 other{"{0} انچ مرکری"}
@@ -1148,12 +1148,12 @@ ur{
                 one{"{0}mb"}
                 other{"{0}mb"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -1222,7 +1222,7 @@ ur{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1336,11 +1336,6 @@ ur{
                 one{"{0} مول"}
                 other{"{0} مول"}
             }
-            part-per-million{
-                dnam{"حصے/ملین"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"فیصد"}
                 one{"{0}%"}
@@ -1351,12 +1346,17 @@ ur{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"حصے/ملین"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"پرمرئیڈ"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"لیٹر/100 کلو میٹر"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -1847,7 +1847,7 @@ ur{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1867,12 +1867,12 @@ ur{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
index 7f7bc4124d1f74791f57ace3757a4252305f3492..e1511bb2e795a0b2ac9d919de2ef77fa5f8662c7 100644 (file)
@@ -14,7 +14,7 @@ uz{
                 one{"{0} grav. kuchi"}
                 other{"{0} grav. kuchi"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metr/soniya kvadrat"}
                 one{"{0} metr/soniya kvadrat"}
                 other{"{0} metr/soniya kvadrat"}
@@ -118,11 +118,6 @@ uz{
                 one{"{0} millimol/litr"}
                 other{"{0} millimol/litr"}
             }
-            part-per-million{
-                dnam{"millionning ulushi"}
-                one{"milliondan {0}"}
-                other{"milliondan {0}"}
-            }
             percent{
                 dnam{"foiz"}
                 one{"{0} foiz"}
@@ -133,6 +128,11 @@ uz{
                 one{"{0} promille"}
                 other{"{0} promille"}
             }
+            permillion{
+                dnam{"millionning ulushi"}
+                one{"milliondan {0}"}
+                other{"milliondan {0}"}
+            }
             permyriad{
                 dnam{"promiriada"}
                 one{"{0} promiriada"}
@@ -140,7 +140,7 @@ uz{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"litr/100 km"}
                 one{"{0} litr/100 km"}
                 other{"{0} litr/100 km"}
@@ -660,7 +660,7 @@ uz{
                 one{"{0} gektopaskal"}
                 other{"{0} gektopaskal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"duym simob ustuni"}
                 one{"{0} duym simob ustuni"}
                 other{"{0} duym simob ustuni"}
@@ -680,7 +680,7 @@ uz{
                 one{"{0} millibar"}
                 other{"{0} millibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm simob ustuni"}
                 one{"{0} mm simob ustuni"}
                 other{"{0} mm simob ustuni"}
@@ -690,7 +690,7 @@ uz{
                 one{"{0} paskal"}
                 other{"{0} paskal"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"funt/kvadrat duym"}
                 one{"{0} funt/kvadrat duym"}
                 other{"{0} funt/kvadrat duym"}
@@ -746,7 +746,7 @@ uz{
                 one{"{0} nyuton-metr"}
                 other{"{0} nyuton-metr"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"funt-fut"}
                 one{"{0} funt-fut"}
                 other{"{0} funt-fut"}
@@ -948,7 +948,7 @@ uz{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100 km"}
                 one{"{0}L/100km"}
                 other{"{0}L/100km"}
@@ -1088,7 +1088,7 @@ uz{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -1146,7 +1146,7 @@ uz{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"metr/soniya²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1261,11 +1261,6 @@ uz{
                 one{"{0} mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"foiz"}
                 one{"{0}%"}
@@ -1276,6 +1271,11 @@ uz{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
             permyriad{
                 dnam{"promiriada"}
                 one{"{0}‱"}
@@ -1283,7 +1283,7 @@ uz{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100 km"}
                 one{"{0} L/100 km"}
                 other{"{0} L/100 km"}
@@ -1810,7 +1810,7 @@ uz{
                 one{"{0} gPa"}
                 other{"{0} gPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"dy sim.ust"}
                 one{"{0} dy sim.ust"}
                 other{"{0} dy sim.ust"}
@@ -1830,7 +1830,7 @@ uz{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm sim.ust"}
                 one{"{0} mm sim.ust"}
                 other{"{0} mm sim.ust"}
@@ -1840,7 +1840,7 @@ uz{
                 one{"{0} Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"funt/kv.dy"}
                 one{"{0} funt/kv.dy"}
                 other{"{0} funt/kv.dy"}
@@ -1896,7 +1896,7 @@ uz{
                 one{"{0} N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"funt-fut"}
                 one{"{0} funt-fut"}
                 other{"{0} funt-fut"}
index 13c815300510424ca4d8103549b1d4ea876c102e..7b5673d139c4239a96d50870ff2d7a7a0e75f512 100644 (file)
@@ -171,7 +171,7 @@ uz_Cyrl{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -382,7 +382,7 @@ uz_Cyrl{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
@@ -593,7 +593,7 @@ uz_Cyrl{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
index 067ea080681e0b2ecd19b11d6dce5f1033531342..1943b390682002f830f14d5d97adec073b864711 100644 (file)
@@ -97,7 +97,7 @@ vi{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"lít/100km"}
                 other{"{0} l/100km"}
             }
@@ -485,7 +485,7 @@ vi{
                 dnam{"héctô pascal"}
                 other{"{0} héctô pascal"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inch thủy ngân"}
                 other{"{0} inch thủy ngân"}
             }
@@ -493,11 +493,11 @@ vi{
                 dnam{"millibar"}
                 other{"{0} millibar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"milimét thủy ngân"}
                 other{"{0} milimét thủy ngân"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"pound/inch vuông"}
                 other{"{0} pound/inch vuông"}
             }
@@ -539,7 +539,7 @@ vi{
                 dnam{"newton-mét"}
                 other{"{0} newton-mét"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"pound-feet"}
                 other{"{0} pound-feet"}
             }
@@ -671,7 +671,7 @@ vi{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 other{"{0}L/100km"}
             }
@@ -784,7 +784,7 @@ vi{
             hectopascal{
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 other{"{0}\u0022 Hg"}
             }
             millibar{
@@ -1147,17 +1147,17 @@ vi{
             hectopascal{
                 dnam{"hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
             }
             millibar{
                 dnam{"mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
             }
         }
@@ -1176,7 +1176,7 @@ vi{
                 dnam{"N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
             }
index 7bc1dec5e93bce468bc406029f79530496522f96..a755d4e4f6a7c74fa4d25d468bfc854623b324a1 100644 (file)
@@ -13,7 +13,7 @@ yue{
                 dnam{"G 力"}
                 other{"{0} G 力"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"米/平方秒"}
                 other{"每平方秒 {0} 米"}
             }
@@ -107,10 +107,6 @@ yue{
                 dnam{"摩爾"}
                 other{"{0} 摩爾"}
             }
-            part-per-million{
-                dnam{"百萬分率"}
-                other{"{0} 百萬分率"}
-            }
             percent{
                 dnam{"%"}
                 other{"{0}%"}
@@ -119,13 +115,17 @@ yue{
                 dnam{"‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"百萬分率"}
+                other{"{0} 百萬分率"}
+            }
             permyriad{
                 dnam{"點子"}
                 other{"{0} 點子"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"公升/100 公里"}
                 other{"{0} 公升/100 公里"}
             }
@@ -568,7 +568,7 @@ yue{
                 dnam{"百帕"}
                 other{"{0} 百帕"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"英吋汞柱"}
                 other{"{0} 英吋汞柱"}
             }
@@ -584,7 +584,7 @@ yue{
                 dnam{"毫巴"}
                 other{"{0} 毫巴"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"毫米汞柱"}
                 other{"{0} 毫米汞柱"}
             }
@@ -592,7 +592,7 @@ yue{
                 dnam{"帕斯卡"}
                 other{"{0} 帕斯卡"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"磅力/平方英吋"}
                 other{"每平方吋 {0} 磅"}
             }
@@ -638,7 +638,7 @@ yue{
                 dnam{"牛頓米"}
                 other{"{0} 牛頓米"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"尺磅"}
                 other{"{0} 尺磅"}
             }
@@ -764,7 +764,7 @@ yue{
             g-force{
                 other{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 other{"{0}m/s²"}
             }
         }
@@ -824,7 +824,7 @@ yue{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"公升/100 公里"}
                 other{"{0}L/100km"}
             }
@@ -1091,16 +1091,16 @@ yue{
             hectopascal{
                 other{"{0}百帕"}
             }
-            inch-hg{
+            inch-ofhg{
                 other{"{0}″ Hg"}
             }
             millibar{
                 other{"{0}毫巴"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 other{"{0}mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 other{"{0}psi"}
             }
         }
@@ -1206,7 +1206,7 @@ yue{
                 dnam{"G 力"}
                 other{"{0} G 力"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"米/平方秒"}
                 other{"每平方秒{0}米"}
             }
@@ -1300,10 +1300,6 @@ yue{
                 dnam{"摩爾"}
                 other{"{0} 摩爾"}
             }
-            part-per-million{
-                dnam{"百萬分率"}
-                other{"{0} 百萬分率"}
-            }
             percent{
                 dnam{"%"}
                 other{"{0}%"}
@@ -1312,13 +1308,17 @@ yue{
                 dnam{"‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"百萬分率"}
+                other{"{0} 百萬分率"}
+            }
             permyriad{
                 dnam{"點子"}
                 other{"{0} 點子"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"公升/100 公里"}
                 other{"{0} 公升/100 公里"}
             }
@@ -1761,7 +1761,7 @@ yue{
                 dnam{"百帕"}
                 other{"{0} 百帕"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"英吋汞柱"}
                 other{"{0} 英吋汞柱"}
             }
@@ -1777,7 +1777,7 @@ yue{
                 dnam{"毫巴"}
                 other{"{0} 毫巴"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"毫米汞柱"}
                 other{"{0} 毫米汞柱"}
             }
@@ -1785,7 +1785,7 @@ yue{
                 dnam{"帕斯卡"}
                 other{"{0} 帕斯卡"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"磅力/平方英吋"}
                 other{"每平方吋{0}磅"}
             }
@@ -1831,7 +1831,7 @@ yue{
                 dnam{"牛頓米"}
                 other{"{0} 牛頓米"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"尺磅"}
                 other{"{0} 尺磅"}
             }
index c471e78c019946ad7a4e4970b4096fb557d7542a..163e4f7962df282aacd4f7380220646b5ed2a94d 100644 (file)
@@ -14,7 +14,7 @@ yue_Hans{
                 dnam{"G 力"}
                 other{"{0} G 力"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"每平方秒公尺"}
                 other{"每平方秒 {0} 米"}
             }
@@ -108,10 +108,6 @@ yue_Hans{
                 dnam{"摩尔"}
                 other{"{0} 摩尔"}
             }
-            part-per-million{
-                dnam{"百万分率"}
-                other{"{0} 百万分率"}
-            }
             percent{
                 dnam{"%"}
                 other{"{0}%"}
@@ -120,13 +116,17 @@ yue_Hans{
                 dnam{"‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"百万分率"}
+                other{"{0} 百万分率"}
+            }
             permyriad{
                 dnam{"点子"}
                 other{"{0} 点子"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"每 100 公里公升"}
                 other{"每 100 公里 {0} 公升"}
             }
@@ -569,7 +569,7 @@ yue_Hans{
                 dnam{"百帕"}
                 other{"{0} 百帕"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"英寸汞柱"}
                 other{"{0} 英寸汞柱"}
             }
@@ -585,7 +585,7 @@ yue_Hans{
                 dnam{"毫巴"}
                 other{"{0} 毫巴"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"毫米汞柱"}
                 other{"{0} 毫米汞柱"}
             }
@@ -593,7 +593,7 @@ yue_Hans{
                 dnam{"帕斯卡"}
                 other{"{0} 帕斯卡"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"每平方英寸磅力"}
                 other{"每平方吋 {0} 磅"}
             }
@@ -639,7 +639,7 @@ yue_Hans{
                 dnam{"牛顿米"}
                 other{"{0} 牛顿米"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"尺磅"}
                 other{"{0} 尺磅"}
             }
@@ -765,7 +765,7 @@ yue_Hans{
             g-force{
                 other{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 other{"{0}m/s²"}
             }
         }
@@ -825,7 +825,7 @@ yue_Hans{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"升/100公里"}
                 other{"每100公里{0}升"}
             }
@@ -1092,16 +1092,16 @@ yue_Hans{
             hectopascal{
                 other{"{0}百帕"}
             }
-            inch-hg{
+            inch-ofhg{
                 other{"{0}″ Hg"}
             }
             millibar{
                 other{"{0}毫巴"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 other{"{0}mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 other{"{0}psi"}
             }
         }
@@ -1207,7 +1207,7 @@ yue_Hans{
                 dnam{"G 力"}
                 other{"{0} G 力"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"公尺/平方秒"}
                 other{"每平方秒{0}米"}
             }
@@ -1301,10 +1301,6 @@ yue_Hans{
                 dnam{"摩尔"}
                 other{"{0} 摩尔"}
             }
-            part-per-million{
-                dnam{"百万分率"}
-                other{"{0} 百万分率"}
-            }
             percent{
                 dnam{"%"}
                 other{"{0}%"}
@@ -1313,13 +1309,17 @@ yue_Hans{
                 dnam{"‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"百万分率"}
+                other{"{0} 百万分率"}
+            }
             permyriad{
                 dnam{"点子"}
                 other{"{0} 点子"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"升/100 公里"}
                 other{"每100公里 {0} 升"}
             }
@@ -1762,7 +1762,7 @@ yue_Hans{
                 dnam{"百帕"}
                 other{"{0} 百帕"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"英寸汞柱"}
                 other{"{0} 英寸汞柱"}
             }
@@ -1778,7 +1778,7 @@ yue_Hans{
                 dnam{"毫巴"}
                 other{"{0} 毫巴"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"毫米汞柱"}
                 other{"{0} 毫米汞柱"}
             }
@@ -1786,7 +1786,7 @@ yue_Hans{
                 dnam{"帕斯卡"}
                 other{"{0} 帕斯卡"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"磅力/平方英寸"}
                 other{"每平方吋{0}磅"}
             }
@@ -1832,7 +1832,7 @@ yue_Hans{
                 dnam{"牛顿米"}
                 other{"{0} 牛顿米"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"尺磅"}
                 other{"{0} 尺磅"}
             }
index 1dd405bfe760a9b19fd6a6a4b9a1d2d22b0d2afc..7399c30ea9c4b886340b971b485f25d2351173e1 100644 (file)
@@ -13,7 +13,7 @@ zh{
                 dnam{"G力"}
                 other{"{0}G力"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"米/秒²"}
                 other{"每平方秒{0}米"}
             }
@@ -108,10 +108,6 @@ zh{
                 dnam{"摩尔"}
                 other{"{0}摩尔"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                other{"百万分之{0}"}
-            }
             percent{
                 dnam{"%"}
                 other{"{0}%"}
@@ -120,9 +116,13 @@ zh{
                 dnam{"‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                other{"百万分之{0}"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"升/100千米"}
                 other{"{0}升/100千米"}
             }
@@ -565,7 +565,7 @@ zh{
                 dnam{"百帕斯卡"}
                 other{"{0}百帕斯卡"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"英寸汞柱"}
                 other{"{0}英寸汞柱"}
             }
@@ -581,7 +581,7 @@ zh{
                 dnam{"毫巴"}
                 other{"{0}毫巴"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"毫米汞柱"}
                 other{"{0}毫米汞柱"}
             }
@@ -589,7 +589,7 @@ zh{
                 dnam{"帕斯卡"}
                 other{"{0}帕斯卡"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"磅/平方英寸"}
                 other{"每平方英寸{0}磅"}
             }
@@ -635,7 +635,7 @@ zh{
                 dnam{"牛顿米"}
                 other{"{0}牛顿米"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"磅英尺"}
                 other{"{0}磅英尺"}
             }
@@ -762,7 +762,7 @@ zh{
                 dnam{"G力"}
                 other{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"米/秒²"}
                 other{"{0}米/秒²"}
             }
@@ -832,7 +832,7 @@ zh{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"升/100千米"}
                 other{"{0}L/100km"}
             }
@@ -1037,7 +1037,7 @@ zh{
             hectopascal{
                 other{"{0}hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 other{"{0}\u0022 Hg"}
             }
             millibar{
@@ -1185,7 +1185,7 @@ zh{
                 dnam{"G力"}
                 other{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"米/秒²"}
                 other{"{0}米/秒²"}
             }
@@ -1280,10 +1280,6 @@ zh{
                 dnam{"摩尔"}
                 other{"{0}摩尔"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                other{"{0}ppm"}
-            }
             percent{
                 dnam{"%"}
                 other{"{0}%"}
@@ -1292,9 +1288,13 @@ zh{
                 dnam{"‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                other{"{0}ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"升/100千米"}
                 other{"{0}升/100千米"}
             }
@@ -1707,7 +1707,7 @@ zh{
                 dnam{"百帕"}
                 other{"{0}百帕"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"英寸汞柱"}
                 other{"{0}英寸汞柱"}
             }
@@ -1723,7 +1723,7 @@ zh{
                 dnam{"毫巴"}
                 other{"{0}毫巴"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"毫米汞柱"}
                 other{"{0}毫米汞柱"}
             }
@@ -1731,7 +1731,7 @@ zh{
                 dnam{"帕"}
                 other{"{0}帕"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"磅/平方英寸"}
                 other{"每平方英寸{0}磅"}
             }
@@ -1777,7 +1777,7 @@ zh{
                 dnam{"牛米"}
                 other{"{0}牛米"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"磅英尺"}
                 other{"{0}磅英尺"}
             }
index 60c1a59639a4cd4294d0c7c1059446cad694ccf8..c50931f730db15079adaf87161e6896a9c1cf731 100644 (file)
@@ -14,7 +14,7 @@ zh_Hant{
                 dnam{"G 力"}
                 other{"{0} G 力"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"每平方秒公尺"}
                 other{"每平方秒 {0} 公尺"}
             }
@@ -108,10 +108,6 @@ zh_Hant{
                 dnam{"莫耳"}
                 other{"{0} 莫耳"}
             }
-            part-per-million{
-                dnam{"百萬分率"}
-                other{"{0} 百萬分率"}
-            }
             percent{
                 dnam{"百分比"}
                 other{"{0}%"}
@@ -120,9 +116,13 @@ zh_Hant{
                 dnam{"千分比"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"百萬分率"}
+                other{"{0} 百萬分率"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"每 100 公里公升"}
                 other{"每 100 公里 {0} 公升"}
             }
@@ -545,7 +545,7 @@ zh_Hant{
                 dnam{"百帕"}
                 other{"{0} 百帕"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"英寸汞柱"}
                 other{"{0} 英寸汞柱"}
             }
@@ -561,7 +561,7 @@ zh_Hant{
                 dnam{"毫巴"}
                 other{"{0} 毫巴"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"毫米汞柱"}
                 other{"{0} 毫米汞柱"}
             }
@@ -569,7 +569,7 @@ zh_Hant{
                 dnam{"帕斯卡"}
                 other{"{0} 帕斯卡"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"每平方英寸磅力"}
                 other{"每平方英寸 {0} 磅力"}
             }
@@ -615,7 +615,7 @@ zh_Hant{
                 dnam{"牛頓米"}
                 other{"{0} 牛頓米"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"磅英尺"}
                 other{"{0} 磅英尺"}
             }
@@ -742,7 +742,7 @@ zh_Hant{
                 dnam{"G 力"}
                 other{"{0}G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"公尺/平方秒"}
                 other{"{0}m/s²"}
             }
@@ -823,17 +823,17 @@ zh_Hant{
                 dnam{"毫莫耳/公升"}
                 other{"{0}mmol/L"}
             }
-            part-per-million{
-                dnam{"百萬分率"}
-                other{"{0}ppm"}
-            }
             percent{
                 dnam{"百分比"}
                 other{"{0}%"}
             }
+            permillion{
+                dnam{"百萬分率"}
+                other{"{0}ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"升/100公里"}
                 other{"{0}升/100公里"}
             }
@@ -1184,7 +1184,7 @@ zh_Hant{
                 dnam{"百帕"}
                 other{"{0}百帕"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"英寸汞柱"}
                 other{"{0}英吋汞柱"}
             }
@@ -1192,11 +1192,11 @@ zh_Hant{
                 dnam{"毫巴"}
                 other{"{0}毫巴"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"毫米汞柱"}
                 other{"{0}mmHg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"磅力/平方英寸"}
                 other{"{0}psi"}
             }
@@ -1348,7 +1348,7 @@ zh_Hant{
                 dnam{"G 力"}
                 other{"{0} G 力"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"公尺/平方秒"}
                 other{"{0} 公尺/平方秒"}
             }
@@ -1442,10 +1442,6 @@ zh_Hant{
                 dnam{"mol"}
                 other{"{0} mol"}
             }
-            part-per-million{
-                dnam{"百萬分率"}
-                other{"{0} 百萬分率"}
-            }
             percent{
                 dnam{"百分比"}
                 other{"{0}%"}
@@ -1454,13 +1450,17 @@ zh_Hant{
                 dnam{"千分比"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"百萬分率"}
+                other{"{0} 百萬分率"}
+            }
             permyriad{
                 dnam{"‱"}
                 other{"{0}‱"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"升/100 公里"}
                 other{"{0} 升/100 公里"}
             }
@@ -1869,7 +1869,7 @@ zh_Hant{
                 dnam{"百帕"}
                 other{"{0} 百帕"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"英寸汞柱"}
                 other{"{0} 英寸汞柱"}
             }
@@ -1885,7 +1885,7 @@ zh_Hant{
                 dnam{"毫巴"}
                 other{"{0} 毫巴"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"毫米汞柱"}
                 other{"{0} 毫米汞柱"}
             }
@@ -1893,7 +1893,7 @@ zh_Hant{
                 dnam{"Pa"}
                 other{"{0} Pa"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"磅力/平方英寸"}
                 other{"{0} 磅力/平方英寸"}
             }
@@ -1939,7 +1939,7 @@ zh_Hant{
                 dnam{"N⋅m"}
                 other{"{0} N⋅m"}
             }
-            pound-foot{
+            pound-force-foot{
                 dnam{"lbf⋅ft"}
                 other{"{0} lbf⋅ft"}
             }
index ff94a81aafcff178bbf92b997cc89a1aec4e6ddc..ae31d3a7277a40c1eb3e24a24447e388603a1dcf 100644 (file)
@@ -4,7 +4,7 @@ zh_Hant_HK{
     Version{"37"}
     units{
         acceleration{
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"米/平方秒"}
                 other{"{0} 米/平方秒"}
             }
@@ -53,12 +53,12 @@ zh_Hant_HK{
                 dnam{"每公升毫摩爾"}
                 other{"每公升 {0} 毫摩爾"}
             }
-            part-per-million{
+            permillion{
                 other{"{0} ppm"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"公升/100公里"}
             }
             liter-per-kilometer{
@@ -221,7 +221,7 @@ zh_Hant_HK{
                 dnam{"百帕斯卡"}
                 other{"{0} 百帕斯卡"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"英吋汞柱"}
                 other{"{0} 英吋汞柱"}
             }
@@ -229,7 +229,7 @@ zh_Hant_HK{
                 dnam{"兆帕斯卡"}
                 other{"{0} 兆帕斯卡"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"磅/平方吋"}
                 other{"{0} 磅/平方吋"}
             }
@@ -259,7 +259,7 @@ zh_Hant_HK{
             }
         }
         torque{
-            pound-foot{
+            pound-force-foot{
                 dnam{"磅尺"}
                 other{"{0} 磅尺"}
             }
@@ -315,7 +315,7 @@ zh_Hant_HK{
     }
     unitsNarrow{
         acceleration{
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"米每平方秒"}
             }
         }
@@ -357,12 +357,12 @@ zh_Hant_HK{
             millimole-per-liter{
                 dnam{"毫摩爾/公升"}
             }
-            part-per-million{
+            permillion{
                 other{"{0} ppm"}
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 other{"{0}L/100km"}
             }
         }
@@ -488,11 +488,11 @@ zh_Hant_HK{
             }
         }
         pressure{
-            inch-hg{
+            inch-ofhg{
                 dnam{"英吋汞柱"}
                 other{"{0}″ Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"磅每平方吋"}
             }
         }
@@ -554,7 +554,7 @@ zh_Hant_HK{
             g-force{
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"米每平方秒"}
                 other{"{0} 米每平方秒"}
             }
@@ -610,7 +610,7 @@ zh_Hant_HK{
                 dnam{"毫摩爾/公升"}
                 other{"{0} 毫摩爾/公升"}
             }
-            part-per-million{
+            permillion{
                 other{"{0} ppm"}
             }
         }
@@ -778,7 +778,7 @@ zh_Hant_HK{
             }
         }
         pressure{
-            inch-hg{
+            inch-ofhg{
                 dnam{"英吋汞柱"}
                 other{"{0} 英吋汞柱"}
             }
@@ -786,7 +786,7 @@ zh_Hant_HK{
                 dnam{"帕"}
                 other{"{0} 帕"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"磅每平方吋"}
                 other{"{0} 磅每平方吋"}
             }
index 75577551f91339e1a466617fb91040b882f65257..cd65d28be93d28ee349c20cbce421e15d372954a 100644 (file)
@@ -14,7 +14,7 @@ zu{
                 one{"{0} g-force"}
                 other{"{0} g-force"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -118,11 +118,6 @@ zu{
                 one{"{0} mmol/L"}
                 other{"{0} mmol/L"}
             }
-            part-per-million{
-                dnam{"ppm"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0}%"}
@@ -133,9 +128,14 @@ zu{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"ppm"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -573,7 +573,7 @@ zu{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -583,12 +583,12 @@ zu{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
@@ -798,7 +798,7 @@ zu{
             }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0}L/100km"}
                 other{"{0}L/100km"}
@@ -920,7 +920,7 @@ zu{
                 one{"{0} G"}
                 other{"{0} G"}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{"m/s²"}
                 one{"{0} m/s²"}
                 other{"{0} m/s²"}
@@ -1027,11 +1027,6 @@ zu{
                 one{"{0} mmol/L"}
                 other{"{0} mmol/L"}
             }
-            part-per-million{
-                dnam{"izingxenye/izigidi"}
-                one{"{0} ppm"}
-                other{"{0} ppm"}
-            }
             percent{
                 dnam{"%"}
                 one{"{0}%"}
@@ -1042,9 +1037,14 @@ zu{
                 one{"{0}‰"}
                 other{"{0}‰"}
             }
+            permillion{
+                dnam{"izingxenye/izigidi"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
         }
         consumption{
-            liter-per-100kilometers{
+            liter-per-100-kilometer{
                 dnam{"L/100km"}
                 one{"{0} L/100km"}
                 other{"{0} L/100km"}
@@ -1471,7 +1471,7 @@ zu{
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{"inHg"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
@@ -1481,12 +1481,12 @@ zu{
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{"mm Hg"}
                 one{"{0} mm Hg"}
                 other{"{0} mm Hg"}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
                 other{"{0} psi"}
diff --git a/icu4c/source/data/zone/ms_ID.txt b/icu4c/source/data/zone/ms_ID.txt
new file mode 100644 (file)
index 0000000..51068c2
--- /dev/null
@@ -0,0 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+ms_ID{
+    Version{"37"}
+    zoneStrings{
+        hourFormat{"+HH.mm;-HH.mm"}
+    }
+}
index 66ddd0a1d54663c66079332569c60d9233be0106..5ce9f5423c53d2a285c9e603fc60bfe65749e0c1 100644 (file)
@@ -118,7 +118,7 @@ static const char * const gTypes[] = {
 // Must be grouped by type and sorted alphabetically within each type.
 static const char * const gSubTypes[] = {
     "g-force",
-    "meter-per-second-squared",
+    "meter-per-square-second",
     "arc-minute",
     "arc-second",
     "degree",
@@ -138,11 +138,11 @@ static const char * const gSubTypes[] = {
     "milligram-per-deciliter",
     "millimole-per-liter",
     "mole",
-    "part-per-million",
     "percent",
     "permille",
+    "permillion",
     "permyriad",
-    "liter-per-100kilometers",
+    "liter-per-100-kilometer",
     "liter-per-kilometer",
     "mile-per-gallon",
     "mile-per-gallon-imperial",
@@ -547,13 +547,13 @@ static const char * const gSubTypes[] = {
     "atmosphere",
     "bar",
     "hectopascal",
-    "inch-hg",
+    "inch-ofhg",
     "kilopascal",
     "megapascal",
     "millibar",
-    "millimeter-of-mercury",
+    "millimeter-ofhg",
     "pascal",
-    "pound-per-square-inch",
+    "pound-force-per-square-inch",
     "kilometer-per-hour",
     "knot",
     "meter-per-second",
@@ -563,7 +563,7 @@ static const char * const gSubTypes[] = {
     "generic",
     "kelvin",
     "newton-meter",
-    "pound-foot",
+    "pound-force-foot",
     "acre-foot",
     "barrel",
     "bushel",
@@ -780,27 +780,27 @@ MeasureUnit MeasureUnit::getMole() {
 }
 
 MeasureUnit *MeasureUnit::createPartPerMillion(UErrorCode &status) {
-    return MeasureUnit::create(3, 4, status);
+    return MeasureUnit::create(3, 6, status);
 }
 
 MeasureUnit MeasureUnit::getPartPerMillion() {
-    return MeasureUnit(3, 4);
+    return MeasureUnit(3, 6);
 }
 
 MeasureUnit *MeasureUnit::createPercent(UErrorCode &status) {
-    return MeasureUnit::create(3, 5, status);
+    return MeasureUnit::create(3, 4, status);
 }
 
 MeasureUnit MeasureUnit::getPercent() {
-    return MeasureUnit(3, 5);
+    return MeasureUnit(3, 4);
 }
 
 MeasureUnit *MeasureUnit::createPermille(UErrorCode &status) {
-    return MeasureUnit::create(3, 6, status);
+    return MeasureUnit::create(3, 5, status);
 }
 
 MeasureUnit MeasureUnit::getPermille() {
-    return MeasureUnit(3, 6);
+    return MeasureUnit(3, 5);
 }
 
 MeasureUnit *MeasureUnit::createPermyriad(UErrorCode &status) {
index ebcf6914fdb377d9c754448abedf39b0c53ecbee..31c93c0f73d163742697443483fda89e0e4c2a71 100644 (file)
@@ -249,7 +249,7 @@ class U_I18N_API MeasureUnit: public UObject {
 #endif  /* U_HIDE_DRAFT_API */
 
     /**
-     * Returns by pointer, unit of acceleration: meter-per-second-squared.
+     * Returns by pointer, unit of acceleration: meter-per-square-second.
      * Caller owns returned value and must free it.
      * Also see {@link #getMeterPerSecondSquared()}.
      * @param status ICU error code.
@@ -259,7 +259,7 @@ class U_I18N_API MeasureUnit: public UObject {
 
 #ifndef U_HIDE_DRAFT_API
     /**
-     * Returns by value, unit of acceleration: meter-per-second-squared.
+     * Returns by value, unit of acceleration: meter-per-square-second.
      * Also see {@link #createMeterPerSecondSquared()}.
      * @draft ICU 64
      */
@@ -609,7 +609,7 @@ class U_I18N_API MeasureUnit: public UObject {
 #endif /* U_HIDE_DRAFT_API */
 
     /**
-     * Returns by pointer, unit of concentr: part-per-million.
+     * Returns by pointer, unit of concentr: permillion.
      * Caller owns returned value and must free it.
      * Also see {@link #getPartPerMillion()}.
      * @param status ICU error code.
@@ -619,7 +619,7 @@ class U_I18N_API MeasureUnit: public UObject {
 
 #ifndef U_HIDE_DRAFT_API
     /**
-     * Returns by value, unit of concentr: part-per-million.
+     * Returns by value, unit of concentr: permillion.
      * Also see {@link #createPartPerMillion()}.
      * @draft ICU 64
      */
@@ -681,7 +681,7 @@ class U_I18N_API MeasureUnit: public UObject {
 #endif /* U_HIDE_DRAFT_API */
 
     /**
-     * Returns by pointer, unit of consumption: liter-per-100kilometers.
+     * Returns by pointer, unit of consumption: liter-per-100-kilometer.
      * Caller owns returned value and must free it.
      * Also see {@link #getLiterPer100Kilometers()}.
      * @param status ICU error code.
@@ -691,7 +691,7 @@ class U_I18N_API MeasureUnit: public UObject {
 
 #ifndef U_HIDE_DRAFT_API
     /**
-     * Returns by value, unit of consumption: liter-per-100kilometers.
+     * Returns by value, unit of consumption: liter-per-100-kilometer.
      * Also see {@link #createLiterPer100Kilometers()}.
      * @draft ICU 64
      */
@@ -2535,7 +2535,7 @@ class U_I18N_API MeasureUnit: public UObject {
 #endif  /* U_HIDE_DRAFT_API */
 
     /**
-     * Returns by pointer, unit of pressure: inch-hg.
+     * Returns by pointer, unit of pressure: inch-ofhg.
      * Caller owns returned value and must free it.
      * Also see {@link #getInchHg()}.
      * @param status ICU error code.
@@ -2545,7 +2545,7 @@ class U_I18N_API MeasureUnit: public UObject {
 
 #ifndef U_HIDE_DRAFT_API
     /**
-     * Returns by value, unit of pressure: inch-hg.
+     * Returns by value, unit of pressure: inch-ofhg.
      * Also see {@link #createInchHg()}.
      * @draft ICU 64
      */
@@ -2607,7 +2607,7 @@ class U_I18N_API MeasureUnit: public UObject {
 #endif  /* U_HIDE_DRAFT_API */
 
     /**
-     * Returns by pointer, unit of pressure: millimeter-of-mercury.
+     * Returns by pointer, unit of pressure: millimeter-ofhg.
      * Caller owns returned value and must free it.
      * Also see {@link #getMillimeterOfMercury()}.
      * @param status ICU error code.
@@ -2617,7 +2617,7 @@ class U_I18N_API MeasureUnit: public UObject {
 
 #ifndef U_HIDE_DRAFT_API
     /**
-     * Returns by value, unit of pressure: millimeter-of-mercury.
+     * Returns by value, unit of pressure: millimeter-ofhg.
      * Also see {@link #createMillimeterOfMercury()}.
      * @draft ICU 64
      */
@@ -2643,7 +2643,7 @@ class U_I18N_API MeasureUnit: public UObject {
 #endif /* U_HIDE_DRAFT_API */
 
     /**
-     * Returns by pointer, unit of pressure: pound-per-square-inch.
+     * Returns by pointer, unit of pressure: pound-force-per-square-inch.
      * Caller owns returned value and must free it.
      * Also see {@link #getPoundPerSquareInch()}.
      * @param status ICU error code.
@@ -2653,7 +2653,7 @@ class U_I18N_API MeasureUnit: public UObject {
 
 #ifndef U_HIDE_DRAFT_API
     /**
-     * Returns by value, unit of pressure: pound-per-square-inch.
+     * Returns by value, unit of pressure: pound-force-per-square-inch.
      * Also see {@link #createPoundPerSquareInch()}.
      * @draft ICU 64
      */
@@ -2824,7 +2824,7 @@ class U_I18N_API MeasureUnit: public UObject {
 
 #ifndef U_HIDE_DRAFT_API
     /**
-     * Returns by pointer, unit of torque: pound-foot.
+     * Returns by pointer, unit of torque: pound-force-foot.
      * Caller owns returned value and must free it.
      * Also see {@link #getPoundFoot()}.
      * @param status ICU error code.
@@ -2833,7 +2833,7 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createPoundFoot(UErrorCode &status);
 
     /**
-     * Returns by value, unit of torque: pound-foot.
+     * Returns by value, unit of torque: pound-force-foot.
      * Also see {@link #createPoundFoot()}.
      * @draft ICU 64
      */
index 6ba4fd1fcef903aed5202a52886638cc36beab18..55c12769fa2ebac1e9ef31b00ba10a6301897ab8 100644 (file)
@@ -28081,7 +28081,7 @@ structLocale:table(nofallback){
                 many{""}
                 other{""}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{""}
                 zero{""}
                 one{""}
@@ -29021,7 +29021,7 @@ structLocale:table(nofallback){
                 many{""}
                 other{""}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{""}
                 zero{""}
                 one{""}
@@ -29039,7 +29039,7 @@ structLocale:table(nofallback){
                 many{""}
                 other{""}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{""}
                 zero{""}
                 one{""}
@@ -29048,7 +29048,7 @@ structLocale:table(nofallback){
                 many{""}
                 other{""}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{""}
                 zero{""}
                 one{""}
@@ -29339,7 +29339,7 @@ structLocale:table(nofallback){
                 many{""}
                 other{""}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{""}
                 zero{""}
                 one{""}
@@ -30279,7 +30279,7 @@ structLocale:table(nofallback){
                 many{""}
                 other{""}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{""}
                 zero{""}
                 one{""}
@@ -30297,7 +30297,7 @@ structLocale:table(nofallback){
                 many{""}
                 other{""}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{""}
                 zero{""}
                 one{""}
@@ -30306,7 +30306,7 @@ structLocale:table(nofallback){
                 many{""}
                 other{""}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{""}
                 zero{""}
                 one{""}
@@ -30597,7 +30597,7 @@ structLocale:table(nofallback){
                 many{""}
                 other{""}
             }
-            meter-per-second-squared{
+            meter-per-square-second{
                 dnam{""}
                 zero{""}
                 one{""}
@@ -31537,7 +31537,7 @@ structLocale:table(nofallback){
                 many{""}
                 other{""}
             }
-            inch-hg{
+            inch-ofhg{
                 dnam{""}
                 zero{""}
                 one{""}
@@ -31555,7 +31555,7 @@ structLocale:table(nofallback){
                 many{""}
                 other{""}
             }
-            millimeter-of-mercury{
+            millimeter-ofhg{
                 dnam{""}
                 zero{""}
                 one{""}
@@ -31564,7 +31564,7 @@ structLocale:table(nofallback){
                 many{""}
                 other{""}
             }
-            pound-per-square-inch{
+            pound-force-per-square-inch{
                 dnam{""}
                 zero{""}
                 one{""}
index 357fe9612e635511fbf9af18a0ea56cf81eb200a..691e3756f68a8433294b6dc5407893380b8a3775 100644 (file)
@@ -421,10 +421,10 @@ public class MeasureUnit implements Serializable {
     public static final MeasureUnit G_FORCE = MeasureUnit.internalGetInstance("acceleration", "g-force");
 
     /**
-     * Constant for unit of acceleration: meter-per-second-squared
+     * Constant for unit of acceleration: meter-per-square-second
      * @stable ICU 54
      */
-    public static final MeasureUnit METER_PER_SECOND_SQUARED = MeasureUnit.internalGetInstance("acceleration", "meter-per-second-squared");
+    public static final MeasureUnit METER_PER_SECOND_SQUARED = MeasureUnit.internalGetInstance("acceleration", "meter-per-square-second");
 
     /**
      * Constant for unit of angle: arc-minute
@@ -543,10 +543,10 @@ public class MeasureUnit implements Serializable {
     public static final MeasureUnit MOLE = MeasureUnit.internalGetInstance("concentr", "mole");
 
     /**
-     * Constant for unit of concentr: part-per-million
+     * Constant for unit of concentr: permillion
      * @stable ICU 57
      */
-    public static final MeasureUnit PART_PER_MILLION = MeasureUnit.internalGetInstance("concentr", "part-per-million");
+    public static final MeasureUnit PART_PER_MILLION = MeasureUnit.internalGetInstance("concentr", "permillion");
 
     /**
      * Constant for unit of concentr: percent
@@ -568,10 +568,10 @@ public class MeasureUnit implements Serializable {
     public static final MeasureUnit PERMYRIAD = MeasureUnit.internalGetInstance("concentr", "permyriad");
 
     /**
-     * Constant for unit of consumption: liter-per-100kilometers
+     * Constant for unit of consumption: liter-per-100-kilometer
      * @stable ICU 56
      */
-    public static final MeasureUnit LITER_PER_100KILOMETERS = MeasureUnit.internalGetInstance("consumption", "liter-per-100kilometers");
+    public static final MeasureUnit LITER_PER_100KILOMETERS = MeasureUnit.internalGetInstance("consumption", "liter-per-100-kilometer");
 
     /**
      * Constant for unit of consumption: liter-per-kilometer
@@ -1209,10 +1209,10 @@ public class MeasureUnit implements Serializable {
     public static final MeasureUnit HECTOPASCAL = MeasureUnit.internalGetInstance("pressure", "hectopascal");
 
     /**
-     * Constant for unit of pressure: inch-hg
+     * Constant for unit of pressure: inch-ofhg
      * @stable ICU 53
      */
-    public static final MeasureUnit INCH_HG = MeasureUnit.internalGetInstance("pressure", "inch-hg");
+    public static final MeasureUnit INCH_HG = MeasureUnit.internalGetInstance("pressure", "inch-ofhg");
 
     /**
      * Constant for unit of pressure: kilopascal
@@ -1235,10 +1235,10 @@ public class MeasureUnit implements Serializable {
     public static final MeasureUnit MILLIBAR = MeasureUnit.internalGetInstance("pressure", "millibar");
 
     /**
-     * Constant for unit of pressure: millimeter-of-mercury
+     * Constant for unit of pressure: millimeter-ofhg
      * @stable ICU 54
      */
-    public static final MeasureUnit MILLIMETER_OF_MERCURY = MeasureUnit.internalGetInstance("pressure", "millimeter-of-mercury");
+    public static final MeasureUnit MILLIMETER_OF_MERCURY = MeasureUnit.internalGetInstance("pressure", "millimeter-ofhg");
 
     /**
      * Constant for unit of pressure: pascal
@@ -1248,10 +1248,10 @@ public class MeasureUnit implements Serializable {
     public static final MeasureUnit PASCAL = MeasureUnit.internalGetInstance("pressure", "pascal");
 
     /**
-     * Constant for unit of pressure: pound-per-square-inch
+     * Constant for unit of pressure: pound-force-per-square-inch
      * @stable ICU 54
      */
-    public static final MeasureUnit POUND_PER_SQUARE_INCH = MeasureUnit.internalGetInstance("pressure", "pound-per-square-inch");
+    public static final MeasureUnit POUND_PER_SQUARE_INCH = MeasureUnit.internalGetInstance("pressure", "pound-force-per-square-inch");
 
     /**
      * Constant for unit of speed: kilometer-per-hour
@@ -1309,11 +1309,11 @@ public class MeasureUnit implements Serializable {
     public static final MeasureUnit NEWTON_METER = MeasureUnit.internalGetInstance("torque", "newton-meter");
 
     /**
-     * Constant for unit of torque: pound-foot
+     * Constant for unit of torque: pound-force-foot
      * @draft ICU 64
      * @provisional This API might change or be removed in a future release.
      */
-    public static final MeasureUnit POUND_FOOT = MeasureUnit.internalGetInstance("torque", "pound-foot");
+    public static final MeasureUnit POUND_FOOT = MeasureUnit.internalGetInstance("torque", "pound-force-foot");
 
     /**
      * Constant for unit of volume: acre-foot
index 4767bcd2047c167d2cb169e3134d2e2c85913761..3c99ed63ca5d6c9b22a1cf3c0b61ce1bdf259e88 100644 (file)
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:edc27908a404a2b2dc5219e13c7867b8f2c1e06df3de7c490e8ccde8d62e6d79
-size 13148695
+oid sha256:4c253061af8712a3f527e3d5cf2227ef90b0dcffc428f319ff4563c241a0e1a1
+size 13149632
index 7f17a15bea4aa50fa3a43fcbf04e8716b3379158..5565932f41f756f34fe5195c43725a99e8e4d4ed 100644 (file)
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:573cfbb44d3c2063fd72b914ad1761735c0148bf105f7e0e6b1ecf11d03c93d0
+oid sha256:5171c1ef2de18296eb47ef5c8f4f74b2273942ace690b763f3af8902e6ed42b4
 size 94304
index 1c1ce8b1b89b22db4541ff8d6c143811f7aec22c..be37d535eceead7843eab8921e49ba109cbed280 100644 (file)
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3960402d9560dcf92e0eaa65ed77166524ee5f308da61d331a015a5b69619276
+oid sha256:0fbae65d9d55e8bacc2ba5cfc8e9e71c45aee7408aab6fa1158ac1f71b819781
 size 723480
index 7e023942f7f969cf90ff09fff962ca5e6b3f649f..b4604c2a791e48e7918d301d7886d21c98ffd869 100644 (file)
@@ -84,7 +84,7 @@ public class MeasureUnitTest extends TestFmwk {
         }
     }
 
-    private static final String[] DRAFT_VERSIONS = {"64", "65"};
+    private static final String[] DRAFT_VERSIONS = {"64", "65", "66", "67"};
 
     private static final HashSet<String> DRAFT_VERSION_SET = new HashSet<>();
 
@@ -267,6 +267,10 @@ public class MeasureUnitTest extends TestFmwk {
 
     private static final HashMap<String, String> JAVA_VERSION_MAP = new HashMap<>();
 
+    // modify certain CLDR unit names before generating functions
+    // that create/get the corresponding MeasureUnit objects
+    private static final Map<String,String> CLDR_NAME_REMAP = new HashMap();
+
     static {
         TIME_CODES.add("year");
         TIME_CODES.add("month");
@@ -281,6 +285,20 @@ public class MeasureUnitTest extends TestFmwk {
         for (String[] funcNameAndVersion : JAVA_VERSIONS) {
             JAVA_VERSION_MAP.put(funcNameAndVersion[0], funcNameAndVersion[1]);
         }
+
+        // CLDR_NAME_REMAP entries
+        // The first two fix overly-generic CLDR unit names
+        CLDR_NAME_REMAP.put("revolution", "revolution-angle");
+        CLDR_NAME_REMAP.put("generic",    "generic-temperature");
+        // The next seven map updated CLDR 37 names back to their
+        // old form in order to preserve the old function names
+        CLDR_NAME_REMAP.put("meter-per-square-second",     "meter-per-second-squared");
+        CLDR_NAME_REMAP.put("permillion",                  "part-per-million");
+        CLDR_NAME_REMAP.put("liter-per-100-kilometer",     "liter-per-100kilometers");
+        CLDR_NAME_REMAP.put("inch-ofhg",                   "inch-hg");
+        CLDR_NAME_REMAP.put("millimeter-ofhg",             "millimeter-of-mercury");
+        CLDR_NAME_REMAP.put("pound-force-per-square-inch", "pound-per-square-inch");
+        CLDR_NAME_REMAP.put("pound-force-foot",            "pound-foot");
     }
 
     @Test
@@ -288,12 +306,12 @@ public class MeasureUnitTest extends TestFmwk {
         // various generateXXX calls go here, see
         // http://site.icu-project.org/design/formatting/measureformat/updating-measure-unit
         // use this test to run each of the ollowing in succession
-        //generateConstants("65"); // for MeasureUnit.java, update generated MeasureUnit constants
-        //generateBackwardCompatibilityTest("65"); // for MeasureUnitTest.java, create TestCompatible65
-        //generateCXXHConstants("65"); // for measunit.h, update generated createXXX methods
+        //generateConstants("67"); // for MeasureUnit.java, update generated MeasureUnit constants
+        //generateBackwardCompatibilityTest("67"); // for MeasureUnitTest.java, create TestCompatible65
+        //generateCXXHConstants("67"); // for measunit.h, update generated createXXX methods
         //generateCXXConstants(); // for measunit.cpp, update generated code
-        //generateCXXBackwardCompatibilityTest("65"); // for measfmttest.cpp, create TestCompatible65
-        //updateJAVAVersions("65"); // for MeasureUnitTest.java, JAVA_VERSIONS
+        //generateCXXBackwardCompatibilityTest("67"); // for measfmttest.cpp, create TestCompatible65
+        //updateJAVAVersions("67"); // for MeasureUnitTest.java, JAVA_VERSIONS
     }
 
     @Test
@@ -2923,12 +2941,12 @@ public class MeasureUnitTest extends TestFmwk {
         StringBuilder result = new StringBuilder();
         boolean caps = true;
         String code = unit.getSubtype();
-        if (code.equals("revolution")) {
-            code = code + "-angle";
-        }
-        if (code.equals("generic")) {
-             code = code + "-temperature";
+
+        String replacement = CLDR_NAME_REMAP.get(code);
+        if (replacement != null) {
+            code = replacement;
         }
+
         int len = code.length();
         for (int i = 0; i < len; i++) {
             char ch = code.charAt(i);
@@ -3004,19 +3022,17 @@ public class MeasureUnitTest extends TestFmwk {
     static String toJAVAName(MeasureUnit unit) {
         String code = unit.getSubtype();
         String type = unit.getType();
+
+        String replacement = CLDR_NAME_REMAP.get(code);
+         if (replacement != null) {
+            code = replacement;
+        }
+
         String name = code.toUpperCase(Locale.ENGLISH).replace("-", "_");
         if (type.equals("angle")) {
             if (code.equals("minute") || code.equals("second")) {
                 name = "ARC_" + name;
             }
-            if (code.equals("revolution")) {
-                name = name + "_ANGLE";
-            }
-        }
-        if (type.equals("temperature")) {
-            if (code.equals("generic")) {
-                name = name + "_TEMPERATURE";
-            }
         }
         return name;
     }
index 0b5c88dc25451e5ab62073408b801110efe176e5..24c9d49f7a2bbb6725b7ac1b7d68836f89f2f24d 100644 (file)
             -->
             <localeIds>
                 // A
-                af, agq, agq_CM, ak, am, ar, ars, as, asa, asa_TZ, ast, ast_ES, az, az_AZ, az_Cyrl
+                af, agq, ak, am, ar, ars, as, asa, ast, az, az_AZ, az_Cyrl
 
                 // B
-                bas, bas_CM, be, bem, bem_ZM, bez, bez_TZ, bg, bm, bn, bo, br, brx, brx_IN, bs, bs_BA
-                bs_Cyrl
+                bas, be, bem, bez, bg, bm, bn, bo, br, brx, bs, bs_BA, bs_Cyrl
 
                 // C
-                ca, ccp, ccp_BD, ccp_IN, ce, ceb, ceb_PH, cgg, cgg_UG, chr, chr_US, ckb, ckb_IQ, ckb_IR, cs, cy
+                ca, ccp, ce, ceb, cgg, chr, ckb, cs, cy
 
                 // D
-                da, dav, dav_KE, de, dje, dje_NE, dsb, dsb_DE, dua, dua_CM, dyo, dyo_SN, dz
+                da, dav, de, dje, dsb, dua, dyo, dz
 
                 // E
-                ebu, ebu_KE, ee, el, en, en_NH, en_RH, eo, es, et, eu, ewo, ewo_CM
+                ebu, ee, el, en, en_NH, en_RH, eo, es, et, eu, ewo
 
                 // F
-                fa, ff, ff_Adlm, ff_CM, ff_GN, ff_MR, ff_SN, fi, fil, fil_PH, fo, fr, fur, fur_IT, fy
+                fa, ff, ff_Adlm, ff_CM, ff_GN, ff_MR, ff_SN, fi, fil, fo, fr, fur, fy
 
                 // G
-                ga, gd, gl, gsw, gsw_CH, gsw_FR, gsw_LI, gu, guz, guz_KE, gv
+                ga, gd, gl, gsw, gu, guz, gv
 
                 // H
-                ha, haw, haw_US, he, hi, hr, hsb, hsb_DE, hu, hy
+                ha, haw, he, hi, hr, hsb, hu, hy
 
                 // I
                 ia, id, ig, ii, in, in_ID, is, it, iw, iw_IL
 
                 // J
-                ja, jgo, jgo_CM, jmc, jmc_TZ, jv
+                ja, jgo, jmc, jv
 
                 // K
-                ka, kab, kab_DZ, kam, kam_KE, kde, kde_TZ, kea, kea_CV, khq, khq_ML, ki, kk, kkj, kkj_CM, kl
-                kln, kln_KE, km, kn, ko, kok, kok_IN, ks, ks_IN, ksb, ksb_TZ, ksf, ksf_CM, ksh, ksh_DE, ku, kw
-                ky
+                ka, kab, kam, kde, kea, khq, ki, kk, kkj, kl, kln, km, kn, ko, kok, ks
+                ks_IN, ksb, ksf, ksh, ku, kw, ky
 
                 // L
-                lag, lag_TZ, lb, lg, lkt, lkt_US, ln, lo, lrc, lrc_IQ, lrc_IR, lt, lu, luo, luo_KE, luy
-                luy_KE, lv
+                lag, lb, lg, lkt, ln, lo, lrc, lt, lu, luo, luy, lv
 
                 // M
-                mai, mai_IN, mas, mas_KE, mas_TZ, mer, mer_KE, mfe, mfe_MU, mg, mgh, mgh_MZ, mgo, mgo_CM, mi
-                mk, ml, mn, mni, mni_Beng, mni_Beng_IN, mni_IN, mo, mr, ms, mt, mua, mua_CM, my, mzn, mzn_IR
+                mai, mas, mer, mfe, mg, mgh, mgo, mi, mk, ml, mn, mni, mni_IN, mo, mr, ms
+                mt, mua, my, mzn
 
                 // N
-                naq, naq_NA, nb, nd, nds, nds_DE, nds_NL, ne, nl, nmg, nmg_CM, nn, nnh, nnh_CM, no, no_NO
-                no_NO_NY, nus, nus_SS, nyn, nyn_UG
+                naq, nb, nd, nds, ne, nl, nmg, nn, nnh, no, no_NO, no_NO_NY, nus, nyn
 
                 // O
                 om, or, os
 
                 // P
-                pa, pa_Arab, pa_IN, pa_PK, pcm, pcm_NG, pl, ps, pt
+                pa, pa_Arab, pa_IN, pa_PK, pcm, pl, ps, pt
 
                 // Q
                 qu
 
                 // R
-                rm, rn, ro, rof, rof_TZ, ru, rw, rwk, rwk_TZ
+                rm, rn, ro, rof, ru, rw, rwk
 
                 // S
-                sah, sah_RU, saq, saq_KE, sat, sat_Olck, sat_Olck_IN, sat_IN, sbp, sbp_TZ, sd, sd_Deva, sd_PK
-                se, seh, seh_MZ, ses, ses_ML, sg, sh, sh_BA, sh_CS, sh_YU, shi, shi_Latn, shi_Latn_MA, shi_MA
-                shi_Tfng, shi_Tfng_MA, si, sk, sl, smn, smn_FI, sn, so, sq, sr, sr_BA, sr_CS, sr_Cyrl_CS
-                sr_Cyrl_YU, sr_Latn, sr_Latn_CS, sr_Latn_YU, sr_ME, sr_RS, sr_XK, sr_YU, su, su_ID, sv, sw
+                sah, saq, sat, sat_IN, sbp, sd, sd_Deva, sd_PK, se, seh, ses, sg, sh, sh_BA, sh_CS, sh_YU
+                shi, shi_Latn, shi_MA, si, sk, sl, smn, sn, so, sq, sr, sr_BA, sr_CS, sr_Cyrl_CS, sr_Cyrl_YU, sr_Latn
+                sr_Latn_CS, sr_Latn_YU, sr_ME, sr_RS, sr_XK, sr_YU, su, su_ID, sv, sw
 
                 // T
-                ta, te, teo, teo_KE, teo_UG, tg, th, ti, tk, tl, tl_PH, to, tr, tt, twq, twq_NE
-                tzm, tzm_MA
+                ta, te, teo, tg, th, ti, tk, tl, tl_PH, to, tr, tt, twq, tzm
 
                 // U
                 ug, uk, ur, uz, uz_AF, uz_Arab, uz_Cyrl, uz_UZ
 
                 // V
-                vai, vai_LR, vai_Latn, vai_Latn_LR, vai_Vaii, vai_Vaii_LR, vi, vun, vun_TZ
+                vai, vai_LR, vai_Latn, vi, vun
 
                 // W
-                wae, wae_CH, wo
+                wae, wo
 
                 // X
-                xh, xog, xog_UG
+                xh, xog
 
                 // Y
-                yav, yav_CM, yi, yo, yue, yue_CN, yue_HK, yue_Hans, yue_Hans_CN, yue_Hant, yue_Hant_HK
+                yav, yi, yo, yue, yue_CN, yue_HK, yue_Hans
 
                 // Z
-                zgh, zgh_MA, zh, zh_CN, zh_HK, zh_Hant, zh_MO, zh_SG, zh_TW, zu
+                zgh, zh, zh_CN, zh_HK, zh_Hant, zh_MO, zh_SG, zh_TW, zu
             </localeIds>
 
             <!-- The following elements configure directories in which a subset of the available
index 601fa5685998b0b7838de8551d120992be31a2a5..268fb26185f974abc21c4b3931a06bf1baaeb37e 100644 (file)
@@ -38,7 +38,7 @@ final class LocaleIdResolver {
 
     // ---- Code below here is to expand the incoming set of locale IDs ----
 
-    private static final Pattern WILDCARD_LOCALE = Pattern.compile("[a-z]{2}(?:_[A-Z][a-z]{3})?");
+    private static final Pattern WILDCARD_LOCALE = Pattern.compile("[a-z]{2,3}(?:_[A-Z][a-z]{3})?");
 
     private ImmutableSet<String> resolve(Set<String> idSpecs) {
         ImmutableSet<String> allAvailableIds = supplementalData.getAvailableLocaleIds();
@@ -91,7 +91,7 @@ final class LocaleIdResolver {
     // E.g. "xx_Fooo" --> "xx" --> "xx_Fooo_YY" ==> "xx"
     private String removeDefaultScript(String id) {
         if (id.contains("_")) {
-            String lang = id.substring(0, 2);
+            String lang = id.substring(0, id.indexOf("_"));
             String maxId = supplementalData.maximize(lang)
                 .orElseThrow(
                     () -> new IllegalStateException("cannot maximize language subtag: " + lang));