diff --git a/.config/tvs.ruleset b/.config/tvs.ruleset new file mode 100644 index 00000000..33575dc2 --- /dev/null +++ b/.config/tvs.ruleset @@ -0,0 +1,310 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/pipelines/azure-pipelines.release.yaml b/build/pipelines/azure-pipelines.release.yaml index 3ffc9a09..fb9607a6 100644 --- a/build/pipelines/azure-pipelines.release.yaml +++ b/build/pipelines/azure-pipelines.release.yaml @@ -11,7 +11,7 @@ variables: - name: versionMajor value: 11 - name: versionMinor - value: 2503 + value: 2506 - name: versionBuild value: $[counter(format('{0}.{1}.*', variables['versionMajor'], variables['versionMinor']), 0)] - name: versionPatch @@ -89,6 +89,8 @@ extends: useReleaseAppxmanifest: true condition: not(eq(variables['Build.Reason'], 'PullRequest')) + - template: /build/pipelines/templates/run-compliance-checks.yaml@self + - template: /build/pipelines/templates/run-ui-tests.yaml@self parameters: platform: x64 diff --git a/build/pipelines/templates/build-single-architecture.yaml b/build/pipelines/templates/build-single-architecture.yaml index 0eb2ee0b..8b2b55f4 100644 --- a/build/pipelines/templates/build-single-architecture.yaml +++ b/build/pipelines/templates/build-single-architecture.yaml @@ -45,14 +45,6 @@ jobs: - checkout: self fetchDepth: 1 - - task: WinUndockNativeCompiler@1 - displayName: Use LKG native compiler - inputs: - compilerPackageName: 'DevDiv.rel.LKG18.VCTools' - compilerPackageVersion: '19.42.3443710001+DevDivGIT.CI20250110.04-466784EE54DF2F302AD0CD6790031C954EF41DA23DA4415D73A76ADF260F2D21' - slnDirectory: $(Build.SourcesDirectory)\src - runPrefastDuring: Build - - ${{ if eq(parameters.isOSSBuild, true) }}: - task: nuget-security-analysis@0 displayName: Secure Supply Chain Analysis diff --git a/build/pipelines/templates/release-store.yaml b/build/pipelines/templates/release-store.yaml index 48483835..f47152d0 100644 --- a/build/pipelines/templates/release-store.yaml +++ b/build/pipelines/templates/release-store.yaml @@ -3,21 +3,20 @@ jobs: - job: ReleaseStore dependsOn: Package + templateContext: + type: releaseJob + isProduction: true + inputs: + - input: pipelineArtifact + artifactName: storeBrokerPayload variables: - skipComponentGovernanceDetection: true - StoreBrokerPackagePath: $(Pipeline.Workspace)\storeBrokerPayload - StoreBrokerLogPath: $(StoreBrokerPackagePath)\StoreBroker.log FlightId: 161f0975-cb5f-475b-8ef6-26383c37621f AppId: 9WZDNCRFHVN5 ProductId: 00009007199266248474 steps: - checkout: none - - download: current - displayName: Download storeBrokerPayload artifact - artifact: storeBrokerPayload - - - task: MS-RDX-MRO.windows-store-publish-dev.flight-task.store-flight@3 + - task: MS-RDX-MRO.windows-store-publish.flight-task.store-flight@3 displayName: Flight StoreBroker Payload to team ring name: StoreBrokerFlight inputs: @@ -25,21 +24,21 @@ jobs: appId: $(AppId) flightId: $(FlightId) inputMethod: JsonAndZip - jsonPath: $(StoreBrokerPackagePath)\SBCalculator.json - zipPath: $(StoreBrokerPackagePath)\SBCalculator.zip + jsonPath: $(Pipeline.Workspace)\SBCalculator.json + zipPath: $(Pipeline.Workspace)\SBCalculator.zip force: true skipPolling: true targetPublishMode: Immediate - logPath: $(StoreBrokerLogPath) + logPath: $(Pipeline.Workspace)\StoreBroker.log deletePackages: true numberOfPackagesToKeep: 0 - - task: APS-Aero-Package.aero-upload-task.AeroUploadTask.AeroUpload@1 + - task: APS-Aero-Package.aero-upload-task.AeroUploadTask.AeroUpload@2 displayName: Aero Upload (FC) inputs: productId: $(ProductId) flightId: $(FlightId) submissionId: $(StoreBrokerFlight.WS_SubmissionId) - submissionDataPath: $(StoreBrokerPackagePath)\SBCalculator.json - packagePath: $(StoreBrokerPackagePath)\SBCalculator.zip + submissionDataPath: $(Pipeline.Workspace)\SBCalculator.json + packagePath: $(Pipeline.Workspace)\SBCalculator.zip serviceEndpoint: AeroUpload-Calculator-FC diff --git a/build/pipelines/templates/run-compliance-checks.yaml b/build/pipelines/templates/run-compliance-checks.yaml new file mode 100644 index 00000000..ba301af5 --- /dev/null +++ b/build/pipelines/templates/run-compliance-checks.yaml @@ -0,0 +1,47 @@ +jobs: +- job: ComplianceChecks + displayName: Run compliance checks + timeoutInMinutes: 60 + pool: + name: EssentialExperiences-windows-2022 + steps: + - checkout: self + + - task: UniversalPackages@0 + displayName: Download internals package + inputs: + command: download + downloadDirectory: $(Build.SourcesDirectory) + vstsFeed: WindowsInboxApps + vstsFeedPackage: calculator-internals + vstsPackageVersion: 0.0.117 + + - task: NuGetToolInstaller@0 + displayName: Use NuGet 6.x + inputs: + versionSpec: 6.x + + - task: NuGetCommand@2 + displayName: NuGet restore src/Calculator.sln + inputs: + command: custom + arguments: restore src/Calculator.sln -Verbosity Detailed -NonInteractive + + - task: PowerShell@2 + displayName: Set version number in AppxManifest + inputs: + filePath: $(Build.SourcesDirectory)\build\scripts\UpdateAppxManifestVersion.ps1 + arguments: '-AppxManifest $(Build.SourcesDirectory)\src\Calculator\Package.appxmanifest -Version $(Build.BuildNumber)' + + - task: securedevelopmentteam.vss-secure-development-tools.build-task-prefast.SDLNativeRules@3 + displayName: 'Run the PREfast SDL Native Rules' + inputs: + userProvideBuildInfo: msBuildInfo + setupCommandlines: '"%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsMSBuildCmd.bat"' + msBuildArchitecture: 'amd64' + msBuildCommandline: 'msbuild.exe $(Build.SourcesDirectory)\src\Calculator.sln /p:AppVersion=$(Build.BuildNumber) /p:OutDir=$(Build.BinariesDirectory)\ /p:Configuration=Release /p:Platform=x64 /m /p:IsStoreBuild=true' + rulesetName: Custom + customRuleset: $(Build.SourcesDirectory)\.config\tvs.ruleset + + - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@3 + displayName: 'Publish Guardian Artifacts' diff --git a/src/CalcManager/CEngine/scicomm.cpp b/src/CalcManager/CEngine/scicomm.cpp index 701fb21c..a4300edc 100644 --- a/src/CalcManager/CEngine/scicomm.cpp +++ b/src/CalcManager/CEngine/scicomm.cpp @@ -163,7 +163,15 @@ void CCalcEngine::ProcessCommandWorker(OpCode wParam) { m_bRecord = true; m_input.Clear(); - CheckAndAddLastBinOpToHistory(); + + /* + * Account for scenarios where an equation includes any input after closing parenthesis - i.e. "(8)2=16". + * This prevents the calculator from ending an equation and adding to history prematurely. + */ + if (m_nLastCom != IDC_CLOSEP) + { + CheckAndAddLastBinOpToHistory(); + } } // Interpret digit keys. @@ -185,6 +193,38 @@ void CCalcEngine::ProcessCommandWorker(OpCode wParam) return; } + // Check if the last command was a closing parenthesis + if (m_nLastCom == IDC_CLOSEP) + { + // Treat this as an implicit multiplication + m_nOpCode = IDC_MUL; + m_lastVal = m_currentVal; + + // We need to clear any previous state from last calculation + m_holdVal = Rational(0); + m_bNoPrevEqu = true; + + // Add the operand to history before adding the implicit multiplication + if (!m_HistoryCollector.FOpndAddedToHistory()) + { + m_HistoryCollector.AddOpenBraceToHistory(); + m_HistoryCollector.AddOpndToHistory(m_numberString, m_currentVal); + m_HistoryCollector.AddCloseBraceToHistory(); + } + + // Add the implicit multiplication to history + m_HistoryCollector.AddBinOpToHistory(m_nOpCode, m_fIntegerMode); + + m_bChangeOp = true; + m_nPrevOpCode = 0; + + // Clear any pending operations in the precedence stack + while (m_precedenceOpCount > 0) + { + m_precedenceOpCount--; + m_nPrecOp[m_precedenceOpCount] = 0; + } + } DisplayNum(); return; @@ -504,11 +544,13 @@ void CCalcEngine::ProcessCommandWorker(OpCode wParam) { wstring groupedString = GroupDigitsPerRadix(m_numberString, m_radix); m_HistoryCollector.CompleteEquation(groupedString); + + m_lastVal = m_currentVal; + m_nPrevOpCode = 0; + m_precedenceOpCount = 0; } m_bChangeOp = false; - m_nPrevOpCode = 0; - break; case IDC_OPENP: @@ -790,6 +832,40 @@ void CCalcEngine::ProcessCommandWorker(OpCode wParam) break; case IDC_PNT: + + // Check if the last command was a closing parenthesis + if (m_nLastCom == IDC_CLOSEP) + { + // Treat this as an implicit multiplication + m_nOpCode = IDC_MUL; + m_lastVal = m_currentVal; + + // We need to clear any previous state from last calculation + m_holdVal = Rational(0); + m_bNoPrevEqu = true; + + // Add the operand to history before adding the implicit multiplication + if (!m_HistoryCollector.FOpndAddedToHistory()) + { + m_HistoryCollector.AddOpenBraceToHistory(); + m_HistoryCollector.AddOpndToHistory(m_numberString, m_currentVal); + m_HistoryCollector.AddCloseBraceToHistory(); + } + + // Add the implicit multiplication to history + m_HistoryCollector.AddBinOpToHistory(m_nOpCode, m_fIntegerMode); + + m_bChangeOp = true; + m_nPrevOpCode = 0; + + // Clear any pending operations in the precedence stack + while (m_precedenceOpCount > 0) + { + m_precedenceOpCount--; + m_nPrecOp[m_precedenceOpCount] = 0; + } + } + if (m_bRecord && !m_fIntegerMode && m_input.TryAddDecimalPt()) { DisplayNum(); diff --git a/src/Calculator/Resources/af-ZA/Resources.resw b/src/Calculator/Resources/af-ZA/Resources.resw index ce2b9ff8..46fe47d6 100644 --- a/src/Calculator/Resources/af-ZA/Resources.resw +++ b/src/Calculator/Resources/af-ZA/Resources.resw @@ -1277,6 +1277,10 @@ koppie (VSA) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + akker An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometer A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angström + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Seemyle 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/Calculator/Resources/am-ET/Resources.resw b/src/Calculator/Resources/am-ET/Resources.resw index c253941e..fd7f6ed4 100644 --- a/src/Calculator/Resources/am-ET/Resources.resw +++ b/src/Calculator/Resources/am-ET/Resources.resw @@ -1277,6 +1277,10 @@ ኩባያ (ዩናይትድ ስቴትስ) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ ናኖሜትር A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstroms + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + የመርከበኛ ማይሎች 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/Calculator/Resources/ar-SA/Resources.resw b/src/Calculator/Resources/ar-SA/Resources.resw index 699b5104..f961e845 100644 --- a/src/Calculator/Resources/ar-SA/Resources.resw +++ b/src/Calculator/Resources/ar-SA/Resources.resw @@ -1277,6 +1277,10 @@ كوب (الولايات المتحدة) An abbreviation for a measurement unit of volume + + أنغ + An abbreviation for a measurement unit of length + التيار المتردد An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ نانومتر A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + من وحدات أنغستروم + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + الأميال البحرية 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/Calculator/Resources/az-Latn-AZ/Resources.resw b/src/Calculator/Resources/az-Latn-AZ/Resources.resw index a4c54068..4f593c54 100644 --- a/src/Calculator/Resources/az-Latn-AZ/Resources.resw +++ b/src/Calculator/Resources/az-Latn-AZ/Resources.resw @@ -1277,6 +1277,10 @@ fincan (ABŞ) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometr A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Anqstrom + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Dəniz milləri 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/Calculator/Resources/bg-BG/Resources.resw b/src/Calculator/Resources/bg-BG/Resources.resw index b7e8f78a..e4330104 100644 --- a/src/Calculator/Resources/bg-BG/Resources.resw +++ b/src/Calculator/Resources/bg-BG/Resources.resw @@ -1277,6 +1277,10 @@ чаши (САЩ) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + акра An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Нанометра A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Ангстрьоми + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Морски мили 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/Calculator/Resources/ca-ES/Resources.resw b/src/Calculator/Resources/ca-ES/Resources.resw index 8be9fe6f..40a2abbf 100644 --- a/src/Calculator/Resources/ca-ES/Resources.resw +++ b/src/Calculator/Resources/ca-ES/Resources.resw @@ -1277,6 +1277,10 @@ tassa (EUA) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanòmetres A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Àngstroms + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Milles nàutiques 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/Calculator/Resources/cs-CZ/Resources.resw b/src/Calculator/Resources/cs-CZ/Resources.resw index 01e8fa97..79556db6 100644 --- a/src/Calculator/Resources/cs-CZ/Resources.resw +++ b/src/Calculator/Resources/cs-CZ/Resources.resw @@ -1277,6 +1277,10 @@ šálků (USA) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ nanometrů A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstromy + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Námořní míle 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/Calculator/Resources/da-DK/Resources.resw b/src/Calculator/Resources/da-DK/Resources.resw index 181e7899..98a3d118 100644 --- a/src/Calculator/Resources/da-DK/Resources.resw +++ b/src/Calculator/Resources/da-DK/Resources.resw @@ -1277,6 +1277,10 @@ cup (USA) An abbreviation for a measurement unit of volume + + Å + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometer A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Ångstrøm + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Sømil 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/Calculator/Resources/de-DE/Resources.resw b/src/Calculator/Resources/de-DE/Resources.resw index 5a4b9fac..6f9a9168 100644 --- a/src/Calculator/Resources/de-DE/Resources.resw +++ b/src/Calculator/Resources/de-DE/Resources.resw @@ -1277,6 +1277,10 @@ cup (USA) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometer A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Ångström + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Seemeilen 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/Calculator/Resources/el-GR/Resources.resw b/src/Calculator/Resources/el-GR/Resources.resw index 98a1f6b0..6a71d08d 100644 --- a/src/Calculator/Resources/el-GR/Resources.resw +++ b/src/Calculator/Resources/el-GR/Resources.resw @@ -1277,6 +1277,10 @@ φλιτζ. (Η.Π.Α.) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Νανόμετρα A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Άνγκστρομ + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Ναυτικά μίλια 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/Calculator/Resources/en-GB/Resources.resw b/src/Calculator/Resources/en-GB/Resources.resw index db5b7484..84441779 100644 --- a/src/Calculator/Resources/en-GB/Resources.resw +++ b/src/Calculator/Resources/en-GB/Resources.resw @@ -1277,6 +1277,10 @@ cup (US) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometres A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstroms + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Nautical miles 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/Calculator/Resources/es-ES/Resources.resw b/src/Calculator/Resources/es-ES/Resources.resw index 44c41059..d64f31a9 100644 --- a/src/Calculator/Resources/es-ES/Resources.resw +++ b/src/Calculator/Resources/es-ES/Resources.resw @@ -1277,6 +1277,10 @@ cup (taza) (EE. UU.) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanómetros A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstroms + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Millas náuticas 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/Calculator/Resources/es-MX/Resources.resw b/src/Calculator/Resources/es-MX/Resources.resw index 1a43e1c6..88ed58f9 100644 --- a/src/Calculator/Resources/es-MX/Resources.resw +++ b/src/Calculator/Resources/es-MX/Resources.resw @@ -1277,6 +1277,10 @@ taza (EE. UU.) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ca An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanómetros A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstroms + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Millas náuticas 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/Calculator/Resources/et-EE/Resources.resw b/src/Calculator/Resources/et-EE/Resources.resw index c149b337..1ee8084b 100644 --- a/src/Calculator/Resources/et-EE/Resources.resw +++ b/src/Calculator/Resources/et-EE/Resources.resw @@ -1277,6 +1277,10 @@ tass (USA) An abbreviation for a measurement unit of volume + + Å + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ nanomeetrit A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Ongströmi + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Meremiilid 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/Calculator/Resources/eu-ES/Resources.resw b/src/Calculator/Resources/eu-ES/Resources.resw index d037f743..8860ab24 100644 --- a/src/Calculator/Resources/eu-ES/Resources.resw +++ b/src/Calculator/Resources/eu-ES/Resources.resw @@ -1278,6 +1278,10 @@ kopa (AEB) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1854,6 +1858,10 @@ nanometro A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstrom + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Itsas milia 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/Calculator/Resources/fa-IR/Resources.resw b/src/Calculator/Resources/fa-IR/Resources.resw index 75ce43ea..e4033d58 100644 --- a/src/Calculator/Resources/fa-IR/Resources.resw +++ b/src/Calculator/Resources/fa-IR/Resources.resw @@ -1277,6 +1277,10 @@ فنجان (ایالات متحده) An abbreviation for a measurement unit of volume + + آ + An abbreviation for a measurement unit of length + ایکر An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ نانومتر A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + آنگستروم + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + مایل دریایی 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/Calculator/Resources/fi-FI/Resources.resw b/src/Calculator/Resources/fi-FI/Resources.resw index bb22ce77..b84c2ef6 100644 --- a/src/Calculator/Resources/fi-FI/Resources.resw +++ b/src/Calculator/Resources/fi-FI/Resources.resw @@ -1277,6 +1277,10 @@ cup (US) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + as An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometrit A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Ångströmit + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + merimailia 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/Calculator/Resources/fil-PH/Resources.resw b/src/Calculator/Resources/fil-PH/Resources.resw index 1ab0ce3e..f5e05a59 100644 --- a/src/Calculator/Resources/fil-PH/Resources.resw +++ b/src/Calculator/Resources/fil-PH/Resources.resw @@ -1277,6 +1277,10 @@ cup (US) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometer A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + (na) Angstrom + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Mga milyang pandagat 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/Calculator/Resources/fr-CA/Resources.resw b/src/Calculator/Resources/fr-CA/Resources.resw index fdba10c6..aba1a9a5 100644 --- a/src/Calculator/Resources/fr-CA/Resources.resw +++ b/src/Calculator/Resources/fr-CA/Resources.resw @@ -1277,6 +1277,10 @@ tasse (É.-U.) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanomètres A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angströms + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Milles marins A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) @@ -3228,7 +3236,7 @@ Label for a radio button that toggles rotate circular behavior for the shift operations. - Faire pivoter via le déplacement circulaire de transport + Rotation circulaire via retenue Label for a radio button that toggles rotate circular with carry behavior for the shift operations. diff --git a/src/Calculator/Resources/fr-FR/Resources.resw b/src/Calculator/Resources/fr-FR/Resources.resw index a909b3b9..9ee9a322 100644 --- a/src/Calculator/Resources/fr-FR/Resources.resw +++ b/src/Calculator/Resources/fr-FR/Resources.resw @@ -1277,6 +1277,10 @@ tasse (É.-U.) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanomètres A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angströms + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Milles marins A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) @@ -3228,7 +3236,7 @@ Label for a radio button that toggles rotate circular behavior for the shift operations. - Faire pivoter via le déplacement circulaire de transport + Rotation circulaire via retenue Label for a radio button that toggles rotate circular with carry behavior for the shift operations. diff --git a/src/Calculator/Resources/gl-ES/Resources.resw b/src/Calculator/Resources/gl-ES/Resources.resw index 0f83bfaf..9853bc8f 100644 --- a/src/Calculator/Resources/gl-ES/Resources.resw +++ b/src/Calculator/Resources/gl-ES/Resources.resw @@ -1277,6 +1277,10 @@ cunca (EUA) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanómetros A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Ángstroms + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Millas náuticas 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/Calculator/Resources/he-IL/Resources.resw b/src/Calculator/Resources/he-IL/Resources.resw index 14302a53..dcd43a43 100644 --- a/src/Calculator/Resources/he-IL/Resources.resw +++ b/src/Calculator/Resources/he-IL/Resources.resw @@ -1277,6 +1277,10 @@ כוס (ארה"ב) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + אקר An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ ננומטרים A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + יחידות אנגסטרום + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + מיילים ימיים 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/Calculator/Resources/hi-IN/Resources.resw b/src/Calculator/Resources/hi-IN/Resources.resw index cb3bf31b..ff74c0d4 100644 --- a/src/Calculator/Resources/hi-IN/Resources.resw +++ b/src/Calculator/Resources/hi-IN/Resources.resw @@ -1277,6 +1277,10 @@ कप (संयुक्त राज्य अमेरिका) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ नैनोमीटर A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + एंग्स्ट्रॉम + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + नॉटिकल मील 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/Calculator/Resources/hr-HR/Resources.resw b/src/Calculator/Resources/hr-HR/Resources.resw index 3fa1f7c0..0020ffde 100644 --- a/src/Calculator/Resources/hr-HR/Resources.resw +++ b/src/Calculator/Resources/hr-HR/Resources.resw @@ -1277,6 +1277,10 @@ šalica (SAD) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + AC An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometara A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstremi + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Nautičkih milja 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/Calculator/Resources/hu-HU/Resources.resw b/src/Calculator/Resources/hu-HU/Resources.resw index a1bc8d80..b772ab10 100644 --- a/src/Calculator/Resources/hu-HU/Resources.resw +++ b/src/Calculator/Resources/hu-HU/Resources.resw @@ -1277,6 +1277,10 @@ cs An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ nanométer A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angström + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Tengeri mérföld 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/Calculator/Resources/id-ID/Resources.resw b/src/Calculator/Resources/id-ID/Resources.resw index 5553b2b4..ff0708a2 100644 --- a/src/Calculator/Resources/id-ID/Resources.resw +++ b/src/Calculator/Resources/id-ID/Resources.resw @@ -1277,6 +1277,10 @@ cangkir (AS) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometer A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstrom + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Mil laut 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/Calculator/Resources/is-IS/Resources.resw b/src/Calculator/Resources/is-IS/Resources.resw index e492ec9a..ec316e60 100644 --- a/src/Calculator/Resources/is-IS/Resources.resw +++ b/src/Calculator/Resources/is-IS/Resources.resw @@ -1277,6 +1277,10 @@ bolli (BNA) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanómetrar A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angström + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Sjómílur 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/Calculator/Resources/it-IT/Resources.resw b/src/Calculator/Resources/it-IT/Resources.resw index f301fa86..e2d20bf3 100644 --- a/src/Calculator/Resources/it-IT/Resources.resw +++ b/src/Calculator/Resources/it-IT/Resources.resw @@ -1277,6 +1277,10 @@ tazza (Stati Uniti) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometri A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstrom + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Miglia nautiche 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/Calculator/Resources/ja-JP/Resources.resw b/src/Calculator/Resources/ja-JP/Resources.resw index 2e7cf55c..6128b35f 100644 --- a/src/Calculator/Resources/ja-JP/Resources.resw +++ b/src/Calculator/Resources/ja-JP/Resources.resw @@ -1277,6 +1277,10 @@ カップ (米国) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ ナノメートル A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + オングストローム + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + 海里 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/Calculator/Resources/kk-KZ/Resources.resw b/src/Calculator/Resources/kk-KZ/Resources.resw index c294b312..bc0315fa 100644 --- a/src/Calculator/Resources/kk-KZ/Resources.resw +++ b/src/Calculator/Resources/kk-KZ/Resources.resw @@ -1277,6 +1277,10 @@ кесе (АҚШ) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + акр An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Нанометр A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Ангстремдер + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Теңіздік милялар 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/Calculator/Resources/km-KH/Resources.resw b/src/Calculator/Resources/km-KH/Resources.resw index 7685b95d..d3d24e55 100644 --- a/src/Calculator/Resources/km-KH/Resources.resw +++ b/src/Calculator/Resources/km-KH/Resources.resw @@ -1277,6 +1277,10 @@ ពែង (US) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ ណាណូម៉ែត្រ A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + អង់ស្ត្រូម + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + រង្វាស់ចម្ងាយនាវាចរ 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/Calculator/Resources/kn-IN/Resources.resw b/src/Calculator/Resources/kn-IN/Resources.resw index fe262e1a..27974c9e 100644 --- a/src/Calculator/Resources/kn-IN/Resources.resw +++ b/src/Calculator/Resources/kn-IN/Resources.resw @@ -1277,6 +1277,10 @@ ಕಪ್ (US) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ ನ್ಯಾನೋಮೀಟರ್‌‍ಗಳು A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + ಆಂಗ್‌ಸ್ಟ್ರೋಮ್ಸ್ + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + ನಾಟಿಕಲ್ ಮೈಲುಗಳು 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/Calculator/Resources/ko-KR/Resources.resw b/src/Calculator/Resources/ko-KR/Resources.resw index 09eb7719..b9f3c853 100644 --- a/src/Calculator/Resources/ko-KR/Resources.resw +++ b/src/Calculator/Resources/ko-KR/Resources.resw @@ -1277,6 +1277,10 @@ 컵(미국) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ 나노미터 A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + 옹스트롬 + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + 해리 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/Calculator/Resources/lo-LA/Resources.resw b/src/Calculator/Resources/lo-LA/Resources.resw index 7c7acef2..0ce15b5f 100644 --- a/src/Calculator/Resources/lo-LA/Resources.resw +++ b/src/Calculator/Resources/lo-LA/Resources.resw @@ -1277,6 +1277,10 @@ ຈອກ (ສະຫະລັດ) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ ນາໂນແມັດ A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + ອັງສະຕອມ + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + ໄມທະເລ 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/Calculator/Resources/lt-LT/Resources.resw b/src/Calculator/Resources/lt-LT/Resources.resw index 9ed067b4..3d850ae7 100644 --- a/src/Calculator/Resources/lt-LT/Resources.resw +++ b/src/Calculator/Resources/lt-LT/Resources.resw @@ -1277,6 +1277,10 @@ puodelis (JAV) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometrai A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstremai + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Jūrmylės 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/Calculator/Resources/lv-LV/Resources.resw b/src/Calculator/Resources/lv-LV/Resources.resw index 7c0f5242..291f417a 100644 --- a/src/Calculator/Resources/lv-LV/Resources.resw +++ b/src/Calculator/Resources/lv-LV/Resources.resw @@ -1277,6 +1277,10 @@ glāzes (ASV) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + akri An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometri A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstrēmi + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Jūras jūdzes 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/Calculator/Resources/mk-MK/Resources.resw b/src/Calculator/Resources/mk-MK/Resources.resw index 4d93d08b..16f50fe1 100644 --- a/src/Calculator/Resources/mk-MK/Resources.resw +++ b/src/Calculator/Resources/mk-MK/Resources.resw @@ -1277,6 +1277,10 @@ шолја (САД) An abbreviation for a measurement unit of volume + + А + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Нанометри A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Ангстреми + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Наутички милји 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/Calculator/Resources/ml-IN/Resources.resw b/src/Calculator/Resources/ml-IN/Resources.resw index 0b4799c6..745ffbdb 100644 --- a/src/Calculator/Resources/ml-IN/Resources.resw +++ b/src/Calculator/Resources/ml-IN/Resources.resw @@ -1277,6 +1277,10 @@ കപ്പ് (US) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ നാനോമീറ്ററുകൾ A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + ആങ്സ്ട്രോംസ് + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + നോട്ടിക്കൽ മൈലുകൾ 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/Calculator/Resources/ms-MY/Resources.resw b/src/Calculator/Resources/ms-MY/Resources.resw index 7ff9022a..8187eb22 100644 --- a/src/Calculator/Resources/ms-MY/Resources.resw +++ b/src/Calculator/Resources/ms-MY/Resources.resw @@ -1277,6 +1277,10 @@ cawan (AS) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometer A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstroms + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Batu nautika 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/Calculator/Resources/nb-NO/Resources.resw b/src/Calculator/Resources/nb-NO/Resources.resw index 73535f1e..8e3e8fa2 100644 --- a/src/Calculator/Resources/nb-NO/Resources.resw +++ b/src/Calculator/Resources/nb-NO/Resources.resw @@ -1277,6 +1277,10 @@ kopp (USA) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ nanometer A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Ångstrøm + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Nautiske mil 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/Calculator/Resources/nl-NL/Resources.resw b/src/Calculator/Resources/nl-NL/Resources.resw index e6f05209..bf9f252e 100644 --- a/src/Calculator/Resources/nl-NL/Resources.resw +++ b/src/Calculator/Resources/nl-NL/Resources.resw @@ -1277,6 +1277,10 @@ cup (VS) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometer A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Ångström + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Zeemijlen 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/Calculator/Resources/pl-PL/Resources.resw b/src/Calculator/Resources/pl-PL/Resources.resw index 19a521ff..c3112045 100644 --- a/src/Calculator/Resources/pl-PL/Resources.resw +++ b/src/Calculator/Resources/pl-PL/Resources.resw @@ -1277,6 +1277,10 @@ filiżanka (USA) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometry A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstremy + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Mile morskie 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/Calculator/Resources/pt-BR/Resources.resw b/src/Calculator/Resources/pt-BR/Resources.resw index 5e2f77eb..2357b42a 100644 --- a/src/Calculator/Resources/pt-BR/Resources.resw +++ b/src/Calculator/Resources/pt-BR/Resources.resw @@ -1277,6 +1277,10 @@ xícara (EUA) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanômetros A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Ångströms + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Milhas náuticas 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/Calculator/Resources/pt-PT/Resources.resw b/src/Calculator/Resources/pt-PT/Resources.resw index 8b56d8d3..16e90d44 100644 --- a/src/Calculator/Resources/pt-PT/Resources.resw +++ b/src/Calculator/Resources/pt-PT/Resources.resw @@ -1277,6 +1277,10 @@ cháv. (EUA) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanómetros A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstroms + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Milhas náuticas 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/Calculator/Resources/ro-RO/Resources.resw b/src/Calculator/Resources/ro-RO/Resources.resw index 7d7697dd..b39129a1 100644 --- a/src/Calculator/Resources/ro-RO/Resources.resw +++ b/src/Calculator/Resources/ro-RO/Resources.resw @@ -1277,6 +1277,10 @@ cană (S.U.A.) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometri A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstromi + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Mile marine 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/Calculator/Resources/ru-RU/Resources.resw b/src/Calculator/Resources/ru-RU/Resources.resw index 758e6ef4..84b5dc58 100644 --- a/src/Calculator/Resources/ru-RU/Resources.resw +++ b/src/Calculator/Resources/ru-RU/Resources.resw @@ -1277,6 +1277,10 @@ чашка (США) An abbreviation for a measurement unit of volume + + А + An abbreviation for a measurement unit of length + акр An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Нанометры A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Ангстремы + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Морские мили 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/Calculator/Resources/sk-SK/Resources.resw b/src/Calculator/Resources/sk-SK/Resources.resw index 0be7f3fc..97ab892c 100644 --- a/src/Calculator/Resources/sk-SK/Resources.resw +++ b/src/Calculator/Resources/sk-SK/Resources.resw @@ -1277,6 +1277,10 @@ šálka (USA) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometre A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angströmy + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Námorné míle 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/Calculator/Resources/sl-SI/Resources.resw b/src/Calculator/Resources/sl-SI/Resources.resw index 63774f40..a77f0f27 100644 --- a/src/Calculator/Resources/sl-SI/Resources.resw +++ b/src/Calculator/Resources/sl-SI/Resources.resw @@ -1277,6 +1277,10 @@ skodelica (ZDA) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometri A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstremi + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Navtične milje 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/Calculator/Resources/sq-AL/Resources.resw b/src/Calculator/Resources/sq-AL/Resources.resw index 55c7a79d..19b76581 100644 --- a/src/Calculator/Resources/sq-AL/Resources.resw +++ b/src/Calculator/Resources/sq-AL/Resources.resw @@ -1277,6 +1277,10 @@ filxhan (SHBA) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometra A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstromë + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Milje detare 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/Calculator/Resources/sr-Latn-RS/Resources.resw b/src/Calculator/Resources/sr-Latn-RS/Resources.resw index 9ef6a75c..de430614 100644 --- a/src/Calculator/Resources/sr-Latn-RS/Resources.resw +++ b/src/Calculator/Resources/sr-Latn-RS/Resources.resw @@ -1277,6 +1277,10 @@ šolja (SAD) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + AC An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometara A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstroms + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Nautičkih milja 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/Calculator/Resources/sv-SE/Resources.resw b/src/Calculator/Resources/sv-SE/Resources.resw index b6e6c150..1f8cedcd 100644 --- a/src/Calculator/Resources/sv-SE/Resources.resw +++ b/src/Calculator/Resources/sv-SE/Resources.resw @@ -1277,6 +1277,10 @@ kopp (US) An abbreviation for a measurement unit of volume + + E + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometer A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Ångström + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Nautiska mil 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/Calculator/Resources/ta-IN/Resources.resw b/src/Calculator/Resources/ta-IN/Resources.resw index aa747069..448ae019 100644 --- a/src/Calculator/Resources/ta-IN/Resources.resw +++ b/src/Calculator/Resources/ta-IN/Resources.resw @@ -1277,6 +1277,10 @@ கோப்பை (US) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ஏக் An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ நானோமீட்டர்கள் A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + ஆங்ஸ்ட்ரோம்கள் + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + கடல் மைல்கள் 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/Calculator/Resources/te-IN/Resources.resw b/src/Calculator/Resources/te-IN/Resources.resw index 205410f9..6e71fcbd 100644 --- a/src/Calculator/Resources/te-IN/Resources.resw +++ b/src/Calculator/Resources/te-IN/Resources.resw @@ -1277,6 +1277,10 @@ కప్ (US) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ నానోమీటర్లు A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + ఆంగ్‌స్ట్రామ్స్ + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + నాటికల్ మైళ్లు 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/Calculator/Resources/th-TH/Resources.resw b/src/Calculator/Resources/th-TH/Resources.resw index 73c5dab2..bcac9e91 100644 --- a/src/Calculator/Resources/th-TH/Resources.resw +++ b/src/Calculator/Resources/th-TH/Resources.resw @@ -1277,6 +1277,10 @@ ถ้วย (สหรัฐอเมริกา) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ นาโนเมตร A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + อังสตรอม + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + ไมล์ทะเล 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/Calculator/Resources/tr-TR/Resources.resw b/src/Calculator/Resources/tr-TR/Resources.resw index 526364a3..40f0602c 100644 --- a/src/Calculator/Resources/tr-TR/Resources.resw +++ b/src/Calculator/Resources/tr-TR/Resources.resw @@ -1277,6 +1277,10 @@ Bardak (ABD) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nanometre A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstrom + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Deniz mili 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/Calculator/Resources/uk-UA/Resources.resw b/src/Calculator/Resources/uk-UA/Resources.resw index c0a84660..636b790e 100644 --- a/src/Calculator/Resources/uk-UA/Resources.resw +++ b/src/Calculator/Resources/uk-UA/Resources.resw @@ -1277,6 +1277,10 @@ чашка (США) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + змінний струм An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Нанометр. A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Ангстреми + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Морські милі 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/Calculator/Resources/vi-VN/Resources.resw b/src/Calculator/Resources/vi-VN/Resources.resw index d6d78bac..073aa6fc 100644 --- a/src/Calculator/Resources/vi-VN/Resources.resw +++ b/src/Calculator/Resources/vi-VN/Resources.resw @@ -1277,6 +1277,10 @@ chén (Mỹ) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ Nano mét A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + Angstrom + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + Dặm Hải lý 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/Calculator/Resources/zh-CN/Resources.resw b/src/Calculator/Resources/zh-CN/Resources.resw index adff78fe..1c9115f5 100644 --- a/src/Calculator/Resources/zh-CN/Resources.resw +++ b/src/Calculator/Resources/zh-CN/Resources.resw @@ -1134,7 +1134,7 @@ Unit conversion category name called Time - 容量 + 体积 Unit conversion category name called Volume (eg. cups, teaspoons, milliliters) @@ -1277,6 +1277,10 @@ 杯（美制） An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + 英亩 An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ 纳米 A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + 埃 + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + 海里 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/Calculator/Resources/zh-TW/Resources.resw b/src/Calculator/Resources/zh-TW/Resources.resw index e905bb0a..3dcd0b46 100644 --- a/src/Calculator/Resources/zh-TW/Resources.resw +++ b/src/Calculator/Resources/zh-TW/Resources.resw @@ -1277,6 +1277,10 @@ 杯 (美制) An abbreviation for a measurement unit of volume + + A + An abbreviation for a measurement unit of length + ac An abbreviation for a measurement unit of volume @@ -1853,6 +1857,10 @@ 奈米 A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + + 埃 + A measurement unit for length. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) + 海浬 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/CalculatorUITests/ScientificModeFunctionalTests.cs b/src/CalculatorUITests/ScientificModeFunctionalTests.cs index 21e43f0b..9911bf8e 100644 --- a/src/CalculatorUITests/ScientificModeFunctionalTests.cs +++ b/src/CalculatorUITests/ScientificModeFunctionalTests.cs @@ -4,6 +4,7 @@ using CalculatorUITestFramework; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace CalculatorUITests { @@ -133,6 +134,81 @@ namespace CalculatorUITests Assert.AreEqual("12", page.CalculatorResults.GetCalculatorResultText()); } + [TestMethod] + [Priority(0)] + public void SmokeTest_CloseParenthesis() + { + /* + * TEST #1 + */ + page.ScientificOperators.ParenthesisLeftButton.Click(); + page.StandardOperators.NumberPad.Input(8); + page.ScientificOperators.ParenthesisRightButton.Click(); + page.StandardOperators.NumberPad.Input(2); + page.StandardOperators.EqualButton.Click(); + + // Assert calculator & history results + Assert.AreEqual("16", page.CalculatorResults.GetCalculatorResultText()); + Assert.AreEqual("(8) \x00D7 2=", page.CalculatorResults.GetCalculatorExpressionText()); + + var historyItems0 = page.HistoryPanel.GetAllHistoryListViewItems(); + Assert.IsTrue(historyItems0[0].GetValue().Equals("16", StringComparison.InvariantCultureIgnoreCase)); + Assert.IsTrue(historyItems0[0].GetExpression().Equals("(8) \x00D7 2=", StringComparison.InvariantCultureIgnoreCase)); + + /* + * TEST #2 + */ + page.ScientificOperators.ParenthesisLeftButton.Click(); + page.StandardOperators.NumberPad.Input(7); + page.StandardOperators.MultiplyButton.Click(); + page.StandardOperators.NumberPad.Input(2); + page.ScientificOperators.ParenthesisRightButton.Click(); + page.StandardOperators.NumberPad.Input(2); + page.StandardOperators.EqualButton.Click(); + + // Assert calculator & history results + Assert.AreEqual("28", page.CalculatorResults.GetCalculatorResultText()); + Assert.AreEqual("(7 \x00D7 2) \x00D7 2=", page.CalculatorResults.GetCalculatorExpressionText()); + + var historyItems1 = page.HistoryPanel.GetAllHistoryListViewItems(); + Assert.IsTrue(historyItems1[0].GetValue().Equals("28", StringComparison.InvariantCultureIgnoreCase)); + Assert.IsTrue(historyItems1[0].GetExpression().Equals("(7 \x00D7 2) \x00D7 2=", StringComparison.InvariantCultureIgnoreCase)); + + /* + * TEST #3 + */ + page.ScientificOperators.ParenthesisLeftButton.Click(); + page.StandardOperators.NumberPad.Input(8); + page.ScientificOperators.ParenthesisRightButton.Click(); + page.StandardOperators.NumberPad.Input(0.5); + page.StandardOperators.EqualButton.Click(); + + // Assert calculator & history results + Assert.AreEqual("4", page.CalculatorResults.GetCalculatorResultText()); + Assert.AreEqual("(8) \x00D7 0.5=", page.CalculatorResults.GetCalculatorExpressionText()); + + var historyItems2 = page.HistoryPanel.GetAllHistoryListViewItems(); + Assert.IsTrue(historyItems2[0].GetValue().Equals("4", StringComparison.InvariantCultureIgnoreCase)); + Assert.IsTrue(historyItems2[0].GetExpression().Equals("(8) \x00D7 0.5=", StringComparison.InvariantCultureIgnoreCase)); + + /* + * TEST #4 + */ + page.ScientificOperators.ParenthesisLeftButton.Click(); + page.StandardOperators.NumberPad.Input(8); + page.ScientificOperators.ParenthesisRightButton.Click(); + page.StandardOperators.NumberPad.Input(.5); + page.StandardOperators.EqualButton.Click(); + + // Assert calculator & history results + Assert.AreEqual("4", page.CalculatorResults.GetCalculatorResultText()); + Assert.AreEqual("(8) \x00D7 0.5=", page.CalculatorResults.GetCalculatorExpressionText()); + + var historyItems3 = page.HistoryPanel.GetAllHistoryListViewItems(); + Assert.IsTrue(historyItems3[0].GetValue().Equals("4", StringComparison.InvariantCultureIgnoreCase)); + Assert.IsTrue(historyItems3[0].GetExpression().Equals("(8) \x00D7 0.5=", StringComparison.InvariantCultureIgnoreCase)); + } + [TestMethod] [Priority(0)] public void SmokeTest_RadianAngleOperator() diff --git a/src/CalculatorUnitTests/CalculatorManagerTest.cpp b/src/CalculatorUnitTests/CalculatorManagerTest.cpp index 73e83c0a..d5b574f7 100644 --- a/src/CalculatorUnitTests/CalculatorManagerTest.cpp +++ b/src/CalculatorUnitTests/CalculatorManagerTest.cpp @@ -643,6 +643,26 @@ namespace CalculatorManagerTest Command commands5[] = { Command::Command2, Command::CommandOPENP, Command::Command2, Command::CommandCLOSEP, Command::CommandADD, Command::CommandEQU, Command::CommandNULL }; TestDriver::Test(L"8", L"2 \x00D7 (2) + 4=", commands5, true, true); + + Command commands6[] = { Command::CommandOPENP, Command::Command8, Command::CommandCLOSEP, Command::Command2, Command::CommandEQU, Command::CommandNULL }; + TestDriver::Test(L"16", L"(8) \x00D7 2=", commands6, true, true); + + Command commands7[] = { Command::CommandOPENP, Command::Command7, Command::CommandMUL, Command::Command2, + Command::CommandCLOSEP, Command::Command2, Command::CommandEQU, Command::CommandNULL }; + TestDriver::Test(L"28", L"(7 \x00D7 2) \x00D7 2=", commands7, true, true); + + Command commands8[] = { Command::CommandOPENP, Command::Command7, Command::CommandMUL, Command::Command2, + Command::CommandCLOSEP, Command::Command2, Command::CommandEQU, + Command::CommandOPENP, Command::Command1, Command::Command4, Command::CommandCLOSEP, Command::Command2, Command::CommandEQU, Command::CommandNULL}; + TestDriver::Test(L"28", L"(14) \x00D7 2=", commands8, true, true); + + Command commands9[] = { Command::CommandOPENP, Command::Command8, Command::CommandCLOSEP, + Command::Command0, Command::CommandPNT, Command::Command5, Command::CommandEQU, Command::CommandNULL }; + TestDriver::Test(L"4", L"(8) \x00D7 0.5=", commands9, true, true); + + Command commands10[] = { Command::CommandOPENP, Command::Command8, Command::CommandCLOSEP, + Command::CommandPNT, Command::Command5, Command::CommandEQU, Command::CommandNULL }; + TestDriver::Test(L"4", L"(8) \x00D7 0.5=", commands10, true, true); } void CalculatorManagerTest::CalculatorManagerTestScientificError() diff --git a/src/GraphingImpl/Mocks/Graph.h b/src/GraphingImpl/Mocks/Graph.h index 3678074c..00335037 100644 --- a/src/GraphingImpl/Mocks/Graph.h +++ b/src/GraphingImpl/Mocks/Graph.h @@ -44,7 +44,7 @@ namespace MockGraphingImpl return m_variables; } - virtual void SetArgValue(std::wstring variableName, double /*value*/) + virtual void SetArgValue(std::wstring /*variableName*/, double /*value*/) { }