Merge remote-tracking branch 'upstream/master' into code-analysis-2

.gitignore

@@ -290,4 +290,5 @@ __pycache__/
 # Calculator specific
 Generated Files/
 !/build/config/TRexDefs/**
+!src/Calculator/TemporaryKey.pfx
 !src/CalculatorUnitTests/CalculatorUnitTests_TemporaryKey.pfx

build/pipelines/azure-pipelines.loc.yaml

@@ -15,30 +15,33 @@ name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
 jobs:
 - job: Localize
   pool:
-    name: Package ES Custom Demands Lab A
-    demands:
-    - ClientAlias -equals PKGESUTILAPPS
-  workspace:
-    clean: outputs
+    vmImage: vs2017-win2016
+  variables:
+    skipComponentGovernanceDetection: true
   steps:
-  - checkout: self
-    clean: true
 
-  - task: PkgESSetupBuild@10
-    displayName: Initialize Package ES
+  - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@1
+    displayName: Send resources to Touchdown Build
     inputs:
-      productName: Calculator
-      branchVersion: true
+      teamId: 86
+      authId: d3dd8113-65b3-4526-bdca-a00a7d1c37ba
+      authKey: $(LocServiceKey)
+      isPreview: false
+      relativePathRoot: src/Calculator/Resources/en-US/
+      resourceFilePath: '*.resw'
+      outputDirectoryRoot: src/Calculator/Resources/
 
-  - task: PkgESTouchdownLocService@10
-    displayName: Package ES Touchdown Loc Service
+  - script: |
+      cd $(Build.SourcesDirectory)
+      git add -A
+      git diff --cached --exit-code
+      echo '##vso[task.setvariable variable=hasChanges]%errorlevel%'
+      git diff --cached > $(Build.ArtifactStagingDirectory)\LocalizedStrings.patch
+    displayName: Check for changes and create patch file
+
+  - task: PublishPipelineArtifact@0
+    displayName: Publish patch file as artifact
+    condition: eq(variables['hasChanges'], '1')
     inputs:
-      IsCallToServiceStepSelected: true
-      IsCheckedInFileSelected: true
-      CheckinFilesAtOriginFilePath: true
-      GitLocPath: Loc/Resources
-      LocConfigFile: build/config/LocConfigPackageEs.xml
-      AuthenticationMode: OAuth
-      ClientApplicationID: d3dd8113-65b3-4526-bdca-a00a7d1c37ba
-      ApplicationKeyID: $(LocServiceKey)
-      SendToLoc: true
+      artifactName: Patch
+      targetPath: $(Build.ArtifactStagingDirectory)

build/pipelines/azure-pipelines.release.yaml

@@ -9,8 +9,8 @@ pr: none
 
 variables:
   versionMajor: 10
-  versionMinor: 1902
-  versionBuild: $[counter('10.1902.*', 0)]
+  versionMinor: 1903
+  versionBuild: $[counter('10.1903.*', 0)]
   versionPatch: 0
 
 name: '$(versionMajor).$(versionMinor).$(versionBuild).$(versionPatch)'

build/pipelines/templates/build-app-internal.yaml

@@ -29,7 +29,7 @@ jobs:
       downloadDirectory: $(Build.SourcesDirectory)
       vstsFeed: WindowsApps
       vstsFeedPackage: calculator-internals
-      vstsPackageVersion: 0.0.7
+      vstsPackageVersion: 0.0.10
 
   - template: ./build-single-architecture.yaml
     parameters:

build/pipelines/templates/prepare-release-internalonly.yaml

@@ -87,7 +87,7 @@ jobs:
       downloadDirectory: $(Build.SourcesDirectory)
       vstsFeed: WindowsApps
       vstsFeedPackage: calculator-internals
-      vstsPackageVersion: 0.0.7
+      vstsPackageVersion: 0.0.10
 
   - task: PkgESStoreBrokerPackage@10
     displayName: Create StoreBroker Packages

docs/Roadmap.md

@@ -9,6 +9,7 @@ In 2019, the Windows Calculator team is focused on:
 * Iterating upon the existing app design based on the latest [Fluent Design guidelines](https://developer.microsoft.com/en-us/windows/apps/design)
 * Improving testing and diagnostics within the project
 * Investigating new features with a focus on addressing top user feedback, including:
+  * Adding graphing mode
   * Adding the ability for users to pin Calculator on top of other windows
   * Providing additional customization options
   * [Your feature idea here] - please review our [new feature development process](https://github.com/Microsoft/calculator/blob/master/docs/NewFeatureProcess.md) to get started!

src/CalcManager/CEngine/History.cpp

@@ -136,7 +136,7 @@ void CHistoryCollector::AddBinOpToHistory(int nOpCode, bool fNoRepetition)
 }
 
 // This is expected to be called when a binary op in the last say 1+2+ is changing to another one say 1+2* (+ changed to *)
-// It needs to know by this change a Precedence inversion happened. i.e. previous op was lower or equal to its previous op, but the new 
+// It needs to know by this change a Precedence inversion happened. i.e. previous op was lower or equal to its previous op, but the new
 // one isn't. (Eg. 1*2* to 1*2^). It can add explicit brackets to ensure the precedence is inverted. (Eg. (1*2) ^)
 void CHistoryCollector::ChangeLastBinOp(int nOpCode, bool fPrecInvToHigher)
 {
@@ -203,7 +203,7 @@ bool CHistoryCollector::FOpndAddedToHistory()
 
 // AddUnaryOpToHistory
 //
-// This is does the postfix to prefix translation of the input and adds the text to the history. Eg. doing 2 + 4 (sqrt), 
+// This is does the postfix to prefix translation of the input and adds the text to the history. Eg. doing 2 + 4 (sqrt),
 // this routine will ensure the last sqrt call unary operator, actually goes back in history and wraps 4 in sqrt(4)
 //
 void CHistoryCollector::AddUnaryOpToHistory(int nOpCode, bool fInv, ANGLE_TYPE angletype)
@@ -297,7 +297,7 @@ void CHistoryCollector::AddUnaryOpToHistory(int nOpCode, bool fInv, ANGLE_TYPE a
 }
 
 // Called after = with the result of the equation
-// Responsible for clearing the top line of current running history display, as well as adding yet another element to 
+// Responsible for clearing the top line of current running history display, as well as adding yet another element to
 // history of equations
 void CHistoryCollector::CompleteHistoryLine(wstring_view numStr)
 {
@@ -413,37 +413,39 @@ int CHistoryCollector::AddCommand(_In_ const std::shared_ptr<IExpressionCommand>
     return nCommands - 1;
 }
 
-// To Update the operands in the Expression according to the current Radix 
+// To Update the operands in the Expression according to the current Radix
 void CHistoryCollector::UpdateHistoryExpression(uint32_t radix, int32_t precision)
 {
-    if (m_spTokens != nullptr)
+    if (m_spTokens == nullptr)
     {
-        unsigned int size;
-        IFT(m_spTokens->GetSize(&size));
+        return;
+    }
 
-        for (unsigned int i = 0; i < size; ++i)
+    unsigned int size;
+    IFT(m_spTokens->GetSize(&size));
+
+    for (unsigned int i = 0; i < size; ++i)
+    {
+        std::pair<std::wstring, int> token;
+        IFT(m_spTokens->GetAt(i, &token));
+        int commandPosition = token.second;
+        if (commandPosition != -1)
         {
-            std::pair<std::wstring, int> token;
-            IFT(m_spTokens->GetAt(i, &token));
-            int commandPosition = token.second;
-            if (commandPosition != -1)
+            std::shared_ptr<IExpressionCommand> expCommand;
+            IFT(m_spCommands->GetAt(commandPosition, &expCommand));
+            if (expCommand != nullptr && CalculationManager::CommandType::OperandCommand == expCommand->GetCommandType())
             {
-                std::shared_ptr<IExpressionCommand> expCommand;
-                IFT(m_spCommands->GetAt(commandPosition, &expCommand));
-                if (expCommand != nullptr && CalculationManager::CommandType::OperandCommand == expCommand->GetCommandType())
+                std::shared_ptr<COpndCommand> opndCommand = std::static_pointer_cast<COpndCommand>(expCommand);
+                if (opndCommand != nullptr)
                 {
-                    std::shared_ptr<COpndCommand> opndCommand = std::static_pointer_cast<COpndCommand>(expCommand);
-                    if (opndCommand != nullptr)
-                    {
-                        token.first = opndCommand->GetString(radix, precision);
-                        IFT(m_spTokens->SetAt(i, token));
-                        opndCommand->SetCommands(GetOperandCommandsFromString(token.first));
-                    }
+                    token.first = opndCommand->GetString(radix, precision);
+                    IFT(m_spTokens->SetAt(i, token));
+                    opndCommand->SetCommands(GetOperandCommandsFromString(token.first));
                 }
             }
         }
-        SetExpressionDisplay();
     }
+    SetExpressionDisplay();
 }
 
 void CHistoryCollector::SetDecimalSymbol(wchar_t decimalSymbol)

src/CalcManager/CEngine/scicomm.cpp

@@ -36,7 +36,7 @@ namespace {
         static BYTE    rgbPrec[] = { 0,0,  IDC_OR,0, IDC_XOR,0,  IDC_AND,1,
             IDC_ADD,2, IDC_SUB,2,    IDC_RSHF,3, IDC_LSHF,3,
             IDC_MOD,3, IDC_DIV,3, IDC_MUL,3,  IDC_PWR,4,   IDC_ROOT, 4 };
-        int iPrec;
+        unsigned int iPrec;
 
         iPrec = 0;
         while ((iPrec < size(rgbPrec)) && (nopCode != rgbPrec[iPrec]))
@@ -947,7 +947,7 @@ wstring_view CCalcEngine::OpCodeToUnaryString(int nOpCode, bool fInv, ANGLE_TYPE
     // Try to lookup the ID in the UFNE table
     int ids = 0;
     int iufne = nOpCode - IDC_UNARYFIRST;
-    if (iufne >= 0 && iufne < size(rgUfne))
+    if (iufne >= 0 && (size_t)iufne < size(rgUfne))
     {
         if (fInv)
         {

src/CalcManager/CEngine/sciset.cpp

@@ -56,7 +56,7 @@ LONG CCalcEngine::DwWordBitWidthFromeNumWidth(NUM_WIDTH /*numwidth*/)
     static constexpr int nBitMax[] = { 64, 32, 16, 8 };
     LONG wmax = nBitMax[0];
 
-    if (m_numwidth >= 0 && m_numwidth < size(nBitMax))
+    if (m_numwidth >= 0 && (size_t)m_numwidth < size(nBitMax))
     {
         wmax = nBitMax[m_numwidth];
     }
@@ -69,7 +69,7 @@ uint32_t CCalcEngine::NRadixFromRadixType(RADIX_TYPE radixtype)
     uint32_t radix = 10;
 
     // convert special bases into symbolic values
-    if (radixtype >= 0 && radixtype < size(rgnRadish))
+    if (radixtype >= 0 && (size_t)radixtype < size(rgnRadish))
     {
         radix = rgnRadish[radixtype];
     }

src/CalcManager/CalculatorHistory.cpp

@@ -8,7 +8,6 @@ using namespace std;
 using namespace CalculationManager;
 
 CalculatorHistory::CalculatorHistory(size_t maxSize) :
-    m_mode(eMode),
     m_maxHistorySize(maxSize)
 {}
 
@@ -35,15 +34,13 @@ unsigned int CalculatorHistory::AddToHistory(_In_ shared_ptr<CalculatorVector <p
 
 unsigned int CalculatorHistory::AddItem(_In_ shared_ptr<HISTORYITEM> const &spHistoryItem)
 {
-    int lastIndex;
-
     if (m_historyItems.size() >= m_maxHistorySize)
     {
         m_historyItems.erase(m_historyItems.begin());
     }
 
     m_historyItems.push_back(spHistoryItem);
-    lastIndex = static_cast<unsigned>(m_historyItems.size() - 1);
+    unsigned int lastIndex = static_cast<unsigned>(m_historyItems.size() - 1);
     return lastIndex;
 }
 

src/CalcManager/CalculatorHistory.h

@@ -43,7 +43,6 @@ namespace CalculationManager
 
     private:
         std::vector<std::shared_ptr<HISTORYITEM>> m_historyItems;
-        CALCULATOR_MODE m_mode;
         const size_t m_maxHistorySize;
     };
 }

