Merge branch 'master' of https://github.com/Microsoft/calculator into issue-407

2025-08-22 14:13:30 -07:00 · 2019-04-11 18:22:19 -04:00 · 2019-04-11 18:22:19 -04:00 · 6b579cc03d
commit 6b579cc03d
parent f834445828 f6f10444f7
80 changed files with 1172 additions and 968 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -6,36 +6,45 @@ labels: ''
 assignees: ''
 ---
-<!--Before filing a bug
+<!--
 Before filing a bug
 - Ensure the bug reproduces on the latest version of the app.
- Search existing issues and make sure this issue is not already filed.-->
+- Search existing issues and make sure this issue is not already filed.
 -->
 **Describe the bug**
-<!--A clear and concise description of what the bug is.-->
+<!-- A clear and concise description of what the bug is. -->
 **Steps To Reproduce**
-<!--Steps to reproduce the behavior:
+<!--
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
-4. See error-->
+4. See error
 -->
 **Expected behavior**
-<!--A clear and concise description of what you expected to happen.-->
+<!-- A clear and concise description of what you expected to happen. -->
 **Screenshots**
-<!--If applicable, add screenshots to help explain your problem.-->
+<!-- If applicable, add screenshots to help explain your problem. -->
-**Device and Application Information (please complete the following information):**
+**Device and Application Information**
 - OS Build:
 - Architecture:
 - Application Version:
-
+ - Region: 
-<!--Run the following commands in Powershell and copy/paste the output.
+ - Dev Version Installed: 
 <!--
 Run the following commands in Powershell and copy/paste the output.
 " - OS Build: $([Environment]::OSVersion.Version)"
 " - Architecture: $((Get-AppxPackage -Name Microsoft.WindowsCalculator).Architecture)"
 " - Application Version: $((Get-AppxPackage -Name Microsoft.WindowsCalculator).Version)"
 " - Region: $((Get-Culture).Name)"
 " - Dev Version Installed: $($null -ne (Get-AppxPackage -Name Microsoft.WindowsCalculator.Dev))"
 -->
 **Additional context**
-<!--Add any other context about the problem here.-->
+<!-- Add any other context about the problem here. -->
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -2,42 +2,42 @@
 name: Feature request
 about: Propose a new feature in the app
 title: ''
-labels: ''
+labels: 'Enhancement'
 assignees: ''
 ---
 <!--
-
+See https://github.com/Microsoft/calculator/blob/master/docs/NewFeatureProcess.md for suggestions on how to write a good feature pitch. Just want to submit an idea quickly? Try Feedback Hub instead: https://insider.windows.com/en-us/fb/?contextid=130
 See https://github.com/Microsoft/calculator/blob/master/docs/NewFeatureProcess.md for
 suggestions on how to write a good feature pitch. Just want to submit an idea quickly? Try Feedback
 Hub instead: https://insider.windows.com/en-us/fb/?contextid=130
 -->
 **Problem Statement**
-<!-- What problem are we trying to solve? Who’s the target audience? Is there a customer need or
+<!--
-pain point we need to remedy? Is there a business goal or metric we are trying to improve? Do we
+What problem are we trying to solve? Who’s the target audience? Is there a customer need or pain point we need to remedy? Is there a business goal or metric we are trying to improve? Do we have a hypothesis we want to prove or disprove? 
-have a hypothesis we want to prove or disprove? -->
+-->
 **Evidence or User Insights**
-<!-- Why should we do this? Potential sources of data: Feedback Hub, other GitHub issues, other
+<!--
-anecdotes from listening to customers in person or online, request from another team, telemetry
+Why should we do this? Potential sources of data: Feedback Hub, other GitHub issues, other anecdotes from listening to customers in person or online, request from another team, telemetry data, user research, market or competitive research
-data, user research, market or competitive research -->
+-->
 **Proposal**
-<!-- How will the solution/feature help us solve the problem? How will it meet the target
+<!--
-audience’s needs? If there are business goals or metrics, how does this improve them? -->
+How will the solution/feature help us solve the problem? How will it meet the target audience’s needs? If there are business goals or metrics, how does this improve them?
 -->
 **Goals**
-<!-- What you want to accomplish with this feature. Typical examples include
+<!--
-“User Can *perform some task*” -->
+What you want to accomplish with this feature. Typical examples include
 "User Can *perform some task*"
 -->
 **Non-Goals**
-<!-- Things we are explicitly not doing or supporting or that are out of scope, including reasons
+<!--
-why. -->
+Things we are explicitly not doing or supporting or that are out of scope, including reasons why.
 -->
 **Low-Fidelity Concept**
-<!-- Show as much of the experience as needed to explain the idea. This can be as simple as a
+<!--
-napkin drawing but can also be a code prototype, a PowerPoint walkthrough, or a design
+Show as much of the experience as needed to explain the idea. This can be as simple as a napkin drawing but can also be a code prototype, or a design comp. Keep it simple at this stage, as it can be refined later during the pre-production stage.
-comp. -->
+-->
--- a/.github/ISSUE_TEMPLATE/localization_suggestion.md
+++ b/.github/ISSUE_TEMPLATE/localization_suggestion.md
@ -0,0 +1,54 @@
 ---
 name: Localization Suggestion
 about: Report a problem or suggested change to Calculator's localized content.
 title: '[Localization] '
 labels: 'Area: World-Readiness'
 assignees: ''
 ---
 <!--
 PLEASE NOTE: 
 We cannot _merge_ any suggested localization changes to our localized resources files. These files are automatically generated from an internal localization process.  Any suggestion submitted this way will be duplicated into our internal localization system, and then closed here.
 Alternatively, you can launch feedback-hub://, click on the "Language Community" tab on the left-side of the app, and follow the steps to submit a localization suggestion that way.  (The "Language Community" tab currently will only be visible if your system is running a non-English language).
 Before filing a bug
 - Ensure the bug reproduces on the latest version of the app.
 - Search existing issues and make sure this issue is not already filed.
 -->
 **Describe the bug**
 <!-- A clear and concise description of what the bug is. -->
 **Steps To Reproduce**
 <!--
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 -->
 **Expected behavior**
 <!-- A clear and concise description of what you expected to happen. -->
 **Screenshots**
 <!-- If applicable, add screenshots to help explain your problem. -->
 **Device and Application Information**
 - OS Build:
 - Architecture:
 - Application Version:
 - Region: 
 - Dev Version Installed: 
 <!--
 Run the following commands in Powershell and copy/paste the output.
 " - OS Build: $([Environment]::OSVersion.Version)"
 " - Architecture: $((Get-AppxPackage -Name Microsoft.WindowsCalculator).Architecture)"
 " - Application Version: $((Get-AppxPackage -Name Microsoft.WindowsCalculator).Version)"
 " - Region: $((Get-Culture).Name)"
 " - Dev Version Installed: $($null -ne (Get-AppxPackage -Name Microsoft.WindowsCalculator.Dev))"
 -->
 **Additional context**
 <!-- Add any other context about the problem here. -->
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -3,7 +3,8 @@ The Calculator team encourages community feedback and contributions. Thank you f
 making Calculator better! There are several ways you can get involved.
 ## Reporting issues and suggesting new features
