From 3bf924cd203cc456c5133fd3407dd916a9f5cfd9 Mon Sep 17 00:00:00 2001 From: Christoph Date: Sat, 19 May 2018 11:03:06 +0200 Subject: [PATCH] Camera translation (#3747) * citra_qt: correct spelling in configuration * citra_qt/camera: Changed the order of the translation The translation may not correspond to "couln't load" and "the camera", so create two cases which can get translated individually. Also add a space after "the camera". * citra_qt/camera: use the same syntax for the filter in "still_image_camera.cpp" as in "configure_camera.cpp" * citra_qt/camera: the config should only get added if it's not empty --- src/citra_qt/camera/qt_camera_factory.cpp | 8 ++++---- src/citra_qt/camera/still_image_camera.cpp | 2 +- src/citra_qt/configuration/configure_camera.ui | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/citra_qt/camera/qt_camera_factory.cpp b/src/citra_qt/camera/qt_camera_factory.cpp index d7eb49cd4..fa78591ba 100644 --- a/src/citra_qt/camera/qt_camera_factory.cpp +++ b/src/citra_qt/camera/qt_camera_factory.cpp @@ -14,10 +14,10 @@ std::unique_ptr QtCameraFactory::CreatePreview(const std::strin if (camera->IsPreviewAvailable()) { return camera; } - QMessageBox::critical(nullptr, QObject::tr("Error"), - QObject::tr("Couldn't load ") + - (config.empty() ? QObject::tr("the camera") : "") + - QString::fromStdString(config)); + QMessageBox::critical( + nullptr, QObject::tr("Error"), + (config.empty() ? QObject::tr("Couldn't load the camera") + : QObject::tr("Couldn't load %1").arg(QString::fromStdString(config)))); return nullptr; } diff --git a/src/citra_qt/camera/still_image_camera.cpp b/src/citra_qt/camera/still_image_camera.cpp index c3929df4f..ab0d18308 100644 --- a/src/citra_qt/camera/still_image_camera.cpp +++ b/src/citra_qt/camera/still_image_camera.cpp @@ -52,7 +52,7 @@ const std::string StillImageCameraFactory::getFilePath() { temp_filters << QString("*." + QString(type)); } - QString filter = QObject::tr("Supported image files (") + temp_filters.join(" ") + ")"; + QString filter = QObject::tr("Supported image files (%1)").arg(temp_filters.join(" ")); return QFileDialog::getOpenFileName(nullptr, QObject::tr("Open File"), ".", filter) .toStdString(); diff --git a/src/citra_qt/configuration/configure_camera.ui b/src/citra_qt/configuration/configure_camera.ui index ff6615498..cd4d2e108 100644 --- a/src/citra_qt/configuration/configure_camera.ui +++ b/src/citra_qt/configuration/configure_camera.ui @@ -117,7 +117,7 @@ - Select where the image of the emulated camera come from. It may be an image or a real camera. + Select where the image of the emulated camera comes from. It may be an image or a real camera. Camera Image Source: