diff options
author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-08-21 08:29:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-21 08:29:25 +0200 |
commit | fcb436f1f469d6de09a334f3e131b87b09c9821e (patch) | |
tree | 2962db0fc9d17abc42fdb57eb49310ca1320a63d /launcher | |
parent | 5c95448f1f323eeb4b52425c304df95c9a01d5c8 (diff) | |
parent | e2e0a7af4597499f202106250addad92304a296b (diff) | |
download | PrismLauncher-fcb436f1f469d6de09a334f3e131b87b09c9821e.tar.gz PrismLauncher-fcb436f1f469d6de09a334f3e131b87b09c9821e.tar.bz2 PrismLauncher-fcb436f1f469d6de09a334f3e131b87b09c9821e.zip |
Merge pull request #1551 from dannydorazio/develop
Diffstat (limited to 'launcher')
-rw-r--r-- | launcher/ui/MainWindow.cpp | 2 | ||||
-rw-r--r-- | launcher/ui/pages/global/AccountListPage.cpp | 3 | ||||
-rw-r--r-- | launcher/ui/pages/instance/VersionPage.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp index 73b8dbe5..780147ef 100644 --- a/launcher/ui/MainWindow.cpp +++ b/launcher/ui/MainWindow.cpp @@ -870,7 +870,7 @@ void MainWindow::finalizeInstance(InstancePtr inst) } else { CustomMessageBox::selectable(this, tr("Error"), tr("The launcher cannot download Minecraft or update instances unless you have at least " - "one account added.\nPlease add your Mojang or Minecraft account."), + "one account added.\nPlease add your Microsoft or Mojang account."), QMessageBox::Warning) ->show(); } diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp index 5c6fb092..c0bd1607 100644 --- a/launcher/ui/pages/global/AccountListPage.cpp +++ b/launcher/ui/pages/global/AccountListPage.cpp @@ -64,7 +64,8 @@ AccountListPage::AccountListPage(QWidget* parent) : QMainWindow(parent), ui(new ui->setupUi(this); ui->listView->setEmptyString( tr("Welcome!\n" - "If you're new here, you can click the \"Add\" button to add your Mojang or Minecraft account.")); + "If you're new here, you can select the \"Add Microsoft\" or \"Add Mojang\" buttons to link your Microsoft and/or Mojang " + "accounts.")); ui->listView->setEmptyMode(VersionListView::String); ui->listView->setContextMenuPolicy(Qt::CustomContextMenu); diff --git a/launcher/ui/pages/instance/VersionPage.cpp b/launcher/ui/pages/instance/VersionPage.cpp index ef029d1d..fa506431 100644 --- a/launcher/ui/pages/instance/VersionPage.cpp +++ b/launcher/ui/pages/instance/VersionPage.cpp @@ -408,7 +408,7 @@ void VersionPage::on_actionDownload_All_triggered() if (!APPLICATION->accounts()->anyAccountIsValid()) { CustomMessageBox::selectable(this, tr("Error"), tr("Cannot download Minecraft or update instances unless you have at least " - "one account added.\nPlease add your Mojang or Minecraft account."), + "one account added.\nPlease add your Microsoft or Mojang account."), QMessageBox::Warning) ->show(); return; |