diff --git a/ImageEditorDialog.cpp b/ImageEditorDialog.cpp index fa86959..e634476 100644 --- a/ImageEditorDialog.cpp +++ b/ImageEditorDialog.cpp @@ -151,7 +151,7 @@ fileDialogPreOpen: //Work? delete importImage; goto fileDialogPreOpen; } - ImportDialog *importDialog = new ImportDialog(this); + ImportDialog *importDialog = new ImportDialog(profileName, this); importDialog->setImage(importImage); importDialog->setModal(true); importDialog->show(); diff --git a/ImageEditorDialog.ui b/ImageEditorDialog.ui index 13dd575..8278072 100644 --- a/ImageEditorDialog.ui +++ b/ImageEditorDialog.ui @@ -55,6 +55,9 @@ + + Import picture + &Import... @@ -75,6 +78,9 @@ + + Apply changes + &Overwrite @@ -82,6 +88,9 @@ + + Discard changes + &Close diff --git a/ImportDialog.cpp b/ImportDialog.cpp index afc2373..9b876d0 100644 --- a/ImportDialog.cpp +++ b/ImportDialog.cpp @@ -43,14 +43,16 @@ #define snapmaticAvatarPlacementW 145 #define snapmaticAvatarPlacementH 66 -ImportDialog::ImportDialog(QWidget *parent) : - QDialog(parent), +ImportDialog::ImportDialog(QString profileName, QWidget *parent) : + QDialog(parent), profileName(profileName), ui(new Ui::ImportDialog) { // Set Window Flags setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint); ui->setupUi(this); + ui->cmdOK->setDefault(true); + ui->cmdOK->setFocus(); importAgreed = false; watermarkAvatar = true; watermarkPicture = false; @@ -103,6 +105,11 @@ ImportDialog::ImportDialog(QWidget *parent) : } #endif + // Options menu + optionsMenu = new QMenu(this); + optionsMenu->addAction(tr("&Import new Picture..."), this, SLOT(importNewPicture())); + ui->cmdOptions->setMenu(optionsMenu); + setMaximumSize(sizeHint()); setMinimumSize(sizeHint()); setFixedSize(sizeHint()); @@ -110,6 +117,7 @@ ImportDialog::ImportDialog(QWidget *parent) : ImportDialog::~ImportDialog() { + delete optionsMenu; delete ui; } @@ -247,6 +255,75 @@ void ImportDialog::processWatermark(QPainter *snapmaticPainter) snapmaticPainter->drawImage(0, 0, textWatermark); } +void ImportDialog::importNewPicture() +{ + QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR); + settings.beginGroup("FileDialogs"); + bool dontUseNativeDialog = settings.value("DontUseNativeDialog", false).toBool(); + settings.beginGroup("ImportCopy"); + +fileDialogPreOpen: //Work? + QFileDialog fileDialog(this); + fileDialog.setFileMode(QFileDialog::ExistingFile); + fileDialog.setViewMode(QFileDialog::Detail); + fileDialog.setAcceptMode(QFileDialog::AcceptOpen); + fileDialog.setOption(QFileDialog::DontUseNativeDialog, dontUseNativeDialog); + fileDialog.setWindowFlags(fileDialog.windowFlags()^Qt::WindowContextHelpButtonHint); + fileDialog.setWindowTitle(QApplication::translate("ProfileInterface", "Import...")); + fileDialog.setLabelText(QFileDialog::Accept, QApplication::translate("ProfileInterface", "Import")); + + // Getting readable Image formats + QString imageFormatsStr = " "; + for (QByteArray imageFormat : QImageReader::supportedImageFormats()) + { + imageFormatsStr += QString("*.") % QString::fromUtf8(imageFormat).toLower() % " "; + } + + QStringList filters; + filters << QApplication::translate("ProfileInterface", "All image files (%1)").arg(imageFormatsStr.trimmed()); + filters << QApplication::translate("ProfileInterface", "All files (**)"); + fileDialog.setNameFilters(filters); + + QList sidebarUrls = SidebarGenerator::generateSidebarUrls(fileDialog.sidebarUrls()); + + fileDialog.setSidebarUrls(sidebarUrls); + fileDialog.setDirectory(settings.value(profileName % "+Directory", StandardPaths::documentsLocation()).toString()); + fileDialog.restoreGeometry(settings.value(profileName % "+Geometry", "").toByteArray()); + + if (fileDialog.exec()) + { + QStringList selectedFiles = fileDialog.selectedFiles(); + if (selectedFiles.length() == 1) + { + QString selectedFile = selectedFiles.at(0); + QString selectedFileName = QFileInfo(selectedFile).fileName(); + + QFile snapmaticFile(selectedFile); + if (!snapmaticFile.open(QFile::ReadOnly)) + { + QMessageBox::warning(this, QApplication::translate("ProfileInterface", "Import"), QApplication::translate("ProfileInterface", "Can't import %1 because file can't be open").arg("\""+selectedFileName+"\"")); + goto fileDialogPreOpen; + } + QImage *importImage = new QImage(); + QImageReader snapmaticImageReader; + snapmaticImageReader.setDecideFormatFromContent(true); + snapmaticImageReader.setDevice(&snapmaticFile); + if (!snapmaticImageReader.read(importImage)) + { + QMessageBox::warning(this, QApplication::translate("ProfileInterface", "Import"), QApplication::translate("ProfileInterface", "Can't import %1 because file can't be parsed properly").arg("\""+selectedFileName+"\"")); + delete importImage; + goto fileDialogPreOpen; + } + setImage(importImage); + } + } + + settings.setValue(profileName % "+Geometry", fileDialog.saveGeometry()); + settings.setValue(profileName % "+Directory", fileDialog.directory().absolutePath()); + settings.endGroup(); + settings.endGroup(); +} + QImage ImportDialog::image() { return newImage; @@ -272,16 +349,22 @@ void ImportDialog::setImage(QImage *image_) } else if (image_->width() > snapmaticResolutionW && image_->width() > image_->height()) { + insideAvatarZone = false; + ui->cbAvatar->setChecked(false); workImage = image_->scaledToWidth(snapmaticResolutionW, Qt::SmoothTransformation); delete image_; } else if (image_->height() > snapmaticResolutionH && image_->height() > image_->width()) { + insideAvatarZone = false; + ui->cbAvatar->setChecked(false); workImage = image_->scaledToHeight(snapmaticResolutionH, Qt::SmoothTransformation); delete image_; } else { + insideAvatarZone = false; + ui->cbAvatar->setChecked(false); workImage = *image_; delete image_; } @@ -306,7 +389,7 @@ void ImportDialog::on_cbIgnore_toggled(bool checked) void ImportDialog::on_cbAvatar_toggled(bool checked) { - if (workImage.width() == workImage.height() && !checked) + if (!workImage.isNull() && workImage.width() == workImage.height() && !checked) { if (QMessageBox::No == QMessageBox::warning(this, tr("Snapmatic Avatar Zone"), tr("Are you sure to use a square image outside of the Avatar Zone?\nWhen you want to use it as Avatar the image will be detached!"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No)) { diff --git a/ImportDialog.h b/ImportDialog.h index c58b9f5..a0f4568 100644 --- a/ImportDialog.h +++ b/ImportDialog.h @@ -20,6 +20,7 @@ #define IMPORTDIALOG_H #include +#include namespace Ui { class ImportDialog; @@ -30,7 +31,7 @@ class ImportDialog : public QDialog Q_OBJECT public: - explicit ImportDialog(QWidget *parent = 0); + explicit ImportDialog(QString profileName, QWidget *parent = 0); ~ImportDialog(); QImage image(); QString getImageTitle(); @@ -39,6 +40,7 @@ public: private slots: void processImage(); + void importNewPicture(); void on_cbIgnore_toggled(bool checked); void on_cbAvatar_toggled(bool checked); void on_cmdCancel_clicked(); @@ -52,6 +54,7 @@ private slots: void on_cbWatermark_toggled(bool checked); private: + QString profileName; Ui::ImportDialog *ui; QImage avatarAreaImage; QString backgroundPath; @@ -60,6 +63,7 @@ private: QImage workImage; QImage newImage; QColor selectedColour; + QMenu *optionsMenu; bool insideAvatarZone; bool watermarkPicture; bool watermarkAvatar; diff --git a/ImportDialog.ui b/ImportDialog.ui index a4e76a8..a6c31c4 100644 --- a/ImportDialog.ui +++ b/ImportDialog.ui @@ -141,7 +141,7 @@ - + @@ -170,6 +170,9 @@ + + Select background colour + ... @@ -220,6 +223,9 @@ + + Select background image + ... @@ -227,6 +233,9 @@ + + Remove background image + X @@ -290,6 +299,16 @@ + + + + Import options + + + &Options + + + diff --git a/JsonEditorDialog.ui b/JsonEditorDialog.ui index 333c2d0..a52f087 100644 --- a/JsonEditorDialog.ui +++ b/JsonEditorDialog.ui @@ -112,6 +112,9 @@ 0 + + Apply changes + &Save @@ -125,6 +128,9 @@ 0 + + Discard changes + &Close diff --git a/MapLocationDialog.ui b/MapLocationDialog.ui index d62edf0..cd46742 100644 --- a/MapLocationDialog.ui +++ b/MapLocationDialog.ui @@ -134,6 +134,9 @@ color: rgb(255, 255, 255); Qt::NoFocus + + Close viewer + &Close @@ -160,6 +163,9 @@ color: rgb(255, 255, 255); Qt::NoFocus + + Apply new position + &Apply @@ -173,6 +179,9 @@ color: rgb(255, 255, 255); Qt::NoFocus + + Revert old position + &Revert @@ -186,8 +195,11 @@ color: rgb(255, 255, 255); Qt::NoFocus + + Select new position + - &Set + &Select false @@ -199,6 +211,9 @@ color: rgb(255, 255, 255); Qt::NoFocus + + Quit select position + &Done diff --git a/ProfileInterface.cpp b/ProfileInterface.cpp index 2dda46e..737c475 100644 --- a/ProfileInterface.cpp +++ b/ProfileInterface.cpp @@ -737,7 +737,7 @@ bool ProfileInterface::importFile(QString selectedFile, QDateTime importDateTime delete picture; return false; } - ImportDialog *importDialog = new ImportDialog(this); + ImportDialog *importDialog = new ImportDialog(profileName, this); importDialog->setImage(snapmaticImage); importDialog->setModal(true); importDialog->show(); @@ -922,7 +922,7 @@ bool ProfileInterface::importImage(QImage *snapmaticImage, QDateTime importDateT if (picture->readingPicture(true, false, true, false)) { bool success = false; - ImportDialog *importDialog = new ImportDialog(this); + ImportDialog *importDialog = new ImportDialog(profileName, this); importDialog->setImage(snapmaticImage); importDialog->setModal(true); importDialog->show(); diff --git a/res/gta5sync.ts b/res/gta5sync.ts index 284f821..f522acb 100644 --- a/res/gta5sync.ts +++ b/res/gta5sync.ts @@ -172,16 +172,31 @@ Pictures and Savegames + Import picture + + + + &Import... - + + Apply changes + + + + &Overwrite - + + Discard changes + + + + &Close @@ -221,7 +236,7 @@ Pictures and Savegames - + Ignore Aspect Ratio @@ -237,91 +252,121 @@ Pictures and Savegames - - + + Background Colour: <span style="color: %1">%1</span> - + Select background colour + + + + + ... - - - + + + Background Image: - + + Select background image + + + + + Remove background image + + + + X - + Force Colour in Avatar Zone - - Import picture + + Import options - - &OK - - - - - Discard picture + + &Options + Import picture + + + + + &OK + + + + + Discard picture + + + + &Cancel - + + &Import new Picture... + + + + Custom Avatar Custom Avatar Description in SC, don't use Special Character! - + Custom Picture Custom Picture Description in SC, don't use Special Character! - + Snapmatic Avatar Zone - + 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! - + Select Colour... - + Background Image: %1 - + File Background Image: File @@ -336,11 +381,21 @@ When you want to use it as Avatar the image will be detached! + Apply changes + + + + &Save - + + Discard changes + + + + &Close @@ -359,26 +414,51 @@ When you want to use it as Avatar the image will be detached! + Close viewer + + + + &Close - + + Apply new position + + + + &Apply - + + Revert old position + + + + &Revert - - &Set + + Select new position - + + &Select + + + + + Quit select position + + + + &Done @@ -1028,7 +1108,8 @@ Press 1 for Default View - + + @@ -1039,9 +1120,12 @@ Press 1 for Default View - - - + + + + + + @@ -1061,14 +1145,16 @@ Press 1 for Default View - + + All image files (%1) - + + All files (**) @@ -1076,14 +1162,16 @@ Press 1 for Default View - + + Can't import %1 because file can't be open - + + Can't import %1 because file can't be parsed properly diff --git a/res/gta5sync_de.qm b/res/gta5sync_de.qm index 2019e56..b56d18e 100644 Binary files a/res/gta5sync_de.qm and b/res/gta5sync_de.qm differ diff --git a/res/gta5sync_de.ts b/res/gta5sync_de.ts index 6a5efca..b376283 100644 --- a/res/gta5sync_de.ts +++ b/res/gta5sync_de.ts @@ -188,16 +188,31 @@ Snapmatic Bilder und Spielständen + Import picture + Bild importieren + + + &Import... &Importieren... - + + Apply changes + Änderungen übernehmen + + + &Overwrite &Überschreiben - + + Discard changes + Änderungen verwerfen + + + &Close S&chließen @@ -221,7 +236,7 @@ Snapmatic Bilder und Spielständen - + Ignore Aspect Ratio Seitenverhältnis ignorieren @@ -247,92 +262,122 @@ Snapmatic Bilder und Spielständen - - + + Background Colour: <span style="color: %1">%1</span> Hintergrundfarbe: <span style="color: %1">%1</span> - + Select background colour + Hintergrundfarbe auswählen + + + + ... ... - + + Select background image + Hintergrundbild auswählen + + + + Remove background image + Hintergrundbild entfernen + + + Background Image: %1 Hintergrundbild: %1 - + X X - + Force Colour in Avatar Zone Erzwinge Farbe in Avatar Zone - + + Import options + Import Optionen + + + + &Options + &Optionen + + + Import picture Bild importieren - + &OK &OK - + Discard picture Bild verwerfen - + &Cancel Abbre&chen - - - + + + Background Image: Hintergrundbild: - + + &Import new Picture... + Neues Bild &importieren... + + + Custom Avatar Custom Avatar Description in SC, don't use Special Character! Eigener Avatar - + Custom Picture Custom Picture Description in SC, don't use Special Character! Eigenes Bild - + 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! Bist du sicher ein Quadrat Bild außerhalb der Avatar Zone zu verwenden? Wenn du es als Avatar verwenden möchtest wird es abgetrennt! - + Snapmatic Avatar Zone Snapmatic Avatar Zone - + Select Colour... Farbe auswählen... - + File Background Image: File Datei @@ -347,11 +392,21 @@ Wenn du es als Avatar verwenden möchtest wird es abgetrennt! + Apply changes + Änderungen übernehmen + + + &Save &Speichern - + + Discard changes + Änderungen verwerfen + + + &Close S&chließen @@ -370,26 +425,51 @@ Wenn du es als Avatar verwenden möchtest wird es abgetrennt! + Close viewer + Ansicht schließen + + + &Close S&chließen - + + Apply new position + Neue Position festlegen + + + &Apply &Übernehmen - + + Revert old position + Alte Position wiederherstellen + + + &Revert &Zurücksetzen - - &Set - &Ändern + + Select new position + Neue Position auswählen - + + &Select + Au&swählen + + + + Quit select position + Position auswählen verlassen + + + &Done &Fertig @@ -1055,7 +1135,8 @@ Drücke 1 für Standardmodus - + + @@ -1066,9 +1147,12 @@ Drücke 1 für Standardmodus - - - + + + + + + @@ -1105,14 +1189,16 @@ Drücke 1 für Standardmodus - + + All image files (%1) Alle Bilddateien (%1) - + + All files (**) @@ -1147,14 +1233,16 @@ Drücke 1 für Standardmodus - + + Can't import %1 because file can't be open Kann %1 nicht importieren weil die Datei nicht geöffnet werden kann - + + Can't import %1 because file can't be parsed properly Kann %1 nicht importieren weil die Datei nicht richtig gelesen werden kann diff --git a/res/gta5sync_en_US.qm b/res/gta5sync_en_US.qm index f16e2cd..1db696b 100644 Binary files a/res/gta5sync_en_US.qm and b/res/gta5sync_en_US.qm differ diff --git a/res/gta5sync_en_US.ts b/res/gta5sync_en_US.ts index d6099af..349ee1e 100644 --- a/res/gta5sync_en_US.ts +++ b/res/gta5sync_en_US.ts @@ -178,16 +178,31 @@ Pictures and Savegames + Import picture + + + + &Import... - + + Apply changes + + + + &Overwrite - + + Discard changes + + + + &Close @@ -211,14 +226,19 @@ Pictures and Savegames - - + + Background Colour: <span style="color: %1">%1</span> Background Color: <span style="color: %1">%1</span> - + Select background colour + + + + + ... @@ -234,7 +254,7 @@ Pictures and Savegames - + Ignore Aspect Ratio @@ -249,79 +269,104 @@ Pictures and Savegames - + Background Image: %1 - + + Select background image + + + + + Remove background image + + + + X - + Force Colour in Avatar Zone Force Color in Avatar Zone - + + Import options + + + + + &Options + + + + Import picture - + &OK - + Discard picture - + &Cancel - - - + + + Background Image: - + + &Import new Picture... + + + + Custom Avatar Custom Avatar Description in SC, don't use Special Character! - + Custom Picture Custom Picture Description in SC, don't use Special Character! - + Snapmatic Avatar Zone - + 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! - + Select Colour... Select Color... - + File Background Image: File @@ -336,11 +381,21 @@ When you want to use it as Avatar the image will be detached! + Apply changes + + + + &Save - + + Discard changes + + + + &Close @@ -359,26 +414,51 @@ When you want to use it as Avatar the image will be detached! + Close viewer + + + + &Close - + + Apply new position + + + + &Apply - + + Revert old position + + + + &Revert - - &Set - + + Select new position + - + + &Select + + + + + Quit select position + + + + &Done @@ -1048,7 +1128,8 @@ Press 1 for Default View - + + @@ -1059,9 +1140,12 @@ Press 1 for Default View - - - + + + + + + @@ -1104,14 +1188,16 @@ Press 1 for Default View - + + All image files (%1) - + + All files (**) @@ -1151,14 +1237,16 @@ Press 1 for Default View - + + Can't import %1 because file can't be open - + + Can't import %1 because file can't be parsed properly diff --git a/res/gta5sync_fr.qm b/res/gta5sync_fr.qm index db3608b..ca93472 100644 Binary files a/res/gta5sync_fr.qm and b/res/gta5sync_fr.qm differ diff --git a/res/gta5sync_fr.ts b/res/gta5sync_fr.ts index 6f83e0b..b562fc0 100644 --- a/res/gta5sync_fr.ts +++ b/res/gta5sync_fr.ts @@ -188,16 +188,31 @@ et les fichiers de sauvegarde de Grand Theft Auto V + Import picture + Importer l'image + + + &Import... &Importer... - + + Apply changes + Appliquer les changements + + + &Overwrite &Remplacer - + + Discard changes + Annuler les changements + + + &Close &Fermer @@ -221,7 +236,7 @@ et les fichiers de sauvegarde de Grand Theft Auto V - + Ignore Aspect Ratio Déverrouiller le ratio d'aspect @@ -247,92 +262,122 @@ et les fichiers de sauvegarde de Grand Theft Auto V - - + + Background Colour: <span style="color: %1">%1</span> Couleur de fond : <span style="color: %1">%1</span> - + Select background colour + + + + + ... ... - + + Select background image + + + + + Remove background image + + + + Background Image: %1 Image de fond : %1 - + X X - + Force Colour in Avatar Zone Forcer la couleur dans la Zone d'Avatar - + + Import options + + + + + &Options + + + + Import picture Importer l'image - + &OK &OK - + Discard picture Supprimer l'image - + &Cancel A&nnuler - - - + + + Background Image: Image de fond : - + + &Import new Picture... + + + + Custom Avatar Custom Avatar Description in SC, don't use Special Character! Avatar personnalisé - + Custom Picture Custom Picture Description in SC, don't use Special Character! Image personnalisé - + 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! Ê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 ! - + Snapmatic Avatar Zone Zone d'Avatar Snapmatic - + Select Colour... Choisir une couleur... - + File Background Image: File Fichier @@ -347,11 +392,21 @@ Si vous l'utilisez comme Avatar, l'image sera détachée ! + Apply changes + Appliquer les changements + + + &Save &Sauvegarder - + + Discard changes + Annuler les changements + + + &Close &Fermer @@ -370,26 +425,51 @@ Si vous l'utilisez comme Avatar, l'image sera détachée ! + Close viewer + Fermer la visionneuse + + + &Close &Fermer - + + Apply new position + + + + &Apply &Appliquer - + + Revert old position + + + + &Revert &Revenir - - &Set - &Définir + + Select new position + - + + &Select + &Sélectionner + + + + Quit select position + + + + &Done &Terminer @@ -1066,7 +1146,8 @@ Appuyer sur 1 pour le mode par défaut - + + @@ -1077,9 +1158,12 @@ Appuyer sur 1 pour le mode par défaut - - - + + + + + + @@ -1111,14 +1195,16 @@ Appuyer sur 1 pour le mode par défaut - + + All image files (%1) Toutes les images (%1) - + + All files (**) @@ -1165,14 +1251,16 @@ Appuyer sur 1 pour le mode par défaut - + + Can't import %1 because file can't be open Impossible d'importer %1, le fichier ne peut pas être ouvert - + + Can't import %1 because file can't be parsed properly Impossible d'importer %1, le fichier ne peut pas être parsé correctement diff --git a/res/gta5sync_ru.qm b/res/gta5sync_ru.qm index ac02bb3..c45bd06 100644 Binary files a/res/gta5sync_ru.qm and b/res/gta5sync_ru.qm differ diff --git a/res/gta5sync_ru.ts b/res/gta5sync_ru.ts index fb077b2..0b761a2 100644 --- a/res/gta5sync_ru.ts +++ b/res/gta5sync_ru.ts @@ -190,16 +190,31 @@ Pictures and Savegames + Import picture + Импортировать картинку + + + &Import... &Импортировать... - + + Apply changes + Применить изменения + + + &Overwrite &Перезаписать - + + Discard changes + Отвергнуть изменения + + + &Close &Закрыть @@ -223,7 +238,7 @@ Pictures and Savegames - + Ignore Aspect Ratio Игнорировать соотн. сторон @@ -249,93 +264,123 @@ Pictures and Savegames - - + + Background Colour: <span style="color: %1">%1</span> Цвет фона: <span style="color: %1">%1</span> - + Select background colour + + + + + ... ... - + + Select background image + + + + + Remove background image + + + + Background Image: %1 Фоновая картинка: %1 - + X latin X X - + Force Colour in Avatar Zone Задать цвет в зоне аватарки - + + Import options + + + + + &Options + + + + Import picture Импортировать картинку - + &OK &ОК - + Discard picture Отклонить картинку - + &Cancel Я не уверен насчет горячих клавиш... От&мена - - - + + + Background Image: Фоновая картинка: - + + &Import new Picture... + + + + Custom Avatar Custom Avatar Description in SC, don't use Special Character! Свой Аватар - + Custom Picture Custom Picture Description in SC, don't use Special Character! Своя Картинка - + 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! Ты точно хочешь использовать квадратное изображение вне зоны аватарки? Если это аватар, то изображение будет обрезано! - + Snapmatic Avatar Zone Зона Snapmatic Аватарки - + Select Colour... Выбрать цвет... - + File Background Image: File Файл @@ -350,11 +395,21 @@ When you want to use it as Avatar the image will be detached! + Apply changes + Применить изменения + + + &Save &Сохранить - + + Discard changes + Отвергнуть изменения + + + &Close &Закрыть @@ -373,26 +428,51 @@ When you want to use it as Avatar the image will be detached! + Close viewer + Закрыть просмотрщик + + + &Close &Закрыть - + + Apply new position + + + + &Apply &Применить - + + Revert old position + + + + &Revert &Откатить - - &Set - &Изменить + + Select new position + - + + &Select + + + + + Quit select position + + + + &Done &Готово @@ -1060,7 +1140,8 @@ Press 1 for Default View - + + @@ -1071,9 +1152,12 @@ Press 1 for Default View - - - + + + + + + @@ -1105,7 +1189,8 @@ Press 1 for Default View - + + All files (**) @@ -1157,21 +1242,24 @@ Press 1 for Default View - + + All image files (%1) Все файлы изображений (%1) - + + Can't import %1 because file can't be open Не удалось открыть %1, файл не может быть открыт - + + Can't import %1 because file can't be parsed properly Не получилось импортировать %1, файл не может быть правильно обработан diff --git a/res/gta5sync_uk.qm b/res/gta5sync_uk.qm index 6afd7db..d271641 100644 Binary files a/res/gta5sync_uk.qm and b/res/gta5sync_uk.qm differ diff --git a/res/gta5sync_uk.ts b/res/gta5sync_uk.ts index 6df5750..4c095c1 100644 --- a/res/gta5sync_uk.ts +++ b/res/gta5sync_uk.ts @@ -182,16 +182,31 @@ Pictures and Savegames + Import picture + Імпортувати зображення + + + &Import... &Імпорт... - + + Apply changes + Застосувати зміни + + + &Overwrite &Перезаписати - + + Discard changes + Скасувати зміни + + + &Close &Закрити @@ -231,7 +246,7 @@ Pictures and Savegames - + Ignore Aspect Ratio Ігнорувати співвідношення сторін @@ -247,92 +262,122 @@ Pictures and Savegames - - + + Background Colour: <span style="color: %1">%1</span> Фоновий колір: <span style="color: %1">%1</span> - + Select background colour + + + + + ... ... - - - + + + Background Image: Фонове зображення: - + + Select background image + + + + + Remove background image + + + + X Х - + Force Colour in Avatar Zone Примусовий колір в зоні Аватару - + + Import options + + + + + &Options + + + + Import picture Імпортувати зображення - + &OK &OK - + Discard picture Відхилити зображення - + &Cancel &Скасувати - + + &Import new Picture... + + + + Custom Avatar Custom Avatar Description in SC, don't use Special Character! Користувацький Аватар - + Custom Picture Custom Picture Description in SC, don't use Special Character! Користувацьке Зображення - + Snapmatic Avatar Zone Зона Snapmatic Аватару - + 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! Ви впевнені, що будете використовувати квадратне зображення поза зоною аватара? Якщо ви хочете використовувати його як Аватар, зображення буде відокремлено! - + Select Colour... Вибір кольору... - + Background Image: %1 Фонове зображення: %1 - + File Background Image: File Файл @@ -347,11 +392,21 @@ When you want to use it as Avatar the image will be detached! + Apply changes + Застосувати зміни + + + &Save &Зберегти - + + Discard changes + Скасувати зміни + + + &Close &Закрити @@ -370,26 +425,51 @@ When you want to use it as Avatar the image will be detached! + Close viewer + Закрити переглядач + + + &Close &Закрити - + + Apply new position + + + + &Apply &Застосувати - + + Revert old position + + + + &Revert &Повернути - - &Set - &Змінити + + Select new position + - + + &Select + &Виділення + + + + Quit select position + + + + &Done &Готово @@ -1046,7 +1126,8 @@ Press 1 for Default View - + + @@ -1057,9 +1138,12 @@ Press 1 for Default View - - - + + + + + + @@ -1079,14 +1163,16 @@ Press 1 for Default View - + + All image files (%1) Файли зображень (%1) - + + All files (**) @@ -1094,14 +1180,16 @@ Press 1 for Default View - + + Can't import %1 because file can't be open Неможливо імпортувати %1, оскільки файл не може бути відкритий - + + Can't import %1 because file can't be parsed properly Неможливо імпортувати %1, оскільки файл неможливо розібрати правильно diff --git a/res/gta5sync_zh_TW.qm b/res/gta5sync_zh_TW.qm index 662cd22..14d54eb 100644 Binary files a/res/gta5sync_zh_TW.qm and b/res/gta5sync_zh_TW.qm differ diff --git a/res/gta5sync_zh_TW.ts b/res/gta5sync_zh_TW.ts index 3fd9d73..3cccf8c 100644 --- a/res/gta5sync_zh_TW.ts +++ b/res/gta5sync_zh_TW.ts @@ -181,16 +181,31 @@ Pictures and Savegames + Import picture + 匯入圖片 + + + &Import... 匯入(&I)... - + + Apply changes + 套用變更 + + + &Overwrite 修改(&O) - + + Discard changes + 捨棄變更 + + + &Close 關閉(&C) @@ -230,7 +245,7 @@ Pictures and Savegames - + Ignore Aspect Ratio 忽略長寬比 @@ -246,91 +261,121 @@ Pictures and Savegames - - + + Background Colour: <span style="color: %1">%1</span> 背景顏色: <span style="color: %1">%1</span> - + Select background colour + + + + + ... ... - - - + + + Background Image: 背景圖片: - + + Select background image + + + + + Remove background image + + + + X X - + Force Colour in Avatar Zone 強制在大頭貼區域使用顏色 - + + Import options + + + + + &Options + + + + Import picture 匯入圖片 - + &OK 確定(&O) - + Discard picture 捨棄圖片 - + &Cancel 取消(&C) - + + &Import new Picture... + + + + Custom Avatar Custom Avatar Description in SC, don't use Special Character! 自訂大頭貼 - + Custom Picture Custom Picture Description in SC, don't use Special Character! 自訂圖片 - + Snapmatic Avatar Zone Snapmatic 大頭貼區域 - + 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! 你確定要在大頭貼區域以外的地方使用方形圖片嗎? 作為大頭貼的圖片將被分離! - + Select Colour... 選擇顏色... - + Background Image: %1 背景圖片: %1 - + File Background Image: File 文件 @@ -345,11 +390,21 @@ When you want to use it as Avatar the image will be detached! + Apply changes + 套用變更 + + + &Save 保存(&S) - + + Discard changes + 捨棄變更 + + + &Close 關閉(&C) @@ -368,26 +423,51 @@ When you want to use it as Avatar the image will be detached! + Close viewer + 關閉檢視器 + + + &Close 關閉(&C) - + + Apply new position + + + + &Apply 套用(&A) - + + Revert old position + + + + &Revert 還原(&R) - - &Set - 設置(&S) + + Select new position + - + + &Select + 選擇(&S) + + + + Quit select position + + + + &Done 完成(&D) @@ -1044,7 +1124,8 @@ Press 1 for Default View - + + @@ -1055,9 +1136,12 @@ Press 1 for Default View - - - + + + + + + @@ -1077,14 +1161,16 @@ Press 1 for Default View - + + All image files (%1) 所有圖片 (%1) - + + All files (**) @@ -1092,14 +1178,16 @@ Press 1 for Default View - + + Can't import %1 because file can't be open 無法匯入 %1，因為檔案無法開啟 - + + Can't import %1 because file can't be parsed properly 無法匯入 %1，因為檔案無法正確解析