diff options
author | Lioncash <mathew1800@gmail.com> | 2020-07-28 03:02:08 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2020-07-28 03:04:17 +0200 |
commit | 2e303095d58c1439ac59d0c4732665ae8555c633 (patch) | |
tree | d14c4f1cc7cb7c7e808ac9a2cfefef7478cd1b2a | |
parent | Merge pull request #4419 from lioncash/initializer (diff) | |
download | yuzu-2e303095d58c1439ac59d0c4732665ae8555c633.tar yuzu-2e303095d58c1439ac59d0c4732665ae8555c633.tar.gz yuzu-2e303095d58c1439ac59d0c4732665ae8555c633.tar.bz2 yuzu-2e303095d58c1439ac59d0c4732665ae8555c633.tar.lz yuzu-2e303095d58c1439ac59d0c4732665ae8555c633.tar.xz yuzu-2e303095d58c1439ac59d0c4732665ae8555c633.tar.zst yuzu-2e303095d58c1439ac59d0c4732665ae8555c633.zip |
-rw-r--r-- | src/yuzu/main.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 31a635176..0eae485ce 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1655,7 +1655,7 @@ void GMainWindow::OnMenuInstallToNAND() { ui.action_Install_File_NAND->setEnabled(false); - install_progress = new QProgressDialog(QStringLiteral(""), tr("Cancel"), 0, total_size, this); + install_progress = new QProgressDialog(QString{}, tr("Cancel"), 0, total_size, this); install_progress->setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint & ~Qt::WindowMaximizeButtonHint); install_progress->setAttribute(Qt::WA_DeleteOnClose, true); @@ -1705,12 +1705,12 @@ void GMainWindow::OnMenuInstallToNAND() { install_progress->close(); const QString install_results = - (new_files.isEmpty() ? QStringLiteral("") + (new_files.isEmpty() ? QString{} : tr("%n file(s) were newly installed\n", "", new_files.size())) + (overwritten_files.isEmpty() - ? QStringLiteral("") + ? QString{} : tr("%n file(s) were overwritten\n", "", overwritten_files.size())) + - (failed_files.isEmpty() ? QStringLiteral("") + (failed_files.isEmpty() ? QString{} : tr("%n file(s) failed to install\n", "", failed_files.size())); QMessageBox::information(this, tr("Install Results"), install_results); @@ -2202,8 +2202,7 @@ void GMainWindow::UpdateStatusBar() { if (shaders_building != 0) { shader_building_label->setText( - tr("Building: %1 shader").arg(shaders_building) + - (shaders_building != 1 ? QString::fromStdString("s") : QString::fromStdString(""))); + tr("Building: %n shader(s)", "", static_cast<int>(shaders_building))); shader_building_label->setVisible(true); } else { shader_building_label->setVisible(false); |