From 2b2cfc210fb711cb2e765f0138e6a71317257e09 Mon Sep 17 00:00:00 2001 From: Syping <schiedelrafael@keppe.org> Date: Mon, 16 Nov 2020 15:29:31 +0100 Subject: [PATCH] add unlimited buffer and import as-is --- ImportDialog.cpp | 329 ++++++++++++++++++++++++++---------------- ImportDialog.h | 7 +- ImportDialog.ui | 59 +++++++- ProfileInterface.cpp | 6 +- res/gta5sync.ts | 205 +++++++++++++++----------- res/gta5sync_de.qm | Bin 48399 -> 49583 bytes res/gta5sync_de.ts | 205 +++++++++++++++----------- res/gta5sync_en_US.ts | 205 +++++++++++++++----------- res/gta5sync_fr.ts | 205 +++++++++++++++----------- res/gta5sync_ko.ts | 205 +++++++++++++++----------- res/gta5sync_ru.ts | 205 +++++++++++++++----------- res/gta5sync_uk.ts | 205 +++++++++++++++----------- res/gta5sync_zh_TW.ts | 205 +++++++++++++++----------- 13 files changed, 1242 insertions(+), 799 deletions(-) diff --git a/ImportDialog.cpp b/ImportDialog.cpp index c2b9d8b..e14bb00 100644 --- a/ImportDialog.cpp +++ b/ImportDialog.cpp @@ -16,10 +16,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. *****************************************************************************/ -#include "ImportDialog.h" #include "ui_ImportDialog.h" +#include "SnapmaticPicture.h" #include "SidebarGenerator.h" #include "StandardPaths.h" +#include "ImportDialog.h" #include "imagecropper.h" #include "AppEnv.h" #include "config.h" @@ -39,8 +40,6 @@ #include <QRgb> // IMAGES VALUES -#define snapmaticResolutionW 960 -#define snapmaticResolutionH 536 #define snapmaticAvatarResolution 470 #define snapmaticAvatarPlacementW 145 #define snapmaticAvatarPlacementH 66 @@ -88,6 +87,14 @@ ImportDialog::ImportDialog(QString profileName, QWidget *parent) : ui->labBackgroundImage->setText(tr("Background Image:")); ui->cmdBackgroundWipe->setVisible(false); + // Snapmatic Resolution + snapmaticResolution = SnapmaticPicture::getSnapmaticResolution(); + ui->cbResolution->addItem("GTA V", snapmaticResolution); + ui->cbResolution->addItem("FiveM", QSize(1920, 1072)); + ui->cbResolution->addItem("1280x720", QSize(1280, 720)); + ui->cbResolution->addItem("1920x1080", QSize(1920, 1080)); + ui->cbResolution->addItem("2560x1440", QSize(2560, 1440)); + // Set Import Settings QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR); settings.beginGroup("Import"); @@ -116,13 +123,12 @@ ImportDialog::ImportDialog(QString profileName, QWidget *parent) : #endif // Options menu - optionsMenu = new QMenu(this); - optionsMenu->addAction(tr("&Import new Picture..."), this, SLOT(importNewPicture())); - optionsMenu->addAction(tr("&Crop Picture..."), this, SLOT(cropPicture())); - optionsMenu->addSeparator(); - optionsMenu->addAction(tr("&Load Settings..."), this, SLOT(loadImportSettings())); - optionsMenu->addAction(tr("&Save Settings..."), this, SLOT(saveImportSettings())); - ui->cmdOptions->setMenu(optionsMenu); + optionsMenu.addAction(tr("&Import new Picture..."), this, SLOT(importNewPicture())); + optionsMenu.addAction(tr("&Crop Picture..."), this, SLOT(cropPicture())); + optionsMenu.addSeparator(); + optionsMenu.addAction(tr("&Load Settings..."), this, SLOT(loadImportSettings())); + optionsMenu.addAction(tr("&Save Settings..."), this, SLOT(saveImportSettings())); + ui->cmdOptions->setMenu(&optionsMenu); setMaximumSize(sizeHint()); setMinimumSize(sizeHint()); @@ -131,97 +137,84 @@ ImportDialog::ImportDialog(QString profileName, QWidget *parent) : ImportDialog::~ImportDialog() { - delete optionsMenu; delete ui; } void ImportDialog::processImage() { - if (workImage.isNull()) return; + if (workImage.isNull()) + return; + QImage snapmaticImage = workImage; - QPixmap snapmaticPixmap(snapmaticResolutionW, snapmaticResolutionH); + QPixmap snapmaticPixmap(snapmaticResolution); snapmaticPixmap.fill(selectedColour); QPainter snapmaticPainter(&snapmaticPixmap); qreal screenRatioPR = AppEnv::screenRatioPR(); - if (!backImage.isNull()) - { - if (!ui->cbStretch->isChecked()) - { + if (!backImage.isNull()) { + if (!ui->cbStretch->isChecked()) { int diffWidth = 0; int diffHeight = 0; - if (backImage.width() != snapmaticResolutionW) - { - diffWidth = snapmaticResolutionW - backImage.width(); + if (backImage.width() != snapmaticResolution.width()) { + diffWidth = snapmaticResolution.width() - backImage.width(); diffWidth = diffWidth / 2; } - else if (backImage.height() != snapmaticResolutionH) - { - diffHeight = snapmaticResolutionH - backImage.height(); + else if (backImage.height() != snapmaticResolution.height()) { + diffHeight = snapmaticResolution.height() - backImage.height(); diffHeight = diffHeight / 2; } snapmaticPainter.drawImage(0 + diffWidth, 0 + diffHeight, backImage); } - else - { - snapmaticPainter.drawImage(0, 0, QImage(backImage).scaled(snapmaticResolutionW, snapmaticResolutionH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); + else { + snapmaticPainter.drawImage(0, 0, QImage(backImage).scaled(snapmaticResolution, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); } - if (ui->cbAvatar->isChecked() && ui->cbForceAvatarColour->isChecked()) - { + if (ui->cbAvatar->isChecked() && ui->cbForceAvatarColour->isChecked()) { snapmaticPainter.fillRect(snapmaticAvatarPlacementW, snapmaticAvatarPlacementH, snapmaticAvatarResolution, snapmaticAvatarResolution, selectedColour); } } - if (insideAvatarZone) - { + if (insideAvatarZone) { // Avatar mode int diffWidth = 0; int diffHeight = 0; - if (!ui->cbIgnore->isChecked()) - { + if (!ui->cbIgnore->isChecked()) { snapmaticImage = snapmaticImage.scaled(snapmaticAvatarResolution, snapmaticAvatarResolution, Qt::KeepAspectRatio, Qt::SmoothTransformation); - if (snapmaticImage.width() > snapmaticImage.height()) - { + if (snapmaticImage.width() > snapmaticImage.height()) { diffHeight = snapmaticAvatarResolution - snapmaticImage.height(); diffHeight = diffHeight / 2; } - else if (snapmaticImage.width() < snapmaticImage.height()) - { + else if (snapmaticImage.width() < snapmaticImage.height()) { diffWidth = snapmaticAvatarResolution - snapmaticImage.width(); diffWidth = diffWidth / 2; } } - else - { + else { snapmaticImage = snapmaticImage.scaled(snapmaticAvatarResolution, snapmaticAvatarResolution, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); } snapmaticPainter.drawImage(snapmaticAvatarPlacementW + diffWidth, snapmaticAvatarPlacementH + diffHeight, snapmaticImage); - if (ui->cbWatermark->isChecked()) { processWatermark(&snapmaticPainter); } + if (ui->cbWatermark->isChecked()) + processWatermark(&snapmaticPainter); imageTitle = tr("Custom Avatar", "Custom Avatar Description in SC, don't use Special Character!"); } - else - { + else { // Picture mode int diffWidth = 0; int diffHeight = 0; - if (!ui->cbIgnore->isChecked()) - { - snapmaticImage = snapmaticImage.scaled(snapmaticResolutionW, snapmaticResolutionH, Qt::KeepAspectRatio, Qt::SmoothTransformation); - if (snapmaticImage.width() != snapmaticResolutionW) - { - diffWidth = snapmaticResolutionW - snapmaticImage.width(); + if (!ui->cbIgnore->isChecked()) { + snapmaticImage = snapmaticImage.scaled(snapmaticResolution, Qt::KeepAspectRatio, Qt::SmoothTransformation); + if (snapmaticImage.width() != snapmaticResolution.width()) { + diffWidth = snapmaticResolution.width() - snapmaticImage.width(); diffWidth = diffWidth / 2; } - else if (snapmaticImage.height() != snapmaticResolutionH) - { - diffHeight = snapmaticResolutionH - snapmaticImage.height(); + else if (snapmaticImage.height() != snapmaticResolution.height()) { + diffHeight = snapmaticResolution.height() - snapmaticImage.height(); diffHeight = diffHeight / 2; } } - else - { - snapmaticImage = snapmaticImage.scaled(snapmaticResolutionW, snapmaticResolutionH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); + else { + snapmaticImage = snapmaticImage.scaled(snapmaticResolution, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); } snapmaticPainter.drawImage(0 + diffWidth, 0 + diffHeight, snapmaticImage); - if (ui->cbWatermark->isChecked()) { processWatermark(&snapmaticPainter); } + if (ui->cbWatermark->isChecked()) + processWatermark(&snapmaticPainter); imageTitle = tr("Custom Picture", "Custom Picture Description in SC, don't use Special Character!"); } snapmaticPainter.end(); @@ -232,6 +225,43 @@ void ImportDialog::processImage() ui->labPicture->setPixmap(snapmaticPixmap.scaled(snapmaticResolutionLW * screenRatioPR, snapmaticResolutionLH * screenRatioPR, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); } +void ImportDialog::reworkImage() +{ + workImage = QImage(); + if (origImage.width() == origImage.height()) { + if (ui->cbResolution->currentIndex() == 0) { + insideAvatarZone = true; + ui->cbAvatar->setChecked(true); + } + else { + insideAvatarZone = false; + ui->cbAvatar->setChecked(false); + } + if (origImage.height() > snapmaticResolution.height()) { + workImage = origImage.scaled(snapmaticResolution.height(), snapmaticResolution.height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation); + } + else { + workImage = origImage; + } + } + else if (origImage.width() > snapmaticResolution.width() && origImage.width() > origImage.height()) { + insideAvatarZone = false; + ui->cbAvatar->setChecked(false); + workImage = origImage.scaledToWidth(snapmaticResolution.width(), Qt::SmoothTransformation); + } + else if (origImage.height() > snapmaticResolution.height() && origImage.height() > origImage.width()) { + insideAvatarZone = false; + ui->cbAvatar->setChecked(false); + workImage = origImage.scaledToHeight(snapmaticResolution.height(), Qt::SmoothTransformation); + } + else { + insideAvatarZone = false; + ui->cbAvatar->setChecked(false); + workImage = origImage; + } + processImage(); +} + void ImportDialog::processWatermark(QPainter *snapmaticPainter) { bool blackWatermark = false; @@ -277,21 +307,21 @@ void ImportDialog::processSettings(QString settingsProfile, bool setDefault) { QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR); settings.beginGroup("Import"); - if (setDefault) - { + if (setDefault) { settings.setValue("Profile", settingsProfile); } - if (settingsProfile == "Default") - { + if (settingsProfile == "Default") { watermarkAvatar = true; watermarkPicture = false; selectedColour = QColor::fromRgb(0, 0, 0, 255); backImage = QImage(); ui->cbStretch->setChecked(false); ui->cbForceAvatarColour->setChecked(false); + ui->cbUnlimited->setChecked(false); + ui->cbImportAsIs->setChecked(false); + ui->cbResolution->setCurrentIndex(0); } - else - { + else { settings.beginGroup(settingsProfile); watermarkAvatar = settings.value("WatermarkAvatar", true).toBool(); watermarkPicture = settings.value("WatermarkPicture", false).toBool(); @@ -299,27 +329,31 @@ void ImportDialog::processSettings(QString settingsProfile, bool setDefault) selectedColour = qvariant_cast<QColor>(settings.value("SelectedColour", QColor::fromRgb(0, 0, 0, 255))); ui->cbStretch->setChecked(settings.value("BackgroundStretch", false).toBool()); ui->cbForceAvatarColour->setChecked(settings.value("ForceAvatarColour", false).toBool()); + ui->cbUnlimited->setChecked(settings.value("UnlimitedBuffer", false).toBool()); + ui->cbImportAsIs->setChecked(settings.value("ImportAsIs", false).toBool()); + const QVariant data = settings.value("Resolution", SnapmaticPicture::getSnapmaticResolution()); + if (data.type() == QVariant::Size) { + int index = ui->cbResolution->findData(data); + if (index != -1) { + ui->cbResolution->setCurrentIndex(index); + } + } settings.endGroup(); } - if (!workImage.isNull()) - { - if (ui->cbAvatar->isChecked()) - { + if (!workImage.isNull()) { + if (ui->cbAvatar->isChecked()) { ui->cbWatermark->setChecked(watermarkAvatar); } - else - { + else { ui->cbWatermark->setChecked(watermarkPicture); } } ui->labColour->setText(tr("Background Colour: <span style=\"color: %1\">%1</span>").arg(selectedColour.name())); - if (!backImage.isNull()) - { + if (!backImage.isNull()) { ui->labBackgroundImage->setText(tr("Background Image: %1").arg(tr("Storage", "Background Image: Storage"))); ui->cmdBackgroundWipe->setVisible(true); } - else - { + else { ui->labBackgroundImage->setText(tr("Background Image:")); ui->cmdBackgroundWipe->setVisible(false); } @@ -337,6 +371,15 @@ void ImportDialog::saveSettings(QString settingsProfile) settings.setValue("SelectedColour", selectedColour); settings.setValue("BackgroundStretch", ui->cbStretch->isChecked()); settings.setValue("ForceAvatarColour", ui->cbForceAvatarColour->isChecked()); + const QVariant data = ui->cbResolution->currentData(); + if (data.type() == QVariant::Size) { + settings.setValue("Resolution", ui->cbResolution->currentData()); + } + else { + settings.setValue("Resolution", SnapmaticPicture::getSnapmaticResolution()); + } + settings.setValue("UnlimitedBuffer", ui->cbUnlimited->isChecked()); + settings.setValue("ImportAsIs", ui->cbImportAsIs->isChecked()); settings.endGroup(); settings.setValue("Profile", settingsProfile); settings.endGroup(); @@ -488,11 +531,11 @@ void ImportDialog::loadImportSettings() bool ok; QStringList profileList; profileList << tr("Default", "Default as Default Profile") - << tr("Profile %1", "Profile %1 as Profile 1").arg("1") - << tr("Profile %1", "Profile %1 as Profile 1").arg("2") - << tr("Profile %1", "Profile %1 as Profile 1").arg("3") - << tr("Profile %1", "Profile %1 as Profile 1").arg("4") - << tr("Profile %1", "Profile %1 as Profile 1").arg("5"); + << tr("Profile %1", "Profile %1 as Profile 1").arg("1") + << tr("Profile %1", "Profile %1 as Profile 1").arg("2") + << tr("Profile %1", "Profile %1 as Profile 1").arg("3") + << tr("Profile %1", "Profile %1 as Profile 1").arg("4") + << tr("Profile %1", "Profile %1 as Profile 1").arg("5"); QString sProfile = QInputDialog::getItem(this, tr("Load Settings..."), tr("Please select your settings profile"), profileList, 0, false, &ok, windowFlags()); if (ok) { @@ -536,10 +579,10 @@ void ImportDialog::saveImportSettings() bool ok; QStringList profileList; profileList << tr("Profile %1", "Profile %1 as Profile 1").arg("1") - << tr("Profile %1", "Profile %1 as Profile 1").arg("2") - << tr("Profile %1", "Profile %1 as Profile 1").arg("3") - << tr("Profile %1", "Profile %1 as Profile 1").arg("4") - << tr("Profile %1", "Profile %1 as Profile 1").arg("5"); + << tr("Profile %1", "Profile %1 as Profile 1").arg("2") + << tr("Profile %1", "Profile %1 as Profile 1").arg("3") + << tr("Profile %1", "Profile %1 as Profile 1").arg("4") + << tr("Profile %1", "Profile %1 as Profile 1").arg("5"); QString sProfile = QInputDialog::getItem(this, tr("Save Settings..."), tr("Please select your settings profile"), profileList, 0, false, &ok, windowFlags()); if (ok) { @@ -570,44 +613,49 @@ void ImportDialog::saveImportSettings() QImage ImportDialog::image() { - return newImage; + if (ui->cbImportAsIs->isChecked()) { + return origImage; + } + else { + return newImage; + } } void ImportDialog::setImage(QImage *image_) { origImage = *image_; workImage = QImage(); - if (image_->width() == image_->height()) - { - insideAvatarZone = true; - ui->cbAvatar->setChecked(true); - if (image_->height() > snapmaticResolutionH) - { - workImage = image_->scaled(snapmaticResolutionH, snapmaticResolutionH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); + if (image_->width() == image_->height()) { + if (ui->cbResolution->currentIndex() == 0) { + insideAvatarZone = true; + ui->cbAvatar->setChecked(true); + } + else { + insideAvatarZone = false; + ui->cbAvatar->setChecked(false); + } + if (image_->height() > snapmaticResolution.height()) { + workImage = image_->scaled(snapmaticResolution.height(), snapmaticResolution.height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation); delete image_; } - else - { + else { workImage = *image_; delete image_; } } - else if (image_->width() > snapmaticResolutionW && image_->width() > image_->height()) - { + else if (image_->width() > snapmaticResolution.width() && image_->width() > image_->height()) { insideAvatarZone = false; ui->cbAvatar->setChecked(false); - workImage = image_->scaledToWidth(snapmaticResolutionW, Qt::SmoothTransformation); + workImage = image_->scaledToWidth(snapmaticResolution.width(), Qt::SmoothTransformation); delete image_; } - else if (image_->height() > snapmaticResolutionH && image_->height() > image_->width()) - { + else if (image_->height() > snapmaticResolution.height() && image_->height() > image_->width()) { insideAvatarZone = false; ui->cbAvatar->setChecked(false); - workImage = image_->scaledToHeight(snapmaticResolutionH, Qt::SmoothTransformation); + workImage = image_->scaledToHeight(snapmaticResolution.height(), Qt::SmoothTransformation); delete image_; } - else - { + else { insideAvatarZone = false; ui->cbAvatar->setChecked(false); workImage = *image_; @@ -619,18 +667,15 @@ void ImportDialog::setImage(QImage *image_) void ImportDialog::lockSettings(bool lock) { - ui->cbAvatar->setDisabled(lock); - ui->cbForceAvatarColour->setDisabled(lock); - ui->cbIgnore->setDisabled(lock); - ui->cbStretch->setDisabled(lock); - ui->cbWatermark->setDisabled(lock); - ui->cmdBackgroundChange->setDisabled(lock); - ui->cmdBackgroundWipe->setDisabled(lock); - ui->cmdColourChange->setDisabled(lock); - ui->labBackgroundImage->setDisabled(lock); - ui->labColour->setDisabled(lock); - ui->gbSettings->setDisabled(lock); - ui->gbBackground->setDisabled(lock); + ui->gbAdvanced->setDisabled(lock); + if (ui->cbImportAsIs->isChecked()) { + ui->gbBackground->setDisabled(true); + ui->gbSettings->setDisabled(true); + } + else { + ui->gbBackground->setDisabled(lock); + ui->gbSettings->setDisabled(lock); + } ui->cmdOK->setDisabled(lock); settingsLocked = lock; } @@ -652,6 +697,11 @@ bool ImportDialog::isImportAgreed() return importAgreed; } +bool ImportDialog::isUnlimitedBuffer() +{ + return ui->cbUnlimited->isChecked(); +} + bool ImportDialog::areSettingsLocked() { return settingsLocked; @@ -670,10 +720,11 @@ void ImportDialog::on_cbIgnore_toggled(bool checked) void ImportDialog::on_cbAvatar_toggled(bool checked) { - if (!workImage.isNull() && workImage.width() == workImage.height() && !checked) - { - if (QMessageBox::No == QMessageBox::warning(this, tr("Snapmatic Avatar Zone"), tr("Are you sure to use a square image outside of the Avatar Zone?\nWhen you want to use it as Avatar the image will be detached!"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No)) - { + if (ui->cbResolution->currentIndex() != 0) + return; + + if (!workImage.isNull() && workImage.width() == workImage.height() && !checked) { + if (QMessageBox::No == QMessageBox::warning(this, tr("Snapmatic Avatar Zone"), tr("Are you sure to use a square image outside of the Avatar Zone?\nWhen you want to use it as Avatar the image will be detached!"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No)) { ui->cbAvatar->setChecked(true); insideAvatarZone = true; return; @@ -681,12 +732,10 @@ void ImportDialog::on_cbAvatar_toggled(bool checked) } insideAvatarZone = ui->cbAvatar->isChecked(); watermarkBlock = true; - if (insideAvatarZone) - { + if (insideAvatarZone) { ui->cbWatermark->setChecked(watermarkAvatar); } - else - { + else { ui->cbWatermark->setChecked(watermarkPicture); } watermarkBlock = false; @@ -788,7 +837,7 @@ fileDialogPreOpen: QMessageBox::warning(this, QApplication::translate("ProfileInterface", "Import"), QApplication::translate("ProfileInterface", "Can't import %1 because file can't be parsed properly").arg("\""+selectedFileName+"\"")); goto fileDialogPreOpen; } - backImage = importImage.scaled(snapmaticResolutionW, snapmaticResolutionH, Qt::KeepAspectRatio, Qt::SmoothTransformation); + backImage = importImage.scaled(snapmaticResolution, Qt::KeepAspectRatio, Qt::SmoothTransformation); backgroundPath = selectedFile; ui->labBackgroundImage->setText(tr("Background Image: %1").arg(tr("File", "Background Image: File"))); ui->cmdBackgroundWipe->setVisible(true); @@ -826,14 +875,50 @@ void ImportDialog::on_cbWatermark_toggled(bool checked) { if (!watermarkBlock) { - if (insideAvatarZone) - { + if (insideAvatarZone) { watermarkAvatar = checked; } - else - { + else { watermarkPicture = checked; } processImage(); } } + +void ImportDialog::on_cbImportAsIs_toggled(bool checked) +{ + ui->cbResolution->setDisabled(checked); + ui->labResolution->setDisabled(checked); + ui->gbBackground->setDisabled(checked); + ui->gbSettings->setDisabled(checked); +} + +void ImportDialog::on_cbResolution_currentIndexChanged(int index) +{ + Q_UNUSED(index) + const QVariant data = ui->cbResolution->currentData(); + if (data.type() == QVariant::Size) { + const QSize dataSize = data.toSize(); + if (dataSize == SnapmaticPicture::getSnapmaticResolution()) { + ui->cbAvatar->setEnabled(true); + snapmaticResolution = dataSize; + reworkImage(); + } + else { + if (!workImage.isNull() && workImage.width() == workImage.height() && ui->cbAvatar->isChecked()) { + if (QMessageBox::No == QMessageBox::warning(this, tr("Snapmatic Avatar Zone"), tr("Are you sure to use a square image outside of the Avatar Zone?\nWhen you want to use it as Avatar the image will be detached!"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No)) { + ui->cbResolution->setCurrentIndex(0); + ui->cbAvatar->setChecked(true); + insideAvatarZone = true; + return; + } + } + ui->cbAvatar->setChecked(false); + ui->cbAvatar->setDisabled(true); + insideAvatarZone = false; + ui->cbWatermark->setChecked(watermarkPicture); + snapmaticResolution = dataSize; + reworkImage(); + } + } +} diff --git a/ImportDialog.h b/ImportDialog.h index 28ce21e..562e34b 100644 --- a/ImportDialog.h +++ b/ImportDialog.h @@ -39,10 +39,12 @@ public: void lockSettings(bool lock); void enableOverwriteMode(); bool isImportAgreed(); + bool isUnlimitedBuffer(); bool areSettingsLocked(); private slots: void processImage(); + void reworkImage(); void cropPicture(); void importNewPicture(); void loadImportSettings(); @@ -58,6 +60,8 @@ private slots: void on_cbStretch_toggled(bool checked); void on_cbForceAvatarColour_toggled(bool checked); void on_cbWatermark_toggled(bool checked); + void on_cbImportAsIs_toggled(bool checked); + void on_cbResolution_currentIndexChanged(int index); private: QString profileName; @@ -70,7 +74,8 @@ private: QImage origImage; QImage newImage; QColor selectedColour; - QMenu *optionsMenu; + QMenu optionsMenu; + QSize snapmaticResolution; bool insideAvatarZone; bool watermarkPicture; bool watermarkAvatar; diff --git a/ImportDialog.ui b/ImportDialog.ui index c62dcd7..601e98b 100644 --- a/ImportDialog.ui +++ b/ImportDialog.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>516</width> - <height>512</height> + <height>677</height> </rect> </property> <property name="minimumSize"> @@ -297,6 +297,63 @@ </property> </spacer> </item> + <item> + <widget class="QGroupBox" name="gbAdvanced"> + <property name="title"> + <string>Advanced</string> + </property> + <layout class="QVBoxLayout" name="vlAdvanced"> + <item> + <layout class="QHBoxLayout" name="hlResolution"> + <item> + <widget class="QLabel" name="labResolution"> + <property name="text"> + <string>Resolution:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="cbResolution"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Snapmatic resolution</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="hlExpert"> + <item> + <widget class="QCheckBox" name="cbUnlimited"> + <property name="toolTip"> + <string>Avoid compression and expand buffer instead, improves picture quality, but may break Snapmatic</string> + </property> + <property name="text"> + <string>Unlimited Buffer</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="cbImportAsIs"> + <property name="toolTip"> + <string>Import as-is, don't change the picture at all, guarantee to break Snapmatic unless you know what you doing</string> + </property> + <property name="text"> + <string>Import as-is</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + </item> <item> <layout class="QHBoxLayout" name="hlButtons"> <item> diff --git a/ProfileInterface.cpp b/ProfileInterface.cpp index 3e52093..4070fa8 100644 --- a/ProfileInterface.cpp +++ b/ProfileInterface.cpp @@ -1,6 +1,6 @@ /***************************************************************************** * gta5view Grand Theft Auto V Profile Viewer -* Copyright (C) 2016-2019 Syping +* Copyright (C) 2016-2020 Syping * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -805,7 +805,7 @@ bool ProfileInterface::importFile(QString selectedFile, QDateTime importDateTime importDialog->exec(); if (importDialog->isImportAgreed()) { - if (picture->setImage(importDialog->image())) + if (picture->setImage(importDialog->image(), importDialog->isUnlimitedBuffer())) { SnapmaticProperties spJson = picture->getSnapmaticProperties(); spJson.uid = getRandomUid(); @@ -1058,7 +1058,7 @@ bool ProfileInterface::importImage(QImage *snapmaticImage, QDateTime importDateT importDialog->exec(); if (importDialog->isImportAgreed()) { - if (picture->setImage(importDialog->image())) + if (picture->setImage(importDialog->image(), importDialog->isUnlimitedBuffer())) { SnapmaticProperties spJson = picture->getSnapmaticProperties(); spJson.uid = getRandomUid(); diff --git a/res/gta5sync.ts b/res/gta5sync.ts index 5ba25e5..afdcce6 100644 --- a/res/gta5sync.ts +++ b/res/gta5sync.ts @@ -166,27 +166,27 @@ Pictures and Savegames</source> <context> <name>ImageEditorDialog</name> <message> - <location filename="../ImportDialog.cpp" line="640"/> + <location filename="../ImportDialog.cpp" line="685"/> <source>Overwrite Image...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="642"/> + <location filename="../ImportDialog.cpp" line="687"/> <source>Apply changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="641"/> + <location filename="../ImportDialog.cpp" line="686"/> <source>&Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="644"/> + <location filename="../ImportDialog.cpp" line="689"/> <source>Discard changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="643"/> + <location filename="../ImportDialog.cpp" line="688"/> <source>&Close</source> <translation type="unfinished"></translation> </message> @@ -246,9 +246,9 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="150"/> - <location filename="../ImportDialog.cpp" line="87"/> - <location filename="../ImportDialog.cpp" line="315"/> - <location filename="../ImportDialog.cpp" line="728"/> + <location filename="../ImportDialog.cpp" line="86"/> + <location filename="../ImportDialog.cpp" line="351"/> + <location filename="../ImportDialog.cpp" line="777"/> <source>Background Colour: <span style="color: %1">%1</span></source> <translation type="unfinished"></translation> </message> @@ -265,9 +265,9 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="203"/> - <location filename="../ImportDialog.cpp" line="88"/> - <location filename="../ImportDialog.cpp" line="323"/> - <location filename="../ImportDialog.cpp" line="808"/> + <location filename="../ImportDialog.cpp" line="87"/> + <location filename="../ImportDialog.cpp" line="357"/> + <location filename="../ImportDialog.cpp" line="857"/> <source>Background Image:</source> <translation type="unfinished"></translation> </message> @@ -292,170 +292,207 @@ Pictures and Savegames</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.ui" line="305"/> + <location filename="../ImportDialog.ui" line="303"/> + <source>Advanced</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="311"/> + <source>Resolution:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="324"/> + <source>Snapmatic resolution</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="335"/> + <source>Avoid compression and expand buffer instead, improves picture quality, but may break Snapmatic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="338"/> + <source>Unlimited Buffer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="345"/> + <source>Import as-is, don't change the picture at all, guarantee to break Snapmatic unless you know what you doing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="348"/> + <source>Import as-is</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="362"/> <source>Import options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.ui" line="308"/> + <location filename="../ImportDialog.ui" line="365"/> <source>&Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.ui" line="337"/> + <location filename="../ImportDialog.ui" line="394"/> <source>Import picture</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.ui" line="340"/> + <location filename="../ImportDialog.ui" line="397"/> <source>&OK</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.ui" line="353"/> + <location filename="../ImportDialog.ui" line="410"/> <source>Discard picture</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.ui" line="356"/> + <location filename="../ImportDialog.ui" line="413"/> <source>&Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="120"/> + <location filename="../ImportDialog.cpp" line="126"/> <source>&Import new Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="121"/> + <location filename="../ImportDialog.cpp" line="127"/> <source>&Crop Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="123"/> + <location filename="../ImportDialog.cpp" line="129"/> <source>&Load Settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="124"/> + <location filename="../ImportDialog.cpp" line="130"/> <source>&Save Settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="198"/> + <location filename="../ImportDialog.cpp" line="195"/> <location filename="../ProfileInterface.cpp" line="721"/> <source>Custom Avatar</source> <comment>Custom Avatar Description in SC, don't use Special Character!</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="225"/> + <location filename="../ImportDialog.cpp" line="218"/> <location filename="../ProfileInterface.cpp" line="740"/> <source>Custom Picture</source> <comment>Custom Picture Description in SC, don't use Special Character!</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="318"/> + <location filename="../ImportDialog.cpp" line="353"/> <source>Storage</source> <comment>Background Image: Storage</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="355"/> + <location filename="../ImportDialog.cpp" line="398"/> <source>Crop Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="397"/> + <location filename="../ImportDialog.cpp" line="440"/> <source>&Crop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="398"/> + <location filename="../ImportDialog.cpp" line="441"/> <source>Crop Picture</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="485"/> - <location filename="../ImportDialog.cpp" line="533"/> + <location filename="../ImportDialog.cpp" line="528"/> + <location filename="../ImportDialog.cpp" line="576"/> <source>Please import a new picture first</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="490"/> - <location filename="../ImportDialog.cpp" line="500"/> + <location filename="../ImportDialog.cpp" line="533"/> + <location filename="../ImportDialog.cpp" line="543"/> <source>Default</source> <comment>Default as Default Profile</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="491"/> - <location filename="../ImportDialog.cpp" line="492"/> - <location filename="../ImportDialog.cpp" line="493"/> - <location filename="../ImportDialog.cpp" line="494"/> - <location filename="../ImportDialog.cpp" line="495"/> - <location filename="../ImportDialog.cpp" line="504"/> - <location filename="../ImportDialog.cpp" line="508"/> - <location filename="../ImportDialog.cpp" line="512"/> - <location filename="../ImportDialog.cpp" line="516"/> - <location filename="../ImportDialog.cpp" line="520"/> + <location filename="../ImportDialog.cpp" line="534"/> + <location filename="../ImportDialog.cpp" line="535"/> + <location filename="../ImportDialog.cpp" line="536"/> + <location filename="../ImportDialog.cpp" line="537"/> <location filename="../ImportDialog.cpp" line="538"/> - <location filename="../ImportDialog.cpp" line="539"/> - <location filename="../ImportDialog.cpp" line="540"/> - <location filename="../ImportDialog.cpp" line="541"/> - <location filename="../ImportDialog.cpp" line="542"/> <location filename="../ImportDialog.cpp" line="547"/> <location filename="../ImportDialog.cpp" line="551"/> <location filename="../ImportDialog.cpp" line="555"/> <location filename="../ImportDialog.cpp" line="559"/> <location filename="../ImportDialog.cpp" line="563"/> + <location filename="../ImportDialog.cpp" line="581"/> + <location filename="../ImportDialog.cpp" line="582"/> + <location filename="../ImportDialog.cpp" line="583"/> + <location filename="../ImportDialog.cpp" line="584"/> + <location filename="../ImportDialog.cpp" line="585"/> + <location filename="../ImportDialog.cpp" line="590"/> + <location filename="../ImportDialog.cpp" line="594"/> + <location filename="../ImportDialog.cpp" line="598"/> + <location filename="../ImportDialog.cpp" line="602"/> + <location filename="../ImportDialog.cpp" line="606"/> <source>Profile %1</source> <comment>Profile %1 as Profile 1</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="485"/> - <location filename="../ImportDialog.cpp" line="496"/> + <location filename="../ImportDialog.cpp" line="528"/> + <location filename="../ImportDialog.cpp" line="539"/> <source>Load Settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="533"/> - <location filename="../ImportDialog.cpp" line="543"/> + <location filename="../ImportDialog.cpp" line="576"/> + <location filename="../ImportDialog.cpp" line="586"/> <source>Save Settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="675"/> + <location filename="../ImportDialog.cpp" line="727"/> + <location filename="../ImportDialog.cpp" line="909"/> <source>Snapmatic Avatar Zone</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="675"/> + <location filename="../ImportDialog.cpp" line="727"/> + <location filename="../ImportDialog.cpp" line="909"/> <source>Are you sure to use a square image outside of the Avatar Zone? When you want to use it as Avatar the image will be detached!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="724"/> + <location filename="../ImportDialog.cpp" line="773"/> <source>Select Colour...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="318"/> - <location filename="../ImportDialog.cpp" line="793"/> + <location filename="../ImportDialog.cpp" line="353"/> + <location filename="../ImportDialog.cpp" line="842"/> <source>Background Image: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="496"/> - <location filename="../ImportDialog.cpp" line="543"/> + <location filename="../ImportDialog.cpp" line="539"/> + <location filename="../ImportDialog.cpp" line="586"/> <source>Please select your settings profile</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="793"/> + <location filename="../ImportDialog.cpp" line="842"/> <source>File</source> <comment>Background Image: File</comment> <translation type="unfinished"></translation> @@ -1272,8 +1309,8 @@ Press 1 for Default View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="426"/> - <location filename="../ImportDialog.cpp" line="747"/> + <location filename="../ImportDialog.cpp" line="469"/> + <location filename="../ImportDialog.cpp" line="796"/> <location filename="../ProfileInterface.cpp" line="496"/> <location filename="../ProfileInterface.cpp" line="497"/> <location filename="../ProfileInterface.cpp" line="541"/> @@ -1295,40 +1332,40 @@ Press 1 for Default View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="427"/> - <location filename="../ImportDialog.cpp" line="458"/> - <location filename="../ImportDialog.cpp" line="467"/> - <location filename="../ImportDialog.cpp" line="748"/> - <location filename="../ImportDialog.cpp" line="779"/> - <location filename="../ImportDialog.cpp" line="788"/> + <location filename="../ImportDialog.cpp" line="470"/> + <location filename="../ImportDialog.cpp" line="501"/> + <location filename="../ImportDialog.cpp" line="510"/> + <location filename="../ImportDialog.cpp" line="797"/> + <location filename="../ImportDialog.cpp" line="828"/> + <location filename="../ImportDialog.cpp" line="837"/> <source>Import</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="437"/> - <location filename="../ImportDialog.cpp" line="758"/> + <location filename="../ImportDialog.cpp" line="480"/> + <location filename="../ImportDialog.cpp" line="807"/> <location filename="../ProfileInterface.cpp" line="516"/> <source>All image files (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="438"/> - <location filename="../ImportDialog.cpp" line="759"/> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="808"/> <location filename="../ProfileInterface.cpp" line="517"/> <location filename="../UserInterface.cpp" line="477"/> <source>All files (**)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="458"/> - <location filename="../ImportDialog.cpp" line="779"/> + <location filename="../ImportDialog.cpp" line="501"/> + <location filename="../ImportDialog.cpp" line="828"/> <location filename="../ProfileInterface.cpp" line="786"/> <source>Can't import %1 because file can't be open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="467"/> - <location filename="../ImportDialog.cpp" line="788"/> + <location filename="../ImportDialog.cpp" line="510"/> + <location filename="../ImportDialog.cpp" line="837"/> <location filename="../ProfileInterface.cpp" line="796"/> <source>Can't import %1 because file can't be parsed properly</source> <translation type="unfinished"></translation> @@ -2008,24 +2045,24 @@ Press 1 for Default View</source> <name>SnapmaticPicture</name> <message> <location filename="../JsonEditorDialog.cpp" line="177"/> - <location filename="../SnapmaticPicture.cpp" line="354"/> + <location filename="../SnapmaticPicture.cpp" line="353"/> <source>JSON is incomplete and malformed</source> <translation type="unfinished"></translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="181"/> - <location filename="../SnapmaticPicture.cpp" line="358"/> + <location filename="../SnapmaticPicture.cpp" line="357"/> <source>JSON is incomplete</source> <translation type="unfinished"></translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="185"/> - <location filename="../SnapmaticPicture.cpp" line="362"/> + <location filename="../SnapmaticPicture.cpp" line="361"/> <source>JSON is malformed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="159"/> + <location filename="../SnapmaticPicture.cpp" line="154"/> <source>PHOTO - %1</source> <translation type="unfinished"></translation> </message> @@ -2035,37 +2072,37 @@ Press 1 for Default View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="330"/> + <location filename="../SnapmaticPicture.cpp" line="329"/> <source>header not exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="334"/> + <location filename="../SnapmaticPicture.cpp" line="333"/> <source>header is malformed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="338"/> + <location filename="../SnapmaticPicture.cpp" line="337"/> <source>picture not exists (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="342"/> + <location filename="../SnapmaticPicture.cpp" line="341"/> <source>JSON not exists (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="346"/> + <location filename="../SnapmaticPicture.cpp" line="345"/> <source>title not exists (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="350"/> + <location filename="../SnapmaticPicture.cpp" line="349"/> <source>description not exists (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="364"/> + <location filename="../SnapmaticPicture.cpp" line="363"/> <source>reading file %1 because of %2</source> <comment>Example for %2: JSON is malformed error</comment> <translation type="unfinished"></translation> diff --git a/res/gta5sync_de.qm b/res/gta5sync_de.qm index 00627a74394e41a5b363cdc31fce4035517adae1..41f12bd5ada456175034a1fd56959d75c974bdc7 100644 GIT binary patch delta 4321 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 delta 3384 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 LZUt(m%!K~~1PS5& diff --git a/res/gta5sync_de.ts b/res/gta5sync_de.ts index fb2996f..3780483 100644 --- a/res/gta5sync_de.ts +++ b/res/gta5sync_de.ts @@ -184,27 +184,27 @@ Snapmatic Bilder und Spielständen</translation> <translation>Snapmatic Bild Editor</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="640"/> + <location filename="../ImportDialog.cpp" line="685"/> <source>Overwrite Image...</source> <translation>Bild überschreiben...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="642"/> + <location filename="../ImportDialog.cpp" line="687"/> <source>Apply changes</source> <translation>Änderungen übernehmen</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="641"/> + <location filename="../ImportDialog.cpp" line="686"/> <source>&Overwrite</source> <translation>&Überschreiben</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="644"/> + <location filename="../ImportDialog.cpp" line="689"/> <source>Discard changes</source> <translation>Änderungen verwerfen</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="643"/> + <location filename="../ImportDialog.cpp" line="688"/> <source>&Close</source> <translation>S&chließen</translation> </message> @@ -256,9 +256,9 @@ Snapmatic Bilder und Spielständen</translation> </message> <message> <location filename="../ImportDialog.ui" line="150"/> - <location filename="../ImportDialog.cpp" line="87"/> - <location filename="../ImportDialog.cpp" line="315"/> - <location filename="../ImportDialog.cpp" line="728"/> + <location filename="../ImportDialog.cpp" line="86"/> + <location filename="../ImportDialog.cpp" line="351"/> + <location filename="../ImportDialog.cpp" line="777"/> <source>Background Colour: <span style="color: %1">%1</span></source> <translation>Hintergrundfarbe: <span style="color: %1">%1</span></translation> </message> @@ -284,8 +284,13 @@ Snapmatic Bilder und Spielständen</translation> <translation>Hintergrundbild entfernen</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="318"/> - <location filename="../ImportDialog.cpp" line="793"/> + <location filename="../ImportDialog.ui" line="345"/> + <source>Import as-is, don't change the picture at all, guarantee to break Snapmatic unless you know what you doing</source> + <translation>Importiere das Bild ohne Veränderungen, Snapmatic wird garantiert beschädigt wenn du nicht weißt was du tust</translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="353"/> + <location filename="../ImportDialog.cpp" line="842"/> <source>Background Image: %1</source> <translation>Hintergrundbild: %1</translation> </message> @@ -300,173 +305,205 @@ Snapmatic Bilder und Spielständen</translation> <translation>Erzwinge Farbe in Avatar Zone</translation> </message> <message> - <location filename="../ImportDialog.ui" line="305"/> + <location filename="../ImportDialog.ui" line="303"/> + <source>Advanced</source> + <translation>Erweitert</translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="311"/> + <source>Resolution:</source> + <translation>Auflösung:</translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="324"/> + <source>Snapmatic resolution</source> + <translation>Snapmatic Auflösung</translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="335"/> + <source>Avoid compression and expand buffer instead, improves picture quality, but may break Snapmatic</source> + <translation>Vermeide Komprimierung und vergrößere Buffer stattdessen, verbessert Bild Qualität, aber könnte Snapmatic beschädigen</translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="338"/> + <source>Unlimited Buffer</source> + <translation>Unlimitierter Buffer</translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="348"/> + <source>Import as-is</source> + <translation>Importiere ohne Änderungen</translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="362"/> <source>Import options</source> <translation>Import Optionen</translation> </message> <message> - <location filename="../ImportDialog.ui" line="308"/> + <location filename="../ImportDialog.ui" line="365"/> <source>&Options</source> <translation>&Optionen</translation> </message> <message> - <location filename="../ImportDialog.ui" line="337"/> + <location filename="../ImportDialog.ui" line="394"/> <source>Import picture</source> <translation>Bild importieren</translation> </message> <message> - <location filename="../ImportDialog.ui" line="340"/> + <location filename="../ImportDialog.ui" line="397"/> <source>&OK</source> <translation>&OK</translation> </message> <message> - <location filename="../ImportDialog.ui" line="353"/> + <location filename="../ImportDialog.ui" line="410"/> <source>Discard picture</source> <translation>Bild verwerfen</translation> </message> <message> - <location filename="../ImportDialog.ui" line="356"/> + <location filename="../ImportDialog.ui" line="413"/> <source>&Cancel</source> <translation>Abbre&chen</translation> </message> <message> <location filename="../ImportDialog.ui" line="203"/> - <location filename="../ImportDialog.cpp" line="88"/> - <location filename="../ImportDialog.cpp" line="323"/> - <location filename="../ImportDialog.cpp" line="808"/> + <location filename="../ImportDialog.cpp" line="87"/> + <location filename="../ImportDialog.cpp" line="357"/> + <location filename="../ImportDialog.cpp" line="857"/> <source>Background Image:</source> <translation>Hintergrundbild:</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="120"/> + <location filename="../ImportDialog.cpp" line="126"/> <source>&Import new Picture...</source> <translation>Neues Bild &importieren...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="121"/> + <location filename="../ImportDialog.cpp" line="127"/> <source>&Crop Picture...</source> <translation>Bild zu&schneiden...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="123"/> + <location filename="../ImportDialog.cpp" line="129"/> <source>&Load Settings...</source> <translation>Einstellungen &laden...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="124"/> + <location filename="../ImportDialog.cpp" line="130"/> <source>&Save Settings...</source> <translation>Einstellungen &speichern...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="198"/> + <location filename="../ImportDialog.cpp" line="195"/> <location filename="../ProfileInterface.cpp" line="721"/> <source>Custom Avatar</source> <comment>Custom Avatar Description in SC, don't use Special Character!</comment> <translation>Eigener Avatar</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="225"/> + <location filename="../ImportDialog.cpp" line="218"/> <location filename="../ProfileInterface.cpp" line="740"/> <source>Custom Picture</source> <comment>Custom Picture Description in SC, don't use Special Character!</comment> <translation>Eigenes Bild</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="318"/> + <location filename="../ImportDialog.cpp" line="353"/> <source>Storage</source> <comment>Background Image: Storage</comment> <translation>Speicher</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="355"/> + <location filename="../ImportDialog.cpp" line="398"/> <source>Crop Picture...</source> <translation>Bild zuschneiden...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="397"/> + <location filename="../ImportDialog.cpp" line="440"/> <source>&Crop</source> <translation>Zu&schneiden</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="398"/> + <location filename="../ImportDialog.cpp" line="441"/> <source>Crop Picture</source> <translation>Bild zuschneiden</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="485"/> - <location filename="../ImportDialog.cpp" line="533"/> + <location filename="../ImportDialog.cpp" line="528"/> + <location filename="../ImportDialog.cpp" line="576"/> <source>Please import a new picture first</source> <translation>Bitte importiere ein neues Bild zuerst</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="490"/> - <location filename="../ImportDialog.cpp" line="500"/> + <location filename="../ImportDialog.cpp" line="533"/> + <location filename="../ImportDialog.cpp" line="543"/> <source>Default</source> <comment>Default as Default Profile</comment> <translation>Standard</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="491"/> - <location filename="../ImportDialog.cpp" line="492"/> - <location filename="../ImportDialog.cpp" line="493"/> - <location filename="../ImportDialog.cpp" line="494"/> - <location filename="../ImportDialog.cpp" line="495"/> - <location filename="../ImportDialog.cpp" line="504"/> - <location filename="../ImportDialog.cpp" line="508"/> - <location filename="../ImportDialog.cpp" line="512"/> - <location filename="../ImportDialog.cpp" line="516"/> - <location filename="../ImportDialog.cpp" line="520"/> + <location filename="../ImportDialog.cpp" line="534"/> + <location filename="../ImportDialog.cpp" line="535"/> + <location filename="../ImportDialog.cpp" line="536"/> + <location filename="../ImportDialog.cpp" line="537"/> <location filename="../ImportDialog.cpp" line="538"/> - <location filename="../ImportDialog.cpp" line="539"/> - <location filename="../ImportDialog.cpp" line="540"/> - <location filename="../ImportDialog.cpp" line="541"/> - <location filename="../ImportDialog.cpp" line="542"/> <location filename="../ImportDialog.cpp" line="547"/> <location filename="../ImportDialog.cpp" line="551"/> <location filename="../ImportDialog.cpp" line="555"/> <location filename="../ImportDialog.cpp" line="559"/> <location filename="../ImportDialog.cpp" line="563"/> + <location filename="../ImportDialog.cpp" line="581"/> + <location filename="../ImportDialog.cpp" line="582"/> + <location filename="../ImportDialog.cpp" line="583"/> + <location filename="../ImportDialog.cpp" line="584"/> + <location filename="../ImportDialog.cpp" line="585"/> + <location filename="../ImportDialog.cpp" line="590"/> + <location filename="../ImportDialog.cpp" line="594"/> + <location filename="../ImportDialog.cpp" line="598"/> + <location filename="../ImportDialog.cpp" line="602"/> + <location filename="../ImportDialog.cpp" line="606"/> <source>Profile %1</source> <comment>Profile %1 as Profile 1</comment> <translation>Profil %1</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="485"/> - <location filename="../ImportDialog.cpp" line="496"/> + <location filename="../ImportDialog.cpp" line="528"/> + <location filename="../ImportDialog.cpp" line="539"/> <source>Load Settings...</source> <translation>Einstellungen laden...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="496"/> - <location filename="../ImportDialog.cpp" line="543"/> + <location filename="../ImportDialog.cpp" line="539"/> + <location filename="../ImportDialog.cpp" line="586"/> <source>Please select your settings profile</source> <translation>Bitte wähle dein Einstellungsprofil aus</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="533"/> - <location filename="../ImportDialog.cpp" line="543"/> + <location filename="../ImportDialog.cpp" line="576"/> + <location filename="../ImportDialog.cpp" line="586"/> <source>Save Settings...</source> <translation>Einstellungen speichern...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="675"/> + <location filename="../ImportDialog.cpp" line="727"/> + <location filename="../ImportDialog.cpp" line="909"/> <source>Are you sure to use a square image outside of the Avatar Zone? When you want to use it as Avatar the image will be detached!</source> <translation>Bist du sicher ein Quadrat Bild außerhalb der Avatar Zone zu verwenden? Wenn du es als Avatar verwenden möchtest wird es abgetrennt!</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="675"/> + <location filename="../ImportDialog.cpp" line="727"/> + <location filename="../ImportDialog.cpp" line="909"/> <source>Snapmatic Avatar Zone</source> <translation>Snapmatic Avatar Zone</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="724"/> + <location filename="../ImportDialog.cpp" line="773"/> <source>Select Colour...</source> <translation>Farbe auswählen...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="793"/> + <location filename="../ImportDialog.cpp" line="842"/> <source>File</source> <comment>Background Image: File</comment> <translation>Datei</translation> @@ -1299,8 +1336,8 @@ Drücke 1 für Standardmodus</translation> <translation><h4>Folgende Snapmatic Bilder wurden repariert</h4>%1</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="426"/> - <location filename="../ImportDialog.cpp" line="747"/> + <location filename="../ImportDialog.cpp" line="469"/> + <location filename="../ImportDialog.cpp" line="796"/> <location filename="../ProfileInterface.cpp" line="496"/> <location filename="../ProfileInterface.cpp" line="497"/> <location filename="../ProfileInterface.cpp" line="541"/> @@ -1322,12 +1359,12 @@ Drücke 1 für Standardmodus</translation> <translation>Importieren...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="427"/> - <location filename="../ImportDialog.cpp" line="458"/> - <location filename="../ImportDialog.cpp" line="467"/> - <location filename="../ImportDialog.cpp" line="748"/> - <location filename="../ImportDialog.cpp" line="779"/> - <location filename="../ImportDialog.cpp" line="788"/> + <location filename="../ImportDialog.cpp" line="470"/> + <location filename="../ImportDialog.cpp" line="501"/> + <location filename="../ImportDialog.cpp" line="510"/> + <location filename="../ImportDialog.cpp" line="797"/> + <location filename="../ImportDialog.cpp" line="828"/> + <location filename="../ImportDialog.cpp" line="837"/> <source>Import</source> <translation>Importieren</translation> </message> @@ -1349,15 +1386,15 @@ Drücke 1 für Standardmodus</translation> <translation>Importfähige Dateien (%1)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="437"/> - <location filename="../ImportDialog.cpp" line="758"/> + <location filename="../ImportDialog.cpp" line="480"/> + <location filename="../ImportDialog.cpp" line="807"/> <location filename="../ProfileInterface.cpp" line="516"/> <source>All image files (%1)</source> <translation>Alle Bilddateien (%1)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="438"/> - <location filename="../ImportDialog.cpp" line="759"/> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="808"/> <location filename="../ProfileInterface.cpp" line="517"/> <location filename="../UserInterface.cpp" line="477"/> <source>All files (**)</source> @@ -1391,15 +1428,15 @@ Drücke 1 für Standardmodus</translation> <translation>Fehler beim Lesen von Spielstanddatei</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="458"/> - <location filename="../ImportDialog.cpp" line="779"/> + <location filename="../ImportDialog.cpp" line="501"/> + <location filename="../ImportDialog.cpp" line="828"/> <location filename="../ProfileInterface.cpp" line="786"/> <source>Can't import %1 because file can't be open</source> <translation>Kann %1 nicht importieren weil die Datei nicht geöffnet werden kann</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="467"/> - <location filename="../ImportDialog.cpp" line="788"/> + <location filename="../ImportDialog.cpp" line="510"/> + <location filename="../ImportDialog.cpp" line="837"/> <location filename="../ProfileInterface.cpp" line="796"/> <source>Can't import %1 because file can't be parsed properly</source> <translation>Kann %1 nicht importieren weil die Datei nicht richtig gelesen werden kann</translation> @@ -2040,7 +2077,7 @@ Drücke 1 für Standardmodus</translation> <context> <name>SnapmaticPicture</name> <message> - <location filename="../SnapmaticPicture.cpp" line="159"/> + <location filename="../SnapmaticPicture.cpp" line="154"/> <source>PHOTO - %1</source> <translation>FOTO - %1</translation> </message> @@ -2050,56 +2087,56 @@ Drücke 1 für Standardmodus</translation> <translation>Datei öffnen %1</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="330"/> + <location filename="../SnapmaticPicture.cpp" line="329"/> <source>header not exists</source> <translation>Header nicht existiert</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="334"/> + <location filename="../SnapmaticPicture.cpp" line="333"/> <source>header is malformed</source> <translation>Header fehlerhaft ist</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="338"/> + <location filename="../SnapmaticPicture.cpp" line="337"/> <source>picture not exists (%1)</source> <translation>Bild nicht existiert (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="342"/> + <location filename="../SnapmaticPicture.cpp" line="341"/> <source>JSON not exists (%1)</source> <translation>JSON nicht existiert (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="346"/> + <location filename="../SnapmaticPicture.cpp" line="345"/> <source>title not exists (%1)</source> <translation>Titel nicht existiert (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="350"/> + <location filename="../SnapmaticPicture.cpp" line="349"/> <source>description not exists (%1)</source> <translation>Beschreibung nicht existiert (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="364"/> + <location filename="../SnapmaticPicture.cpp" line="363"/> <source>reading file %1 because of %2</source> <comment>Example for %2: JSON is malformed error</comment> <translation>Datei lesen von %1 weil %2</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="177"/> - <location filename="../SnapmaticPicture.cpp" line="354"/> + <location filename="../SnapmaticPicture.cpp" line="353"/> <source>JSON is incomplete and malformed</source> <translation>JSON ist unvollständig und Fehlerhaft</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="181"/> - <location filename="../SnapmaticPicture.cpp" line="358"/> + <location filename="../SnapmaticPicture.cpp" line="357"/> <source>JSON is incomplete</source> <translation>JSON ist unvollständig</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="185"/> - <location filename="../SnapmaticPicture.cpp" line="362"/> + <location filename="../SnapmaticPicture.cpp" line="361"/> <source>JSON is malformed</source> <translation>JSON ist Fehlerhaft</translation> </message> diff --git a/res/gta5sync_en_US.ts b/res/gta5sync_en_US.ts index ddf1da0..b0efae3 100644 --- a/res/gta5sync_en_US.ts +++ b/res/gta5sync_en_US.ts @@ -174,27 +174,27 @@ Pictures and Savegames</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="640"/> + <location filename="../ImportDialog.cpp" line="685"/> <source>Overwrite Image...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="642"/> + <location filename="../ImportDialog.cpp" line="687"/> <source>Apply changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="641"/> + <location filename="../ImportDialog.cpp" line="686"/> <source>&Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="644"/> + <location filename="../ImportDialog.cpp" line="689"/> <source>Discard changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="643"/> + <location filename="../ImportDialog.cpp" line="688"/> <source>&Close</source> <translation type="unfinished"></translation> </message> @@ -220,9 +220,9 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="150"/> - <location filename="../ImportDialog.cpp" line="87"/> - <location filename="../ImportDialog.cpp" line="315"/> - <location filename="../ImportDialog.cpp" line="728"/> + <location filename="../ImportDialog.cpp" line="86"/> + <location filename="../ImportDialog.cpp" line="351"/> + <location filename="../ImportDialog.cpp" line="777"/> <source>Background Colour: <span style="color: %1">%1</span></source> <translation>Background Color: <span style="color: %1">%1</span></translation> </message> @@ -264,8 +264,8 @@ Pictures and Savegames</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="318"/> - <location filename="../ImportDialog.cpp" line="793"/> + <location filename="../ImportDialog.cpp" line="353"/> + <location filename="../ImportDialog.cpp" line="842"/> <source>Background Image: %1</source> <translation type="unfinished"></translation> </message> @@ -290,172 +290,209 @@ Pictures and Savegames</source> <translation>Force Color in Avatar Zone</translation> </message> <message> - <location filename="../ImportDialog.ui" line="305"/> + <location filename="../ImportDialog.ui" line="303"/> + <source>Advanced</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="311"/> + <source>Resolution:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="324"/> + <source>Snapmatic resolution</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="335"/> + <source>Avoid compression and expand buffer instead, improves picture quality, but may break Snapmatic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="338"/> + <source>Unlimited Buffer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="345"/> + <source>Import as-is, don't change the picture at all, guarantee to break Snapmatic unless you know what you doing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="348"/> + <source>Import as-is</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="362"/> <source>Import options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.ui" line="308"/> + <location filename="../ImportDialog.ui" line="365"/> <source>&Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.ui" line="337"/> + <location filename="../ImportDialog.ui" line="394"/> <source>Import picture</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.ui" line="340"/> + <location filename="../ImportDialog.ui" line="397"/> <source>&OK</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.ui" line="353"/> + <location filename="../ImportDialog.ui" line="410"/> <source>Discard picture</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.ui" line="356"/> + <location filename="../ImportDialog.ui" line="413"/> <source>&Cancel</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ImportDialog.ui" line="203"/> - <location filename="../ImportDialog.cpp" line="88"/> - <location filename="../ImportDialog.cpp" line="323"/> - <location filename="../ImportDialog.cpp" line="808"/> + <location filename="../ImportDialog.cpp" line="87"/> + <location filename="../ImportDialog.cpp" line="357"/> + <location filename="../ImportDialog.cpp" line="857"/> <source>Background Image:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="120"/> + <location filename="../ImportDialog.cpp" line="126"/> <source>&Import new Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="121"/> + <location filename="../ImportDialog.cpp" line="127"/> <source>&Crop Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="123"/> + <location filename="../ImportDialog.cpp" line="129"/> <source>&Load Settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="124"/> + <location filename="../ImportDialog.cpp" line="130"/> <source>&Save Settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="198"/> + <location filename="../ImportDialog.cpp" line="195"/> <location filename="../ProfileInterface.cpp" line="721"/> <source>Custom Avatar</source> <comment>Custom Avatar Description in SC, don't use Special Character!</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="225"/> + <location filename="../ImportDialog.cpp" line="218"/> <location filename="../ProfileInterface.cpp" line="740"/> <source>Custom Picture</source> <comment>Custom Picture Description in SC, don't use Special Character!</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="318"/> + <location filename="../ImportDialog.cpp" line="353"/> <source>Storage</source> <comment>Background Image: Storage</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="355"/> + <location filename="../ImportDialog.cpp" line="398"/> <source>Crop Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="397"/> + <location filename="../ImportDialog.cpp" line="440"/> <source>&Crop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="398"/> + <location filename="../ImportDialog.cpp" line="441"/> <source>Crop Picture</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="485"/> - <location filename="../ImportDialog.cpp" line="533"/> + <location filename="../ImportDialog.cpp" line="528"/> + <location filename="../ImportDialog.cpp" line="576"/> <source>Please import a new picture first</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="490"/> - <location filename="../ImportDialog.cpp" line="500"/> + <location filename="../ImportDialog.cpp" line="533"/> + <location filename="../ImportDialog.cpp" line="543"/> <source>Default</source> <comment>Default as Default Profile</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="491"/> - <location filename="../ImportDialog.cpp" line="492"/> - <location filename="../ImportDialog.cpp" line="493"/> - <location filename="../ImportDialog.cpp" line="494"/> - <location filename="../ImportDialog.cpp" line="495"/> - <location filename="../ImportDialog.cpp" line="504"/> - <location filename="../ImportDialog.cpp" line="508"/> - <location filename="../ImportDialog.cpp" line="512"/> - <location filename="../ImportDialog.cpp" line="516"/> - <location filename="../ImportDialog.cpp" line="520"/> + <location filename="../ImportDialog.cpp" line="534"/> + <location filename="../ImportDialog.cpp" line="535"/> + <location filename="../ImportDialog.cpp" line="536"/> + <location filename="../ImportDialog.cpp" line="537"/> <location filename="../ImportDialog.cpp" line="538"/> - <location filename="../ImportDialog.cpp" line="539"/> - <location filename="../ImportDialog.cpp" line="540"/> - <location filename="../ImportDialog.cpp" line="541"/> - <location filename="../ImportDialog.cpp" line="542"/> <location filename="../ImportDialog.cpp" line="547"/> <location filename="../ImportDialog.cpp" line="551"/> <location filename="../ImportDialog.cpp" line="555"/> <location filename="../ImportDialog.cpp" line="559"/> <location filename="../ImportDialog.cpp" line="563"/> + <location filename="../ImportDialog.cpp" line="581"/> + <location filename="../ImportDialog.cpp" line="582"/> + <location filename="../ImportDialog.cpp" line="583"/> + <location filename="../ImportDialog.cpp" line="584"/> + <location filename="../ImportDialog.cpp" line="585"/> + <location filename="../ImportDialog.cpp" line="590"/> + <location filename="../ImportDialog.cpp" line="594"/> + <location filename="../ImportDialog.cpp" line="598"/> + <location filename="../ImportDialog.cpp" line="602"/> + <location filename="../ImportDialog.cpp" line="606"/> <source>Profile %1</source> <comment>Profile %1 as Profile 1</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="485"/> - <location filename="../ImportDialog.cpp" line="496"/> + <location filename="../ImportDialog.cpp" line="528"/> + <location filename="../ImportDialog.cpp" line="539"/> <source>Load Settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="496"/> - <location filename="../ImportDialog.cpp" line="543"/> + <location filename="../ImportDialog.cpp" line="539"/> + <location filename="../ImportDialog.cpp" line="586"/> <source>Please select your settings profile</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="533"/> - <location filename="../ImportDialog.cpp" line="543"/> + <location filename="../ImportDialog.cpp" line="576"/> + <location filename="../ImportDialog.cpp" line="586"/> <source>Save Settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="675"/> + <location filename="../ImportDialog.cpp" line="727"/> + <location filename="../ImportDialog.cpp" line="909"/> <source>Snapmatic Avatar Zone</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="675"/> + <location filename="../ImportDialog.cpp" line="727"/> + <location filename="../ImportDialog.cpp" line="909"/> <source>Are you sure to use a square image outside of the Avatar Zone? When you want to use it as Avatar the image will be detached!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="724"/> + <location filename="../ImportDialog.cpp" line="773"/> <source>Select Colour...</source> <translation>Select Color...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="793"/> + <location filename="../ImportDialog.cpp" line="842"/> <source>File</source> <comment>Background Image: File</comment> <translation type="unfinished"></translation> @@ -1292,8 +1329,8 @@ Press 1 for Default View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="426"/> - <location filename="../ImportDialog.cpp" line="747"/> + <location filename="../ImportDialog.cpp" line="469"/> + <location filename="../ImportDialog.cpp" line="796"/> <location filename="../ProfileInterface.cpp" line="496"/> <location filename="../ProfileInterface.cpp" line="497"/> <location filename="../ProfileInterface.cpp" line="541"/> @@ -1315,12 +1352,12 @@ Press 1 for Default View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="427"/> - <location filename="../ImportDialog.cpp" line="458"/> - <location filename="../ImportDialog.cpp" line="467"/> - <location filename="../ImportDialog.cpp" line="748"/> - <location filename="../ImportDialog.cpp" line="779"/> - <location filename="../ImportDialog.cpp" line="788"/> + <location filename="../ImportDialog.cpp" line="470"/> + <location filename="../ImportDialog.cpp" line="501"/> + <location filename="../ImportDialog.cpp" line="510"/> + <location filename="../ImportDialog.cpp" line="797"/> + <location filename="../ImportDialog.cpp" line="828"/> + <location filename="../ImportDialog.cpp" line="837"/> <source>Import</source> <translation type="unfinished"></translation> </message> @@ -1348,15 +1385,15 @@ Press 1 for Default View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="437"/> - <location filename="../ImportDialog.cpp" line="758"/> + <location filename="../ImportDialog.cpp" line="480"/> + <location filename="../ImportDialog.cpp" line="807"/> <location filename="../ProfileInterface.cpp" line="516"/> <source>All image files (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="438"/> - <location filename="../ImportDialog.cpp" line="759"/> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="808"/> <location filename="../ProfileInterface.cpp" line="517"/> <location filename="../UserInterface.cpp" line="477"/> <source>All files (**)</source> @@ -1395,15 +1432,15 @@ Press 1 for Default View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="458"/> - <location filename="../ImportDialog.cpp" line="779"/> + <location filename="../ImportDialog.cpp" line="501"/> + <location filename="../ImportDialog.cpp" line="828"/> <location filename="../ProfileInterface.cpp" line="786"/> <source>Can't import %1 because file can't be open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="467"/> - <location filename="../ImportDialog.cpp" line="788"/> + <location filename="../ImportDialog.cpp" line="510"/> + <location filename="../ImportDialog.cpp" line="837"/> <location filename="../ProfileInterface.cpp" line="796"/> <source>Can't import %1 because file can't be parsed properly</source> <translation type="unfinished"></translation> @@ -2007,7 +2044,7 @@ Press 1 for Default View</source> <context> <name>SnapmaticPicture</name> <message> - <location filename="../SnapmaticPicture.cpp" line="159"/> + <location filename="../SnapmaticPicture.cpp" line="154"/> <source>PHOTO - %1</source> <translation type="unfinished"></translation> </message> @@ -2017,56 +2054,56 @@ Press 1 for Default View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="330"/> + <location filename="../SnapmaticPicture.cpp" line="329"/> <source>header not exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="334"/> + <location filename="../SnapmaticPicture.cpp" line="333"/> <source>header is malformed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="338"/> + <location filename="../SnapmaticPicture.cpp" line="337"/> <source>picture not exists (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="342"/> + <location filename="../SnapmaticPicture.cpp" line="341"/> <source>JSON not exists (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="346"/> + <location filename="../SnapmaticPicture.cpp" line="345"/> <source>title not exists (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="350"/> + <location filename="../SnapmaticPicture.cpp" line="349"/> <source>description not exists (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="364"/> + <location filename="../SnapmaticPicture.cpp" line="363"/> <source>reading file %1 because of %2</source> <comment>Example for %2: JSON is malformed error</comment> <translation type="unfinished"></translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="177"/> - <location filename="../SnapmaticPicture.cpp" line="354"/> + <location filename="../SnapmaticPicture.cpp" line="353"/> <source>JSON is incomplete and malformed</source> <translation type="unfinished"></translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="181"/> - <location filename="../SnapmaticPicture.cpp" line="358"/> + <location filename="../SnapmaticPicture.cpp" line="357"/> <source>JSON is incomplete</source> <translation type="unfinished"></translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="185"/> - <location filename="../SnapmaticPicture.cpp" line="362"/> + <location filename="../SnapmaticPicture.cpp" line="361"/> <source>JSON is malformed</source> <translation type="unfinished"></translation> </message> diff --git a/res/gta5sync_fr.ts b/res/gta5sync_fr.ts index 79be7fb..d4e8cca 100644 --- a/res/gta5sync_fr.ts +++ b/res/gta5sync_fr.ts @@ -184,27 +184,27 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation> <translation>Éditeur d'images Snapmatic</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="640"/> + <location filename="../ImportDialog.cpp" line="685"/> <source>Overwrite Image...</source> <translation>Remplacer l'image...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="642"/> + <location filename="../ImportDialog.cpp" line="687"/> <source>Apply changes</source> <translation>Appliquer les modifications</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="641"/> + <location filename="../ImportDialog.cpp" line="686"/> <source>&Overwrite</source> <translation>&Remplacer</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="644"/> + <location filename="../ImportDialog.cpp" line="689"/> <source>Discard changes</source> <translation>Annuler les modifications</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="643"/> + <location filename="../ImportDialog.cpp" line="688"/> <source>&Close</source> <translation>&Fermer</translation> </message> @@ -256,9 +256,9 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation> </message> <message> <location filename="../ImportDialog.ui" line="150"/> - <location filename="../ImportDialog.cpp" line="87"/> - <location filename="../ImportDialog.cpp" line="315"/> - <location filename="../ImportDialog.cpp" line="728"/> + <location filename="../ImportDialog.cpp" line="86"/> + <location filename="../ImportDialog.cpp" line="351"/> + <location filename="../ImportDialog.cpp" line="777"/> <source>Background Colour: <span style="color: %1">%1</span></source> <translation>Couleur de fond : <span style="color: %1">%1</span></translation> </message> @@ -284,8 +284,13 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation> <translation>Supprimer l'image de fond</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="318"/> - <location filename="../ImportDialog.cpp" line="793"/> + <location filename="../ImportDialog.ui" line="345"/> + <source>Import as-is, don't change the picture at all, guarantee to break Snapmatic unless you know what you doing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="353"/> + <location filename="../ImportDialog.cpp" line="842"/> <source>Background Image: %1</source> <translation>Image de fond : %1</translation> </message> @@ -300,173 +305,205 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation> <translation>Forcer la couleur dans la Zone d'Avatar</translation> </message> <message> - <location filename="../ImportDialog.ui" line="305"/> + <location filename="../ImportDialog.ui" line="303"/> + <source>Advanced</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="311"/> + <source>Resolution:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="324"/> + <source>Snapmatic resolution</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="335"/> + <source>Avoid compression and expand buffer instead, improves picture quality, but may break Snapmatic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="338"/> + <source>Unlimited Buffer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="348"/> + <source>Import as-is</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="362"/> <source>Import options</source> <translation>Options d'importation</translation> </message> <message> - <location filename="../ImportDialog.ui" line="308"/> + <location filename="../ImportDialog.ui" line="365"/> <source>&Options</source> <translation>&Options</translation> </message> <message> - <location filename="../ImportDialog.ui" line="337"/> + <location filename="../ImportDialog.ui" line="394"/> <source>Import picture</source> <translation>Importer l'image</translation> </message> <message> - <location filename="../ImportDialog.ui" line="340"/> + <location filename="../ImportDialog.ui" line="397"/> <source>&OK</source> <translation>&OK</translation> </message> <message> - <location filename="../ImportDialog.ui" line="353"/> + <location filename="../ImportDialog.ui" line="410"/> <source>Discard picture</source> <translation>Supprimer l'image</translation> </message> <message> - <location filename="../ImportDialog.ui" line="356"/> + <location filename="../ImportDialog.ui" line="413"/> <source>&Cancel</source> <translation>A&nnuler</translation> </message> <message> <location filename="../ImportDialog.ui" line="203"/> - <location filename="../ImportDialog.cpp" line="88"/> - <location filename="../ImportDialog.cpp" line="323"/> - <location filename="../ImportDialog.cpp" line="808"/> + <location filename="../ImportDialog.cpp" line="87"/> + <location filename="../ImportDialog.cpp" line="357"/> + <location filename="../ImportDialog.cpp" line="857"/> <source>Background Image:</source> <translation>Image de fond :</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="120"/> + <location filename="../ImportDialog.cpp" line="126"/> <source>&Import new Picture...</source> <translation>&Importer une nouvelle image...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="121"/> + <location filename="../ImportDialog.cpp" line="127"/> <source>&Crop Picture...</source> <translation>&Rogner l'image...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="123"/> + <location filename="../ImportDialog.cpp" line="129"/> <source>&Load Settings...</source> <translation>&Charger les paramètres...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="124"/> + <location filename="../ImportDialog.cpp" line="130"/> <source>&Save Settings...</source> <translation>&Sauvegarder les paramètres...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="198"/> + <location filename="../ImportDialog.cpp" line="195"/> <location filename="../ProfileInterface.cpp" line="721"/> <source>Custom Avatar</source> <comment>Custom Avatar Description in SC, don't use Special Character!</comment> <translation>Avatar personnalisé</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="225"/> + <location filename="../ImportDialog.cpp" line="218"/> <location filename="../ProfileInterface.cpp" line="740"/> <source>Custom Picture</source> <comment>Custom Picture Description in SC, don't use Special Character!</comment> <translation>Image personnalisé</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="318"/> + <location filename="../ImportDialog.cpp" line="353"/> <source>Storage</source> <comment>Background Image: Storage</comment> <translation>Stockage</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="355"/> + <location filename="../ImportDialog.cpp" line="398"/> <source>Crop Picture...</source> <translation>Rogner l'image...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="397"/> + <location filename="../ImportDialog.cpp" line="440"/> <source>&Crop</source> <translation>&Rogner</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="398"/> + <location filename="../ImportDialog.cpp" line="441"/> <source>Crop Picture</source> <translation>Rogner l'image</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="485"/> - <location filename="../ImportDialog.cpp" line="533"/> + <location filename="../ImportDialog.cpp" line="528"/> + <location filename="../ImportDialog.cpp" line="576"/> <source>Please import a new picture first</source> <translation>Veuillez d'abord importer une nouvelle image</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="490"/> - <location filename="../ImportDialog.cpp" line="500"/> + <location filename="../ImportDialog.cpp" line="533"/> + <location filename="../ImportDialog.cpp" line="543"/> <source>Default</source> <comment>Default as Default Profile</comment> <translation>Défaut</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="491"/> - <location filename="../ImportDialog.cpp" line="492"/> - <location filename="../ImportDialog.cpp" line="493"/> - <location filename="../ImportDialog.cpp" line="494"/> - <location filename="../ImportDialog.cpp" line="495"/> - <location filename="../ImportDialog.cpp" line="504"/> - <location filename="../ImportDialog.cpp" line="508"/> - <location filename="../ImportDialog.cpp" line="512"/> - <location filename="../ImportDialog.cpp" line="516"/> - <location filename="../ImportDialog.cpp" line="520"/> + <location filename="../ImportDialog.cpp" line="534"/> + <location filename="../ImportDialog.cpp" line="535"/> + <location filename="../ImportDialog.cpp" line="536"/> + <location filename="../ImportDialog.cpp" line="537"/> <location filename="../ImportDialog.cpp" line="538"/> - <location filename="../ImportDialog.cpp" line="539"/> - <location filename="../ImportDialog.cpp" line="540"/> - <location filename="../ImportDialog.cpp" line="541"/> - <location filename="../ImportDialog.cpp" line="542"/> <location filename="../ImportDialog.cpp" line="547"/> <location filename="../ImportDialog.cpp" line="551"/> <location filename="../ImportDialog.cpp" line="555"/> <location filename="../ImportDialog.cpp" line="559"/> <location filename="../ImportDialog.cpp" line="563"/> + <location filename="../ImportDialog.cpp" line="581"/> + <location filename="../ImportDialog.cpp" line="582"/> + <location filename="../ImportDialog.cpp" line="583"/> + <location filename="../ImportDialog.cpp" line="584"/> + <location filename="../ImportDialog.cpp" line="585"/> + <location filename="../ImportDialog.cpp" line="590"/> + <location filename="../ImportDialog.cpp" line="594"/> + <location filename="../ImportDialog.cpp" line="598"/> + <location filename="../ImportDialog.cpp" line="602"/> + <location filename="../ImportDialog.cpp" line="606"/> <source>Profile %1</source> <comment>Profile %1 as Profile 1</comment> <translation>Profil %1</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="485"/> - <location filename="../ImportDialog.cpp" line="496"/> + <location filename="../ImportDialog.cpp" line="528"/> + <location filename="../ImportDialog.cpp" line="539"/> <source>Load Settings...</source> <translation>Charger les paramètres...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="496"/> - <location filename="../ImportDialog.cpp" line="543"/> + <location filename="../ImportDialog.cpp" line="539"/> + <location filename="../ImportDialog.cpp" line="586"/> <source>Please select your settings profile</source> <translation>Veuillez choisir votre profil de paramètres</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="533"/> - <location filename="../ImportDialog.cpp" line="543"/> + <location filename="../ImportDialog.cpp" line="576"/> + <location filename="../ImportDialog.cpp" line="586"/> <source>Save Settings...</source> <translation>Sauvegarder les paramètres...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="675"/> + <location filename="../ImportDialog.cpp" line="727"/> + <location filename="../ImportDialog.cpp" line="909"/> <source>Are you sure to use a square image outside of the Avatar Zone? When you want to use it as Avatar the image will be detached!</source> <translation>Êtes-vous sûr d'utiliser une image carrée en dehors de la Zone d'Avatar ? Si vous l'utilisez comme Avatar, l'image sera détachée !</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="675"/> + <location filename="../ImportDialog.cpp" line="727"/> + <location filename="../ImportDialog.cpp" line="909"/> <source>Snapmatic Avatar Zone</source> <translation>Zone d'Avatar Snapmatic</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="724"/> + <location filename="../ImportDialog.cpp" line="773"/> <source>Select Colour...</source> <translation>Choisir une couleur...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="793"/> + <location filename="../ImportDialog.cpp" line="842"/> <source>File</source> <comment>Background Image: File</comment> <translation>Fichier</translation> @@ -1310,8 +1347,8 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation><h4>Les Snapmatic suivants ont été répaés</h4>%1</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="426"/> - <location filename="../ImportDialog.cpp" line="747"/> + <location filename="../ImportDialog.cpp" line="469"/> + <location filename="../ImportDialog.cpp" line="796"/> <location filename="../ProfileInterface.cpp" line="496"/> <location filename="../ProfileInterface.cpp" line="497"/> <location filename="../ProfileInterface.cpp" line="541"/> @@ -1333,12 +1370,12 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>Importer...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="427"/> - <location filename="../ImportDialog.cpp" line="458"/> - <location filename="../ImportDialog.cpp" line="467"/> - <location filename="../ImportDialog.cpp" line="748"/> - <location filename="../ImportDialog.cpp" line="779"/> - <location filename="../ImportDialog.cpp" line="788"/> + <location filename="../ImportDialog.cpp" line="470"/> + <location filename="../ImportDialog.cpp" line="501"/> + <location filename="../ImportDialog.cpp" line="510"/> + <location filename="../ImportDialog.cpp" line="797"/> + <location filename="../ImportDialog.cpp" line="828"/> + <location filename="../ImportDialog.cpp" line="837"/> <source>Import</source> <translation>Importer</translation> </message> @@ -1355,15 +1392,15 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>Photos Snapmatic (PGTA*)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="437"/> - <location filename="../ImportDialog.cpp" line="758"/> + <location filename="../ImportDialog.cpp" line="480"/> + <location filename="../ImportDialog.cpp" line="807"/> <location filename="../ProfileInterface.cpp" line="516"/> <source>All image files (%1)</source> <translation>Toutes les images (%1)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="438"/> - <location filename="../ImportDialog.cpp" line="759"/> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="808"/> <location filename="../ProfileInterface.cpp" line="517"/> <location filename="../UserInterface.cpp" line="477"/> <source>All files (**)</source> @@ -1409,15 +1446,15 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>Impossible de lire le fichier de sauvegarde</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="458"/> - <location filename="../ImportDialog.cpp" line="779"/> + <location filename="../ImportDialog.cpp" line="501"/> + <location filename="../ImportDialog.cpp" line="828"/> <location filename="../ProfileInterface.cpp" line="786"/> <source>Can't import %1 because file can't be open</source> <translation>Impossible d'importer %1, le fichier ne peut pas être ouvert</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="467"/> - <location filename="../ImportDialog.cpp" line="788"/> + <location filename="../ImportDialog.cpp" line="510"/> + <location filename="../ImportDialog.cpp" line="837"/> <location filename="../ProfileInterface.cpp" line="796"/> <source>Can't import %1 because file can't be parsed properly</source> <translation>Impossible d'importer %1, le fichier ne peut pas être parsé correctement</translation> @@ -2043,7 +2080,7 @@ Appuyer sur 1 pour le mode par défaut</translation> <context> <name>SnapmaticPicture</name> <message> - <location filename="../SnapmaticPicture.cpp" line="159"/> + <location filename="../SnapmaticPicture.cpp" line="154"/> <source>PHOTO - %1</source> <translation>PHOTO - %1</translation> </message> @@ -2053,56 +2090,56 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>ouverture du fichier %1</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="330"/> + <location filename="../SnapmaticPicture.cpp" line="329"/> <source>header not exists</source> <translation>les headers n'existent pas</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="334"/> + <location filename="../SnapmaticPicture.cpp" line="333"/> <source>header is malformed</source> <translation>les headers sont incorrects</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="338"/> + <location filename="../SnapmaticPicture.cpp" line="337"/> <source>picture not exists (%1)</source> <translation>l'image n'existe pas (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="342"/> + <location filename="../SnapmaticPicture.cpp" line="341"/> <source>JSON not exists (%1)</source> <translation>le JSON n'existe pas (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="346"/> + <location filename="../SnapmaticPicture.cpp" line="345"/> <source>title not exists (%1)</source> <translation>le titre n'existe pas (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="350"/> + <location filename="../SnapmaticPicture.cpp" line="349"/> <source>description not exists (%1)</source> <translation>la description n'existe pas (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="364"/> + <location filename="../SnapmaticPicture.cpp" line="363"/> <source>reading file %1 because of %2</source> <comment>Example for %2: JSON is malformed error</comment> <translation>lecture du fichier %1 : %2</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="177"/> - <location filename="../SnapmaticPicture.cpp" line="354"/> + <location filename="../SnapmaticPicture.cpp" line="353"/> <source>JSON is incomplete and malformed</source> <translation>JSON incomplet ou incorrect</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="181"/> - <location filename="../SnapmaticPicture.cpp" line="358"/> + <location filename="../SnapmaticPicture.cpp" line="357"/> <source>JSON is incomplete</source> <translation>JSON incomplet</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="185"/> - <location filename="../SnapmaticPicture.cpp" line="362"/> + <location filename="../SnapmaticPicture.cpp" line="361"/> <source>JSON is malformed</source> <translation>JSON incorrect</translation> </message> diff --git a/res/gta5sync_ko.ts b/res/gta5sync_ko.ts index 53166ac..fb4ec79 100644 --- a/res/gta5sync_ko.ts +++ b/res/gta5sync_ko.ts @@ -176,27 +176,27 @@ Pictures and Savegames</source> <context> <name>ImageEditorDialog</name> <message> - <location filename="../ImportDialog.cpp" line="640"/> + <location filename="../ImportDialog.cpp" line="685"/> <source>Overwrite Image...</source> <translation>이미지 덮어쓰기...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="642"/> + <location filename="../ImportDialog.cpp" line="687"/> <source>Apply changes</source> <translation>변경 사항 적용</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="641"/> + <location filename="../ImportDialog.cpp" line="686"/> <source>&Overwrite</source> <translation>덮어쓰기(&O)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="644"/> + <location filename="../ImportDialog.cpp" line="689"/> <source>Discard changes</source> <translation>변경 사항 무시</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="643"/> + <location filename="../ImportDialog.cpp" line="688"/> <source>&Close</source> <translation>닫기(&C)</translation> </message> @@ -256,9 +256,9 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="150"/> - <location filename="../ImportDialog.cpp" line="87"/> - <location filename="../ImportDialog.cpp" line="315"/> - <location filename="../ImportDialog.cpp" line="728"/> + <location filename="../ImportDialog.cpp" line="86"/> + <location filename="../ImportDialog.cpp" line="351"/> + <location filename="../ImportDialog.cpp" line="777"/> <source>Background Colour: <span style="color: %1">%1</span></source> <translation>배경 색상: <span style="color: %1">%1</span></translation> </message> @@ -275,9 +275,9 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="203"/> - <location filename="../ImportDialog.cpp" line="88"/> - <location filename="../ImportDialog.cpp" line="323"/> - <location filename="../ImportDialog.cpp" line="808"/> + <location filename="../ImportDialog.cpp" line="87"/> + <location filename="../ImportDialog.cpp" line="357"/> + <location filename="../ImportDialog.cpp" line="857"/> <source>Background Image:</source> <translation>배경 이미지:</translation> </message> @@ -302,57 +302,92 @@ Pictures and Savegames</source> <translation>아바타 구역에 색상을 적용합니다</translation> </message> <message> - <location filename="../ImportDialog.ui" line="305"/> + <location filename="../ImportDialog.ui" line="303"/> + <source>Advanced</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="311"/> + <source>Resolution:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="324"/> + <source>Snapmatic resolution</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="335"/> + <source>Avoid compression and expand buffer instead, improves picture quality, but may break Snapmatic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="338"/> + <source>Unlimited Buffer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="345"/> + <source>Import as-is, don't change the picture at all, guarantee to break Snapmatic unless you know what you doing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="348"/> + <source>Import as-is</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="362"/> <source>Import options</source> <translation>가져오기 옵션</translation> </message> <message> - <location filename="../ImportDialog.ui" line="308"/> + <location filename="../ImportDialog.ui" line="365"/> <source>&Options</source> <translation>옵션(&O)</translation> </message> <message> - <location filename="../ImportDialog.ui" line="337"/> + <location filename="../ImportDialog.ui" line="394"/> <source>Import picture</source> <translation>사진 가져오기</translation> </message> <message> - <location filename="../ImportDialog.ui" line="340"/> + <location filename="../ImportDialog.ui" line="397"/> <source>&OK</source> <translation>확인(&O)</translation> </message> <message> - <location filename="../ImportDialog.ui" line="353"/> + <location filename="../ImportDialog.ui" line="410"/> <source>Discard picture</source> <translation>사진 삭제</translation> </message> <message> - <location filename="../ImportDialog.ui" line="356"/> + <location filename="../ImportDialog.ui" line="413"/> <source>&Cancel</source> <translation>취소(&C)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="120"/> + <location filename="../ImportDialog.cpp" line="126"/> <source>&Import new Picture...</source> <translation>새로운 사진 가져오기(&I)...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="121"/> + <location filename="../ImportDialog.cpp" line="127"/> <source>&Crop Picture...</source> <translation>사진 자르기(&C)...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="123"/> + <location filename="../ImportDialog.cpp" line="129"/> <source>&Load Settings...</source> <translation>설정 불러오기(&L)...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="124"/> + <location filename="../ImportDialog.cpp" line="130"/> <source>&Save Settings...</source> <translation>설정 저장(&S)...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="198"/> + <location filename="../ImportDialog.cpp" line="195"/> <location filename="../ProfileInterface.cpp" line="721"/> <source>Custom Avatar</source> <comment>Custom Avatar Description in SC, don't use Special Character!</comment> @@ -360,7 +395,7 @@ Pictures and Savegames</source> <translation>사용자 지정 아바타</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="225"/> + <location filename="../ImportDialog.cpp" line="218"/> <location filename="../ProfileInterface.cpp" line="740"/> <source>Custom Picture</source> <comment>Custom Picture Description in SC, don't use Special Character!</comment> @@ -368,110 +403,112 @@ Pictures and Savegames</source> <translation>사용자 지정 사진</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="318"/> - <location filename="../ImportDialog.cpp" line="793"/> + <location filename="../ImportDialog.cpp" line="353"/> + <location filename="../ImportDialog.cpp" line="842"/> <source>Background Image: %1</source> <translation>배경 이미지: %1</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="318"/> + <location filename="../ImportDialog.cpp" line="353"/> <source>Storage</source> <comment>Background Image: Storage</comment> <translatorcomment>배경 이미지: 저장됨</translatorcomment> <translation>저장됨</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="355"/> + <location filename="../ImportDialog.cpp" line="398"/> <source>Crop Picture...</source> <translation>사진 자르기...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="397"/> + <location filename="../ImportDialog.cpp" line="440"/> <source>&Crop</source> <translation>자르기(&C)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="398"/> + <location filename="../ImportDialog.cpp" line="441"/> <source>Crop Picture</source> <translation>사진 자르기</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="485"/> - <location filename="../ImportDialog.cpp" line="496"/> + <location filename="../ImportDialog.cpp" line="528"/> + <location filename="../ImportDialog.cpp" line="539"/> <source>Load Settings...</source> <translation>설정 불러오기...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="485"/> - <location filename="../ImportDialog.cpp" line="533"/> + <location filename="../ImportDialog.cpp" line="528"/> + <location filename="../ImportDialog.cpp" line="576"/> <source>Please import a new picture first</source> <translation>먼저 새 사진을 가져오세요</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="490"/> - <location filename="../ImportDialog.cpp" line="500"/> + <location filename="../ImportDialog.cpp" line="533"/> + <location filename="../ImportDialog.cpp" line="543"/> <source>Default</source> <comment>Default as Default Profile</comment> <translatorcomment>기본 프로필로 기본 설정</translatorcomment> <translation>기본</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="491"/> - <location filename="../ImportDialog.cpp" line="492"/> - <location filename="../ImportDialog.cpp" line="493"/> - <location filename="../ImportDialog.cpp" line="494"/> - <location filename="../ImportDialog.cpp" line="495"/> - <location filename="../ImportDialog.cpp" line="504"/> - <location filename="../ImportDialog.cpp" line="508"/> - <location filename="../ImportDialog.cpp" line="512"/> - <location filename="../ImportDialog.cpp" line="516"/> - <location filename="../ImportDialog.cpp" line="520"/> + <location filename="../ImportDialog.cpp" line="534"/> + <location filename="../ImportDialog.cpp" line="535"/> + <location filename="../ImportDialog.cpp" line="536"/> + <location filename="../ImportDialog.cpp" line="537"/> <location filename="../ImportDialog.cpp" line="538"/> - <location filename="../ImportDialog.cpp" line="539"/> - <location filename="../ImportDialog.cpp" line="540"/> - <location filename="../ImportDialog.cpp" line="541"/> - <location filename="../ImportDialog.cpp" line="542"/> <location filename="../ImportDialog.cpp" line="547"/> <location filename="../ImportDialog.cpp" line="551"/> <location filename="../ImportDialog.cpp" line="555"/> <location filename="../ImportDialog.cpp" line="559"/> <location filename="../ImportDialog.cpp" line="563"/> + <location filename="../ImportDialog.cpp" line="581"/> + <location filename="../ImportDialog.cpp" line="582"/> + <location filename="../ImportDialog.cpp" line="583"/> + <location filename="../ImportDialog.cpp" line="584"/> + <location filename="../ImportDialog.cpp" line="585"/> + <location filename="../ImportDialog.cpp" line="590"/> + <location filename="../ImportDialog.cpp" line="594"/> + <location filename="../ImportDialog.cpp" line="598"/> + <location filename="../ImportDialog.cpp" line="602"/> + <location filename="../ImportDialog.cpp" line="606"/> <source>Profile %1</source> <comment>Profile %1 as Profile 1</comment> <translatorcomment>%1을 프로필 1로 지정합니다.</translatorcomment> <translation>프로필 %1</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="496"/> - <location filename="../ImportDialog.cpp" line="543"/> + <location filename="../ImportDialog.cpp" line="539"/> + <location filename="../ImportDialog.cpp" line="586"/> <source>Please select your settings profile</source> <translation>설정 프로필을 선택하세요</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="533"/> - <location filename="../ImportDialog.cpp" line="543"/> + <location filename="../ImportDialog.cpp" line="576"/> + <location filename="../ImportDialog.cpp" line="586"/> <source>Save Settings...</source> <translation>설정 저장...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="675"/> + <location filename="../ImportDialog.cpp" line="727"/> + <location filename="../ImportDialog.cpp" line="909"/> <source>Snapmatic Avatar Zone</source> <translation>스낵매틱 아바타 영역</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="675"/> + <location filename="../ImportDialog.cpp" line="727"/> + <location filename="../ImportDialog.cpp" line="909"/> <source>Are you sure to use a square image outside of the Avatar Zone? When you want to use it as Avatar the image will be detached!</source> <translation>아바타 구역 밖에서 네모난 이미지를 정말 사용합니까? 아바타로 사용하려는 경우 이미지가 분리됩니다!</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="724"/> + <location filename="../ImportDialog.cpp" line="773"/> <source>Select Colour...</source> <translation>색상 선택...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="793"/> + <location filename="../ImportDialog.cpp" line="842"/> <source>File</source> <comment>Background Image: File</comment> <translatorcomment>배경 이미지: 파일</translatorcomment> @@ -1304,8 +1341,8 @@ Press 1 for Default View</source> <translation>%2 파일 중 %1 파일을 내보냅니다</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="426"/> - <location filename="../ImportDialog.cpp" line="747"/> + <location filename="../ImportDialog.cpp" line="469"/> + <location filename="../ImportDialog.cpp" line="796"/> <location filename="../ProfileInterface.cpp" line="496"/> <location filename="../ProfileInterface.cpp" line="497"/> <location filename="../ProfileInterface.cpp" line="541"/> @@ -1327,40 +1364,40 @@ Press 1 for Default View</source> <translation>가져오기...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="427"/> - <location filename="../ImportDialog.cpp" line="458"/> - <location filename="../ImportDialog.cpp" line="467"/> - <location filename="../ImportDialog.cpp" line="748"/> - <location filename="../ImportDialog.cpp" line="779"/> - <location filename="../ImportDialog.cpp" line="788"/> + <location filename="../ImportDialog.cpp" line="470"/> + <location filename="../ImportDialog.cpp" line="501"/> + <location filename="../ImportDialog.cpp" line="510"/> + <location filename="../ImportDialog.cpp" line="797"/> + <location filename="../ImportDialog.cpp" line="828"/> + <location filename="../ImportDialog.cpp" line="837"/> <source>Import</source> <translation>가져오기</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="437"/> - <location filename="../ImportDialog.cpp" line="758"/> + <location filename="../ImportDialog.cpp" line="480"/> + <location filename="../ImportDialog.cpp" line="807"/> <location filename="../ProfileInterface.cpp" line="516"/> <source>All image files (%1)</source> <translation>모든 이미지 파일 (%1)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="438"/> - <location filename="../ImportDialog.cpp" line="759"/> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="808"/> <location filename="../ProfileInterface.cpp" line="517"/> <location filename="../UserInterface.cpp" line="477"/> <source>All files (**)</source> <translation>모든 파일 (**)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="458"/> - <location filename="../ImportDialog.cpp" line="779"/> + <location filename="../ImportDialog.cpp" line="501"/> + <location filename="../ImportDialog.cpp" line="828"/> <location filename="../ProfileInterface.cpp" line="786"/> <source>Can't import %1 because file can't be open</source> <translation>파일을 열 수 없으므로 %1을 가져올 수 없습니다</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="467"/> - <location filename="../ImportDialog.cpp" line="788"/> + <location filename="../ImportDialog.cpp" line="510"/> + <location filename="../ImportDialog.cpp" line="837"/> <location filename="../ProfileInterface.cpp" line="796"/> <source>Can't import %1 because file can't be parsed properly</source> <translation>파일을 구문 분석할 수 없으므로 %1을 가져올 수 없습니다</translation> @@ -2065,24 +2102,24 @@ Press 1 for Default View</source> <name>SnapmaticPicture</name> <message> <location filename="../JsonEditorDialog.cpp" line="177"/> - <location filename="../SnapmaticPicture.cpp" line="354"/> + <location filename="../SnapmaticPicture.cpp" line="353"/> <source>JSON is incomplete and malformed</source> <translation>JSON이 불안정하고 형식이 잘못되었습니다</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="181"/> - <location filename="../SnapmaticPicture.cpp" line="358"/> + <location filename="../SnapmaticPicture.cpp" line="357"/> <source>JSON is incomplete</source> <translation>JSON이 불안정합니다</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="185"/> - <location filename="../SnapmaticPicture.cpp" line="362"/> + <location filename="../SnapmaticPicture.cpp" line="361"/> <source>JSON is malformed</source> <translation>잘못된 JSON 형식</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="159"/> + <location filename="../SnapmaticPicture.cpp" line="154"/> <source>PHOTO - %1</source> <translation>사진 - %1</translation> </message> @@ -2092,37 +2129,37 @@ Press 1 for Default View</source> <translation>파일 열기 %1</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="330"/> + <location filename="../SnapmaticPicture.cpp" line="329"/> <source>header not exists</source> <translation>헤더가 존재하지 않습니다</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="334"/> + <location filename="../SnapmaticPicture.cpp" line="333"/> <source>header is malformed</source> <translation>헤더의 형식이 잘못되었습니다</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="338"/> + <location filename="../SnapmaticPicture.cpp" line="337"/> <source>picture not exists (%1)</source> <translation>사진이 존재하지 않습니다. (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="342"/> + <location filename="../SnapmaticPicture.cpp" line="341"/> <source>JSON not exists (%1)</source> <translation>JSON이 존재하지 않습니다. (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="346"/> + <location filename="../SnapmaticPicture.cpp" line="345"/> <source>title not exists (%1)</source> <translation>제목이 존재하지 않습니다. (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="350"/> + <location filename="../SnapmaticPicture.cpp" line="349"/> <source>description not exists (%1)</source> <translation>설명이 존재하지 않습니다. (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="364"/> + <location filename="../SnapmaticPicture.cpp" line="363"/> <source>reading file %1 because of %2</source> <comment>Example for %2: JSON is malformed error</comment> <translatorcomment>%2의 예: JSON이 잘못된 형식입니다</translatorcomment> diff --git a/res/gta5sync_ru.ts b/res/gta5sync_ru.ts index dec45db..29dff3e 100644 --- a/res/gta5sync_ru.ts +++ b/res/gta5sync_ru.ts @@ -188,27 +188,27 @@ Pictures and Savegames</source> <translation>Редактор картинок Snapmatic</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="640"/> + <location filename="../ImportDialog.cpp" line="685"/> <source>Overwrite Image...</source> <translation>Перезаписать картинку...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="642"/> + <location filename="../ImportDialog.cpp" line="687"/> <source>Apply changes</source> <translation>Применить изменения</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="641"/> + <location filename="../ImportDialog.cpp" line="686"/> <source>&Overwrite</source> <translation>&Перезаписать</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="644"/> + <location filename="../ImportDialog.cpp" line="689"/> <source>Discard changes</source> <translation>Отменить изменения</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="643"/> + <location filename="../ImportDialog.cpp" line="688"/> <source>&Close</source> <translation>&Закрыть</translation> </message> @@ -260,9 +260,9 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="150"/> - <location filename="../ImportDialog.cpp" line="87"/> - <location filename="../ImportDialog.cpp" line="315"/> - <location filename="../ImportDialog.cpp" line="728"/> + <location filename="../ImportDialog.cpp" line="86"/> + <location filename="../ImportDialog.cpp" line="351"/> + <location filename="../ImportDialog.cpp" line="777"/> <source>Background Colour: <span style="color: %1">%1</span></source> <translation>Цвет фона: <span style="color: %1">%1</span></translation> </message> @@ -288,8 +288,13 @@ Pictures and Savegames</source> <translation>Убрать фоновую картинку</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="318"/> - <location filename="../ImportDialog.cpp" line="793"/> + <location filename="../ImportDialog.ui" line="345"/> + <source>Import as-is, don't change the picture at all, guarantee to break Snapmatic unless you know what you doing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="353"/> + <location filename="../ImportDialog.cpp" line="842"/> <source>Background Image: %1</source> <translation>Фоновая картинка: %1</translation> </message> @@ -306,32 +311,62 @@ Pictures and Savegames</source> <translation>Задать цвет в зоне аватарки</translation> </message> <message> - <location filename="../ImportDialog.ui" line="305"/> + <location filename="../ImportDialog.ui" line="303"/> + <source>Advanced</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="311"/> + <source>Resolution:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="324"/> + <source>Snapmatic resolution</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="335"/> + <source>Avoid compression and expand buffer instead, improves picture quality, but may break Snapmatic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="338"/> + <source>Unlimited Buffer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="348"/> + <source>Import as-is</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="362"/> <source>Import options</source> <translation>Опции импорта</translation> </message> <message> - <location filename="../ImportDialog.ui" line="308"/> + <location filename="../ImportDialog.ui" line="365"/> <source>&Options</source> <translation>&Опции</translation> </message> <message> - <location filename="../ImportDialog.ui" line="337"/> + <location filename="../ImportDialog.ui" line="394"/> <source>Import picture</source> <translation>Импортировать картинку</translation> </message> <message> - <location filename="../ImportDialog.ui" line="340"/> + <location filename="../ImportDialog.ui" line="397"/> <source>&OK</source> <translation>&ОК</translation> </message> <message> - <location filename="../ImportDialog.ui" line="353"/> + <location filename="../ImportDialog.ui" line="410"/> <source>Discard picture</source> <translation>Отклонить картинку</translation> </message> <message> - <location filename="../ImportDialog.ui" line="356"/> + <location filename="../ImportDialog.ui" line="413"/> <source>&Cancel</source> <translatorcomment>Я не уверен насчет горячих клавиш... </translatorcomment> @@ -339,141 +374,143 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="203"/> - <location filename="../ImportDialog.cpp" line="88"/> - <location filename="../ImportDialog.cpp" line="323"/> - <location filename="../ImportDialog.cpp" line="808"/> + <location filename="../ImportDialog.cpp" line="87"/> + <location filename="../ImportDialog.cpp" line="357"/> + <location filename="../ImportDialog.cpp" line="857"/> <source>Background Image:</source> <translation>Фоновая картинка:</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="120"/> + <location filename="../ImportDialog.cpp" line="126"/> <source>&Import new Picture...</source> <translation>&Импортировать картинку...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="121"/> + <location filename="../ImportDialog.cpp" line="127"/> <source>&Crop Picture...</source> <translation>Об&резать картинку...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="123"/> + <location filename="../ImportDialog.cpp" line="129"/> <source>&Load Settings...</source> <translation>&Загрузить настройки...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="124"/> + <location filename="../ImportDialog.cpp" line="130"/> <source>&Save Settings...</source> <translation>&Сохранить настройки...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="198"/> + <location filename="../ImportDialog.cpp" line="195"/> <location filename="../ProfileInterface.cpp" line="721"/> <source>Custom Avatar</source> <comment>Custom Avatar Description in SC, don't use Special Character!</comment> <translation>Свой Аватар</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="225"/> + <location filename="../ImportDialog.cpp" line="218"/> <location filename="../ProfileInterface.cpp" line="740"/> <source>Custom Picture</source> <comment>Custom Picture Description in SC, don't use Special Character!</comment> <translation>Своя Картинка</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="318"/> + <location filename="../ImportDialog.cpp" line="353"/> <source>Storage</source> <comment>Background Image: Storage</comment> <translation>Хранилище</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="355"/> + <location filename="../ImportDialog.cpp" line="398"/> <source>Crop Picture...</source> <translation>Обрезать картинку...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="397"/> + <location filename="../ImportDialog.cpp" line="440"/> <source>&Crop</source> <translation>Об&резать</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="398"/> + <location filename="../ImportDialog.cpp" line="441"/> <source>Crop Picture</source> <translation>Обрезать картинку</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="485"/> - <location filename="../ImportDialog.cpp" line="533"/> + <location filename="../ImportDialog.cpp" line="528"/> + <location filename="../ImportDialog.cpp" line="576"/> <source>Please import a new picture first</source> <translation>Импортируй сначала новую картинку</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="490"/> - <location filename="../ImportDialog.cpp" line="500"/> + <location filename="../ImportDialog.cpp" line="533"/> + <location filename="../ImportDialog.cpp" line="543"/> <source>Default</source> <comment>Default as Default Profile</comment> <translation>По умолчанию</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="491"/> - <location filename="../ImportDialog.cpp" line="492"/> - <location filename="../ImportDialog.cpp" line="493"/> - <location filename="../ImportDialog.cpp" line="494"/> - <location filename="../ImportDialog.cpp" line="495"/> - <location filename="../ImportDialog.cpp" line="504"/> - <location filename="../ImportDialog.cpp" line="508"/> - <location filename="../ImportDialog.cpp" line="512"/> - <location filename="../ImportDialog.cpp" line="516"/> - <location filename="../ImportDialog.cpp" line="520"/> + <location filename="../ImportDialog.cpp" line="534"/> + <location filename="../ImportDialog.cpp" line="535"/> + <location filename="../ImportDialog.cpp" line="536"/> + <location filename="../ImportDialog.cpp" line="537"/> <location filename="../ImportDialog.cpp" line="538"/> - <location filename="../ImportDialog.cpp" line="539"/> - <location filename="../ImportDialog.cpp" line="540"/> - <location filename="../ImportDialog.cpp" line="541"/> - <location filename="../ImportDialog.cpp" line="542"/> <location filename="../ImportDialog.cpp" line="547"/> <location filename="../ImportDialog.cpp" line="551"/> <location filename="../ImportDialog.cpp" line="555"/> <location filename="../ImportDialog.cpp" line="559"/> <location filename="../ImportDialog.cpp" line="563"/> + <location filename="../ImportDialog.cpp" line="581"/> + <location filename="../ImportDialog.cpp" line="582"/> + <location filename="../ImportDialog.cpp" line="583"/> + <location filename="../ImportDialog.cpp" line="584"/> + <location filename="../ImportDialog.cpp" line="585"/> + <location filename="../ImportDialog.cpp" line="590"/> + <location filename="../ImportDialog.cpp" line="594"/> + <location filename="../ImportDialog.cpp" line="598"/> + <location filename="../ImportDialog.cpp" line="602"/> + <location filename="../ImportDialog.cpp" line="606"/> <source>Profile %1</source> <comment>Profile %1 as Profile 1</comment> <translation>Профиль %1</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="485"/> - <location filename="../ImportDialog.cpp" line="496"/> + <location filename="../ImportDialog.cpp" line="528"/> + <location filename="../ImportDialog.cpp" line="539"/> <source>Load Settings...</source> <translation>Загрузить настройки...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="496"/> - <location filename="../ImportDialog.cpp" line="543"/> + <location filename="../ImportDialog.cpp" line="539"/> + <location filename="../ImportDialog.cpp" line="586"/> <source>Please select your settings profile</source> <translation>Пожалуйста, выбери профиль для настроек</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="533"/> - <location filename="../ImportDialog.cpp" line="543"/> + <location filename="../ImportDialog.cpp" line="576"/> + <location filename="../ImportDialog.cpp" line="586"/> <source>Save Settings...</source> <translation>Сохранить настройки...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="675"/> + <location filename="../ImportDialog.cpp" line="727"/> + <location filename="../ImportDialog.cpp" line="909"/> <source>Are you sure to use a square image outside of the Avatar Zone? When you want to use it as Avatar the image will be detached!</source> <translation>Ты точно хочешь использовать квадратное изображение вне зоны аватарки? Если это аватар, то изображение будет обрезано!</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="675"/> + <location filename="../ImportDialog.cpp" line="727"/> + <location filename="../ImportDialog.cpp" line="909"/> <source>Snapmatic Avatar Zone</source> <translation>Зона Snapmatic Аватарки</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="724"/> + <location filename="../ImportDialog.cpp" line="773"/> <source>Select Colour...</source> <translation>Выбрать цвет...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="793"/> + <location filename="../ImportDialog.cpp" line="842"/> <source>File</source> <comment>Background Image: File</comment> <translation>Файл</translation> @@ -1311,8 +1348,8 @@ Press 1 for Default View</source> <translation><h4>Нижеследующие картинки Snapmatic были восстановлены</h4>%1</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="426"/> - <location filename="../ImportDialog.cpp" line="747"/> + <location filename="../ImportDialog.cpp" line="469"/> + <location filename="../ImportDialog.cpp" line="796"/> <location filename="../ProfileInterface.cpp" line="496"/> <location filename="../ProfileInterface.cpp" line="497"/> <location filename="../ProfileInterface.cpp" line="541"/> @@ -1334,12 +1371,12 @@ Press 1 for Default View</source> <translation>Импортировать...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="427"/> - <location filename="../ImportDialog.cpp" line="458"/> - <location filename="../ImportDialog.cpp" line="467"/> - <location filename="../ImportDialog.cpp" line="748"/> - <location filename="../ImportDialog.cpp" line="779"/> - <location filename="../ImportDialog.cpp" line="788"/> + <location filename="../ImportDialog.cpp" line="470"/> + <location filename="../ImportDialog.cpp" line="501"/> + <location filename="../ImportDialog.cpp" line="510"/> + <location filename="../ImportDialog.cpp" line="797"/> + <location filename="../ImportDialog.cpp" line="828"/> + <location filename="../ImportDialog.cpp" line="837"/> <source>Import</source> <translation>Импортировать</translation> </message> @@ -1356,8 +1393,8 @@ Press 1 for Default View</source> <translation>Картинка Snapmatic (PGTA*)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="438"/> - <location filename="../ImportDialog.cpp" line="759"/> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="808"/> <location filename="../ProfileInterface.cpp" line="517"/> <location filename="../UserInterface.cpp" line="477"/> <source>All files (**)</source> @@ -1408,22 +1445,22 @@ Press 1 for Default View</source> <translation>Файлы для импорта (%1)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="437"/> - <location filename="../ImportDialog.cpp" line="758"/> + <location filename="../ImportDialog.cpp" line="480"/> + <location filename="../ImportDialog.cpp" line="807"/> <location filename="../ProfileInterface.cpp" line="516"/> <source>All image files (%1)</source> <translation>Все файлы изображений (%1)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="458"/> - <location filename="../ImportDialog.cpp" line="779"/> + <location filename="../ImportDialog.cpp" line="501"/> + <location filename="../ImportDialog.cpp" line="828"/> <location filename="../ProfileInterface.cpp" line="786"/> <source>Can't import %1 because file can't be open</source> <translation>Не удалось открыть %1, файл не может быть открыт</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="467"/> - <location filename="../ImportDialog.cpp" line="788"/> + <location filename="../ImportDialog.cpp" line="510"/> + <location filename="../ImportDialog.cpp" line="837"/> <location filename="../ProfileInterface.cpp" line="796"/> <source>Can't import %1 because file can't be parsed properly</source> <translation>Не получилось импортировать %1, файл не может быть правильно обработан</translation> @@ -2055,7 +2092,7 @@ Press 1 for Default View</source> <context> <name>SnapmaticPicture</name> <message> - <location filename="../SnapmaticPicture.cpp" line="159"/> + <location filename="../SnapmaticPicture.cpp" line="154"/> <source>PHOTO - %1</source> <translation>ФОТО - %1</translation> </message> @@ -2065,56 +2102,56 @@ Press 1 for Default View</source> <translation>Открыть файл %1</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="330"/> + <location filename="../SnapmaticPicture.cpp" line="329"/> <source>header not exists</source> <translation>Отсутствует шапка (header)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="334"/> + <location filename="../SnapmaticPicture.cpp" line="333"/> <source>header is malformed</source> <translation>Шапка (header) повреждена</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="338"/> + <location filename="../SnapmaticPicture.cpp" line="337"/> <source>picture not exists (%1)</source> <translation>Картинки не существует (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="342"/> + <location filename="../SnapmaticPicture.cpp" line="341"/> <source>JSON not exists (%1)</source> <translation>JSON не существует (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="346"/> + <location filename="../SnapmaticPicture.cpp" line="345"/> <source>title not exists (%1)</source> <translation>Заголовок отсутствует (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="350"/> + <location filename="../SnapmaticPicture.cpp" line="349"/> <source>description not exists (%1)</source> <translation>Описание отсутствует (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="364"/> + <location filename="../SnapmaticPicture.cpp" line="363"/> <source>reading file %1 because of %2</source> <comment>Example for %2: JSON is malformed error</comment> <translation>Чтение из файла %1 из-за %2</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="177"/> - <location filename="../SnapmaticPicture.cpp" line="354"/> + <location filename="../SnapmaticPicture.cpp" line="353"/> <source>JSON is incomplete and malformed</source> <translation>JSON не полный и повреждён</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="181"/> - <location filename="../SnapmaticPicture.cpp" line="358"/> + <location filename="../SnapmaticPicture.cpp" line="357"/> <source>JSON is incomplete</source> <translation>JSON частично отсутствует</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="185"/> - <location filename="../SnapmaticPicture.cpp" line="362"/> + <location filename="../SnapmaticPicture.cpp" line="361"/> <source>JSON is malformed</source> <translation>JSON повреждён</translation> </message> diff --git a/res/gta5sync_uk.ts b/res/gta5sync_uk.ts index 091be8c..8ce5730 100644 --- a/res/gta5sync_uk.ts +++ b/res/gta5sync_uk.ts @@ -179,27 +179,27 @@ Pictures and Savegames</source> <context> <name>ImageEditorDialog</name> <message> - <location filename="../ImportDialog.cpp" line="640"/> + <location filename="../ImportDialog.cpp" line="685"/> <source>Overwrite Image...</source> <translation>Перезаписати зображення...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="642"/> + <location filename="../ImportDialog.cpp" line="687"/> <source>Apply changes</source> <translation>Застосувати зміни</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="641"/> + <location filename="../ImportDialog.cpp" line="686"/> <source>&Overwrite</source> <translation>&Перезаписати</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="644"/> + <location filename="../ImportDialog.cpp" line="689"/> <source>Discard changes</source> <translation>Скасувати зміни</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="643"/> + <location filename="../ImportDialog.cpp" line="688"/> <source>&Close</source> <translation>&Закрити</translation> </message> @@ -259,9 +259,9 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="150"/> - <location filename="../ImportDialog.cpp" line="87"/> - <location filename="../ImportDialog.cpp" line="315"/> - <location filename="../ImportDialog.cpp" line="728"/> + <location filename="../ImportDialog.cpp" line="86"/> + <location filename="../ImportDialog.cpp" line="351"/> + <location filename="../ImportDialog.cpp" line="777"/> <source>Background Colour: <span style="color: %1">%1</span></source> <translation>Фоновий колір: <span style="color: %1">%1</span></translation> </message> @@ -278,9 +278,9 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="203"/> - <location filename="../ImportDialog.cpp" line="88"/> - <location filename="../ImportDialog.cpp" line="323"/> - <location filename="../ImportDialog.cpp" line="808"/> + <location filename="../ImportDialog.cpp" line="87"/> + <location filename="../ImportDialog.cpp" line="357"/> + <location filename="../ImportDialog.cpp" line="857"/> <source>Background Image:</source> <translation>Фонове зображення:</translation> </message> @@ -305,171 +305,208 @@ Pictures and Savegames</source> <translation>Примусовий колір в зоні Аватару</translation> </message> <message> - <location filename="../ImportDialog.ui" line="305"/> + <location filename="../ImportDialog.ui" line="303"/> + <source>Advanced</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="311"/> + <source>Resolution:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="324"/> + <source>Snapmatic resolution</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="335"/> + <source>Avoid compression and expand buffer instead, improves picture quality, but may break Snapmatic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="338"/> + <source>Unlimited Buffer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="345"/> + <source>Import as-is, don't change the picture at all, guarantee to break Snapmatic unless you know what you doing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="348"/> + <source>Import as-is</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="362"/> <source>Import options</source> <translation>Параметри імпорту</translation> </message> <message> - <location filename="../ImportDialog.ui" line="308"/> + <location filename="../ImportDialog.ui" line="365"/> <source>&Options</source> <translation>&Параметри</translation> </message> <message> - <location filename="../ImportDialog.ui" line="337"/> + <location filename="../ImportDialog.ui" line="394"/> <source>Import picture</source> <translation>Імпортувати зображення</translation> </message> <message> - <location filename="../ImportDialog.ui" line="340"/> + <location filename="../ImportDialog.ui" line="397"/> <source>&OK</source> <translation>&OK</translation> </message> <message> - <location filename="../ImportDialog.ui" line="353"/> + <location filename="../ImportDialog.ui" line="410"/> <source>Discard picture</source> <translation>Відхилити зображення</translation> </message> <message> - <location filename="../ImportDialog.ui" line="356"/> + <location filename="../ImportDialog.ui" line="413"/> <source>&Cancel</source> <translation>&Скасувати</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="120"/> + <location filename="../ImportDialog.cpp" line="126"/> <source>&Import new Picture...</source> <translation>&Імпортувати нове зображення...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="121"/> + <location filename="../ImportDialog.cpp" line="127"/> <source>&Crop Picture...</source> <translation>&Обрізати зображення...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="123"/> + <location filename="../ImportDialog.cpp" line="129"/> <source>&Load Settings...</source> <translation>&Завантажити параметри...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="124"/> + <location filename="../ImportDialog.cpp" line="130"/> <source>&Save Settings...</source> <translation>&Зберегти параметри...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="198"/> + <location filename="../ImportDialog.cpp" line="195"/> <location filename="../ProfileInterface.cpp" line="721"/> <source>Custom Avatar</source> <comment>Custom Avatar Description in SC, don't use Special Character!</comment> <translation>Користувацький Аватар</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="225"/> + <location filename="../ImportDialog.cpp" line="218"/> <location filename="../ProfileInterface.cpp" line="740"/> <source>Custom Picture</source> <comment>Custom Picture Description in SC, don't use Special Character!</comment> <translation>Користувацьке Зображення</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="318"/> + <location filename="../ImportDialog.cpp" line="353"/> <source>Storage</source> <comment>Background Image: Storage</comment> <translation>Зберігання</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="355"/> + <location filename="../ImportDialog.cpp" line="398"/> <source>Crop Picture...</source> <translation>Обрізати зображення...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="397"/> + <location filename="../ImportDialog.cpp" line="440"/> <source>&Crop</source> <translation>&Обрізати</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="398"/> + <location filename="../ImportDialog.cpp" line="441"/> <source>Crop Picture</source> <translation>Обрізати зображення</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="485"/> - <location filename="../ImportDialog.cpp" line="533"/> + <location filename="../ImportDialog.cpp" line="528"/> + <location filename="../ImportDialog.cpp" line="576"/> <source>Please import a new picture first</source> <translation>Спершу імпортуйте нове зображення</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="490"/> - <location filename="../ImportDialog.cpp" line="500"/> + <location filename="../ImportDialog.cpp" line="533"/> + <location filename="../ImportDialog.cpp" line="543"/> <source>Default</source> <comment>Default as Default Profile</comment> <translation>Стандартний</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="491"/> - <location filename="../ImportDialog.cpp" line="492"/> - <location filename="../ImportDialog.cpp" line="493"/> - <location filename="../ImportDialog.cpp" line="494"/> - <location filename="../ImportDialog.cpp" line="495"/> - <location filename="../ImportDialog.cpp" line="504"/> - <location filename="../ImportDialog.cpp" line="508"/> - <location filename="../ImportDialog.cpp" line="512"/> - <location filename="../ImportDialog.cpp" line="516"/> - <location filename="../ImportDialog.cpp" line="520"/> + <location filename="../ImportDialog.cpp" line="534"/> + <location filename="../ImportDialog.cpp" line="535"/> + <location filename="../ImportDialog.cpp" line="536"/> + <location filename="../ImportDialog.cpp" line="537"/> <location filename="../ImportDialog.cpp" line="538"/> - <location filename="../ImportDialog.cpp" line="539"/> - <location filename="../ImportDialog.cpp" line="540"/> - <location filename="../ImportDialog.cpp" line="541"/> - <location filename="../ImportDialog.cpp" line="542"/> <location filename="../ImportDialog.cpp" line="547"/> <location filename="../ImportDialog.cpp" line="551"/> <location filename="../ImportDialog.cpp" line="555"/> <location filename="../ImportDialog.cpp" line="559"/> <location filename="../ImportDialog.cpp" line="563"/> + <location filename="../ImportDialog.cpp" line="581"/> + <location filename="../ImportDialog.cpp" line="582"/> + <location filename="../ImportDialog.cpp" line="583"/> + <location filename="../ImportDialog.cpp" line="584"/> + <location filename="../ImportDialog.cpp" line="585"/> + <location filename="../ImportDialog.cpp" line="590"/> + <location filename="../ImportDialog.cpp" line="594"/> + <location filename="../ImportDialog.cpp" line="598"/> + <location filename="../ImportDialog.cpp" line="602"/> + <location filename="../ImportDialog.cpp" line="606"/> <source>Profile %1</source> <comment>Profile %1 as Profile 1</comment> <translation>Профіль %1</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="485"/> - <location filename="../ImportDialog.cpp" line="496"/> + <location filename="../ImportDialog.cpp" line="528"/> + <location filename="../ImportDialog.cpp" line="539"/> <source>Load Settings...</source> <translation>Завантажити параметри...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="533"/> - <location filename="../ImportDialog.cpp" line="543"/> + <location filename="../ImportDialog.cpp" line="576"/> + <location filename="../ImportDialog.cpp" line="586"/> <source>Save Settings...</source> <translation>Зберегти параметри...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="675"/> + <location filename="../ImportDialog.cpp" line="727"/> + <location filename="../ImportDialog.cpp" line="909"/> <source>Snapmatic Avatar Zone</source> <translation>Зона Snapmatic Аватару</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="675"/> + <location filename="../ImportDialog.cpp" line="727"/> + <location filename="../ImportDialog.cpp" line="909"/> <source>Are you sure to use a square image outside of the Avatar Zone? When you want to use it as Avatar the image will be detached!</source> <translation>Ви впевнені, що будете використовувати квадратне зображення поза зоною аватара? Якщо ви хочете використовувати його як Аватар, зображення буде відокремлено!</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="724"/> + <location filename="../ImportDialog.cpp" line="773"/> <source>Select Colour...</source> <translation>Вибір кольору...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="318"/> - <location filename="../ImportDialog.cpp" line="793"/> + <location filename="../ImportDialog.cpp" line="353"/> + <location filename="../ImportDialog.cpp" line="842"/> <source>Background Image: %1</source> <translation>Фонове зображення: %1</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="496"/> - <location filename="../ImportDialog.cpp" line="543"/> + <location filename="../ImportDialog.cpp" line="539"/> + <location filename="../ImportDialog.cpp" line="586"/> <source>Please select your settings profile</source> <translation>Будь ласка, виберіть свій профіль налаштувань</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="793"/> + <location filename="../ImportDialog.cpp" line="842"/> <source>File</source> <comment>Background Image: File</comment> <translation>Файл</translation> @@ -1294,8 +1331,8 @@ Press 1 for Default View</source> <translation>Експортується файл %1 з %2 файлів</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="426"/> - <location filename="../ImportDialog.cpp" line="747"/> + <location filename="../ImportDialog.cpp" line="469"/> + <location filename="../ImportDialog.cpp" line="796"/> <location filename="../ProfileInterface.cpp" line="496"/> <location filename="../ProfileInterface.cpp" line="497"/> <location filename="../ProfileInterface.cpp" line="541"/> @@ -1317,40 +1354,40 @@ Press 1 for Default View</source> <translation>Імпортування...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="427"/> - <location filename="../ImportDialog.cpp" line="458"/> - <location filename="../ImportDialog.cpp" line="467"/> - <location filename="../ImportDialog.cpp" line="748"/> - <location filename="../ImportDialog.cpp" line="779"/> - <location filename="../ImportDialog.cpp" line="788"/> + <location filename="../ImportDialog.cpp" line="470"/> + <location filename="../ImportDialog.cpp" line="501"/> + <location filename="../ImportDialog.cpp" line="510"/> + <location filename="../ImportDialog.cpp" line="797"/> + <location filename="../ImportDialog.cpp" line="828"/> + <location filename="../ImportDialog.cpp" line="837"/> <source>Import</source> <translation>Імпорт</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="437"/> - <location filename="../ImportDialog.cpp" line="758"/> + <location filename="../ImportDialog.cpp" line="480"/> + <location filename="../ImportDialog.cpp" line="807"/> <location filename="../ProfileInterface.cpp" line="516"/> <source>All image files (%1)</source> <translation>Файли зображень (%1)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="438"/> - <location filename="../ImportDialog.cpp" line="759"/> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="808"/> <location filename="../ProfileInterface.cpp" line="517"/> <location filename="../UserInterface.cpp" line="477"/> <source>All files (**)</source> <translation>Усі файли (**)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="458"/> - <location filename="../ImportDialog.cpp" line="779"/> + <location filename="../ImportDialog.cpp" line="501"/> + <location filename="../ImportDialog.cpp" line="828"/> <location filename="../ProfileInterface.cpp" line="786"/> <source>Can't import %1 because file can't be open</source> <translation>Неможливо імпортувати %1, оскільки файл не може бути відкритий</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="467"/> - <location filename="../ImportDialog.cpp" line="788"/> + <location filename="../ImportDialog.cpp" line="510"/> + <location filename="../ImportDialog.cpp" line="837"/> <location filename="../ProfileInterface.cpp" line="796"/> <source>Can't import %1 because file can't be parsed properly</source> <translation>Неможливо імпортувати %1, оскільки файл неможливо розібрати правильно</translation> @@ -2046,24 +2083,24 @@ Press 1 for Default View</source> <name>SnapmaticPicture</name> <message> <location filename="../JsonEditorDialog.cpp" line="177"/> - <location filename="../SnapmaticPicture.cpp" line="354"/> + <location filename="../SnapmaticPicture.cpp" line="353"/> <source>JSON is incomplete and malformed</source> <translation>JSON неповний та неправильний</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="181"/> - <location filename="../SnapmaticPicture.cpp" line="358"/> + <location filename="../SnapmaticPicture.cpp" line="357"/> <source>JSON is incomplete</source> <translation>JSON неповний</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="185"/> - <location filename="../SnapmaticPicture.cpp" line="362"/> + <location filename="../SnapmaticPicture.cpp" line="361"/> <source>JSON is malformed</source> <translation>JSON неправильний</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="159"/> + <location filename="../SnapmaticPicture.cpp" line="154"/> <source>PHOTO - %1</source> <translation>ФОТО - %1</translation> </message> @@ -2073,37 +2110,37 @@ Press 1 for Default View</source> <translation>відкрити файл%1</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="330"/> + <location filename="../SnapmaticPicture.cpp" line="329"/> <source>header not exists</source> <translation>заголовок не існує</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="334"/> + <location filename="../SnapmaticPicture.cpp" line="333"/> <source>header is malformed</source> <translation>заголовок неправильний</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="338"/> + <location filename="../SnapmaticPicture.cpp" line="337"/> <source>picture not exists (%1)</source> <translation>зображення не існує (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="342"/> + <location filename="../SnapmaticPicture.cpp" line="341"/> <source>JSON not exists (%1)</source> <translation>JSON не існує (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="346"/> + <location filename="../SnapmaticPicture.cpp" line="345"/> <source>title not exists (%1)</source> <translation>заголовок не існує (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="350"/> + <location filename="../SnapmaticPicture.cpp" line="349"/> <source>description not exists (%1)</source> <translation>опис не існує (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="364"/> + <location filename="../SnapmaticPicture.cpp" line="363"/> <source>reading file %1 because of %2</source> <comment>Example for %2: JSON is malformed error</comment> <translation>читання файлу %1 тому що %2</translation> diff --git a/res/gta5sync_zh_TW.ts b/res/gta5sync_zh_TW.ts index 2f0a58f..1ed0c36 100644 --- a/res/gta5sync_zh_TW.ts +++ b/res/gta5sync_zh_TW.ts @@ -175,27 +175,27 @@ Pictures and Savegames</source> <context> <name>ImageEditorDialog</name> <message> - <location filename="../ImportDialog.cpp" line="640"/> + <location filename="../ImportDialog.cpp" line="685"/> <source>Overwrite Image...</source> <translation>修改圖片...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="642"/> + <location filename="../ImportDialog.cpp" line="687"/> <source>Apply changes</source> <translation>套用變更</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="641"/> + <location filename="../ImportDialog.cpp" line="686"/> <source>&Overwrite</source> <translation>修改(&O)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="644"/> + <location filename="../ImportDialog.cpp" line="689"/> <source>Discard changes</source> <translation>捨棄變更</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="643"/> + <location filename="../ImportDialog.cpp" line="688"/> <source>&Close</source> <translation>關閉(&C)</translation> </message> @@ -255,9 +255,9 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="150"/> - <location filename="../ImportDialog.cpp" line="87"/> - <location filename="../ImportDialog.cpp" line="315"/> - <location filename="../ImportDialog.cpp" line="728"/> + <location filename="../ImportDialog.cpp" line="86"/> + <location filename="../ImportDialog.cpp" line="351"/> + <location filename="../ImportDialog.cpp" line="777"/> <source>Background Colour: <span style="color: %1">%1</span></source> <translation>背景顏色: <span style="color: %1">%1</span></translation> </message> @@ -274,9 +274,9 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="203"/> - <location filename="../ImportDialog.cpp" line="88"/> - <location filename="../ImportDialog.cpp" line="323"/> - <location filename="../ImportDialog.cpp" line="808"/> + <location filename="../ImportDialog.cpp" line="87"/> + <location filename="../ImportDialog.cpp" line="357"/> + <location filename="../ImportDialog.cpp" line="857"/> <source>Background Image:</source> <translation>背景圖片:</translation> </message> @@ -301,170 +301,207 @@ Pictures and Savegames</source> <translation>強制在大頭貼區域使用顏色</translation> </message> <message> - <location filename="../ImportDialog.ui" line="305"/> + <location filename="../ImportDialog.ui" line="303"/> + <source>Advanced</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="311"/> + <source>Resolution:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="324"/> + <source>Snapmatic resolution</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="335"/> + <source>Avoid compression and expand buffer instead, improves picture quality, but may break Snapmatic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="338"/> + <source>Unlimited Buffer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="345"/> + <source>Import as-is, don't change the picture at all, guarantee to break Snapmatic unless you know what you doing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="348"/> + <source>Import as-is</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.ui" line="362"/> <source>Import options</source> <translation>匯入選項</translation> </message> <message> - <location filename="../ImportDialog.ui" line="308"/> + <location filename="../ImportDialog.ui" line="365"/> <source>&Options</source> <translation>選項(&O)</translation> </message> <message> - <location filename="../ImportDialog.ui" line="337"/> + <location filename="../ImportDialog.ui" line="394"/> <source>Import picture</source> <translation>匯入圖片</translation> </message> <message> - <location filename="../ImportDialog.ui" line="340"/> + <location filename="../ImportDialog.ui" line="397"/> <source>&OK</source> <translation>確定(&O)</translation> </message> <message> - <location filename="../ImportDialog.ui" line="353"/> + <location filename="../ImportDialog.ui" line="410"/> <source>Discard picture</source> <translation>捨棄圖片</translation> </message> <message> - <location filename="../ImportDialog.ui" line="356"/> + <location filename="../ImportDialog.ui" line="413"/> <source>&Cancel</source> <translation>取消(&C)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="120"/> + <location filename="../ImportDialog.cpp" line="126"/> <source>&Import new Picture...</source> <translation>匯入新圖片(&I)...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="121"/> + <location filename="../ImportDialog.cpp" line="127"/> <source>&Crop Picture...</source> <translation>裁剪圖片(&C)...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="123"/> + <location filename="../ImportDialog.cpp" line="129"/> <source>&Load Settings...</source> <translation>載入設定(&L)...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="124"/> + <location filename="../ImportDialog.cpp" line="130"/> <source>&Save Settings...</source> <translation>儲存設定(&S)...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="198"/> + <location filename="../ImportDialog.cpp" line="195"/> <location filename="../ProfileInterface.cpp" line="721"/> <source>Custom Avatar</source> <comment>Custom Avatar Description in SC, don't use Special Character!</comment> <translation>自訂大頭貼</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="225"/> + <location filename="../ImportDialog.cpp" line="218"/> <location filename="../ProfileInterface.cpp" line="740"/> <source>Custom Picture</source> <comment>Custom Picture Description in SC, don't use Special Character!</comment> <translation>自訂圖片</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="318"/> + <location filename="../ImportDialog.cpp" line="353"/> <source>Storage</source> <comment>Background Image: Storage</comment> <translation>儲存</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="355"/> + <location filename="../ImportDialog.cpp" line="398"/> <source>Crop Picture...</source> <translation>裁剪圖片...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="397"/> + <location filename="../ImportDialog.cpp" line="440"/> <source>&Crop</source> <translation>裁剪(&C)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="398"/> + <location filename="../ImportDialog.cpp" line="441"/> <source>Crop Picture</source> <translation>裁剪圖片</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="485"/> - <location filename="../ImportDialog.cpp" line="533"/> + <location filename="../ImportDialog.cpp" line="528"/> + <location filename="../ImportDialog.cpp" line="576"/> <source>Please import a new picture first</source> <translation>請先匯入新圖片</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="490"/> - <location filename="../ImportDialog.cpp" line="500"/> + <location filename="../ImportDialog.cpp" line="533"/> + <location filename="../ImportDialog.cpp" line="543"/> <source>Default</source> <comment>Default as Default Profile</comment> <translation>預設</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="491"/> - <location filename="../ImportDialog.cpp" line="492"/> - <location filename="../ImportDialog.cpp" line="493"/> - <location filename="../ImportDialog.cpp" line="494"/> - <location filename="../ImportDialog.cpp" line="495"/> - <location filename="../ImportDialog.cpp" line="504"/> - <location filename="../ImportDialog.cpp" line="508"/> - <location filename="../ImportDialog.cpp" line="512"/> - <location filename="../ImportDialog.cpp" line="516"/> - <location filename="../ImportDialog.cpp" line="520"/> + <location filename="../ImportDialog.cpp" line="534"/> + <location filename="../ImportDialog.cpp" line="535"/> + <location filename="../ImportDialog.cpp" line="536"/> + <location filename="../ImportDialog.cpp" line="537"/> <location filename="../ImportDialog.cpp" line="538"/> - <location filename="../ImportDialog.cpp" line="539"/> - <location filename="../ImportDialog.cpp" line="540"/> - <location filename="../ImportDialog.cpp" line="541"/> - <location filename="../ImportDialog.cpp" line="542"/> <location filename="../ImportDialog.cpp" line="547"/> <location filename="../ImportDialog.cpp" line="551"/> <location filename="../ImportDialog.cpp" line="555"/> <location filename="../ImportDialog.cpp" line="559"/> <location filename="../ImportDialog.cpp" line="563"/> + <location filename="../ImportDialog.cpp" line="581"/> + <location filename="../ImportDialog.cpp" line="582"/> + <location filename="../ImportDialog.cpp" line="583"/> + <location filename="../ImportDialog.cpp" line="584"/> + <location filename="../ImportDialog.cpp" line="585"/> + <location filename="../ImportDialog.cpp" line="590"/> + <location filename="../ImportDialog.cpp" line="594"/> + <location filename="../ImportDialog.cpp" line="598"/> + <location filename="../ImportDialog.cpp" line="602"/> + <location filename="../ImportDialog.cpp" line="606"/> <source>Profile %1</source> <comment>Profile %1 as Profile 1</comment> <translation>設定檔 %1</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="485"/> - <location filename="../ImportDialog.cpp" line="496"/> + <location filename="../ImportDialog.cpp" line="528"/> + <location filename="../ImportDialog.cpp" line="539"/> <source>Load Settings...</source> <translation>載入設定...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="533"/> - <location filename="../ImportDialog.cpp" line="543"/> + <location filename="../ImportDialog.cpp" line="576"/> + <location filename="../ImportDialog.cpp" line="586"/> <source>Save Settings...</source> <translation>儲存設定...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="675"/> + <location filename="../ImportDialog.cpp" line="727"/> + <location filename="../ImportDialog.cpp" line="909"/> <source>Snapmatic Avatar Zone</source> <translation>Snapmatic 大頭貼區域</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="675"/> + <location filename="../ImportDialog.cpp" line="727"/> + <location filename="../ImportDialog.cpp" line="909"/> <source>Are you sure to use a square image outside of the Avatar Zone? When you want to use it as Avatar the image will be detached!</source> <translation>你確定要在大頭貼區域以外的地方使用方形圖片嗎? 作為大頭貼的圖片將被分離!</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="724"/> + <location filename="../ImportDialog.cpp" line="773"/> <source>Select Colour...</source> <translation>選擇顏色...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="318"/> - <location filename="../ImportDialog.cpp" line="793"/> + <location filename="../ImportDialog.cpp" line="353"/> + <location filename="../ImportDialog.cpp" line="842"/> <source>Background Image: %1</source> <translation>背景圖片: %1</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="496"/> - <location filename="../ImportDialog.cpp" line="543"/> + <location filename="../ImportDialog.cpp" line="539"/> + <location filename="../ImportDialog.cpp" line="586"/> <source>Please select your settings profile</source> <translation>請選擇設定檔</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="793"/> + <location filename="../ImportDialog.cpp" line="842"/> <source>File</source> <comment>Background Image: File</comment> <translation>文件</translation> @@ -1288,8 +1325,8 @@ Press 1 for Default View</source> <translation>匯出檔案中 %1 共 %2 個檔案</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="426"/> - <location filename="../ImportDialog.cpp" line="747"/> + <location filename="../ImportDialog.cpp" line="469"/> + <location filename="../ImportDialog.cpp" line="796"/> <location filename="../ProfileInterface.cpp" line="496"/> <location filename="../ProfileInterface.cpp" line="497"/> <location filename="../ProfileInterface.cpp" line="541"/> @@ -1311,40 +1348,40 @@ Press 1 for Default View</source> <translation>匯入...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="427"/> - <location filename="../ImportDialog.cpp" line="458"/> - <location filename="../ImportDialog.cpp" line="467"/> - <location filename="../ImportDialog.cpp" line="748"/> - <location filename="../ImportDialog.cpp" line="779"/> - <location filename="../ImportDialog.cpp" line="788"/> + <location filename="../ImportDialog.cpp" line="470"/> + <location filename="../ImportDialog.cpp" line="501"/> + <location filename="../ImportDialog.cpp" line="510"/> + <location filename="../ImportDialog.cpp" line="797"/> + <location filename="../ImportDialog.cpp" line="828"/> + <location filename="../ImportDialog.cpp" line="837"/> <source>Import</source> <translation>匯入</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="437"/> - <location filename="../ImportDialog.cpp" line="758"/> + <location filename="../ImportDialog.cpp" line="480"/> + <location filename="../ImportDialog.cpp" line="807"/> <location filename="../ProfileInterface.cpp" line="516"/> <source>All image files (%1)</source> <translation>所有圖片 (%1)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="438"/> - <location filename="../ImportDialog.cpp" line="759"/> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="808"/> <location filename="../ProfileInterface.cpp" line="517"/> <location filename="../UserInterface.cpp" line="477"/> <source>All files (**)</source> <translation>所有檔案 (**)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="458"/> - <location filename="../ImportDialog.cpp" line="779"/> + <location filename="../ImportDialog.cpp" line="501"/> + <location filename="../ImportDialog.cpp" line="828"/> <location filename="../ProfileInterface.cpp" line="786"/> <source>Can't import %1 because file can't be open</source> <translation>無法匯入 %1,因為檔案無法開啟</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="467"/> - <location filename="../ImportDialog.cpp" line="788"/> + <location filename="../ImportDialog.cpp" line="510"/> + <location filename="../ImportDialog.cpp" line="837"/> <location filename="../ProfileInterface.cpp" line="796"/> <source>Can't import %1 because file can't be parsed properly</source> <translation>無法匯入 %1,因為檔案無法正確解析</translation> @@ -2036,24 +2073,24 @@ Press 1 for Default View</source> <name>SnapmaticPicture</name> <message> <location filename="../JsonEditorDialog.cpp" line="177"/> - <location filename="../SnapmaticPicture.cpp" line="354"/> + <location filename="../SnapmaticPicture.cpp" line="353"/> <source>JSON is incomplete and malformed</source> <translation>JSON 不完整和異常</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="181"/> - <location filename="../SnapmaticPicture.cpp" line="358"/> + <location filename="../SnapmaticPicture.cpp" line="357"/> <source>JSON is incomplete</source> <translation>JSON 不完整</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="185"/> - <location filename="../SnapmaticPicture.cpp" line="362"/> + <location filename="../SnapmaticPicture.cpp" line="361"/> <source>JSON is malformed</source> <translation>JSON 異常</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="159"/> + <location filename="../SnapmaticPicture.cpp" line="154"/> <source>PHOTO - %1</source> <translation>照片 - %1</translation> </message> @@ -2063,37 +2100,37 @@ Press 1 for Default View</source> <translation>開啟檔案 - %1</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="330"/> + <location filename="../SnapmaticPicture.cpp" line="329"/> <source>header not exists</source> <translation>標頭不存在</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="334"/> + <location filename="../SnapmaticPicture.cpp" line="333"/> <source>header is malformed</source> <translation>標頭異常</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="338"/> + <location filename="../SnapmaticPicture.cpp" line="337"/> <source>picture not exists (%1)</source> <translation>圖片不存在 (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="342"/> + <location filename="../SnapmaticPicture.cpp" line="341"/> <source>JSON not exists (%1)</source> <translation>JSON 不存在 (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="346"/> + <location filename="../SnapmaticPicture.cpp" line="345"/> <source>title not exists (%1)</source> <translation>標題不存在 (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="350"/> + <location filename="../SnapmaticPicture.cpp" line="349"/> <source>description not exists (%1)</source> <translation>描述不存在 (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="364"/> + <location filename="../SnapmaticPicture.cpp" line="363"/> <source>reading file %1 because of %2</source> <comment>Example for %2: JSON is malformed error</comment> <translation>讀取檔案 %1 失敗,因為 %2</translation>