Fix merge issue and validation issue

Signed-off-by: nggieber <[email protected]>

Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp

@@ -127,7 +127,9 @@ namespace O3DE::ProjectManager
         m_binarySizeLabel->setText(tr("Binary Size:  %1").arg(binarySize ? tr("%1 KB").arg(binarySize) : tr("Unknown")));
 
         // Update and Uninstall buttons
-        if (m_model->GetGemOrigin(modelIndex) == GemInfo::Remote && m_model->GetDownloadStatus(modelIndex) == GemInfo::Downloaded)
+        if (m_model->GetGemOrigin(modelIndex) == GemInfo::Remote &&
+            (m_model->GetDownloadStatus(modelIndex) == GemInfo::Downloaded ||
+             m_model->GetDownloadStatus(modelIndex) == GemInfo::DownloadSuccessful))
         {
             m_updateGemButton->show();
             m_uninstallGemButton->show();

Code/Tools/ProjectManager/Source/GemCatalog/GemUninstallDialog.cpp

@@ -36,7 +36,7 @@ namespace O3DE::ProjectManager
 
         layout->addSpacing(10);
 
-        QLabel* bodyLabel = new QLabel(tr("The Gem and its related files will be uninstalled. This does not affect the Gem’s repository. "
+        QLabel* bodyLabel = new QLabel(tr("The Gem and its related files will be uninstalled. This does not affect the Gem's repository. "
                                           "You can reinstall this Gem from the Catalog, but its contents may be subject to change."));
         bodyLabel->setWordWrap(true);
         bodyLabel->setFixedSize(QSize(440, 80));