diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h b/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h index 14493f85..33c94d62 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h @@ -166,7 +166,6 @@ namespace CalculatorApp Area_Pyeong = UnitStart + 165, Energy_Kilowatthour = UnitStart + 166, UnitEnd = Energy_Kilowatthour - }; } } diff --git a/src/Calculator.sln b/src/Calculator.sln index e9149bb3..9458f929 100644 --- a/src/Calculator.sln +++ b/src/Calculator.sln @@ -41,30 +41,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM.ActiveCfg = Debug|ARM - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM.Build.0 = Debug|ARM - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM.Deploy.0 = Debug|ARM - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM64.Build.0 = Debug|ARM64 - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM64.Deploy.0 = Debug|ARM64 - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x64.ActiveCfg = Debug|x64 - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x64.Build.0 = Debug|x64 - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x64.Deploy.0 = Debug|x64 - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x86.ActiveCfg = Debug|x86 - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x86.Build.0 = Debug|x86 - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x86.Deploy.0 = Debug|x86 - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM.ActiveCfg = Release|ARM - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM.Build.0 = Release|ARM - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM.Deploy.0 = Release|ARM - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM64.ActiveCfg = Release|ARM64 - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM64.Build.0 = Release|ARM64 - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM64.Deploy.0 = Release|ARM64 - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x64.ActiveCfg = Release|x64 - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x64.Build.0 = Release|x64 - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x64.Deploy.0 = Release|x64 - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x86.ActiveCfg = Release|x86 - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x86.Build.0 = Release|x86 - {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x86.Deploy.0 = Release|x86 {311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM.ActiveCfg = Debug|ARM {311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM.Build.0 = Debug|ARM {311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM64.ActiveCfg = Debug|ARM64 @@ -193,6 +169,30 @@ Global {FC81FF41-02CD-4CD9-9BC5-45A1E39AC6ED}.Release|x64.Build.0 = Release|x64 {FC81FF41-02CD-4CD9-9BC5-45A1E39AC6ED}.Release|x86.ActiveCfg = Release|Win32 {FC81FF41-02CD-4CD9-9BC5-45A1E39AC6ED}.Release|x86.Build.0 = Release|Win32 + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM.ActiveCfg = Debug|ARM + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM.Build.0 = Debug|ARM + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM.Deploy.0 = Debug|ARM + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM64.Build.0 = Debug|ARM64 + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x64.ActiveCfg = Debug|x64 + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x64.Build.0 = Debug|x64 + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x64.Deploy.0 = Debug|x64 + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x86.ActiveCfg = Debug|x86 + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x86.Build.0 = Debug|x86 + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x86.Deploy.0 = Debug|x86 + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM.ActiveCfg = Release|ARM + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM.Build.0 = Release|ARM + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM.Deploy.0 = Release|ARM + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM64.ActiveCfg = Release|ARM64 + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM64.Build.0 = Release|ARM64 + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM64.Deploy.0 = Release|ARM64 + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x64.ActiveCfg = Release|x64 + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x64.Build.0 = Release|x64 + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x64.Deploy.0 = Release|x64 + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x86.ActiveCfg = Release|x86 + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x86.Build.0 = Release|x86 + {3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x86.Deploy.0 = Release|x86 {CC9B4FA7-D746-4F52-9401-0AD1B4D6B16D}.Debug|ARM.ActiveCfg = Debug|ARM {CC9B4FA7-D746-4F52-9401-0AD1B4D6B16D}.Debug|ARM.Build.0 = Debug|ARM {CC9B4FA7-D746-4F52-9401-0AD1B4D6B16D}.Debug|ARM64.ActiveCfg = Debug|ARM64 diff --git a/src/Calculator/Resources/de-DE/Resources.resw b/src/Calculator/Resources/de-DE/Resources.resw index cc4615aa..6793db0c 100644 --- a/src/Calculator/Resources/de-DE/Resources.resw +++ b/src/Calculator/Resources/de-DE/Resources.resw @@ -1,4 +1,4 @@ - + - - - - - - + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 4046.8564224 - - - 1 - - - 0.09290304 - - - 0.83612736 - - - 0.000001 - - - 0.0001 - - - 0.00064516 - - - 2589988.110336 - - - 1000000 - - - 10000 - - - 0.012516104 - - - 0.06032246 - - - 10869.66 - - - 100000 - - - 0.000000125 - - - 0.000001 - - - 0.001 - - - 1 - - - 1000 - - - 1000000 - - - 1000000000 - - - 1000000000000 - - - 1000000000000000 - - - 1000000000000000000 - - - 0.000125 - - - 0.125 - - - 125 - - - 125000 - - - 125000000 - - - 125000000000 - - - 125000000000000 - - - 125000000000000000 - - - 134.217728 - - - 1073.741824 - - - 0.000128 - - - 0.001024 - - - 0.131072 - - - 1.048576 - - - 140737488.355328 - - - 1125899906.842624 - - - 137438.953472 - - - 1099511.627776 - - - 144115188075.855872 - - - 1152921504606.846976 - - - 147573952589676.412928 - - - 1180591620717411.303424 - - - 151115727451828646.838272 - - - 1208925819614629174.706176 - - - 1.474560 - - - 734.003200 - - - 5046.586573 - - - 4.184 - - - 4184 - - - 1055.056 - - - 1000 - - - 0.0000000000000000001602176565 - - - 1 - - - 1.3558179483314 - - - 9000 - - - 439614 - - - 1046700 - - - 0.0254 - - - 0.3048 - - - 0.9144 - - - 1609.344 - - - 0.000001 - - - 0.001 - - - 0.000000001 - - - 0.01 - - - 1 - - - 1000 - - - 1852 - - - 0.035052 - - - 0.18669 - - - 76 - - - 17.58426666666667 - - - 0.0225969658055233 - - - 1 - - - 1000 - - - 745.69987158227022 - - - 60 - - - 745.7 - - - 2982799.486329081 - - - 86400 - - - 1 - - - 604800 - - - 31557600 - - - 0.001 - - - 0.000001 - - - 60 - - - 3600 - - - 236.588237 - - - 473.176473 - - - 568.26125 - - - 946.352946 - - - 1136.5225 - - - 3785.411784 - - - 4546.09 - - - 1000 - - - 4.928922 - - - 14.786765 - - - 1 - - - 764554.857984 - - - 1000000 - - - 1 - - - 16.387064 - - - 28316.846592 - - - 29.5735295625 - - - 28.4130625 - - - 5.91938802083333333333 - - - 17.7581640625 - - - 236.5882 - - - 378541.2 - - - 3750000000 - - - 1 - - - 0.1 - - - 0.01 - - - 0.001 - - - 0.45359237 - - - 0.028349523125 - - - 0.000001 - - - 0.00001 - - - 0.0001 - - - 1016.0469088 - - - 1000 - - - 6.35029318 - - - 0.0002 - - - 907.18474 - - - 0.000002 - - - 0.4325 - - - 4000 - - - 90000 - - - 1 - - - 30.48 - - - 27.777777777777777777778 - - - 51.44 - - - 34030 - - - 100 - - - 44.7 - - - 8.94 - - - 2011.5 - - - 24585 - - - 1 - - - 57.29577951308233 - - - 0.9 - - - 1 - - - 0.9869232667160128 - - - 0.0098692326671601 - - - 0.0013155687145324 - - - 9.869232667160128e-6 - - - 0.068045961016531 - - + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 4046.8564224 + + + 1 + + + 0.09290304 + + + 0.83612736 + + + 0.000001 + + + 0.0001 + + + 0.00064516 + + + 2589988.110336 + + + 1000000 + + + 10000 + + + 0.012516104 + + + 0.06032246 + + + 10869.66 + + + 100000 + + + 0.000000125 + + + 0.000001 + + + 0.001 + + + 1 + + + 1000 + + + 1000000 + + + 1000000000 + + + 1000000000000 + + + 1000000000000000 + + + 1000000000000000000 + + + 0.000125 + + + 0.125 + + + 125 + + + 125000 + + + 125000000 + + + 125000000000 + + + 125000000000000 + + + 125000000000000000 + + + 134.217728 + + + 1073.741824 + + + 0.000128 + + + 0.001024 + + + 0.131072 + + + 1.048576 + + + 140737488.355328 + + + 1125899906.842624 + + + 137438.953472 + + + 1099511.627776 + + + 144115188075.855872 + + + 1152921504606.846976 + + + 147573952589676.412928 + + + 1180591620717411.303424 + + + 151115727451828646.838272 + + + 1208925819614629174.706176 + + + 1.474560 + + + 734.003200 + + + 5046.586573 + + + 4.184 + + + 4184 + + + 1055.056 + + + 1000 + + + 0.0000000000000000001602176565 + + + 1 + + + 1.3558179483314 + + + 9000 + + + 439614 + + + 1046700 + + + 0.0254 + + + 0.3048 + + + 0.9144 + + + 1609.344 + + + 0.000001 + + + 0.001 + + + 0.000000001 + + + 0.01 + + + 1 + + + 1000 + + + 1852 + + + 0.035052 + + + 0.18669 + + + 76 + + + 17.58426666666667 + + + 0.0225969658055233 + + + 1 + + + 1000 + + + 745.69987158227022 + + + 60 + + + 745.7 + + + 2982799.486329081 + + + 86400 + + + 1 + + + 604800 + + + 31557600 + + + 0.001 + + + 0.000001 + + + 60 + + + 3600 + + + 236.588237 + + + 473.176473 + + + 568.26125 + + + 946.352946 + + + 1136.5225 + + + 3785.411784 + + + 4546.09 + + + 1000 + + + 4.928922 + + + 14.786765 + + + 1 + + + 764554.857984 + + + 1000000 + + + 1 + + + 16.387064 + + + 28316.846592 + + + 29.5735295625 + + + 28.4130625 + + + 5.91938802083333333333 + + + 17.7581640625 + + + 236.5882 + + + 378541.2 + + + 3750000000 + + + 1 + + + 0.1 + + + 0.01 + + + 0.001 + + + 0.45359237 + + + 0.028349523125 + + + 0.000001 + + + 0.00001 + + + 0.0001 + + + 1016.0469088 + + + 1000 + + + 6.35029318 + + + 0.0002 + + + 907.18474 + + + 0.000002 + + + 0.4325 + + + 4000 + + + 90000 + + + 1 + + + 30.48 + + + 27.777777777777777777778 + + + 51.44 + + + 34030 + + + 100 + + + 44.7 + + + 8.94 + + + 2011.5 + + + 24585 + + + 1 + + + 57.29577951308233 + + + 0.9 + + + 1 + + + 0.9869232667160128 + + + 0.0098692326671601 + + + 0.0013155687145324 + + + 9.869232667160128e-6 + + + 0.068045961016531 + + 0.002 - + 1 - + 1 - + 1000 - + 1 - + 0.003 3600000 - \ No newline at end of file +