diff options
author | flow <flowlnlnln@gmail.com> | 2022-05-17 18:25:08 -0300 |
---|---|---|
committer | flow <flowlnlnln@gmail.com> | 2022-05-17 18:25:08 -0300 |
commit | ff9f3cb31ff75c2d657146cf8fe646084439fd0f (patch) | |
tree | 6c098648df6a4da447aa305420709037115f81f0 /launcher/LaunchController.cpp | |
parent | 17bbfe8d8951ddc7acca0222c6d2e38fb29eef25 (diff) | |
parent | cc13310083fe8d0c3bb423fa3e31db7b1f7b25e1 (diff) | |
download | PrismLauncher-ff9f3cb31ff75c2d657146cf8fe646084439fd0f.tar.gz PrismLauncher-ff9f3cb31ff75c2d657146cf8fe646084439fd0f.tar.bz2 PrismLauncher-ff9f3cb31ff75c2d657146cf8fe646084439fd0f.zip |
fix conflicts with develop
Diffstat (limited to 'launcher/LaunchController.cpp')
-rw-r--r-- | launcher/LaunchController.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/launcher/LaunchController.cpp b/launcher/LaunchController.cpp index 4cb62e69..002c08b9 100644 --- a/launcher/LaunchController.cpp +++ b/launcher/LaunchController.cpp @@ -93,7 +93,7 @@ void LaunchController::decideAccount() auto reply = CustomMessageBox::selectable( m_parentWidget, tr("No Accounts"), - tr("In order to play Minecraft, you must have at least one Mojang or Minecraft " + tr("In order to play Minecraft, you must have at least one Mojang or Microsoft " "account logged in. " "Would you like to open the account manager to add an account now?"), QMessageBox::Information, |