From b02f06ae9706e0509c64e2c0764055b3157a3833 Mon Sep 17 00:00:00 2001 From: Syping <schiedelrafael@keppe.org> Date: Wed, 25 Jul 2018 20:52:30 +0200 Subject: [PATCH] ImportDialog improved --- ImportDialog.cpp | 170 +++++++++++++++++++++++++++++++++++ ImportDialog.h | 4 + SnapmaticEditor.ui | 6 ++ config.h | 2 +- res/gta5sync.ts | 159 +++++++++++++++++++++++++-------- res/gta5sync_de.qm | Bin 46137 -> 47820 bytes res/gta5sync_de.ts | 161 ++++++++++++++++++++++++++-------- res/gta5sync_en_US.ts | 159 +++++++++++++++++++++++++-------- res/gta5sync_fr.qm | Bin 42522 -> 42734 bytes res/gta5sync_fr.ts | 159 +++++++++++++++++++++++++-------- res/gta5sync_ru.qm | Bin 42826 -> 43064 bytes res/gta5sync_ru.ts | 200 ++++++++++++++++++++++++++++++------------ res/gta5sync_uk.qm | Bin 43809 -> 43989 bytes res/gta5sync_uk.ts | 159 +++++++++++++++++++++++++-------- res/gta5sync_zh_TW.qm | Bin 32875 -> 33007 bytes res/gta5sync_zh_TW.ts | 159 +++++++++++++++++++++++++-------- 16 files changed, 1060 insertions(+), 278 deletions(-) diff --git a/ImportDialog.cpp b/ImportDialog.cpp index bb9ebda..880db7d 100644 --- a/ImportDialog.cpp +++ b/ImportDialog.cpp @@ -24,6 +24,7 @@ #include "AppEnv.h" #include "config.h" #include <QStringBuilder> +#include <QInputDialog> #include <QImageReader> #include <QColorDialog> #include <QFileDialog> @@ -62,6 +63,13 @@ ImportDialog::ImportDialog(QString profileName, QWidget *parent) : avatarAreaImage = QImage(":/img/avatarareaimport.png"); selectedColour = QColor::fromRgb(0, 0, 0, 255); + // Set Import Settings + QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR); + settings.beginGroup("Import"); + QString currentProfile = settings.value("Profile", "Default").toString(); + settings.endGroup(); + processSettings(currentProfile); + // Set Icon for OK Button if (QIcon::hasThemeIcon("dialog-ok")) { @@ -111,6 +119,9 @@ ImportDialog::ImportDialog(QString profileName, QWidget *parent) : 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); setMaximumSize(sizeHint()); @@ -258,6 +269,75 @@ void ImportDialog::processWatermark(QPainter *snapmaticPainter) snapmaticPainter->drawImage(0, 0, textWatermark); } +void ImportDialog::processSettings(QString settingsProfile, bool setDefault) +{ + QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR); + settings.beginGroup("Import"); + if (setDefault) + { + settings.setValue("Profile", settingsProfile); + } + if (settingsProfile == "Default") + { + watermarkAvatar = true; + watermarkPicture = false; + selectedColour = QColor::fromRgb(0, 0, 0, 255); + backImage = QImage(); + ui->cbStretch->setChecked(false); + ui->cbForceAvatarColour->setChecked(false); + } + else + { + settings.beginGroup(settingsProfile); + watermarkAvatar = settings.value("WatermarkAvatar", true).toBool(); + watermarkPicture = settings.value("WatermarkPicture", false).toBool(); + backImage = qvariant_cast<QImage>(settings.value("BackgroundImage", QImage())); + 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()); + settings.endGroup(); + } + if (!workImage.isNull()) + { + if (ui->cbAvatar->isChecked()) + { + ui->cbWatermark->setChecked(watermarkAvatar); + } + else + { + ui->cbWatermark->setChecked(watermarkPicture); + } + } + ui->labColour->setText(tr("Background Colour: <span style=\"color: %1\">%1</span>").arg(selectedColour.name())); + if (!backImage.isNull()) + { + ui->labBackgroundImage->setText(tr("Background Image: %1").arg(tr("Storage", "Background Image: Storage"))); + ui->cmdBackgroundWipe->setVisible(true); + } + else + { + ui->labBackgroundImage->setText(tr("Background Image:")); + ui->cmdBackgroundWipe->setVisible(false); + } + settings.endGroup(); +} + +void ImportDialog::saveSettings(QString settingsProfile) +{ + QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR); + settings.beginGroup("Import"); + settings.beginGroup(settingsProfile); + settings.setValue("WatermarkAvatar", watermarkAvatar); + settings.setValue("WatermarkPicture", watermarkPicture); + settings.setValue("BackgroundImage", backImage); + settings.setValue("SelectedColour", selectedColour); + settings.setValue("BackgroundStretch", ui->cbStretch->isChecked()); + settings.setValue("ForceAvatarColour", ui->cbForceAvatarColour->isChecked()); + settings.endGroup(); + settings.setValue("Profile", settingsProfile); + settings.endGroup(); +} + void ImportDialog::cropPicture() { qreal screenRatio = AppEnv::screenRatio(); @@ -394,6 +474,96 @@ fileDialogPreOpen: //Work? settings.endGroup(); } +void ImportDialog::loadImportSettings() +{ + if (settingsLocked) + { + QMessageBox::information(this, tr("Load Settings..."), tr("Please import a new picture first")); + return; + } + 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"); + QString sProfile = QInputDialog::getItem(this, tr("Load Settings..."), tr("Please select your settings profile"), profileList, 0, false, &ok, windowFlags()); + if (ok) + { + QString pProfile; + if (sProfile == tr("Default", "Default as Default Profile")) + { + pProfile = "Default"; + } + else if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("1")) + { + pProfile = "Profile 1"; + } + else if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("2")) + { + pProfile = "Profile 2"; + } + else if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("3")) + { + pProfile = "Profile 3"; + } + else if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("4")) + { + pProfile = "Profile 4"; + } + else if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("5")) + { + pProfile = "Profile 5"; + } + processSettings(pProfile, true); + processImage(); + } +} + +void ImportDialog::saveImportSettings() +{ + if (settingsLocked) + { + QMessageBox::information(this, tr("Save Settings..."), tr("Please import a new picture first")); + return; + } + 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"); + QString sProfile = QInputDialog::getItem(this, tr("Save Settings..."), tr("Please select your settings profile"), profileList, 0, false, &ok, windowFlags()); + if (ok) + { + QString pProfile; + if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("1")) + { + pProfile = "Profile 1"; + } + else if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("2")) + { + pProfile = "Profile 2"; + } + else if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("3")) + { + pProfile = "Profile 3"; + } + else if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("4")) + { + pProfile = "Profile 4"; + } + else if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("5")) + { + pProfile = "Profile 5"; + } + saveSettings(pProfile); + } +} + QImage ImportDialog::image() { return newImage; diff --git a/ImportDialog.h b/ImportDialog.h index 839632f..dda74b3 100644 --- a/ImportDialog.h +++ b/ImportDialog.h @@ -45,6 +45,8 @@ private slots: void processImage(); void cropPicture(); void importNewPicture(); + void loadImportSettings(); + void saveImportSettings(); void on_cbIgnore_toggled(bool checked); void on_cbAvatar_toggled(bool checked); void on_cmdCancel_clicked(); @@ -77,6 +79,8 @@ private: int snapmaticResolutionLW; int snapmaticResolutionLH; void processWatermark(QPainter *snapmaticPainter); + void processSettings(QString settingsProfile, bool setDefault = false); + void saveSettings(QString settingsProfile); }; #endif // IMPORTDIALOG_H diff --git a/SnapmaticEditor.ui b/SnapmaticEditor.ui index e591fcc..fc9ede9 100644 --- a/SnapmaticEditor.ui +++ b/SnapmaticEditor.ui @@ -236,6 +236,9 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="toolTip"> + <string>Apply changes</string> + </property> <property name="text"> <string>&Apply</string> </property> @@ -249,6 +252,9 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="toolTip"> + <string>Discard changes</string> + </property> <property name="text"> <string>&Cancel</string> </property> diff --git a/config.h b/config.h index 2381763..ca74c4b 100644 --- a/config.h +++ b/config.h @@ -28,7 +28,7 @@ #endif #ifndef GTA5SYNC_APPVENDORLINK -#define GTA5SYNC_APPVENDORLINK "https://github.com/Syping/" +#define GTA5SYNC_APPVENDORLINK "g5e://about?U3lwaW5n:R2l0TGFiOiA8YSBocmVmPSJodHRwczovL2dpdGxhYi5jb20vU3lwaW5nIj5TeXBpbmc8L2E+PGJyLz5HaXRIdWI6IDxhIGhyZWY9Imh0dHBzOi8vZ2l0aHViLmNvbS9TeXBpbmciPlN5cGluZzwvYT48YnIvPlNvY2lhbCBDbHViOiA8YSBocmVmPSJodHRwczovL3NvY2lhbGNsdWIucm9ja3N0YXJnYW1lcy5jb20vbWVtYmVyL1N5cGluZy80NjMwMzA1NiI+U3lwaW5nPC9hPg==" #endif #ifndef GTA5SYNC_APPSTR diff --git a/res/gta5sync.ts b/res/gta5sync.ts index 4f2b2d6..40d457f 100644 --- a/res/gta5sync.ts +++ b/res/gta5sync.ts @@ -167,7 +167,7 @@ Pictures and Savegames</source> <name>ImageEditorDialog</name> <message> <location filename="../ImageEditorDialog.ui" line="14"/> - <location filename="../ImportDialog.cpp" line="465"/> + <location filename="../ImportDialog.cpp" line="635"/> <source>Overwrite Image...</source> <translation type="unfinished"></translation> </message> @@ -183,25 +183,25 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImageEditorDialog.ui" line="82"/> - <location filename="../ImportDialog.cpp" line="467"/> + <location filename="../ImportDialog.cpp" line="637"/> <source>Apply changes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="85"/> - <location filename="../ImportDialog.cpp" line="466"/> + <location filename="../ImportDialog.cpp" line="636"/> <source>&Overwrite</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="92"/> - <location filename="../ImportDialog.cpp" line="469"/> + <location filename="../ImportDialog.cpp" line="639"/> <source>Discard changes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="95"/> - <location filename="../ImportDialog.cpp" line="468"/> + <location filename="../ImportDialog.cpp" line="638"/> <source>&Close</source> <translation type="unfinished"></translation> </message> @@ -265,8 +265,9 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="150"/> - <location filename="../ImportDialog.cpp" line="86"/> - <location filename="../ImportDialog.cpp" line="553"/> + <location filename="../ImportDialog.cpp" line="94"/> + <location filename="../ImportDialog.cpp" line="311"/> + <location filename="../ImportDialog.cpp" line="723"/> <source>Background Colour: <span style="color: %1">%1</span></source> <translation type="unfinished"></translation> </message> @@ -283,8 +284,9 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="203"/> - <location filename="../ImportDialog.cpp" line="87"/> - <location filename="../ImportDialog.cpp" line="633"/> + <location filename="../ImportDialog.cpp" line="95"/> + <location filename="../ImportDialog.cpp" line="319"/> + <location filename="../ImportDialog.cpp" line="803"/> <source>Background Image:</source> <translation type="unfinished"></translation> </message> @@ -339,67 +341,140 @@ Pictures and Savegames</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="112"/> + <location filename="../ImportDialog.cpp" line="120"/> <source>&Import new Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="113"/> + <location filename="../ImportDialog.cpp" line="121"/> <source>&Crop Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="186"/> + <location filename="../ImportDialog.cpp" line="123"/> + <source>&Load Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="124"/> + <source>&Save Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="197"/> <location filename="../ProfileInterface.cpp" line="668"/> <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="213"/> + <location filename="../ImportDialog.cpp" line="224"/> <location filename="../ProfileInterface.cpp" line="687"/> <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="271"/> + <location filename="../ImportDialog.cpp" line="314"/> + <source>Storage</source> + <comment>Background Image: Storage</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="351"/> <source>Crop Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="313"/> + <location filename="../ImportDialog.cpp" line="393"/> <source>&Crop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="314"/> + <location filename="../ImportDialog.cpp" line="394"/> <source>Crop Picture</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="529"/> + <source>Please import a new picture first</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="486"/> + <location filename="../ImportDialog.cpp" line="496"/> + <source>Default</source> + <comment>Default as Default Profile</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="487"/> + <location filename="../ImportDialog.cpp" line="488"/> + <location filename="../ImportDialog.cpp" line="489"/> + <location filename="../ImportDialog.cpp" line="490"/> + <location filename="../ImportDialog.cpp" line="491"/> <location filename="../ImportDialog.cpp" line="500"/> + <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="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="543"/> + <location filename="../ImportDialog.cpp" line="547"/> + <location filename="../ImportDialog.cpp" line="551"/> + <location filename="../ImportDialog.cpp" line="555"/> + <location filename="../ImportDialog.cpp" line="559"/> + <source>Profile %1</source> + <comment>Profile %1 as Profile 1</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="492"/> + <source>Load Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="529"/> + <location filename="../ImportDialog.cpp" line="539"/> + <source>Save Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="670"/> <source>Snapmatic Avatar Zone</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="500"/> + <location filename="../ImportDialog.cpp" line="670"/> <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="549"/> + <location filename="../ImportDialog.cpp" line="719"/> <source>Select Colour...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="618"/> + <location filename="../ImportDialog.cpp" line="314"/> + <location filename="../ImportDialog.cpp" line="788"/> <source>Background Image: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="618"/> + <location filename="../ImportDialog.cpp" line="492"/> + <location filename="../ImportDialog.cpp" line="539"/> + <source>Please select your settings profile</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="788"/> <source>File</source> <comment>Background Image: File</comment> <translation type="unfinished"></translation> @@ -1141,8 +1216,8 @@ Press 1 for Default View</source> </message> <message> <location filename="../ImageEditorDialog.cpp" line="109"/> - <location filename="../ImportDialog.cpp" line="342"/> - <location filename="../ImportDialog.cpp" line="572"/> + <location filename="../ImportDialog.cpp" line="422"/> + <location filename="../ImportDialog.cpp" line="742"/> <location filename="../ProfileInterface.cpp" line="482"/> <location filename="../ProfileInterface.cpp" line="548"/> <location filename="../ProfileInterface.cpp" line="857"/> @@ -1153,12 +1228,12 @@ Press 1 for Default View</source> <location filename="../ImageEditorDialog.cpp" line="110"/> <location filename="../ImageEditorDialog.cpp" line="141"/> <location filename="../ImageEditorDialog.cpp" line="150"/> - <location filename="../ImportDialog.cpp" line="343"/> - <location filename="../ImportDialog.cpp" line="374"/> - <location filename="../ImportDialog.cpp" line="383"/> - <location filename="../ImportDialog.cpp" line="573"/> - <location filename="../ImportDialog.cpp" line="604"/> - <location filename="../ImportDialog.cpp" line="613"/> + <location filename="../ImportDialog.cpp" line="423"/> + <location filename="../ImportDialog.cpp" line="454"/> + <location filename="../ImportDialog.cpp" line="463"/> + <location filename="../ImportDialog.cpp" line="743"/> + <location filename="../ImportDialog.cpp" line="774"/> + <location filename="../ImportDialog.cpp" line="783"/> <location filename="../ProfileInterface.cpp" line="483"/> <location filename="../ProfileInterface.cpp" line="527"/> <location filename="../ProfileInterface.cpp" line="582"/> @@ -1178,16 +1253,16 @@ Press 1 for Default View</source> </message> <message> <location filename="../ImageEditorDialog.cpp" line="120"/> - <location filename="../ImportDialog.cpp" line="353"/> - <location filename="../ImportDialog.cpp" line="583"/> + <location filename="../ImportDialog.cpp" line="433"/> + <location filename="../ImportDialog.cpp" line="753"/> <location filename="../ProfileInterface.cpp" line="502"/> <source>All image files (%1)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="121"/> - <location filename="../ImportDialog.cpp" line="354"/> - <location filename="../ImportDialog.cpp" line="584"/> + <location filename="../ImportDialog.cpp" line="434"/> + <location filename="../ImportDialog.cpp" line="754"/> <location filename="../ProfileInterface.cpp" line="503"/> <location filename="../UserInterface.cpp" line="463"/> <source>All files (**)</source> @@ -1195,16 +1270,16 @@ Press 1 for Default View</source> </message> <message> <location filename="../ImageEditorDialog.cpp" line="141"/> - <location filename="../ImportDialog.cpp" line="374"/> - <location filename="../ImportDialog.cpp" line="604"/> + <location filename="../ImportDialog.cpp" line="454"/> + <location filename="../ImportDialog.cpp" line="774"/> <location filename="../ProfileInterface.cpp" line="725"/> <source>Can't import %1 because file can't be open</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="150"/> - <location filename="../ImportDialog.cpp" line="383"/> - <location filename="../ImportDialog.cpp" line="613"/> + <location filename="../ImportDialog.cpp" line="463"/> + <location filename="../ImportDialog.cpp" line="783"/> <location filename="../ProfileInterface.cpp" line="735"/> <source>Can't import %1 because file can't be parsed properly</source> <translation type="unfinished"></translation> @@ -1777,11 +1852,21 @@ Press 1 for Default View</source> </message> <message> <location filename="../SnapmaticEditor.ui" line="240"/> + <source>Apply changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SnapmaticEditor.ui" line="243"/> <source>&Apply</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="253"/> + <location filename="../SnapmaticEditor.ui" line="256"/> + <source>Discard changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SnapmaticEditor.ui" line="259"/> <source>&Cancel</source> <translation type="unfinished"></translation> </message> diff --git a/res/gta5sync_de.qm b/res/gta5sync_de.qm index f97f7350aa240cbb22702f9e6dbcab627ff21f4b..4a7499aa1f6dd3efbe9dd70672d595bddcecb03b 100644 GIT binary patch delta 4582 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 MT`PN9EcW&LCtV298UO$Q delta 3380 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 diff --git a/res/gta5sync_de.ts b/res/gta5sync_de.ts index 1a8ec1d..e988307 100644 --- a/res/gta5sync_de.ts +++ b/res/gta5sync_de.ts @@ -46,7 +46,7 @@ Läuft auf Qt %6<br/> <location filename="../AboutDialog.cpp" line="50"/> <source>TRANSLATOR</source> <extracomment>Insert your name here and profile here in following scheme, First Translator,First Profile\nSecond Translator\nThird Translator,Second Profile</extracomment> - <translation>Syping,https://github.com/Syping/</translation> + <translation>Syping,g5e://about?U3lwaW5n:R2l0TGFiOiA8YSBocmVmPSJodHRwczovL2dpdGxhYi5jb20vU3lwaW5nIj5TeXBpbmc8L2E+PGJyLz5HaXRIdWI6IDxhIGhyZWY9Imh0dHBzOi8vZ2l0aHViLmNvbS9TeXBpbmciPlN5cGluZzwvYT48YnIvPlNvY2lhbCBDbHViOiA8YSBocmVmPSJodHRwczovL3NvY2lhbGNsdWIucm9ja3N0YXJnYW1lcy5jb20vbWVtYmVyL1N5cGluZy80NjMwMzA1NiI+U3lwaW5nPC9hPg==</translation> </message> <message> <location filename="../AboutDialog.cpp" line="73"/> @@ -187,7 +187,7 @@ Snapmatic Bilder und Spielständen</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="14"/> - <location filename="../ImportDialog.cpp" line="465"/> + <location filename="../ImportDialog.cpp" line="635"/> <source>Overwrite Image...</source> <translation>Bild überschreiben...</translation> </message> @@ -203,25 +203,25 @@ Snapmatic Bilder und Spielständen</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="82"/> - <location filename="../ImportDialog.cpp" line="467"/> + <location filename="../ImportDialog.cpp" line="637"/> <source>Apply changes</source> <translation>Änderungen übernehmen</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="85"/> - <location filename="../ImportDialog.cpp" line="466"/> + <location filename="../ImportDialog.cpp" line="636"/> <source>&Overwrite</source> <translation>&Überschreiben</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="92"/> - <location filename="../ImportDialog.cpp" line="469"/> + <location filename="../ImportDialog.cpp" line="639"/> <source>Discard changes</source> <translation>Änderungen verwerfen</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="95"/> - <location filename="../ImportDialog.cpp" line="468"/> + <location filename="../ImportDialog.cpp" line="638"/> <source>&Close</source> <translation>S&chließen</translation> </message> @@ -275,8 +275,9 @@ Snapmatic Bilder und Spielständen</translation> </message> <message> <location filename="../ImportDialog.ui" line="150"/> - <location filename="../ImportDialog.cpp" line="86"/> - <location filename="../ImportDialog.cpp" line="553"/> + <location filename="../ImportDialog.cpp" line="94"/> + <location filename="../ImportDialog.cpp" line="311"/> + <location filename="../ImportDialog.cpp" line="723"/> <source>Background Colour: <span style="color: %1">%1</span></source> <translation>Hintergrundfarbe: <span style="color: %1">%1</span></translation> </message> @@ -302,7 +303,8 @@ Snapmatic Bilder und Spielständen</translation> <translation>Hintergrundbild entfernen</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="618"/> + <location filename="../ImportDialog.cpp" line="314"/> + <location filename="../ImportDialog.cpp" line="788"/> <source>Background Image: %1</source> <translation>Hintergrundbild: %1</translation> </message> @@ -348,69 +350,142 @@ Snapmatic Bilder und Spielständen</translation> </message> <message> <location filename="../ImportDialog.ui" line="203"/> - <location filename="../ImportDialog.cpp" line="87"/> - <location filename="../ImportDialog.cpp" line="633"/> + <location filename="../ImportDialog.cpp" line="95"/> + <location filename="../ImportDialog.cpp" line="319"/> + <location filename="../ImportDialog.cpp" line="803"/> <source>Background Image:</source> <translation>Hintergrundbild:</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="112"/> + <location filename="../ImportDialog.cpp" line="120"/> <source>&Import new Picture...</source> <translation>Neues Bild &importieren...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="113"/> + <location filename="../ImportDialog.cpp" line="121"/> <source>&Crop Picture...</source> <translation>Bild zu&schneiden...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="186"/> + <location filename="../ImportDialog.cpp" line="123"/> + <source>&Load Settings...</source> + <translation>Einstellungen &laden...</translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="124"/> + <source>&Save Settings...</source> + <translation>Einstellungen &speichern...</translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="197"/> <location filename="../ProfileInterface.cpp" line="668"/> <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="213"/> + <location filename="../ImportDialog.cpp" line="224"/> <location filename="../ProfileInterface.cpp" line="687"/> <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="271"/> + <location filename="../ImportDialog.cpp" line="314"/> + <source>Storage</source> + <comment>Background Image: Storage</comment> + <translation>Speicher</translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="351"/> <source>Crop Picture...</source> <translation>Bild zuschneiden...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="313"/> + <location filename="../ImportDialog.cpp" line="393"/> <source>&Crop</source> <translation>Zu&schneiden</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="314"/> + <location filename="../ImportDialog.cpp" line="394"/> <source>Crop Picture</source> <translation>Bild zuschneiden</translation> </message> <message> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="529"/> + <source>Please import a new picture first</source> + <translation>Bitte importiere ein neues Bild zuerst</translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="486"/> + <location filename="../ImportDialog.cpp" line="496"/> + <source>Default</source> + <comment>Default as Default Profile</comment> + <translation>Standard</translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="487"/> + <location filename="../ImportDialog.cpp" line="488"/> + <location filename="../ImportDialog.cpp" line="489"/> + <location filename="../ImportDialog.cpp" line="490"/> + <location filename="../ImportDialog.cpp" line="491"/> <location filename="../ImportDialog.cpp" line="500"/> + <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="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="543"/> + <location filename="../ImportDialog.cpp" line="547"/> + <location filename="../ImportDialog.cpp" line="551"/> + <location filename="../ImportDialog.cpp" line="555"/> + <location filename="../ImportDialog.cpp" line="559"/> + <source>Profile %1</source> + <comment>Profile %1 as Profile 1</comment> + <translation>Profil %1</translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="492"/> + <source>Load Settings...</source> + <translation>Einstellungen laden...</translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="492"/> + <location filename="../ImportDialog.cpp" line="539"/> + <source>Please select your settings profile</source> + <translation>Bitte wähle dein Einstellungsprofil aus</translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="529"/> + <location filename="../ImportDialog.cpp" line="539"/> + <source>Save Settings...</source> + <translation>Einstellungen speichern...</translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="670"/> <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="500"/> + <location filename="../ImportDialog.cpp" line="670"/> <source>Snapmatic Avatar Zone</source> <translation>Snapmatic Avatar Zone</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="549"/> + <location filename="../ImportDialog.cpp" line="719"/> <source>Select Colour...</source> <translation>Farbe auswählen...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="618"/> + <location filename="../ImportDialog.cpp" line="788"/> <source>File</source> <comment>Background Image: File</comment> <translation>Datei</translation> @@ -1168,8 +1243,8 @@ Drücke 1 für Standardmodus</translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="109"/> - <location filename="../ImportDialog.cpp" line="342"/> - <location filename="../ImportDialog.cpp" line="572"/> + <location filename="../ImportDialog.cpp" line="422"/> + <location filename="../ImportDialog.cpp" line="742"/> <location filename="../ProfileInterface.cpp" line="482"/> <location filename="../ProfileInterface.cpp" line="548"/> <location filename="../ProfileInterface.cpp" line="857"/> @@ -1180,12 +1255,12 @@ Drücke 1 für Standardmodus</translation> <location filename="../ImageEditorDialog.cpp" line="110"/> <location filename="../ImageEditorDialog.cpp" line="141"/> <location filename="../ImageEditorDialog.cpp" line="150"/> - <location filename="../ImportDialog.cpp" line="343"/> - <location filename="../ImportDialog.cpp" line="374"/> - <location filename="../ImportDialog.cpp" line="383"/> - <location filename="../ImportDialog.cpp" line="573"/> - <location filename="../ImportDialog.cpp" line="604"/> - <location filename="../ImportDialog.cpp" line="613"/> + <location filename="../ImportDialog.cpp" line="423"/> + <location filename="../ImportDialog.cpp" line="454"/> + <location filename="../ImportDialog.cpp" line="463"/> + <location filename="../ImportDialog.cpp" line="743"/> + <location filename="../ImportDialog.cpp" line="774"/> + <location filename="../ImportDialog.cpp" line="783"/> <location filename="../ProfileInterface.cpp" line="483"/> <location filename="../ProfileInterface.cpp" line="527"/> <location filename="../ProfileInterface.cpp" line="582"/> @@ -1222,16 +1297,16 @@ Drücke 1 für Standardmodus</translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="120"/> - <location filename="../ImportDialog.cpp" line="353"/> - <location filename="../ImportDialog.cpp" line="583"/> + <location filename="../ImportDialog.cpp" line="433"/> + <location filename="../ImportDialog.cpp" line="753"/> <location filename="../ProfileInterface.cpp" line="502"/> <source>All image files (%1)</source> <translation>Alle Bilddateien (%1)</translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="121"/> - <location filename="../ImportDialog.cpp" line="354"/> - <location filename="../ImportDialog.cpp" line="584"/> + <location filename="../ImportDialog.cpp" line="434"/> + <location filename="../ImportDialog.cpp" line="754"/> <location filename="../ProfileInterface.cpp" line="503"/> <location filename="../UserInterface.cpp" line="463"/> <source>All files (**)</source> @@ -1266,16 +1341,16 @@ Drücke 1 für Standardmodus</translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="141"/> - <location filename="../ImportDialog.cpp" line="374"/> - <location filename="../ImportDialog.cpp" line="604"/> + <location filename="../ImportDialog.cpp" line="454"/> + <location filename="../ImportDialog.cpp" line="774"/> <location filename="../ProfileInterface.cpp" line="725"/> <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="../ImageEditorDialog.cpp" line="150"/> - <location filename="../ImportDialog.cpp" line="383"/> - <location filename="../ImportDialog.cpp" line="613"/> + <location filename="../ImportDialog.cpp" line="463"/> + <location filename="../ImportDialog.cpp" line="783"/> <location filename="../ProfileInterface.cpp" line="735"/> <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> @@ -1836,11 +1911,21 @@ Drücke 1 für Standardmodus</translation> </message> <message> <location filename="../SnapmaticEditor.ui" line="240"/> + <source>Apply changes</source> + <translation>Änderungen übernehmen</translation> + </message> + <message> + <location filename="../SnapmaticEditor.ui" line="243"/> <source>&Apply</source> <translation>&Übernehmen</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="253"/> + <location filename="../SnapmaticEditor.ui" line="256"/> + <source>Discard changes</source> + <translation>Änderungen verwerfen</translation> + </message> + <message> + <location filename="../SnapmaticEditor.ui" line="259"/> <source>&Cancel</source> <translation>Abbre&chen</translation> </message> diff --git a/res/gta5sync_en_US.ts b/res/gta5sync_en_US.ts index fa39d1b..a6e3121 100644 --- a/res/gta5sync_en_US.ts +++ b/res/gta5sync_en_US.ts @@ -177,7 +177,7 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImageEditorDialog.ui" line="14"/> - <location filename="../ImportDialog.cpp" line="465"/> + <location filename="../ImportDialog.cpp" line="635"/> <source>Overwrite Image...</source> <translation></translation> </message> @@ -193,25 +193,25 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImageEditorDialog.ui" line="82"/> - <location filename="../ImportDialog.cpp" line="467"/> + <location filename="../ImportDialog.cpp" line="637"/> <source>Apply changes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="85"/> - <location filename="../ImportDialog.cpp" line="466"/> + <location filename="../ImportDialog.cpp" line="636"/> <source>&Overwrite</source> <translation></translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="92"/> - <location filename="../ImportDialog.cpp" line="469"/> + <location filename="../ImportDialog.cpp" line="639"/> <source>Discard changes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="95"/> - <location filename="../ImportDialog.cpp" line="468"/> + <location filename="../ImportDialog.cpp" line="638"/> <source>&Close</source> <translation></translation> </message> @@ -239,8 +239,9 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="150"/> - <location filename="../ImportDialog.cpp" line="86"/> - <location filename="../ImportDialog.cpp" line="553"/> + <location filename="../ImportDialog.cpp" line="94"/> + <location filename="../ImportDialog.cpp" line="311"/> + <location filename="../ImportDialog.cpp" line="723"/> <source>Background Colour: <span style="color: %1">%1</span></source> <translation>Background Color: <span style="color: %1">%1</span></translation> </message> @@ -282,7 +283,8 @@ Pictures and Savegames</source> <translation></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="618"/> + <location filename="../ImportDialog.cpp" line="314"/> + <location filename="../ImportDialog.cpp" line="788"/> <source>Background Image: %1</source> <translation></translation> </message> @@ -338,68 +340,141 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="203"/> - <location filename="../ImportDialog.cpp" line="87"/> - <location filename="../ImportDialog.cpp" line="633"/> + <location filename="../ImportDialog.cpp" line="95"/> + <location filename="../ImportDialog.cpp" line="319"/> + <location filename="../ImportDialog.cpp" line="803"/> <source>Background Image:</source> <translation></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="112"/> + <location filename="../ImportDialog.cpp" line="120"/> <source>&Import new Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="113"/> + <location filename="../ImportDialog.cpp" line="121"/> <source>&Crop Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="186"/> + <location filename="../ImportDialog.cpp" line="123"/> + <source>&Load Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="124"/> + <source>&Save Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="197"/> <location filename="../ProfileInterface.cpp" line="668"/> <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="213"/> + <location filename="../ImportDialog.cpp" line="224"/> <location filename="../ProfileInterface.cpp" line="687"/> <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="271"/> + <location filename="../ImportDialog.cpp" line="314"/> + <source>Storage</source> + <comment>Background Image: Storage</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="351"/> <source>Crop Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="313"/> + <location filename="../ImportDialog.cpp" line="393"/> <source>&Crop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="314"/> + <location filename="../ImportDialog.cpp" line="394"/> <source>Crop Picture</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="529"/> + <source>Please import a new picture first</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="486"/> + <location filename="../ImportDialog.cpp" line="496"/> + <source>Default</source> + <comment>Default as Default Profile</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="487"/> + <location filename="../ImportDialog.cpp" line="488"/> + <location filename="../ImportDialog.cpp" line="489"/> + <location filename="../ImportDialog.cpp" line="490"/> + <location filename="../ImportDialog.cpp" line="491"/> <location filename="../ImportDialog.cpp" line="500"/> + <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="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="543"/> + <location filename="../ImportDialog.cpp" line="547"/> + <location filename="../ImportDialog.cpp" line="551"/> + <location filename="../ImportDialog.cpp" line="555"/> + <location filename="../ImportDialog.cpp" line="559"/> + <source>Profile %1</source> + <comment>Profile %1 as Profile 1</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="492"/> + <source>Load Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="492"/> + <location filename="../ImportDialog.cpp" line="539"/> + <source>Please select your settings profile</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="529"/> + <location filename="../ImportDialog.cpp" line="539"/> + <source>Save Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="670"/> <source>Snapmatic Avatar Zone</source> <translation></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="500"/> + <location filename="../ImportDialog.cpp" line="670"/> <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="549"/> + <location filename="../ImportDialog.cpp" line="719"/> <source>Select Colour...</source> <translation>Select Color...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="618"/> + <location filename="../ImportDialog.cpp" line="788"/> <source>File</source> <comment>Background Image: File</comment> <translation></translation> @@ -1161,8 +1236,8 @@ Press 1 for Default View</source> </message> <message> <location filename="../ImageEditorDialog.cpp" line="109"/> - <location filename="../ImportDialog.cpp" line="342"/> - <location filename="../ImportDialog.cpp" line="572"/> + <location filename="../ImportDialog.cpp" line="422"/> + <location filename="../ImportDialog.cpp" line="742"/> <location filename="../ProfileInterface.cpp" line="482"/> <location filename="../ProfileInterface.cpp" line="548"/> <location filename="../ProfileInterface.cpp" line="857"/> @@ -1173,12 +1248,12 @@ Press 1 for Default View</source> <location filename="../ImageEditorDialog.cpp" line="110"/> <location filename="../ImageEditorDialog.cpp" line="141"/> <location filename="../ImageEditorDialog.cpp" line="150"/> - <location filename="../ImportDialog.cpp" line="343"/> - <location filename="../ImportDialog.cpp" line="374"/> - <location filename="../ImportDialog.cpp" line="383"/> - <location filename="../ImportDialog.cpp" line="573"/> - <location filename="../ImportDialog.cpp" line="604"/> - <location filename="../ImportDialog.cpp" line="613"/> + <location filename="../ImportDialog.cpp" line="423"/> + <location filename="../ImportDialog.cpp" line="454"/> + <location filename="../ImportDialog.cpp" line="463"/> + <location filename="../ImportDialog.cpp" line="743"/> + <location filename="../ImportDialog.cpp" line="774"/> + <location filename="../ImportDialog.cpp" line="783"/> <location filename="../ProfileInterface.cpp" line="483"/> <location filename="../ProfileInterface.cpp" line="527"/> <location filename="../ProfileInterface.cpp" line="582"/> @@ -1221,16 +1296,16 @@ Press 1 for Default View</source> </message> <message> <location filename="../ImageEditorDialog.cpp" line="120"/> - <location filename="../ImportDialog.cpp" line="353"/> - <location filename="../ImportDialog.cpp" line="583"/> + <location filename="../ImportDialog.cpp" line="433"/> + <location filename="../ImportDialog.cpp" line="753"/> <location filename="../ProfileInterface.cpp" line="502"/> <source>All image files (%1)</source> <translation></translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="121"/> - <location filename="../ImportDialog.cpp" line="354"/> - <location filename="../ImportDialog.cpp" line="584"/> + <location filename="../ImportDialog.cpp" line="434"/> + <location filename="../ImportDialog.cpp" line="754"/> <location filename="../ProfileInterface.cpp" line="503"/> <location filename="../UserInterface.cpp" line="463"/> <source>All files (**)</source> @@ -1270,16 +1345,16 @@ Press 1 for Default View</source> </message> <message> <location filename="../ImageEditorDialog.cpp" line="141"/> - <location filename="../ImportDialog.cpp" line="374"/> - <location filename="../ImportDialog.cpp" line="604"/> + <location filename="../ImportDialog.cpp" line="454"/> + <location filename="../ImportDialog.cpp" line="774"/> <location filename="../ProfileInterface.cpp" line="725"/> <source>Can't import %1 because file can't be open</source> <translation></translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="150"/> - <location filename="../ImportDialog.cpp" line="383"/> - <location filename="../ImportDialog.cpp" line="613"/> + <location filename="../ImportDialog.cpp" line="463"/> + <location filename="../ImportDialog.cpp" line="783"/> <location filename="../ProfileInterface.cpp" line="735"/> <source>Can't import %1 because file can't be parsed properly</source> <translation></translation> @@ -1805,11 +1880,21 @@ Press 1 for Default View</source> </message> <message> <location filename="../SnapmaticEditor.ui" line="240"/> + <source>Apply changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SnapmaticEditor.ui" line="243"/> <source>&Apply</source> <translation></translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="253"/> + <location filename="../SnapmaticEditor.ui" line="256"/> + <source>Discard changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SnapmaticEditor.ui" line="259"/> <source>&Cancel</source> <translation></translation> </message> diff --git a/res/gta5sync_fr.qm b/res/gta5sync_fr.qm index ca934720260141465a527a7df5b4c91227739357..b15e8f1861e3a25d2ec3a9cdb33c445dcc9e0a02 100644 GIT binary patch delta 1383 zcmX9;dr(w$7(ILUUUu)jyYBeFO<tQ=n=Y_mxuPkA`9cE}6B<D>A2>QZ%t2NqmB;c@ z9<u&eQNl5E@sThDq?r(orWL-{P^iWzE19HHQ`@5Q(YLdIojbqB`JL~4-?{adxVx9R zno)`&yRSJvF9R5F0RpxFA=3a|k{1K@UaYPICJv+Zd@lyR3M~5!C_D<j@&F(h2wMPy z9{i!rKzS$l4j$OF6}*ek@c{hQ=YdgL@O_JcakTHjHDwT{Ti}n)1_-evz*qvo^#!mY z$BWg0_I~~Hb1->W1Ac<(#B5+pEKDBu8V)88drc%v9`>4En0}7{>>7mZIS=Ul5%TFg zVEST&ct|rdy;wd1QB#N~bvS0HUk7#_WJwBx;wsBk%+MDU93<TVD4uEtR`#Q!r3ct} zlbu%>CO*Z$bviFK;`aLju=NP;XD0wNH45pwP#`1Oi={(e+<A=oa#Ia<>(7Ao7sX+4 zfZq+p@whf1HeBKQo3xdrvUDzT_#fPwMMc1tDO^?w`NCRRGgr#(%w-m(VGQHWbkZ}m z3%KsxIv~c%xz>|cyNxVMsZacx8@x^JD(vIjH?9DQ3%P%0W&^`N<o=5oN$X0bc&Hbs z%u$a1@(D2IxN^(}+7JCoX~}g1)$z)trg9)+u5zt)EVXJC>s4;!91=_7%_-ZX`KDuO z)Zm+Zi|q|S{FCpHSCB!ieAoU-z~%+K%UTOeO7r5n059%P@vf6LIycDQPU`?(XyS)@ zE)ve*ADtrYj`vtUAH><5>@lyO@RyKprV>V{2o0emDZf@|C?@hEr*Pn3aw9oYa275h zSClMDm@JjP;uCm&7_~c_Z55Kay7{bENH$d%R5kl^X@Xi+jw=otf(t6=8LHD>rfPld zE)YIT)qd<DP;rqZ`4~s+?NB{AF-SdJq!#ATtW=e=Dj&V*R>vK2(frP4%|1rI!X@g% z=_FwJS@p^A?ZB!=b=O%Mhx{~l$H(kvTQ2JRW60Xi#USedJv~-54vhnLIG9Cc4z@>$ z@%C;C%1kj$)ee}7#T9i_R*q53jJ*%+3}q!M<I6i{h|V(!K%FEug})9gbc@|Fl(Vd* z;>BA}f!t2<>eBgSb-mbUjs#wsE8a_aKvT=H0adhAWs#<>ZlLQQvoN)h+f&Ap)NgY2 z5$w3yY${8XT!*Ux-^Ws)fgIkRCw=n)-F-Gry46O~-r6S($T>jqE~XU|UMzl2uC!3S zyH?4SbEu$<U%gmXEmvOph=Nxl+aDFuZ{Vox&`$-n4X`RvpLkhzw*5#XkL0G))Ped6 z`4d|ZFxf7jvZYeki{!2>vUu+@LSo&kl+Q(z_3{3)Yr{5Rk6P~8mktzk%hwzf)BFp} zEgBTpn6G5y@)Rse3gT)Hu{0^jue4dyFo%xH`!r4+2}p0$oVrK)+1tz^8H0D1X#Kx8 z1DeNL|3Qjz!86+Nk>3LTm$jxFG!q4zSiclKqG*EFe&ivgJ44%&984MPW?}Mbzm4;C zDdV##&Ohi@tak$=J9ODS6xDZTv1U11pI4{5A2bgLJE?QOOOLE;UrV+2wsV@_tZe1D X1Xfz<%kC8Qu(q%`&v*N2TWawCcigQ) delta 1333 zcmX9-ZA?>V7(Kncx9z=`+5l<;2pt$YR#-tNf<sV;AZ|cpQx-usWvjsm8p6j!1%v|1 z1f;%{4~3{3h*J`#s8JCYMB<zuRd8gBI-P+C+t4^hbep(6q`yvb@B5zjJm)#*=}qpy z4X$>kV$?RvTwKr&1cU-}b^?JBfNqTwz4cD49t7sipzp;_^nMTcv=7)d0>0`9AQ%Wc z0fQd=(E?!iOYq%1@WpxX4nn&b{B3_=rWX9rYGCd~CuZ!1us9T6*p><*jszIXAvmrA zxj9a(UTb@x-vF4VS?4^4>1+((5eL&W`@SfcrrG!9z%<QX>k88!A%t-VZ0ra0UI^@2 z2`pZXz-iLVOegM6L}WPeq`D%;au={YWNQ=#g$v75EYp=OG6SDIz~0UQ(qG7KDh#d> z7`aR5q&AFxB>+2z*_1*rE>KAKgMgYR%$r-JZwCi>-cy{3KLx}ED;zKA<+28r$A!5D zaTy<$0y}cKta6%u|2XU6D!7`HEJkVY2;q7!CIW0PcdcFrEY0T}+2n*hofRteN$%X( zC@rJJjhno83rJeU{T;mpaQ&A1H^iM5utX^y{Sl;AIs5z9K=>J@M=t#jx}yxun*^#W zm1{co03j=soAP~uy2ETlS;W=FG7E1`*|VMRIFUx{d&GBIKL*6V_-;9!#vbP{9a;cv z+sixh>wpDmPTV@jiIvg3<D8ZL`}3n|-N2h2{L6vsgv<C>7f5^EeKyYfaHWr!R?xpS zUnn-y2(wd!<{*+(bX#aHBl40*!jXT-jpR(BwPY>1vV<iF3#IZMD)0UowAACQT1e*V zE7*vTZ2B@)U3(~x@^Mmazh$SDsno5#G-qv}`s4>sf#Bupt`igFgPK`XMz_Wn>epw- zXj3&BA(oO*b%nL4^x`~C{4ocmvxN1ijGnvfnsy5b*l<~MF1Ql-yiIfIGA+HRiA|}@ zo~13K{=rhZ%ZWbuBlNVdXnZ*rsJz2s)Mmfh0x`jMjcO1rrm4Fqp=Dxv1C5nq6f@(V zQ!Fx=U2S}~vQTX8O$6#=#g5>QfK`*?wWZXetaak`;s1cVi{kBd?~|27;*dEEcxQ$9 zEagucFp5p8qok^ADPm(YU7ui)8Y9=x$1IvpxTZ|juQ8h{swGEz4KQm;8ZwZ>d(KKf z9jCi*#7o1cNZR@qX++KethboAm^k0MUaktId2NT~s#qFm^KVY9_(86^ahhsXF56y} zP|3fM?fOOJgD)csl0>=n)UOofaJl0<+CbA)`MlK!SZI?kSW~IWrShdLvbgaeA+a_t zk*`FN^$A|GBew`>SS}B=SSYE2JZPs97OR*b85BC^FB!RlNR}Y^aO^S5l6*YN$6T6Y z>8RY|(yAi?mNu6Q&q)9N4%Q|a{p`J3uV2i7%aqn@>}z6LtqlnK8SuKPHQl336rX0} zQj}YXMQb}YK^@+#?M(Iq$^{lFZ}iN6qDu+b0z^O5rDsn9?%ldA160-RyI7ALr7sxN kJ@;7&ynRkLd5|92+O-Kd;M(Qp@_Rm8Zyo4jWvPDu1OLXHh5!Hn diff --git a/res/gta5sync_fr.ts b/res/gta5sync_fr.ts index c2ff2fe..0058fb3 100644 --- a/res/gta5sync_fr.ts +++ b/res/gta5sync_fr.ts @@ -187,7 +187,7 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="14"/> - <location filename="../ImportDialog.cpp" line="465"/> + <location filename="../ImportDialog.cpp" line="635"/> <source>Overwrite Image...</source> <translation>Remplacer l'image...</translation> </message> @@ -203,25 +203,25 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="82"/> - <location filename="../ImportDialog.cpp" line="467"/> + <location filename="../ImportDialog.cpp" line="637"/> <source>Apply changes</source> <translation type="unfinished">Appliquer les changements</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="85"/> - <location filename="../ImportDialog.cpp" line="466"/> + <location filename="../ImportDialog.cpp" line="636"/> <source>&Overwrite</source> <translation>&Remplacer</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="92"/> - <location filename="../ImportDialog.cpp" line="469"/> + <location filename="../ImportDialog.cpp" line="639"/> <source>Discard changes</source> <translation type="unfinished">Annuler les changements</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="95"/> - <location filename="../ImportDialog.cpp" line="468"/> + <location filename="../ImportDialog.cpp" line="638"/> <source>&Close</source> <translation>&Fermer</translation> </message> @@ -275,8 +275,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="86"/> - <location filename="../ImportDialog.cpp" line="553"/> + <location filename="../ImportDialog.cpp" line="94"/> + <location filename="../ImportDialog.cpp" line="311"/> + <location filename="../ImportDialog.cpp" line="723"/> <source>Background Colour: <span style="color: %1">%1</span></source> <translation>Couleur de fond : <span style="color: %1">%1</span></translation> </message> @@ -302,7 +303,8 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="618"/> + <location filename="../ImportDialog.cpp" line="314"/> + <location filename="../ImportDialog.cpp" line="788"/> <source>Background Image: %1</source> <translation>Image de fond : %1</translation> </message> @@ -348,69 +350,142 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation> </message> <message> <location filename="../ImportDialog.ui" line="203"/> - <location filename="../ImportDialog.cpp" line="87"/> - <location filename="../ImportDialog.cpp" line="633"/> + <location filename="../ImportDialog.cpp" line="95"/> + <location filename="../ImportDialog.cpp" line="319"/> + <location filename="../ImportDialog.cpp" line="803"/> <source>Background Image:</source> <translation>Image de fond :</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="112"/> + <location filename="../ImportDialog.cpp" line="120"/> <source>&Import new Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="113"/> + <location filename="../ImportDialog.cpp" line="121"/> <source>&Crop Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="186"/> + <location filename="../ImportDialog.cpp" line="123"/> + <source>&Load Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="124"/> + <source>&Save Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="197"/> <location filename="../ProfileInterface.cpp" line="668"/> <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="213"/> + <location filename="../ImportDialog.cpp" line="224"/> <location filename="../ProfileInterface.cpp" line="687"/> <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="271"/> + <location filename="../ImportDialog.cpp" line="314"/> + <source>Storage</source> + <comment>Background Image: Storage</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="351"/> <source>Crop Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="313"/> + <location filename="../ImportDialog.cpp" line="393"/> <source>&Crop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="314"/> + <location filename="../ImportDialog.cpp" line="394"/> <source>Crop Picture</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="529"/> + <source>Please import a new picture first</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="486"/> + <location filename="../ImportDialog.cpp" line="496"/> + <source>Default</source> + <comment>Default as Default Profile</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="487"/> + <location filename="../ImportDialog.cpp" line="488"/> + <location filename="../ImportDialog.cpp" line="489"/> + <location filename="../ImportDialog.cpp" line="490"/> + <location filename="../ImportDialog.cpp" line="491"/> <location filename="../ImportDialog.cpp" line="500"/> + <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="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="543"/> + <location filename="../ImportDialog.cpp" line="547"/> + <location filename="../ImportDialog.cpp" line="551"/> + <location filename="../ImportDialog.cpp" line="555"/> + <location filename="../ImportDialog.cpp" line="559"/> + <source>Profile %1</source> + <comment>Profile %1 as Profile 1</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="492"/> + <source>Load Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="492"/> + <location filename="../ImportDialog.cpp" line="539"/> + <source>Please select your settings profile</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="529"/> + <location filename="../ImportDialog.cpp" line="539"/> + <source>Save Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="670"/> <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="500"/> + <location filename="../ImportDialog.cpp" line="670"/> <source>Snapmatic Avatar Zone</source> <translation>Zone d'Avatar Snapmatic</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="549"/> + <location filename="../ImportDialog.cpp" line="719"/> <source>Select Colour...</source> <translation>Choisir une couleur...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="618"/> + <location filename="../ImportDialog.cpp" line="788"/> <source>File</source> <comment>Background Image: File</comment> <translation>Fichier</translation> @@ -1179,8 +1254,8 @@ Appuyer sur 1 pour le mode par défaut</translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="109"/> - <location filename="../ImportDialog.cpp" line="342"/> - <location filename="../ImportDialog.cpp" line="572"/> + <location filename="../ImportDialog.cpp" line="422"/> + <location filename="../ImportDialog.cpp" line="742"/> <location filename="../ProfileInterface.cpp" line="482"/> <location filename="../ProfileInterface.cpp" line="548"/> <location filename="../ProfileInterface.cpp" line="857"/> @@ -1191,12 +1266,12 @@ Appuyer sur 1 pour le mode par défaut</translation> <location filename="../ImageEditorDialog.cpp" line="110"/> <location filename="../ImageEditorDialog.cpp" line="141"/> <location filename="../ImageEditorDialog.cpp" line="150"/> - <location filename="../ImportDialog.cpp" line="343"/> - <location filename="../ImportDialog.cpp" line="374"/> - <location filename="../ImportDialog.cpp" line="383"/> - <location filename="../ImportDialog.cpp" line="573"/> - <location filename="../ImportDialog.cpp" line="604"/> - <location filename="../ImportDialog.cpp" line="613"/> + <location filename="../ImportDialog.cpp" line="423"/> + <location filename="../ImportDialog.cpp" line="454"/> + <location filename="../ImportDialog.cpp" line="463"/> + <location filename="../ImportDialog.cpp" line="743"/> + <location filename="../ImportDialog.cpp" line="774"/> + <location filename="../ImportDialog.cpp" line="783"/> <location filename="../ProfileInterface.cpp" line="483"/> <location filename="../ProfileInterface.cpp" line="527"/> <location filename="../ProfileInterface.cpp" line="582"/> @@ -1228,16 +1303,16 @@ Appuyer sur 1 pour le mode par défaut</translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="120"/> - <location filename="../ImportDialog.cpp" line="353"/> - <location filename="../ImportDialog.cpp" line="583"/> + <location filename="../ImportDialog.cpp" line="433"/> + <location filename="../ImportDialog.cpp" line="753"/> <location filename="../ProfileInterface.cpp" line="502"/> <source>All image files (%1)</source> <translation>Toutes les images (%1)</translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="121"/> - <location filename="../ImportDialog.cpp" line="354"/> - <location filename="../ImportDialog.cpp" line="584"/> + <location filename="../ImportDialog.cpp" line="434"/> + <location filename="../ImportDialog.cpp" line="754"/> <location filename="../ProfileInterface.cpp" line="503"/> <location filename="../UserInterface.cpp" line="463"/> <source>All files (**)</source> @@ -1284,16 +1359,16 @@ Appuyer sur 1 pour le mode par défaut</translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="141"/> - <location filename="../ImportDialog.cpp" line="374"/> - <location filename="../ImportDialog.cpp" line="604"/> + <location filename="../ImportDialog.cpp" line="454"/> + <location filename="../ImportDialog.cpp" line="774"/> <location filename="../ProfileInterface.cpp" line="725"/> <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="../ImageEditorDialog.cpp" line="150"/> - <location filename="../ImportDialog.cpp" line="383"/> - <location filename="../ImportDialog.cpp" line="613"/> + <location filename="../ImportDialog.cpp" line="463"/> + <location filename="../ImportDialog.cpp" line="783"/> <location filename="../ProfileInterface.cpp" line="735"/> <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> @@ -1837,11 +1912,21 @@ Appuyer sur 1 pour le mode par défaut</translation> </message> <message> <location filename="../SnapmaticEditor.ui" line="240"/> + <source>Apply changes</source> + <translation type="unfinished">Appliquer les changements</translation> + </message> + <message> + <location filename="../SnapmaticEditor.ui" line="243"/> <source>&Apply</source> <translation>A&ppliquer</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="253"/> + <location filename="../SnapmaticEditor.ui" line="256"/> + <source>Discard changes</source> + <translation type="unfinished">Annuler les changements</translation> + </message> + <message> + <location filename="../SnapmaticEditor.ui" line="259"/> <source>&Cancel</source> <translation>A&nnuler</translation> </message> diff --git a/res/gta5sync_ru.qm b/res/gta5sync_ru.qm index c45bd06c1e02c92a4ff8cb9a33a56039a64d53e9..e5de3ece17dd86076213a3b22fbc654f2d827e92 100644 GIT binary patch delta 3268 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 F{Xa1?u+9Jg delta 3114 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 diff --git a/res/gta5sync_ru.ts b/res/gta5sync_ru.ts index 97e3e63..cc6c41a 100644 --- a/res/gta5sync_ru.ts +++ b/res/gta5sync_ru.ts @@ -98,7 +98,8 @@ Pictures and Savegames</source> <message> <location filename="../config.h" line="88"/> <source>Custom</source> - <translatorcomment>Не известен контекст</translatorcomment> + <translatorcomment>Не известен контекст +</translatorcomment> <translation>Своя</translation> </message> </context> @@ -116,7 +117,8 @@ Pictures and Savegames</source> <message> <location filename="../ExportDialog.ui" line="14"/> <source>Dialog</source> - <translatorcomment>Возможно не это имелось ввиду, немецкого перевода нету</translatorcomment> + <translatorcomment>Возможно не это имелось ввиду, немецкого перевода нету +</translatorcomment> <translation>Диалоговое окно</translation> </message> <message> @@ -189,14 +191,14 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImageEditorDialog.ui" line="14"/> - <location filename="../ImportDialog.cpp" line="465"/> + <location filename="../ImportDialog.cpp" line="635"/> <source>Overwrite Image...</source> <translation>Перезаписать картинку...</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="59"/> <source>Import picture</source> - <translation type="unfinished">Импортировать картинку</translation> + <translation>Импортировать картинку</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="62"/> @@ -205,25 +207,25 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImageEditorDialog.ui" line="82"/> - <location filename="../ImportDialog.cpp" line="467"/> + <location filename="../ImportDialog.cpp" line="637"/> <source>Apply changes</source> - <translation type="unfinished">Применить изменения</translation> + <translation>Применить изменения</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="85"/> - <location filename="../ImportDialog.cpp" line="466"/> + <location filename="../ImportDialog.cpp" line="636"/> <source>&Overwrite</source> <translation>&Перезаписать</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="92"/> - <location filename="../ImportDialog.cpp" line="469"/> + <location filename="../ImportDialog.cpp" line="639"/> <source>Discard changes</source> - <translation type="unfinished">Отвергнуть изменения</translation> + <translation>Отменить изменения</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="95"/> - <location filename="../ImportDialog.cpp" line="468"/> + <location filename="../ImportDialog.cpp" line="638"/> <source>&Close</source> <translation>&Закрыть</translation> </message> @@ -277,15 +279,16 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="150"/> - <location filename="../ImportDialog.cpp" line="86"/> - <location filename="../ImportDialog.cpp" line="553"/> + <location filename="../ImportDialog.cpp" line="94"/> + <location filename="../ImportDialog.cpp" line="311"/> + <location filename="../ImportDialog.cpp" line="723"/> <source>Background Colour: <span style="color: %1">%1</span></source> <translation>Цвет фона: <span style="color: %1">%1</span></translation> </message> <message> <location filename="../ImportDialog.ui" line="174"/> <source>Select background colour</source> - <translation type="unfinished"></translation> + <translation>Выберите цвет фона</translation> </message> <message> <location filename="../ImportDialog.ui" line="177"/> @@ -296,7 +299,7 @@ Pictures and Savegames</source> <message> <location filename="../ImportDialog.ui" line="227"/> <source>Select background image</source> - <translation type="unfinished"></translation> + <translation>Выбрать фоновое изображение</translation> </message> <message> <location filename="../ImportDialog.ui" line="237"/> @@ -304,14 +307,16 @@ Pictures and Savegames</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="618"/> + <location filename="../ImportDialog.cpp" line="314"/> + <location filename="../ImportDialog.cpp" line="788"/> <source>Background Image: %1</source> <translation>Фоновая картинка: %1</translation> </message> <message> <location filename="../ImportDialog.ui" line="240"/> <source>X</source> - <translatorcomment>latin X</translatorcomment> + <translatorcomment>latin X +</translatorcomment> <translation>X</translation> </message> <message> @@ -347,73 +352,147 @@ Pictures and Savegames</source> <message> <location filename="../ImportDialog.ui" line="356"/> <source>&Cancel</source> - <translatorcomment>Я не уверен насчет горячих клавиш...</translatorcomment> + <translatorcomment>Я не уверен насчет горячих клавиш... +</translatorcomment> <translation>От&мена</translation> </message> <message> <location filename="../ImportDialog.ui" line="203"/> - <location filename="../ImportDialog.cpp" line="87"/> - <location filename="../ImportDialog.cpp" line="633"/> + <location filename="../ImportDialog.cpp" line="95"/> + <location filename="../ImportDialog.cpp" line="319"/> + <location filename="../ImportDialog.cpp" line="803"/> <source>Background Image:</source> <translation>Фоновая картинка:</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="112"/> + <location filename="../ImportDialog.cpp" line="120"/> <source>&Import new Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="113"/> + <location filename="../ImportDialog.cpp" line="121"/> <source>&Crop Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="186"/> + <location filename="../ImportDialog.cpp" line="123"/> + <source>&Load Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="124"/> + <source>&Save Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="197"/> <location filename="../ProfileInterface.cpp" line="668"/> <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="213"/> + <location filename="../ImportDialog.cpp" line="224"/> <location filename="../ProfileInterface.cpp" line="687"/> <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="271"/> + <location filename="../ImportDialog.cpp" line="314"/> + <source>Storage</source> + <comment>Background Image: Storage</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="351"/> <source>Crop Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="313"/> + <location filename="../ImportDialog.cpp" line="393"/> <source>&Crop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="314"/> + <location filename="../ImportDialog.cpp" line="394"/> <source>Crop Picture</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="529"/> + <source>Please import a new picture first</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="486"/> + <location filename="../ImportDialog.cpp" line="496"/> + <source>Default</source> + <comment>Default as Default Profile</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="487"/> + <location filename="../ImportDialog.cpp" line="488"/> + <location filename="../ImportDialog.cpp" line="489"/> + <location filename="../ImportDialog.cpp" line="490"/> + <location filename="../ImportDialog.cpp" line="491"/> <location filename="../ImportDialog.cpp" line="500"/> + <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="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="543"/> + <location filename="../ImportDialog.cpp" line="547"/> + <location filename="../ImportDialog.cpp" line="551"/> + <location filename="../ImportDialog.cpp" line="555"/> + <location filename="../ImportDialog.cpp" line="559"/> + <source>Profile %1</source> + <comment>Profile %1 as Profile 1</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="492"/> + <source>Load Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="492"/> + <location filename="../ImportDialog.cpp" line="539"/> + <source>Please select your settings profile</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="529"/> + <location filename="../ImportDialog.cpp" line="539"/> + <source>Save Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="670"/> <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="500"/> + <location filename="../ImportDialog.cpp" line="670"/> <source>Snapmatic Avatar Zone</source> <translation>Зона Snapmatic Аватарки</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="549"/> + <location filename="../ImportDialog.cpp" line="719"/> <source>Select Colour...</source> <translation>Выбрать цвет...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="618"/> + <location filename="../ImportDialog.cpp" line="788"/> <source>File</source> <comment>Background Image: File</comment> <translation>Файл</translation> @@ -429,7 +508,7 @@ When you want to use it as Avatar the image will be detached!</source> <message> <location filename="../JsonEditorDialog.ui" line="116"/> <source>Apply changes</source> - <translation type="unfinished">Применить изменения</translation> + <translation>Применить изменения</translation> </message> <message> <location filename="../JsonEditorDialog.ui" line="119"/> @@ -439,7 +518,7 @@ When you want to use it as Avatar the image will be detached!</source> <message> <location filename="../JsonEditorDialog.ui" line="132"/> <source>Discard changes</source> - <translation type="unfinished">Отвергнуть изменения</translation> + <translation>Отменить изменения</translation> </message> <message> <location filename="../JsonEditorDialog.ui" line="135"/> @@ -462,7 +541,7 @@ When you want to use it as Avatar the image will be detached!</source> <message> <location filename="../MapLocationDialog.ui" line="138"/> <source>Close viewer</source> - <translation type="unfinished">Закрыть просмотрщик</translation> + <translation>Закрыть просмотрщик</translation> </message> <message> <location filename="../MapLocationDialog.ui" line="141"/> @@ -675,7 +754,8 @@ Y: %2</translation> <message> <location filename="../OptionsDialog.ui" line="434"/> <source>Hardware, Application and OS Specification</source> - <translatorcomment>Application = gta5view</translatorcomment> + <translatorcomment>Application = gta5view +</translatorcomment> <translation>Железо, выпуск программы, тип ОС</translation> </message> <message> @@ -708,7 +788,8 @@ Y: %2</translation> <message> <location filename="../OptionsDialog.ui" line="558"/> <source>Language for Areas</source> - <translatorcomment>Язык для местоположений?</translatorcomment> + <translatorcomment>Язык для местоположений? +</translatorcomment> <translation>Язык перевода местоположений</translation> </message> <message> @@ -785,7 +866,7 @@ Y: %2</translation> <location filename="../OptionsDialog.cpp" line="153"/> <source>%1 (Next Closest Language)</source> <comment>First language a person can talk with a different person/application. "Native" or "Not Native".</comment> - <translation></translation> + <translation type="unfinished"></translation> </message> <message> <location filename="../OptionsDialog.cpp" line="153"/> @@ -1168,13 +1249,14 @@ Press 1 for Default View</source> <message> <location filename="../ProfileInterface.cpp" line="409"/> <source><h4>Following Snapmatic Pictures got repaired</h4>%1</source> - <translatorcomment>Change wording if the %1 is not a multiline beginning at new line</translatorcomment> + <translatorcomment>Change wording if the %1 is not a multiline beginning at new line +</translatorcomment> <translation><h4>Нижеследующие картинки Snapmatic были восстановлены</h4>%1</translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="109"/> - <location filename="../ImportDialog.cpp" line="342"/> - <location filename="../ImportDialog.cpp" line="572"/> + <location filename="../ImportDialog.cpp" line="422"/> + <location filename="../ImportDialog.cpp" line="742"/> <location filename="../ProfileInterface.cpp" line="482"/> <location filename="../ProfileInterface.cpp" line="548"/> <location filename="../ProfileInterface.cpp" line="857"/> @@ -1185,12 +1267,12 @@ Press 1 for Default View</source> <location filename="../ImageEditorDialog.cpp" line="110"/> <location filename="../ImageEditorDialog.cpp" line="141"/> <location filename="../ImageEditorDialog.cpp" line="150"/> - <location filename="../ImportDialog.cpp" line="343"/> - <location filename="../ImportDialog.cpp" line="374"/> - <location filename="../ImportDialog.cpp" line="383"/> - <location filename="../ImportDialog.cpp" line="573"/> - <location filename="../ImportDialog.cpp" line="604"/> - <location filename="../ImportDialog.cpp" line="613"/> + <location filename="../ImportDialog.cpp" line="423"/> + <location filename="../ImportDialog.cpp" line="454"/> + <location filename="../ImportDialog.cpp" line="463"/> + <location filename="../ImportDialog.cpp" line="743"/> + <location filename="../ImportDialog.cpp" line="774"/> + <location filename="../ImportDialog.cpp" line="783"/> <location filename="../ProfileInterface.cpp" line="483"/> <location filename="../ProfileInterface.cpp" line="527"/> <location filename="../ProfileInterface.cpp" line="582"/> @@ -1222,8 +1304,8 @@ Press 1 for Default View</source> </message> <message> <location filename="../ImageEditorDialog.cpp" line="121"/> - <location filename="../ImportDialog.cpp" line="354"/> - <location filename="../ImportDialog.cpp" line="584"/> + <location filename="../ImportDialog.cpp" line="434"/> + <location filename="../ImportDialog.cpp" line="754"/> <location filename="../ProfileInterface.cpp" line="503"/> <location filename="../UserInterface.cpp" line="463"/> <source>All files (**)</source> @@ -1275,24 +1357,24 @@ Press 1 for Default View</source> </message> <message> <location filename="../ImageEditorDialog.cpp" line="120"/> - <location filename="../ImportDialog.cpp" line="353"/> - <location filename="../ImportDialog.cpp" line="583"/> + <location filename="../ImportDialog.cpp" line="433"/> + <location filename="../ImportDialog.cpp" line="753"/> <location filename="../ProfileInterface.cpp" line="502"/> <source>All image files (%1)</source> <translation>Все файлы изображений (%1)</translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="141"/> - <location filename="../ImportDialog.cpp" line="374"/> - <location filename="../ImportDialog.cpp" line="604"/> + <location filename="../ImportDialog.cpp" line="454"/> + <location filename="../ImportDialog.cpp" line="774"/> <location filename="../ProfileInterface.cpp" line="725"/> <source>Can't import %1 because file can't be open</source> <translation>Не удалось открыть %1, файл не может быть открыт</translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="150"/> - <location filename="../ImportDialog.cpp" line="383"/> - <location filename="../ImportDialog.cpp" line="613"/> + <location filename="../ImportDialog.cpp" line="463"/> + <location filename="../ImportDialog.cpp" line="783"/> <location filename="../ProfileInterface.cpp" line="735"/> <source>Can't import %1 because file can't be parsed properly</source> <translation>Не получилось импортировать %1, файл не может быть правильно обработан</translation> @@ -1843,11 +1925,21 @@ Press 1 for Default View</source> </message> <message> <location filename="../SnapmaticEditor.ui" line="240"/> + <source>Apply changes</source> + <translation type="unfinished">Применить изменения</translation> + </message> + <message> + <location filename="../SnapmaticEditor.ui" line="243"/> <source>&Apply</source> <translation>&Применить</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="253"/> + <location filename="../SnapmaticEditor.ui" line="256"/> + <source>Discard changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SnapmaticEditor.ui" line="259"/> <source>&Cancel</source> <translation>&Отмена</translation> </message> @@ -2124,7 +2216,7 @@ Press 1 for Default View</source> <message> <location filename="../main.cpp" line="173"/> <source>&OK</source> - <translation type="unfinished">&ОК</translation> + <translation>&ОК</translation> </message> </context> <context> diff --git a/res/gta5sync_uk.qm b/res/gta5sync_uk.qm index d271641aab8230bfee70588f6f889d89a0032b7c..7d21baae0edd9e341938dd6d071b06861bb9a949 100644 GIT binary patch delta 1365 zcmX9;YfKbp6g@LL!_LEXD-~BjS;fHOsw=2SeL$rxR8*{0z!b%%;QB}eV-SoLSd_OQ zx_&HJ1u1m{reHxR2Bq3aC6#JeO9gE#rj62yt+m*Y`il0F{dFcY_nULiIrn~b1APB2 z{>Vh`sol%M+hXidM(;m>knw=$H8)Oc0Y3f?C~UK58*FzWbP7Or3IrG7i3JdD1OSEx z2m^6|32xl+HpHc&K#mULa>AMSAiBN>_QtxAt%Fpzmg<8MH17bgvc!!Q6Jf633rt%9 z^SLNsN(anie2!?C$M`%Q`(Pd;tkl8$S1@4&3*d|st|R;{D&JIsDC<q2>KTjYjNC(( z!9^N!b5Bvjp2%Nh0k$Tgw7Cz+y3M*dW5^v0-K2WmUOf0h1P<h4ByBbDJ~-u<*}%@p zZY*taW5pxp#V<12Gw%WW{^T0K1Ag<l_EoJU;UeeyF9tYhU{-#iXZd7)+geh#U*J;< z$eClq><nMTwX;x-(Yutt{0-53R>SvH>Vfx?dDkv->BMH1sxf@{njd};Plo@>kKXA8 z;%@NI-c182pclb!(tBAW*Y^YVX3eCluYjdV8t>ioJvcxUnlTEnQcZkQF)+VQvpsV< zaJ-)NYjXJGD_Fc>Ni5$iG&LpxVujG0w;mYh6gt&pGN?+pRJ(u@TOznJD}b<OH>OW> z<KdZtt0Rx<eiR-gbpo>#;b|X@h`C01d4YOAexD5r#>jdxv9}A@6E3EHo&v0YL(Gw7 zpjZ-Z7SiPXyI4J&ddx2rtMiGis70)MPVOZ7h|c{VkxQ{GTnv+6cuegcPpN;!vc&|x zx}5ck3FaeK?UC9HVw|9L^g1YHAFcB;>8|Y2o?ZDjFz=YQt?^&-MP~6HrjSPMt8>E? zsYMc_yMd!E($sDXb!3+!pF2tSE$N*nbwEXwwCc1AIHY4|JOX_Rtx|)P8nRB2I_8!D z+qBZ9E}ED881~4+;!|vu4TH;w<E8AEIYe`PNDh2D1328sLbVqE$_zQy-UB4p$w}Ha zV9pP6auvzk^Ge>ae1yodSb;Wh@!?No=jGKv^)k6>?m9}?Cig6}0lWO<YxiFRpI(t~ zY+ONEWXS`TFkoSg{5bImDUM@9+6d+7c4f(yYM_Q=b0ibj$l|3<e60^_mn`NoRdF?x zlhF=kz(|IdpHyytNk?ZCD)(Edvy>5KNKFSy(wI(OZ7WgKvQUy+)uNU~lb)STZY*1) zmR<jv_HRVBzuZrIH>x@ei-5dZwR%=QFm;|AcRqAu*&)^0`WyZBs@n7|WmLOWJ)h?X zESA*^c^iPhF7;9>rEqcsA@Q8lsaGO~;fpn$s%v)+X^B?*YOFxPMfE2KT@?8j*r;se zUNA4k#0|1=#mN1`k`zC_G=*g=2F}SGifMYA&i5{5s(0yphfmRAMHdwIGhp=6neWhq z6zpJwN`z-oh|YeR24l-3U2}pzZD<~wqi*rZiqIzprO~qY>yvkl(jE4JKCO=yIX9S{ zQ6mhtbp4254Bdeq`q2|al74<W={noSk9)k2^JkGkla889ti8~SjTGHv{=Q4cp4+;M HH~Rk%be5@< delta 1310 zcmX9;dr%a09RKXzE_=Jnc|qw7D4b$EI`u?N5d*>u5)~@rQ7G16hcY9YgW!+>A#dT3 z^T&bl(2np?GJ`=GN~owzKFTvvu+eHNDX`2zhe=VXFLQr=cJ}w%{k*=v-?ahW(a%>u z!wuOcoB6y0wkV_5GGN{$!1Iy|rym90J`0rSZMla0B@ns<;Db{ToP_n&5U%(GhC>kg z<AFf9aMOzr!xjR$=@6F_KKDCB=Qlu3tPA(FLF-se`-2fQe<!fA+=c8tm=5Lu(^tTB zEDD&`3DX2$O*2dre4aG}FijBJ(_#8Mn6RGtb4HIKgfFJ;>&g*jxeC-JumsM?MYAk! zslF)G3~We2MOz;UFJ|A-{tygarG2^_3^j{D!A<srGsy0oa&tD3#V{W}lq~Up?*i`2 zRqZ6On{)mf1C(d7EPj!vbsN8NHR=BF9X_L&eD957-FzwM!J;%quf=@N*KzdjA%CG( z54@bpJGW8>^`}{`#_;+Yet0N>;tb<QZ(IiAuka6-Z3Za*N5M}6#TJcx@ETxKHB-)y z17Rr|uWhs*?5|mvH45zcQ<KnI1}t!B(z9pKUwJmD$>Tpd$Si_6*?L-NJ(2>5H9}iq z65!q<bg8Li`@V2;|MS#Go#4!_0Ychbm^s~rRmFm{vyj&32tz4dz$`_0&_@GcY7!ow zn9v@{?g+-EyqJ9X46r?1%=macko1(8C(A(TyJEhXJbC>gHqIuEg};f7MZ{L>E;`02 zon&vZrQj{9<x>_bhR8{7KE0EuI)z!qM84rR8x#{wyL+VS{aM85A=xk6f!b`TrH6di z`b(d${0Er7SL!%&AE>r4i(BA4Ng6*kOvUZeiqXB4io4dQ*G!6R+NEPH<a<E-(me;j z9NJZfoj_$e>vjw9F7DADvXCIlG;QbHa$uvRJ$Z(vqVNEF;%4?P?U4;XMN;-}%D&ly zG__Va;K58_x5T0(v!DHYIo5UoNOj05QU@^SqMTYsHn)$<o0g9d*>z@@0+v*D%Pl=| zKtrS4I`<7~IA6XHnGbCBl`q};4|xBad}Zwl%KEz8Zw>(#HOY6A?~&7^Y*dO+Y`w}0 zX^lW*3Jcc;auTy>*YW$ZS+CY?s@R}74^>gncBS7)fm_Fv>z~o5GfR|P?WAn|h%%^V z0%aGOj~tg@mZnxNB)fI)YGpL}+0yF53c_!{pwl&?+8!6ssTx)7hEQPVBeii>5#Tf5 zg<EdBuwqzkY5$dm|5>&56m_)kta`lA7g!>zCkod90cX^c8Pr14SA@jVl&+qO7{*k* z)}=bP<&l?WwXexS!|kR1V5e)KXbKY*BbUVdl|U|(#nSUCmZA9ayG}8yV&K3ID1kHd zx~V@?r+TMu>hLG@QJO9&<VV0bS!cRI6H;`Z-BBVuORPHEVH%9IJG!<+KN9&13s=*; zcl@PK4%!U7a!sGQb(C(XSM{6w=pg4;vTilPkmuBo_{Pu;=cXTRAd<}E>A-$nho}49 P9W1`=YDZ4_TEG7R)U=o| diff --git a/res/gta5sync_uk.ts b/res/gta5sync_uk.ts index 25beeea..b1c29f6 100644 --- a/res/gta5sync_uk.ts +++ b/res/gta5sync_uk.ts @@ -177,7 +177,7 @@ Pictures and Savegames</source> <name>ImageEditorDialog</name> <message> <location filename="../ImageEditorDialog.ui" line="14"/> - <location filename="../ImportDialog.cpp" line="465"/> + <location filename="../ImportDialog.cpp" line="635"/> <source>Overwrite Image...</source> <translation>Перезаписати зображення...</translation> </message> @@ -193,25 +193,25 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImageEditorDialog.ui" line="82"/> - <location filename="../ImportDialog.cpp" line="467"/> + <location filename="../ImportDialog.cpp" line="637"/> <source>Apply changes</source> <translation type="unfinished">Застосувати зміни</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="85"/> - <location filename="../ImportDialog.cpp" line="466"/> + <location filename="../ImportDialog.cpp" line="636"/> <source>&Overwrite</source> <translation>&Перезаписати</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="92"/> - <location filename="../ImportDialog.cpp" line="469"/> + <location filename="../ImportDialog.cpp" line="639"/> <source>Discard changes</source> <translation type="unfinished">Скасувати зміни</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="95"/> - <location filename="../ImportDialog.cpp" line="468"/> + <location filename="../ImportDialog.cpp" line="638"/> <source>&Close</source> <translation>&Закрити</translation> </message> @@ -275,8 +275,9 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="150"/> - <location filename="../ImportDialog.cpp" line="86"/> - <location filename="../ImportDialog.cpp" line="553"/> + <location filename="../ImportDialog.cpp" line="94"/> + <location filename="../ImportDialog.cpp" line="311"/> + <location filename="../ImportDialog.cpp" line="723"/> <source>Background Colour: <span style="color: %1">%1</span></source> <translation>Фоновий колір: <span style="color: %1">%1</span></translation> </message> @@ -293,8 +294,9 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="203"/> - <location filename="../ImportDialog.cpp" line="87"/> - <location filename="../ImportDialog.cpp" line="633"/> + <location filename="../ImportDialog.cpp" line="95"/> + <location filename="../ImportDialog.cpp" line="319"/> + <location filename="../ImportDialog.cpp" line="803"/> <source>Background Image:</source> <translation>Фонове зображення:</translation> </message> @@ -349,68 +351,141 @@ Pictures and Savegames</source> <translation>&Скасувати</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="112"/> + <location filename="../ImportDialog.cpp" line="120"/> <source>&Import new Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="113"/> + <location filename="../ImportDialog.cpp" line="121"/> <source>&Crop Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="186"/> + <location filename="../ImportDialog.cpp" line="123"/> + <source>&Load Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="124"/> + <source>&Save Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="197"/> <location filename="../ProfileInterface.cpp" line="668"/> <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="213"/> + <location filename="../ImportDialog.cpp" line="224"/> <location filename="../ProfileInterface.cpp" line="687"/> <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="271"/> + <location filename="../ImportDialog.cpp" line="314"/> + <source>Storage</source> + <comment>Background Image: Storage</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="351"/> <source>Crop Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="313"/> + <location filename="../ImportDialog.cpp" line="393"/> <source>&Crop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="314"/> + <location filename="../ImportDialog.cpp" line="394"/> <source>Crop Picture</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="529"/> + <source>Please import a new picture first</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="486"/> + <location filename="../ImportDialog.cpp" line="496"/> + <source>Default</source> + <comment>Default as Default Profile</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="487"/> + <location filename="../ImportDialog.cpp" line="488"/> + <location filename="../ImportDialog.cpp" line="489"/> + <location filename="../ImportDialog.cpp" line="490"/> + <location filename="../ImportDialog.cpp" line="491"/> <location filename="../ImportDialog.cpp" line="500"/> + <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="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="543"/> + <location filename="../ImportDialog.cpp" line="547"/> + <location filename="../ImportDialog.cpp" line="551"/> + <location filename="../ImportDialog.cpp" line="555"/> + <location filename="../ImportDialog.cpp" line="559"/> + <source>Profile %1</source> + <comment>Profile %1 as Profile 1</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="492"/> + <source>Load Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="529"/> + <location filename="../ImportDialog.cpp" line="539"/> + <source>Save Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="670"/> <source>Snapmatic Avatar Zone</source> <translation>Зона Snapmatic Аватару</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="500"/> + <location filename="../ImportDialog.cpp" line="670"/> <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="549"/> + <location filename="../ImportDialog.cpp" line="719"/> <source>Select Colour...</source> <translation>Вибір кольору...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="618"/> + <location filename="../ImportDialog.cpp" line="314"/> + <location filename="../ImportDialog.cpp" line="788"/> <source>Background Image: %1</source> <translation>Фонове зображення: %1</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="618"/> + <location filename="../ImportDialog.cpp" line="492"/> + <location filename="../ImportDialog.cpp" line="539"/> + <source>Please select your settings profile</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="788"/> <source>File</source> <comment>Background Image: File</comment> <translation>Файл</translation> @@ -1159,8 +1234,8 @@ Press 1 for Default View</source> </message> <message> <location filename="../ImageEditorDialog.cpp" line="109"/> - <location filename="../ImportDialog.cpp" line="342"/> - <location filename="../ImportDialog.cpp" line="572"/> + <location filename="../ImportDialog.cpp" line="422"/> + <location filename="../ImportDialog.cpp" line="742"/> <location filename="../ProfileInterface.cpp" line="482"/> <location filename="../ProfileInterface.cpp" line="548"/> <location filename="../ProfileInterface.cpp" line="857"/> @@ -1171,12 +1246,12 @@ Press 1 for Default View</source> <location filename="../ImageEditorDialog.cpp" line="110"/> <location filename="../ImageEditorDialog.cpp" line="141"/> <location filename="../ImageEditorDialog.cpp" line="150"/> - <location filename="../ImportDialog.cpp" line="343"/> - <location filename="../ImportDialog.cpp" line="374"/> - <location filename="../ImportDialog.cpp" line="383"/> - <location filename="../ImportDialog.cpp" line="573"/> - <location filename="../ImportDialog.cpp" line="604"/> - <location filename="../ImportDialog.cpp" line="613"/> + <location filename="../ImportDialog.cpp" line="423"/> + <location filename="../ImportDialog.cpp" line="454"/> + <location filename="../ImportDialog.cpp" line="463"/> + <location filename="../ImportDialog.cpp" line="743"/> + <location filename="../ImportDialog.cpp" line="774"/> + <location filename="../ImportDialog.cpp" line="783"/> <location filename="../ProfileInterface.cpp" line="483"/> <location filename="../ProfileInterface.cpp" line="527"/> <location filename="../ProfileInterface.cpp" line="582"/> @@ -1196,16 +1271,16 @@ Press 1 for Default View</source> </message> <message> <location filename="../ImageEditorDialog.cpp" line="120"/> - <location filename="../ImportDialog.cpp" line="353"/> - <location filename="../ImportDialog.cpp" line="583"/> + <location filename="../ImportDialog.cpp" line="433"/> + <location filename="../ImportDialog.cpp" line="753"/> <location filename="../ProfileInterface.cpp" line="502"/> <source>All image files (%1)</source> <translation>Файли зображень (%1)</translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="121"/> - <location filename="../ImportDialog.cpp" line="354"/> - <location filename="../ImportDialog.cpp" line="584"/> + <location filename="../ImportDialog.cpp" line="434"/> + <location filename="../ImportDialog.cpp" line="754"/> <location filename="../ProfileInterface.cpp" line="503"/> <location filename="../UserInterface.cpp" line="463"/> <source>All files (**)</source> @@ -1213,16 +1288,16 @@ Press 1 for Default View</source> </message> <message> <location filename="../ImageEditorDialog.cpp" line="141"/> - <location filename="../ImportDialog.cpp" line="374"/> - <location filename="../ImportDialog.cpp" line="604"/> + <location filename="../ImportDialog.cpp" line="454"/> + <location filename="../ImportDialog.cpp" line="774"/> <location filename="../ProfileInterface.cpp" line="725"/> <source>Can't import %1 because file can't be open</source> <translation>Неможливо імпортувати %1, оскільки файл не може бути відкритий</translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="150"/> - <location filename="../ImportDialog.cpp" line="383"/> - <location filename="../ImportDialog.cpp" line="613"/> + <location filename="../ImportDialog.cpp" line="463"/> + <location filename="../ImportDialog.cpp" line="783"/> <location filename="../ProfileInterface.cpp" line="735"/> <source>Can't import %1 because file can't be parsed properly</source> <translation>Неможливо імпортувати %1, оскільки файл неможливо розібрати правильно</translation> @@ -1803,11 +1878,21 @@ Press 1 for Default View</source> </message> <message> <location filename="../SnapmaticEditor.ui" line="240"/> + <source>Apply changes</source> + <translation type="unfinished">Застосувати зміни</translation> + </message> + <message> + <location filename="../SnapmaticEditor.ui" line="243"/> <source>&Apply</source> <translation>&Застосувати</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="253"/> + <location filename="../SnapmaticEditor.ui" line="256"/> + <source>Discard changes</source> + <translation type="unfinished">Скасувати зміни</translation> + </message> + <message> + <location filename="../SnapmaticEditor.ui" line="259"/> <source>&Cancel</source> <translation>&Скасувати</translation> </message> diff --git a/res/gta5sync_zh_TW.qm b/res/gta5sync_zh_TW.qm index 14d54eb7a92500cf8a1b090e039c06757bd3ade6..e1a9e6299392cf008bd2d67c5e30988f1d9151a0 100644 GIT binary patch delta 1309 zcmXAodrTBp6vn@qon>}rSk_fxf)+N&)2-}65m5=^qY88tS}mwpKvq^j9*Q8^KM)W# zeQ0HKOWULvqb{OVN)$z^4GmS&B806}Ox02~N`kSip@kHm?V<bEZ|<FY&-v~-=X+ek zKdI&Gr*jidU(3P`ML<L>pbEh2@qk|SQ2pG)A}bK>L;Fb{sy_lbSAdPToK>o^62fJ= zxPBCZn^>0NY%=9mL7Pkw1B0M-{{UqC>*1DO=#H)iUdu+r8+(9x*F7w<!+hd>QjiC8 z`*L7<CCrmSi+9638MOE;%s+(!C03Y!k0RPxC})apN5XtMz3ecSJ8l4_LrB_3w5dp* zcOMY^keoXUm{tVaY1+?U%64!|s%vVFliYUfU0?y;3dYB+1GL_craU9C>IN=8+W}ZZ zaqWBz@TP$N<0(Ma0u0}v7}7F~9MjUe52K~2K+I-N{&fzJ_R7P&J`aoIxqwrYd*(W> zJZ217Yv-yOvjKB6i{yhuXXOK6T{m0BtK1>x;Ny(P_=43`k@rsUCHvk5wjN<E{C>Vz zWU(5Pe<I)YEhXC~@;#p!s0nu7T}I_Ct6?P?b#@j1Xe1rT<@xbD{Xjwp|8!X?;B%gT z9yN{Hv|J;d7z7G!tVN?5|IwtM`2YwF*A!L;QOtX6P*cr)!O{im`rE>p(^-I45L)Zj z0=ln-%ZeSy3=lex%q6x6?#fSTSdMzQdc?#0or1fgj{e((k*v$q_Ay~%pqJPtytp)} zb2=LmOx!N^Qc!1)Xsa!xcIp&u<D79CB;sC*o$JybeMS#o+@W>VuBQT+Sb}z*oVUa) zpxcKg;32EhX7JmK*`PMVT#zHyAK5_(Y+^%y19g6u=<1>;mkfz#ZGQqGnPS`Nzkz~5 zmhKfcwIV=#)&7W@wnwL3(G6^w&klO264R|b=>{B+S&LV=zf;%jp!~@n={l?*(qJ^} zI=`pE$iC11@UqOX$4lzaVk%<26j(V71l*UxCW2|E?y^|X$~7>DXyUH1ePX!OB)Pg$ zf$dT3f@m_{lWtn#fbenYN#<XqG?NXBiPBR!esd$8xyT}QVSM=-mafa@D>kwVI*Zw1 zl-<pr0LJU`O%qirUnl?a6<zheEk8Wh10*%c!%8`@$(!k=wCFzNKrHDlbtwl{kg&IR zdFV)14)mQTE43)j7qw*GGNnOXK<}wy2PO5LYQ=SqEV5~(a^^cKWW{mio4P<6&ot#y z-3BtKm(p26l`4Ngq^RYml&g!Vf(z>ucg1cJKBf#Dc2M`8D?c}o!E+X|ammEJWWI73 zzaf+*$btN}RF);1{116IuAq~0qPNRH`E6^wFFhgkTMJl&93FH<Kl3*Wpjh=YACWC{ zD)bR?w*bGLdh;D>Y|d3SBrlqpo1%A~q<*G!>svF(Rh#azNG0F@l_4{t6qsu;*vrO& zDM^OXfpg@c8LUM~^kat6z!V@j)iC}grC5_zNbekK<Gp*<v0A?n7F^)Vdh<G1tSRjO N?^cITo6~W7#(y#-h6exu delta 1206 zcmXAodr(wm7{;GHd(Q5jb68f8ID^RU5LZ`c0Y@No5R2hr1Q;g5Dk#W;3oIA8SbvZb zT3O`Cd{WH>V-yz+k`Ww-Kxim;h)OmHFKL&ti3Uc6sbr$k>UH+7-^@4P_rA~jJm0(2 z$lX24o$^u5w>)9lZ2c1mj|LPTSic3(D{d<9xLG;^M0wJAikr$8z`oCc{kE0{#ft+! zLJxBrz`KZ5Keu$53PcF0RM8j+!8HM7|L11uZs<C)fVKGu-}nj;Gwo*SBFx<{k%A(a zFC_s!^)Np!S}wu-xM+Di%-@6%M_|4eNnB(hDpS-mh<}Q1C$=NWHVahPk#d}vrXV%u z4#4{&wctr$bs5rn>AZM~)v2B~9E-C6&j#Vm{uz>;&aSGA-g}*xo24saBIZ93fV>>` zNTrB5D(U+TK-mNf;Nn<5=d1E(bzH2Mg*%u<^7n4!9LHY(D%Z17?p3agu_U$0Ps5F0 z&Y(laO}=d)#|k-DHF;6(!5Y-cI+0tL-$mY?<d$zw0rA1yUx^if=SA+H$kpWQv|8-G z1{}P>M%9W}lX_R*>p)1D+Fl<>=9aTL^$}Gtv+)tR#e83H9w6|1f75P2cb*@S3u&Tr z{MeaIfHjVH)t{zhJKW5gce6yzyM~(R-VJ^}kCHV$;8$k8A`bEohe>DE`|Lh%Qt?bL zDC=s4BNkHYy-H}?ungq432n!yc0r`j@iz^=ZAj>B%q8c0S-KD-9k{9qaC%ZaRqQPx zo2y=7b3(Sc<gWJAnL28arfr>S1svzKo#QmJ!>+xMwg?1UwS&EX(8vYMrU~_~Ij8;i z(gH=`sS}c&fc*+<*C?V%_uN?*U^~o4HDP`Mx*i+#Pklo-6mf#m?9q*VMrr0d*dvW) zO~Hhy{IHFlt`&{-b3niyF?1yeC@Et}+6Yx3tJ9iP*{oF?CPs;!;~5mrW#-hHyvoJv zmRKNcSzNOIP6~fz%i09-xU{9X4LFp@;&q|ip`Vydm(SJQV@{pLT+}YPdQJjf)6#Vl zIaPdGy7>`3^}8kgGB63GbV+k^4N&+l3lKA-a^&V{(p?cLHz$*@9WT0BG%GiMeUbkC z$8yWVM%uJ$xmAgyc|_JOD$mPu=K%fZ!kcp6r(|Spg#1a95in=U!%cf=n>6y6gPf|V zBvRFyX!*)ka&U8#?5cg4gdde>+HLf=UX#CVrESdrk_nPYb%KRRp`7&sOP7pX<t^rr zOn&|zZOL>~O7Q43Q2(@@9>YtdzTyGvlEMNr_5MFv069YMzwjZ|gFZa=JHYp_-h7*a z-M53?m$rKEzou_FOL=a0>ie^4{SK6|c)7&SX|RS@0GkYk!s=yURf?fvW&qgJ%|_(} lUz6cC<8~k@!?64wwb+?yr#bC|-X4=V%*Qq~s4bpf^FI}&VhR8N diff --git a/res/gta5sync_zh_TW.ts b/res/gta5sync_zh_TW.ts index 9b1f39e..09df532 100644 --- a/res/gta5sync_zh_TW.ts +++ b/res/gta5sync_zh_TW.ts @@ -176,7 +176,7 @@ Pictures and Savegames</source> <name>ImageEditorDialog</name> <message> <location filename="../ImageEditorDialog.ui" line="14"/> - <location filename="../ImportDialog.cpp" line="465"/> + <location filename="../ImportDialog.cpp" line="635"/> <source>Overwrite Image...</source> <translation>修改圖片...</translation> </message> @@ -192,25 +192,25 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImageEditorDialog.ui" line="82"/> - <location filename="../ImportDialog.cpp" line="467"/> + <location filename="../ImportDialog.cpp" line="637"/> <source>Apply changes</source> <translation type="unfinished">套用變更</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="85"/> - <location filename="../ImportDialog.cpp" line="466"/> + <location filename="../ImportDialog.cpp" line="636"/> <source>&Overwrite</source> <translation>修改(&O)</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="92"/> - <location filename="../ImportDialog.cpp" line="469"/> + <location filename="../ImportDialog.cpp" line="639"/> <source>Discard changes</source> <translation type="unfinished">捨棄變更</translation> </message> <message> <location filename="../ImageEditorDialog.ui" line="95"/> - <location filename="../ImportDialog.cpp" line="468"/> + <location filename="../ImportDialog.cpp" line="638"/> <source>&Close</source> <translation>關閉(&C)</translation> </message> @@ -274,8 +274,9 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="150"/> - <location filename="../ImportDialog.cpp" line="86"/> - <location filename="../ImportDialog.cpp" line="553"/> + <location filename="../ImportDialog.cpp" line="94"/> + <location filename="../ImportDialog.cpp" line="311"/> + <location filename="../ImportDialog.cpp" line="723"/> <source>Background Colour: <span style="color: %1">%1</span></source> <translation>背景顏色: <span style="color: %1">%1</span></translation> </message> @@ -292,8 +293,9 @@ Pictures and Savegames</source> </message> <message> <location filename="../ImportDialog.ui" line="203"/> - <location filename="../ImportDialog.cpp" line="87"/> - <location filename="../ImportDialog.cpp" line="633"/> + <location filename="../ImportDialog.cpp" line="95"/> + <location filename="../ImportDialog.cpp" line="319"/> + <location filename="../ImportDialog.cpp" line="803"/> <source>Background Image:</source> <translation>背景圖片:</translation> </message> @@ -348,67 +350,140 @@ Pictures and Savegames</source> <translation>取消(&C)</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="112"/> + <location filename="../ImportDialog.cpp" line="120"/> <source>&Import new Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="113"/> + <location filename="../ImportDialog.cpp" line="121"/> <source>&Crop Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="186"/> + <location filename="../ImportDialog.cpp" line="123"/> + <source>&Load Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="124"/> + <source>&Save Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="197"/> <location filename="../ProfileInterface.cpp" line="668"/> <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="213"/> + <location filename="../ImportDialog.cpp" line="224"/> <location filename="../ProfileInterface.cpp" line="687"/> <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="271"/> + <location filename="../ImportDialog.cpp" line="314"/> + <source>Storage</source> + <comment>Background Image: Storage</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="351"/> <source>Crop Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="313"/> + <location filename="../ImportDialog.cpp" line="393"/> <source>&Crop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ImportDialog.cpp" line="314"/> + <location filename="../ImportDialog.cpp" line="394"/> <source>Crop Picture</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="529"/> + <source>Please import a new picture first</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="486"/> + <location filename="../ImportDialog.cpp" line="496"/> + <source>Default</source> + <comment>Default as Default Profile</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="487"/> + <location filename="../ImportDialog.cpp" line="488"/> + <location filename="../ImportDialog.cpp" line="489"/> + <location filename="../ImportDialog.cpp" line="490"/> + <location filename="../ImportDialog.cpp" line="491"/> <location filename="../ImportDialog.cpp" line="500"/> + <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="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="543"/> + <location filename="../ImportDialog.cpp" line="547"/> + <location filename="../ImportDialog.cpp" line="551"/> + <location filename="../ImportDialog.cpp" line="555"/> + <location filename="../ImportDialog.cpp" line="559"/> + <source>Profile %1</source> + <comment>Profile %1 as Profile 1</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="481"/> + <location filename="../ImportDialog.cpp" line="492"/> + <source>Load Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="529"/> + <location filename="../ImportDialog.cpp" line="539"/> + <source>Save Settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="670"/> <source>Snapmatic Avatar Zone</source> <translation>Snapmatic 大頭貼區域</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="500"/> + <location filename="../ImportDialog.cpp" line="670"/> <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="549"/> + <location filename="../ImportDialog.cpp" line="719"/> <source>Select Colour...</source> <translation>選擇顏色...</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="618"/> + <location filename="../ImportDialog.cpp" line="314"/> + <location filename="../ImportDialog.cpp" line="788"/> <source>Background Image: %1</source> <translation>背景圖片: %1</translation> </message> <message> - <location filename="../ImportDialog.cpp" line="618"/> + <location filename="../ImportDialog.cpp" line="492"/> + <location filename="../ImportDialog.cpp" line="539"/> + <source>Please select your settings profile</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ImportDialog.cpp" line="788"/> <source>File</source> <comment>Background Image: File</comment> <translation>文件</translation> @@ -1157,8 +1232,8 @@ Press 1 for Default View</source> </message> <message> <location filename="../ImageEditorDialog.cpp" line="109"/> - <location filename="../ImportDialog.cpp" line="342"/> - <location filename="../ImportDialog.cpp" line="572"/> + <location filename="../ImportDialog.cpp" line="422"/> + <location filename="../ImportDialog.cpp" line="742"/> <location filename="../ProfileInterface.cpp" line="482"/> <location filename="../ProfileInterface.cpp" line="548"/> <location filename="../ProfileInterface.cpp" line="857"/> @@ -1169,12 +1244,12 @@ Press 1 for Default View</source> <location filename="../ImageEditorDialog.cpp" line="110"/> <location filename="../ImageEditorDialog.cpp" line="141"/> <location filename="../ImageEditorDialog.cpp" line="150"/> - <location filename="../ImportDialog.cpp" line="343"/> - <location filename="../ImportDialog.cpp" line="374"/> - <location filename="../ImportDialog.cpp" line="383"/> - <location filename="../ImportDialog.cpp" line="573"/> - <location filename="../ImportDialog.cpp" line="604"/> - <location filename="../ImportDialog.cpp" line="613"/> + <location filename="../ImportDialog.cpp" line="423"/> + <location filename="../ImportDialog.cpp" line="454"/> + <location filename="../ImportDialog.cpp" line="463"/> + <location filename="../ImportDialog.cpp" line="743"/> + <location filename="../ImportDialog.cpp" line="774"/> + <location filename="../ImportDialog.cpp" line="783"/> <location filename="../ProfileInterface.cpp" line="483"/> <location filename="../ProfileInterface.cpp" line="527"/> <location filename="../ProfileInterface.cpp" line="582"/> @@ -1194,16 +1269,16 @@ Press 1 for Default View</source> </message> <message> <location filename="../ImageEditorDialog.cpp" line="120"/> - <location filename="../ImportDialog.cpp" line="353"/> - <location filename="../ImportDialog.cpp" line="583"/> + <location filename="../ImportDialog.cpp" line="433"/> + <location filename="../ImportDialog.cpp" line="753"/> <location filename="../ProfileInterface.cpp" line="502"/> <source>All image files (%1)</source> <translation>所有圖片 (%1)</translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="121"/> - <location filename="../ImportDialog.cpp" line="354"/> - <location filename="../ImportDialog.cpp" line="584"/> + <location filename="../ImportDialog.cpp" line="434"/> + <location filename="../ImportDialog.cpp" line="754"/> <location filename="../ProfileInterface.cpp" line="503"/> <location filename="../UserInterface.cpp" line="463"/> <source>All files (**)</source> @@ -1211,16 +1286,16 @@ Press 1 for Default View</source> </message> <message> <location filename="../ImageEditorDialog.cpp" line="141"/> - <location filename="../ImportDialog.cpp" line="374"/> - <location filename="../ImportDialog.cpp" line="604"/> + <location filename="../ImportDialog.cpp" line="454"/> + <location filename="../ImportDialog.cpp" line="774"/> <location filename="../ProfileInterface.cpp" line="725"/> <source>Can't import %1 because file can't be open</source> <translation>無法匯入 %1,因為檔案無法開啟</translation> </message> <message> <location filename="../ImageEditorDialog.cpp" line="150"/> - <location filename="../ImportDialog.cpp" line="383"/> - <location filename="../ImportDialog.cpp" line="613"/> + <location filename="../ImportDialog.cpp" line="463"/> + <location filename="../ImportDialog.cpp" line="783"/> <location filename="../ProfileInterface.cpp" line="735"/> <source>Can't import %1 because file can't be parsed properly</source> <translation>無法匯入 %1,因為檔案無法正確解析</translation> @@ -1797,11 +1872,21 @@ Press 1 for Default View</source> </message> <message> <location filename="../SnapmaticEditor.ui" line="240"/> + <source>Apply changes</source> + <translation type="unfinished">套用變更</translation> + </message> + <message> + <location filename="../SnapmaticEditor.ui" line="243"/> <source>&Apply</source> <translation>套用(&A)</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="253"/> + <location filename="../SnapmaticEditor.ui" line="256"/> + <source>Discard changes</source> + <translation type="unfinished">捨棄變更</translation> + </message> + <message> + <location filename="../SnapmaticEditor.ui" line="259"/> <source>&Cancel</source> <translation>取消(&C)</translation> </message>