Skip to content

Commit c5ca6bb

Browse files
ngeslinngeslin
committed
Merge remote-tracking branch 'upstream/master' into master-anjdreas
2 parents 7fe9a0b + 2d757e5 commit c5ca6bb

File tree

67 files changed

+3007
-54
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+3007
-54
lines changed

‎Common/UnitDefinitions/Capacitance.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"PluralName": "Farads",
1616
"FromUnitToBaseFunc": "x",
1717
"FromBaseToUnitFunc": "x",
18-
"Prefixes": [ "Pico", "Nano", "Micro", "Milli" ],
18+
"Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Kilo", "Mega" ],
1919
"Localization": [
2020
{
2121
"Culture": "en-US",

‎Common/UnitDefinitions/Density.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"PluralName": "GramsPerCubicMeter",
4040
"FromUnitToBaseFunc": "x/1e3",
4141
"FromBaseToUnitFunc": "x*1e3",
42-
"Prefixes": [ "Milli", "Kilo" ],
42+
"Prefixes": [ "Kilo", "Milli", "Micro" ],
4343
"Localization": [
4444
{
4545
"Culture": "en-US",

‎Common/UnitDefinitions/ElectricResistivity.json‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,26 @@
1515
"PluralName": "OhmMeters",
1616
"FromUnitToBaseFunc": "x",
1717
"FromBaseToUnitFunc": "x",
18-
"Prefixes": [ "Nano", "Micro", "Milli" ],
18+
"Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Kilo", "Mega" ],
1919
"Localization": [
2020
{
2121
"Culture": "en-US",
2222
"Abbreviations": [ "Ω·m" ]
2323
}
2424
]
25+
},
26+
{
27+
"SingularName": "OhmCentimeter",
28+
"PluralName": "OhmsCentimeter",
29+
"FromUnitToBaseFunc": "x/100",
30+
"FromBaseToUnitFunc": "x*100",
31+
"Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Kilo", "Mega" ],
32+
"Localization": [
33+
{
34+
"Culture": "en-US",
35+
"Abbreviations": [ "Ω·cm" ]
36+
}
37+
]
2538
}
2639
]
2740
}

‎Common/UnitDefinitions/Irradiance.json‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,26 @@
1212
"PluralName": "WattsPerSquareMeter",
1313
"FromUnitToBaseFunc": "x",
1414
"FromBaseToUnitFunc": "x",
15-
"Prefixes": [ "Kilo" ],
15+
"Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Kilo", "Mega" ],
1616
"Localization": [
1717
{
1818
"Culture": "en-US",
1919
"Abbreviations": [ "W/m²" ]
2020
}
2121
]
22+
},
23+
{
24+
"SingularName": "WattPerSquareCentimeter",
25+
"PluralName": "WattsPerSquareCentimeter",
26+
"FromUnitToBaseFunc": "x*10000",
27+
"FromBaseToUnitFunc": "x*0.0001",
28+
"Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Kilo", "Mega" ],
29+
"Localization": [
30+
{
31+
"Culture": "en-US",
32+
"Abbreviations": [ "W/cm²" ]
33+
}
34+
]
2235
}
2336
]
2437
}

‎Common/UnitDefinitions/Irradiation.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,18 @@
2020
}
2121
]
2222
},
23+
{
24+
"SingularName": "JoulePerSquareMillimeter",
25+
"PluralName": "JoulesPerSquareMillimeter",
26+
"FromUnitToBaseFunc": "x*1e6",
27+
"FromBaseToUnitFunc": "x/1e6",
28+
"Localization": [
29+
{
30+
"Culture": "en-US",
31+
"Abbreviations": [ "J/mm²" ]
32+
}
33+
]
34+
},
2335
{
2436
"SingularName": "WattHourPerSquareMeter",
2537
"PluralName": "WattHoursPerSquareMeter",

‎Common/UnitDefinitions/Mass.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,20 @@
165165
"Abbreviations": [ "cwt" ]
166166
}
167167
]
168+
},
169+
{
170+
"SingularName": "Grain",
171+
"PluralName": "Grains",
172+
"FromUnitToBaseFunc": "x/15432.358352941431",
173+
"FromBaseToUnitFunc": "x*15432.358352941431",
174+
"XmlDocSummary": "A grain is a unit of measurement of mass, and in the troy weight, avoirdupois, and Apothecaries' system, equal to exactly 64.79891 milligrams.",
175+
"XmlDocRemarks": "https://en.wikipedia.org/wiki/Grain_(unit)",
176+
"Localization": [
177+
{
178+
"Culture": "en-US",
179+
"Abbreviations": [ "gr" ]
180+
}
181+
]
168182
}
169183
]
170184
}

‎Common/UnitDefinitions/MassFlow.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,19 @@
2020
}
2121
]
2222
},
23+
{
24+
"SingularName": "GramPerDay",
25+
"PluralName": "GramsPerDay",
26+
"FromUnitToBaseFunc": "x/86400",
27+
"FromBaseToUnitFunc": "x*86400",
28+
"Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Deca", "Hecto", "Kilo", "Mega" ],
29+
"Localization": [
30+
{
31+
"Culture": "en-US",
32+
"Abbreviations": [ "g/d" ]
33+
}
34+
]
35+
},
2336
{
2437
"SingularName": "KilogramPerHour",
2538
"PluralName": "KilogramsPerHour",
@@ -64,6 +77,20 @@
6477
}
6578
]
6679
},
80+
{
81+
"SingularName": "PoundPerDay",
82+
"PluralName": "PoundsPerDay",
83+
"FromUnitToBaseFunc": "x/190.47936",
84+
"FromBaseToUnitFunc": "x*190.47936",
85+
"Prefixes": [ "Mega" ],
86+
"Localization": [
87+
{
88+
"Culture": "en-US",
89+
"Abbreviations": [ "lb/d" ],
90+
"AbbreviationsWithPrefixes": [ "Mlb/d" ]
91+
}
92+
]
93+
},
6794
{
6895
"SingularName": "PoundPerHour",
6996
"PluralName": "PoundsPerHour",

‎Common/UnitDefinitions/Pressure.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,18 @@
328328
"Abbreviations": [ "lbm/(in·s²)", "lb/(in·s²)" ]
329329
}
330330
]
331+
},
332+
{
333+
"SingularName": "InchOfWaterColumn",
334+
"PluralName": "InchesOfWaterColumn",
335+
"FromUnitToBaseFunc": "x*249.08890833333",
336+
"FromBaseToUnitFunc": "x/249.08890833333",
337+
"Localization": [
338+
{
339+
"Culture": "en-US",
340+
"Abbreviations": [ "wc" ]
341+
}
342+
]
331343
}
332344
]
333345
}

‎Common/UnitDefinitions/SpecificEnergy.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,18 @@
4646
"Abbreviations": [ "Wh/kg" ]
4747
}
4848
]
49+
},
50+
{
51+
"SingularName": "BtuPerPound",
52+
"PluralName": "BtuPerPound",
53+
"FromUnitToBaseFunc": "x*2326.000075362",
54+
"FromBaseToUnitFunc": "x/2326.000075362",
55+
"Localization": [
56+
{
57+
"Culture": "en-US",
58+
"Abbreviations": [ "btu/lb" ]
59+
}
60+
]
4961
}
5062

5163
]

‎Common/UnitDefinitions/SpecificVolume.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"PluralName": "CubicMetersPerKilogram",
1313
"FromUnitToBaseFunc": "x",
1414
"FromBaseToUnitFunc": "x",
15-
"Prefixes": [],
15+
"Prefixes": [ "Milli" ],
1616
"Localization": [
1717
{
1818
"Culture": "en-US",

0 commit comments

Comments
 (0)