diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h b/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h index 33c94d62..057b6da0 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h @@ -165,7 +165,8 @@ namespace CalculatorApp Data_Zetabytes = UnitStart + 164, Area_Pyeong = UnitStart + 165, Energy_Kilowatthour = UnitStart + 166, - UnitEnd = Energy_Kilowatthour + Data_Nibble = UnitStart + 167, + UnitEnd = Data_Nibble }; } } diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp index 9cb0e811..844dd3fe 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp @@ -250,81 +250,83 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_mapApp theme setting Screen reader prompt for the App theme Setting radio buttons group - \ No newline at end of file + diff --git a/src/Calculator/Resources/en-US/Resources.resw b/src/Calculator/Resources/en-US/Resources.resw index b94831fb..82643890 100644 --- a/src/Calculator/Resources/en-US/Resources.resw +++ b/src/Calculator/Resources/en-US/Resources.resw @@ -1965,6 +1965,10 @@ MiB An abbreviation for a measurement unit of data + + nybl + An abbreviation for a measurement unit of data + Pi An abbreviation for a measurement unit of data @@ -2229,6 +2233,10 @@ Minutes A measurement unit for time. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Nibble + A measurement unit for data. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Nanometers A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) diff --git a/src/CalculatorUnitTests/Test.resw b/src/CalculatorUnitTests/Test.resw index 5adc7e62..bc8b6f69 100644 --- a/src/CalculatorUnitTests/Test.resw +++ b/src/CalculatorUnitTests/Test.resw @@ -162,6 +162,9 @@ 0.000000125 + + 0.0000005 + 0.000001