src/CalcManager/CalculatorManager.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"
@@ -24,15 +24,15 @@ namespace CalculationManager
 {
     CalculatorManager::CalculatorManager(_In_ ICalcDisplay* displayCallback, _In_ IResourceProvider* resourceProvider) :
         m_displayCallback(displayCallback),
+        m_currentCalculatorEngine(nullptr),
         m_resourceProvider(resourceProvider),
+        m_inHistoryItemLoadMode(false),
+        m_persistedPrimaryValue(),
+        m_isExponentialFormat(false),
         m_currentDegreeMode(Command::CommandNULL),
         m_savedDegreeMode(Command::CommandDEG),
-        m_isExponentialFormat(false),
-        m_persistedPrimaryValue(),
-        m_currentCalculatorEngine(nullptr),
-        m_pStdHistory(new CalculatorHistory(CM_STD, MAX_HISTORY_ITEMS)),
-        m_pSciHistory(new CalculatorHistory(CM_SCI, MAX_HISTORY_ITEMS)),
-        m_inHistoryItemLoadMode(false)
+        m_pStdHistory(new CalculatorHistory(MAX_HISTORY_ITEMS)),
+        m_pSciHistory(new CalculatorHistory(MAX_HISTORY_ITEMS))
     {
         CCalcEngine::InitialOneTimeOnlySetup(*m_resourceProvider);
     }
@@ -292,7 +292,7 @@ namespace CalculationManager
             break;
         case Command::CommandFE:
             m_isExponentialFormat = !m_isExponentialFormat;
-            // fall through
+            [[fallthrough]];
         default:
             m_currentCalculatorEngine->ProcessCommand(static_cast<WPARAM>(command));
             break;
@@ -308,7 +308,10 @@ namespace CalculationManager
     unsigned char CalculatorManager::MapCommandForSerialize(Command command)
     {
         unsigned int commandToSave = static_cast<unsigned int>(command);
-        commandToSave > UCHAR_MAX ? commandToSave -= UCHAR_MAX : commandToSave;
+        if (commandToSave > UCHAR_MAX)
+        {
+            commandToSave -= UCHAR_MAX;
+        }
         return static_cast<unsigned char>(commandToSave);
     }
 
@@ -360,7 +363,7 @@ namespace CalculationManager
     /// <param name = "serializedPrimaryDisplay">Serialized Rational of primary display</param>
     void CalculatorManager::DeSerializePrimaryDisplay(const vector<long> &serializedPrimaryDisplay)
     {
-        if (serializedPrimaryDisplay.size() == 0)
+        if (serializedPrimaryDisplay.empty())
         {
             return;
         }
@@ -490,22 +493,25 @@ namespace CalculationManager
     void CalculatorManager::MemorizeNumber()
     {
         m_savedCommands.push_back(MEMORY_COMMAND_TO_UNSIGNED_CHAR(MemoryCommand::MemorizeNumber));
-        if (!(m_currentCalculatorEngine->FInErrorState()))
+
+        if (m_currentCalculatorEngine->FInErrorState())
         {
-            m_currentCalculatorEngine->ProcessCommand(IDC_STORE);
-
-            auto memoryObjectPtr = m_currentCalculatorEngine->PersistedMemObject();
-            if (memoryObjectPtr != nullptr)
-            {
-                m_memorizedNumbers.insert(m_memorizedNumbers.begin(), *memoryObjectPtr);
-            }
-
-            if (m_memorizedNumbers.size() > m_maximumMemorySize)
-            {
-                m_memorizedNumbers.resize(m_maximumMemorySize);
-            }
-            this->SetMemorizedNumbersString();
+            return;
         }
+
+        m_currentCalculatorEngine->ProcessCommand(IDC_STORE);
+
+        auto memoryObjectPtr = m_currentCalculatorEngine->PersistedMemObject();
+        if (memoryObjectPtr != nullptr)
+        {
+            m_memorizedNumbers.insert(m_memorizedNumbers.begin(), *memoryObjectPtr);
+        }
+
+        if (m_memorizedNumbers.size() > m_maximumMemorySize)
+        {
+            m_memorizedNumbers.resize(m_maximumMemorySize);
+        }
+        this->SetMemorizedNumbersString();
     }
 
     /// <summary>
@@ -516,11 +522,14 @@ namespace CalculationManager
     void CalculatorManager::MemorizedNumberLoad(_In_ unsigned int indexOfMemory)
     {
         SaveMemoryCommand(MemoryCommand::MemorizedNumberLoad, indexOfMemory);
-        if (!(m_currentCalculatorEngine->FInErrorState()))
+
+        if (m_currentCalculatorEngine->FInErrorState())
         {
-            this->MemorizedNumberSelect(indexOfMemory);
-            m_currentCalculatorEngine->ProcessCommand(IDC_RECALL);
+            return;
         }
+
+        this->MemorizedNumberSelect(indexOfMemory);
+        m_currentCalculatorEngine->ProcessCommand(IDC_RECALL);
     }
 
     /// <summary>
@@ -532,24 +541,27 @@ namespace CalculationManager
     void CalculatorManager::MemorizedNumberAdd(_In_ unsigned int indexOfMemory)
     {
         SaveMemoryCommand(MemoryCommand::MemorizedNumberAdd, indexOfMemory);
-        if (!(m_currentCalculatorEngine->FInErrorState()))
+
+        if (m_currentCalculatorEngine->FInErrorState())
         {
-            if (m_memorizedNumbers.empty())
-            {
-                this->MemorizeNumber();
-            }
-            else
-            {
-                this->MemorizedNumberSelect(indexOfMemory);
-                m_currentCalculatorEngine->ProcessCommand(IDC_MPLUS);
-
-                this->MemorizedNumberChanged(indexOfMemory);
-
-                this->SetMemorizedNumbersString();
-            }
-
-            m_displayCallback->MemoryItemChanged(indexOfMemory);
+            return;
         }
+
+        if (m_memorizedNumbers.empty())
+        {
+            this->MemorizeNumber();
+        }
+        else
+        {
+            this->MemorizedNumberSelect(indexOfMemory);
+            m_currentCalculatorEngine->ProcessCommand(IDC_MPLUS);
+
+            this->MemorizedNumberChanged(indexOfMemory);
+
+            this->SetMemorizedNumbersString();
+        }
+
+        m_displayCallback->MemoryItemChanged(indexOfMemory);
     }
 
     void CalculatorManager::MemorizedNumberClear(_In_ unsigned int indexOfMemory)
@@ -570,27 +582,30 @@ namespace CalculationManager
     void CalculatorManager::MemorizedNumberSubtract(_In_ unsigned int indexOfMemory)
     {
         SaveMemoryCommand(MemoryCommand::MemorizedNumberSubtract, indexOfMemory);
-        if (!(m_currentCalculatorEngine->FInErrorState()))
+
+        if (m_currentCalculatorEngine->FInErrorState())
         {
-            // To add negative of the number on display to the memory -x = x - 2x
-            if (m_memorizedNumbers.empty())
-            {
-                this->MemorizeNumber();
-                this->MemorizedNumberSubtract(0);
-                this->MemorizedNumberSubtract(0);
-            }
-            else
-            {
-                this->MemorizedNumberSelect(indexOfMemory);
-                m_currentCalculatorEngine->ProcessCommand(IDC_MMINUS);
-
-                this->MemorizedNumberChanged(indexOfMemory);
-
-                this->SetMemorizedNumbersString();
-            }
-
-            m_displayCallback->MemoryItemChanged(indexOfMemory);
+            return;
         }
+
+        // To add negative of the number on display to the memory -x = x - 2x
+        if (m_memorizedNumbers.empty())
+        {
+            this->MemorizeNumber();
+            this->MemorizedNumberSubtract(0);
+            this->MemorizedNumberSubtract(0);
+        }
+        else
+        {
+            this->MemorizedNumberSelect(indexOfMemory);
+            m_currentCalculatorEngine->ProcessCommand(IDC_MMINUS);
+
+            this->MemorizedNumberChanged(indexOfMemory);
+
+            this->SetMemorizedNumbersString();
+        }
+
+        m_displayCallback->MemoryItemChanged(indexOfMemory);
     }
 
     /// <summary>
@@ -613,11 +628,13 @@ namespace CalculationManager
 /// <param name="indexOfMemory">Index of the target memory</param>
     void CalculatorManager::MemorizedNumberSelect(_In_ unsigned int indexOfMemory)
     {
-        if (!(m_currentCalculatorEngine->FInErrorState()))
+        if (m_currentCalculatorEngine->FInErrorState())
         {
-            auto memoryObject = m_memorizedNumbers.at(indexOfMemory);
-            m_currentCalculatorEngine->PersistedMemObject(memoryObject);
+            return;
         }
+
+        auto memoryObject = m_memorizedNumbers.at(indexOfMemory);
+        m_currentCalculatorEngine->PersistedMemObject(memoryObject);
     }
 
     /// <summary>
@@ -627,13 +644,15 @@ namespace CalculationManager
     /// <param name="indexOfMemory">Index of the target memory</param>
     void CalculatorManager::MemorizedNumberChanged(_In_ unsigned int indexOfMemory)
     {
-        if (!(m_currentCalculatorEngine->FInErrorState()))
+        if (m_currentCalculatorEngine->FInErrorState())
         {
-            auto memoryObject = m_currentCalculatorEngine->PersistedMemObject();
-            if (memoryObject != nullptr)
-            {
-                m_memorizedNumbers.at(indexOfMemory) = *memoryObject;
-            }
+            return;
+        }
+
+        auto memoryObject = m_currentCalculatorEngine->PersistedMemObject();
+        if (memoryObject != nullptr)
+        {
+            m_memorizedNumbers.at(indexOfMemory) = *memoryObject;
         }
     }
 

src/CalcManager/CalculatorManager.h

@@ -42,7 +42,7 @@ namespace CalculationManager
         MemorizedNumberClear = 335
     };
 
-    class CalculatorManager sealed : public ICalcDisplay
+    class CalculatorManager final : public ICalcDisplay
     {
     private:
         ICalcDisplay* const m_displayCallback;
@@ -141,7 +141,7 @@ namespace CalculationManager
         std::shared_ptr<HISTORYITEM> const& GetHistoryItem(_In_ unsigned int uIdx);
         bool RemoveHistoryItem(_In_ unsigned int uIdx);
         void ClearHistory();
-        const size_t MaxHistorySize() const { return m_pHistory->MaxHistorySize(); }
+        size_t MaxHistorySize() const { return m_pHistory->MaxHistorySize(); }
         CalculationManager::Command GetCurrentDegreeMode();
         void SetHistory(_In_ CALCULATOR_MODE eMode, _In_ std::vector<std::shared_ptr<HISTORYITEM>> const& history);
         void SetInHistoryItemLoadMode(_In_ bool isHistoryItemLoadMode);

src/CalcManager/ExpressionCommand.cpp

@@ -98,8 +98,8 @@ void CBinaryCommand::Accept(_In_ ISerializeCommandVisitor &commandVisitor)
 COpndCommand::COpndCommand(shared_ptr<CalculatorVector<int>> const &commands, bool fNegative, bool fDecimal, bool fSciFmt) :
     m_commands(commands),
     m_fNegative(fNegative),
-    m_fDecimal(fDecimal),
     m_fSciFmt(fSciFmt),
+    m_fDecimal(fDecimal),
     m_fInitialized(false),
     m_value{}
 {}

src/CalcManager/Ratpack/conv.cpp

@@ -612,6 +612,7 @@ PNUMBER StringToNumber(wstring_view numberString, uint32_t radix, int32_t precis
                 break;
             }
             // Drop through in the 'e'-as-a-digit case
+            [[fallthrough]];
         default:
             state = machine[state][NZ];
             break;
@@ -646,7 +647,7 @@ PNUMBER StringToNumber(wstring_view numberString, uint32_t radix, int32_t precis
             break;
         case LD:
             pnumret->exp++;
-            // Fall through
+            [[fallthrough]];
         case DD:
             {
                 curChar = NormalizeCharDigit(curChar, radix);
@@ -1270,7 +1271,7 @@ PNUMBER RatToNumber(_In_ PRAT prat, uint32_t radix, int32_t precision)
     // Convert p and q of rational form from internal base to requested base.
     // Scale by largest power of BASEX possible.
     long scaleby = min(temprat->pp->exp, temprat->pq->exp);
-    scaleby = max(scaleby, 0);
+    scaleby = max(scaleby, 0l);
 
     temprat->pp->exp -= scaleby;
     temprat->pq->exp -= scaleby;

src/CalcManager/Ratpack/logic.cpp

@@ -16,7 +16,7 @@
 #include "pch.h"
 #include "ratpak.h"
 
-
+using namespace std;
 
 void lshrat( _Inout_ PRAT *pa, _In_ PRAT b, uint32_t radix, int32_t precision)
 

src/CalcManager/Ratpack/ratpak.h

@@ -225,7 +225,7 @@ memmove( (x)->pp->mant, &((x)->pp->mant[trim]), sizeof(MANTTYPE)*((x)->pp->cdigi
                 (x)->pp->cdigit -= trim; \
                 (x)->pp->exp += trim; \
                 } \
-            trim = min((x)->pp->exp,(x)->pq->exp);\
+            trim = std::min((x)->pp->exp,(x)->pq->exp);\
             (x)->pp->exp -= trim;\
             (x)->pq->exp -= trim;\
             }

src/CalcManager/UnitConverter.cpp

@@ -109,22 +109,8 @@ CategorySelectionInitializer UnitConverter::SetCurrentCategory(const Category& i
             vector<Unit>& unitVector = m_categoryToUnits[m_currentCategory];
             for (unsigned int i = 0; i < unitVector.size(); i++)
             {
-                if (unitVector[i].id == m_fromType.id)
-                {
-                    unitVector[i].isConversionSource = true;
-                }
-                else
-                {
-                    unitVector[i].isConversionSource = false;
-                }
-                if (unitVector[i].id == m_toType.id)
-                {
-                    unitVector[i].isConversionTarget = true;
-                }
-                else
-                {
-                    unitVector[i].isConversionTarget = false;
-                }
+                unitVector[i].isConversionSource = (unitVector[i].id == m_fromType.id);
+                unitVector[i].isConversionTarget = (unitVector[i].id == m_toType.id);
             }
             m_currentCategory = input;
             if (!m_currentCategory.supportsNegative && m_currentDisplay.front() == L'-')
@@ -156,15 +142,17 @@ Category UnitConverter::GetCurrentCategory()
 /// <param name="toType">Unit struct we are converting to</param>
 void UnitConverter::SetCurrentUnitTypes(const Unit& fromType, const Unit& toType)
 {
-    if (CheckLoad())
+    if (!CheckLoad())
     {
-        m_fromType = fromType;
-        m_toType = toType;
-        Calculate();
-
-        UpdateCurrencySymbols();
-        UpdateViewModel();
+        return;
     }
+
+    m_fromType = fromType;
+    m_toType = toType;
+    Calculate();
+
+    UpdateCurrencySymbols();
+    UpdateViewModel();
 }
 
 /// <summary>
@@ -181,22 +169,24 @@ void UnitConverter::SetCurrentUnitTypes(const Unit& fromType, const Unit& toType
 /// </param>
 void UnitConverter::SwitchActive(const wstring& newValue)
 {
-    if (CheckLoad())
+    if (!CheckLoad())
     {
-        swap(m_fromType, m_toType);
-        swap(m_currentHasDecimal, m_returnHasDecimal);
-        m_returnDisplay = m_currentDisplay;
-        m_currentDisplay = newValue;
-        m_currentHasDecimal = (m_currentDisplay.find(L'.') != m_currentDisplay.npos);
-        m_switchedActive = true;
+        return;
+    }
 
-        if (m_currencyDataLoader != nullptr && m_vmCurrencyCallback != nullptr)
-        {
-            shared_ptr<ICurrencyConverterDataLoader> currencyDataLoader = GetCurrencyConverterDataLoader();
-            const pair<wstring, wstring> currencyRatios = currencyDataLoader->GetCurrencyRatioEquality(m_fromType, m_toType);
+    swap(m_fromType, m_toType);
+    swap(m_currentHasDecimal, m_returnHasDecimal);
+    m_returnDisplay = m_currentDisplay;
+    m_currentDisplay = newValue;
+    m_currentHasDecimal = (m_currentDisplay.find(L'.') != m_currentDisplay.npos);
+    m_switchedActive = true;
 
-            m_vmCurrencyCallback->CurrencyRatiosCallback(currencyRatios.first, currencyRatios.second);
-        }
+    if (m_currencyDataLoader != nullptr && m_vmCurrencyCallback != nullptr)
+    {
+        shared_ptr<ICurrencyConverterDataLoader> currencyDataLoader = GetCurrencyConverterDataLoader();
+        const pair<wstring, wstring> currencyRatios = currencyDataLoader->GetCurrencyRatioEquality(m_fromType, m_toType);
+
+        m_vmCurrencyCallback->CurrencyRatiosCallback(currencyRatios.first, currencyRatios.second);
     }
 }
 
@@ -291,55 +281,53 @@ wstring UnitConverter::ConversionDataToString(ConversionData d, const wchar_t *
 /// </summary>
 wstring UnitConverter::Serialize()
 {
-    if (CheckLoad())
-    {
-        wstringstream out(wstringstream::out);
-        const wchar_t * delimiter = L";";
-
-        out << UnitToString(m_fromType, delimiter) << "|";
-        out << UnitToString(m_toType, delimiter) << "|";
-        out << CategoryToString(m_currentCategory, delimiter) << "|";
-        out << std::to_wstring(m_currentHasDecimal) << delimiter << std::to_wstring(m_returnHasDecimal) << delimiter << std::to_wstring(m_switchedActive) << delimiter;
-        out << m_currentDisplay << delimiter << m_returnDisplay << delimiter << "|";
-        wstringstream categoryString(wstringstream::out);
-        wstringstream categoryToUnitString(wstringstream::out);
-        wstringstream unitToUnitToDoubleString(wstringstream::out);
-        for (const Category& c : m_categories)
-        {
-            categoryString << CategoryToString(c, delimiter) << ",";
-        }
-
-        for (const auto& cur : m_categoryToUnits)
-        {
-            categoryToUnitString << CategoryToString(cur.first, delimiter) << "[";
-            for (const Unit& u : cur.second)
-            {
-                categoryToUnitString << UnitToString(u, delimiter) << ",";
-            }
-            categoryToUnitString << "[" << "]";
-        }
-
-        for (const auto& cur : m_ratioMap)
-        {
-            unitToUnitToDoubleString << UnitToString(cur.first, delimiter) << "[";
-            for (const auto& curConversion : cur.second)
-            {
-                unitToUnitToDoubleString << UnitToString(curConversion.first, delimiter) << ":";
-                unitToUnitToDoubleString << ConversionDataToString(curConversion.second, delimiter) << ":,";
-            }
-            unitToUnitToDoubleString << "[" << "]";
-        }
-
-        out << categoryString.str() << "|";
-        out << categoryToUnitString.str() << "|";
-        out << unitToUnitToDoubleString.str() << "|";
-        wstring test = out.str();
-        return test;
-    }
-    else
+    if (!CheckLoad())
     {
         return wstring();
     }
+
+    wstringstream out(wstringstream::out);
+    const wchar_t * delimiter = L";";
+
+    out << UnitToString(m_fromType, delimiter) << "|";
+    out << UnitToString(m_toType, delimiter) << "|";
+    out << CategoryToString(m_currentCategory, delimiter) << "|";
+    out << std::to_wstring(m_currentHasDecimal) << delimiter << std::to_wstring(m_returnHasDecimal) << delimiter << std::to_wstring(m_switchedActive) << delimiter;
+    out << m_currentDisplay << delimiter << m_returnDisplay << delimiter << "|";
+    wstringstream categoryString(wstringstream::out);
+    wstringstream categoryToUnitString(wstringstream::out);
+    wstringstream unitToUnitToDoubleString(wstringstream::out);
+    for (const Category& c : m_categories)
+    {
+        categoryString << CategoryToString(c, delimiter) << ",";
+    }
+
+    for (const auto& cur : m_categoryToUnits)
+    {
+        categoryToUnitString << CategoryToString(cur.first, delimiter) << "[";
+        for (const Unit& u : cur.second)
+        {
+            categoryToUnitString << UnitToString(u, delimiter) << ",";
+        }
+        categoryToUnitString << "[" << "]";
+    }
+
+    for (const auto& cur : m_ratioMap)
+    {
+        unitToUnitToDoubleString << UnitToString(cur.first, delimiter) << "[";
+        for (const auto& curConversion : cur.second)
+        {
+            unitToUnitToDoubleString << UnitToString(curConversion.first, delimiter) << ":";
+            unitToUnitToDoubleString << ConversionDataToString(curConversion.second, delimiter) << ":,";
+        }
+        unitToUnitToDoubleString << "[" << "]";
+    }
+
+    out << categoryString.str() << "|";
+    out << categoryToUnitString.str() << "|";
+    out << unitToUnitToDoubleString.str() << "|";
+    wstring test = out.str();
+    return test;
 }
 
 /// <summary>
@@ -349,55 +337,58 @@ wstring UnitConverter::Serialize()
 void UnitConverter::DeSerialize(const wstring& serializedData)
 {
     Reset();
-    if (!serializedData.empty())
+
+    if (serializedData.empty())
     {
-        vector<wstring> outerTokens = StringToVector(serializedData, L"|");
-        assert(outerTokens.size() == EXPECTEDSERIALIZEDTOKENCOUNT);
-        m_fromType = StringToUnit(outerTokens[0]);
-        m_toType = StringToUnit(outerTokens[1]);
-        m_currentCategory = StringToCategory(outerTokens[2]);
-        vector<wstring> stateDataTokens = StringToVector(outerTokens[3], L";");
-        assert(stateDataTokens.size() == EXPECTEDSTATEDATATOKENCOUNT);
-        m_currentHasDecimal = (stateDataTokens[0].compare(L"1") == 0);
-        m_returnHasDecimal = (stateDataTokens[1].compare(L"1") == 0);
-        m_switchedActive = (stateDataTokens[2].compare(L"1") == 0);
-        m_currentDisplay = stateDataTokens[3];
-        m_returnDisplay = stateDataTokens[4];
-        vector<wstring> categoryListTokens = StringToVector(outerTokens[4], L",");
-        for (wstring token : categoryListTokens)
-        {
-            m_categories.push_back(StringToCategory(token));
-        }
-        vector<wstring> unitVectorTokens = StringToVector(outerTokens[5], L"]");
-        for (wstring unitVector : unitVectorTokens)
-        {
-            vector<wstring> mapcomponents = StringToVector(unitVector, L"[");
-            assert(mapcomponents.size() == EXPECTEDMAPCOMPONENTTOKENCOUNT);
-            Category key = StringToCategory(mapcomponents[0]);
-            vector<wstring> units = StringToVector(mapcomponents[1], L",");
-            for (wstring unit : units)
-            {
-                m_categoryToUnits[key].push_back(StringToUnit(unit));
-            }
-        }
-        vector<wstring> ratioMapTokens = StringToVector(outerTokens[6], L"]");
-        for (wstring token : ratioMapTokens)
-        {
-            vector<wstring> ratioMapComponentTokens = StringToVector(token, L"[");
-            assert(ratioMapComponentTokens.size() == EXPECTEDMAPCOMPONENTTOKENCOUNT);
-            Unit key = StringToUnit(ratioMapComponentTokens[0]);
-            vector<wstring> ratioMapList = StringToVector(ratioMapComponentTokens[1], L",");
-            for (wstring subtoken : ratioMapList)
-            {
-                vector<wstring> ratioMapSubComponentTokens = StringToVector(subtoken, L":");
-                assert(ratioMapSubComponentTokens.size() == EXPECTEDMAPCOMPONENTTOKENCOUNT);
-                Unit subkey = StringToUnit(ratioMapSubComponentTokens[0]);
-                ConversionData conversion = StringToConversionData(ratioMapSubComponentTokens[1]);
-                m_ratioMap[key][subkey] = conversion;
-            }
-        }
-        UpdateViewModel();
+        return;
     }
+
+    vector<wstring> outerTokens = StringToVector(serializedData, L"|");
+    assert(outerTokens.size() == EXPECTEDSERIALIZEDTOKENCOUNT);
+    m_fromType = StringToUnit(outerTokens[0]);
+    m_toType = StringToUnit(outerTokens[1]);
+    m_currentCategory = StringToCategory(outerTokens[2]);
+    vector<wstring> stateDataTokens = StringToVector(outerTokens[3], L";");
+    assert(stateDataTokens.size() == EXPECTEDSTATEDATATOKENCOUNT);
+    m_currentHasDecimal = (stateDataTokens[0].compare(L"1") == 0);
+    m_returnHasDecimal = (stateDataTokens[1].compare(L"1") == 0);
+    m_switchedActive = (stateDataTokens[2].compare(L"1") == 0);
+    m_currentDisplay = stateDataTokens[3];
+    m_returnDisplay = stateDataTokens[4];
+    vector<wstring> categoryListTokens = StringToVector(outerTokens[4], L",");
+    for (wstring token : categoryListTokens)
+    {
+        m_categories.push_back(StringToCategory(token));
+    }
+    vector<wstring> unitVectorTokens = StringToVector(outerTokens[5], L"]");
+    for (wstring unitVector : unitVectorTokens)
+    {
+        vector<wstring> mapcomponents = StringToVector(unitVector, L"[");
+        assert(mapcomponents.size() == EXPECTEDMAPCOMPONENTTOKENCOUNT);
+        Category key = StringToCategory(mapcomponents[0]);
+        vector<wstring> units = StringToVector(mapcomponents[1], L",");
+        for (wstring unit : units)
+        {
+            m_categoryToUnits[key].push_back(StringToUnit(unit));
+        }
+    }
+    vector<wstring> ratioMapTokens = StringToVector(outerTokens[6], L"]");
+    for (wstring token : ratioMapTokens)
+    {
+        vector<wstring> ratioMapComponentTokens = StringToVector(token, L"[");
+        assert(ratioMapComponentTokens.size() == EXPECTEDMAPCOMPONENTTOKENCOUNT);
+        Unit key = StringToUnit(ratioMapComponentTokens[0]);
+        vector<wstring> ratioMapList = StringToVector(ratioMapComponentTokens[1], L",");
+        for (wstring subtoken : ratioMapList)
+        {
+            vector<wstring> ratioMapSubComponentTokens = StringToVector(subtoken, L":");
+            assert(ratioMapSubComponentTokens.size() == EXPECTEDMAPCOMPONENTTOKENCOUNT);
+            Unit subkey = StringToUnit(ratioMapSubComponentTokens[0]);
+            ConversionData conversion = StringToConversionData(ratioMapSubComponentTokens[1]);
+            m_ratioMap[key][subkey] = conversion;
+        }
+    }
+    UpdateViewModel();
 }
 
 /// <summary>
@@ -406,15 +397,17 @@ void UnitConverter::DeSerialize(const wstring& serializedData)
 /// <param name="userPreferences">wstring holding the serialized data. If it does not have expected number of parameters, we will ignore it</param>
 void UnitConverter::RestoreUserPreferences(const wstring& userPreferences)
 {
-    if (!userPreferences.empty())
+    if (userPreferences.empty())
     {
-        vector<wstring> outerTokens = StringToVector(userPreferences, L"|");
-        if (outerTokens.size() == 3)
-        {
-            m_fromType = StringToUnit(outerTokens[0]);
-            m_toType = StringToUnit(outerTokens[1]);
-            m_currentCategory = StringToCategory(outerTokens[2]);
-        }
+        return;
+    }
+
+    vector<wstring> outerTokens = StringToVector(userPreferences, L"|");
+    if (outerTokens.size() == 3)
+    {
+        m_fromType = StringToUnit(outerTokens[0]);
+        m_toType = StringToUnit(outerTokens[1]);
+        m_currentCategory = StringToCategory(outerTokens[2]);
     }
 }
 
@@ -503,144 +496,146 @@ wstring UnitConverter::Unquote(const wstring& s)
 /// <param name="command">Command enum representing the command that was entered</param>
 void UnitConverter::SendCommand(Command command)
 {
-    if (CheckLoad())
+    if (!CheckLoad())
     {
-        // TODO: Localization of characters
-        bool clearFront = false;
-        if (m_currentDisplay == L"0")
+        return;
+    }
+
+    // TODO: Localization of characters
+    bool clearFront = false;
+    if (m_currentDisplay == L"0")
+    {
+        clearFront = true;
+    }
+    bool clearBack = false;
+    if ((m_currentHasDecimal && m_currentDisplay.size() - 1 >= MAXIMUMDIGITSALLOWED) || (!m_currentHasDecimal && m_currentDisplay.size() >= MAXIMUMDIGITSALLOWED))
+    {
+        clearBack = true;
+    }
+    if (command != Command::Negate && m_switchedActive)
+    {
+        ClearValues();
+        m_switchedActive = false;
+        clearFront = true;
+        clearBack = false;
+    }
+    switch (command)
+    {
+    case Command::Zero:
+        m_currentDisplay += L"0";
+        break;
+
+    case Command::One:
+        m_currentDisplay += L"1";
+        break;
+
+    case Command::Two:
+        m_currentDisplay += L"2";
+        break;
+
+    case Command::Three:
+        m_currentDisplay += L"3";
+        break;
+
+    case Command::Four:
+        m_currentDisplay += L"4";
+        break;
+
+    case Command::Five:
+        m_currentDisplay += L"5";
+        break;
+
+    case Command::Six:
+        m_currentDisplay += L"6";
+        break;
+
+    case Command::Seven:
+        m_currentDisplay += L"7";
+        break;
+
+    case Command::Eight:
+        m_currentDisplay += L"8";
+        break;
+
+    case Command::Nine:
+        m_currentDisplay += L"9";
+        break;
+
+    case Command::Decimal:
+        clearFront = false;
+        clearBack = false;
+        if (!m_currentHasDecimal)
         {
-            clearFront = true;
+            m_currentDisplay += L".";
+            m_currentHasDecimal = true;
         }
-        bool clearBack = false;
-        if ((m_currentHasDecimal && m_currentDisplay.size() - 1 >= MAXIMUMDIGITSALLOWED) || (!m_currentHasDecimal && m_currentDisplay.size() >= MAXIMUMDIGITSALLOWED))
+        break;
+
+    case Command::Backspace:
+        clearFront = false;
+        clearBack = false;
+        if ((m_currentDisplay.front() != '-' && m_currentDisplay.size() > 1) || m_currentDisplay.size() > 2)
         {
-            clearBack = true;
-        }
-        if (command != Command::Negate && m_switchedActive)
-        {
-            ClearValues();
-            m_switchedActive = false;
-            clearFront = true;
-            clearBack = false;
-        }
-        switch (command)
-        {
-        case Command::Zero:
-            m_currentDisplay += L"0";
-            break;
-
-        case Command::One:
-            m_currentDisplay += L"1";
-            break;
-
-        case Command::Two:
-            m_currentDisplay += L"2";
-            break;
-
-        case Command::Three:
-            m_currentDisplay += L"3";
-            break;
-
-        case Command::Four:
-            m_currentDisplay += L"4";
-            break;
-
-        case Command::Five:
-            m_currentDisplay += L"5";
-            break;
-
-        case Command::Six:
-            m_currentDisplay += L"6";
-            break;
-
-        case Command::Seven:
-            m_currentDisplay += L"7";
-            break;
-
-        case Command::Eight:
-            m_currentDisplay += L"8";
-            break;
-
-        case Command::Nine:
-            m_currentDisplay += L"9";
-            break;
-
-        case Command::Decimal:
-            clearFront = false;
-            clearBack = false;
-            if (!m_currentHasDecimal)
+            if (m_currentDisplay.back() == '.')
             {
-                m_currentDisplay += L".";
-                m_currentHasDecimal = true;
+                m_currentHasDecimal = false;
             }
-            break;
+            m_currentDisplay.pop_back();
+        }
+        else
+        {
+            m_currentDisplay = L"0";
+            m_currentHasDecimal = false;
+        }
+        break;
 
-        case Command::Backspace:
-            clearFront = false;
-            clearBack = false;
-            if ((m_currentDisplay.front() != '-' && m_currentDisplay.size() > 1) || m_currentDisplay.size() > 2)
+    case Command::Negate:
+        clearFront = false;
+        clearBack = false;
+        if (m_currentCategory.supportsNegative)
+        {
+            if (m_currentDisplay.front() == '-')
             {
-                if (m_currentDisplay.back() == '.')
-                {
-                    m_currentHasDecimal = false;
-                }
-                m_currentDisplay.pop_back();
+                m_currentDisplay.erase(0, 1);
             }
             else
             {
-                m_currentDisplay = L"0";
-                m_currentHasDecimal = false;
+                m_currentDisplay.insert(0, 1, '-');
             }
-            break;
-
-        case Command::Negate:
-            clearFront = false;
-            clearBack = false;
-            if (m_currentCategory.supportsNegative)
-            {
-                if (m_currentDisplay.front() == '-')
-                {
-                    m_currentDisplay.erase(0, 1);
-                }
-                else
-                {
-                    m_currentDisplay.insert(0, 1, '-');
-                }
-            }
-            break;
-
-        case Command::Clear:
-            clearFront = false;
-            clearBack = false;
-            ClearValues();
-            break;
-
-        case Command::Reset:
-            clearFront = false;
-            clearBack = false;
-            ClearValues();
-            Reset();
-            break;
-
-        default:
-            break;
         }
+        break;
 
+    case Command::Clear:
+        clearFront = false;
+        clearBack = false;
+        ClearValues();
+        break;
 
-        if (clearFront)
-        {
-            m_currentDisplay.erase(0, 1);
-        }
-        if (clearBack)
-        {
-            m_currentDisplay.erase(m_currentDisplay.size() - 1, 1);
-            m_vmCallback->MaxDigitsReached();
-        }
+    case Command::Reset:
+        clearFront = false;
+        clearBack = false;
+        ClearValues();
+        Reset();
+        break;
 
-        Calculate();
-
-        UpdateViewModel();
+    default:
+        break;
     }
+
+
+    if (clearFront)
+    {
+        m_currentDisplay.erase(0, 1);
+    }
+    if (clearBack)
+    {
+        m_currentDisplay.erase(m_currentDisplay.size() - 1, 1);
+        m_vmCallback->MaxDigitsReached();
+    }
+
+    Calculate();
+
+    UpdateViewModel();
 }
 
 /// <summary>
@@ -844,47 +839,49 @@ void UnitConverter::Reset()
     ClearValues();
     m_switchedActive = false;
 
-    if (!m_categories.empty())
+    if (m_categories.empty())
     {
-        m_currentCategory = m_categories[0];
+        return;
+    }
 
-        m_categoryToUnits.clear();
-        m_ratioMap.clear();
-        bool readyCategoryFound = false;
-        for (const Category& category : m_categories)
+    m_currentCategory = m_categories[0];
+
+    m_categoryToUnits.clear();
+    m_ratioMap.clear();
+    bool readyCategoryFound = false;
+    for (const Category& category : m_categories)
+    {
+        shared_ptr<IConverterDataLoader> activeDataLoader = GetDataLoaderForCategory(category);
+        if (activeDataLoader == nullptr)
         {
-            shared_ptr<IConverterDataLoader> activeDataLoader = GetDataLoaderForCategory(category);
-            if (activeDataLoader == nullptr)
-            {
-                // The data loader is different depending on the category, e.g. currency data loader
-                // is different from the static data loader.
-                // If there is no data loader for this category, continue.
-                continue;
-            }
-
-            vector<Unit> units = activeDataLoader->LoadOrderedUnits(category);
-            m_categoryToUnits[category] = units;
-
-            // Just because the units are empty, doesn't mean the user can't select this category,
-            // we just want to make sure we don't let an unready category be the default.
-            if (!units.empty())
-            {
-                for (Unit u : units)
-                {
-                    m_ratioMap[u] = activeDataLoader->LoadOrderedRatios(u);
-                }
-
-                if (!readyCategoryFound)
-                {
-                    m_currentCategory = category;
-                    readyCategoryFound = true;
-                }
-            }
+            // The data loader is different depending on the category, e.g. currency data loader
+            // is different from the static data loader.
+            // If there is no data loader for this category, continue.
+            continue;
         }
 
-        InitializeSelectedUnits();
-        Calculate();
+        vector<Unit> units = activeDataLoader->LoadOrderedUnits(category);
+        m_categoryToUnits[category] = units;
+
+        // Just because the units are empty, doesn't mean the user can't select this category,
+        // we just want to make sure we don't let an unready category be the default.
+        if (!units.empty())
+        {
+            for (Unit u : units)
+            {
+                m_ratioMap[u] = activeDataLoader->LoadOrderedRatios(u);
+            }
+
+            if (!readyCategoryFound)
+            {
+                m_currentCategory = category;
+                readyCategoryFound = true;
+            }
+        }
     }
+
+    InitializeSelectedUnits();
+    Calculate();
 }
 
 /// <summary>
@@ -1029,22 +1026,24 @@ void UnitConverter::Calculate()
 /// <param name="input">wstring to trim</param>
 void UnitConverter::TrimString(wstring& returnString)
 {
-    if (returnString.find(L'.') != m_returnDisplay.npos)
+    if (returnString.find(L'.') == m_returnDisplay.npos)
     {
-        wstring::iterator iter;
-        for (iter = returnString.end() - 1; ;iter--)
+        return;
+    }
+
+    wstring::iterator iter;
+    for (iter = returnString.end() - 1; ;iter--)
+    {
+        if (*iter != L'0')
         {
-            if (*iter != L'0')
-            {
-                returnString.erase(iter + 1, returnString.end());
-                break;
-            }
-        }
-        if (*(returnString.end()-1) == L'.')
-        {
-            returnString.erase(returnString.end()-1, returnString.end());
+            returnString.erase(iter + 1, returnString.end());
+            break;
         }
     }
+    if (*(returnString.end()-1) == L'.')
+    {
+        returnString.erase(returnString.end()-1, returnString.end());
+    }
 }
 
 /// <summary>

src/CalcManager/pch.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
@@ -7,6 +7,10 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+// Windows headers define min/max macros.
+// Disable it for project code.
+#define NOMINMAX
+
 #include <assert.h>
 #include <windows.h>
 #include <winerror.h>

src/CalcViewModel/ApplicationViewModel.cpp

@@ -32,14 +32,11 @@ using namespace Windows::UI::Xaml::Data;
 using namespace Windows::UI::Xaml::Input;
 using namespace Windows::UI::Xaml::Media;
 
-namespace CalculatorApp::ViewModel::ApplicationViewModelProperties
+namespace
 {
-    StringReference Mode(L"Mode");
-    StringReference PreviousMode(L"PreviousMode");
-    StringReference ClearMemoryVisibility(L"ClearMemoryVisibility");
-    StringReference AppBarVisibility(L"AppBarVisibility");
-    StringReference CategoryName(L"CategoryName");
-    StringReference Categories(L"Categories");
+    StringReference CategoriesPropertyName(L"Categories");
+    StringReference ClearMemoryVisibilityPropertyName(L"ClearMemoryVisibility");
+    StringReference AppBarVisibilityPropertyName(L"AppBarVisibility");
 }
 
 ApplicationViewModel::ApplicationViewModel() :
@@ -60,7 +57,7 @@ void ApplicationViewModel::Mode::set(ViewMode value)
         PreviousMode = m_mode;
         m_mode = value;
         OnModeChanged();
-        RaisePropertyChanged(ApplicationViewModelProperties::Mode);
+        RaisePropertyChanged(ModePropertyName);
     }
 }
 
@@ -69,7 +66,7 @@ void ApplicationViewModel::Categories::set(IObservableVector<NavCategoryGroup^>^
     if (m_categories != value)
     {
         m_categories = value;
-        RaisePropertyChanged(ApplicationViewModelProperties::Categories);
+        RaisePropertyChanged(CategoriesPropertyName);
     }
 }
 
@@ -163,11 +160,11 @@ void ApplicationViewModel::OnModeChanged()
     //
     // Save the changed mode, so that the new window launches in this mode.
     // Don't save until after we have adjusted to the new mode, so we don't save a mode that fails to load.
-    ApplicationData::Current->LocalSettings->Values->Insert(ApplicationViewModelProperties::Mode, NavCategory::Serialize(m_mode));
+    ApplicationData::Current->LocalSettings->Values->Insert(ModePropertyName, NavCategory::Serialize(m_mode));
 
     TraceLogger::GetInstance().LogModeChangeEnd(m_mode, ApplicationView::GetApplicationViewIdForWindow(CoreWindow::GetForCurrentThread()));
-    RaisePropertyChanged(ApplicationViewModelProperties::ClearMemoryVisibility);
-    RaisePropertyChanged(ApplicationViewModelProperties::AppBarVisibility);
+    RaisePropertyChanged(ClearMemoryVisibilityPropertyName);
+    RaisePropertyChanged(AppBarVisibilityPropertyName);
 }
 
 void ApplicationViewModel::OnCopyCommand(Object^ parameter)

src/CalcViewModel/ApplicationViewModel.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
@@ -11,16 +11,6 @@ namespace CalculatorApp
 {
     namespace ViewModel
     {
-        namespace ApplicationViewModelProperties
-        {
-            extern Platform::StringReference Mode;
-            extern Platform::StringReference PreviousMode;
-            extern Platform::StringReference ClearMemoryVisibility;
-            extern Platform::StringReference AppBarVisibility;
-            extern Platform::StringReference CategoryName;
-            extern Platform::StringReference Categories;
-        }
-
         [Windows::UI::Xaml::Data::Bindable]
         public ref class ApplicationViewModel sealed : public Windows::UI::Xaml::Data::INotifyPropertyChanged
         {
@@ -32,9 +22,9 @@ namespace CalculatorApp
             OBSERVABLE_OBJECT();
             OBSERVABLE_PROPERTY_RW(StandardCalculatorViewModel^, CalculatorViewModel);
             OBSERVABLE_PROPERTY_RW(DateCalculatorViewModel^, DateCalcViewModel);
-            OBSERVABLE_PROPERTY_RW(CalculatorApp::ViewModel::UnitConverterViewModel^, ConverterViewModel);
+            OBSERVABLE_PROPERTY_RW(UnitConverterViewModel^, ConverterViewModel);
             OBSERVABLE_PROPERTY_RW(CalculatorApp::Common::ViewMode, PreviousMode);
-            OBSERVABLE_PROPERTY_RW(Platform::String^, CategoryName);
+            OBSERVABLE_NAMED_PROPERTY_RW(Platform::String^, CategoryName);
 
             COMMAND_FOR_METHOD(CopyCommand, ApplicationViewModel::OnCopyCommand);
             COMMAND_FOR_METHOD(PasteCommand, ApplicationViewModel::OnPasteCommand);
@@ -48,6 +38,13 @@ namespace CalculatorApp
 
                 void set(CalculatorApp::Common::ViewMode value);
             }
+            static property Platform::String^ ModePropertyName
+            {
+                Platform::String^ get()
+                {
+                    return Platform::StringReference(L"Mode");
+                }
+            }
 
             property Windows::Foundation::Collections::IObservableVector<CalculatorApp::Common::NavCategoryGroup^>^ Categories
             {

src/CalcViewModel/Common/CopyPasteManager.cpp

@@ -139,7 +139,7 @@ String^ CopyPasteManager::ValidatePasteExpression(String^ pastedText, ViewMode m
     String^ englishString = LocalizationSettings::GetInstance().GetEnglishValueFromLocalizedDigits(pasteExpression);
 
     // Removing the spaces, comma separator from the pasteExpression to allow pasting of expressions like 1  +     2+1,333
-    pasteExpression = Utils::RemoveUnwantedCharsFromWstring(englishString->Data());
+    pasteExpression = RemoveUnwantedCharsFromWstring(englishString->Data());
 
     // If the last character is an = sign, remove it from the pasteExpression to allow evaluating the result on paste.
     if (!pasteExpression.empty() && pasteExpression.back() == L'=')
@@ -567,3 +567,21 @@ size_t CopyPasteManager::ProgrammerOperandLength(const wstring& operand, int num
 
     return len;
 }
+
+// return wstring after removing characters like space, comma, double quotes, and monetary prefix currency symbols supported by the Windows keyboard:
+// yen or yuan(¥) - 165
+// unspecified currency sign(¤) - 164
+// Ghanaian cedi(₵) - 8373
+// dollar or peso($) - 36
+// colón(₡) - 8353
+// won(₩) - 8361
+// shekel(₪) - 8362
+// naira(₦) - 8358
+// Indian rupee(₹) - 8377
+// pound(£) - 163
+// euro(€) - 8364
+wstring CopyPasteManager::RemoveUnwantedCharsFromWstring(const wstring& input)
+{
+    wchar_t unWantedChars[] = { L' ', L',', L'"', 165, 164, 8373, 36, 8353, 8361, 8362, 8358, 8377, 163, 8364, 8234, 8235, 8236, 8237 };
+    return Utils::RemoveUnwantedCharsFromWstring(input, unWantedChars, 18);
+}

src/CalcViewModel/Common/CopyPasteManager.h

@@ -58,6 +58,7 @@ namespace CalculatorApp
         static size_t OperandLength(std::wstring operand, CalculatorApp::Common::ViewMode mode, CalculatorApp::Common::CategoryGroupType modeType, int programmerNumberBase = -1);
         static size_t StandardScientificOperandLength(std::wstring operand);
         static size_t ProgrammerOperandLength(const std::wstring& operand, int numberBase);
+        static std::wstring RemoveUnwantedCharsFromWstring(const std::wstring& input);
 
         static constexpr size_t MaxStandardOperandLength = 16;
         static constexpr size_t MaxScientificOperandLength = 32;

src/CalcViewModel/Common/DateCalculator.cpp

@@ -12,6 +12,7 @@ using namespace CalculatorApp::Common::DateCalculation;
 DateCalculationEngine::DateCalculationEngine(_In_ String^ calendarIdentifier)
 {
     m_calendar = ref new Calendar();
+    m_calendar->ChangeTimeZone("UTC");
     m_calendar->ChangeCalendarSystem(calendarIdentifier);
 }
 

src/CalcViewModel/Common/Utils.cpp

@@ -80,7 +80,13 @@ void Utils::RunOnUIThreadNonblocking(std::function<void()>&& function, _In_ Core
     }
 }
 
-//return wstring after removing characters specified by unwantedChars array
+// Returns if the last character of a wstring is the target wchar_t
+bool Utils::IsLastCharacterTarget(_In_ wstring const &input, _In_ wchar_t target)
+{
+    return !input.empty() && input.back() == target;
+}
+
+// Return wstring after removing characters specified by unwantedChars array
 wstring Utils::RemoveUnwantedCharsFromWstring(wstring input, _In_reads_(size) wchar_t* unwantedChars, unsigned int size)
 {
     for (unsigned int i = 0; i < size; ++i)

src/CalcViewModel/Common/Utils.h

@@ -42,10 +42,16 @@
         }\
     } private: t m_##n; public:
 
-#define NAMED_OBSERVABLE_PROPERTY_RW(t, n)\
+#define OBSERVABLE_NAMED_PROPERTY_R(t, n)\
+    OBSERVABLE_PROPERTY_R(t, n)\
+    internal: static property Platform::String^ n##PropertyName {\
+    Platform::String^ get() { return Platform::StringReference(L#n); }\
+    } public:
+
+#define OBSERVABLE_NAMED_PROPERTY_RW(t, n)\
     OBSERVABLE_PROPERTY_RW(t, n)\
-    private: property Platform::StringReference n##_PropertyName {\
-    Platform::StringReference get() { return Platform::StringReference(L#n); }\
+    internal: static property Platform::String^ n##PropertyName {\
+    Platform::String^ get() { return Platform::StringReference(L#n); }\
     } public:
 
 #define OBSERVABLE_PROPERTY_FIELD(n) m_##n

src/CalcViewModel/DateCalculatorViewModel.cpp

@@ -22,14 +22,14 @@ using namespace Windows::Globalization;
 using namespace Windows::Globalization::DateTimeFormatting;
 using namespace Windows::System::UserProfile;
 
-namespace CalculatorApp::ViewModel::DateCalculatorViewModelProperties
+namespace
 {
-    StringReference StrDateDiffResult(L"StrDateDiffResult");
-    StringReference StrDateDiffResultAutomationName(L"StrDateDiffResultAutomationName");
-    StringReference StrDateDiffResultInDays(L"StrDateDiffResultInDays");
-    StringReference StrDateResult(L"StrDateResult");
-    StringReference StrDateResultAutomationName(L"StrDateResultAutomationName");
-    StringReference IsDiffInDays(L"IsDiffInDays");
+    StringReference StrDateDiffResultPropertyName(L"StrDateDiffResult");
+    StringReference StrDateDiffResultAutomationNamePropertyName(L"StrDateDiffResultAutomationName");
+    StringReference StrDateDiffResultInDaysPropertyName(L"StrDateDiffResultInDays");
+    StringReference StrDateResultPropertyName(L"StrDateResult");
+    StringReference StrDateResultAutomationNamePropertyName(L"StrDateResultAutomationName");
+    StringReference IsDiffInDaysPropertyName(L"IsDiffInDays");
 }
 
 DateCalculatorViewModel::DateCalculatorViewModel() :
@@ -43,11 +43,7 @@ DateCalculatorViewModel::DateCalculatorViewModel() :
     m_StrDateDiffResultAutomationName(L""),
     m_StrDateDiffResultInDays(L""),
     m_StrDateResult(L""),
-    m_StrDateResultAutomationName(L""),
-    m_fromDate({ 0 }),
-    m_toDate({ 0 }),
-    m_startDate({ 0 }),
-    m_dateResult({ 0 })
+    m_StrDateResultAutomationName(L"")
 {
     const auto& localizationSettings = LocalizationSettings::GetInstance();
 
@@ -56,24 +52,24 @@ DateCalculatorViewModel::DateCalculatorViewModel() :
 
     // Initialize Date Calc engine
     m_dateCalcEngine = make_shared<DateCalculationEngine>(localizationSettings.GetCalendarIdentifier());
-
     // Initialize dates of DatePicker controls to today's date
     auto calendar = ref new Calendar();
+    // We force the timezone to UTC, in order to avoid being affected by Daylight Saving Time
+    // when we calculate the difference between 2 dates. 
+    calendar->ChangeTimeZone("UTC");
     auto today = calendar->GetDateTime();
 
     // FromDate and ToDate should be clipped (adjusted to a consistent hour in UTC)
-    m_fromDate = today;
-    m_toDate = today;
-    FromDate = ClipTime(today);
-    ToDate = ClipTime(today);
+    m_fromDate = ClipTime(today);
+    m_toDate = ClipTime(today);
 
     // StartDate should not be clipped
-    StartDate = today;
+    m_startDate = today;
     m_dateResult = today;
 
     // Initialize the list separator delimiter appended with a space at the end, e.g. ", "
     // This will be used for date difference formatting: Y years, M months, W weeks, D days
-    m_listSeparator = ref new String((localizationSettings.GetListSeparator() + L" ").c_str());
+    m_listSeparator = localizationSettings.GetListSeparator() + L" ";
 
     // Initialize the output results
     UpdateDisplayResult();
@@ -86,15 +82,6 @@ DateCalculatorViewModel::DateCalculatorViewModel() :
         m_offsetValues->Append(ref new String(numberStr.c_str()));
     }
 
-    /* In the ClipTime function, we used to change timezone to UTC before clipping the time.
-       The comment from the previous developers said this was done to eliminate the effects of
-       Daylight Savings Time. We can't think of a good reason why this change in timezone is
-       necessary and did find bugs related to the change, therefore, we have removed the
-       change. Just in case, we will see if the clipped time is ever a different day from the
-       original day, which would hopefully indicate the change in timezone was actually
-       necessary. We will collect telemetry if we find this case. If we don't see any
-       telemetry events after the application has been used for some time, we will feel safe
-       and can remove this function. */
     DayOfWeek trueDayOfWeek = calendar->DayOfWeek;
 
     DateTime clippedTime = ClipTime(today);
@@ -110,18 +97,18 @@ DateCalculatorViewModel::DateCalculatorViewModel() :
 
 void DateCalculatorViewModel::OnPropertyChanged(_In_ String^ prop)
 {
-    if (prop == DateCalculatorViewModelProperties::StrDateDiffResult)
+    if (prop == StrDateDiffResultPropertyName)
     {
         UpdateStrDateDiffResultAutomationName();
     }
-    else if (prop == DateCalculatorViewModelProperties::StrDateResult)
+    else if (prop == StrDateResultPropertyName)
     {
         UpdateStrDateResultAutomationName();
     }
-    else if (prop != DateCalculatorViewModelProperties::StrDateDiffResultAutomationName
-        && prop != DateCalculatorViewModelProperties::StrDateDiffResultInDays
-        && prop != DateCalculatorViewModelProperties::StrDateResultAutomationName
-        && prop != DateCalculatorViewModelProperties::IsDiffInDays)
+    else if (prop != StrDateDiffResultAutomationNamePropertyName
+        && prop != StrDateDiffResultInDaysPropertyName
+        && prop != StrDateResultAutomationNamePropertyName
+        && prop != IsDiffInDaysPropertyName)
     {
         OnInputsChanged();
     }
@@ -181,8 +168,8 @@ void DateCalculatorViewModel::UpdateDisplayResult()
             StrDateDiffResult = AppResourceProvider::GetInstance().GetResourceString(L"Date_SameDates");
         }
         else if ((m_dateDiffResult.year == 0) &&
-                (m_dateDiffResult.month == 0) &&
-                (m_dateDiffResult.week == 0))
+            (m_dateDiffResult.month == 0) &&
+            (m_dateDiffResult.week == 0))
         {
             IsDiffInDays = true;
             StrDateDiffResultInDays = L"";
@@ -245,22 +232,23 @@ void DateCalculatorViewModel::InitializeDateOutputFormats(_In_ String^ calendarI
 
 String^ DateCalculatorViewModel::GetDateDiffString() const
 {
-    String^ result = L"";
+    wstring result;
     bool addDelimiter = false;
     AppResourceProvider resourceLoader = AppResourceProvider::GetInstance();
 
     auto yearCount = m_dateDiffResult.year;
     if (yearCount > 0)
     {
-        result = String::Concat(GetLocalizedNumberString(yearCount), L" ");
+        result += GetLocalizedNumberString(yearCount)->Data();
+        result += L" ";
 
         if (yearCount > 1)
         {
-            result = String::Concat(result, resourceLoader.GetResourceString(L"Date_Years"));
+            result += resourceLoader.GetResourceString(L"Date_Years")->Data();
         }
         else
         {
-            result = String::Concat(result, resourceLoader.GetResourceString(L"Date_Year"));
+            result += resourceLoader.GetResourceString(L"Date_Year")->Data();
         }
 
         // set the flags to add a delimiter whenever the next unit is added
@@ -272,22 +260,23 @@ String^ DateCalculatorViewModel::GetDateDiffString() const
     {
         if (addDelimiter)
         {
-            result = String::Concat(result, m_listSeparator);
+            result += m_listSeparator;
         }
         else
         {
             addDelimiter = true;
         }
 
-        result = String::Concat(result, String::Concat(GetLocalizedNumberString(monthCount), L" "));
+        result += GetLocalizedNumberString(monthCount)->Data();
+        result += L" ";
 
         if (monthCount > 1)
         {
-            result = String::Concat(result, resourceLoader.GetResourceString(L"Date_Months"));
+            result += resourceLoader.GetResourceString(L"Date_Months")->Data();
         }
         else
         {
-            result = String::Concat(result, resourceLoader.GetResourceString(L"Date_Month"));
+            result += resourceLoader.GetResourceString(L"Date_Month")->Data();
         }
     }
 
@@ -296,22 +285,23 @@ String^ DateCalculatorViewModel::GetDateDiffString() const
     {
         if (addDelimiter)
         {
-            result = String::Concat(result, m_listSeparator);
+            result += m_listSeparator;
         }
         else
         {
             addDelimiter = true;
         }
 
-        result = String::Concat(result, String::Concat(GetLocalizedNumberString(weekCount), L" "));
+        result += GetLocalizedNumberString(weekCount)->Data();
+        result += L" ";
 
         if (weekCount > 1)
         {
-            result = String::Concat(result, resourceLoader.GetResourceString(L"Date_Weeks"));
+            result += resourceLoader.GetResourceString(L"Date_Weeks")->Data();
         }
         else
         {
-            result = String::Concat(result, resourceLoader.GetResourceString(L"Date_Week"));
+            result += resourceLoader.GetResourceString(L"Date_Week")->Data();
         }
     }
 
@@ -320,43 +310,45 @@ String^ DateCalculatorViewModel::GetDateDiffString() const
     {
         if (addDelimiter)
         {
-            result = String::Concat(result, m_listSeparator);
+            result += m_listSeparator;
         }
         else
         {
             addDelimiter = true;
         }
 
-        result = String::Concat(result, String::Concat(GetLocalizedNumberString(dayCount), L" "));
+        result += GetLocalizedNumberString(dayCount)->Data();
+        result += L" ";
 
         if (dayCount > 1)
         {
-            result = String::Concat(result, resourceLoader.GetResourceString(L"Date_Days"));
+            result += resourceLoader.GetResourceString(L"Date_Days")->Data();
         }
         else
         {
-            result = String::Concat(result, resourceLoader.GetResourceString(L"Date_Day"));
+            result += resourceLoader.GetResourceString(L"Date_Day")->Data();
         }
     }
 
-    return result;
+    return ref new String(result.data());
 }
 
 String^ DateCalculatorViewModel::GetDateDiffStringInDays() const
 {
-    String^ strDateUnit;
+    wstring result = GetLocalizedNumberString(m_dateDiffResultInDays.day)->Data();
+    result += L" ";
 
     // Display the result as '1 day' or 'N days'
     if (m_dateDiffResultInDays.day > 1)
     {
-        strDateUnit = AppResourceProvider::GetInstance().GetResourceString(L"Date_Days");
+        result += AppResourceProvider::GetInstance().GetResourceString(L"Date_Days")->Data();
     }
     else
     {
-        strDateUnit = AppResourceProvider::GetInstance().GetResourceString(L"Date_Day");
+        result += AppResourceProvider::GetInstance().GetResourceString(L"Date_Day")->Data();
     }
 
-    return String::Concat(GetLocalizedNumberString(m_dateDiffResultInDays.day), String::Concat(L" ", strDateUnit));
+    return ref new String(result.data());
 }
 
 void DateCalculatorViewModel::OnCopyCommand(Platform::Object^ parameter)
@@ -378,13 +370,14 @@ String^ DateCalculatorViewModel::GetLocalizedNumberString(int value) const
     return ref new String(numberStr.c_str());
 }
 
-// Adjusts the given DateTime to 12AM of the same day
+// Adjusts the given DateTime to 12AM (UTC) of the same day
 DateTime DateCalculatorViewModel::ClipTime(DateTime dateTime)
 {
     auto calendar = ref new Calendar();
+    calendar->ChangeTimeZone("UTC");
     calendar->SetDateTime(dateTime);
-    calendar->Period = 1;
-    calendar->Hour = 12;
+    calendar->Period = calendar->FirstPeriodInThisDay;
+    calendar->Hour = calendar->FirstHourInThisPeriod;
     calendar->Minute = 0;
     calendar->Second = 0;
     calendar->Nanosecond = 0;

src/CalcViewModel/DateCalculatorViewModel.h

@@ -23,8 +23,8 @@ namespace CalculatorApp
             // Input Properties
             OBSERVABLE_PROPERTY_RW(bool, IsDateDiffMode);
             OBSERVABLE_PROPERTY_RW(bool, IsAddMode);
-            OBSERVABLE_PROPERTY_RW(bool, IsDiffInDays);     // If diff is only in days or the dates are the same,
-                                                            // then show only one result and avoid redundancy
+            OBSERVABLE_PROPERTY_R(bool, IsDiffInDays);     // If diff is only in days or the dates are the same,
+                                                           // then show only one result and avoid redundancy
 
             OBSERVABLE_PROPERTY_RW(int, DaysOffset);
             OBSERVABLE_PROPERTY_RW(int, MonthsOffset);
@@ -82,11 +82,11 @@ namespace CalculatorApp
             }
 
             // Output Properties
-            OBSERVABLE_PROPERTY_RW(Platform::String^, StrDateDiffResult);
-            OBSERVABLE_PROPERTY_RW(Platform::String^, StrDateDiffResultAutomationName);
-            OBSERVABLE_PROPERTY_RW(Platform::String^, StrDateDiffResultInDays);
-            OBSERVABLE_PROPERTY_RW(Platform::String^, StrDateResult);
-            OBSERVABLE_PROPERTY_RW(Platform::String^, StrDateResultAutomationName);
+            OBSERVABLE_PROPERTY_R(Platform::String^, StrDateDiffResult);
+            OBSERVABLE_PROPERTY_R(Platform::String^, StrDateDiffResultAutomationName);
+            OBSERVABLE_PROPERTY_R(Platform::String^, StrDateDiffResultInDays);
+            OBSERVABLE_PROPERTY_R(Platform::String^, StrDateResult);
+            OBSERVABLE_PROPERTY_R(Platform::String^, StrDateResultAutomationName);
 
             COMMAND_FOR_METHOD(CopyCommand, DateCalculatorViewModel::OnCopyCommand);
 
@@ -104,8 +104,6 @@ namespace CalculatorApp
             Platform::String^ GetLocalizedNumberString(int value) const;
             static Windows::Foundation::DateTime ClipTime(Windows::Foundation::DateTime dateTime);
 
-            static void CheckClipTimeSameDay(Windows::Globalization::Calendar^ reference);
-
             property bool IsOutOfBound
             {
                 bool get() { return m_isOutOfBound; }
@@ -146,7 +144,7 @@ namespace CalculatorApp
             CalculatorApp::Common::DateCalculation::DateUnit m_daysOutputFormat;
             CalculatorApp::Common::DateCalculation::DateUnit m_allDateUnitsOutputFormat;
             Windows::Globalization::DateTimeFormatting::DateTimeFormatter^ m_dateTimeFormatter;
-            Platform::String^ m_listSeparator;
+            std::wstring m_listSeparator;
         };
     }
 }

src/CalcViewModel/StandardCalculatorViewModel.cpp

@@ -30,40 +30,34 @@ constexpr int StandardModePrecision = 16;
 constexpr int ScientificModePrecision = 32;
 constexpr int ProgrammerModePrecision = 64;
 
-namespace CalculatorApp::ViewModel
+namespace
 {
-    namespace CalculatorViewModelProperties
-    {
-        StringReference IsMemoryEmpty(L"IsMemoryEmpty");
-        StringReference IsScientific(L"IsScientific");
-        StringReference IsStandard(L"IsStandard");
-        StringReference IsProgrammer(L"IsProgrammer");
-        StringReference DisplayValue(L"DisplayValue");
-        StringReference IsInError(L"IsInError");
-        StringReference BinaryDisplayValue(L"BinaryDisplayValue");
-        StringReference OpenParenthesisCount(L"OpenParenthesisCount");
-    }
+    StringReference IsStandardPropertyName(L"IsStandard");
+    StringReference IsScientificPropertyName(L"IsScientific");
+    StringReference IsProgrammerPropertyName(L"IsProgrammer");
+    StringReference DisplayValuePropertyName(L"DisplayValue");
+    StringReference CalculationResultAutomationNamePropertyName(L"CalculationResultAutomationName");
+}
 
-    namespace CalculatorResourceKeys
-    {
-        StringReference CalculatorExpression(L"Format_CalculatorExpression");
-        StringReference CalculatorResults(L"Format_CalculatorResults");
-        StringReference CalculatorResults_DecimalSeparator_Announced(L"Format_CalculatorResults_Decimal");
-        StringReference HexButton(L"Format_HexButtonValue");
-        StringReference DecButton(L"Format_DecButtonValue");
-        StringReference OctButton(L"Format_OctButtonValue");
-        StringReference BinButton(L"Format_BinButtonValue");
-        StringReference LeftParenthesisAutomationFormat(L"Format_OpenParenthesisAutomationNamePrefix");
-        StringReference OpenParenthesisCountAutomationFormat(L"Format_OpenParenthesisCountAutomationNamePrefix");
-        StringReference NoParenthesisAdded(L"NoRightParenthesisAdded_Announcement");
-        StringReference MaxDigitsReachedFormat(L"Format_MaxDigitsReached");
-        StringReference ButtonPressFeedbackFormat(L"Format_ButtonPressAuditoryFeedback");
-        StringReference MemorySave(L"Format_MemorySave");
-        StringReference MemoryItemChanged(L"Format_MemorySlotChanged");
-        StringReference MemoryItemCleared(L"Format_MemorySlotCleared");
-        StringReference MemoryCleared(L"Memory_Cleared");
-        StringReference DisplayCopied(L"Display_Copied");
-    }
+namespace CalculatorResourceKeys
+{
+    StringReference CalculatorExpression(L"Format_CalculatorExpression");
+    StringReference CalculatorResults(L"Format_CalculatorResults");
+    StringReference CalculatorResults_DecimalSeparator_Announced(L"Format_CalculatorResults_Decimal");
+    StringReference HexButton(L"Format_HexButtonValue");
+    StringReference DecButton(L"Format_DecButtonValue");
+    StringReference OctButton(L"Format_OctButtonValue");
+    StringReference BinButton(L"Format_BinButtonValue");
+    StringReference LeftParenthesisAutomationFormat(L"Format_OpenParenthesisAutomationNamePrefix");
+    StringReference OpenParenthesisCountAutomationFormat(L"Format_OpenParenthesisCountAutomationNamePrefix");
+    StringReference NoParenthesisAdded(L"NoRightParenthesisAdded_Announcement");
+    StringReference MaxDigitsReachedFormat(L"Format_MaxDigitsReached");
+    StringReference ButtonPressFeedbackFormat(L"Format_ButtonPressAuditoryFeedback");
+    StringReference MemorySave(L"Format_MemorySave");
+    StringReference MemoryItemChanged(L"Format_MemorySlotChanged");
+    StringReference MemoryItemCleared(L"Format_MemorySlotCleared");
+    StringReference MemoryCleared(L"Memory_Cleared");
+    StringReference DisplayCopied(L"Display_Copied");
 }
 
 StandardCalculatorViewModel::StandardCalculatorViewModel() :
@@ -584,8 +578,7 @@ void StandardCalculatorViewModel::HandleUpdatedOperandData(Command cmdenum)
 
 bool StandardCalculatorViewModel::IsOperator(Command cmdenum)
 {
-    if ((cmdenum == Command::Command0) || (cmdenum == Command::Command1) || (cmdenum == Command::Command2) || (cmdenum == Command::Command3) || (cmdenum == Command::Command4) || (cmdenum == Command::Command5)
-        || (cmdenum == Command::Command6) || (cmdenum == Command::Command7) || (cmdenum == Command::Command8) || (cmdenum == Command::Command9) || (cmdenum == Command::CommandPNT) || (cmdenum == Command::CommandBACK)
+    if ((cmdenum >= Command::Command0 && cmdenum <= Command::Command9) || (cmdenum == Command::CommandPNT) || (cmdenum == Command::CommandBACK)
         || (cmdenum == Command::CommandEXP) || (cmdenum == Command::CommandFE) || (cmdenum == Command::ModeBasic) || (cmdenum == Command::ModeProgrammer) || (cmdenum == Command::ModeScientific)
         || (cmdenum == Command::CommandINV) || (cmdenum == Command::CommandCENTR) || (cmdenum == Command::CommandDEG) || (cmdenum == Command::CommandRAD) || (cmdenum == Command::CommandGRAD)
         || ((cmdenum >= Command::CommandBINEDITSTART) && (cmdenum <= Command::CommandBINEDITEND)))
@@ -658,8 +651,7 @@ void StandardCalculatorViewModel::OnButtonPressed(Object^ parameter)
             {
                 m_CurrentAngleType = numOpEnum;
             }
-            if ((cmdenum == Command::Command0) || (cmdenum == Command::Command1) || (cmdenum == Command::Command2) || (cmdenum == Command::Command3) || (cmdenum == Command::Command4) || (cmdenum == Command::Command5)
-                || (cmdenum == Command::Command6) || (cmdenum == Command::Command7) || (cmdenum == Command::Command8) || (cmdenum == Command::Command9) || (cmdenum == Command::CommandPNT) || (cmdenum == Command::CommandBACK) || (cmdenum == Command::CommandEXP))
+            if ((cmdenum >= Command::Command0 && cmdenum <= Command::Command9) || (cmdenum == Command::CommandPNT) || (cmdenum == Command::CommandBACK) || (cmdenum == Command::CommandEXP))
             {
                 IsOperatorCommand = false;
             }
@@ -1276,30 +1268,30 @@ void StandardCalculatorViewModel::Deserialize(Array<unsigned char>^ state)
 
 void StandardCalculatorViewModel::OnPropertyChanged(String^ propertyname)
 {
-    if (propertyname == CalculatorViewModelProperties::IsScientific)
+    if (propertyname == IsScientificPropertyName)
     {
         if (IsScientific)
         {
             OnButtonPressed(NumbersAndOperatorsEnum::IsScientificMode);
         }
     }
-    else if (propertyname == CalculatorViewModelProperties::IsProgrammer)
+    else if (propertyname == IsProgrammerPropertyName)
     {
         if (IsProgrammer)
         {
             OnButtonPressed(NumbersAndOperatorsEnum::IsProgrammerMode);
         }
     }
-    else if (propertyname == CalculatorViewModelProperties::IsStandard)
+    else if (propertyname == IsStandardPropertyName)
     {
         if (IsStandard)
         {
             OnButtonPressed(NumbersAndOperatorsEnum::IsStandardMode);
         }
     }
-    else if (propertyname == CalculatorViewModelProperties::DisplayValue)
+    else if (propertyname == DisplayValuePropertyName)
     {
-        RaisePropertyChanged(CalculationResultAutomationName_PropertyName);
+        RaisePropertyChanged(CalculationResultAutomationNamePropertyName);
         Announcement = GetDisplayUpdatedNarratorAnnouncement();
     }
 }
@@ -1648,7 +1640,7 @@ bool StandardCalculatorViewModel::IsOpnd(int nOpCode)
         Command::CommandPNT
     };
 
-    for (int i = 0; i < size(opnd); i++)
+    for (unsigned int i = 0; i < size(opnd); i++)
     {
         if (nOpCode == static_cast<int>(opnd[i]))
         {
@@ -1679,7 +1671,7 @@ bool StandardCalculatorViewModel::IsUnaryOp(int nOpCode)
         Command::CommandCUB
     };
 
-    for (int i = 0; i < size(unaryOp); i++)
+    for (unsigned int i = 0; i < size(unaryOp); i++)
     {
         if (nOpCode == static_cast<int>(unaryOp[i]))
         {
@@ -1706,7 +1698,7 @@ bool StandardCalculatorViewModel::IsTrigOp(int nOpCode)
         Command::CommandATAN
     };
 
-    for (int i = 0; i < size(trigOp); i++)
+    for (unsigned int i = 0; i < size(trigOp); i++)
     {
         if (nOpCode == static_cast<int>(trigOp[i]))
         {
@@ -1729,7 +1721,7 @@ bool StandardCalculatorViewModel::IsBinOp(int nOpCode)
         Command::CommandPWR
     };
 
-    for (int i = 0; i < size(binOp); i++)
+    for (unsigned int i = 0; i < size(binOp); i++)
     {
         if (nOpCode == static_cast<int>(binOp[i]))
         {
@@ -1763,7 +1755,7 @@ bool StandardCalculatorViewModel::IsRecoverableCommand(int nOpCode)
         Command::CommandF
     };
 
-    for (int i = 0; i < size(recoverableCommands); i++)
+    for (unsigned int i = 0; i < size(recoverableCommands); i++)
     {
         if (nOpCode == static_cast<int>(recoverableCommands[i]))
         {

src/CalcViewModel/StandardCalculatorViewModel.h

@@ -31,13 +31,6 @@ namespace CalculatorApp
 #define ASCII_0 48
         public delegate void HideMemoryClickedHandler();
         public delegate void ProgModeRadixChangeHandler();
-        namespace CalculatorViewModelProperties
-        {
-            extern Platform::StringReference IsMemoryEmpty;
-            extern Platform::StringReference IsInError;
-            extern Platform::StringReference BinaryDisplayValue;
-            extern Platform::StringReference OpenParenthesisCount;
-        }
 
         [Windows::UI::Xaml::Data::Bindable]
         public ref class StandardCalculatorViewModel sealed : public Windows::UI::Xaml::Data::INotifyPropertyChanged
@@ -52,14 +45,14 @@ namespace CalculatorApp
             OBSERVABLE_OBJECT_CALLBACK(OnPropertyChanged);
             OBSERVABLE_PROPERTY_RW(Platform::String^, DisplayValue);
             OBSERVABLE_PROPERTY_RW(HistoryViewModel^, HistoryVM);
-            OBSERVABLE_PROPERTY_RW(bool, IsInError);
+            OBSERVABLE_NAMED_PROPERTY_RW(bool, IsInError);
             OBSERVABLE_PROPERTY_RW(bool, IsOperatorCommand);
             OBSERVABLE_PROPERTY_RW(Platform::String^, DisplayStringExpression);
             OBSERVABLE_PROPERTY_RW(Windows::Foundation::Collections::IVector<Common::DisplayExpressionToken^>^, ExpressionTokens);
             OBSERVABLE_PROPERTY_RW(Platform::String^, DecimalDisplayValue);
             OBSERVABLE_PROPERTY_RW(Platform::String^, HexDisplayValue);
             OBSERVABLE_PROPERTY_RW(Platform::String^, OctalDisplayValue);
-            OBSERVABLE_PROPERTY_RW(Platform::String^, BinaryDisplayValue);
+            OBSERVABLE_NAMED_PROPERTY_RW(Platform::String^, BinaryDisplayValue);
             OBSERVABLE_PROPERTY_RW(Platform::String^, HexDisplayValue_AutomationName);
             OBSERVABLE_PROPERTY_RW(Platform::String^, DecDisplayValue_AutomationName);
             OBSERVABLE_PROPERTY_RW(Platform::String^, OctDisplayValue_AutomationName);
@@ -70,19 +63,19 @@ namespace CalculatorApp
             OBSERVABLE_PROPERTY_RW(bool, IsDecimalEnabled);
             OBSERVABLE_PROPERTY_RW(bool, IsCurrentViewPinned);
             OBSERVABLE_PROPERTY_RW(Windows::Foundation::Collections::IVector<MemoryItemViewModel^>^, MemorizedNumbers);
-            OBSERVABLE_PROPERTY_RW(bool, IsMemoryEmpty);
+            OBSERVABLE_NAMED_PROPERTY_RW(bool, IsMemoryEmpty);
             OBSERVABLE_PROPERTY_RW(bool, IsFToEChecked);
             OBSERVABLE_PROPERTY_RW(bool, IsFToEEnabled);
             OBSERVABLE_PROPERTY_RW(bool, IsHyperbolicChecked);
             OBSERVABLE_PROPERTY_RW(bool, AreHEXButtonsEnabled);
-            NAMED_OBSERVABLE_PROPERTY_RW(Platform::String^, CalculationResultAutomationName);
-            NAMED_OBSERVABLE_PROPERTY_RW(Platform::String^, CalculationExpressionAutomationName);
+            OBSERVABLE_PROPERTY_RW(Platform::String^, CalculationResultAutomationName);
+            OBSERVABLE_PROPERTY_RW(Platform::String^, CalculationExpressionAutomationName);
             OBSERVABLE_PROPERTY_RW(bool, IsShiftProgrammerChecked);
             OBSERVABLE_PROPERTY_RW(bool, IsQwordEnabled);
             OBSERVABLE_PROPERTY_RW(bool, IsDwordEnabled);
             OBSERVABLE_PROPERTY_RW(bool, IsWordEnabled);
             OBSERVABLE_PROPERTY_RW(bool, IsByteEnabled);
-            OBSERVABLE_PROPERTY_RW(Platform::String^, OpenParenthesisCount);
+            OBSERVABLE_NAMED_PROPERTY_RW(Platform::String^, OpenParenthesisCount);
             OBSERVABLE_PROPERTY_RW(int, CurrentRadixType);
             OBSERVABLE_PROPERTY_RW(bool, AreTokensUpdated);
             OBSERVABLE_PROPERTY_RW(bool, AreHistoryShortcutsEnabled);

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"
@@ -53,48 +53,40 @@ constexpr size_t SELECTED_TARGET_UNIT = 2;
 
 // x millisecond delay before we consider conversion to be final
 constexpr unsigned int CONVERSION_FINALIZED_DELAY_IN_MS = 1000;
+const wregex regexTrimSpacesStart = wregex(L"^\\s+");
+const wregex regexTrimSpacesEnd = wregex(L"\\s+$");
 
-namespace CalculatorApp::ViewModel
+namespace
 {
-    namespace UnitConverterViewModelProperties
-    {
-        StringReference CurrentCategory(L"CurrentCategory");
-        StringReference Unit1(L"Unit1");
-        StringReference Unit2(L"Unit2");
-        StringReference Value1Active(L"Value1Active");
-        StringReference Value2Active(L"Value2Active");
-        StringReference Value1(L"Value1");
-        StringReference Value2(L"Value2");
-        StringReference Value1AutomationName(L"Value1AutomationName");
-        StringReference Value2AutomationName(L"Value2AutomationName");
-        StringReference SupplementaryVisibility(L"SupplementaryVisibility");
-        StringReference SupplementaryResults(L"SupplementaryResults");
-        StringReference Unit1AutomationName(L"Unit1AutomationName");
-        StringReference Unit2AutomationName(L"Unit2AutomationName");
-        StringReference CurrencySymbol1(L"CurrencySymbol1");
-        StringReference CurrencySymbol2(L"CurrencySymbol2");
-        StringReference CurrencySymbolVisibility(L"CurrencySymbolVisibility");
-        StringReference CurrencyRatioEquality(L"CurrencyRatioEquality");
-        StringReference CurrencyRatioEqualityAutomationName(L"CurrencyRatioEqualityAutomationName");
-        StringReference NetworkBehavior(L"NetworkBehavior");
-        StringReference CurrencyDataLoadFailed(L"CurrencyDataLoadFailed");
-        StringReference CurrencyDataIsWeekOld(L"CurrencyDataIsWeekOld");
-        StringReference IsCurrencyLoadingVisible(L"IsCurrencyLoadingVisible");
-    }
+    StringReference CurrentCategoryPropertyName(L"CurrentCategory");
+    StringReference Unit1AutomationNamePropertyName(L"Unit1AutomationName");
+    StringReference Unit2AutomationNamePropertyName(L"Unit2AutomationName");
+    StringReference Unit1PropertyName(L"Unit1");
+    StringReference Unit2PropertyName(L"Unit2");
+    StringReference Value1PropertyName(L"Value1");
+    StringReference Value2PropertyName(L"Value2");
+    StringReference Value1ActivePropertyName(L"Value1Active");
+    StringReference Value2ActivePropertyName(L"Value2Active");
+    StringReference Value1AutomationNamePropertyName(L"Value1AutomationName");
+    StringReference Value2AutomationNamePropertyName(L"Value2AutomationName");
+    StringReference CurrencySymbol1PropertyName(L"CurrencySymbol1");
+    StringReference CurrencySymbol2PropertyName(L"CurrencySymbol2");
+    StringReference CurrencySymbolVisibilityPropertyName(L"CurrencySymbolVisibility");
+    StringReference SupplementaryVisibilityPropertyName(L"SupplementaryVisibility");
+}
 
-    namespace UnitConverterResourceKeys
-    {
-        StringReference ValueFromFormat(L"Format_ValueFrom");
-        StringReference ValueFromDecimalFormat(L"Format_ValueFrom_Decimal");
-        StringReference ValueToFormat(L"Format_ValueTo");
-        StringReference ConversionResultFormat(L"Format_ConversionResult");
-        StringReference InputUnit_Name(L"InputUnit_Name");
-        StringReference OutputUnit_Name(L"OutputUnit_Name");
-        StringReference MaxDigitsReachedFormat(L"Format_MaxDigitsReached");
-        StringReference UpdatingCurrencyRates(L"UpdatingCurrencyRates");
-        StringReference CurrencyRatesUpdated(L"CurrencyRatesUpdated");
-        StringReference CurrencyRatesUpdateFailed(L"CurrencyRatesUpdateFailed");
-    }
+namespace CalculatorApp::ViewModel::UnitConverterResourceKeys
+{
+    StringReference ValueFromFormat(L"Format_ValueFrom");
+    StringReference ValueFromDecimalFormat(L"Format_ValueFrom_Decimal");
+    StringReference ValueToFormat(L"Format_ValueTo");
+    StringReference ConversionResultFormat(L"Format_ConversionResult");
+    StringReference InputUnit_Name(L"InputUnit_Name");
+    StringReference OutputUnit_Name(L"OutputUnit_Name");
+    StringReference MaxDigitsReachedFormat(L"Format_MaxDigitsReached");
+    StringReference UpdatingCurrencyRates(L"UpdatingCurrencyRates");
+    StringReference CurrencyRatesUpdated(L"CurrencyRatesUpdated");
+    StringReference CurrencyRatesUpdateFailed(L"CurrencyRatesUpdateFailed");
 }
 
 UnitConverterViewModel::UnitConverterViewModel(const shared_ptr<UCM::IUnitConverter>& model) :
@@ -202,12 +194,10 @@ void UnitConverterViewModel::BuildUnitList(const vector<UCM::Unit>& modelUnitLis
     m_Units->Clear();
     for (const UCM::Unit& modelUnit : modelUnitList)
     {
-        if (modelUnit.isWhimsical)
+        if (!modelUnit.isWhimsical)
         {
-            continue;
+            m_Units->Append(ref new Unit(modelUnit));
         }
-
-        m_Units->Append(ref new Unit(modelUnit));
     }
 
     if (m_Units->Size == 0)
@@ -281,8 +271,8 @@ void UnitConverterViewModel::OnSwitchActive(Platform::Object^ unused)
     Utils::Swap(&m_localizedValueFromFormat, &m_localizedValueToFormat);
 
     Utils::Swap(&m_Unit1AutomationName, &m_Unit2AutomationName);
-    RaisePropertyChanged(UnitConverterViewModelProperties::Unit1AutomationName);
-    RaisePropertyChanged(UnitConverterViewModelProperties::Unit2AutomationName);
+    RaisePropertyChanged(Unit1AutomationNamePropertyName);
+    RaisePropertyChanged(Unit2AutomationNamePropertyName);
 
     m_isInputBlocked = false;
     m_model->SwitchActive(m_valueFromUnlocalized);
@@ -348,10 +338,15 @@ String^ UnitConverterViewModel::ConvertToLocalizedString(const std::wstring& str
             if (pos != wstring::npos)
             {
                 currencyResult.erase(pos, currencyCode.length());
-                pos = currencyResult.find(L'\u00a0'); // non-breaking space
-                if (pos != wstring::npos)
+                std::wsmatch sm;
+                if (regex_search(currencyResult, sm, regexTrimSpacesStart))
                 {
-                    currencyResult.erase(pos, 1);
+                    currencyResult.erase(sm.prefix().length(), sm.length());
+                }
+
+                if (regex_search(currencyResult, sm, regexTrimSpacesEnd))
+                {
+                    currencyResult.erase(sm.prefix().length(), sm.length());
                 }
             }
 
@@ -556,13 +551,13 @@ void UnitConverterViewModel::OnPropertyChanged(Platform::String^ prop)
 {
     static bool isCategoryChanging = false;
 
-    if (prop->Equals(UnitConverterViewModelProperties::CurrentCategory))
+    if (prop == CurrentCategoryPropertyName)
     {
         isCategoryChanging = true;
         CategoryChanged->Execute(nullptr);
         isCategoryChanging = false;
     }
-    else if (prop->Equals(UnitConverterViewModelProperties::Unit1) || prop->Equals(UnitConverterViewModelProperties::Unit2))
+    else if (prop == Unit1PropertyName || prop == Unit2PropertyName)
     {
         // Category changes will handle updating units after they've both been updated.
         // This event should only be used to update units from explicit user interaction.
@@ -571,7 +566,7 @@ void UnitConverterViewModel::OnPropertyChanged(Platform::String^ prop)
             UnitChanged->Execute(nullptr);
         }
         // Get the localized automation name for each CalculationResults field
-        if (prop->Equals(UnitConverterViewModelProperties::Unit1))
+        if (prop == Unit1PropertyName)
         {
             UpdateValue1AutomationName();
         }
@@ -580,15 +575,15 @@ void UnitConverterViewModel::OnPropertyChanged(Platform::String^ prop)
             UpdateValue2AutomationName();
         }
     }
-    else if (prop->Equals(UnitConverterViewModelProperties::Value1))
+    else if (prop == Value1PropertyName)
     {
         UpdateValue1AutomationName();
     }
-    else if (prop->Equals(UnitConverterViewModelProperties::Value2))
+    else if (prop == Value2PropertyName)
     {
         UpdateValue2AutomationName();
     }
-    else if (prop->Equals(UnitConverterViewModelProperties::Value1Active) || prop->Equals(UnitConverterViewModelProperties::Value2Active))
+    else if (prop == Value1ActivePropertyName || prop == Value2ActivePropertyName)
     {
         // if one of the values is activated, and as a result both are true, it means
         // that we're trying to switch.
@@ -600,11 +595,11 @@ void UnitConverterViewModel::OnPropertyChanged(Platform::String^ prop)
         UpdateValue1AutomationName();
         UpdateValue2AutomationName();
     }
-    else if (prop->Equals(UnitConverterViewModelProperties::SupplementaryResults))
+    else if (prop == SupplementaryResultsPropertyName)
     {
-        RaisePropertyChanged(UnitConverterViewModelProperties::SupplementaryVisibility);
+        RaisePropertyChanged(SupplementaryVisibilityPropertyName);
     }
-    else if (prop->Equals(UnitConverterViewModelProperties::Value1AutomationName))
+    else if (prop == Value1AutomationNamePropertyName)
     {
         m_isValue1Updating = false;
         if (!m_isValue2Updating)
@@ -612,7 +607,7 @@ void UnitConverterViewModel::OnPropertyChanged(Platform::String^ prop)
             AnnounceConversionResult();
         }
     }
-    else if (prop->Equals(UnitConverterViewModelProperties::Value2AutomationName))
+    else if (prop == Value2AutomationNamePropertyName)
     {
         m_isValue2Updating = false;
         if (!m_isValue1Updating)
@@ -620,9 +615,9 @@ void UnitConverterViewModel::OnPropertyChanged(Platform::String^ prop)
             AnnounceConversionResult();
         }
     }
-    else if (prop->Equals(UnitConverterViewModelProperties::CurrencySymbol1) || prop->Equals(UnitConverterViewModelProperties::CurrencySymbol2))
+    else if (prop == CurrencySymbol1PropertyName || prop == CurrencySymbol2PropertyName)
     {
-        RaisePropertyChanged(UnitConverterViewModelProperties::CurrencySymbolVisibility);
+        RaisePropertyChanged(CurrencySymbolVisibilityPropertyName);
     }
 }
 
@@ -643,10 +638,8 @@ String^ UnitConverterViewModel::Serialize()
         String^ serializedData = ref new String(wstring(out.str()).c_str());
         return serializedData;
     }
-    else
-    {
-        return nullptr;
-    }
+
+    return nullptr;
 }
 
 void UnitConverterViewModel::Deserialize(Platform::String^ state)
@@ -849,7 +842,7 @@ void UnitConverterViewModel::RefreshSupplementaryResults()
     }
 
     m_cacheMutex.unlock();
-    RaisePropertyChanged(UnitConverterViewModelProperties::SupplementaryResults);
+    RaisePropertyChanged(SupplementaryResultsPropertyName);
     //EventWriteConverterSupplementaryResultsUpdated();
 }
 
@@ -879,14 +872,11 @@ void UnitConverterViewModel::UpdateInputBlocked(_In_ const wstring& currencyInpu
 {
     // currencyInput is in en-US and has the default decimal separator, so this is safe to do.
     auto posOfDecimal = currencyInput.find(L'.');
+    m_isInputBlocked  = false;
     if (posOfDecimal != wstring::npos && IsCurrencyCurrentCategory)
     {
         m_isInputBlocked = (posOfDecimal + static_cast<size_t>(m_currencyMaxFractionDigits) + 1 == currencyInput.length());
     }
-    else
-    {
-        m_isInputBlocked = false;
-    }
 }
 
 NumbersAndOperatorsEnum UnitConverterViewModel::MapCharacterToButtonId(
@@ -988,7 +978,7 @@ void UnitConverterViewModel::OnPaste(String^ stringToPaste, ViewMode mode)
             }
 
             // Negate is only allowed if it's the first legal character, which is handled above.
-            if (NumbersAndOperatorsEnum::None != op && NumbersAndOperatorsEnum::Negate != op)
+            if (NumbersAndOperatorsEnum::Negate != op)
             {
                 UCM::Command cmd = CommandFromButtonId(op);
                 m_model->SendCommand(cmd);

src/CalcViewModel/UnitConverterViewModel.h

@@ -138,25 +138,6 @@ namespace CalculatorApp
             return ref new Activatable<TActivatable>(activatable);
         }
 
-        namespace UnitConverterViewModelProperties
-        {
-            extern Platform::StringReference CurrentCategory;
-            extern Platform::StringReference Unit1;
-            extern Platform::StringReference Unit2;
-            extern Platform::StringReference Value1Active;
-            extern Platform::StringReference Value2Active;
-            extern Platform::StringReference SupplementaryVisibility;
-            extern Platform::StringReference SupplementaryResults;
-            extern Platform::StringReference CurrencySymbol1;
-            extern Platform::StringReference CurrencySymbol2;
-            extern Platform::StringReference CurrencySymbolVisibility;
-            extern Platform::StringReference CurrencyRatioEquality;
-            extern Platform::StringReference NetworkBehavior;
-            extern Platform::StringReference CurrencyDataLoadFailed;
-            extern Platform::StringReference CurrencyDataIsWeekOld;
-            extern Platform::StringReference IsCurrencyLoadingVisible;
-        }
-
         [Windows::UI::Xaml::Data::Bindable]
         public ref class UnitConverterViewModel sealed : public Windows::UI::Xaml::Data::INotifyPropertyChanged
         {
@@ -176,7 +157,7 @@ namespace CalculatorApp
             OBSERVABLE_PROPERTY_RW(Platform::String^, CurrencySymbol2);
             OBSERVABLE_PROPERTY_RW(Unit^, Unit2);
             OBSERVABLE_PROPERTY_RW(Platform::String^, Value2);
-            OBSERVABLE_PROPERTY_R(Windows::Foundation::Collections::IObservableVector<SupplementaryResult^>^, SupplementaryResults);
+            OBSERVABLE_NAMED_PROPERTY_R(Windows::Foundation::Collections::IObservableVector<SupplementaryResult^>^, SupplementaryResults);
             OBSERVABLE_PROPERTY_RW(bool, Value1Active);
             OBSERVABLE_PROPERTY_RW(bool, Value2Active);
             OBSERVABLE_PROPERTY_RW(Platform::String^, Value1AutomationName);
@@ -187,14 +168,14 @@ namespace CalculatorApp
             OBSERVABLE_PROPERTY_RW(bool, IsDecimalEnabled);
             OBSERVABLE_PROPERTY_RW(bool, IsDropDownOpen);
             OBSERVABLE_PROPERTY_RW(bool, IsDropDownEnabled);
-            OBSERVABLE_PROPERTY_RW(bool, IsCurrencyLoadingVisible);
+            OBSERVABLE_NAMED_PROPERTY_RW(bool, IsCurrencyLoadingVisible);
             OBSERVABLE_PROPERTY_RW(bool, IsCurrencyCurrentCategory);
             OBSERVABLE_PROPERTY_RW(Platform::String^, CurrencyRatioEquality);
             OBSERVABLE_PROPERTY_RW(Platform::String^, CurrencyRatioEqualityAutomationName);
             OBSERVABLE_PROPERTY_RW(Platform::String^, CurrencyTimestamp);
-            OBSERVABLE_PROPERTY_RW(CalculatorApp::NetworkAccessBehavior, NetworkBehavior);
-            OBSERVABLE_PROPERTY_RW(bool, CurrencyDataLoadFailed);
-            OBSERVABLE_PROPERTY_RW(bool, CurrencyDataIsWeekOld);
+            OBSERVABLE_NAMED_PROPERTY_RW(CalculatorApp::NetworkAccessBehavior, NetworkBehavior);
+            OBSERVABLE_NAMED_PROPERTY_RW(bool, CurrencyDataLoadFailed);
+            OBSERVABLE_NAMED_PROPERTY_RW(bool, CurrencyDataIsWeekOld);
 
             property Windows::UI::Xaml::Visibility SupplementaryVisibility
             {

src/CalcViewModel/pch.h

@@ -10,6 +10,10 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+// Windows headers define min/max macros.
+// Disable it for project code.
+#define NOMINMAX
+
 #include <windows.h>
 
 #include <collection.h>

src/Calculator/AboutFlyout.xaml

@@ -38,7 +38,7 @@
                 <Paragraph>
                     <Run x:Name="AboutFlyoutVersion"/>
                     <LineBreak/>
-                    <Run x:Uid="AboutControlCopyright"/>
+                    <Run x:Name="AboutControlCopyrightRun"/>
                 </Paragraph>
             </RichTextBlock>
             <HyperlinkButton x:Name="AboutFlyoutEULA"

src/Calculator/AboutFlyout.xaml.cpp

@@ -8,6 +8,7 @@
 #include "CalcViewModel/Common/LocalizationStringUtil.h"
 #include "CalcViewModel/Common/TraceLogger.h"
 
+using namespace std;
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
 using namespace Platform;
@@ -19,6 +20,10 @@ using namespace Windows::UI::Xaml::Controls;
 using namespace Windows::UI::Xaml::Controls::Primitives;
 using namespace Windows::UI::Xaml::Data;
 
+#ifndef BUILD_YEAR
+#define BUILD_YEAR 2019
+#endif
+
 AboutFlyout::AboutFlyout()
 {
     auto locService = LocalizationService::GetInstance();
@@ -31,6 +36,10 @@ AboutFlyout::AboutFlyout()
     this->SetVersionString();
 
     Header->Text = resourceLoader.GetResourceString("AboutButton/Content");
+
+    auto copyrightText = LocalizationStringUtil::GetLocalizedString(resourceLoader.GetResourceString("AboutControlCopyright")->Data(), to_wstring(BUILD_YEAR).c_str());
+    AboutControlCopyrightRun->Text = ref new String(copyrightText.c_str());
+
 }
 
 void AboutFlyout::FeedbackButton_Click(_In_ Object^ sender, _In_ RoutedEventArgs^ e)

src/Calculator/Calculator.vcxproj

@@ -15,6 +15,10 @@
     <AppxOSMaxVersionTestedReplaceManifestVersion>false</AppxOSMaxVersionTestedReplaceManifestVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
     <AppxDefaultResourceQualifierUAP_Contrast>black</AppxDefaultResourceQualifierUAP_Contrast>
+    <AppxBundle>Always</AppxBundle>
+    <PackageCertificateKeyFile>TemporaryKey.pfx</PackageCertificateKeyFile>
+    <AppxPackageSigningEnabled>true</AppxPackageSigningEnabled>
+    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <!-- This has to be exactly in this place for this to work -->
@@ -126,16 +130,6 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <PropertyGroup Condition="Exists('TemporaryKey.pfx')">
-    <PackageCertificateKeyFile>TemporaryKey.pfx</PackageCertificateKeyFile>
-    <AppxPackageSigningEnabled>true</AppxPackageSigningEnabled>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
-    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition="!Exists('TemporaryKey.pfx')">
-    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
-    <AppxBundle>Never</AppxBundle>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <ClCompile>
       <AdditionalOptions>/bigobj /await /std:c++17 </AdditionalOptions>
@@ -360,7 +354,7 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <ItemGroup Condition="Exists('TemporaryKey.pfx')">
+  <ItemGroup>
     <None Include="TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
@@ -459,142 +453,138 @@
     <ClCompile Include="WindowFrameService.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <PRIResource Include="Resources\af-ZA\CEngineStrings.resw" Condition="Exists('Resources\af-ZA\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\af-ZA\Resources.resw" Condition="Exists('Resources\af-ZA\Resources.resw')" />
-    <PRIResource Include="Resources\am-et\CEngineStrings.resw" Condition="Exists('Resources\am-et\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\am-et\Resources.resw" Condition="Exists('Resources\am-et\Resources.resw')" />
-    <PRIResource Include="Resources\ar-sa\CEngineStrings.resw" Condition="Exists('Resources\ar-sa\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\ar-sa\Resources.resw" Condition="Exists('Resources\ar-sa\Resources.resw')" />
-    <PRIResource Include="Resources\az-Latn-AZ\CEngineStrings.resw" Condition="Exists('Resources\az-Latn-AZ\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\az-Latn-AZ\Resources.resw" Condition="Exists('Resources\az-Latn-AZ\Resources.resw')" />
-    <PRIResource Include="Resources\be-BY\CEngineStrings.resw" Condition="Exists('Resources\be-BY\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\be-BY\Resources.resw" Condition="Exists('Resources\be-BY\Resources.resw')" />
-    <PRIResource Include="Resources\bg-BG\CEngineStrings.resw" Condition="Exists('Resources\bg-BG\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\bg-BG\Resources.resw" Condition="Exists('Resources\bg-BG\Resources.resw')" />
-    <PRIResource Include="Resources\bn-BD\CEngineStrings.resw" Condition="Exists('Resources\bn-BD\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\bn-BD\Resources.resw" Condition="Exists('Resources\bn-BD\Resources.resw')" />
-    <PRIResource Include="Resources\ca-es\CEngineStrings.resw" Condition="Exists('Resources\ca-es\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\ca-es\Resources.resw" Condition="Exists('Resources\ca-es\Resources.resw')" />
-    <PRIResource Include="Resources\cs-cz\CEngineStrings.resw" Condition="Exists('Resources\cs-cz\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\cs-cz\Resources.resw" Condition="Exists('Resources\cs-cz\Resources.resw')" />
-    <PRIResource Include="Resources\da-DK\CEngineStrings.resw" Condition="Exists('Resources\da-DK\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\da-DK\Resources.resw" Condition="Exists('Resources\da-DK\Resources.resw')" />
-    <PRIResource Include="Resources\de-de\CEngineStrings.resw" Condition="Exists('Resources\de-de\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\de-de\Resources.resw" Condition="Exists('Resources\de-de\Resources.resw')" />
-    <PRIResource Include="Resources\el-GR\CEngineStrings.resw" Condition="Exists('Resources\el-GR\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\el-GR\Resources.resw" Condition="Exists('Resources\el-GR\Resources.resw')" />
-    <PRIResource Include="Resources\en-gb\CEngineStrings.resw" Condition="Exists('Resources\en-gb\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\en-gb\Resources.resw" Condition="Exists('Resources\en-gb\Resources.resw')" />
+    <PRIResource Include="Resources\af-ZA\CEngineStrings.resw" />
+    <PRIResource Include="Resources\af-ZA\Resources.resw" />
+    <PRIResource Include="Resources\am-et\CEngineStrings.resw" />
+    <PRIResource Include="Resources\am-et\Resources.resw" />
+    <PRIResource Include="Resources\ar-sa\CEngineStrings.resw" />
+    <PRIResource Include="Resources\ar-sa\Resources.resw" />
+    <PRIResource Include="Resources\az-Latn-AZ\CEngineStrings.resw" />
+    <PRIResource Include="Resources\az-Latn-AZ\Resources.resw" />
+    <PRIResource Include="Resources\be-BY\CEngineStrings.resw" />
+    <PRIResource Include="Resources\be-BY\Resources.resw" />
+    <PRIResource Include="Resources\bg-BG\CEngineStrings.resw" />
+    <PRIResource Include="Resources\bg-BG\Resources.resw" />
+    <PRIResource Include="Resources\bn-BD\CEngineStrings.resw" />
+    <PRIResource Include="Resources\bn-BD\Resources.resw" />
+    <PRIResource Include="Resources\ca-es\CEngineStrings.resw" />
+    <PRIResource Include="Resources\ca-es\Resources.resw" />
+    <PRIResource Include="Resources\cs-cz\CEngineStrings.resw" />
+    <PRIResource Include="Resources\cs-cz\Resources.resw" />
+    <PRIResource Include="Resources\da-DK\CEngineStrings.resw" />
+    <PRIResource Include="Resources\da-DK\Resources.resw" />
+    <PRIResource Include="Resources\de-de\CEngineStrings.resw" />
+    <PRIResource Include="Resources\de-de\Resources.resw" />
+    <PRIResource Include="Resources\el-GR\CEngineStrings.resw" />
+    <PRIResource Include="Resources\el-GR\Resources.resw" />
+    <PRIResource Include="Resources\en-gb\CEngineStrings.resw" />
+    <PRIResource Include="Resources\en-gb\Resources.resw" />
     <PRIResource Include="Resources\en-US\CEngineStrings.resw" />
     <PRIResource Include="Resources\en-US\Resources.resw">
       <SubType>Designer</SubType>
     </PRIResource>
-    <PRIResource Include="Resources\es-es\CEngineStrings.resw" Condition="Exists('Resources\es-es\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\es-es\Resources.resw" Condition="Exists('Resources\es-es\Resources.resw')" />
-    <PRIResource Include="Resources\es-mx\CEngineStrings.resw" Condition="Exists('Resources\es-mx\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\es-mx\resources.resw" Condition="Exists('Resources\es-mx\Resources.resw')" />
-    <PRIResource Include="Resources\et-EE\CEngineStrings.resw" Condition="Exists('Resources\et-EE\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\et-EE\Resources.resw" Condition="Exists('Resources\et-EE\Resources.resw')" />
-    <PRIResource Include="Resources\eu-ES\CEngineStrings.resw" Condition="Exists('Resources\eu-ES\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\eu-ES\Resources.resw" Condition="Exists('Resources\eu-ES\Resources.resw')" />
-    <PRIResource Include="Resources\fa-IR\CEngineStrings.resw" Condition="Exists('Resources\fa-IR\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\fa-IR\Resources.resw" Condition="Exists('Resources\fa-IR\Resources.resw')" />
-    <PRIResource Include="Resources\fi-fi\CEngineStrings.resw" Condition="Exists('Resources\fi-fi\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\fi-fi\Resources.resw" Condition="Exists('Resources\fi-fi\Resources.resw')" />
-    <PRIResource Include="Resources\fil-PH\CEngineStrings.resw" Condition="Exists('Resources\fil-PH\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\fil-PH\Resources.resw" Condition="Exists('Resources\fil-PH\Resources.resw')" />
-    <PRIResource Include="Resources\fr-ca\CEngineStrings.resw" Condition="Exists('Resources\fr-ca\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\fr-ca\resources.resw" Condition="Exists('Resources\fr-ca\Resources.resw')" />
-    <PRIResource Include="Resources\fr-fr\CEngineStrings.resw" Condition="Exists('Resources\fr-fr\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\fr-fr\Resources.resw" Condition="Exists('Resources\fr-fr\Resources.resw')" />
-    <PRIResource Include="Resources\gl-ES\CEngineStrings.resw" Condition="Exists('Resources\gl-ES\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\gl-ES\Resources.resw" Condition="Exists('Resources\gl-ES\Resources.resw')" />
-    <PRIResource Include="Resources\ha-Latn-NG\CEngineStrings.resw" Condition="Exists('Resources\ha-Latn-NG\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\ha-Latn-NG\Resources.resw" Condition="Exists('Resources\ha-Latn-NG\Resources.resw')" />
-    <PRIResource Include="Resources\he-IL\CEngineStrings.resw" Condition="Exists('Resources\he-IL\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\he-IL\Resources.resw" Condition="Exists('Resources\he-IL\Resources.resw')" />
-    <PRIResource Include="Resources\hi-in\CEngineStrings.resw" Condition="Exists('Resources\hi-in\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\hi-in\Resources.resw" Condition="Exists('Resources\hi-in\Resources.resw')" />
-    <PRIResource Include="Resources\hr-HR\CEngineStrings.resw" Condition="Exists('Resources\hr-HR\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\hr-HR\Resources.resw" Condition="Exists('Resources\hr-HR\Resources.resw')" />
-    <PRIResource Include="Resources\hu-HU\CEngineStrings.resw" Condition="Exists('Resources\hu-HU\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\hu-HU\Resources.resw" Condition="Exists('Resources\hu-HU\Resources.resw')" />
-    <PRIResource Include="Resources\id-ID\CEngineStrings.resw" Condition="Exists('Resources\id-ID\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\id-ID\Resources.resw" Condition="Exists('Resources\id-ID\Resources.resw')" />
-    <PRIResource Include="Resources\is-IS\CEngineStrings.resw" Condition="Exists('Resources\is-IS\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\is-IS\Resources.resw" Condition="Exists('Resources\is-IS\Resources.resw')" />
-    <PRIResource Include="Resources\it-it\CEngineStrings.resw" Condition="Exists('Resources\it-it\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\it-it\Resources.resw" Condition="Exists('Resources\it-it\Resources.resw')" />
-    <PRIResource Include="Resources\ja-jp\CEngineStrings.resw" Condition="Exists('Resources\ja-jp\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\ja-jp\Resources.resw" Condition="Exists('Resources\ja-jp\Resources.resw')" />
-    <PRIResource Include="Resources\kk-KZ\CEngineStrings.resw" Condition="Exists('Resources\kk-KZ\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\kk-KZ\Resources.resw" Condition="Exists('Resources\kk-KZ\Resources.resw')" />
-    <PRIResource Include="Resources\km-KH\CEngineStrings.resw" Condition="Exists('Resources\km-KH\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\km-KH\Resources.resw" Condition="Exists('Resources\km-KH\Resources.resw')" />
-    <PRIResource Include="Resources\kn-IN\CEngineStrings.resw" Condition="Exists('Resources\kn-IN\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\kn-IN\Resources.resw" Condition="Exists('Resources\kn-IN\Resources.resw')" />
-    <PRIResource Include="Resources\ko-kr\CEngineStrings.resw" Condition="Exists('Resources\ko-kr\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\ko-kr\Resources.resw" Condition="Exists('Resources\ko-kr\Resources.resw')" />
-    <PRIResource Include="Resources\lo-LA\CEngineStrings.resw" Condition="Exists('Resources\lo-LA\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\lo-LA\Resources.resw" Condition="Exists('Resources\lo-LA\Resources.resw')" />
-    <PRIResource Include="Resources\lt-LT\CEngineStrings.resw" Condition="Exists('Resources\lt-LT\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\lt-LT\Resources.resw" Condition="Exists('Resources\lt-LT\Resources.resw')" />
-    <PRIResource Include="Resources\lv-LV\CEngineStrings.resw" Condition="Exists('Resources\lv-LV\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\lv-LV\Resources.resw" Condition="Exists('Resources\lv-LV\Resources.resw')" />
-    <PRIResource Include="Resources\mk-MK\CEngineStrings.resw" Condition="Exists('Resources\mk-MK\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\mk-MK\Resources.resw" Condition="Exists('Resources\mk-MK\Resources.resw')" />
-    <PRIResource Include="Resources\ml-IN\CEngineStrings.resw" Condition="Exists('Resources\ml-IN\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\ml-IN\Resources.resw" Condition="Exists('Resources\ml-IN\Resources.resw')" />
-    <PRIResource Include="Resources\ms-MY\CEngineStrings.resw" Condition="Exists('Resources\ms-MY\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\ms-MY\Resources.resw" Condition="Exists('Resources\ms-MY\Resources.resw')" />
-    <PRIResource Include="Resources\nb-NO\CEngineStrings.resw" Condition="Exists('Resources\nb-NO\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\nb-NO\Resources.resw" Condition="Exists('Resources\nb-NO\Resources.resw')" />
-    <PRIResource Include="Resources\nl-nl\CEngineStrings.resw" Condition="Exists('Resources\nl-nl\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\nl-nl\Resources.resw" Condition="Exists('Resources\nl-nl\Resources.resw')" />
-    <PRIResource Include="Resources\pl-pl\CEngineStrings.resw" Condition="Exists('Resources\pl-pl\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\pl-pl\Resources.resw" Condition="Exists('Resources\pl-pl\Resources.resw')" />
-    <PRIResource Include="Resources\pt-br\CEngineStrings.resw" Condition="Exists('Resources\pt-br\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\pt-br\Resources.resw" Condition="Exists('Resources\pt-br\Resources.resw')" />
-    <PRIResource Include="Resources\pt-PT\CEngineStrings.resw" Condition="Exists('Resources\pt-PT\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\pt-PT\Resources.resw" Condition="Exists('Resources\pt-PT\Resources.resw')" />
-    <PRIResource Include="Resources\qps-plocm\CEngineStrings.resw" Condition="Exists('Resources\qps-plocm\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\qps-plocm\Resources.resw" Condition="Exists('Resources\qps-plocm\Resources.resw')" />
-    <PRIResource Include="Resources\qps-ploc\CEngineStrings.resw" Condition="Exists('Resources\qps-ploc\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\qps-ploc\Resources.resw" Condition="Exists('Resources\qps-ploc\Resources.resw')" />
-    <PRIResource Include="Resources\ro-RO\CEngineStrings.resw" Condition="Exists('Resources\ro-RO\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\ro-RO\Resources.resw" Condition="Exists('Resources\ro-RO\Resources.resw')" />
-    <PRIResource Include="Resources\ru-ru\CEngineStrings.resw" Condition="Exists('Resources\ru-ru\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\ru-ru\Resources.resw" Condition="Exists('Resources\ru-ru\Resources.resw')" />
-    <PRIResource Include="Resources\sk-SK\CEngineStrings.resw" Condition="Exists('Resources\sk-SK\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\sk-SK\Resources.resw" Condition="Exists('Resources\sk-SK\Resources.resw')" />
-    <PRIResource Include="Resources\sl-SI\CEngineStrings.resw" Condition="Exists('Resources\sl-SI\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\sl-SI\Resources.resw" Condition="Exists('Resources\sl-SI\Resources.resw')" />
-    <PRIResource Include="Resources\sq-AL\CEngineStrings.resw" Condition="Exists('Resources\sq-AL\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\sq-AL\Resources.resw" Condition="Exists('Resources\sq-AL\Resources.resw')" />
-    <PRIResource Include="Resources\sr-Latn-RS\CEngineStrings.resw" Condition="Exists('Resources\sr-Latn-RS\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\sr-Latn-RS\Resources.resw" Condition="Exists('Resources\sr-Latn-RS\Resources.resw')" />
-    <PRIResource Include="Resources\sv-se\CEngineStrings.resw" Condition="Exists('Resources\sv-se\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\sv-se\Resources.resw" Condition="Exists('Resources\sv-se\Resources.resw')" />
-    <PRIResource Include="Resources\sw-KE\CEngineStrings.resw" Condition="Exists('Resources\sw-KE\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\sw-KE\Resources.resw" Condition="Exists('Resources\sw-KE\Resources.resw')" />
-    <PRIResource Include="Resources\ta-IN\CEngineStrings.resw" Condition="Exists('Resources\ta-IN\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\ta-IN\Resources.resw" Condition="Exists('Resources\ta-IN\Resources.resw')" />
-    <PRIResource Include="Resources\te-IN\CEngineStrings.resw" Condition="Exists('Resources\te-IN\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\te-IN\Resources.resw" Condition="Exists('Resources\te-IN\Resources.resw')" />
-    <PRIResource Include="Resources\th-th\CEngineStrings.resw" Condition="Exists('Resources\th-th\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\th-th\Resources.resw" Condition="Exists('Resources\th-th\Resources.resw')" />
-    <PRIResource Include="Resources\tr-tr\CEngineStrings.resw" Condition="Exists('Resources\tr-tr\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\tr-tr\Resources.resw" Condition="Exists('Resources\tr-tr\Resources.resw')" />
-    <PRIResource Include="Resources\uk-UA\CEngineStrings.resw" Condition="Exists('Resources\uk-UA\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\uk-UA\Resources.resw" Condition="Exists('Resources\uk-UA\Resources.resw')" />
-    <PRIResource Include="Resources\uz-Latn-UZ\CEngineStrings.resw" Condition="Exists('Resources\uz-Latn-UZ\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\uz-Latn-UZ\Resources.resw" Condition="Exists('Resources\uz-Latn-UZ\Resources.resw')" />
-    <PRIResource Include="Resources\vi-vn\CEngineStrings.resw" Condition="Exists('Resources\vi-vn\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\vi-vn\Resources.resw" Condition="Exists('Resources\vi-vn\Resources.resw')" />
-    <PRIResource Include="Resources\zh-cn\CEngineStrings.resw" Condition="Exists('Resources\zh-cn\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\zh-cn\Resources.resw" Condition="Exists('Resources\zh-cn\Resources.resw')" />
-    <PRIResource Include="Resources\zh-tw\CEngineStrings.resw" Condition="Exists('Resources\zh-tw\CEngineStrings.resw')" />
-    <PRIResource Include="Resources\zh-tw\Resources.resw" Condition="Exists('Resources\zh-tw\Resources.resw')" />
+    <PRIResource Include="Resources\es-es\CEngineStrings.resw" />
+    <PRIResource Include="Resources\es-es\Resources.resw" />
+    <PRIResource Include="Resources\es-mx\CEngineStrings.resw" />
+    <PRIResource Include="Resources\es-mx\resources.resw" />
+    <PRIResource Include="Resources\et-EE\CEngineStrings.resw" />
+    <PRIResource Include="Resources\et-EE\Resources.resw" />
+    <PRIResource Include="Resources\eu-ES\CEngineStrings.resw" />
+    <PRIResource Include="Resources\eu-ES\Resources.resw" />
+    <PRIResource Include="Resources\fa-IR\CEngineStrings.resw" />
+    <PRIResource Include="Resources\fa-IR\Resources.resw" />
+    <PRIResource Include="Resources\fi-fi\CEngineStrings.resw" />
+    <PRIResource Include="Resources\fi-fi\Resources.resw" />
+    <PRIResource Include="Resources\fil-PH\CEngineStrings.resw" />
+    <PRIResource Include="Resources\fil-PH\Resources.resw" />
+    <PRIResource Include="Resources\fr-ca\CEngineStrings.resw" />
+    <PRIResource Include="Resources\fr-ca\resources.resw" />
+    <PRIResource Include="Resources\fr-fr\CEngineStrings.resw" />
+    <PRIResource Include="Resources\fr-fr\Resources.resw" />
+    <PRIResource Include="Resources\gl-ES\CEngineStrings.resw" />
+    <PRIResource Include="Resources\gl-ES\Resources.resw" />
+    <PRIResource Include="Resources\ha-Latn-NG\CEngineStrings.resw" />
+    <PRIResource Include="Resources\ha-Latn-NG\Resources.resw" />
+    <PRIResource Include="Resources\he-IL\CEngineStrings.resw" />
+    <PRIResource Include="Resources\he-IL\Resources.resw" />
+    <PRIResource Include="Resources\hi-in\CEngineStrings.resw" />
+    <PRIResource Include="Resources\hi-in\Resources.resw" />
+    <PRIResource Include="Resources\hr-HR\CEngineStrings.resw" />
+    <PRIResource Include="Resources\hr-HR\Resources.resw" />
+    <PRIResource Include="Resources\hu-HU\CEngineStrings.resw" />
+    <PRIResource Include="Resources\hu-HU\Resources.resw" />
+    <PRIResource Include="Resources\id-ID\CEngineStrings.resw" />
+    <PRIResource Include="Resources\id-ID\Resources.resw" />
+    <PRIResource Include="Resources\is-IS\CEngineStrings.resw" />
+    <PRIResource Include="Resources\is-IS\Resources.resw" />
+    <PRIResource Include="Resources\it-it\CEngineStrings.resw" />
+    <PRIResource Include="Resources\it-it\Resources.resw" />
+    <PRIResource Include="Resources\ja-jp\CEngineStrings.resw" />
+    <PRIResource Include="Resources\ja-jp\Resources.resw" />
+    <PRIResource Include="Resources\kk-KZ\CEngineStrings.resw" />
+    <PRIResource Include="Resources\kk-KZ\Resources.resw" />
+    <PRIResource Include="Resources\km-KH\CEngineStrings.resw" />
+    <PRIResource Include="Resources\km-KH\Resources.resw" />
+    <PRIResource Include="Resources\kn-IN\CEngineStrings.resw" />
+    <PRIResource Include="Resources\kn-IN\Resources.resw" />
+    <PRIResource Include="Resources\ko-kr\CEngineStrings.resw" />
+    <PRIResource Include="Resources\ko-kr\Resources.resw" />
+    <PRIResource Include="Resources\lo-LA\CEngineStrings.resw" />
+    <PRIResource Include="Resources\lo-LA\Resources.resw" />
+    <PRIResource Include="Resources\lt-LT\CEngineStrings.resw" />
+    <PRIResource Include="Resources\lt-LT\Resources.resw" />
+    <PRIResource Include="Resources\lv-LV\CEngineStrings.resw" />
+    <PRIResource Include="Resources\lv-LV\Resources.resw" />
+    <PRIResource Include="Resources\mk-MK\CEngineStrings.resw" />
+    <PRIResource Include="Resources\mk-MK\Resources.resw" />
+    <PRIResource Include="Resources\ml-IN\CEngineStrings.resw" />
+    <PRIResource Include="Resources\ml-IN\Resources.resw" />
+    <PRIResource Include="Resources\ms-MY\CEngineStrings.resw" />
+    <PRIResource Include="Resources\ms-MY\Resources.resw" />
+    <PRIResource Include="Resources\nb-NO\CEngineStrings.resw" />
+    <PRIResource Include="Resources\nb-NO\Resources.resw" />
+    <PRIResource Include="Resources\nl-nl\CEngineStrings.resw" />
+    <PRIResource Include="Resources\nl-nl\Resources.resw" />
+    <PRIResource Include="Resources\pl-pl\CEngineStrings.resw" />
+    <PRIResource Include="Resources\pl-pl\Resources.resw" />
+    <PRIResource Include="Resources\pt-br\CEngineStrings.resw" />
+    <PRIResource Include="Resources\pt-br\Resources.resw" />
+    <PRIResource Include="Resources\pt-PT\CEngineStrings.resw" />
+    <PRIResource Include="Resources\pt-PT\Resources.resw" />
+    <PRIResource Include="Resources\ro-RO\CEngineStrings.resw" />
+    <PRIResource Include="Resources\ro-RO\Resources.resw" />
+    <PRIResource Include="Resources\ru-ru\CEngineStrings.resw" />
+    <PRIResource Include="Resources\ru-ru\Resources.resw" />
+    <PRIResource Include="Resources\sk-SK\CEngineStrings.resw" />
+    <PRIResource Include="Resources\sk-SK\Resources.resw" />
+    <PRIResource Include="Resources\sl-SI\CEngineStrings.resw" />
+    <PRIResource Include="Resources\sl-SI\Resources.resw" />
+    <PRIResource Include="Resources\sq-AL\CEngineStrings.resw" />
+    <PRIResource Include="Resources\sq-AL\Resources.resw" />
+    <PRIResource Include="Resources\sr-Latn-RS\CEngineStrings.resw" />
+    <PRIResource Include="Resources\sr-Latn-RS\Resources.resw" />
+    <PRIResource Include="Resources\sv-se\CEngineStrings.resw" />
+    <PRIResource Include="Resources\sv-se\Resources.resw" />
+    <PRIResource Include="Resources\sw-KE\CEngineStrings.resw" />
+    <PRIResource Include="Resources\sw-KE\Resources.resw" />
+    <PRIResource Include="Resources\ta-IN\CEngineStrings.resw" />
+    <PRIResource Include="Resources\ta-IN\Resources.resw" />
+    <PRIResource Include="Resources\te-IN\CEngineStrings.resw" />
+    <PRIResource Include="Resources\te-IN\Resources.resw" />
+    <PRIResource Include="Resources\th-th\CEngineStrings.resw" />
+    <PRIResource Include="Resources\th-th\Resources.resw" />
+    <PRIResource Include="Resources\tr-tr\CEngineStrings.resw" />
+    <PRIResource Include="Resources\tr-tr\Resources.resw" />
+    <PRIResource Include="Resources\uk-UA\CEngineStrings.resw" />
+    <PRIResource Include="Resources\uk-UA\Resources.resw" />
+    <PRIResource Include="Resources\uz-Latn-UZ\CEngineStrings.resw" />
+    <PRIResource Include="Resources\uz-Latn-UZ\Resources.resw" />
+    <PRIResource Include="Resources\vi-vn\CEngineStrings.resw" />
+    <PRIResource Include="Resources\vi-vn\Resources.resw" />
+    <PRIResource Include="Resources\zh-cn\CEngineStrings.resw" />
+    <PRIResource Include="Resources\zh-cn\Resources.resw" />
+    <PRIResource Include="Resources\zh-tw\CEngineStrings.resw" />
+    <PRIResource Include="Resources\zh-tw\Resources.resw" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="Assets\CalculatorAppList.contrast-black_scale-100.png" />

src/Calculator/Calculator.vcxproj.filters

@@ -413,6 +413,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
+    <None Include="TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="Views\Calculator.xaml">

src/Calculator/Controls/CalculationResult.cpp

@@ -210,7 +210,7 @@ void CalculationResult::UpdateTextState()
 
         if (widthDiff > WIDTHCUTOFF)
         {
-            fontSizeChange = min(max(floor(WIDTHTOFONTSCALAR * widthDiff) - WIDTHTOFONTOFFSET, INCREMENTOFFSET), MAXFONTINCREMENT);
+            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)
         {

src/Calculator/Resources/af-ZA/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Sakrekenaar</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Sakrekenaar [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows-Sakrekenaar</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows-Sakrekenaar [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Sakrekenaar</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Sakrekenaar [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopieer</value>
@@ -2265,9 +2277,9 @@
     <value>Microsoft-Privaatheidstelling</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Alle regte voorbehou.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Alle regte voorbehou.</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">
     <value>Inligting oor</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x of</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>en</value>

src/Calculator/Resources/am-ET/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>ማስሊያ</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>ማስሊያ [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows ማስሊያ</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows ማስሊያ [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>ማስሊያ</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>ማስሊያ [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>ቅዳ</value>
@@ -918,7 +930,7 @@
     <comment>Screen reader prompt for the Calculator cos button  on the scientific operator keypad</comment>
   </data>
   <data name="tanButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>ሰያፍ</value>
+    <value>ሰዓት</value>
     <comment>Screen reader prompt for the Calculator tan button  on the scientific operator keypad</comment>
   </data>
   <data name="sinhButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
@@ -1082,7 +1094,7 @@
     <comment>Unit conversion category name called Power (eg. the power of an engine or a light bulb)</comment>
   </data>
   <data name="CategoryName_SpeedText" xml:space="preserve">
-    <value>ቶሎታ</value>
+    <value>ፍጥነት</value>
     <comment>Unit conversion category name called Speed</comment>
   </data>
   <data name="CategoryName_TimeText" xml:space="preserve">
@@ -1090,7 +1102,7 @@
     <comment>Unit conversion category name called Time</comment>
   </data>
   <data name="CategoryName_VolumeText" xml:space="preserve">
-    <value>ድምጽ መጠን</value>
+    <value>የድምጽ መጠን</value>
     <comment>Unit conversion category name called Volume (eg. cups, teaspoons, milliliters)</comment>
   </data>
   <data name="CategoryName_TemperatureText" xml:space="preserve">
@@ -2265,9 +2277,9 @@
     <value>የ Microsoft ግላዊነት መግለጫ</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. ሁሉም መብቱ የተጠበቀ።</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <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">
     <value>ስለ</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x ወይም</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>እና</value>
@@ -2616,7 +2628,7 @@
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
   <data name="RefreshButtonText.Content" xml:space="preserve">
-    <value>የዝማኔ ክፍያዎች</value>
+    <value>የዝማኔ ፍጥነቶች</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
   <data name="DataChargesMayApply" xml:space="preserve">
@@ -2688,11 +2700,11 @@
     <comment>AccessKey for the currency converter navbar item. {StringCategory="Accelerator"}</comment>
   </data>
   <data name="CategoryName_DataAccessKey" xml:space="preserve">
-    <value>ው</value>
+    <value>D</value>
     <comment>AccessKey for the data converter navbar item. {StringCategory="Accelerator"}</comment>
   </data>
   <data name="CategoryName_EnergyAccessKey" xml:space="preserve">
-    <value>ጉ</value>
+    <value>E</value>
     <comment>AccessKey for the energy converter navbar item. {StringCategory="Accelerator"}</comment>
   </data>
   <data name="CategoryName_LengthAccessKey" xml:space="preserve">
@@ -2708,7 +2720,7 @@
     <comment>AccessKey for the pressure converter navbar item. {StringCategory="Accelerator"}</comment>
   </data>
   <data name="CategoryName_SpeedAccessKey" xml:space="preserve">
-    <value>ቶ</value>
+    <value>S</value>
     <comment>AccessKey for the speed converter navbar item. {StringCategory="Accelerator"}</comment>
   </data>
   <data name="CategoryName_TimeAccessKey" xml:space="preserve">
@@ -2716,7 +2728,7 @@
     <comment>AccessKey for the time converter navbar item. {StringCategory="Accelerator"}</comment>
   </data>
   <data name="CategoryName_VolumeAccessKey" xml:space="preserve">
-    <value>ድመ</value>
+    <value>ዕ</value>
     <comment>AccessKey for the volume converter navbar item. {StringCategory="Accelerator"}</comment>
   </data>
   <data name="CategoryName_WeightAccessKey" xml:space="preserve">
@@ -2728,7 +2740,7 @@
     <comment>AccessKey for the temperature converter navbar item. {StringCategory="Accelerator"}</comment>
   </data>
   <data name="ClearHistory.AccessKey" xml:space="preserve">
-    <value>አጽ</value>
+    <value>C</value>
     <comment>Access key for the Clear history button.{StringCategory="Accelerator"}</comment>
   </data>
   <data name="ClearMemory.AccessKey" xml:space="preserve">

src/Calculator/Resources/ar-SA/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>الحاسبة</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>الحاسبة [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>الحاسبة في Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>الحاسبة في Windows [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>الحاسبة</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>الحاسبة [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>نسخ</value>
@@ -2266,9 +2278,9 @@
     <value>بيان الخصوصية الخاص بشركة Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. جميع الحقوق محفوظة.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <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">
     <value>حول</value>
@@ -2602,7 +2614,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x or</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>و</value>

src/Calculator/Resources/az-Latn-AZ/CEngineStrings.resw

@@ -150,7 +150,7 @@
     <comment>Same 107</comment>
   </data>
   <data name="99" xml:space="preserve">
-    <value>Sıfırla bölmək mümkün deyil</value>
+    <value>Sıfra bölmək mümkün deyil</value>
     <comment>Error string shown when a divide by zero condition happens during the calculation</comment>
   </data>
 </root>

src/Calculator/Resources/az-Latn-AZ/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Kalkulyator</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Kalkulyator [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows Kalkulyator</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows Kalkulyator [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Kalkulyator</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Kalkulyator [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Köçür</value>
@@ -2265,9 +2277,9 @@
     <value>Microsoft Məxfilik Bildirişi</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Bütün hüquqlar qorunur.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Bütün hüquqlar qorunur.</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">
     <value>Haqqında</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x, yaxud</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>və</value>

src/Calculator/Resources/be-BY/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Калькулятар</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Калькулятар [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Калькулятар Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Калькулятар Windows [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Калькулятар</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Калькулятар [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Капіяваць</value>
@@ -2265,9 +2277,9 @@
     <value>Заява аб канфідэнцыйнасці Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© Microsoft, 2018. Усе правы абароненыя.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <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">
     <value>Інфармацыя</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>выключальнае або</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>пабітавае і</value>
@@ -2616,7 +2628,7 @@
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
   <data name="RefreshButtonText.Content" xml:space="preserve">
-    <value>Абнавіць курсы</value>
+    <value>Абнавіць тарыфы</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
   <data name="DataChargesMayApply" xml:space="preserve">
@@ -2887,4 +2899,4 @@
     <value>Пагадненне аб выкарыстанні сэрвісаў Microsoft</value>
     <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
   </data>
-</root>
+</root>

src/Calculator/Resources/bg-BG/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Калкулатор</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Калкулатор [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Калкулатор на Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Калкулатор на Windows [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Калкулатор</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Калкулатор [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Копиране</value>
@@ -2265,9 +2277,9 @@
     <value>Декларация за поверителност на Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Всички права запазени.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <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">
     <value>Относно</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x или</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>и</value>

src/Calculator/Resources/bn-BD/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>ক্যালকুলেটর</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>ক্যালকুলেটর [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows ক্যালকুলেটর</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows ক্যালকুলেটর [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>ক্যালকুলেটর</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>ক্যালকুলেটর [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>প্রতিলিপি</value>
@@ -2265,9 +2277,9 @@
     <value>Microsoft গোপনীয়তার বিবৃতি</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. সর্বস্বত্ব সংরক্ষিত।</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <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">
     <value>বিষয়ক</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x বা</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>এবং</value>
@@ -2616,7 +2628,7 @@
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
   <data name="RefreshButtonText.Content" xml:space="preserve">
-    <value>হালনাগাদ হার</value>
+    <value>হালনাগাদের হার</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
   <data name="DataChargesMayApply" xml:space="preserve">

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 
@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Calculadora</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Calculadora [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Calculadora del Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Calculadora del Windows [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Calculadora</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Calculadora [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Copia</value>
@@ -2265,9 +2277,9 @@
     <value>Declaració de privadesa de Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Tots els drets reservats.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Tots els drets reservats.</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">
     <value>Sobre</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x o</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>i</value>
@@ -2887,4 +2899,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>

src/Calculator/Resources/cs-CZ/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Kalkulačka</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Kalkulačka [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows Kalkulačka</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows Kalkulačka [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Kalkulačka</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Kalkulačka [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopírovat</value>
@@ -2265,9 +2277,9 @@
     <value>Prohlášení společnosti Microsoft o zásadách ochrany osobních údajů</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Všechna práva vyhrazena.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Všechna práva vyhrazena.</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">
     <value>O aplikaci</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>XOR</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>AND</value>

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 
@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Lommeregner</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Lommeregner [Udvikling]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows Lommeregner</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows Lommeregner [Udvikling]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Lommeregner</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Lommeregner [Udvikling]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopiér</value>
@@ -2265,9 +2277,9 @@
     <value>Microsofts erklæring om beskyttelse af personlige oplysninger</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Alle rettigheder forbeholdes.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Alle rettigheder forbeholdes.</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">
     <value>Om</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x eller</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>og</value>
@@ -2616,7 +2628,7 @@
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
   <data name="RefreshButtonText.Content" xml:space="preserve">
-    <value>Opdater valutakurser</value>
+    <value>Opdater satser</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
   <data name="DataChargesMayApply" xml:space="preserve">
@@ -2887,4 +2899,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>

src/Calculator/Resources/de-DE/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Rechner</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Rechner [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows-Rechner</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows-Rechner [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Rechner</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Rechner [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopieren</value>
@@ -446,7 +458,7 @@
     <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">
-    <value>Speicher</value>
+    <value>Arbeitsspeicher</value>
     <comment>The automation name for the Memory pivot item that is shown when Calculator is in wide layout.</comment>
   </data>
   <data name="HistoryLabel.Text" xml:space="preserve">
@@ -770,23 +782,23 @@
     <comment>Screen reader prompt for the Calculator number "F" button</comment>
   </data>
   <data name="andButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>And</value>
+    <value>UND</value>
     <comment>Screen reader prompt for the Calculator And button</comment>
   </data>
   <data name="orButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Or</value>
+    <value>ODER</value>
     <comment>Screen reader prompt for the Calculator Or button</comment>
   </data>
   <data name="notButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Not</value>
+    <value>NICHT</value>
     <comment>Screen reader prompt for the Calculator Not button</comment>
   </data>
   <data name="rolButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Nach links drehen</value>
+    <value>Nach links verschieben</value>
     <comment>Screen reader prompt for the Calculator ROL button</comment>
   </data>
   <data name="rorButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Nach rechts drehen</value>
+    <value>Nach rechts verschieben</value>
     <comment>Screen reader prompt for the Calculator ROR button</comment>
   </data>
   <data name="lshButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
@@ -918,7 +930,7 @@
     <comment>Screen reader prompt for the Calculator cos button  on the scientific operator keypad</comment>
   </data>
   <data name="tanButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Tagens</value>
+    <value>Tangens</value>
     <comment>Screen reader prompt for the Calculator tan button  on the scientific operator keypad</comment>
   </data>
   <data name="sinhButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
@@ -938,19 +950,19 @@
     <comment>Screen reader prompt for the x squared on the scientific operator keypad. </comment>
   </data>
   <data name="xpower3Button.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Würfel</value>
+    <value>Kubik</value>
     <comment>Screen reader prompt for the x cubed on the scientific operator keypad. </comment>
   </data>
   <data name="invsinButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Arcussinus</value>
+    <value>Arkussinus</value>
     <comment>Screen reader prompt for the inverted sin on the scientific operator keypad.</comment>
   </data>
   <data name="invcosButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Arcuscosinus</value>
+    <value>Arkuskosinus</value>
     <comment>Screen reader prompt for the inverted cos on the scientific operator keypad.</comment>
   </data>
   <data name="invtanButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Arcustangens</value>
+    <value>Arkustangens</value>
     <comment>Screen reader prompt for the inverted tan on the scientific operator keypad.</comment>
   </data>
   <data name="invsinhButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
@@ -1866,7 +1878,7 @@
     <comment>A measurement unit for time. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
   </data>
   <data name="UnitAbbreviation_Carat" xml:space="preserve">
-    <value>cd</value>
+    <value>kt</value>
     <comment>An abbreviation for a measurement unit of weight</comment>
   </data>
   <data name="UnitAbbreviation_Degree" xml:space="preserve">
@@ -2265,9 +2277,9 @@
     <value>Datenschutzbestimmungen von Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Alle Rechte vorbehalten.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Alle Rechte vorbehalten.</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">
     <value>Info</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x oder</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>und</value>

src/Calculator/Resources/el-GR/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Αριθμομηχανή</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Αριθμομηχανή [προγραμματιστές]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Αριθμομηχανή των Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Αριθμομηχανή των Windows [προγραμματιστές]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Αριθμομηχανή</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Αριθμομηχανή [προγραμματιστές]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Αντιγραφή</value>
@@ -2265,9 +2277,9 @@
     <value>Δήλωση προστασίας προσωπικών δεδομένων της Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Με επιφύλαξη κάθε νόμιμου δικαιώματος.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <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">
     <value>Πληροφορίες</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x or</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>και</value>

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 
@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Calculator</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Calculator [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows Calculator</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows Calculator [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Calculator</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Calculator [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Copy</value>
@@ -2265,9 +2277,9 @@
     <value>Microsoft Privacy Statement</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. All rights reserved.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. All rights reserved.</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">
     <value>About</value>
@@ -2887,4 +2899,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>

src/Calculator/Resources/en-US/Resources.resw

@@ -2709,9 +2709,9 @@
     <value>Microsoft Privacy Statement</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. All rights reserved.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. All rights reserved.</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">
     <value>About</value>

src/Calculator/Resources/es-ES/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Calculadora</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Calculadora [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Calculadora de Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Calculadora de Windows [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Calculadora</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Calculadora [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Copiar</value>
@@ -2265,9 +2277,9 @@
     <value>Declaración de privacidad de Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Todos los derechos reservados.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Todos los derechos reservados.</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">
     <value>Acerca de</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x o</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>y</value>

src/Calculator/Resources/es-MX/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Calculadora</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Calculadora [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Calculadora de Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Calculadora de Windows [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Calculadora</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Calculadora [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Copiar</value>
@@ -2265,9 +2277,9 @@
     <value>Declaración de privacidad de Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Todos los derechos reservados.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Todos los derechos reservados.</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">
     <value>Acerca de</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x o</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>y</value>

src/Calculator/Resources/et-EE/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Kalkulaator</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Kalkulaator [arendusversioon]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windowsi kalkulaator</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windowsi kalkulaator [arendusversioon]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Kalkulaator</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Kalkulaator [arendusversioon]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopeeri</value>
@@ -2265,9 +2277,9 @@
     <value>Microsofti privaatsusavaldus</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Kõik õigused on reserveeritud.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Kõik õigused on reserveeritud.</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">
     <value>Teave</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>välistav või</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>ja</value>

src/Calculator/Resources/eu-ES/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Kalkulagailua</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Kalkulagailua [Gar.]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows Kalkulagailua</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows Kalkulagailua [Gar.]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Kalkulagailua</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Kalkulagailua [Gar.]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopiatu</value>
@@ -2265,9 +2277,9 @@
     <value>Microsoft Pribatutasun-adierazpena</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Eskubide guztiak erreserbatuta.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Eskubide guztiak erreserbatuta.</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">
     <value>Honi buruz</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x edo</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>eta</value>

src/Calculator/Resources/fa-IR/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>ماشین حساب</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>ماشین حساب [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>ماشین حساب Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>ماشین حساب Windows [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>ماشین حساب</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>ماشین حساب [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>کپی</value>
@@ -2265,9 +2277,9 @@
     <value>بیانیه حریم خصوصی Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. کلیه حقوق محفوظ است.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <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">
     <value>درباره</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>برابر یا</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>و</value>
@@ -2616,7 +2628,7 @@
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
   <data name="RefreshButtonText.Content" xml:space="preserve">
-    <value>به‌روزرسانی نرخ‌‌ها</value>
+    <value>به‌روزرسانی نرخ‌ها</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
   <data name="DataChargesMayApply" xml:space="preserve">

src/Calculator/Resources/fi-FI/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Laskin</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Laskin [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windowsin laskin</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windowsin laskin [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Laskin</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Laskin [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopioi</value>
@@ -2265,9 +2277,9 @@
     <value>Microsoftin tietosuojatiedot</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Kaikki oikeudet pidätetään.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Kaikki oikeudet pidätetään.</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">
     <value>Tietoja</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x tai</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>ja</value>

src/Calculator/Resources/fil-PH/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Calculator</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Calculator [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows Calculator</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows Calculator [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Calculator</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Calculator [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopyahin</value>
@@ -2265,9 +2277,9 @@
     <value>Pahayag ng Pagiging Pribado ng Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Nakalaan ang lahat ng karapatan.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Nakalaan 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">
     <value>Tungkol Dito</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x o</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>at</value>

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 
@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Calculatrice</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Calculatrice [Dév]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Calculatrice Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Calculatrice Windows [Dév]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Calculatrice</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Calculatrice [Dév]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Copier</value>
@@ -2265,9 +2277,9 @@
     <value>Énoncé de confidentialité Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Tous droits réservés.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <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">
     <value>À propos de</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x ou</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>et</value>
@@ -2887,4 +2899,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>

src/Calculator/Resources/fr-FR/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Calculatrice</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Calculatrice [Dév.]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Calculatrice Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Calculatrice Windows [Dév.]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Calculatrice</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Calculatrice [Dév.]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Copier</value>
@@ -518,7 +530,7 @@
     <comment>The text that shows in the dropdown navigation control for the converter group in upper case. The previous key for this was "ConverterMode.Text".</comment>
   </data>
   <data name="CalculatorModeTextCaps" xml:space="preserve">
-    <value>Calculette</value>
+    <value>Calculatrice</value>
     <comment>The text that shows in the dropdown navigation control for the calculator group in upper case.</comment>
   </data>
   <data name="ConverterModePluralText" xml:space="preserve">
@@ -2265,9 +2277,9 @@
     <value>Déclaration de confidentialité Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Tous droits réservés.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <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">
     <value>À propos de</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x ou</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>et</value>
@@ -2887,4 +2899,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>

src/Calculator/Resources/gl-ES/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Calculadora</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Calculadora [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Calculadora de Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Calculadora de Windows [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Calculadora</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Calculadora [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Copiar</value>
@@ -2265,9 +2277,9 @@
     <value>Declaración de privacidade de Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Todos os dereitos reservados.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Todos os dereitos reservados.</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">
     <value>Acerca de</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x ou</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>e</value>

src/Calculator/Resources/ha-Latn-NG/Resources.resw

@@ -119,7 +119,7 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Manahajar lissafi</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Manahajar lissafi Windows</value>
@@ -127,7 +127,7 @@
   </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Manahajar lissafi</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kwafa</value>
@@ -421,10 +421,6 @@
     <value>Shingen alƙaluma na kilisawa bit</value>
     <comment>This is the tool tip automation name for the bitFlip button.</comment>
   </data>
-  <data name="fullKeypad.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Cikakken shingen alƙaluma</value>
-    <comment>This is the tool tip automation name for the numberPad button.</comment>
-  </data>
   <data name="HistoryLabel.Text" xml:space="preserve">
     <value>Tarihi</value>
     <comment>The text that shows as the header for the history list</comment>
@@ -605,10 +601,6 @@
     <value>Shingen alƙaluma na kilisawa bit</value>
     <comment>Screen reader prompt for the Calculator bitFlip button</comment>
   </data>
-  <data name="fullKeypad.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Cikakken shingen alƙaluma</value>
-    <comment>Screen reader prompt for the Calculator numberPad button</comment>
-  </data>
   <data name="decimalSeparatorButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Mai Rabewar Gomiya</value>
     <comment>Screen reader prompt for the "." button</comment>
@@ -2132,20 +2124,4 @@
     <value>%1 %2</value>
     <comment>{Locked='%1','%2'} Formatting string for a Narrator announcement when user presses a button with auditory feedback. "%1" is the display value and "%2" is the button press feedback. Example, user presses "plus" and hears "Display is 7 plus".</comment>
   </data>
-  <data name="minusButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
-    <value>Deɓewa</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 minus" when the button is pressed.</comment>
-  </data>
-  <data name="plusButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
-    <value>Tara da</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 plus" when the button is pressed.</comment>
-  </data>
-  <data name="lshButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
-    <value>Matsawa ta hagu</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 left shift" when the button is pressed.</comment>
-  </data>
-  <data name="rshButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
-    <value>Matsawa ta dama</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 right shift" when the button is pressed.</comment>
-  </data>
 </root>

src/Calculator/Resources/he-IL/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>מחשבון</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>מחשבון [פיתוח]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>‎‎מחשבון Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>מחשבון Windows [פיתוח]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>מחשבון</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>מחשבון [פיתוח]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>העתק</value>
@@ -2265,9 +2277,9 @@
     <value>הצהרת הפרטיות של Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>‎© 2018 Microsoft. כל הזכויות שמורות.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <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">
     <value>אודות</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x או</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>וגם</value>

src/Calculator/Resources/hi-IN/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>कैल्क्यूलेटर</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>कैल्क्यूलेटर [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows कैल्‍क्‍यूलेटर</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows कैल्क्यूलेटर [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>कैल्क्यूलेटर</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>कैल्क्यूलेटर [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>प्रतिलिपि बनाएँ</value>
@@ -2265,9 +2277,9 @@
     <value>Microsoft गोपनीयता कथन</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. सर्वाधिकार सुरक्षित.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <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">
     <value>के बारे में</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x या</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>और</value>
@@ -2616,7 +2628,7 @@
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
   <data name="RefreshButtonText.Content" xml:space="preserve">
-    <value>दरों को अपडेट करें</value>
+    <value>दरों को अद्यतन करें</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
   <data name="DataChargesMayApply" xml:space="preserve">

src/Calculator/Resources/hr-HR/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Kalkulator</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Kalkulator [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows kalkulator</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows kalkulator [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Kalkulator</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Kalkulator [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopiraj</value>
@@ -2265,9 +2277,9 @@
     <value>Microsoftova izjava o zaštiti privatnosti</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
+  <data name="AboutControlCopyright" xml:space="preserve">
     <value>© 2018. Microsoft. Sva prava pridržana.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+    <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">
     <value>O programu</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x ili</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>i</value>
@@ -2876,7 +2888,7 @@
     <comment>Name for the y root function. Used by screen readers.</comment>
   </data>
   <data name="NavCategoryItem_AutomationNameFormat" xml:space="preserve">
-    <value>%1, %2</value>
+    <value>%1 %2</value>
     <comment>{Locked='%1','%2'}.  Format string for the accessible name of a Calculator menu item, used by screen readers. "%1" is the item name, e.g. Standard, Programmer, etc. %2 is the category name, e.g. Calculator, Converter. An example when formatted is "Standard Calculator" or "Currency Converter".</comment>
   </data>
   <data name="NavCategoryHeader_AutomationNameFormat" xml:space="preserve">

src/Calculator/Resources/hu-HU/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Számológép</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Számológép [fejlesztői]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows Számológép</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows Számológép [fejlesztői]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Számológép</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Számológép [fejlesztői]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Másolás</value>
@@ -2265,9 +2277,9 @@
     <value>A Microsoft adatvédelmi nyilatkozata</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Minden jog fenntartva.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Minden jog fenntartva.</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">
     <value>Névjegy</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x vagy</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>és</value>

src/Calculator/Resources/id-ID/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Kalkulator</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Kalkulator [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Kalkulator Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Kalkulator Windows [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Kalkulator</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Kalkulator [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Salin</value>
@@ -2265,9 +2277,9 @@
     <value>Pernyataan Privasi Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Hak cipta dilindungi undang-undang.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Hak cipta dilindungi undang-undang.</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">
     <value>Tentang</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x atau</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>dan</value>

src/Calculator/Resources/is-IS/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Reiknivél</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Reiknivél [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows-reiknivél</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows-reiknivél [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Reiknivél</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Reiknivél [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Afrita</value>
@@ -2265,9 +2277,9 @@
     <value>Yfirlýsing Microsoft um persónuvernd</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Allur réttur áskilinn.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Allur réttur áskilinn.</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">
     <value>Um</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x eða</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>og</value>

src/Calculator/Resources/it-IT/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Calcolatrice</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Calcolatrice [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Calcolatrice Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Calcolatrice Windows [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Calcolatrice</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Calcolatrice [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Copia</value>
@@ -2265,9 +2277,9 @@
     <value>Informativa sulla privacy di Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Tutti i diritti sono riservati.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Tutti i diritti sono riservati.</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">
     <value>Informazioni</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x o</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>e</value>

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 
@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>電卓</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>電卓 [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows 電卓</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows 電卓 [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>電卓</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>電卓 [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>コピー</value>
@@ -2265,9 +2277,9 @@
     <value>Microsoft のプライバシーに関する声明</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. All rights reserved.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. All rights reserved.</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">
     <value>バージョン情報</value>
@@ -2443,10 +2455,10 @@
     <value>日</value>
   </data>
   <data name="Date_Month" xml:space="preserve">
-    <value>月</value>
+    <value>か月</value>
   </data>
   <data name="Date_Months" xml:space="preserve">
-    <value>月</value>
+    <value>か月</value>
   </data>
   <data name="Date_SameDates" xml:space="preserve">
     <value>日付が同じです</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>排他的論理和</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>論理積</value>
@@ -2887,4 +2899,4 @@
     <value>Microsoft サービス規約</value>
     <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
   </data>
-</root>
+</root>

src/Calculator/Resources/kk-KZ/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Есептегіш</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Есептегіш [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows есептегіші</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows есептегіші [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Есептегіш</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Есептегіш [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Көшіру</value>
@@ -2265,9 +2277,9 @@
     <value>Microsoft құпиялылық туралы мәлімдемесі</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Барлық құқықтар қорғалған.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <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">
     <value>Бағдарлама туралы</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x немесе</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>және</value>
@@ -2616,7 +2628,7 @@
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
   <data name="RefreshButtonText.Content" xml:space="preserve">
-    <value>Бағамдарды жаңарту</value>
+    <value>Бағаларды жаңарту</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
   <data name="DataChargesMayApply" xml:space="preserve">

src/Calculator/Resources/km-KH/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>ម៉ាស៊ីនគិតលេខ</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>ម៉ាស៊ីនគិតលេខ [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows ម៉ាស៊ីនគិតលេខ</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows ម៉ាស៊ីនគិតលេខ [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>ម៉ាស៊ីនគិតលេខ</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>ម៉ាស៊ីនគិតលេខ [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>ចម្លង</value>
@@ -2265,9 +2277,9 @@
     <value>ព័ត៌មាន​ឯកត្តជន Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. រក្សាសិទ្ធិគ្រប់បែបយ៉ាង។</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <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">
     <value>អំពី</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x ឬក៏</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>និង</value>
@@ -2616,7 +2628,7 @@
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
   <data name="RefreshButtonText.Content" xml:space="preserve">
-    <value>ធ្វើឱ្យទាន់សម័យការដាក់ពិន្ទុ</value>
+    <value>អាប់ដេតការផ្តល់ចំណាត់ថ្នាក់</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
   <data name="DataChargesMayApply" xml:space="preserve">

src/Calculator/Resources/kn-IN/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>ಕ್ಯಾಲ್ಕುಲೇಟರ್</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>ಕ್ಯಾಲ್ಕುಲೇಟರ್ [ಡೆವ್]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows ಕ್ಯಾಲ್ಕುಲೇಟರ್</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows ಕ್ಯಾಲ್ಕುಲೇಟರ್ [ಡೆವ್]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>ಕ್ಯಾಲ್ಕುಲೇಟರ್</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>ಕ್ಯಾಲ್ಕುಲೇಟರ್ [ಡೆವ್]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>ನಕಲಿಸು</value>
@@ -2265,9 +2277,9 @@
     <value>Microsoft ಗೌಪ್ಯತೆ ಹೇಳಿಕೆ</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. ಎಲ್ಲ ಹಕ್ಕುಗಳನ್ನು ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <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">
     <value>ಕುರಿತು</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x ಅಥವಾ</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>ಮತ್ತು</value>

src/Calculator/Resources/ko-KR/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>계산기</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>계산기[Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows 계산기</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows 계산기[Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>계산기</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>계산기[Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>복사</value>
@@ -2265,9 +2277,9 @@
     <value>Microsoft 개인정보취급방침</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. All rights reserved.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. All rights reserved.</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">
     <value>정보</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x 또는</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>및</value>

src/Calculator/Resources/lo-LA/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>ເຄື່ອງຄິດເລກ</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>ເຄື່ອງຄິດເລກ [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows ເຄື່ອງ​ຄິດ​ເລກ</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows ເຄື່ອງ​ຄິດ​ເລກ [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>ເຄື່ອງຄິດເລກ</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>ເຄື່ອງຄິດເລກ [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>ກັອບປີ່</value>
@@ -2265,9 +2277,9 @@
     <value>ຄໍາຖະແຫຼງຄວາມເປັນສ່ວນຕົວຂອງ Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. ສະຫງວນລິຂະສິດ.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <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">
     <value>ກ່ຽວກັບ</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x ຫຼື</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>ແລະ</value>

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 
@@ -119,18 +119,30 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Skaičiuotuvas</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Skaičiuotuvas [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>„Windows“ skaičiuotuvas</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>„Windows“ skaičiuotuvas [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Skaičiuotuvas</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Skaičiuotuvas [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
-    <value>Copy</value>
+    <value>Kopijuoti</value>
     <comment>Copy context menu string</comment>
   </data>
   <data name="pasteMenuItem" xml:space="preserve">
@@ -982,7 +994,7 @@
     <comment>Screen reader for the yth root of x on the scientific operator keypad. Note: String is meant to read out whatever the "Yth root" mathematical operator sounds like.</comment>
   </data>
   <data name="logBase10Button.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Log</value>
+    <value>Žurnalas</value>
     <comment>Screen reader for the log base 10  on the scientific operator keypad</comment>
   </data>
   <data name="logBaseEButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
@@ -2190,7 +2202,7 @@
     <comment>A human hand, used as a comparison measurement unit for length or area. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
   </data>
   <data name="UnitAbbreviation_Hand" xml:space="preserve">
-    <value>plaštakos</value>
+    <value>plaštak.</value>
     <comment>A human hand, used as a comparison measurement unit for length or area. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
   </data>
   <data name="UnitName_Paper" xml:space="preserve">
@@ -2198,7 +2210,7 @@
     <comment>A sheet of 8.5 x 11 inch paper, used as a comparison measurement unit for area. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
   </data>
   <data name="UnitAbbreviation_Paper" xml:space="preserve">
-    <value>popieriaus lapai</value>
+    <value>popieriaus lap.</value>
     <comment>A sheet of 8.5 x 11 inch paper, used as a comparison measurement unit for area. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
   </data>
   <data name="UnitName_Castle" xml:space="preserve">
@@ -2230,7 +2242,7 @@
     <comment>A train engine, used as a comparison measurement unit for power. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
   </data>
   <data name="UnitAbbreviation_TrainEngine" xml:space="preserve">
-    <value>traukinių varikliai</value>
+    <value>traukinių varikl.</value>
     <comment>A train engine, used as a comparison measurement unit for power. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
   </data>
   <data name="UnitName_SoccerBall" xml:space="preserve">
@@ -2238,7 +2250,7 @@
     <comment>A soccer ball, used as a comparison measurement unit for weight. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
   </data>
   <data name="UnitAbbreviation_SoccerBall" xml:space="preserve">
-    <value>futbolo kamuoliai</value>
+    <value>futbolo kamuoliai (-ių)</value>
     <comment>A soccer ball, used as a comparison measurement unit for weight. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
   </data>
   <data name="MemoryItemHelpText" xml:space="preserve">
@@ -2265,9 +2277,9 @@
     <value>„Microsoft“ privatumo patvirtinimas</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© „Microsoft“, 2018 m. Visos teisės ginamos.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© „Microsoft“, %1 m. 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">
     <value>Apie</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x arba</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>ir</value>
@@ -2616,7 +2628,7 @@
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
   <data name="RefreshButtonText.Content" xml:space="preserve">
-    <value>Naujinti valiutos kursus</value>
+    <value>Naujinti tarifus</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
   <data name="DataChargesMayApply" xml:space="preserve">
@@ -2887,4 +2899,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>

src/Calculator/Resources/lv-LV/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Kalkulators</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Kalkulators [izstr.]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows kalkulators</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows kalkulators [izstr.]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Kalkulators</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Kalkulators [izstr.]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopēt</value>
@@ -2265,9 +2277,9 @@
     <value>Microsoft paziņojums par konfidencialitāti</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Visas tiesības paturētas.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Visas tiesības paturētas.</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">
     <value>Par</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x or</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>and</value>

src/Calculator/Resources/mk-MK/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Калкулатор</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Калкулатор [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows калкулатор</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows калкулатор [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Калкулатор</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Калкулатор [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Копирај</value>
@@ -2265,9 +2277,9 @@
     <value>Изјава на Microsoft за заштита на личните податоци</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft Corporation. Сите права се задржани.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft Corporation. Сите права се задржани.</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">
     <value>За</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x или</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>и</value>

src/Calculator/Resources/ml-IN/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>കാൽക്കുലേറ്റർ</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>കാല്‍‌ക്കുലേറ്റര് [ദേവ്]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows കാൽക്കുലേറ്റർ</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows കാൽക്കുലേറ്റർ [ദേവ്]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>കാൽക്കുലേറ്റർ</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>കാല്‍‌ക്കുലേറ്റര് [ദേവ്]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>പകര്‍ത്തുക</value>
@@ -2265,9 +2277,9 @@
     <value>Microsoft സ്വകാര്യതാ പ്രസ്താവന</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. എല്ലാ അവകാശങ്ങളും സംവരണം ചെയ്തിരിക്കുന്നു.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <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">
     <value>വിവരം</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x അല്ലെങ്കിൽ</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>ഒപ്പം</value>

src/Calculator/Resources/ms-MY/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Kalkulator</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Kalkulator [Pembangun]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Kalkulator Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Kalkulator Windows [Pembangun]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Kalkulator</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Kalkulator [Pembangun]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Salin</value>
@@ -2265,9 +2277,9 @@
     <value>Pernyataan Privasi Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Hak cipta terpelihara.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Hak cipta terpelihara.</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">
     <value>Perihal</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x atau</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>dan</value>

src/Calculator/Resources/nb-NO/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Kalkulator</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Kalkulator [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows Kalkulator</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows Kalkulator [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Kalkulator</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Kalkulator [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopier</value>
@@ -2265,9 +2277,9 @@
     <value>Microsofts personvernerklæring</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Med enerett.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Med enerett.</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">
     <value>Om</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x eller</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>og</value>

src/Calculator/Resources/nl-NL/CEngineStrings.resw

@@ -142,7 +142,7 @@
     <comment>Same 101</comment>
   </data>
   <data name="119" xml:space="preserve">
-    <value>Overflow</value>
+    <value>Overloop</value>
     <comment>Same as 107</comment>
   </data>
   <data name="120" xml:space="preserve">

src/Calculator/Resources/nl-NL/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Rekenmachine</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Rekenmachine [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows Rekenmachine</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows Rekenmachine [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Rekenmachine</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Rekenmachine [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopie</value>
@@ -2265,9 +2277,9 @@
     <value>Privacyverklaring van Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Alle rechten voorbehouden.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Alle rechten voorbehouden.</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">
     <value>Info over</value>
@@ -2603,7 +2615,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x of</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>en</value>

src/Calculator/Resources/pl-PL/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Kalkulator</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Kalkulator [deweloper]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Kalkulator Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Kalkulator Windows [deweloper]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Kalkulator</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Kalkulator [deweloper]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopiuj</value>
@@ -2265,9 +2277,9 @@
     <value>Zasady zachowania poufności informacji firmy Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Wszelkie prawa zastrzeżone.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Wszelkie prawa zastrzeżone.</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">
     <value>Informacje</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x lub</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>i</value>

src/Calculator/Resources/pt-BR/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Calculadora</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Calculadora [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Calculadora Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Calculadora Windows [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Calculadora</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Calculadora [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Copiar</value>
@@ -2265,9 +2277,9 @@
     <value>Política de Privacidade da Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Todos os direitos reservados.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Todos os direitos reservados.</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">
     <value>Sobre</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x ou</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>e</value>

src/Calculator/Resources/pt-PT/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Calculadora</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Calculadora [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Calculadora do Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Calculadora do Windows [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Calculadora</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Calculadora [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Copiar</value>
@@ -2265,9 +2277,9 @@
     <value>Declaração de Privacidade da Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Todos os direitos reservados.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Todos os direitos reservados.</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">
     <value>Acerca de</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x ou</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>e</value>

src/Calculator/Resources/ro-RO/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Calculator</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Calculator [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Calculator Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Calculator Windows [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Calculator</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Calculator [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Copiere</value>
@@ -2265,9 +2277,9 @@
     <value>Angajamentul de respectare a confidențialității Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Toate drepturile rezervate.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Toate drepturile rezervate.</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">
     <value>Despre</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x sau</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>şi</value>
@@ -2616,7 +2628,7 @@
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
   <data name="RefreshButtonText.Content" xml:space="preserve">
-    <value>Actualizare tarife</value>
+    <value>Actualizați tarifele</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
   <data name="DataChargesMayApply" xml:space="preserve">

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 
@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Калькулятор</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Калькулятор [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Калькулятор Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Калькулятор Windows [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Калькулятор</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Калькулятор [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Копировать</value>
@@ -2265,9 +2277,9 @@
     <value>Заявление о конфиденциальности Майкрософт</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© Корпорация Майкрософт (Microsoft Corporation), 2018. Все права защищены.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© Корпорация Майкрософт (Microsoft Corporation), %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">
     <value>О программе</value>
@@ -2413,7 +2425,7 @@
     <comment>Difference result label</comment>
   </data>
   <data name="Date_FromLabel.Text" xml:space="preserve">
-    <value>С</value>
+    <value>От</value>
     <comment>From Date label for Date Picker</comment>
   </data>
   <data name="MonthsLabel.Text" xml:space="preserve">
@@ -2421,11 +2433,11 @@
     <comment>Add/Subtract Months label</comment>
   </data>
   <data name="SubtractOption.Content" xml:space="preserve">
-    <value>Вычитание</value>
+    <value>Вычесть</value>
     <comment>Subtract toggle button text</comment>
   </data>
   <data name="Date_ToLabel.Text" xml:space="preserve">
-    <value>По</value>
+    <value>Кому</value>
     <comment>To Date label for Date Picker</comment>
   </data>
   <data name="YearsLabel.Text" xml:space="preserve">
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>сложить по модулю два с</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>плюс</value>
@@ -2616,7 +2628,7 @@
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
   <data name="RefreshButtonText.Content" xml:space="preserve">
-    <value>Обновить тарифы</value>
+    <value>Обновить курсы</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
   <data name="DataChargesMayApply" xml:space="preserve">
@@ -2887,4 +2899,4 @@
     <value>Соглашение об использовании служб Майкрософт</value>
     <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
   </data>
-</root>
+</root>

src/Calculator/Resources/sk-SK/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Kalkulačka</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Kalkulačka [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows Kalkulačka</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows Kalkulačka [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Kalkulačka</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Kalkulačka [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopírovať</value>
@@ -2265,9 +2277,9 @@
     <value>Prehlásenie spoločnosti Microsoft o ochrane osobných údajov</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Všetky práva vyhradené.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Všetky práva vyhradené.</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">
     <value>Informácie</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>vylučujúce alebo</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>a</value>

src/Calculator/Resources/sl-SI/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Kalkulator</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Kalkulator [Raz.]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Kalkulator Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Kalkulator Windows [Raz.]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Kalkulator</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Kalkulator [Raz.]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopiraj</value>
@@ -2265,9 +2277,9 @@
     <value>Microsoftova izjava o zasebnosti</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Vse pravice pridržane.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Vse pravice pridržane.</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">
     <value>Vizitka</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x ali</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>in</value>

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 
@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Makina llogaritëse</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Makinë llogaritëse [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Makina llogaritëse e Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Makinë llogaritëse e Windows [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Makina llogaritëse</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Makinë llogaritëse [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopjo</value>
@@ -2265,9 +2277,9 @@
     <value>Deklarata e privatësisë e Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Të gjitha të drejtat të rezervuara.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Të gjitha të drejtat të rezervuara.</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">
     <value>Rreth</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x ose</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>dhe</value>
@@ -2887,4 +2899,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>

src/Calculator/Resources/sr-Latn-RS/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Kalkulator</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Kalkulator [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows kalkulator</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows kalkulator [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Kalkulator</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Kalkulator [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopiraj</value>
@@ -2265,9 +2277,9 @@
     <value>Microsoft izjava o privatnosti</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Sva prava zadržana.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Sva prava zadrž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">
     <value>Osnovni podaci o</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>iksor</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>i</value>

src/Calculator/Resources/sv-SE/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Kalkylatorn</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Kalkylatorn [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows Kalkylatorn</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows Kalkylatorn [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Kalkylatorn</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Kalkylatorn [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopiera</value>
@@ -2265,9 +2277,9 @@
     <value>Microsofts sekretesspolicy</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Med ensamrätt.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Med ensamrätt.</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">
     <value>Om</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x or</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>and</value>

src/Calculator/Resources/sw-KE/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Kikokotoo</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Kikokotoo [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Kikokotoo cha Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Kikokotoo cha Windows [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Kikokotoo</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Kikokotoo [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Nakili</value>
@@ -2265,9 +2277,9 @@
     <value>Taarifa ya Faragha ya Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Haki zote zimehifadhiwa.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Haki zote zimehifadhiwa.</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">
     <value>Kuhusu</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x au</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>na</value>

src/Calculator/Resources/ta-IN/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>கால்குலேட்டர்</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>கால்குலேட்டர் [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows கால்குலேட்டர்</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows கால்குலேட்டர் [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>கால்குலேட்டர்</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>கால்குலேட்டர் [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>நகலெடு</value>
@@ -2265,9 +2277,9 @@
     <value>Microsoft தனியுரிமை அறிக்கை</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. அனைத்து உரிமைகளும் பாதுகாக்கப்பட்டவை.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <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">
     <value>இது பற்றி</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x அல்லது</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>மற்றும்</value>

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 
@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>కాలిక్యులేటర్</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>కాలిక్యులేటర్ [డెవ]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows కాలిక్యులేటర్</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows కాలిక్యులేటర్ [డెవ]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>కాలిక్యులేటర్</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>కాలిక్యులేటర్ [డెవ]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>కాపీ</value>
@@ -2265,9 +2277,9 @@
     <value>Microsoft గోప్యతా ప్రకటన</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. అన్ని హక్కులు ప్రత్యేకించినవి.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <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">
     <value>గురించి</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x లేదా</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>మరియు</value>
@@ -2887,4 +2899,4 @@
     <value>Microsoft సర్వీసెస్ అగ్రిమెంట్.</value>
     <comment>Displayed on a link to the Microsoft Services Agreement in the about this app information</comment>
   </data>
-</root>
+</root>

src/Calculator/Resources/th-TH/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>เครื่องคิดเลข</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>เครื่องคิดเลข [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>เครื่องคิดเลขของ Windows</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>เครื่องคิดเลขของ Windows [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>เครื่องคิดเลข</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>เครื่องคิดเลข [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>คัดลอก</value>
@@ -2265,9 +2277,9 @@
     <value>คำชี้แจงสิทธิ์ส่วนบุคคลของ Microsoft</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. All rights reserved.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. All rights reserved.</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">
     <value>เกี่ยวกับ</value>
@@ -2601,7 +2613,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x หรือ</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>และ</value>

src/Calculator/Resources/tr-TR/Resources.resw

@@ -119,15 +119,27 @@
   </resheader>
   <data name="AppName" xml:space="preserve">
     <value>Hesap Makinesi</value>
-    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"}</comment>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppName" xml:space="preserve">
+    <value>Hesap Makinesi [Dev]</value>
+    <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the name of the application when built by a user via GitHub. We use a different name to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="AppStoreName" xml:space="preserve">
     <value>Windows Hesap Makinesi</value>
     <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps.</comment>
   </data>
+  <data name="DevAppStoreName" xml:space="preserve">
+    <value>Windows Hesap Makinesi [Dev]</value>
+    <comment>{@Appx_DisplayName@}{StringCategory="Feature Title"} Name that shows up in the app store. It contains "Windows" to distinguish it from 3rd party calculator apps. This is the the version of the name used when the app is built by a user via GitHub.</comment>
+  </data>
   <data name="AppDescription" xml:space="preserve">
     <value>Hesap Makinesi</value>
-    <comment>{@Appx_Description@}</comment>
+    <comment>{@Appx_Description@} This description is used for the official application when published through Windows Store.</comment>
+  </data>
+  <data name="DevAppDescription" xml:space="preserve">
+    <value>Hesap Makinesi [Dev]</value>
+    <comment>{@Appx_Description@} This is the description of the application when built by a user via GitHub. We use a different description to make it easier for users to distinguish the apps when both this version and the Store version are installed on the same device.</comment>
   </data>
   <data name="copyMenuItem" xml:space="preserve">
     <value>Kopyala</value>
@@ -2266,9 +2278,9 @@
     <value>Microsoft Gizlilik Bildirimi</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
   </data>
-  <data name="AboutControlCopyright.Text" xml:space="preserve">
-    <value>© 2018 Microsoft. Tüm hakları saklıdır.</value>
-    <comment>Copyright statement, displayed on the About panel</comment>
+  <data name="AboutControlCopyright" xml:space="preserve">
+    <value>© %1 Microsoft. Tüm hakları saklıdır.</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">
     <value>Hakkında</value>
@@ -2602,7 +2614,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x veya</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>ve</value>