-If Calculator is not working properly, please file a report in the [Feedback Hub](https://insider.windows.com/en-us/fb/?contextid=130&newFeedback=True).
+If Calculator is not working properly, please file a report in the 
 [Feedback Hub](https://insider.windows.com/en-us/fb/?contextid=130&newFeedback=True).
 Feedback Hub reports automatically include diagnostic data, such as the version of Calculator
 you're using.
@ -17,21 +18,38 @@ all community interactions must abide by the [Code of Conduct](CODE_OF_CONDUCT.m
 ## Finding issues you can help with
 Looking for something to work on?
-[Issues marked *good first issue*](https://github.com/Microsoft/calculator/labels/good%20first%20issue)
+Issues marked [``good first issue``](https://github.com/Microsoft/calculator/labels/good%20first%20issue)
 are a good place to start.
-You can also check [the *help wanted* tag](https://github.com/Microsoft/calculator/labels/help%20wanted)
+You can also check the [``help wanted``](https://github.com/Microsoft/calculator/labels/help%20wanted) tag to find 
-to find other issues to help with.
+other issues to help with. If you're interested in working on a fix, leave a comment to let everyone know and to help
 avoid duplicated effort from others.
 ## Contributions we accept
 We welcome your contributions to the Calculator project, especially to fix bugs and to make
-improvements which address the top issues reported by Calculator users.
+improvements which address the top issues reported by Calculator users. Some general guidelines:
-We have a high bar for new features and changes to the user experience. We prefer to evaluate
+* **DO** create one pull request per Issue, and ensure that the Issue is linked in the pull request.
-*prototypes* to ensure that the design meets users' needs before we start discussing implementation
+* **DO** follow our [Coding and Style](#style-guidelines) guidelines, and keep code changes as small as possible.
-details and reviewing code. We follow a [user-centered process for developing features](docs/NewFeatureProcess.md).
+* **DO** include corresponding tests whenever possible.
-New features need sponsorship from the Calculator team, but we welcome community contributions at
+* **DO** check for additional occurrences of the same problem in other parts of the codebase before submitting your PR.
-many stages of the process.
+* **DO** [link the issue](https://github.com/blog/957-introducing-issue-mentions) you are addressing in the 
   pull request.
 * **DO** write a good description for your pull request. More detail is better. Describe *why* the change is being 
   made and *why* you have chosen a particular solution. Describe any manual testing you performed to validate your change.
 * **DO NOT** submit a PR unless it is linked to an Issue marked 
   [`triage approved`](https://github.com/Microsoft/calculator/issues?q=is%3Aissue+is%3Aopen+label%3A%22Triage%3A+Approved%22). 
   This enables us to have a discussion on the idea before anyone invests time in an implementation.
 * **DO NOT** merge multiple changes into one PR unless they have the same root cause.
 * **DO NOT** submit pure formatting/typo changes to code that has not been modified otherwise.
 We follow a [user-centered process for developing features](docs/NewFeatureProcess.md). New features
 need sponsorship from the Calculator team, but we welcome community contributions at many stages of
 the process.
 > Submitting a pull request for an approved Issue is not a guarantee it will be approved.
 > The change must meet our high bar for code quality, architecture, and performance, as well as
 > [other requirements](#docs/NewFeatureProcess.md#technical-review).
 ## Making changes to the code
@ -41,7 +59,8 @@ To learn how to build the code and run tests, follow the instructions in the [RE
 ### Style guidelines
 The code in this project uses several different coding styles, depending on the age and history of
 the code. Please attempt to match the style of surrounding code as much as possible. In new
-components, prefer the patterns described in the [C++ core guidelines](https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines)
+components, prefer the patterns described in the 
 [C++ core guidelines](https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines)
 and the [modern C++/WinRT language projections](https://docs.microsoft.com/en-us/windows/uwp/cpp-and-winrt-apis/).
 ### Testing
@ -61,18 +80,9 @@ to group your changes into a small number of commits which we can review one at
 When completing a pull request, we will generally squash your changes into a single commit. Please
 let us know if your pull request needs to be merged as separate commits.
-## Submitting a pull request and participating in code review
+## Review Process
 Writing a good description for your pull request is crucial to help reviewers and future
 maintainers understand your change. More detail is better.
 - [Link the issue you're addressing in the pull request](https://github.com/blog/957-introducing-issue-mentions).
 - Describe *why* the change is being made and *why* you've chosen a particular solution.
 - Describe any manual testing you performed to validate your change.
 Please submit one pull request per issue. Large pull requests which have unrelated changes can be
 difficult to review.
 After submitting a pull request, members of the calculator team will review your code. We will
-assign the request to an appropriate reviewer within two days. Any member of the community may
+assign the request to an appropriate reviewer. Any member of the community may
 participate in the review, but at least one member of the Calculator team will ultimately approve
 the request.
--- a/docs/NewFeatureProcess.md
+++ b/docs/NewFeatureProcess.md
@ -1,7 +1,8 @@
 # New feature process
 ## Where do I submit my idea for a new feature?
-The easiest way to submit new feature requests is through [Feedback Hub](https://insider.windows.com/en-us/fb/?contextid=130).
+The easiest way to submit new feature requests is through 
 [Feedback Hub](https://insider.windows.com/en-us/fb/?contextid=130).
 In Feedback Hub, any Windows user (even if they aren't on GitHub) can upvote suggestions. The
 Calculator team reviews these suggestions regularly, and when we're ready to work on an idea we
 create [feature pitch issues here on GitHub](https://github.com/Microsoft/calculator/issues?q=is%3Aissue+is%3Aopen+project%3AMicrosoft%2Fcalculator%2F1).
@ -12,73 +13,45 @@ product. The [Feature Tracking board](https://github.com/Microsoft/calculator/pr
 all the features we're working on and where they're at in the process.
 ## Do I need to follow this process? Can I just start coding and submit a PR?
-You *do not* need to follow this process for bug fixes, performance improvements, or changes to the
+You **do not** need to follow this process for bug fixes, performance improvements, or changes to the
-development tools. To contribute these changes, [discuss the proposed change in an issue](https://github.com/Microsoft/calculator/issues/new)
+development tools. To contribute these changes, 
 [discuss the proposed change in an issue](https://github.com/Microsoft/calculator/issues/new)
 and then submit a pull request.
-You *do* need to follow this process for any change which "users will notice". This applies
+You **do** need to follow this process for any change which "users will notice". This applies
 especially to new features and major visual changes.
 ## Step 1: Feature pitch
-The feature pitch concisely describes a point of view on the problem the new feature should solve.
+Feature pitches are submitted as issues on GitHub using the 
-It will typically include these sections:
+[Feature Request template](https://github.com/Microsoft/calculator/issues/new?assignees=&labels=&template=feature_request.md&title=). 
 We encourage discussion on open issues, and as discussion progresses we will edit the issue description to refine the 
 idea until it is ready for review.
-* **Problem Statement**: What problem are we trying to solve? Who’s the target audience? Is there a
+We review pitches regularly, and will approve or close issues based on whether they broadly align with the 
-  customer need or pain point we need to remedy? Is there a business goal or metric we are trying
+[Calculator roadmap](https://github.com/Microsoft/calculator/blob/master/docs/Roadmap.md). Approved pitches are moved 
-  to improve? Do we have a hypothesis we want to prove or disprove?
+into [pre-production](https://github.com/Microsoft/calculator/projects/1) on the feature tracking board.
 * **Evidence or User Insights**: Why should we do this? Potential sources of data: Feedback Hub,
  other GitHub issues, other anecdotes from listening to customers in person or online, request
  from another team, telemetry data, user research, market or competitive research
 * **Proposal**: How will the solution/feature help us solve the problem? How will it meet the
  target audience’s needs? If there are business goals or metrics, how does this improve them?
 * **Goals**: What you want to accomplish with this feature. Typical examples include “User Can
  *perform some task*”
 * **Non-Goals**: Things we are explicitly not doing or supporting or that are out of scope,
  including reasons why.
 * **Low-Fidelity Concept**: Show as much of the experience as needed to explain the idea. This
  can be as simple as a napkin drawing but can also be a code prototype, a PowerPoint walkthrough,
  or a design comp.
 The low-fidelity concept should be kept simple at this stage and refined during the pre-production
 process.
 Feature pitches are submitted as issues on GitHub. We encourage discussion on open issues, and as
 discussion progresses we will edit the issue description to refine the idea.
 ## Step 2: Pre-production
-In the pre-production phase, we experiment with a variety of ways to address the goals described in
+For most features, the output of this phase is a specification which describes how the feature will work, supported by 
-the feature pitch. The output of this phase is a specification which demonstrates how the feature
+design renderings and code prototypes as needed. The original issue will continue to track the overall progress of the 
-will work, supported by design renderings and code prototypes as needed. Sometimes we'll learn new
+feature, but we will create and iterate on spec documentation in the 
-things about a feature proposal during pre-production, and we'll edit or close the original pitch.
+[Calculator Spec repo](https://github.com/Microsoft/calculator-specs). Sometimes we'll learn new things about a feature 
 proposal during pre-production, and we'll edit or close the original pitch.
-We welcome community participation in the pre-production process. The GitHub issue will be the
+We welcome community participation throughout pre-production. The best ideas often come from trying many ideas during 
-primary place to share progress updates.
+the pre-production phase. To enable rapid
 The best ideas often come from trying many ideas during the pre-production phase. To enable rapid
 experimentation, we encourage developing and sharing rough ideas&mdash;maybe even with pencil and
 paper&mdash;before making designs pixel-perfect or making code robust and maintainable.
-### Spec review
+After the [spec review](https://github.com/Microsoft/calculator-specs#spec-review) is completed, we will move the issue 
-Once there is a high-fidelity design which addresses the goals described in the original pitch, the
+into [production](https://github.com/Microsoft/calculator/projects/1) on the feature tracking board. In _some_ cases, 
-Microsoft product team will review the prototype and ensure all items on this checklist are
+all of the details of an idea can be captured concisely in original feature pitch. When that happens, we may move ideas
-addressed:
+directly into production.
 - [ ] Is there a high-fidelity design which gives reviewers a clear idea of how the feature will
  look and function when implemented?
 - [ ] Has the plan been shared with the community (documented on the wiki and updates posted in the
  original issue) and have others been given an opportunity to provide suggestions?
 - [ ] Are [Fluent design principles](https://docs.microsoft.com/en-us/windows/uwp/design/fluent-design-system/)
  followed? If we do something which deviates from the guidelines, do we have a good reason?
 - [ ] Does the design include provisions for [all users](https://docs.microsoft.com/en-us/windows/uwp/design/accessibility/designing-inclusive-software)
  and [all cultures](https://docs.microsoft.com/en-us/windows/uwp/design/globalizing/guidelines-and-checklist-for-globalizing-your-app)?
 - [ ] Is it technically feasible to build this feature? Take a look at the "before committing"
  checklist below and identify any issues which are likely to be blockers.
 ## Step 3: Production
-A feature can be implemented by the original proposer, a Microsoft team member, or by other
+A feature can be implemented by the original submitter, a Microsoft team member, or by other
-community members. Code contributions and testing help are greatly appreciated. Please let us know
+community members. Code contributions and testing help are greatly appreciated. Please let everyone know if you're 
-in the issue comments if you're actively working on a feature so we can ensure it's assigned to
+actively working on a feature to help avoid duplicated efforts from others.
 you.
 You might be able to reuse code written during the prototype process, although there will typically
 be more work required to make the solution robust. Once the code is ready, you can begin
@ -122,7 +95,8 @@ new features, the Microsoft team considers at least these items:
    - [ ] Run the perf tests to measure any increase in startup time. Move work out of the startup
      path if possible.
 - [ ] If the change adds additional logging:
-    - [ ] All logging should use [TraceLogging](https://docs.microsoft.com/en-us/windows/desktop/tracelogging/trace-logging-about).
+    - [ ] All logging should use 
         [TraceLogging](https://docs.microsoft.com/en-us/windows/desktop/tracelogging/trace-logging-about).
    - [ ] Unnecessary log events should be removed, or configured so that they are collected only when
      needed to debug issues or measure feature usage.
 - [ ] If the change reads user data from files or app settings:
--- a/src/CalcManager/CEngine/calc.cpp
+++ b/src/CalcManager/CEngine/calc.cpp
@ -25,13 +25,18 @@ static constexpr wstring_view DEFAULT_NUMBER_STR = L"0";
 // Read strings for keys, errors, trig types, etc.
 // These will be copied from the resources to local memory.
-array<wstring, CSTRINGSENGMAX> CCalcEngine::s_engineStrings;
+unordered_map<wstring, wstring> CCalcEngine::s_engineStrings;
 void CCalcEngine::LoadEngineStrings(CalculationManager::IResourceProvider& resourceProvider)
 {
-    for (size_t i = 0; i < s_engineStrings.size(); i++)
+    for (const auto& sid : g_sids)
    {
-        s_engineStrings[i] = resourceProvider.GetCEngineString(g_sids[i]);
+        auto locKey = wstring{ sid };
        auto locString = resourceProvider.GetCEngineString(locKey);
        if (!locString.empty())
        {
            s_engineStrings[locKey] = locString;
        }
    }
 }
@ -168,7 +173,7 @@ void CCalcEngine::SettingsChanged()
        m_HistoryCollector.SetDecimalSymbol(m_decimalSeparator);
        // put the new decimal symbol into the table used to draw the decimal key
-        s_engineStrings[IDS_DECIMAL] = m_decimalSeparator;
+        s_engineStrings[SIDS_DECIMAL_SEPARATOR] = m_decimalSeparator;
        // we need to redraw to update the decimal point button
        numChanged = true;
--- a/src/CalcManager/CEngine/scicomm.cpp
+++ b/src/CalcManager/CEngine/scicomm.cpp
@ -16,13 +16,6 @@
 #include "Header Files/CalcEngine.h"
 #include "Header Files/CalcUtils.h"
 #define IDC_RADSIN  IDC_UNARYLAST+1
 #define IDC_RADCOS  IDC_UNARYLAST+2
 #define IDC_RADTAN  IDC_UNARYLAST+3
 #define IDC_GRADSIN IDC_UNARYLAST+4
 #define IDC_GRADCOS IDC_UNARYLAST+5
 #define IDC_GRADTAN IDC_UNARYLAST+6
 using namespace std;
 using namespace CalcEngine;
@ -463,45 +456,12 @@ void CCalcEngine::ProcessCommandWorker(OpCode wParam)
            m_HistoryCollector.AddOpndToHistory(m_numberString, m_currentVal);
        }
-        do {
+        // Evaluate the precedence stack.
-
+        ResolveHighestPrecedenceOperation();
-            if (m_nOpCode) /* Is there a valid operation around?        */
+        while (m_fPrecedence && m_precedenceOpCount > 0)
-            {
+        {
-                /* If this is the first EQU in a string, set m_holdVal=m_currentVal */
+            m_precedenceOpCount--;
-                /* Otherwise let m_currentVal=m_holdVal.  This keeps m_currentVal constant */
+            m_nOpCode = m_nPrecOp[m_precedenceOpCount];
                /* through all EQUs in a row.                     */
                if (m_bNoPrevEqu)
                {
                    m_holdVal = m_currentVal;
                }
                else
                {
                    m_currentVal = m_holdVal;
                    DisplayNum(); // to update the m_numberString
                    m_HistoryCollector.AddBinOpToHistory(m_nOpCode, false);
                    m_HistoryCollector.AddOpndToHistory(m_numberString, m_currentVal); // Adding the repeated last op to history
                }
                // Do the current or last operation.
                m_currentVal = DoOperation(m_nOpCode, m_currentVal, m_lastVal);
                m_nPrevOpCode = m_nOpCode;
                m_lastVal = m_currentVal;
                /* Check for errors.  If this wasn't done, DisplayNum */
                /* would immediately overwrite any error message.     */
                if (!m_bError)
                    DisplayNum();
                /* No longer the first EQU.                       */
                m_bNoPrevEqu = false;
            }
            else if (!m_bError)
                DisplayNum();
            if (m_precedenceOpCount == 0 || !m_fPrecedence)
                break;
            m_nOpCode = m_nPrecOp[--m_precedenceOpCount];
            m_lastVal = m_precedenceVals[m_precedenceOpCount];
            // Precedence Inversion check
@ -514,7 +474,9 @@ void CCalcEngine::ProcessCommandWorker(OpCode wParam)
            m_HistoryCollector.PopLastOpndStart();
            m_bNoPrevEqu = true;
-        } while (m_precedenceOpCount >= 0);
+
            ResolveHighestPrecedenceOperation();
        }
        if (!m_bError)
        {
@ -789,6 +751,48 @@ void CCalcEngine::ProcessCommandWorker(OpCode wParam)
 }
 // Helper function to resolve one item on the precedence stack.
 void CCalcEngine::ResolveHighestPrecedenceOperation()
 {
    // Is there a valid operation around?
    if (m_nOpCode)
    {
        // If this is the first EQU in a string, set m_holdVal=m_currentVal 
        // Otherwise let m_currentVal=m_holdVal.  This keeps m_currentVal constant 
        // through all EQUs in a row.
        if (m_bNoPrevEqu)
        {
            m_holdVal = m_currentVal;
        }
        else
        {
            m_currentVal = m_holdVal;
            DisplayNum(); // to update the m_numberString
            m_HistoryCollector.AddBinOpToHistory(m_nOpCode, false);
            m_HistoryCollector.AddOpndToHistory(m_numberString, m_currentVal); // Adding the repeated last op to history
        }
        // Do the current or last operation.
        m_currentVal = DoOperation(m_nOpCode, m_currentVal, m_lastVal);
        m_nPrevOpCode = m_nOpCode;
        m_lastVal = m_currentVal;
        // Check for errors.  If this wasn't done, DisplayNum
        // would immediately overwrite any error message.
        if (!m_bError)
        {
            DisplayNum();
        }
        // No longer the first EQU.
        m_bNoPrevEqu = false;
    }
    else if (!m_bError)
    {
        DisplayNum();
    }
 }
 // CheckAndAddLastBinOpToHistory
 //
 //  This is a very confusing helper routine to add the last entered binary operator to the history. This is expected to
@ -857,155 +861,94 @@ void CCalcEngine::DisplayAnnounceBinaryOperator()
 // Unary operator Function Name table Element
 // since unary operators button names aren't exactly friendly for history purpose,
 // we have this separate table to get its localized name and for its Inv function if it exists.
-typedef struct
+struct FunctionNameElement
 {
-    int idsFunc;    // index of string for the unary op function. Can be NULL, in which case it same as button name
+    wstring degreeString; // Used by default if there are no rad or grad specific strings.
-    int idsFuncInv; // index of string for Inv of unary op. Can be NULL, in case it is same as idsFunc
+    wstring inverseDegreeString; // Will fall back to degreeString if empty
-    bool fDontUseInExpEval;  // true if this cant be used in reverse direction as well, ie. during expression evaluation
+
-} UFNE;
+    wstring radString;
    wstring inverseRadString; // Will fall back to radString if empty
    wstring gradString;
    wstring inverseGradString; // Will fall back to gradString if empty
    bool hasAngleStrings = ((!radString.empty()) || (!inverseRadString.empty()) || (!gradString.empty()) || (!inverseGradString.empty()));
 };
 // Table for each unary operator
-static const UFNE rgUfne[] =
+static const std::unordered_map<int, FunctionNameElement> unaryOperatorStringTable =
 {
-    /* IDC_CHOP  */{ 0, IDS_FRAC, false },
+    { IDC_CHOP, { L"", SIDS_FRAC} },
    /* IDC_ROL   */{ 0, 0, true },
    /* IDC_ROR   */{ 0, 0, true },
-    /* IDC_COM   */{ 0, 0, true },
+    { IDC_SIN, { SIDS_SIND, SIDS_ASIND, SIDS_SINR, SIDS_ASINR, SIDS_SING, SIDS_ASING } },
-    /* IDC_SIN    */{ IDS_SIND, IDS_ASIND, false },   // default in this table is degrees for sin,cos & tan
+    { IDC_COS, { SIDS_COSD, SIDS_ACOSD, SIDS_COSR, SIDS_ACOSR, SIDS_COSG, SIDS_ACOSG } },
-    /* IDC_COS   */{ IDS_COSD, IDS_ACOSD, false },
+    { IDC_TAN, { SIDS_TAND, SIDS_ATAND, SIDS_TANR, SIDS_ATANR, SIDS_TANG, SIDS_ATANG } },
    /* IDC_TAN   */{ IDS_TAND, IDS_ATAND, false },
-    /* IDC_SINH    */{ 0, IDS_ASINH, false },
+    { IDC_SINH, { L"", SIDS_ASINH } },
-    /* IDC_COSH   */{ 0, IDS_ACOSH, false },
+    { IDC_COSH, { L"", SIDS_ACOSH } },
-    /* IDC_TANH   */{ 0, IDS_ATANH, false },
+    { IDC_TANH, { L"", SIDS_ATANH } },
-    /* IDC_LN     */{ 0, IDS_POWE, false },
+    { IDC_LN , { L"", SIDS_POWE } },
-    /* IDC_LOG   */{ 0, 0, false },
+    { IDC_SQR, { SIDS_SQR } },
-    /* IDC_SQRT */{ 0, 0, false },
+    { IDC_CUB, { SIDS_CUBE } },
-    /* IDC_SQR   */{ IDS_SQR, 0, false },
+    { IDC_FAC, { SIDS_FACT } },
-    /* IDC_CUB   */{ IDS_CUBE, 0, false },
+    { IDC_REC, { SIDS_RECIPROC } },
-    /* IDC_FAC   */{ IDS_FACT, 0, false },
+    { IDC_DMS, { L"", SIDS_DEGREES } },
-    /* IDC_REC   */{ IDS_REC, 0, false },
+    { IDC_SIGN, { SIDS_NEGATE } },
-    /* IDC_DMS  */{ 0, IDS_DEGREES, false },
+    { IDC_DEGREES, { SIDS_DEGREES } }
    /* IDC_CUBEROOT  */{ 0, 0, false },
    /* IDC_POW10  */{ 0, 0, false },
    /* IDC_PERCENT  */{ 0, 0, false },
    /* IDC_RADSIN  */{ IDS_SINR, IDS_ASINR, false },
    /* IDC_RADCOS  */{ IDS_COSR, IDS_ACOSR, false },
    /* IDC_RADTAN  */{ IDS_TANR, IDS_ATANR, false },
    /* IDC_GRADCOS  */{ IDS_SING, IDS_ASING, false },
    /* IDC_GRADCOS  */{ IDS_COSG, IDS_ACOSG, false },
    /* IDC_GRADTAN  */{ IDS_TANG, IDS_ATANG, false },
 };
 wstring_view CCalcEngine::OpCodeToUnaryString(int nOpCode, bool fInv, ANGLE_TYPE angletype)
 {
    // Special cases for Sign and Degrees
    if (IDC_SIGN == nOpCode)
    {
        return GetString(IDS_NEGATE);
    }
    if (IDC_DEGREES == nOpCode)
    {
        return GetString(IDS_DEGREES);
    }
    // Correct the trigonometric functions with type of angle argument they take
    if (ANGLE_RAD == angletype)
    {
        switch (nOpCode)
        {
        case IDC_SIN:
            nOpCode = IDC_RADSIN;
            break;
        case IDC_COS:
            nOpCode = IDC_RADCOS;
            break;
        case IDC_TAN:
            nOpCode = IDC_RADTAN;
            break;
        }
    }
    else if (ANGLE_GRAD == angletype)
    {
        switch (nOpCode)
        {
        case IDC_SIN:
            nOpCode = IDC_GRADSIN;
            break;
        case IDC_COS:
            nOpCode = IDC_GRADCOS;
            break;
        case IDC_TAN:
            nOpCode = IDC_GRADTAN;
            break;
        }
    }
    // Try to lookup the ID in the UFNE table
-    int ids = 0;
+    wstring ids = L"";
-    int iufne = nOpCode - IDC_UNARYFIRST;
+
-    if (iufne >= 0 && (size_t)iufne < size(rgUfne))
+    if (auto pair = unaryOperatorStringTable.find(nOpCode); pair != unaryOperatorStringTable.end())
    {
-        if (fInv)
+        const FunctionNameElement& element = pair->second;
        if (!element.hasAngleStrings || ANGLE_DEG == angletype)
        {
-            ids = rgUfne[iufne].idsFuncInv;
+            if (fInv)
            {
                ids = element.inverseDegreeString;
            }
            if (ids.empty())
            {
                ids = element.degreeString;
            }
        }
-        if (0 == ids)
+        else if (ANGLE_RAD == angletype)
        {
-            ids = rgUfne[iufne].idsFunc;
+            if (fInv)
            {
                ids = element.inverseRadString;
            }
            if (ids.empty())
            {
                ids = element.radString;
            }
        }
        else if (ANGLE_GRAD == angletype)
        {
            if (fInv)
            {
                ids = element.inverseGradString;
            }
            if (ids.empty())
            {
                ids = element.gradString;
            }
        }
    }
    if (!ids.empty())
    {
        return GetString(ids);
    }
    // If we didn't find an ID in the table, use the op code.
-    if (0 == ids)
+    return OpCodeToString(nOpCode);
    {
        ids = IdStrFromCmdId(nOpCode);
    }
    return GetString(ids);
 }
 //
 // Sets the Angle Mode for special unary op IDC's which are used to index to the table rgUfne
 // and returns the equivalent plain IDC for trigonometric function. If it isn't a trigonometric function
 // returns the passed in idc itself.
 int CCalcEngine::IdcSetAngleTypeDecMode(int idc)
 {
    int idcAngleCmd = IDM_DEG;
    switch (idc)
    {
    case IDC_RADSIN:
        idcAngleCmd = IDM_RAD;
        idc = IDC_SIN;
        break;
    case IDC_RADCOS:
        idcAngleCmd = IDM_RAD;
        idc = IDC_COS;
        break;
    case IDC_RADTAN:
        idcAngleCmd = IDM_RAD;
        idc = IDC_TAN;
        break;
    case IDC_GRADSIN:
        idcAngleCmd = IDM_GRAD;
        idc = IDC_SIN;
        break;
    case IDC_GRADCOS:
        idcAngleCmd = IDM_GRAD;
        idc = IDC_COS;
        break;
    case IDC_GRADTAN:
        idcAngleCmd = IDM_GRAD;
        idc = IDC_TAN;
        break;
    }
    ProcessCommand(idcAngleCmd);
    return idc;
 }
 bool CCalcEngine::IsCurrentTooBigForTrig()
--- a/src/CalcManager/Header
+++ b/src/CalcManager/Header
@ -72,7 +72,8 @@ public:
    // Static methods for the instance
    static void InitialOneTimeOnlySetup(CalculationManager::IResourceProvider& resourceProvider); // Once per load time to call to initialize all shared global variables
    // returns the ptr to string representing the operator. Mostly same as the button, but few special cases for x^y etc.
-    static std::wstring_view GetString(int ids) { return s_engineStrings[ids]; }
+    static std::wstring_view GetString(int ids) { return s_engineStrings[std::to_wstring(ids)]; }
    static std::wstring_view GetString(std::wstring ids) { return s_engineStrings[ids]; }
    static std::wstring_view OpCodeToString(int nOpCode) { return GetString(IdStrFromCmdId(nOpCode)); }
    static std::wstring_view OpCodeToUnaryString(int nOpCode, bool fInv, ANGLE_TYPE angletype);
@ -123,12 +124,13 @@ private:
    std::array<CalcEngine::Rational, NUM_WIDTH_LENGTH> m_chopNumbers; // word size enforcement
    std::array<std::wstring, NUM_WIDTH_LENGTH> m_maxDecimalValueStrings; // maximum values represented by a given word width based off m_chopNumbers
-    static std::array<std::wstring, CSTRINGSENGMAX> s_engineStrings; // the string table shared across all instances
+    static std::unordered_map<std::wstring, std::wstring> s_engineStrings; // the string table shared across all instances
    wchar_t m_decimalSeparator;
    wchar_t m_groupSeparator;
 private:
    void ProcessCommandWorker(OpCode wParam);
    void ResolveHighestPrecedenceOperation();
    void HandleErrorCommand(OpCode idc);
    void HandleMaxDigitsReached();
    void DisplayNum(void);
@ -145,12 +147,11 @@ private:
    bool TryToggleBit(CalcEngine::Rational& rat, uint32_t wbitno);
    void CheckAndAddLastBinOpToHistory(bool addToHistory = true);
    int IdcSetAngleTypeDecMode(int idc);
    void InitChopNumbers();
    static void LoadEngineStrings(CalculationManager::IResourceProvider& resourceProvider);
-    static int IdStrFromCmdId(int id) { return id - IDC_FIRSTCONTROL + IDS_FIRSTENGSTR; }
+    static int IdStrFromCmdId(int id) { return id - IDC_FIRSTCONTROL + IDS_ENGINESTR_FIRST; }
    static std::vector<uint32_t> DigitGroupingStringToGroupingVector(std::wstring_view groupingString);
    std::wstring GroupDigits(std::wstring_view delimiter, std::vector<uint32_t> const& grouping, std::wstring_view displayString, bool isNumNegative = false);
--- a/src/CalcManager/Header
+++ b/src/CalcManager/Header
@ -13,327 +13,279 @@
 * Created: 13-Feb-2008
 *
 \****************************************************************************/
-#define IDS_FIRSTENGSTR     IDS_ENGINESTR_FIRST
+inline constexpr auto IDS_ERRORS_FIRST = 99;
 #define IDS_DECIMAL     4
 // All unary op function names for easy history reading
 // This is where the first string after all the commands in order have been placed, should be placed
 // keeping in consecutive helps us to allocate 1 string table and index them
 #define IDS_FNSZFIRST   (IDC_F -IDC_FIRSTCONTROL)+1
 #define IDS_FRAC        IDS_FNSZFIRST
 #define IDS_SIND        IDS_FNSZFIRST+1
 #define IDS_COSD        IDS_FNSZFIRST+2
 #define IDS_TAND        IDS_FNSZFIRST+3
 #define IDS_ASIND       IDS_FNSZFIRST+4
 #define IDS_ACOSD       IDS_FNSZFIRST+5
 #define IDS_ATAND       IDS_FNSZFIRST+6
 #define IDS_SINR        IDS_FNSZFIRST+7
 #define IDS_COSR        IDS_FNSZFIRST+8
 #define IDS_TANR        IDS_FNSZFIRST+9
 #define IDS_ASINR       IDS_FNSZFIRST+10
 #define IDS_ACOSR       IDS_FNSZFIRST+11
 #define IDS_ATANR       IDS_FNSZFIRST+12
 #define IDS_SING        IDS_FNSZFIRST+13
 #define IDS_COSG        IDS_FNSZFIRST+14
 #define IDS_TANG        IDS_FNSZFIRST+15
 #define IDS_ASING       IDS_FNSZFIRST+16
 #define IDS_ACOSG       IDS_FNSZFIRST+17
 #define IDS_ATANG       IDS_FNSZFIRST+18
 #define IDS_ASINH       IDS_FNSZFIRST+19
 #define IDS_ACOSH       IDS_FNSZFIRST+20
 #define IDS_ATANH       IDS_FNSZFIRST+21
 #define IDS_POWE        IDS_FNSZFIRST+22
 #define IDS_POW10       IDS_FNSZFIRST+23
 #define IDS_SQRT        IDS_FNSZFIRST+24
 #define IDS_SQR         IDS_FNSZFIRST+25
 #define IDS_CUBE        IDS_FNSZFIRST+26
 #define IDS_CUBERT      IDS_FNSZFIRST+27
 #define IDS_FACT        IDS_FNSZFIRST+28
 #define IDS_REC         IDS_FNSZFIRST+29
 #define IDS_DEGREES     IDS_FNSZFIRST+30
 #define IDS_NEGATE      IDS_FNSZFIRST+31
 #define IDS_RSH         IDS_FNSZFIRST+32
 #define IDS_FNSZLAST    IDS_RSH
 #define IDS_ERRORS_FIRST     IDS_FNSZLAST+1
 // This is the list of error strings corresponding to SCERR_DIVIDEZERO..
-#define IDS_DIVBYZERO           IDS_ERRORS_FIRST
+inline constexpr auto IDS_DIVBYZERO = IDS_ERRORS_FIRST;
-#define IDS_DOMAIN              IDS_ERRORS_FIRST+1
+inline constexpr auto IDS_DOMAIN = IDS_ERRORS_FIRST + 1;
-#define IDS_UNDEFINED           IDS_ERRORS_FIRST+2
+inline constexpr auto IDS_UNDEFINED = IDS_ERRORS_FIRST + 2;
-#define IDS_POS_INFINITY        IDS_ERRORS_FIRST+3
+inline constexpr auto IDS_POS_INFINITY = IDS_ERRORS_FIRST + 3;
-#define IDS_NEG_INFINITY        IDS_ERRORS_FIRST+4
+inline constexpr auto IDS_NEG_INFINITY = IDS_ERRORS_FIRST + 4;
-#define IDS_NOMEM               IDS_ERRORS_FIRST+6
+inline constexpr auto IDS_NOMEM = IDS_ERRORS_FIRST + 6;
-#define IDS_TOOMANY             IDS_ERRORS_FIRST+7
+inline constexpr auto IDS_TOOMANY = IDS_ERRORS_FIRST + 7;
-#define IDS_OVERFLOW            IDS_ERRORS_FIRST+8
+inline constexpr auto IDS_OVERFLOW = IDS_ERRORS_FIRST + 8;
-#define IDS_NORESULT            IDS_ERRORS_FIRST+9
+inline constexpr auto IDS_NORESULT = IDS_ERRORS_FIRST + 9;
-#define IDS_INSUFFICIENT_DATA   IDS_ERRORS_FIRST+10
+inline constexpr auto IDS_INSUFFICIENT_DATA = IDS_ERRORS_FIRST + 10;
-#define CSTRINGSENGMAX       IDS_INSUFFICIENT_DATA+1
+inline constexpr auto CSTRINGSENGMAX = IDS_INSUFFICIENT_DATA + 1;
 // Arithmetic expression evaluator error strings
-#define IDS_ERR_UNK_CH           CSTRINGSENGMAX+1
+inline constexpr auto IDS_ERR_UNK_CH = CSTRINGSENGMAX + 1;
-#define IDS_ERR_UNK_FN           CSTRINGSENGMAX+2
+inline constexpr auto IDS_ERR_UNK_FN = CSTRINGSENGMAX + 2;
-#define IDS_ERR_UNEX_NUM         CSTRINGSENGMAX+3
+inline constexpr auto IDS_ERR_UNEX_NUM = CSTRINGSENGMAX + 3;
-#define IDS_ERR_UNEX_CH          CSTRINGSENGMAX+4
+inline constexpr auto IDS_ERR_UNEX_CH = CSTRINGSENGMAX + 4;
-#define IDS_ERR_UNEX_SZ          CSTRINGSENGMAX+5
+inline constexpr auto IDS_ERR_UNEX_SZ = CSTRINGSENGMAX + 5;
-#define IDS_ERR_MISMATCH_CLOSE   CSTRINGSENGMAX+6
+inline constexpr auto IDS_ERR_MISMATCH_CLOSE = CSTRINGSENGMAX + 6;
-#define IDS_ERR_UNEX_END         CSTRINGSENGMAX+7
+inline constexpr auto IDS_ERR_UNEX_END = CSTRINGSENGMAX + 7;
-#define IDS_ERR_SG_INV_ERROR     CSTRINGSENGMAX+8
+inline constexpr auto IDS_ERR_SG_INV_ERROR = CSTRINGSENGMAX + 8;
-#define IDS_ERR_INPUT_OVERFLOW   CSTRINGSENGMAX+9
+inline constexpr auto IDS_ERR_INPUT_OVERFLOW = CSTRINGSENGMAX + 9;
-#define IDS_ERR_OUTPUT_OVERFLOW  CSTRINGSENGMAX+10
+inline constexpr auto IDS_ERR_OUTPUT_OVERFLOW = CSTRINGSENGMAX + 10;
-
+// Resource keys for CEngineStrings.resw
-#define SIDS_PLUS_MINUS L"0"
+inline constexpr auto SIDS_PLUS_MINUS = L"0";
-#define SIDS_CLEAR L"1"
+inline constexpr auto SIDS_CLEAR = L"1";
-#define SIDS_CE L"2"
+inline constexpr auto SIDS_CE = L"2";
-#define SIDS_BACKSPACE L"3"
+inline constexpr auto SIDS_BACKSPACE = L"3";
-#define SIDS_DECIMAL_SEPARATOR L"4"
+inline constexpr auto SIDS_DECIMAL_SEPARATOR = L"4";
-#define SIDS_EMPTY_STRING L"5"
+inline constexpr auto SIDS_EMPTY_STRING = L"5";
-#define SIDS_AND L"6"
+inline constexpr auto SIDS_AND = L"6";
-#define SIDS_OR L"7"
+inline constexpr auto SIDS_OR = L"7";
-#define SIDS_XOR L"8"
+inline constexpr auto SIDS_XOR = L"8";
-#define SIDS_LSH L"9"
+inline constexpr auto SIDS_LSH = L"9";
-#define SIDS_RSH L"10"
+inline constexpr auto SIDS_RSH = L"10";
-#define SIDS_DIVIDE L"11"
+inline constexpr auto SIDS_DIVIDE = L"11";
-#define SIDS_MULTIPLY L"12"
+inline constexpr auto SIDS_MULTIPLY = L"12";
-#define SIDS_PLUS L"13"
+inline constexpr auto SIDS_PLUS = L"13";
-#define SIDS_MINUS L"14"
+inline constexpr auto SIDS_MINUS = L"14";
-#define SIDS_MOD L"15"
+inline constexpr auto SIDS_MOD = L"15";
-#define SIDS_YROOT L"16"
+inline constexpr auto SIDS_YROOT = L"16";
-#define SIDS_POW_HAT L"17"
+inline constexpr auto SIDS_POW_HAT = L"17";
-#define SIDS_INT L"18"
+inline constexpr auto SIDS_INT = L"18";
-#define SIDS_ROL L"19"
+inline constexpr auto SIDS_ROL = L"19";
-#define SIDS_ROR L"20"
+inline constexpr auto SIDS_ROR = L"20";
-#define SIDS_NOT L"21"
+inline constexpr auto SIDS_NOT = L"21";
-#define SIDS_SIN L"22"
+inline constexpr auto SIDS_SIN = L"22";
-#define SIDS_COS L"23"
+inline constexpr auto SIDS_COS = L"23";
-#define SIDS_TAN L"24"
+inline constexpr auto SIDS_TAN = L"24";
-#define SIDS_SINH L"25"
+inline constexpr auto SIDS_SINH = L"25";
-#define SIDS_COSH L"26"
+inline constexpr auto SIDS_COSH = L"26";
-#define SIDS_TANH L"27"
+inline constexpr auto SIDS_TANH = L"27";
-#define SIDS_LN L"28"
+inline constexpr auto SIDS_LN = L"28";
-#define SIDS_LOG L"29"
+inline constexpr auto SIDS_LOG = L"29";
-#define SIDS_SQRT L"30"
+inline constexpr auto SIDS_SQRT = L"30";
-#define SIDS_XPOW2 L"31"
+inline constexpr auto SIDS_XPOW2 = L"31";
-#define SIDS_XPOW3 L"32"
+inline constexpr auto SIDS_XPOW3 = L"32";
-#define SIDS_NFACTORIAL L"33"
+inline constexpr auto SIDS_NFACTORIAL = L"33";
-#define SIDS_RECIPROCAL L"34"
+inline constexpr auto SIDS_RECIPROCAL = L"34";
-#define SIDS_DMS L"35"
+inline constexpr auto SIDS_DMS = L"35";
-#define SIDS_CUBEROOT L"36"
+inline constexpr auto SIDS_CUBEROOT = L"36";
-#define SIDS_POWTEN L"37"
+inline constexpr auto SIDS_POWTEN = L"37";
-#define SIDS_PERCENT L"38"
+inline constexpr auto SIDS_PERCENT = L"38";
-#define SIDS_SCIENTIFIC_NOTATION L"39"
+inline constexpr auto SIDS_SCIENTIFIC_NOTATION = L"39";
-#define SIDS_PI L"40"
+inline constexpr auto SIDS_PI = L"40";
-#define SIDS_EQUAL L"41"
+inline constexpr auto SIDS_EQUAL = L"41";
-#define SIDS_MC L"42"
+inline constexpr auto SIDS_MC = L"42";
-#define SIDS_MR L"43"
+inline constexpr auto SIDS_MR = L"43";
-#define SIDS_MS L"44"
+inline constexpr auto SIDS_MS = L"44";
-#define SIDS_MPLUS L"45"
+inline constexpr auto SIDS_MPLUS = L"45";
-#define SIDS_MMINUS L"46"
+inline constexpr auto SIDS_MMINUS = L"46";
-#define SIDS_EXP L"47"
+inline constexpr auto SIDS_EXP = L"47";
-#define SIDS_OPEN_PAREN L"48"
+inline constexpr auto SIDS_OPEN_PAREN = L"48";
-#define SIDS_CLOSE_PAREN L"49"
+inline constexpr auto SIDS_CLOSE_PAREN = L"49";
-#define SIDS_0 L"50"
+inline constexpr auto SIDS_0 = L"50";
-#define SIDS_1 L"51"
+inline constexpr auto SIDS_1 = L"51";
-#define SIDS_2 L"52"
+inline constexpr auto SIDS_2 = L"52";
-#define SIDS_3 L"53"
+inline constexpr auto SIDS_3 = L"53";
-#define SIDS_4 L"54"
+inline constexpr auto SIDS_4 = L"54";
-#define SIDS_5 L"55"
+inline constexpr auto SIDS_5 = L"55";
-#define SIDS_6 L"56"
+inline constexpr auto SIDS_6 = L"56";
-#define SIDS_7 L"57"
+inline constexpr auto SIDS_7 = L"57";
-#define SIDS_8 L"58"
+inline constexpr auto SIDS_8 = L"58";
-#define SIDS_9 L"59"
+inline constexpr auto SIDS_9 = L"59";
-#define SIDS_A L"60"
+inline constexpr auto SIDS_A = L"60";
-#define SIDS_B L"61"
+inline constexpr auto SIDS_B = L"61";
-#define SIDS_C L"62"
+inline constexpr auto SIDS_C = L"62";
-#define SIDS_D L"63"
+inline constexpr auto SIDS_D = L"63";
-#define SIDS_E L"64"
+inline constexpr auto SIDS_E = L"64";
-#define SIDS_F L"65"
+inline constexpr auto SIDS_F = L"65";
-#define SIDS_FRAC L"66"
+inline constexpr auto SIDS_FRAC = L"66";
-#define SIDS_SIND L"67"
+inline constexpr auto SIDS_SIND = L"67";
-#define SIDS_COSD L"68"
+inline constexpr auto SIDS_COSD = L"68";
-#define SIDS_TAND L"69"
+inline constexpr auto SIDS_TAND = L"69";
-#define SIDS_ASIND L"70"
+inline constexpr auto SIDS_ASIND = L"70";
-#define SIDS_ACOSD L"71"
+inline constexpr auto SIDS_ACOSD = L"71";
-#define SIDS_ATAND L"72"
+inline constexpr auto SIDS_ATAND = L"72";
-#define SIDS_SINR L"73"
+inline constexpr auto SIDS_SINR = L"73";
-#define SIDS_COSR L"74"
+inline constexpr auto SIDS_COSR = L"74";
-#define SIDS_TANR L"75"
+inline constexpr auto SIDS_TANR = L"75";
-#define SIDS_ASINR L"76"
+inline constexpr auto SIDS_ASINR = L"76";
-#define SIDS_ACOSR L"77"
+inline constexpr auto SIDS_ACOSR = L"77";
-#define SIDS_ATANR L"78"
+inline constexpr auto SIDS_ATANR = L"78";
-#define SIDS_SING L"79"
+inline constexpr auto SIDS_SING = L"79";
-#define SIDS_COSG L"80"
+inline constexpr auto SIDS_COSG = L"80";
-#define SIDS_TANG L"81"
+inline constexpr auto SIDS_TANG = L"81";
-#define SIDS_ASING L"82"
+inline constexpr auto SIDS_ASING = L"82";
-#define SIDS_ACOSG L"83"
+inline constexpr auto SIDS_ACOSG = L"83";
-#define SIDS_ATANG L"84"
+inline constexpr auto SIDS_ATANG = L"84";
-#define SIDS_ASINH L"85"
+inline constexpr auto SIDS_ASINH = L"85";
-#define SIDS_ACOSH L"86"
+inline constexpr auto SIDS_ACOSH = L"86";
-#define SIDS_ATANH L"87"
+inline constexpr auto SIDS_ATANH = L"87";
-#define SIDS_POWE L"88"
+inline constexpr auto SIDS_POWE = L"88";
-#define SIDS_POWTEN2 L"89"
+inline constexpr auto SIDS_POWTEN2 = L"89";
-#define SIDS_SQRT2 L"90"
+inline constexpr auto SIDS_SQRT2 = L"90";
-#define SIDS_SQR L"91"
+inline constexpr auto SIDS_SQR = L"91";
-#define SIDS_CUBE L"92"
+inline constexpr auto SIDS_CUBE = L"92";
-#define SIDS_CUBERT L"93"
+inline constexpr auto SIDS_CUBERT = L"93";
-#define SIDS_FACT L"94"
+inline constexpr auto SIDS_FACT = L"94";
-#define SIDS_RECIPROC L"95"
+inline constexpr auto SIDS_RECIPROC = L"95";
-#define SIDS_DEGREES L"96"
+inline constexpr auto SIDS_DEGREES = L"96";
-#define SIDS_NEGATE L"97"
+inline constexpr auto SIDS_NEGATE = L"97";
-#define SIDS_RSH2 L"98"
+inline constexpr auto SIDS_RSH2 = L"98";
-#define SIDS_DIVIDEBYZERO L"99"
+inline constexpr auto SIDS_DIVIDEBYZERO = L"99";
-#define SIDS_DOMAIN L"100"
+inline constexpr auto SIDS_DOMAIN = L"100";
-#define SIDS_UNDEFINED L"101"
+inline constexpr auto SIDS_UNDEFINED = L"101";
-#define SIDS_POS_INFINITY L"102"
+inline constexpr auto SIDS_POS_INFINITY = L"102";
-#define SIDS_NEG_INFINITY L"103"
+inline constexpr auto SIDS_NEG_INFINITY = L"103";
-#define SIDS_ABORTED L"104"
+inline constexpr auto SIDS_ABORTED = L"104";
-#define SIDS_NOMEM L"105"
+inline constexpr auto SIDS_NOMEM = L"105";
-#define SIDS_TOOMANY L"106"
+inline constexpr auto SIDS_TOOMANY = L"106";
-#define SIDS_OVERFLOW L"107"
+inline constexpr auto SIDS_OVERFLOW = L"107";
-#define SIDS_NORESULT L"108"
+inline constexpr auto SIDS_NORESULT = L"108";
-#define SIDS_INSUFFICIENT_DATA L"109"
+inline constexpr auto SIDS_INSUFFICIENT_DATA = L"109";
 // 110 is skipped by CSTRINGSENGMAX
-#define SIDS_ERR_UNK_CH L"111"
+inline constexpr auto SIDS_ERR_UNK_CH = L"111";
-#define SIDS_ERR_UNK_FN L"112"
+inline constexpr auto SIDS_ERR_UNK_FN = L"112";
-#define SIDS_ERR_UNEX_NUM L"113"
+inline constexpr auto SIDS_ERR_UNEX_NUM = L"113";
-#define SIDS_ERR_UNEX_CH L"114"
+inline constexpr auto SIDS_ERR_UNEX_CH = L"114";
-#define SIDS_ERR_UNEX_SZ L"115"
+inline constexpr auto SIDS_ERR_UNEX_SZ = L"115";
-#define SIDS_ERR_MISMATCH_CLOSE L"116"
+inline constexpr auto SIDS_ERR_MISMATCH_CLOSE = L"116";
-#define SIDS_ERR_UNEX_END L"117"
+inline constexpr auto SIDS_ERR_UNEX_END = L"117";
-#define SIDS_ERR_SG_INV_ERROR L"118"
+inline constexpr auto SIDS_ERR_SG_INV_ERROR = L"118";
-#define SIDS_ERR_INPUT_OVERFLOW L"119"
+inline constexpr auto SIDS_ERR_INPUT_OVERFLOW = L"119";
-#define SIDS_ERR_OUTPUT_OVERFLOW L"120"
+inline constexpr auto SIDS_ERR_OUTPUT_OVERFLOW = L"120";
-__declspec(selectany) std::wstring g_sids[] =
+// Include the resource key ID from above into this vector to load it into memory for the engine to use
 inline constexpr std::array<std::wstring_view, 120> g_sids =
 {
-    std::wstring(SIDS_PLUS_MINUS),
+    SIDS_PLUS_MINUS,
-    std::wstring(SIDS_C),
+    SIDS_C,
-    std::wstring(SIDS_CE),
+    SIDS_CE,
-    std::wstring(SIDS_BACKSPACE),
+    SIDS_BACKSPACE,
-    std::wstring(SIDS_DECIMAL_SEPARATOR),
+    SIDS_DECIMAL_SEPARATOR,
-    std::wstring(SIDS_EMPTY_STRING),
+    SIDS_EMPTY_STRING,
-    std::wstring(SIDS_AND),
+    SIDS_AND,
-    std::wstring(SIDS_OR),
+    SIDS_OR,
-    std::wstring(SIDS_XOR),
+    SIDS_XOR,
-    std::wstring(SIDS_LSH),
+    SIDS_LSH,
-    std::wstring(SIDS_RSH),
+    SIDS_RSH,
-    std::wstring(SIDS_DIVIDE),
+    SIDS_DIVIDE,
-    std::wstring(SIDS_MULTIPLY),
+    SIDS_MULTIPLY,
-    std::wstring(SIDS_PLUS),
+    SIDS_PLUS,
-    std::wstring(SIDS_MINUS),
+    SIDS_MINUS,
-    std::wstring(SIDS_MOD),
+    SIDS_MOD,
-    std::wstring(SIDS_YROOT),
+    SIDS_YROOT,
-    std::wstring(SIDS_POW_HAT),
+    SIDS_POW_HAT,
-    std::wstring(SIDS_INT),
+    SIDS_INT,
-    std::wstring(SIDS_ROL),
+    SIDS_ROL,
-    std::wstring(SIDS_ROR),
+    SIDS_ROR,
-    std::wstring(SIDS_NOT),
+    SIDS_NOT,
-    std::wstring(SIDS_SIN),
+    SIDS_SIN,
-    std::wstring(SIDS_COS),
+    SIDS_COS,
-    std::wstring(SIDS_TAN),
+    SIDS_TAN,
-    std::wstring(SIDS_SINH),
+    SIDS_SINH,
-    std::wstring(SIDS_COSH),
+    SIDS_COSH,
-    std::wstring(SIDS_TANH),
+    SIDS_TANH,
-    std::wstring(SIDS_LN),
+    SIDS_LN,
-    std::wstring(SIDS_LOG),
+    SIDS_LOG,
-    std::wstring(SIDS_SQRT),
+    SIDS_SQRT,
-    std::wstring(SIDS_XPOW2),
+    SIDS_XPOW2,
-    std::wstring(SIDS_XPOW3),
+    SIDS_XPOW3,
-    std::wstring(SIDS_NFACTORIAL),
+    SIDS_NFACTORIAL,
-    std::wstring(SIDS_RECIPROCAL),
+    SIDS_RECIPROCAL,
-    std::wstring(SIDS_DMS),
+    SIDS_DMS,
-    std::wstring(SIDS_CUBEROOT),
+    SIDS_CUBEROOT,
-    std::wstring(SIDS_POWTEN),
+    SIDS_POWTEN,
-    std::wstring(SIDS_PERCENT),
+    SIDS_PERCENT,
-    std::wstring(SIDS_SCIENTIFIC_NOTATION),
+    SIDS_SCIENTIFIC_NOTATION,
-    std::wstring(SIDS_PI),
+    SIDS_PI,
-    std::wstring(SIDS_EQUAL),
+    SIDS_EQUAL,
-    std::wstring(SIDS_MC),
+    SIDS_MC,
-    std::wstring(SIDS_MR),
+    SIDS_MR,
-    std::wstring(SIDS_MS),
+    SIDS_MS,
-    std::wstring(SIDS_MPLUS),
+    SIDS_MPLUS,
-    std::wstring(SIDS_MMINUS),
+    SIDS_MMINUS,
-    std::wstring(SIDS_EXP),
+    SIDS_EXP,
-    std::wstring(SIDS_OPEN_PAREN),
+    SIDS_OPEN_PAREN,
-    std::wstring(SIDS_CLOSE_PAREN),
+    SIDS_CLOSE_PAREN,
-    std::wstring(SIDS_0),
+    SIDS_0,
-    std::wstring(SIDS_1),
+    SIDS_1,
-    std::wstring(SIDS_2),
+    SIDS_2,
-    std::wstring(SIDS_3),
+    SIDS_3,
-    std::wstring(SIDS_4),
+    SIDS_4,
-    std::wstring(SIDS_5),
+    SIDS_5,
-    std::wstring(SIDS_6),
+    SIDS_6,
-    std::wstring(SIDS_7),
+    SIDS_7,
-    std::wstring(SIDS_8),
+    SIDS_8,
-    std::wstring(SIDS_9),
+    SIDS_9,
-    std::wstring(SIDS_A),
+    SIDS_A,
-    std::wstring(SIDS_B),
+    SIDS_B,
-    std::wstring(SIDS_C),
+    SIDS_C,
-    std::wstring(SIDS_D),
+    SIDS_D,
-    std::wstring(SIDS_E),
+    SIDS_E,
-    std::wstring(SIDS_F),
+    SIDS_F,
-    std::wstring(SIDS_FRAC),
+    SIDS_FRAC,
-    std::wstring(SIDS_SIND),
+    SIDS_SIND,
-    std::wstring(SIDS_COSD),
+    SIDS_COSD,
-    std::wstring(SIDS_TAND),
+    SIDS_TAND,
-    std::wstring(SIDS_ASIND),
+    SIDS_ASIND,
-    std::wstring(SIDS_ACOSD),
+    SIDS_ACOSD,
-    std::wstring(SIDS_ATAND),
+    SIDS_ATAND,
-    std::wstring(SIDS_SINR),
+    SIDS_SINR,
-    std::wstring(SIDS_COSR),
+    SIDS_COSR,
-    std::wstring(SIDS_TANR),
+    SIDS_TANR,
-    std::wstring(SIDS_ASINR),
+    SIDS_ASINR,
-    std::wstring(SIDS_ACOSR),
+    SIDS_ACOSR,
-    std::wstring(SIDS_ATANR),
+    SIDS_ATANR,
-    std::wstring(SIDS_SING),
+    SIDS_SING,
-    std::wstring(SIDS_COSG),
+    SIDS_COSG,
-    std::wstring(SIDS_TANG),
+    SIDS_TANG,
-    std::wstring(SIDS_ASING),
+    SIDS_ASING,
-    std::wstring(SIDS_ACOSG),
+    SIDS_ACOSG,
-    std::wstring(SIDS_ATANG),
+    SIDS_ATANG,
-    std::wstring(SIDS_ASINH),
+    SIDS_ASINH,
-    std::wstring(SIDS_ACOSH),
+    SIDS_ACOSH,
-    std::wstring(SIDS_ATANH),
+    SIDS_ATANH,
-    std::wstring(SIDS_POWE),
+    SIDS_POWE,
-    std::wstring(SIDS_POWTEN2),
+    SIDS_POWTEN2,
-    std::wstring(SIDS_SQRT2),
+    SIDS_SQRT2,
-    std::wstring(SIDS_SQR),
+    SIDS_SQR,
-    std::wstring(SIDS_CUBE),
+    SIDS_CUBE,
-    std::wstring(SIDS_CUBERT),
+    SIDS_CUBERT,
-    std::wstring(SIDS_FACT),
+    SIDS_FACT,
-    std::wstring(SIDS_RECIPROC),
+    SIDS_RECIPROC,
-    std::wstring(SIDS_DEGREES),
+    SIDS_DEGREES,
-    std::wstring(SIDS_NEGATE),
+    SIDS_NEGATE,
-    std::wstring(SIDS_RSH),
+    SIDS_RSH,
-    std::wstring(SIDS_DIVIDEBYZERO),
+    SIDS_DIVIDEBYZERO,
-    std::wstring(SIDS_DOMAIN),
+    SIDS_DOMAIN,
-    std::wstring(SIDS_UNDEFINED),
+    SIDS_UNDEFINED,
-    std::wstring(SIDS_POS_INFINITY),
+    SIDS_POS_INFINITY,
-    std::wstring(SIDS_NEG_INFINITY),
+    SIDS_NEG_INFINITY,
-    std::wstring(SIDS_ABORTED),
+    SIDS_ABORTED,
-    std::wstring(SIDS_NOMEM),
+    SIDS_NOMEM,
-    std::wstring(SIDS_TOOMANY),
+    SIDS_TOOMANY,
-    std::wstring(SIDS_OVERFLOW),
+    SIDS_OVERFLOW,
-    std::wstring(SIDS_NORESULT),
+    SIDS_NORESULT,
-    std::wstring(SIDS_INSUFFICIENT_DATA),
+    SIDS_INSUFFICIENT_DATA,
-    std::wstring(SIDS_ERR_UNK_CH),
+    SIDS_ERR_UNK_CH,
-    std::wstring(SIDS_ERR_UNK_FN),
+    SIDS_ERR_UNK_FN,
-    std::wstring(SIDS_ERR_UNEX_NUM),
+    SIDS_ERR_UNEX_NUM,
-    std::wstring(SIDS_ERR_UNEX_CH),
+    SIDS_ERR_UNEX_CH,
-    std::wstring(SIDS_ERR_UNEX_SZ),
+    SIDS_ERR_UNEX_SZ,
-    std::wstring(SIDS_ERR_MISMATCH_CLOSE),
+    SIDS_ERR_MISMATCH_CLOSE,
-    std::wstring(SIDS_ERR_UNEX_END),
+    SIDS_ERR_UNEX_END,
-    std::wstring(SIDS_ERR_SG_INV_ERROR),
+    SIDS_ERR_SG_INV_ERROR,
-    std::wstring(SIDS_ERR_INPUT_OVERFLOW),
+    SIDS_ERR_INPUT_OVERFLOW,
-    std::wstring(SIDS_ERR_OUTPUT_OVERFLOW)
+    SIDS_ERR_OUTPUT_OVERFLOW
 };
--- a/src/CalcViewModel/UnitConverterViewModel.cpp
+++ b/src/CalcViewModel/UnitConverterViewModel.cpp
@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 #include "pch.h"
@ -394,7 +394,7 @@ String^ UnitConverterViewModel::ConvertToLocalizedString(const std::wstring& str
 void UnitConverterViewModel::DisplayPasteError()
 {
-    String^ errorMsg = AppResourceProvider::GetInstance().GetCEngineString(SIDS_DOMAIN); /*SIDS_DOMAIN is for "invalid input"*/
+    String^ errorMsg = AppResourceProvider::GetInstance().GetCEngineString(StringReference(SIDS_DOMAIN)); /*SIDS_DOMAIN is for "invalid input"*/
    Value1 = errorMsg;
    Value2 = errorMsg;
    m_relocalizeStringOnSwitch = false;
--- a/src/Calculator/App.xaml
+++ b/src/Calculator/App.xaml
@ -134,10 +134,6 @@
            <!-- Standard Operators Standard/Scientific in Fill/Full -->
            <x:Double x:Key="CalcOperatorCaptionSize">15</x:Double>
            <x:Double x:Key="CalcResultFontSizeL">72</x:Double>
            <x:Double x:Key="CalcResultFontSizeM">46</x:Double>
            <x:Double x:Key="CalcResultFontSizeS">28</x:Double>
            <!-- Base style for calc buttons -->
            <Style x:Key="CalcButtonStyle" TargetType="Controls:CalculatorButton">
                <Setter Property="MinWidth" Value="24"/>
@ -360,7 +356,7 @@
                <Setter Property="ZoomMode" Value="Disabled"/>
            </Style>
-            <Style x:Key="CalculationResultStyleL" TargetType="Controls:CalculationResult">
+            <Style x:Key="CalculationResultStyle" TargetType="Controls:CalculationResult">
                <Setter Property="Background" Value="Transparent"/>
                <Setter Property="Foreground" Value="{ThemeResource SystemControlPageTextBaseHighBrush}"/>
                <Setter Property="HorizontalAlignment" Value="Stretch"/>
@ -447,181 +443,6 @@
                    </Setter.Value>
                </Setter>
            </Style>
            <Style x:Key="CalculationResultStyleM" TargetType="Controls:CalculationResult">
                <Setter Property="Background" Value="Transparent"/>
                <Setter Property="Foreground" Value="{ThemeResource SystemControlPageTextBaseHighBrush}"/>
                <Setter Property="HorizontalAlignment" Value="Stretch"/>
                <Setter Property="VerticalAlignment" Value="Stretch"/>
                <Setter Property="HorizontalContentAlignment" Value="Right"/>
                <Setter Property="VerticalContentAlignment" Value="Top"/>
                <Setter Property="IsTextScaleFactorEnabled" Value="False"/>
                <Setter Property="UseSystemFocusVisuals" Value="True"/>
                <Setter Property="Template">
                    <Setter.Value>
                        <ControlTemplate TargetType="Controls:CalculationResult">
                            <Grid x:Name="border" Background="{TemplateBinding Background}">
                                <Grid.ColumnDefinitions>
                                    <ColumnDefinition Width="12"/>
                                    <ColumnDefinition/>
                                    <ColumnDefinition Width="12"/>
                                </Grid.ColumnDefinitions>
                                <VisualStateManager.VisualStateGroups>
                                    <VisualStateGroup x:Name="ActiveStates">
                                        <VisualState x:Name="Active">
                                            <VisualState.Setters>
                                                <Setter Target="normalOutput.IsTextSelectionEnabled" Value="True"/>
                                                <Setter Target="normalOutput.FontWeight" Value="SemiBold"/>
                                            </VisualState.Setters>
                                        </VisualState>
                                        <VisualState x:Name="Normal"/>
                                    </VisualStateGroup>
                                </VisualStateManager.VisualStateGroups>
                                <ScrollViewer x:Name="textContainer"
                                              Grid.Column="1"
                                              Padding="0,0,0,0"
                                              Style="{ThemeResource ResultsScrollerSnapped}"
                                              AutomationProperties.AccessibilityView="Raw">
                                    <TextBlock x:Name="normalOutput"
                                               Margin="{TemplateBinding DisplayMargin}"
                                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                               Foreground="{TemplateBinding Foreground}"
                                               FontSize="{TemplateBinding FontSize}"
                                               FontWeight="Light"
                                               AutomationProperties.AccessibilityView="Raw"
                                               Text="{TemplateBinding DisplayValue}"
                                               TextAlignment="{TemplateBinding HorizontalContentAlignment}"
                                               TextWrapping="NoWrap"/>
                                </ScrollViewer>
                                <HyperlinkButton x:Name="scrollLeft"
                                                 Grid.Column="0"
                                                 Width="20"
                                                 MinWidth="20"
                                                 MinHeight="24"
                                                 Margin="-4,0,-4,0"
                                                 Padding="0,-3,0,4"
                                                 VerticalAlignment="Top"
                                                 HorizontalContentAlignment="Center"
                                                 VerticalContentAlignment="Center"
                                                 Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
                                                 BorderThickness="0"
                                                 Visibility="Collapsed">
                                    <FontIcon x:Name="scrollLeftText"
                                              FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                              FontSize="12"
                                              Glyph="&#xE26C;"/>
                                </HyperlinkButton>
                                <HyperlinkButton x:Name="scrollRight"
                                                 Grid.Column="2"
                                                 Width="20"
                                                 MinWidth="20"
                                                 MinHeight="24"
                                                 Margin="-4,0,-4,0"
                                                 Padding="0,-3,0,4"
                                                 VerticalAlignment="Top"
                                                 HorizontalContentAlignment="Center"
                                                 VerticalContentAlignment="Center"
                                                 Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
                                                 BorderThickness="0"
                                                 Visibility="Collapsed">
                                    <FontIcon x:Name="scrollRightText"
                                              FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                              FontSize="12"
                                              Glyph="&#xE26B;"/>
                                </HyperlinkButton>
                            </Grid>
                        </ControlTemplate>
                    </Setter.Value>
                </Setter>
            </Style>
            <Style x:Key="CalculationResultStyleS" TargetType="Controls:CalculationResult">
                <Setter Property="Background" Value="Transparent"/>
                <Setter Property="Foreground" Value="{ThemeResource SystemControlPageTextBaseHighBrush}"/>
                <Setter Property="HorizontalAlignment" Value="Stretch"/>
                <Setter Property="VerticalAlignment" Value="Stretch"/>
                <Setter Property="HorizontalContentAlignment" Value="Right"/>
                <Setter Property="VerticalContentAlignment" Value="Top"/>
                <Setter Property="MinHeight" Value="12"/>
                <Setter Property="IsTextScaleFactorEnabled" Value="False"/>
                <Setter Property="UseSystemFocusVisuals" Value="True"/>
                <Setter Property="Template">
                    <Setter.Value>
                        <ControlTemplate TargetType="Controls:CalculationResult">
                            <Grid x:Name="border" Background="{TemplateBinding Background}">
                                <Grid.ColumnDefinitions>
                                    <ColumnDefinition Width="12"/>
                                    <ColumnDefinition/>
                                    <ColumnDefinition Width="12"/>
                                </Grid.ColumnDefinitions>
                                <VisualStateManager.VisualStateGroups>
                                    <VisualStateGroup x:Name="ActiveStates">
                                        <VisualState x:Name="Active">
                                            <VisualState.Setters>
                                                <Setter Target="normalOutput.FontWeight" Value="SemiBold"/>
                                                <Setter Target="normalOutput.IsTextSelectionEnabled" Value="True"/>
                                            </VisualState.Setters>
                                        </VisualState>
                                        <VisualState x:Name="Normal"/>
                                    </VisualStateGroup>
                                </VisualStateManager.VisualStateGroups>
                                <ScrollViewer x:Name="textContainer"
                                              Grid.Column="1"
                                              Padding="0,0,0,0"
                                              Style="{ThemeResource ResultsScrollerSnapped}"
                                              AutomationProperties.AccessibilityView="Raw">
                                    <TextBlock x:Name="normalOutput"
                                               Margin="{TemplateBinding DisplayMargin}"
                                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                               Foreground="{TemplateBinding Foreground}"
                                               FontSize="{TemplateBinding FontSize}"
                                               FontWeight="Light"
                                               AutomationProperties.AccessibilityView="Raw"
                                               Text="{TemplateBinding DisplayValue}"
                                               TextAlignment="{TemplateBinding HorizontalContentAlignment}"
                                               TextWrapping="NoWrap"/>
                                </ScrollViewer>
                                <HyperlinkButton x:Name="scrollLeft"
                                                 Grid.Column="0"
                                                 Width="20"
                                                 MinWidth="20"
                                                 MinHeight="24"
                                                 Margin="-4,0,-4,0"
                                                 Padding="0,-3,0,4"
                                                 VerticalAlignment="Top"
                                                 HorizontalContentAlignment="Center"
                                                 VerticalContentAlignment="Center"
                                                 Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
                                                 BorderThickness="0"
                                                 Visibility="Collapsed">
                                    <FontIcon x:Name="scrollLeftText"
                                              FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                              FontSize="12"
                                              Glyph="&#xE26C;"/>
                                </HyperlinkButton>
                                <HyperlinkButton x:Name="scrollRight"
                                                 Grid.Column="2"
                                                 Width="20"
                                                 MinWidth="20"
                                                 MinHeight="24"
                                                 Margin="-4,0,-4,0"
                                                 Padding="0,-3,0,4"
                                                 VerticalAlignment="Top"
                                                 HorizontalContentAlignment="Center"
                                                 VerticalContentAlignment="Center"
                                                 Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
                                                 BorderThickness="0"
                                                 Visibility="Collapsed">
                                    <FontIcon x:Name="scrollRightText"
                                              FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                              FontSize="12"
                                              Glyph="&#xE26B;"/>
                                </HyperlinkButton>
                            </Grid>
                        </ControlTemplate>
                    </Setter.Value>
                </Setter>
            </Style>
            <Style x:Key="CaptionButtonStyle" TargetType="Button">
                <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}"/>
--- a/src/Calculator/Controls/CalculationResult.cpp
+++ b/src/Calculator/Controls/CalculationResult.cpp
@ -28,6 +28,7 @@ using namespace std;
 DEPENDENCY_PROPERTY_INITIALIZATION(CalculationResult, IsActive);
 DEPENDENCY_PROPERTY_INITIALIZATION(CalculationResult, AccentColor);
 DEPENDENCY_PROPERTY_INITIALIZATION(CalculationResult, MinFontSize);
 DEPENDENCY_PROPERTY_INITIALIZATION(CalculationResult, MaxFontSize);
 DEPENDENCY_PROPERTY_INITIALIZATION(CalculationResult, DisplayMargin);
 DEPENDENCY_PROPERTY_INITIALIZATION(CalculationResult, MaxExpressionHistoryCharacters);
 DEPENDENCY_PROPERTY_INITIALIZATION(CalculationResult, ExpressionVisibility);
@ -50,7 +51,6 @@ StringReference CalculationResult::s_FocusedState(L"Focused");
 StringReference CalculationResult::s_UnfocusedState(L"Unfocused");
 CalculationResult::CalculationResult():
    m_startingFontSize(0.0),
    m_isScalingText(false),
    m_haveCalculatedMax(false)
 {
@ -95,7 +95,6 @@ void CalculationResult::OnApplyTemplate()
        if (m_textBlock)
        {
            m_textBlock->Visibility = ::Visibility::Visible;
            m_startingFontSize = m_textBlock->FontSize;
        }
    }
    UpdateAllState();
@ -143,6 +142,16 @@ void CalculationResult::OnDisplayValuePropertyChanged(String^ /*oldValue*/, Stri
    UpdateTextState();
 }
 void CalculationResult::OnMinFontSizePropertyChanged(double /*oldValue*/, double /*newValue*/)
 {
    UpdateTextState();
 }
 void CalculationResult::OnMaxFontSizePropertyChanged(double /*oldValue*/, double /*newValue*/)
 {
    UpdateTextState();
 }
 void CalculationResult::OnIsInErrorPropertyChanged(bool /*oldValue*/, bool newValue)
 {
    // We need to have a good template for this to work
@ -212,7 +221,7 @@ void CalculationResult::UpdateTextState()
        {
            fontSizeChange = min<double>(max<double>(floor(WIDTHTOFONTSCALAR * widthDiff) - WIDTHTOFONTOFFSET, INCREMENTOFFSET), MAXFONTINCREMENT);
        }
-        if (m_textBlock->ActualWidth < containerSize && abs(m_textBlock->FontSize - m_startingFontSize) > FONTTOLERANCE && !m_haveCalculatedMax)
+        if (m_textBlock->ActualWidth < containerSize && abs(m_textBlock->FontSize - MaxFontSize) > FONTTOLERANCE && !m_haveCalculatedMax)
        {
            ModifyFontAndMargin(m_textBlock, fontSizeChange);
            m_textBlock->InvalidateArrange();
@ -228,7 +237,7 @@ void CalculationResult::UpdateTextState()
            m_textBlock->InvalidateArrange();
            return;
        }
-        assert(m_textBlock->FontSize >= MinFontSize && m_textBlock->FontSize <= m_startingFontSize);
+        assert(m_textBlock->FontSize >= MinFontSize && m_textBlock->FontSize <= MaxFontSize);
        m_isScalingText = false;
        if (IsOperatorCommand)
        {
@ -361,24 +370,15 @@ void CalculationResult::ModifyFontAndMargin(TextBlock^ textBox, double fontChang
 {
    double cur = textBox->FontSize;
    double newFontSize = 0.0;
    Thickness t = textBox->Margin;
    double scaleFactor = SCALEFACTOR;
    if (m_textContainer->ActualHeight <= HEIGHTCUTOFF)
    {
        scaleFactor = SMALLHEIGHTSCALEFACTOR;
    }
-    if (fontChange < 0)
+
-    {
+    newFontSize = min(max(cur + fontChange, MinFontSize), MaxFontSize);
-        newFontSize = max(cur + fontChange, MinFontSize);
+    m_textContainer->Padding = Thickness(0, 0, 0, scaleFactor * abs(cur - newFontSize));
        t.Bottom += scaleFactor * abs(cur - newFontSize);
    }
    else
    {
        newFontSize = min(cur + fontChange, m_startingFontSize);
        t.Bottom -= scaleFactor * abs(cur - newFontSize);
    }
    textBox->FontSize = newFontSize;
    textBox->Margin = t;
 }
 void CalculationResult::UpdateAllState()
--- a/src/Calculator/Controls/CalculationResult.h
+++ b/src/Calculator/Controls/CalculationResult.h
@ -19,7 +19,8 @@ namespace CalculatorApp
            DEPENDENCY_PROPERTY_OWNER(CalculationResult);
            DEPENDENCY_PROPERTY(Windows::UI::Xaml::Visibility, ExpressionVisibility);
-            DEPENDENCY_PROPERTY(double, MinFontSize);
+            DEPENDENCY_PROPERTY_WITH_DEFAULT_AND_CALLBACK(double, MinFontSize, 0.0);
            DEPENDENCY_PROPERTY_WITH_DEFAULT_AND_CALLBACK(double, MaxFontSize, 30.0);
            DEPENDENCY_PROPERTY(Windows::UI::Xaml::Thickness, DisplayMargin);
            DEPENDENCY_PROPERTY(int, MaxExpressionHistoryCharacters);
            DEPENDENCY_PROPERTY_WITH_CALLBACK(bool, IsActive);
@ -52,6 +53,8 @@ namespace CalculatorApp
            void OnAccentColorPropertyChanged(Windows::UI::Xaml::Media::Brush^ oldValue, Windows::UI::Xaml::Media::Brush^ newValue);
            void OnDisplayValuePropertyChanged(Platform::String^ oldValue, Platform::String^ newValue);
            void OnIsInErrorPropertyChanged(bool oldValue, bool newValue);
            void OnMinFontSizePropertyChanged(double oldValue, double newValue);
            void OnMaxFontSizePropertyChanged(double oldValue, double newValue);
            void TextContainerSizeChanged(Object^ sender, Windows::UI::Xaml::SizeChangedEventArgs^ e);
            void OnTextContainerLayoutUpdated(Object^ sender, Object^ e);
            void UpdateVisualState();
@ -74,7 +77,6 @@ namespace CalculatorApp
            Windows::UI::Xaml::Controls::TextBlock^ m_textBlock;
            Windows::UI::Xaml::Controls::HyperlinkButton^ m_scrollLeft;
            Windows::UI::Xaml::Controls::HyperlinkButton^ m_scrollRight;
            double m_startingFontSize;
            double scrollRatio = 0.7;
            bool m_isScalingText;
            bool m_haveCalculatedMax;
--- a/src/Calculator/Resources/af-ZA/Resources.resw
+++ b/src/Calculator/Resources/af-ZA/Resources.resw
@ -909,6 +909,14 @@
    <value>Hakies regs</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Aantal oop hakies %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Daar is geen oop hakies om te sluit nie.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Wetenskaplike notering</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/am-ET/Resources.resw
+++ b/src/Calculator/Resources/am-ET/Resources.resw
@ -909,6 +909,14 @@
    <value>የቀኝ ቅንፍ</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>የክፍት ቅንፎች ብዛት %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>ምንም የሚዘጋ ክፍት ቅንፍ የለም።</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>ሳይንሳዊ እሳቤ</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2278,7 +2286,7 @@
    <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
  </data>
  <data name="AboutControlCopyright" xml:space="preserve">
-    <value>© %1 Microsoft. ሁሉም መብቱ የተጠበቀ።</value>
+    <value>© %1 Microsoft. ሁሉም መብቶች በህግ የተከበሩ ናቸው።</value>
    <comment>{Locked="%1"}. Copyright statement, displayed on the About panel. %1 = the current year (4 digits)</comment>
  </data>
  <data name="AboutButton.Content" xml:space="preserve">
--- a/src/Calculator/Resources/ar-SA/Resources.resw
+++ b/src/Calculator/Resources/ar-SA/Resources.resw
@ -909,6 +909,14 @@
    <value>أقواس يمنى</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>عدد الأقواس المفتوحة %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>لا توجد أي أقواس مفتوحة لإغلاقها.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>رموز علمية</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2279,7 +2287,7 @@
    <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
  </data>
  <data name="AboutControlCopyright" xml:space="preserve">
-    <value>© %1 Microsoft. جميع الحقوق محفوظة.</value>
+    <value>حقوق النشر © محفوظة لشركة Microsoft لعام %1. جميع الحقوق محفوظة.</value>
    <comment>{Locked="%1"}. Copyright statement, displayed on the About panel. %1 = the current year (4 digits)</comment>
  </data>
  <data name="AboutButton.Content" xml:space="preserve">
--- a/src/Calculator/Resources/az-Latn-AZ/Resources.resw
+++ b/src/Calculator/Resources/az-Latn-AZ/Resources.resw
@ -909,6 +909,14 @@
    <value>Sağ mötərizə</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Açıq mötərizənin sayı %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Bağlamaq üçün açıq mötərizələr yoxdur.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Eksponensial format</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/be-BY/Resources.resw
+++ b/src/Calculator/Resources/be-BY/Resources.resw
@ -909,6 +909,14 @@
    <value>Правая дужка</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Лік адсутных дужак %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Няма незакрытых дужак.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Экспанентавы запіс</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2899,4 +2907,4 @@
    <value>Пагадненне аб выкарыстанні сэрвісаў Microsoft</value>
    <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
  </data>
-</root>
+</root>
--- a/src/Calculator/Resources/bg-BG/Resources.resw
+++ b/src/Calculator/Resources/bg-BG/Resources.resw
@ -909,6 +909,14 @@
    <value>Дясна скоба</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Брой отворени скоби: %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Няма отворени скоби за затваряне.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Експоненциален запис</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/bn-BD/Resources.resw
+++ b/src/Calculator/Resources/bn-BD/Resources.resw
@ -909,6 +909,14 @@
    <value>ডান বন্ধনী</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>বন্ধনী গণনা খুলুন %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>বন্ধ করার জন্য এখানে কোনো খোলা বন্ধনী নেই।</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>বৈজ্ঞানিক নোটেশন</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2278,7 +2286,7 @@
    <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
  </data>
  <data name="AboutControlCopyright" xml:space="preserve">
-    <value>© %1 Microsoft. সর্বস্বত্ব সংরক্ষিত।</value>
+    <value>© %1 Microsoft। সর্বস্বত্ব সংরক্ষিত।</value>
    <comment>{Locked="%1"}. Copyright statement, displayed on the About panel. %1 = the current year (4 digits)</comment>
  </data>
  <data name="AboutButton.Content" xml:space="preserve">
--- a/src/Calculator/Resources/ca-ES/Resources.resw
+++ b/src/Calculator/Resources/ca-ES/Resources.resw
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@ -909,6 +909,14 @@
    <value>Parèntesi de tancament</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Recompte de parèntesis oberts: %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>No hi ha cap parèntesi obert per tancar.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Notació científica</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2899,4 +2907,4 @@
    <value>Contracte de serveis de Microsoft</value>
    <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
  </data>
-</root>
+</root>
--- a/src/Calculator/Resources/cs-CZ/Resources.resw
+++ b/src/Calculator/Resources/cs-CZ/Resources.resw
@ -909,6 +909,14 @@
    <value>Pravá závorka</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Počet levých okrouhlých závorek %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Nenašly se žádné levé okrouhlé závorky, ke kterým by bylo třeba přidat pravou závorku.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Vědecký zápis</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/da-DK/Resources.resw
+++ b/src/Calculator/Resources/da-DK/Resources.resw
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@ -909,6 +909,14 @@
    <value>Højreparentes</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Åbn parentesantal %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Der er ingen åbne parenteser at lukke.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Videnskabelig notation</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2899,4 +2907,4 @@
    <value>Microsoft-serviceaftale</value>
    <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
  </data>
-</root>
+</root>
--- a/src/Calculator/Resources/de-DE/Resources.resw
+++ b/src/Calculator/Resources/de-DE/Resources.resw
@ -434,7 +434,7 @@
    <comment>This is the automation name and label for the memory button when the memory flyout is open.</comment>
  </data>
  <data name="MemoryButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Arbeitsspeicher</value>
+    <value>Speicher</value>
    <comment>This is the tool tip automation name for the memory button.</comment>
  </data>
  <data name="HistoryButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
@ -454,7 +454,7 @@
    <comment>This is the tool tip automation name for the Clear Memory (MC) button.</comment>
  </data>
  <data name="MemoryLabel.Text" xml:space="preserve">
-    <value>Arbeitsspeicher</value>
+    <value>Speicher</value>
    <comment>The text that shows as the header for the memory list</comment>
  </data>
  <data name="MemoryPivotItem.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
@ -562,7 +562,7 @@
    <comment>Screen reader prompt for the history flyout</comment>
  </data>
  <data name="MemoryPane" xml:space="preserve">
-    <value>Arbeitsspeicher</value>
+    <value>Speicher</value>
    <comment>Screen reader prompt for the memory flyout</comment>
  </data>
  <data name="Format_HexButtonValue" xml:space="preserve">
@ -606,7 +606,7 @@
    <comment>Screen reader prompt for the Calculator Memory button</comment>
  </data>
  <data name="memButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Gespeicherten Wert speichern (STRG+M)</value>
+    <value>Speicher (STRG+M)</value>
    <comment>This is the tool tip automation name for the Memory Store (MS) button.</comment>
  </data>
  <data name="ClearMemoryButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
@ -909,6 +909,14 @@
    <value>Schließende Klammer</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Anzahl geöffneter Klammern %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Es sind keine zu schließenden Klammern vorhanden.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Wissenschaftliche Schreibweise</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -1162,7 +1170,7 @@
    <comment>A measurement unit for volume. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
  </data>
  <data name="UnitAbbreviation_Liter" xml:space="preserve">
-    <value>L</value>
+    <value>l</value>
    <comment>An abbreviation for a measurement unit of volume</comment>
  </data>
  <data name="UnitName_Milliliter" xml:space="preserve">
@ -1170,7 +1178,7 @@
    <comment>A measurement unit for volume. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
  </data>
  <data name="UnitAbbreviation_Milliliter" xml:space="preserve">
-    <value>mL</value>
+    <value>ml</value>
    <comment>An abbreviation for a measurement unit of volume</comment>
  </data>
  <data name="UnitName_PintUK" xml:space="preserve">
@ -1506,7 +1514,7 @@
    <comment>An abbreviation for a measurement unit of power</comment>
  </data>
  <data name="UnitAbbreviation_Week" xml:space="preserve">
-    <value>wo</value>
+    <value>w</value>
    <comment>An abbreviation for a measurement unit of time</comment>
  </data>
  <data name="UnitAbbreviation_Yard" xml:space="preserve">
--- a/src/Calculator/Resources/el-GR/Resources.resw
+++ b/src/Calculator/Resources/el-GR/Resources.resw
@ -909,6 +909,14 @@
    <value>Δεξιά παρένθεση</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Πλήθος ανοιχτών παρενθέσεων %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Δεν υπάρχουν ανοιχτές παρενθέσεις για κλείσιμο.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Επιστημονική σημειογραφία</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/en-GB/Resources.resw
+++ b/src/Calculator/Resources/en-GB/Resources.resw
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@ -909,6 +909,14 @@
    <value>Right parenthesis</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Open parenthesis count %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>There are no open parentheses to close.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Scientific notation</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2899,4 +2907,4 @@
    <value>Microsoft Services Agreement</value>
    <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
  </data>
-</root>
+</root>
--- a/src/Calculator/Resources/es-ES/Resources.resw
+++ b/src/Calculator/Resources/es-ES/Resources.resw
@ -810,7 +810,7 @@
    <comment>Screen reader prompt for the Calculator RSH button</comment>
  </data>
  <data name="xorButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Exclusivo o</value>
+    <value>O exclusivo</value>
    <comment>Screen reader prompt for the Calculator XOR button</comment>
  </data>
  <data name="qwordButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
@ -909,6 +909,14 @@
    <value>Paréntesis de cierre</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Número de paréntesis abiertos %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>No hay ningún paréntesis abierto para cerrar.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Notación científica</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/es-MX/Resources.resw
+++ b/src/Calculator/Resources/es-MX/Resources.resw
@ -810,7 +810,7 @@
    <comment>Screen reader prompt for the Calculator RSH button</comment>
  </data>
  <data name="xorButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Exclusivo o</value>
+    <value>O exclusivo</value>
    <comment>Screen reader prompt for the Calculator XOR button</comment>
  </data>
  <data name="qwordButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
@ -909,6 +909,14 @@
    <value>Paréntesis de cierre</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Recuento de paréntesis de apertura: %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>No hay ningún paréntesis de apertura para cerrar.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Notación científica</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/et-EE/Resources.resw
+++ b/src/Calculator/Resources/et-EE/Resources.resw
@ -909,6 +909,14 @@
    <value>Paremsulg</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Avavate sulgude arv %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Avavaid sulge, mis vajavad sulgemist, ei ole.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Teaduskuju</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/eu-ES/Resources.resw
+++ b/src/Calculator/Resources/eu-ES/Resources.resw
@ -909,6 +909,14 @@
    <value>Eskuineko parentesia</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Ireki %1. parentesia</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Ez dago irekitako parentesirik ixteko.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Notazio zientifikoa</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/fa-IR/Resources.resw
+++ b/src/Calculator/Resources/fa-IR/Resources.resw
@ -909,6 +909,14 @@
    <value>پرانتز سمت راست</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>تعداد پرانتز باز %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>هیچ پرانتز بازی برای بستن وجود ندارد.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>نماد علمی</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/fi-FI/Resources.resw
+++ b/src/Calculator/Resources/fi-FI/Resources.resw
@ -909,6 +909,14 @@
    <value>Oikea sulje</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Avaavien sulkeiden määrä %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Suljettavia avaavia sulkeita ei ole.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Tieteellinen merkintätapa</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/fil-PH/Resources.resw
+++ b/src/Calculator/Resources/fil-PH/Resources.resw
@ -909,6 +909,14 @@
    <value>Kanang parenthesis</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Bilang ng bukas na parenthesis %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Walang mga bukas na parenthesis na masasara.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Scientific notation</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2278,7 +2286,7 @@
    <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
  </data>
  <data name="AboutControlCopyright" xml:space="preserve">
-    <value>© %1 Microsoft. Nakalaan ang lahat ng karapatan.</value>
+    <value>© %1 Microsoft. Reserbado ang lahat ng karapatan.</value>
    <comment>{Locked="%1"}. Copyright statement, displayed on the About panel. %1 = the current year (4 digits)</comment>
  </data>
  <data name="AboutButton.Content" xml:space="preserve">
--- a/src/Calculator/Resources/fr-CA/Resources.resw
+++ b/src/Calculator/Resources/fr-CA/Resources.resw
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@ -909,6 +909,14 @@
    <value>Parenthèse droite</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Nombre de parenthèses ouvertes : %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Aucune parenthèse ouverte ne doit être fermée.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Notation scientifique</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2278,7 +2286,7 @@
    <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
  </data>
  <data name="AboutControlCopyright" xml:space="preserve">
-    <value>%1 Microsoft. Tous droits réservés.</value>
+    <value>© %1 Microsoft. Tous droits réservés.</value>
    <comment>{Locked="%1"}. Copyright statement, displayed on the About panel. %1 = the current year (4 digits)</comment>
  </data>
  <data name="AboutButton.Content" xml:space="preserve">
@ -2899,4 +2907,4 @@
    <value>Contrat de services Microsoft</value>
    <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
  </data>
-</root>
+</root>
--- a/src/Calculator/Resources/fr-FR/Resources.resw
+++ b/src/Calculator/Resources/fr-FR/Resources.resw
@ -909,6 +909,14 @@
    <value>Parenthèse droite</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Nombre de parenthèses ouvrantes %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Il n’y a pas de parenthèses ouvertes à fermer.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Notation scientifique</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2899,4 +2907,4 @@
    <value>Contrat de services Microsoft</value>
    <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
  </data>
-</root>
+</root>
--- a/src/Calculator/Resources/gl-ES/Resources.resw
+++ b/src/Calculator/Resources/gl-ES/Resources.resw
@ -909,6 +909,14 @@
    <value>Paréntese dereita</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Número de parénteses abertos %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Non hai ningún paréntese aberto para pechar.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Notación científica</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/he-IL/Resources.resw
+++ b/src/Calculator/Resources/he-IL/Resources.resw
@ -909,6 +909,14 @@
    <value>סוגר ימני</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>ספירת תווי סוגריים פותחים %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>אין תווי סוגריים פותחים לסגירה.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>הערה מדעית</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/hi-IN/Resources.resw
+++ b/src/Calculator/Resources/hi-IN/Resources.resw
@ -909,6 +909,14 @@
    <value>दायाँ कोष्ठक</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>खुला कोष्ठक संख्या %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>बंद करने के लिए कोई खुला कोष्ठक नहीं है.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>वैज्ञानिक नोटेशन</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2278,7 +2286,7 @@
    <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
  </data>
  <data name="AboutControlCopyright" xml:space="preserve">
-    <value>© %1 Microsoft. सर्वाधिकार सुरक्षित.</value>
+    <value>© %1 Microsoft। सर्वाधिकार सुरक्षित।</value>
    <comment>{Locked="%1"}. Copyright statement, displayed on the About panel. %1 = the current year (4 digits)</comment>
  </data>
  <data name="AboutButton.Content" xml:space="preserve">
--- a/src/Calculator/Resources/hr-HR/Resources.resw
+++ b/src/Calculator/Resources/hr-HR/Resources.resw
@ -909,6 +909,14 @@
    <value>Desna zagrada</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Broj otvorenih zagrada %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Trenutno nema otvorenih zagrada koje treba zatvoriti.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Znanstvena notacija</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2278,7 +2286,7 @@
    <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
  </data>
  <data name="AboutControlCopyright" xml:space="preserve">
-    <value>© 2018. Microsoft. Sva prava pridržana.</value>
+    <value>© %1 Microsoft. Sva prava pridržana.</value>
    <comment>{Locked="%1"}. Copyright statement, displayed on the About panel. %1 = the current year (4 digits)</comment>
  </data>
  <data name="AboutButton.Content" xml:space="preserve">
--- a/src/Calculator/Resources/hu-HU/Resources.resw
+++ b/src/Calculator/Resources/hu-HU/Resources.resw
@ -909,6 +909,14 @@
    <value>Berekesztő zárójel</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Nyitó zárójelek száma: %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Nincsenek bezárandó nyitó zárójelek.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Normál alak</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/id-ID/Resources.resw
+++ b/src/Calculator/Resources/id-ID/Resources.resw
@ -909,6 +909,14 @@
    <value>Tanda kurung buka</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Buka jumlah tanda kurung %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Tidak ada tanda kurung tutup yang diperlukan.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Notasi ilmiah</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/is-IS/Resources.resw
+++ b/src/Calculator/Resources/is-IS/Resources.resw
@ -909,6 +909,14 @@
    <value>Hægri svigi</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Fjöldi opinna sviga: %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Engir opnir svigar til að loka.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Vísindaleg tákn</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/it-IT/Resources.resw
+++ b/src/Calculator/Resources/it-IT/Resources.resw
@ -909,6 +909,14 @@
    <value>Parentesi destra</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Numero di parentesi aperte %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Non sono presenti parentesi aperte da chiudere.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Notazione scientifica</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/ja-JP/Resources.resw
+++ b/src/Calculator/Resources/ja-JP/Resources.resw
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@ -909,6 +909,14 @@
    <value>終わり丸かっこ</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>開きかっこの数 %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>閉じかっこを指定できる開きかっこはありません。</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>指数表記</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2899,4 +2907,4 @@
    <value>Microsoft サービス規約</value>
    <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
  </data>
-</root>
+</root>
--- a/src/Calculator/Resources/kk-KZ/Resources.resw
+++ b/src/Calculator/Resources/kk-KZ/Resources.resw
@ -909,6 +909,14 @@
    <value>Оң жақ жақша</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Ашылатын жақша саны %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Жабу үшін ашылатын жақша жоқ.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Экспоненттік түсінік</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2278,7 +2286,7 @@
    <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
  </data>
  <data name="AboutControlCopyright" xml:space="preserve">
-    <value>© %1 Microsoft. Барлық құқықтар қорғалған.</value>
+    <value>© %1 Microsoft. Барлық құқықтары қорғалған.</value>
    <comment>{Locked="%1"}. Copyright statement, displayed on the About panel. %1 = the current year (4 digits)</comment>
  </data>
  <data name="AboutButton.Content" xml:space="preserve">
--- a/src/Calculator/Resources/km-KH/Resources.resw
+++ b/src/Calculator/Resources/km-KH/Resources.resw
@ -909,6 +909,14 @@
    <value>វង់ក្រចកស្តាំ</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>ការរាប់រង្វង់ក្រចកបើក %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>មិនមានរង្វង់ក្រចកបើកដែលត្រូវបិទឡើយ។</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>ការកត់សម្គាល់វិទ្យាសាស្រ្ត</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/kn-IN/Resources.resw
+++ b/src/Calculator/Resources/kn-IN/Resources.resw
@ -909,6 +909,14 @@
    <value>ಬಲ ಆವರಣ ಚಿಹ್ನೆ</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>ತೆರೆದ ಆವರಣ ಎಣಿಕೆ %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>ಮುಚ್ಚಲು ಯಾವುದೇ ತೆರೆದ ಆವರಣ ಇಲ್ಲ.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>ವೈಜ್ಞಾನಿಕ ಸಂಕೇತನ</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/ko-KR/Resources.resw
+++ b/src/Calculator/Resources/ko-KR/Resources.resw
@ -909,6 +909,14 @@
    <value>닫는 괄호</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>여는 괄호 수 %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>닫을 여는 괄호가 없습니다.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>과학적 표기법</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/lo-LA/Resources.resw
+++ b/src/Calculator/Resources/lo-LA/Resources.resw
@ -909,6 +909,14 @@
    <value>ວົງເລັບຂວາ</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>ຈຳນວນວົງເລັບເປີດ %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>ບໍ່ມີວົງເລັບເປີດເພື່ອປິດ.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>ສັນຍາລັກທາງວິທະຍາສາດ</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/lt-LT/Resources.resw
+++ b/src/Calculator/Resources/lt-LT/Resources.resw
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@ -909,6 +909,14 @@
    <value>Dešinysis lenktinis skliaustas</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Atidarytų skliaustelių skaičius – %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Nėra atidarytų skliaustelių, kuriuos būtų galima uždaryti.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Mokslinis žymėjimas</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2278,7 +2286,7 @@
    <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
  </data>
  <data name="AboutControlCopyright" xml:space="preserve">
-    <value>© „Microsoft“, %1 m. Visos teisės ginamos.</value>
+    <value>© „Microsoft“, %1. Visos teisės ginamos.</value>
    <comment>{Locked="%1"}. Copyright statement, displayed on the About panel. %1 = the current year (4 digits)</comment>
  </data>
  <data name="AboutButton.Content" xml:space="preserve">
@ -2899,4 +2907,4 @@
    <value>„Microsoft“ paslaugų teikimo sutartis</value>
    <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
  </data>
-</root>
+</root>
--- a/src/Calculator/Resources/lv-LV/Resources.resw
+++ b/src/Calculator/Resources/lv-LV/Resources.resw
@ -909,6 +909,14 @@
    <value>Labās puses apaļā iekava</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Atverošo iekavu skaits %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Nav atverošo iekavu, kam jāpievieno aizverošā iekava.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Zinātniskais pieraksts</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/mk-MK/Resources.resw
+++ b/src/Calculator/Resources/mk-MK/Resources.resw
@ -909,6 +909,14 @@
    <value>Десна заграда</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Број на отворени загради %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Нема отворени загради за затворање.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Научно означување</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2278,7 +2286,7 @@
    <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
  </data>
  <data name="AboutControlCopyright" xml:space="preserve">
-    <value>© %1 Microsoft Corporation. Сите права се задржани.</value>
+    <value>© %1 Microsoft. Сите права се задржани.</value>
    <comment>{Locked="%1"}. Copyright statement, displayed on the About panel. %1 = the current year (4 digits)</comment>
  </data>
  <data name="AboutButton.Content" xml:space="preserve">
--- a/src/Calculator/Resources/ml-IN/Resources.resw
+++ b/src/Calculator/Resources/ml-IN/Resources.resw
@ -909,6 +909,14 @@
    <value>വലത് ബ്രാക്കറ്റ്</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>തുറന്ന പാരന്തെസിസ് കൗണ്ട് %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>അടയ്ക്കുന്നതിന് തുറന്ന പാരന്തെസിസ് ഇല്ല.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>സയന്റിഫിക് നൊട്ടേഷൻ</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2278,7 +2286,7 @@
    <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
  </data>
  <data name="AboutControlCopyright" xml:space="preserve">
-    <value>© %1 Microsoft. എല്ലാ അവകാശങ്ങളും സംവരണം ചെയ്തിരിക്കുന്നു.</value>
+    <value>© %1 Microsoft. എല്ലാ അവകാശങ്ങളും നിക്ഷിപ്തം.</value>
    <comment>{Locked="%1"}. Copyright statement, displayed on the About panel. %1 = the current year (4 digits)</comment>
  </data>
  <data name="AboutButton.Content" xml:space="preserve">
--- a/src/Calculator/Resources/ms-MY/Resources.resw
+++ b/src/Calculator/Resources/ms-MY/Resources.resw
@ -909,6 +909,14 @@
    <value>Tanda kurungan kanan</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Buka kiraan kurungan %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Tiada kurungan terbuka untuk ditutup.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Tatatanda saintifik</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/nb-NO/Resources.resw
+++ b/src/Calculator/Resources/nb-NO/Resources.resw
@ -909,6 +909,14 @@
    <value>Høyreparentes</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Antall åpne parenteser %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Det er ingen åpne paranteser å lukke.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Vitenskapelig notasjon</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/nl-NL/Resources.resw
+++ b/src/Calculator/Resources/nl-NL/Resources.resw
@ -909,6 +909,14 @@
    <value>Haakje sluiten</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Aantal haakjes openen %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Er zijn geen haakjes openen om te sluiten.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Wetenschappelijke notatie</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/pl-PL/Resources.resw
+++ b/src/Calculator/Resources/pl-PL/Resources.resw
@ -909,6 +909,14 @@
    <value>Prawy nawias</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Liczba nawiasów otwierających: %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Brak otwartych nawiasów do zamknięcia.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Notacja naukowa</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/pt-BR/Resources.resw
+++ b/src/Calculator/Resources/pt-BR/Resources.resw
@ -909,6 +909,14 @@
    <value>Parêntese direito</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Contagem de parênteses de abertura %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Não há parênteses de abertura para fechar.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Notação científica</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/pt-PT/Resources.resw
+++ b/src/Calculator/Resources/pt-PT/Resources.resw
@ -909,6 +909,14 @@
    <value>Parêntese à direita</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Contagem de parêntesis abertos %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Não existem parêntesis abertos para fechar.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Notação científica</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/ro-RO/Resources.resw
+++ b/src/Calculator/Resources/ro-RO/Resources.resw
@ -909,6 +909,14 @@
    <value>Paranteză dreapta</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Număr paranteze deschise %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Nu există paranteze deschise de închis.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Notație științifică</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/ru-RU/Resources.resw
+++ b/src/Calculator/Resources/ru-RU/Resources.resw
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@ -909,6 +909,14 @@
    <value>Закрывающая круглая скобка</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Количество открывающих скобок: %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Нет открывающих скобок, для которых требуются закрывающие.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Экспоненциальное представление </value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2899,4 +2907,4 @@
    <value>Соглашение об использовании служб Майкрософт</value>
    <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
  </data>
-</root>
+</root>
--- a/src/Calculator/Resources/sk-SK/Resources.resw
+++ b/src/Calculator/Resources/sk-SK/Resources.resw
@ -909,6 +909,14 @@
    <value>Pravá zátvorka</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Počet vstupných zátvoriek: %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Nenachádza sa tu žiadna vstupná zátvorka, ku ktorej je možné pridať výstupnú.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Vedecký zápis</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/sl-SI/Resources.resw
+++ b/src/Calculator/Resources/sl-SI/Resources.resw
@ -909,6 +909,14 @@
    <value>Desni oklepaj</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Število začetnih oklepajev: %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Ni začetnih oklepajev, ki bi potrebovali končnega.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Znanstveni zapis</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/sq-AL/Resources.resw
+++ b/src/Calculator/Resources/sq-AL/Resources.resw
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@ -909,6 +909,14 @@
    <value>Kllapa e djathtë</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Numri i kllapave të hapura %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Nuk ka kllapa hapëse për të mbyllur.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Simbolet shkencore</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2899,4 +2907,4 @@
    <value>Marrëveshja e shërbimeve të Microsoft</value>
    <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
  </data>
-</root>
+</root>
--- a/src/Calculator/Resources/sr-Latn-RS/Resources.resw
+++ b/src/Calculator/Resources/sr-Latn-RS/Resources.resw
@ -909,6 +909,14 @@
    <value>Desna zagrada</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Broj otvorenih zagrada %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Nema otvorenih zagrada koje se mogu zatvoriti.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Naučni način zapisivanja</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2452,13 +2460,13 @@
    <value>dan</value>
  </data>
  <data name="Date_Days" xml:space="preserve">
-    <value>dani</value>
+    <value>dan/dana</value>
  </data>
  <data name="Date_Month" xml:space="preserve">
    <value>mesec</value>
  </data>
  <data name="Date_Months" xml:space="preserve">
-    <value>meseci</value>
+    <value>mesec/meseca/meseci</value>
  </data>
  <data name="Date_SameDates" xml:space="preserve">
    <value>Isti datumi</value>
@ -2467,13 +2475,13 @@
    <value>sedmica</value>
  </data>
  <data name="Date_Weeks" xml:space="preserve">
-    <value>sedmice</value>
+    <value>sedmica/sedmice</value>
  </data>
  <data name="Date_Year" xml:space="preserve">
    <value>godina</value>
  </data>
  <data name="Date_Years" xml:space="preserve">
-    <value>godine</value>
+    <value>godina/godine</value>
  </data>
  <data name="Date_DifferenceResultAutomationName" xml:space="preserve">
    <value>Razlika %1</value>
--- a/src/Calculator/Resources/sv-SE/Resources.resw
+++ b/src/Calculator/Resources/sv-SE/Resources.resw
@ -909,6 +909,14 @@
    <value>Höger parentes</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Antal inledande parenteser %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Det finns inga inledande parenteser att avsluta.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Matematisk notation</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/sw-KE/Resources.resw
+++ b/src/Calculator/Resources/sw-KE/Resources.resw
@ -909,6 +909,14 @@
    <value>Mabano ya kulia</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Fungua hesabu ya mabano %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Hakuna mabano yaliyofunguliwa ya kufunga.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Nukuu ya kisayansi</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/ta-IN/Resources.resw
+++ b/src/Calculator/Resources/ta-IN/Resources.resw
@ -909,6 +909,14 @@
    <value>வலது அடைப்புக்குறி</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>திறப்பு அடைப்புக்குறி கணக்கு %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>மூடுவதற்கு திறந்திருக்கும் அடைப்புக்குறிகள் எதுவும் இல்லை.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>விஞ்ஞானக் குறியீடு</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/te-IN/Resources.resw
+++ b/src/Calculator/Resources/te-IN/Resources.resw
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@ -909,6 +909,14 @@
    <value>కుడి కుండలీకరణం</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>వృత్తార్ధము గణనను %1 తెరువు</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>మూసేయడానికి తెరచి ఉన్న ఏ వృత్తార్ధాలు లేవు.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>సైంటిఫిక్ నొటేషన్</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2899,4 +2907,4 @@
    <value>Microsoft సర్వీసెస్ అగ్రిమెంట్.</value>
    <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
  </data>
-</root>
+</root>
--- a/src/Calculator/Resources/th-TH/Resources.resw
+++ b/src/Calculator/Resources/th-TH/Resources.resw
@ -909,6 +909,14 @@
    <value>วงเล็บปิด</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>จำนวนวงเล็บเปิด %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>ไม่มีวงเล็บเปิดที่จะปิด</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>สัญกรณ์วิทยาศาสตร์</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2278,7 +2286,7 @@
    <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
  </data>
  <data name="AboutControlCopyright" xml:space="preserve">
-    <value>© %1 Microsoft. All rights reserved.</value>
+    <value>© %1 Microsoft สงวนลิขสิทธิ์</value>
    <comment>{Locked="%1"}. Copyright statement, displayed on the About panel. %1 = the current year (4 digits)</comment>
  </data>
  <data name="AboutButton.Content" xml:space="preserve">
--- a/src/Calculator/Resources/tr-TR/Resources.resw
+++ b/src/Calculator/Resources/tr-TR/Resources.resw
@ -909,6 +909,14 @@
    <value>Sağ parantez</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Açık parantez sayısı %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Kapatılacak açık parantez yok.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Bilimsel gösterim</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/uk-UA/Resources.resw
+++ b/src/Calculator/Resources/uk-UA/Resources.resw
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@ -909,6 +909,14 @@
    <value>Права кругла дужка</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Кількість відкривних круглих дужок: %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Відкривних дужок, які потрібно закрити, немає.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Експоненційний формат</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2899,4 +2907,4 @@
    <value>Угода про використання служб Microsoft</value>
    <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
  </data>
-</root>
+</root>
--- a/src/Calculator/Resources/uz-Latn-UZ/Resources.resw
+++ b/src/Calculator/Resources/uz-Latn-UZ/Resources.resw
@ -909,6 +909,14 @@
    <value>O‘ng qavs</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Ochilgan qavslar soni: %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Hech qanday yopilmagan qavs topilmadi.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Eksponensial format</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/vi-VN/Resources.resw
+++ b/src/Calculator/Resources/vi-VN/Resources.resw
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@ -909,6 +909,14 @@
    <value>Dấu ngoặc đơn phải</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>Số lượng dấu mở ngoặc %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>Không có dấu mở ngoặc nào để đóng.</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Ký hiệu khoa học</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2899,4 +2907,4 @@
    <value>Thỏa thuận Dịch vụ của Microsoft</value>
    <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
  </data>
-</root>
+</root>
--- a/src/Calculator/Resources/zh-CN/Resources.resw
+++ b/src/Calculator/Resources/zh-CN/Resources.resw
@ -909,6 +909,14 @@
    <value>右括号</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>左圆括号计数 %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>缺少右圆括号，因此无法结束。</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>科学记数法</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
--- a/src/Calculator/Resources/zh-TW/Resources.resw
+++ b/src/Calculator/Resources/zh-TW/Resources.resw
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@ -909,6 +909,14 @@
    <value>右括弧</value>
    <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>
  </data>
  <data name="Format_OpenParenthesisCountAutomationNamePrefix" xml:space="preserve">
    <value>左括弧計數 %1</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific and programmer operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
  </data>
  <data name="NoRightParenthesisAdded_Announcement" xml:space="preserve">
    <value>沒有需要補齊的左括弧。</value>
    <comment>{Locked="%1"} Screen reader prompt for the Calculator when the ")" button on the scientific and programmer operator keypad cannot be added to the equation. e.g. "1+)".</comment>
  </data>
  <data name="ftoeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>科學記號標記法</value>
    <comment>Screen reader prompt for the Calculator F-E the scientific operator keypad</comment>
@ -2278,7 +2286,7 @@
    <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
  </data>
  <data name="AboutControlCopyright" xml:space="preserve">
-    <value>© %1 Microsoft. 著作權所有，並保留一切權利。</value>
+    <value>© %1 Microsoft 著作權所有，保留一切權利。</value>
    <comment>{Locked="%1"}. Copyright statement, displayed on the About panel. %1 = the current year (4 digits)</comment>
  </data>
  <data name="AboutButton.Content" xml:space="preserve">
@ -2899,4 +2907,4 @@
    <value>Microsoft 服務合約</value>
    <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
  </data>
-</root>
+</root>
--- a/src/Calculator/Views/Calculator.xaml
+++ b/src/Calculator/Views/Calculator.xaml
@ -156,48 +156,17 @@
        </Style>
        <!-- Calculation Result Styles -->
-
+        <Style x:Key="ResultsStyle"
-        <Style x:Key="ResultsStyleL"
+               BasedOn="{StaticResource CalculationResultStyle}"
               x:Name="ResultsStyleL"
               BasedOn="{StaticResource CalculationResultStyleL}"
               TargetType="controls:CalculationResult">
            <Setter Property="HorizontalContentAlignment" Value="Right"/>
            <Setter Property="VerticalContentAlignment" Value="Top"/>
            <Setter Property="FontSize" Value="{StaticResource CalcResultFontSizeL}"/>
            <Setter Property="MinFontSize" Value="12"/>
            <Setter Property="IsActive" Value="True"/>
            <Setter Property="DisplayMargin" Value="0,0,0,0"/>
            <Setter Property="MaxExpressionHistoryCharacters" Value="51"/>
        </Style>
        <Style x:Key="ResultsStyleM"
               x:Name="ResultsStyleM"
               BasedOn="{StaticResource CalculationResultStyleM}"
               TargetType="controls:CalculationResult">
            <Setter Property="HorizontalContentAlignment" Value="Right"/>
            <Setter Property="VerticalContentAlignment" Value="Top"/>
            <Setter Property="FontSize" Value="{StaticResource CalcResultFontSizeM}"/>
            <Setter Property="MinFontSize" Value="12"/>
            <Setter Property="IsActive" Value="True"/>
            <Setter Property="DisplayMargin" Value="0,0,0,0"/>
            <Setter Property="MaxExpressionHistoryCharacters" Value="30"/>
        </Style>
        <Style x:Key="ResultsStyleS"
               x:Name="ResultsStyleS"
               BasedOn="{StaticResource CalculationResultStyleS}"
               TargetType="controls:CalculationResult">
            <Setter Property="HorizontalContentAlignment" Value="Right"/>
            <Setter Property="VerticalContentAlignment" Value="Top"/>
            <Setter Property="FontSize" Value="{StaticResource CalcResultFontSizeS}"/>
            <Setter Property="MinFontSize" Value="12"/>
            <Setter Property="IsActive" Value="True"/>
            <Setter Property="DisplayMargin" Value="0,0,0,0"/>
            <Setter Property="MaxExpressionHistoryCharacters" Value="30"/>
        </Style>
        <!-- Button Styles -->
        <Style x:Key="ScrollButtonStyle" TargetType="Button">
            <Setter Property="BorderThickness" Value="0"/>
            <Setter Property="Padding" Value="0,0,0,0"/>
@ -486,25 +455,34 @@
                    <VisualState.StateTriggers>
                        <AdaptiveTrigger MinWindowHeight="800"/>
                    </VisualState.StateTriggers>
-                    <Storyboard Completed="OnResultsLayoutChanged"/>
+                    <VisualState.Setters>
                        <Setter Target="Results.MaxFontSize" Value="72"/>
                        <Setter Target="Results.MaxExpressionHistoryCharacters" Value="51"/>
                        <Setter Target="RowResult.MinHeight" Value="108"/>
                        <Setter Target="RowResult.Height" Value="72*"/>
                    </VisualState.Setters>
                </VisualState>
-                <VisualState x:Name="ResultsProgM">
+                <VisualState x:Name="ResultsM">
                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowHeight="640"/>
+                        <AdaptiveTrigger x:Name="ResultsMVisualStateTrigger" MinWindowHeight="640"/>
                    </VisualState.StateTriggers>
-                    <Storyboard Completed="OnResultsLayoutChanged"/>
+                    <VisualState.Setters>
-                </VisualState>
+                        <Setter Target="Results.MaxFontSize" Value="46"/>
-                <VisualState x:Name="ResultsSciM">
+                        <Setter Target="Results.MaxExpressionHistoryCharacters" Value="30"/>
-                    <VisualState.StateTriggers>
+                        <Setter Target="RowResult.MinHeight" Value="72"/>
-                        <AdaptiveTrigger MinWindowHeight="544"/>
+                        <Setter Target="RowResult.Height" Value="72*"/>
-                    </VisualState.StateTriggers>
+                    </VisualState.Setters>
                    <Storyboard Completed="OnResultsLayoutChanged"/>
                </VisualState>
                <VisualState x:Name="ResultsS">
                    <VisualState.StateTriggers>
                        <AdaptiveTrigger MinWindowHeight="0"/>
                    </VisualState.StateTriggers>
-                    <Storyboard Completed="OnResultsLayoutChanged"/>
+                    <VisualState.Setters>
                        <Setter Target="Results.MaxFontSize" Value="26"/>
                        <Setter Target="Results.MaxExpressionHistoryCharacters" Value="30"/>
                        <Setter Target="RowResult.MinHeight" Value="42"/>
                        <Setter Target="RowResult.Height" Value="42*"/>
                    </VisualState.Setters>
                </VisualState>
            </VisualStateGroup>
        </VisualStateManager.VisualStateGroups>
@ -531,7 +509,7 @@
                                        x:Uid="CalculatorResults"
                                        Grid.Row="2"
                                        Margin="0,0,0,0"
-                                        Style="{ThemeResource ResultsStyleM}"
+                                        Style="{ThemeResource ResultsStyle}"
                                        AutomationProperties.AutomationId="CalculatorResults"
                                        AutomationProperties.HeadingLevel="Level1"
                                        AutomationProperties.Name="{x:Bind Model.CalculationResultAutomationName, Mode=OneWay}"
--- a/src/Calculator/Views/Calculator.xaml.cpp
+++ b/src/Calculator/Views/Calculator.xaml.cpp
@ -185,16 +185,19 @@ void Calculator::UpdateViewState()
    {
        state = L"Programmer";
        Model->IsDecimalEnabled = false;
        ResultsMVisualStateTrigger->MinWindowHeight = 640;
    }
    else if (IsScientific)
    {
        state = L"Scientific";
        Model->IsDecimalEnabled = true;
        ResultsMVisualStateTrigger->MinWindowHeight = 544;
    }
    else
    {
        state = L"Standard";
        Model->IsDecimalEnabled = true;
        ResultsMVisualStateTrigger->MinWindowHeight = 1;
    }
    CloseHistoryFlyout();
@ -203,32 +206,6 @@ void Calculator::UpdateViewState()
    VisualStateManager::GoToState(this, ref new String(state.c_str()), true/*useTransitions*/);
 }
 void Calculator::SetResultStyles()
 {
    CoreWindow^ window = CoreWindow::GetForCurrentThread();
    if (window)
    {
        float curHeight = window->Bounds.Height;
        if (curHeight >= 800)
        {
            Results->Style = ResultsStyleL;
            RowResult->MinHeight = 108;
            RowResult->Height = GridLength(72, GridUnitType::Star);
        }
        else if ((IsProgrammer && curHeight >= 640) || (IsScientific && curHeight >= 544) || IsStandard)
        {
            Results->Style = ResultsStyleM;
            RowResult->MinHeight = 72;
            RowResult->Height = GridLength(72, GridUnitType::Star);
        }
        else
        {
            Results->Style = ResultsStyleS;
            RowResult->MinHeight = 42;
            RowResult->Height = GridLength(42, GridUnitType::Star);
        }
    }
 }
 void Calculator::AnimateCalculator(bool resultAnimate)
 {
@ -273,7 +250,6 @@ void Calculator::OnContextCanceled(UIElement^ sender, RoutedEventArgs^ e)
 void Calculator::OnLayoutStateChanged(_In_ Object^ sender, _In_ Object^ e)
 {
    UpdateViewState();
    UpdatePanelViewState();
 }
@ -357,7 +333,6 @@ void Calculator::OnStoryboardCompleted(_In_ Object^ sender, _In_ Object^ e)
            AnimateWithoutResult->Begin();
        }
    }
    SetResultStyles();
 }
 void Calculator::EnsureScientific()
@ -492,7 +467,7 @@ void Calculator::OnHistoryItemClicked(_In_ HistoryItemViewModel^ e)
    Model->SetExpressionDisplay(e->GetTokens(), e->GetCommands());
    Model->SetPrimaryDisplay(e->Result->Data(), false);
    Model->IsFToEEnabled = false;
-   
+
    TraceLogger::GetInstance().LogHistoryItemLoadEnd(tokenSize);
    CloseHistoryFlyout();
    this->Focus(::FocusState::Programmatic);
@ -658,7 +633,6 @@ void Calculator::EnableMemoryControls(bool enable)
 void Calculator::EnableControls(bool enable)
 {
    OpsPanel->IsEnabled = enable;
    EnableMemoryControls(enable);
 }
@ -724,11 +698,6 @@ void Calculator::DockPanelTapped(_In_ TappedRoutedEventArgs^ e)
    m_IsLastFlyoutHistory = false;
 }
 void Calculator::OnResultsLayoutChanged(_In_ Object^ sender, _In_ Object^ e)
 {
    SetResultStyles();
 }
 void Calculator::UnregisterEventHandlers()
 {
    expressionText->UnregisterEventHandlers();
--- a/src/Calculator/Views/Calculator.xaml.h
+++ b/src/Calculator/Views/Calculator.xaml.h
@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 #pragma once
@ -133,8 +133,6 @@ namespace CalculatorApp
        void expressionContainer_LayoutUpdated(_In_ Platform::Object^ sender, _In_ Platform::Object^ e);
        bool IsValidRegularExpression(std::wstring str);
        void DockPanelTapped(_In_ Windows::UI::Xaml::Input::TappedRoutedEventArgs^ e);
        void OnResultsLayoutChanged(_In_ Platform::Object^ sender, _In_ Platform::Object^ e);
        void SetResultStyles();
        void OnErrorLayoutCompleted(_In_ Platform::Object^ sender, _In_ Platform::Object^ e);
        void OnHistoryAccessKeyInvoked(_In_ Windows::UI::Xaml::UIElement^ sender, _In_ Windows::UI::Xaml::Input::AccessKeyInvokedEventArgs^ args);
        void OnMemoryAccessKeyInvoked(_In_ Windows::UI::Xaml::UIElement^ sender, _In_ Windows::UI::Xaml::Input::AccessKeyInvokedEventArgs^ args);
--- a/src/Calculator/Views/UnitConverter.xaml
+++ b/src/Calculator/Views/UnitConverter.xaml
@ -1,4 +1,4 @@
-<UserControl x:Class="CalculatorApp.UnitConverter"
+<UserControl x:Class="CalculatorApp.UnitConverter"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:automation="using:CalculatorApp.Common.Automation"
@ -180,46 +180,30 @@
            </Setter>
        </Style>
-        <Style x:Key="ValueLargeStyle"
+        <Style x:Key="ValueBaseStyle"
-               BasedOn="{StaticResource CalculationResultStyleL}"
+               BasedOn="{StaticResource CalculationResultStyle}"
               TargetType="controls:CalculationResult">
            <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundTransparentBrush}"/>
            <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}"/>
            <Setter Property="HorizontalContentAlignment" Value="Left"/>
            <Setter Property="VerticalContentAlignment" Value="Bottom"/>
            <Setter Property="FontSize" Value="46"/>
            <Setter Property="MinFontSize" Value="{ThemeResource BodyFontSize}"/>
            <Setter Property="FontWeight" Value="Light"/>
            <Setter Property="MinFontSize" Value="{ThemeResource BodyFontSize}"/>
        </Style>
        <Style x:Key="ValueLargeStyle"
               BasedOn="{StaticResource ValueBaseStyle}"
               TargetType="controls:CalculationResult">
            <Setter Property="MaxFontSize" Value="46"/>
            <Setter Property="Margin" Value="-2,0,0,0"/>
            <Setter Property="DisplayMargin" Value="0,0,0,12"/>
        </Style>
        <Style x:Key="ValueMediumStyle"
-               BasedOn="{StaticResource CalculationResultStyleM}"
+               BasedOn="{StaticResource ValueBaseStyle}"
               TargetType="controls:CalculationResult">
-            <Setter Property="FontSize" Value="34"/>
+            <Setter Property="MaxFontSize" Value="34"/>
            <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundTransparentBrush}"/>
            <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}"/>
            <Setter Property="MinFontSize" Value="{ThemeResource BodyFontSize}"/>
            <Setter Property="FontWeight" Value="Light"/>
            <Setter Property="HorizontalContentAlignment" Value="Left"/>
            <Setter Property="VerticalContentAlignment" Value="Bottom"/>
            <Setter Property="Margin" Value="0,0,0,0"/>
            <Setter Property="DisplayMargin" Value="0,0,0,4"/>
        </Style>
        <Style x:Key="ValueSmallStyle"
               BasedOn="{StaticResource CalculationResultStyleS}"
               TargetType="controls:CalculationResult">
            <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundTransparentBrush}"/>
            <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}"/>
            <Setter Property="FontSize" Value="24"/>
            <Setter Property="MinFontSize" Value="{ThemeResource BodyFontSize}"/>
            <Setter Property="FontWeight" Value="Light"/>
            <Setter Property="HorizontalContentAlignment" Value="Left"/>
            <Setter Property="VerticalContentAlignment" Value="Bottom"/>
            <Setter Property="Margin" Value="0,0,0,0"/>
            <Setter Property="DisplayMargin" Value="0,0,0,4"/>
        </Style>
        <Style x:Key="CurrencySymbolBaseStyle" TargetType="TextBlock">
            <Setter Property="FontWeight" Value="Light"/>
            <Setter Property="HorizontalAlignment" Value="Left"/>